[Form] Adds a way to trigger deprecation notice on demand for VirtualFormAwareIterator class.

Hugo Hamon · Hugo Hamon · commit a7f841e8542d · 2015-01-05T16:02:26.000+01:00
diff --git a/src/Symfony/Component/Form/Util/InheritDataAwareIterator.php b/src/Symfony/Component/Form/Util/InheritDataAwareIterator.php
@@ -25,4 +25,10 @@
  */
 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
@@ -11,8 +11,6 @@
 
 namespace Symfony\Component\Form\Util;
 
-trigger_error('The '.__NAMESPACE__.'\VirtualFormAwareIterator 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);
-
 /**
  * Iterator that traverses an array of forms.
  *
@@ -27,6 +25,21 @@
  */
 class VirtualFormAwareIterator extends \IteratorIterator implements \RecursiveIterator
 {
+    public function __construct(\Traversable $iterator, $triggerDeprecationNotice = true)
+    {
+        /**
+         * 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) {
+            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);
+        }
+
+        parent::__construct($iterator);
+    }
+
     /**
      * {@inheritdoc}
      */

Original file line number	Diff line number	Diff line change
`@@ -25,4 +25,10 @@`
`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`	`+ }`
`28`	`34`	`}`