Fixes more deprecation notices as per @stof review.

Hugo Hamon · Hugo Hamon · commit f9fbb4f55ea2 · 2015-01-05T16:02:28.000+01:00
diff --git a/src/Symfony/Bundle/TwigBundle/Extension/ActionsExtension.php b/src/Symfony/Bundle/TwigBundle/Extension/ActionsExtension.php
@@ -11,8 +11,6 @@
 
 namespace Symfony\Bundle\TwigBundle\Extension;
 
-trigger_error('The '.__NAMESPACE__.'\ActionsExtension class is deprecated since version 2.2 and will be removed in Symfony 3.0.', E_USER_DEPRECATED);
-
 use Symfony\Bundle\TwigBundle\TokenParser\RenderTokenParser;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpKernel\Fragment\FragmentHandler;
@@ -31,14 +29,14 @@ class ActionsExtension extends \Twig_Extension
     /**
      * @param FragmentHandler|ContainerInterface $handler
      *
-     * @deprecated Passing a ContainerInterface as a first argument is deprecated as of 2.7 and will be removed in 3.0.
+     * @deprecated Passing a ContainerInterface as a first argument is deprecated since 2.7 and will be removed in 3.0.
      */
     public function __construct($handler)
     {
         if ($handler instanceof FragmentHandler) {
             $this->handler = $handler;
         } elseif ($handler instanceof ContainerInterface) {
-            trigger_error(sprintf('The ability to pass a ContainerInterface instance as a first argument to %s was deprecated in 2.7 and will be removed in 3.0. Please, pass a FragmentHandler instance instead.', __METHOD__), E_USER_DEPRECATED);
+            trigger_error('The ability to pass a ContainerInterface instance as a first argument to '.__METHOD__.' method is deprecated since version 2.7 and will be removed in 3.0. Pass a FragmentHandler instance instead.', E_USER_DEPRECATED);
 
             $this->handler = $handler->get('fragment.handler');
         } else {
diff --git a/src/Symfony/Bundle/TwigBundle/TwigEngine.php b/src/Symfony/Bundle/TwigBundle/TwigEngine.php
@@ -42,23 +42,23 @@ public function __construct(\Twig_Environment $environment, TemplateNameParserIn
     }
 
     /**
-     * @deprecated since version 2.3, to be removed in 3.0.
+     * @deprecated since version 2.7, to be removed in 3.0.
      *             Inject the escaping strategy on \Twig_Environment instead.
      */
     public function setDefaultEscapingStrategy($strategy)
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0. Inject the escaping strategy in the Twig_Environment object instead.', E_USER_DEPRECATED);
+        trigger_error('The '.__METHOD__.' method is deprecated since version 2.7 and will be removed in 3.0. Inject the escaping strategy in the Twig_Environment object instead.', E_USER_DEPRECATED);
 
         $this->environment->getExtension('escaper')->setDefaultStrategy($strategy);
     }
 
     /**
-     * @deprecated since version 2.3, to be removed in 3.0.
+     * @deprecated since version 2.7, to be removed in 3.0.
      *             Use TwigDefaultEscapingStrategy instead.
      */
     public function guessDefaultEscapingStrategy($filename)
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0. Use the Symfony\Bundle\TwigBundle\TwigDefaultEscapingStrategy::guess method instead.', E_USER_DEPRECATED);
+        trigger_error('The '.__METHOD__.' method is deprecated since version 2.7 and will be removed in 3.0. Use the Symfony\Bundle\TwigBundle\TwigDefaultEscapingStrategy::guess method instead.', E_USER_DEPRECATED);
 
         return TwigDefaultEscapingStrategy::guess($filename);
     }
diff --git a/src/Symfony/Component/Form/Util/InheritDataAwareIterator.php b/src/Symfony/Component/Form/Util/InheritDataAwareIterator.php
@@ -25,10 +25,4 @@
  */
 class InheritDataAwareIterator extends VirtualFormAwareIterator
 {
-    public function __construct(\Traversable $iterator)
-    {
-        // Do not trigger deprecation notice in parent construct method
-        // when using this class instead of the deprecated parent one.
-        parent::__construct($iterator, false);
-    }
 }
diff --git a/src/Symfony/Component/Form/Util/VirtualFormAwareIterator.php b/src/Symfony/Component/Form/Util/VirtualFormAwareIterator.php
@@ -25,15 +25,15 @@
  */
 class VirtualFormAwareIterator extends \IteratorIterator implements \RecursiveIterator
 {
-    public function __construct(\Traversable $iterator, $triggerDeprecationNotice = true)
+    public function __construct(\Traversable $iterator)
     {
-        /**
+        /*
          * Prevent to trigger deprecation notice when already using the
          * InheritDataAwareIterator class that extends this deprecated one.
          * The {@link Symfony\Component\Form\Util\InheritDataAwareIterator::__construct} method
          * forces this argument to false.
          */
-        if ($triggerDeprecationNotice) {
+        if (__CLASS__ === get_class($this)) {
             trigger_error('The '.__CLASS__.' class is deprecated since version 2.3 and will be removed in 3.0. Use the Symfony\Component\Form\Util\InheritDataAwareIterator class instead.', E_USER_DEPRECATED);
         }
 
diff --git a/src/Symfony/Component/Validator/Context/ExecutionContext.php b/src/Symfony/Component/Validator/Context/ExecutionContext.php
@@ -187,8 +187,6 @@ public function addViolation($message, array $parameters = array(), $invalidValu
         // API, as they are not present in the new interface anymore.
         // You should use buildViolation() instead.
         if (func_num_args() > 2) {
-            trigger_error('The parameters $invalidValue, $plural and $code in method '.__METHOD__.' are deprecated since version 2.5 and will be removed in 3.0. Use the '.__CLASS__.'::buildViolation method instead.', E_USER_DEPRECATED);
-
             throw new BadMethodCallException(
                 'The parameters $invalidValue, $plural and $code are '.
                 'not supported anymore as of Symfony 2.5. Please use '.
@@ -288,11 +286,7 @@ public function getGroup()
      */
     public function getClassName()
     {
-        if ($this->metadata instanceof ClassBasedInterface) {
-            return $this->metadata->getClassName();
-        }
-
-        return null;
+        return $this->metadata instanceof ClassBasedInterface ? $this->metadata->getClassName() : null;
     }
 
     /**
diff --git a/src/Symfony/Component/Validator/ExecutionContextInterface.php b/src/Symfony/Component/Validator/ExecutionContextInterface.php
@@ -99,9 +99,7 @@ interface ExecutionContextInterface
      *
      * @api
      *
-     * @deprecated since version 2.5.
-     *             The parameters $invalidValue, $plural and $code will be removed
-     *             in 3.0.
+     * @deprecated the parameters $invalidValue, $plural and $code are deprecated since version 2.5 and will be removed in 3.0.
      */
     public function addViolation($message, array $params = array(), $invalidValue = null, $plural = null, $code = null);
 
diff --git a/src/Symfony/Component/Yaml/Yaml.php b/src/Symfony/Component/Yaml/Yaml.php
@@ -46,9 +46,7 @@ class Yaml
      *
      * @throws ParseException If the YAML is not valid
      *
-     * @deprecated since version 2.2, to be removed in 3.0.
-     *             The ability to pass file names to the parse() method is
-     *             deprecated. Pass the YAML contents of the file instead.
+     * @deprecated The ability to pass file names to the Yaml::parse method is deprecated since version 2.2 and will be removed in 3.0. Pass the YAML contents of the file instead.
      *
      * @api
      */

Original file line number	Diff line number	Diff line change
`@@ -42,23 +42,23 @@ public function __construct(\Twig_Environment $environment, TemplateNameParserIn`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`/**`
`45`		`- * @deprecated since version 2.3, to be removed in 3.0.`
	`45`	`+ * @deprecated since version 2.7, to be removed in 3.0.`
`46`	`46`	`* Inject the escaping strategy on \Twig_Environment instead.`
`47`	`47`	`*/`
`48`	`48`	`public function setDefaultEscapingStrategy($strategy)`
`49`	`49`	`{`
`50`		`- trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0. Inject the escaping strategy in the Twig_Environment object instead.', E_USER_DEPRECATED);`
	`50`	`+ trigger_error('The '.__METHOD__.' method is deprecated since version 2.7 and will be removed in 3.0. Inject the escaping strategy in the Twig_Environment object instead.', E_USER_DEPRECATED);`
`51`	`51`
`52`	`52`	`$this->environment->getExtension('escaper')->setDefaultStrategy($strategy);`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`/**`
`56`		`- * @deprecated since version 2.3, to be removed in 3.0.`
	`56`	`+ * @deprecated since version 2.7, to be removed in 3.0.`
`57`	`57`	`* Use TwigDefaultEscapingStrategy instead.`
`58`	`58`	`*/`
`59`	`59`	`public function guessDefaultEscapingStrategy($filename)`
`60`	`60`	`{`
`61`		`- trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0. Use the Symfony\Bundle\TwigBundle\TwigDefaultEscapingStrategy::guess method instead.', E_USER_DEPRECATED);`
	`61`	`+ trigger_error('The '.__METHOD__.' method is deprecated since version 2.7 and will be removed in 3.0. Use the Symfony\Bundle\TwigBundle\TwigDefaultEscapingStrategy::guess method instead.', E_USER_DEPRECATED);`
`62`	`62`
`63`	`63`	`return TwigDefaultEscapingStrategy::guess($filename);`
`64`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,10 +25,4 @@`
`25`	`25`	`*/`
`26`	`26`	`class InheritDataAwareIterator extends VirtualFormAwareIterator`
`27`	`27`	`{`
`28`		`- public function __construct(\Traversable $iterator)`
`29`		`- {`
`30`		`- // Do not trigger deprecation notice in parent construct method`
`31`		`- // when using this class instead of the deprecated parent one.`
`32`		`- parent::__construct($iterator, false);`
`33`		`- }`
`34`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,15 +25,15 @@`
`25`	`25`	`*/`
`26`	`26`	`class VirtualFormAwareIterator extends \IteratorIterator implements \RecursiveIterator`
`27`	`27`	`{`
`28`		`- public function __construct(\Traversable $iterator, $triggerDeprecationNotice = true)`
	`28`	`+ public function __construct(\Traversable $iterator)`
`29`	`29`	`{`
`30`		`- /**`
	`30`	`+ /*`
`31`	`31`	`* Prevent to trigger deprecation notice when already using the`
`32`	`32`	`* InheritDataAwareIterator class that extends this deprecated one.`
`33`	`33`	`* The {@link Symfony\Component\Form\Util\InheritDataAwareIterator::__construct} method`
`34`	`34`	`* forces this argument to false.`
`35`	`35`	`*/`
`36`		`- if ($triggerDeprecationNotice) {`
	`36`	`+ if (__CLASS__ === get_class($this)) {`
`37`	`37`	`trigger_error('The '.__CLASS__.' class is deprecated since version 2.3 and will be removed in 3.0. Use the Symfony\Component\Form\Util\InheritDataAwareIterator class instead.', E_USER_DEPRECATED);`
`38`	`38`	`}`
`39`	`39`
Original file line number	Diff line number	Diff line change
`@@ -99,9 +99,7 @@ interface ExecutionContextInterface`
`99`	`99`	`*`
`100`	`100`	`* @api`
`101`	`101`	`*`
`102`		`- * @deprecated since version 2.5.`
`103`		`- * The parameters $invalidValue, $plural and $code will be removed`
`104`		`- * in 3.0.`
	`102`	`+ * @deprecated the parameters $invalidValue, $plural and $code are deprecated since version 2.5 and will be removed in 3.0.`
`105`	`103`	`*/`
`106`	`104`	`public function addViolation($message, array $params = array(), $invalidValue = null, $plural = null, $code = null);`
`107`	`105`
Original file line number	Diff line number	Diff line change
`@@ -46,9 +46,7 @@ class Yaml`
`46`	`46`	`*`
`47`	`47`	`* @throws ParseException If the YAML is not valid`
`48`	`48`	`*`
`49`		`- * @deprecated since version 2.2, to be removed in 3.0.`
`50`		`- * The ability to pass file names to the parse() method is`
`51`		`- * deprecated. Pass the YAML contents of the file instead.`
	`49`	`+ * @deprecated The ability to pass file names to the Yaml::parse method is deprecated since version 2.2 and will be removed in 3.0. Pass the YAML contents of the file instead.`
`52`	`50`	`*`
`53`	`51`	`* @api`
`54`	`52`	`*/`