correct catch deprecation

symfony · peter-gribanov · Jun 2, 2021 · Jun 7, 2021 · Jun 7, 2021 · Jun 7, 2021
commit 0c10e77e9da60b501d28dc10af07dd95848097e4
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/FormType.php b/src/Symfony/Component/Form/Extension/Core/Type/FormType.php
@@ -139,16 +139,16 @@ public function configureOptions(OptionsResolver $resolver)
         };
 
         // Derive "empty_data" closure from "data_class" option
-        $emptyData = static function (Options $options): callable {
+        $emptyData = function (Options $options) {
             $class = $options['data_class'];
 
             if (null !== $class) {
-                return static function (FormInterface $form) use ($class): ?object {
+                return function (FormInterface $form) use ($class) {
                     return $form->isEmpty() && !$form->isRequired() ? null : new $class();
                 };
             }
 
-            return static function (FormInterface $form) {
+            return function (FormInterface $form) {
                 return $form->getConfig()->getCompound() ? [] : '';
             };
         };

@@ -27,7 +27,7 @@ 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 (is_callable($options['empty_data'])) {
+        } elseif ($options['empty_data'] instanceof \Closure) {
             $scope = (new \ReflectionFunction($options['empty_data']))->getClosureScopeClass();
 
             if (null !== $scope && FormType::class === $scope->getName()) {

@@ -11,8 +11,12 @@
 
 namespace Symfony\Component\Form\Tests\Extension\Core\Type;
 
+use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
+
 class TextTypeTest extends BaseTypeTest
 {
+    use ExpectDeprecationTrait;
+
     public const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\TextType';
     public const TESTED_TYPE_OPTIONS = [
         'empty_data' => null,
@@ -38,8 +42,10 @@ public function testSubmitNullReturnsNullWithEmptyDataAsString()
     /**
      * @group legacy
      */
-    public function testDefaultEmptyDataCallback(): void
+    public function testDefaultEmptyDataCallback()
     {
+        $this->expectDeprecation('Since symfony/form 5.4: The default value of "empty_data" option in "Symfony\Component\Form\Extension\Core\Type\TextType" will be changed to empty string. Declare "NULL" as value for "empty_data" if you still want use "NULL" as data.');
+
         $form = $this->factory->create(static::TESTED_TYPE);
 
         $form->submit(null);