not use reflection to get value of FormType::$emptyData

peter-gribanov · Peter Gribanov · commit f1c43f9dea74 · 2021-11-18T18:52:52.000+03:00
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/FormType.php b/src/Symfony/Component/Form/Extension/Core/Type/FormType.php
@@ -30,7 +30,13 @@
 class FormType extends BaseType
 {
     private $dataMapper;
-    private static $emptyData = null;
+
+    /**
+     * @internal
+     *
+     * @deprecated Don't use this property. It will be removed in symfony/form 6.0
+     */
+    public static $emptyData = null;
 
     public function __construct(PropertyAccessorInterface $propertyAccessor = null)
     {
@@ -160,7 +166,7 @@ public function configureOptions(OptionsResolver $resolver)
         };
 
         // Derive "empty_data" closure from "data_class" option
-        if (self::$emptyData === null) {
+        if (null === self::$emptyData) {
             self::$emptyData = function (Options $options) {
                 $class = $options['data_class'];
 
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TextType.php b/src/Symfony/Component/Form/Extension/Core/Type/TextType.php
@@ -27,13 +27,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         // See https://github.com/symfony/symfony/issues/5906#issuecomment-203189375
         if ('' === $options['empty_data']) {
             $builder->addViewTransformer($this);
-        } elseif ($options['empty_data'] instanceof \Closure) {
-            $emptyData = new \ReflectionProperty(FormType::class, 'emptyData');
-            $emptyData->setAccessible(true);
-            // Closure in "empty_data" option is the default value from FormType::configureOptions()
-            if ($emptyData->getValue($builder->getForm()) === $options['empty_data']) {
-                trigger_deprecation('symfony/form', '5.4', 'The default value of "empty_data" option in "%s" will be changed to empty string. Declare "NULL" as value for "empty_data" if you still want use "NULL" as data.', __CLASS__);
-            }
+        } elseif (FormType::$emptyData === $options['empty_data']) {
+            // "empty_data" option is the default value from FormType::configureOptions()
+            trigger_deprecation('symfony/form', '5.4', 'The default value of "empty_data" option in "%s" will be changed to empty string. Declare "NULL" as value for "empty_data" if you still want use "NULL" as data.', __CLASS__);
         }
     }
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/BaseTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/BaseTypeTest.php
@@ -186,7 +186,7 @@ public function testPreferOwnLabelTranslationParameters()
             ])
             ->add('child', $this->getTestedType(), $this->getTestedTypeOptions() + [
                 'label_translation_parameters' => ['%override_param%' => 'child_value'],
-            ]))
+            ])
             ->getForm()
             ->createView();
 
@@ -203,7 +203,7 @@ public function testPreferOwnAttrTranslationParameters()
             ])
             ->add('child', $this->getTestedType(), $this->getTestedTypeOptions() + [
                 'attr_translation_parameters' => ['%override_param%' => 'child_value'],
-            ]))
+            ])
             ->getForm()
             ->createView();
 
@@ -292,7 +292,7 @@ protected function getTestedType()
         return static::TESTED_TYPE;
     }
 
-    protected function getTestedTypeOptions()
+    protected function getTestedTypeOptions(): array
     {
         return static::TESTED_TYPE_OPTIONS;
     }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/BirthdayTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/BirthdayTypeTest.php
@@ -19,8 +19,7 @@
 class BirthdayTypeTest extends DateTypeTest
 {
     public const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\BirthdayType';
-    public const TESTED_TYPE_OPTIONS = [
-    ];
+    public const TESTED_TYPE_OPTIONS = [];
 
     public function testSetInvalidYearsOption()
     {
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/EnumTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/EnumTypeTest.php
@@ -25,7 +25,9 @@
 final class EnumTypeTest extends BaseTypeTest
 {
     public const TESTED_TYPE = EnumType::class;
-    public const TESTED_TYPE_OPTIONS = ['class' => Suit::class];
+    public const TESTED_TYPE_OPTIONS = [
+        'class' => Suit::class,
+    ];
 
     public function testClassOptionIsRequired()
     {

Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,7 @@`
`19`	`19`	`class BirthdayTypeTest extends DateTypeTest`
`20`	`20`	`{`
`21`	`21`	`public const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\BirthdayType';`
`22`		`- public const TESTED_TYPE_OPTIONS = [`
`23`		`- ];`
	`22`	`+ public const TESTED_TYPE_OPTIONS = [];`
`24`	`23`
`25`	`24`	`public function testSetInvalidYearsOption()`
`26`	`25`	`{`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,9 @@`
`25`	`25`	`final class EnumTypeTest extends BaseTypeTest`
`26`	`26`	`{`
`27`	`27`	`public const TESTED_TYPE = EnumType::class;`
`28`		`- public const TESTED_TYPE_OPTIONS = ['class' => Suit::class];`
	`28`	`+ public const TESTED_TYPE_OPTIONS = [`
	`29`	`+ 'class' => Suit::class,`
	`30`	`+ ];`
`29`	`31`
`30`	`32`	`public function testClassOptionIsRequired()`
`31`	`33`	`{`