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

peter-gribanov · Peter Gribanov · commit 643286f91b7c · 2021-11-18T18:44:00.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();
 
