Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

[2.7] adds deprecation notices. #13060

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Jan 5, 2015
Merged

[2.7] adds deprecation notices. #13060

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
86b9f6b
Adds deprecation notices for structures to be removed in 3.0.
Dec 21, 2014
6f57b7b
Reverted trigger_error() function calls on deprecated interfaces to p…
Dec 29, 2014
2a9749d
Fixes deprecation notices.
Dec 29, 2014
39cfd47
Removed deprecation notices from test files.
Dec 29, 2014
fd9c7bb
Normalized @deprecated annotations.
Dec 29, 2014
97efd2c
Fixes more deprecation notices.
Dec 30, 2014
a7f841e
[Form] Adds a way to trigger deprecation notice on demand for Virtual…
Dec 30, 2014
cd9617a
[Validator] adds more deprecation notices.
Dec 30, 2014
e608ba6
[Form] adds more deprecation notices.
Dec 30, 2014
738b9be
[Validator] fixes UuidValidator deprecated class namespace.
Dec 30, 2014
2a3e7d2
Normalizes deprecation notice messages.
Dec 30, 2014
fd47c07
Fixed some deprecations according to @stof feedbacks.
Jan 4, 2015
f9fbb4f
Fixes more deprecation notices as per @stof review.
Jan 4, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Normalized @deprecated annotations.
  • Loading branch information
Hugo Hamon committed Jan 5, 2015
commit fd9c7bb39f4753746b1c77ea45c5d726be42df19
5 changes: 5 additions & 0 deletions 5 src/Symfony/Bridge/Doctrine/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
CHANGELOG
=========

2.4.0
-----

* deprecated DoctrineOrmTestCase class

2.2.0
-----

Expand Down
4 changes: 2 additions & 2 deletions 4 src/Symfony/Bridge/Doctrine/Form/ChoiceList/EntityChoiceList.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ public function getValuesForChoices(array $entities)
*
* @see ChoiceListInterface
*
* @deprecated Deprecated since version 2.4, to be removed in 3.0.
* @deprecated since version 2.4, to be removed in 3.0.
*/
public function getIndicesForChoices(array $entities)
{
Expand Down Expand Up @@ -340,7 +340,7 @@ public function getIndicesForChoices(array $entities)
*
* @see ChoiceListInterface
*
* @deprecated Deprecated since version 2.4, to be removed in 3.0.
* @deprecated since version 2.4, to be removed in 3.0.
*/
public function getIndicesForValues(array $values)
{
Expand Down
5 changes: 3 additions & 2 deletions 5 src/Symfony/Bridge/Doctrine/Tests/DoctrineOrmTestCase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,19 @@

trigger_error('The '.__NAMESPACE__.'\DoctrineOrmTestCase class is deprecated since version 2.4 and will be removed in 3.0. Use Symfony\Bridge\Doctrine\Test\DoctrineTestHelper class instead.', E_USER_DEPRECATED);

use Doctrine\ORM\EntityManager;
use Symfony\Bridge\Doctrine\Test\DoctrineTestHelper;

/**
* Class DoctrineOrmTestCase.
*
* @deprecated Deprecated as of Symfony 2.3, to be removed in Symfony 3.0.
* @deprecated since version 2.4, to be removed in 3.0.
* Use {@link DoctrineTestHelper} instead.
*/
abstract class DoctrineOrmTestCase extends \PHPUnit_Framework_TestCase
{
/**
* @return \Doctrine\ORM\EntityManager
* @return EntityManager
*/
public static function createTestEntityManager()
{
Expand Down
6 changes: 3 additions & 3 deletions 6 src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ public function getValuesForChoices(array $models)
/**
* {@inheritdoc}
*
* @deprecated Deprecated since version 2.4, to be removed in 3.0.
* @deprecated since version 2.4, to be removed in 3.0.
*/
public function getIndicesForChoices(array $models)
{
Expand All @@ -321,7 +321,7 @@ public function getIndicesForChoices(array $models)
* but if they originated from different queries, there are not the same object within the code.
*
* This happens when using m:n relations with either sides model as data_class of the form.
* The choicelist will retrieve the list of available related models with a different query, resulting in different objects.
* The choice list will retrieve the list of available related models with a different query, resulting in different objects.
*/
$choices = $this->fixChoices($models);
foreach ($choices as $i => $givenChoice) {
Expand All @@ -348,7 +348,7 @@ public function getIndicesForChoices(array $models)
/**
* {@inheritdoc}
*
* @deprecated Deprecated since version 2.4, to be removed in 3.0.
* @deprecated since version 2.4, to be removed in 3.0.
*/
public function getIndicesForValues(array $values)
{
Expand Down
4 changes: 2 additions & 2 deletions 4 src/Symfony/Bridge/Swiftmailer/DataCollector/MessageDataCollector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
* @author Fabien Potencier <fabien@symfony.com>
* @author Clément JOBEILI <clement.jobeili@gmail.com>
*
* @deprecated Deprecated since version 2.4, to be removed in 3.0. Use
* MessageDataCollector of SwiftmailerBundle instead.
* @deprecated since version 2.4, to be removed in 3.0.
* Use the MessageDataCollector from SwiftmailerBundle instead.
*/
class MessageDataCollector extends DataCollector
{
Expand Down
2 changes: 1 addition & 1 deletion 2 src/Symfony/Bundle/FrameworkBundle/Command/RouterApacheDumperCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
/**
* RouterApacheDumperCommand.
*
* @deprecated Deprecated since version 2.5, to be removed in 3.0.
* @deprecated since version 2.5, to be removed in 3.0.
* The performance gains are minimal and it's very hard to replicate
* the behavior of PHP implementation.
*
Expand Down
4 changes: 2 additions & 2 deletions 4 src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,8 +267,8 @@ public function createFormBuilder($data = null, array $options = array())
*
* @return Request
*
* @deprecated Deprecated since version 2.4, to be removed in 3.0. Ask
* Symfony to inject the Request object into your controller
* @deprecated since version 2.4, to be removed in 3.0.
* Ask Symfony to inject the Request object into your controller
* method instead by type hinting it in the method's signature.
*/
public function getRequest()
Expand Down
2 changes: 1 addition & 1 deletion 2 src/Symfony/Bundle/FrameworkBundle/HttpCache/HttpCache.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ protected function createSurrogate()
*
* @return Esi
*
* @deprecated Deprecated since version 2.6, to be removed in 3.0. Use createSurrogate() instead
* @deprecated since version 2.6, to be removed in 3.0. Use createSurrogate() instead
*/
protected function createEsi()
{
Expand Down
3 changes: 2 additions & 1 deletion 3 src/Symfony/Bundle/FrameworkBundle/Templating/Debugger.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
*
* @author Fabien Potencier <fabien@symfony.com>
*
* @deprecated Deprecated in 2.4, to be removed in 3.0. Use Psr\Log\LoggerInterface instead.
* @deprecated since version 2.4, to be removed in 3.0.
* Use Psr\Log\LoggerInterface instead.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should stay on a single line IMO

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Everywhere?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will change them in the end when the final review is OK.

*/
class Debugger implements DebuggerInterface
{
Expand Down
3 changes: 2 additions & 1 deletion 3 src/Symfony/Bundle/FrameworkBundle/Templating/GlobalVariables.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ public function __construct(ContainerInterface $container)
/**
* Returns the security context service.
*
* @deprecated Deprecated since version 2.6, to be removed in 3.0.
* @deprecated since version 2.6, to be removed in 3.0.
*
* @return SecurityContext|null The security context
*/
public function getSecurity()
Expand Down
4 changes: 2 additions & 2 deletions 4 src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,8 @@ public function end(FormView $view, array $variables = array())
*
* @return string The HTML markup
*
* @deprecated Deprecated since version 2.3, to be removed in 3.0. Use
* {@link start} instead.
* @deprecated since version 2.3, to be removed in 3.0.
* Use {@link start} instead.
*/
public function enctype(FormView $view)
{
Expand Down
2 changes: 1 addition & 1 deletion 2 src/Symfony/Bundle/TwigBundle/Extension/ActionsExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
*
* @author Fabien Potencier <fabien@symfony.com>
*
* @deprecated Deprecated in 2.2, to be removed in 3.0.
* @deprecated since version 2.2, to be removed in 3.0.
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@stof @fabpot is the class still considered deprecated or only the construct method arguments?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like it is as per b957f44. The strange thing is the introduced deprecation notice in the construct method saying passing a ContainerInterface instance is deprecated since version 2.7 and will be removed in 3.0. The whole class is already deprecated and will be removed in 3.0, which is confusing.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The whole class was deprecated in 2.2. I changed the constructor argument in 2.7. But anyway, nobody should use this class and it will be removed in 3.0. See #13233

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok thanks.

*/
class ActionsExtension extends \Twig_Extension
{
Expand Down
3 changes: 2 additions & 1 deletion 3 src/Symfony/Component/ClassLoader/DebugClassLoader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
*
* @api
*
* @deprecated Deprecated since version 2.4, to be removed in 3.0. Use the DebugClassLoader provided by the Debug component instead.
* @deprecated since version 2.4, to be removed in 3.0.
* Use {@link \Symfony\Component\Debug\DebugClassLoader} instead.
*/
class DebugClassLoader
{
Expand Down
3 changes: 2 additions & 1 deletion 3 src/Symfony/Component/ClassLoader/UniversalClassLoader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@
*
* @api
*
* @deprecated Deprecated since version 2.4, to be removed in 3.0. Use the ClassLoader class instead.
* @deprecated since version 2.4, to be removed in 3.0.
* Use the {@link ClassLoader} class instead.
*/
class UniversalClassLoader
{
Expand Down
3 changes: 2 additions & 1 deletion 3 src/Symfony/Component/Config/Definition/ReferenceDumper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
use Symfony\Component\Config\Definition\Dumper\YamlReferenceDumper;

/**
* @deprecated Deprecated since version 2.4, to be removed in 3.0. Use Symfony\Component\Config\Definition\Dumper\YamlReferenceDumper instead.
* @deprecated since version 2.4, to be removed in 3.0.
* Use {@link \Symfony\Component\Config\Definition\Dumper\YamlReferenceDumper} instead.
*/
class ReferenceDumper extends YamlReferenceDumper
{
Expand Down
4 changes: 2 additions & 2 deletions 4 src/Symfony/Component/Console/Application.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -624,7 +624,7 @@ public static function getAbbreviations($names)
*
* @return string A string representing the Application
*
* @deprecated Deprecated since version 2.3, to be removed in 3.0.
* @deprecated since version 2.3, to be removed in 3.0.
*/
public function asText($namespace = null, $raw = false)
{
Expand All @@ -645,7 +645,7 @@ public function asText($namespace = null, $raw = false)
*
* @return string|\DOMDocument An XML string representing the Application
*
* @deprecated Deprecated since version 2.3, to be removed in 3.0.
* @deprecated since version 2.3, to be removed in 3.0.
*/
public function asXml($namespace = null, $asDom = false)
{
Expand Down
4 changes: 2 additions & 2 deletions 4 src/Symfony/Component/Console/Command/Command.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -605,7 +605,7 @@ public function getHelper($name)
*
* @return string A string representing the command
*
* @deprecated Deprecated since version 2.3, to be removed in 3.0.
* @deprecated since version 2.3, to be removed in 3.0.
*/
public function asText()
{
Expand All @@ -625,7 +625,7 @@ public function asText()
*
* @return string|\DOMDocument An XML string representing the command
*
* @deprecated Deprecated since version 2.3, to be removed in 3.0.
* @deprecated since version 2.3, to be removed in 3.0.
*/
public function asXml($asDom = false)
{
Expand Down
2 changes: 1 addition & 1 deletion 2 src/Symfony/Component/Console/Helper/DialogHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
*
* @author Fabien Potencier <fabien@symfony.com>
*
* @deprecated Deprecated since version 2.5, to be removed in 3.0.
* @deprecated since version 2.5, to be removed in 3.0.
* Use {@link \Symfony\Component\Console\Helper\QuestionHelper} instead.
*/
class DialogHelper extends InputAwareHelper
Expand Down
3 changes: 2 additions & 1 deletion 3 src/Symfony/Component/Console/Helper/ProgressHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
* @author Chris Jones <leeked@gmail.com>
* @author Fabien Potencier <fabien@symfony.com>
*
* @deprecated Deprecated since version 2.5, to be removed in 3.0; use ProgressBar instead.
* @deprecated since version 2.5, to be removed in 3.0
* Use {@link ProgressBar} instead.
*/
class ProgressHelper extends Helper
{
Expand Down
3 changes: 2 additions & 1 deletion 3 src/Symfony/Component/Console/Helper/TableHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
* @author Саша Стаменковић <umpirsky@gmail.com>
* @author Fabien Potencier <fabien@symfony.com>
*
* @deprecated Deprecated since version 2.5, to be removed in 3.0; use Table instead.
* @deprecated since version 2.5, to be removed in 3.0
* Use {@link Table} instead.
*/
class TableHelper extends Helper
{
Expand Down
4 changes: 2 additions & 2 deletions 4 src/Symfony/Component/Console/Input/InputDefinition.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@ public function getSynopsis()
*
* @return string A string representing the InputDefinition
*
* @deprecated Deprecated since version 2.3, to be removed in 3.0.
* @deprecated since version 2.3, to be removed in 3.0.
*/
public function asText()
{
Expand All @@ -437,7 +437,7 @@ public function asText()
*
* @return string|\DOMDocument An XML string representing the InputDefinition
*
* @deprecated Deprecated since version 2.3, to be removed in 3.0.
* @deprecated since version 2.3, to be removed in 3.0.
*/
public function asXml($asDom = false)
{
Expand Down
2 changes: 1 addition & 1 deletion 2 src/Symfony/Component/Debug/DebugClassLoader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ public static function disable()
*
* @return string|null
*
* @deprecated Deprecated since version 2.5, to be removed in 3.0.
* @deprecated since version 2.5, to be removed in 3.0.
*/
public function findFile($class)
{
Expand Down
12 changes: 6 additions & 6 deletions 12 src/Symfony/Component/DependencyInjection/Definition.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ public function getFactory()
* @return Definition The current instance
*
* @api
* @deprecated Deprecated since version 2.6, to be removed in 3.0.
* @deprecated since version 2.6, to be removed in 3.0.
*/
public function setFactoryClass($factoryClass)
{
Expand All @@ -111,7 +111,7 @@ public function setFactoryClass($factoryClass)
* @return string|null The factory class name
*
* @api
* @deprecated Deprecated since version 2.6, to be removed in 3.0.
* @deprecated since version 2.6, to be removed in 3.0.
*/
public function getFactoryClass()
{
Expand All @@ -128,7 +128,7 @@ public function getFactoryClass()
* @return Definition The current instance
*
* @api
* @deprecated Deprecated since version 2.6, to be removed in 3.0.
* @deprecated since version 2.6, to be removed in 3.0.
*/
public function setFactoryMethod($factoryMethod)
{
Expand Down Expand Up @@ -180,7 +180,7 @@ public function getDecoratedService()
* @return string|null The factory method name
*
* @api
* @deprecated Deprecated since version 2.6, to be removed in 3.0.
* @deprecated since version 2.6, to be removed in 3.0.
*/
public function getFactoryMethod()
{
Expand All @@ -197,7 +197,7 @@ public function getFactoryMethod()
* @return Definition The current instance
*
* @api
* @deprecated Deprecated since version 2.6, to be removed in 3.0.
* @deprecated since version 2.6, to be removed in 3.0.
*/
public function setFactoryService($factoryService)
{
Expand All @@ -214,7 +214,7 @@ public function setFactoryService($factoryService)
* @return string|null The factory service id
*
* @api
* @deprecated Deprecated since version 2.6, to be removed in 3.0.
* @deprecated since version 2.6, to be removed in 3.0.
*/
public function getFactoryService()
{
Expand Down
3 changes: 2 additions & 1 deletion 3 src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1402,7 +1402,8 @@ public function dumpParameter($name)
}

/**
* @deprecated Deprecated since version 2.6.2, to be removed in 3.0. Use Symfony\Component\DependencyInjection\ContainerBuilder::addExpressionLanguageProvider instead.
* @deprecated since version 2.6.2, to be removed in 3.0.
* Use \Symfony\Component\DependencyInjection\ContainerBuilder::addExpressionLanguageProvider instead.
*
* @param ExpressionFunctionProviderInterface $provider
*/
Expand Down
2 changes: 1 addition & 1 deletion 2 src/Symfony/Component/DependencyInjection/SimpleXMLElement.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
*
* @author Fabien Potencier <fabien@symfony.com>
*
* @deprecated Deprecated since version 2.5, to be removed in 3.0.
* @deprecated since version 2.5, to be removed in 3.0.
*/
class SimpleXMLElement extends \SimpleXMLElement
{
Expand Down
4 changes: 2 additions & 2 deletions 4 src/Symfony/Component/EventDispatcher/Event.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ public function setDispatcher(EventDispatcherInterface $dispatcher)
*/
public function getDispatcher()
{
trigger_error('The '.__METHOD__.' and '.__CLASS__.'::setDispatcher methods are deprecated since version 2.4 and will be removed in 3.0. The event dispatcher instance can be received in the listener call instead.', E_USER_DEPRECATED);
trigger_error('The '.__METHOD__.' method is deprecated since version 2.4 and will be removed in 3.0. The event dispatcher instance can be received in the listener call instead.', E_USER_DEPRECATED);

return $this->dispatcher;
}
Expand All @@ -113,7 +113,7 @@ public function getDispatcher()
*/
public function getName()
{
trigger_error('The '.__METHOD__.' and '.__CLASS__.'::setName methods are deprecated since version 2.4 and will be removed in 3.0. The event name can be received in the listener call instead.', E_USER_DEPRECATED);
trigger_error('The '.__METHOD__.' method is deprecated since version 2.4 and will be removed in 3.0. The event name can be received in the listener call instead.', E_USER_DEPRECATED);

return $this->name;
}
Expand Down
6 changes: 3 additions & 3 deletions 6 src/Symfony/Component/Form/ButtonBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -592,12 +592,12 @@ public function getByReference()
*
* @return bool Always returns false.
*
* @deprecated since version 2.3, to be removed in 3.0. Use
* {@link getInheritData()} instead.
* @deprecated since version 2.3, to be removed in 3.0.
* Use {@link getInheritData()} instead.
*/
public function getVirtual()
{
trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0. Use FormConfigBuilder::getInheritData() instead.', E_USER_DEPRECATED);
trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0. Use the Symfony\Component\Form\FormConfigBuilder::getInheritData method instead.', E_USER_DEPRECATED);

return false;
}
Expand Down
4 changes: 2 additions & 2 deletions 4 src/Symfony/Component/Form/Exception/AlreadyBoundException.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
/**
* Alias of {@link AlreadySubmittedException}.
*
* @deprecated Deprecated since version 2.3, to be removed in 3.0. Use
* {@link AlreadySubmittedException} instead.
* @deprecated since version 2.3, to be removed in 3.0.
* Use {@link AlreadySubmittedException} instead.
*/
class AlreadyBoundException extends LogicException
{
Expand Down
Loading
Morty Proxy This is a proxified and sanitized view of the page, visit original site.