ignore custom Closure in "empty_data" option

symfony · peter-gribanov · Jun 2, 2021 · Jun 7, 2021 · Jun 7, 2021 · Jun 7, 2021
commit 155eb91388811a246bb95492ca69f41d11a89153
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/FormType.php b/src/Symfony/Component/Form/Extension/Core/Type/FormType.php
@@ -29,6 +29,7 @@
 class FormType extends BaseType
 {
     private DataMapper $dataMapper;
+    private static $emptyData = null;
 
     public function __construct(PropertyAccessorInterface $propertyAccessor = null)
     {
@@ -139,19 +140,21 @@ public function configureOptions(OptionsResolver $resolver)
         };
 
         // Derive "empty_data" closure from "data_class" option
-        $emptyData = function (Options $options) {
-            $class = $options['data_class'];
+        if (self::$emptyData === null) {
+            self::$emptyData = function (Options $options) {
+                $class = $options['data_class'];
+
+                if (null !== $class) {
+                    return function (FormInterface $form) use ($class) {
+                        return $form->isEmpty() && !$form->isRequired() ? null : new $class();
+                    };
+                }
 
-            if (null !== $class) {
-                return function (FormInterface $form) use ($class) {
-                    return $form->isEmpty() && !$form->isRequired() ? null : new $class();
+                return function (FormInterface $form) {
+                    return $form->getConfig()->getCompound() ? [] : '';
                 };
-            }
-
-            return function (FormInterface $form) {
-                return $form->getConfig()->getCompound() ? [] : '';
             };
-        };
+        }
 
         // Wrap "post_max_size_message" in a closure to translate it lazily
         $uploadMaxSizeMessage = function (Options $options) {
@@ -174,7 +177,7 @@ public function configureOptions(OptionsResolver $resolver)
 
         $resolver->setDefaults([
             'data_class' => $dataClass,
-            'empty_data' => $emptyData,
+            'empty_data' => self::$emptyData,
             'trim' => true,
             'required' => true,
             'property_path' => null,

@@ -28,8 +28,12 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         if ('' === $options['empty_data']) {
             $builder->addViewTransformer($this);
         } elseif ($options['empty_data'] instanceof \Closure) {
-            // we assume that this is the default value from \Symfony\Component\Form\Extension\Core\Type\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__);
+            $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__);
+            }
         }
     }
 

@@ -721,8 +721,7 @@ public function provideEmptyData()
             'Compound text field' => ['text', ['date' => ['year' => '2018', 'month' => '11', 'day' => '11'], 'time' => ['hour' => '21', 'minute' => '23']], $expectedData],
             'Compound choice field' => ['choice', ['date' => ['year' => '2018', 'month' => '11', 'day' => '11'], 'time' => ['hour' => '21', 'minute' => '23']], $expectedData],
             'Simple field lazy' => ['single_text', $lazyEmptyData, $expectedData],
-            // TODO uncomment after update to Symfony 6.0
-            // 'Compound text field lazy' => ['text', $lazyEmptyData, $expectedData],
+            'Compound text field lazy' => ['text', $lazyEmptyData, $expectedData],
             'Compound choice field lazy' => ['choice', $lazyEmptyData, $expectedData],
         ];
     }

@@ -1066,8 +1066,7 @@ public function provideEmptyData()
             'Compound text fields' => ['text', ['year' => '2018', 'month' => '11', 'day' => '11'], $expectedData],
             'Compound choice fields' => ['choice', ['year' => '2018', 'month' => '11', 'day' => '11'], $expectedData],
             'Simple field lazy' => ['single_text', $lazyEmptyData, $expectedData],
-            // TODO uncomment after update to Symfony 6.0
-            // 'Compound text fields lazy' => ['text', $lazyEmptyData, $expectedData],
+            'Compound text fields lazy' => ['text', $lazyEmptyData, $expectedData],
             'Compound choice fields lazy' => ['choice', $lazyEmptyData, $expectedData],
         ];
     }

@@ -1125,8 +1125,7 @@ public function provideEmptyData()
             'Compound text field' => ['text', ['hour' => '21', 'minute' => '23'], $expectedData],
             'Compound choice field' => ['choice', ['hour' => '21', 'minute' => '23'], $expectedData],
             'Simple field lazy' => ['single_text', $lazyEmptyData, $expectedData],
-            // TODO uncomment after update to Symfony 6.0
-            // 'Compound text field lazy' => ['text', $lazyEmptyData, $expectedData],
+            'Compound text field lazy' => ['text', $lazyEmptyData, $expectedData],
             'Compound choice field lazy' => ['choice', $lazyEmptyData, $expectedData],
         ];
     }