bug #14258 [Form] Cleanup deprecation notices (nicolas-grekas)

webmozart · webmozart · commit 94eb3841633d · 2015-04-08T11:34:58.000+02:00
This PR was merged into the 2.7 branch. Discussion ---------- [Form] Cleanup deprecation notices | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - This uses the same technique used for FlattenException in HttpKernel that prevents repeated notices triggered by the constructor. Commits ------- 3f58862 [Form] Cleanup deprecation notices
diff --git a/src/Symfony/Component/Form/ChoiceList/View/ChoiceView.php b/src/Symfony/Component/Form/ChoiceList/View/ChoiceView.php
@@ -9,16 +9,17 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Form\ChoiceList\View;
-
-use Symfony\Component\Form\Extension\Core\View\ChoiceView as LegacyChoiceView;
+namespace Symfony\Component\Form\Extension\Core\View;
 
 /**
  * Represents a choice in templates.
  *
  * @author Bernhard Schussek <bschussek@gmail.com>
+ *
+ * @deprecated since version 2.7, to be removed in 3.0.
+ *             Use {@link \Symfony\Component\Form\ChoiceList\View\ChoiceView} instead.
  */
-class ChoiceView extends LegacyChoiceView
+class ChoiceView
 {
     /**
      * The label displayed to humans.
@@ -41,6 +42,32 @@ class ChoiceView extends LegacyChoiceView
      */
     public $data;
 
+    /**
+     * Creates a new ChoiceView.
+     *
+     * @param mixed  $data  The original choice.
+     * @param string $value The view representation of the choice.
+     * @param string $label The label displayed to humans.
+     */
+    public function __construct($data, $value, $label)
+    {
+        $this->data = $data;
+        $this->value = $value;
+        $this->label = $label;
+    }
+}
+
+namespace Symfony\Component\Form\ChoiceList\View;
+
+use Symfony\Component\Form\Extension\Core\View\ChoiceView as LegacyChoiceView;
+
+/**
+ * Represents a choice in templates.
+ *
+ * @author Bernhard Schussek <bschussek@gmail.com>
+ */
+class ChoiceView extends LegacyChoiceView
+{
     /**
      * Additional attributes for the HTML tag.
      *
@@ -58,9 +85,8 @@ class ChoiceView extends LegacyChoiceView
      */
     public function __construct($label, $value, $data, array $attr = array())
     {
-        $this->label = $label;
-        $this->value = $value;
-        $this->data = $data;
+        parent::__construct($data, $value, $label);
+
         $this->attr = $attr;
     }
 }
diff --git a/src/Symfony/Component/Form/Extension/Core/ChoiceList/ChoiceList.php b/src/Symfony/Component/Form/Extension/Core/ChoiceList/ChoiceList.php
@@ -34,7 +34,7 @@
  *
  * @author Bernhard Schussek <bschussek@gmail.com>
  *
- * @deprecated Deprecated since Symfony 2.7, to be removed in Symfony 3.0.
+ * @deprecated since version 2.7, to be removed in 3.0.
  *             Use {@link \Symfony\Component\Form\ChoiceList\ArrayChoiceList} instead.
  */
 class ChoiceList implements ChoiceListInterface
diff --git a/src/Symfony/Component/Form/Extension/Core/ChoiceList/ChoiceListInterface.php b/src/Symfony/Component/Form/Extension/Core/ChoiceList/ChoiceListInterface.php
@@ -28,7 +28,7 @@
  *
  * @author Bernhard Schussek <bschussek@gmail.com>
  *
- * @deprecated Deprecated since Symfony 2.7, to be removed in Symfony 3.0.
+ * @deprecated since version 2.7, to be removed in 3.0.
  *             Use {@link BaseChoiceListInterface} instead.
  */
 interface ChoiceListInterface extends BaseChoiceListInterface
diff --git a/src/Symfony/Component/Form/Extension/Core/ChoiceList/LazyChoiceList.php b/src/Symfony/Component/Form/Extension/Core/ChoiceList/LazyChoiceList.php
@@ -22,9 +22,8 @@
  *
  * @author Bernhard Schussek <bschussek@gmail.com>
  *
- * @deprecated Deprecated since Symfony 2.7, to be removed in Symfony 3.0.
- *             Use {@link \Symfony\Component\Form\ChoiceList\LazyChoiceList}
- *             instead.
+ * @deprecated since version 2.7, to be removed in 3.0.
+ *             Use {@link \Symfony\Component\Form\ChoiceList\LazyChoiceList} instead.
  */
 abstract class LazyChoiceList implements ChoiceListInterface
 {
diff --git a/src/Symfony/Component/Form/Extension/Core/ChoiceList/ObjectChoiceList.php b/src/Symfony/Component/Form/Extension/Core/ChoiceList/ObjectChoiceList.php
@@ -33,9 +33,8 @@
  *
  * @author Bernhard Schussek <bschussek@gmail.com>
  *
- * @deprecated Deprecated since Symfony 2.7, to be removed in Symfony 3.0.
- *             Use {@link \Symfony\Component\Form\ChoiceList\ArrayChoiceList}
- *             instead.
+ * @deprecated since Symfony 2.7, to be removed in version 3.0.
+ *             Use {@link \Symfony\Component\Form\ChoiceList\ArrayChoiceList} instead.
  */
 class ObjectChoiceList extends ChoiceList
 {
diff --git a/src/Symfony/Component/Form/Extension/Core/ChoiceList/SimpleChoiceList.php b/src/Symfony/Component/Form/Extension/Core/ChoiceList/SimpleChoiceList.php
@@ -29,9 +29,8 @@
  *
  * @author Bernhard Schussek <bschussek@gmail.com>
  *
- * @deprecated Deprecated since Symfony 2.7, to be removed in Symfony 3.0.
- *             Use {@link \Symfony\Component\Form\ChoiceList\ArrayChoiceList}
- *             instead.
+ * @deprecated since version 2.7, to be removed in 3.0.
+ *             Use {@link \Symfony\Component\Form\ChoiceList\ArrayChoiceList} instead.
  */
 class SimpleChoiceList extends ChoiceList
 {
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoiceToBooleanArrayTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoiceToBooleanArrayTransformer.php
@@ -18,9 +18,8 @@
 /**
  * @author Bernhard Schussek <bschussek@gmail.com>
  *
- * @deprecated Deprecated since Symfony 2.7, to be removed in Symfony 3.0.
- *             Use {@link \Symfony\Component\Form\ChoiceList\LazyChoiceList}
- *             instead.
+ * @deprecated since version 2.7, to be removed in 3.0.
+ *             Use {@link \Symfony\Component\Form\ChoiceList\LazyChoiceList} instead.
  */
 class ChoiceToBooleanArrayTransformer implements DataTransformerInterface
 {
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoicesToBooleanArrayTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoicesToBooleanArrayTransformer.php
@@ -18,9 +18,8 @@
 /**
  * @author Bernhard Schussek <bschussek@gmail.com>
  *
- * @deprecated Deprecated since Symfony 2.7, to be removed in Symfony 3.0.
- *             Use {@link \Symfony\Component\Form\ChoiceList\LazyChoiceList}
- *             instead.
+ * @deprecated since version 2.7, to be removed in 3.0.
+ *             Use {@link \Symfony\Component\Form\ChoiceList\LazyChoiceList} instead.
  */
 class ChoicesToBooleanArrayTransformer implements DataTransformerInterface
 {
diff --git a/src/Symfony/Component/Form/Extension/Core/EventListener/FixCheckboxInputListener.php b/src/Symfony/Component/Form/Extension/Core/EventListener/FixCheckboxInputListener.php
@@ -23,9 +23,8 @@
  *
  * @author Bernhard Schussek <bschussek@gmail.com>
  *
- * @deprecated Deprecated since Symfony 2.7, to be removed in Symfony 3.0.
- *             Use {@link \Symfony\Component\Form\Extension\Core\DataMapper\CheckboxListMapper}
- *             instead.
+ * @deprecated since version 2.7, to be removed in 3.0.
+ *             Use {@link \Symfony\Component\Form\Extension\Core\DataMapper\CheckboxListMapper} instead.
  */
 class FixCheckboxInputListener implements EventSubscriberInterface
 {
diff --git a/src/Symfony/Component/Form/Extension/Core/EventListener/FixRadioInputListener.php b/src/Symfony/Component/Form/Extension/Core/EventListener/FixRadioInputListener.php
@@ -22,9 +22,8 @@
  *
  * @author Bernhard Schussek <bschussek@gmail.com>
  *
- * @deprecated Deprecated since Symfony 2.7, to be removed in Symfony 3.0.
- *             Use {@link \Symfony\Component\Form\Extension\Core\DataMapper\RadioListMapper}
- *             instead.
+ * @deprecated since version 2.7, to be removed in 3.0.
+ *             Use {@link \Symfony\Component\Form\Extension\Core\DataMapper\RadioListMapper} instead.
  */
 class FixRadioInputListener implements EventSubscriberInterface
 {
diff --git a/src/Symfony/Component/Form/Extension/Core/View/ChoiceView.php b/src/Symfony/Component/Form/Extension/Core/View/ChoiceView.php
@@ -11,50 +11,14 @@
 
 namespace Symfony\Component\Form\Extension\Core\View;
 
+trigger_error('The '.__NAMESPACE__.'\ChoiceView class is deprecated since version 2.7 and will be removed in 3.0. Use Symfony\Component\Form\ChoiceList\View\ChoiceView instead.', E_USER_DEPRECATED);
+
 /**
  * Represents a choice in templates.
  *
  * @author Bernhard Schussek <bschussek@gmail.com>
  *
- * @deprecated Deprecated since Symfony 2.7, to be removed in Symfony 3.0.
+ * @deprecated since version 2.7, to be removed in 3.0.
  *             Use {@link \Symfony\Component\Form\ChoiceList\View\ChoiceView} instead.
  */
-class ChoiceView
-{
-    /**
-     * The original choice value.
-     *
-     * @var mixed
-     */
-    public $data;
-
-    /**
-     * The view representation of the choice.
-     *
-     * @var string
-     */
-    public $value;
-
-    /**
-     * The label displayed to humans.
-     *
-     * @var string
-     */
-    public $label;
-
-    /**
-     * Creates a new ChoiceView.
-     *
-     * @param mixed  $data  The original choice.
-     * @param string $value The view representation of the choice.
-     * @param string $label The label displayed to humans.
-     */
-    public function __construct($data, $value, $label)
-    {
-        $this->data = $data;
-        $this->value = $value;
-        $this->label = $label;
-
-        trigger_error('The '.__CLASS__.' class is deprecated since version 2.7 and will be removed in 3.0. Use Symfony\Component\Form\ChoiceList\View\ChoiceView instead.', E_USER_DEPRECATED);
-    }
-}
+class_exists('Symfony\Component\Form\ChoiceList\View\ChoiceView');
diff --git a/src/Symfony/Component/Form/FormTypeExtensionInterface.php b/src/Symfony/Component/Form/FormTypeExtensionInterface.php
@@ -64,7 +64,7 @@ public function finishView(FormView $view, FormInterface $form, array $options);
      *
      * @param OptionsResolverInterface $resolver The resolver for the options.
      *
-     * @deprecated Deprecated since Symfony 2.7, to be removed in Symfony 3.0.
+     * @deprecated since version 2.7, to be removed in 3.0.
      *             Use the method configureOptions instead. This method will be
      *             added to the FormTypeExtensionInterface with Symfony 3.0
      */
diff --git a/src/Symfony/Component/Form/FormTypeInterface.php b/src/Symfony/Component/Form/FormTypeInterface.php
@@ -73,7 +73,7 @@ public function finishView(FormView $view, FormInterface $form, array $options);
      *
      * @param OptionsResolverInterface $resolver The resolver for the options.
      *
-     * @deprecated Deprecated since Symfony 2.7, to be renamed in Symfony 3.0.
+     * @deprecated since version 2.7, to be renamed in 3.0.
      *             Use the method configureOptions instead. This method will be
      *             added to the FormTypeInterface with Symfony 3.0.
      */

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@`
`34`	`34`	`*`
`35`	`35`	`* @author Bernhard Schussek <[email protected]>`
`36`	`36`	`*`
`37`		`- * @deprecated Deprecated since Symfony 2.7, to be removed in Symfony 3.0.`
	`37`	`+ * @deprecated since version 2.7, to be removed in 3.0.`
`38`	`38`	`* Use {@link \Symfony\Component\Form\ChoiceList\ArrayChoiceList} instead.`
`39`	`39`	`*/`
`40`	`40`	`class ChoiceList implements ChoiceListInterface`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`*`
`29`	`29`	`* @author Bernhard Schussek <[email protected]>`
`30`	`30`	`*`
`31`		`- * @deprecated Deprecated since Symfony 2.7, to be removed in Symfony 3.0.`
	`31`	`+ * @deprecated since version 2.7, to be removed in 3.0.`
`32`	`32`	`* Use {@link BaseChoiceListInterface} instead.`
`33`	`33`	`*/`
`34`	`34`	`interface ChoiceListInterface extends BaseChoiceListInterface`
Original file line number	Diff line number	Diff line change
`@@ -22,9 +22,8 @@`
`22`	`22`	`*`
`23`	`23`	`* @author Bernhard Schussek <[email protected]>`
`24`	`24`	`*`
`25`		`- * @deprecated Deprecated since Symfony 2.7, to be removed in Symfony 3.0.`
`26`		`- * Use {@link \Symfony\Component\Form\ChoiceList\LazyChoiceList}`
`27`		`- * instead.`
	`25`	`+ * @deprecated since version 2.7, to be removed in 3.0.`
	`26`	`+ * Use {@link \Symfony\Component\Form\ChoiceList\LazyChoiceList} instead.`
`28`	`27`	`*/`
`29`	`28`	`abstract class LazyChoiceList implements ChoiceListInterface`
`30`	`29`	`{`
Original file line number	Diff line number	Diff line change
`@@ -33,9 +33,8 @@`
`33`	`33`	`*`
`34`	`34`	`* @author Bernhard Schussek <[email protected]>`
`35`	`35`	`*`
`36`		`- * @deprecated Deprecated since Symfony 2.7, to be removed in Symfony 3.0.`
`37`		`- * Use {@link \Symfony\Component\Form\ChoiceList\ArrayChoiceList}`
`38`		`- * instead.`
	`36`	`+ * @deprecated since Symfony 2.7, to be removed in version 3.0.`
	`37`	`+ * Use {@link \Symfony\Component\Form\ChoiceList\ArrayChoiceList} instead.`
`39`	`38`	`*/`
`40`	`39`	`class ObjectChoiceList extends ChoiceList`
`41`	`40`	`{`
Original file line number	Diff line number	Diff line change
`@@ -29,9 +29,8 @@`
`29`	`29`	`*`
`30`	`30`	`* @author Bernhard Schussek <[email protected]>`
`31`	`31`	`*`
`32`		`- * @deprecated Deprecated since Symfony 2.7, to be removed in Symfony 3.0.`
`33`		`- * Use {@link \Symfony\Component\Form\ChoiceList\ArrayChoiceList}`
`34`		`- * instead.`
	`32`	`+ * @deprecated since version 2.7, to be removed in 3.0.`
	`33`	`+ * Use {@link \Symfony\Component\Form\ChoiceList\ArrayChoiceList} instead.`
`35`	`34`	`*/`
`36`	`35`	`class SimpleChoiceList extends ChoiceList`
`37`	`36`	`{`
Original file line number	Diff line number	Diff line change
`@@ -18,9 +18,8 @@`
`18`	`18`	`/**`
`19`	`19`	`* @author Bernhard Schussek <[email protected]>`
`20`	`20`	`*`
`21`		`- * @deprecated Deprecated since Symfony 2.7, to be removed in Symfony 3.0.`
`22`		`- * Use {@link \Symfony\Component\Form\ChoiceList\LazyChoiceList}`
`23`		`- * instead.`
	`21`	`+ * @deprecated since version 2.7, to be removed in 3.0.`
	`22`	`+ * Use {@link \Symfony\Component\Form\ChoiceList\LazyChoiceList} instead.`
`24`	`23`	`*/`
`25`	`24`	`class ChoiceToBooleanArrayTransformer implements DataTransformerInterface`
`26`	`25`	`{`
Original file line number	Diff line number	Diff line change
`@@ -23,9 +23,8 @@`
`23`	`23`	`*`
`24`	`24`	`* @author Bernhard Schussek <[email protected]>`
`25`	`25`	`*`
`26`		`- * @deprecated Deprecated since Symfony 2.7, to be removed in Symfony 3.0.`
`27`		`- * Use {@link \Symfony\Component\Form\Extension\Core\DataMapper\CheckboxListMapper}`
`28`		`- * instead.`
	`26`	`+ * @deprecated since version 2.7, to be removed in 3.0.`
	`27`	`+ * Use {@link \Symfony\Component\Form\Extension\Core\DataMapper\CheckboxListMapper} instead.`
`29`	`28`	`*/`
`30`	`29`	`class FixCheckboxInputListener implements EventSubscriberInterface`
`31`	`30`	`{`