Merge pull request #1432 from rebuy-de/fix-form-interface-handling

Define method for the `FormInterface` type in the `FormErrorHandler`
schmittjoh · Sep 12, 2022 · 329e29c · 329e29c
2 parents 32956d3 + 235a751
commit 329e29c
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 4 deletions.
diff --git a/src/Handler/FormErrorHandler.php b/src/Handler/FormErrorHandler.php
@@ -43,6 +43,7 @@ public static function getSubscribingMethods()
                 'direction' => GraphNavigatorInterface::DIRECTION_SERIALIZATION,
                 'type' => FormInterface::class,
                 'format' => $format,
+                'method' => 'serializeFormTo' . ucfirst($format),
             ];
             $methods[] = [
                 'direction' => GraphNavigatorInterface::DIRECTION_SERIALIZATION,

diff --git a/tests/Serializer/BaseSerializationTest.php b/tests/Serializer/BaseSerializationTest.php
@@ -132,6 +132,7 @@
 use Symfony\Component\Form\FormConfigBuilder;
 use Symfony\Component\Form\FormError;
 use Symfony\Component\Form\FormFactoryBuilder;
+use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Translation\IdentityTranslator;
 use Symfony\Component\Uid\Uuid;
 use Symfony\Component\Uid\UuidV4;
@@ -1192,7 +1193,10 @@ public function testFormErrors()
         self::assertEquals($this->getContent('form_errors'), $this->serialize($errors));
     }
 
-    public function testNestedFormErrors()
+    /**
+     * @dataProvider initialFormTypeProvider
+     */
+    public function testNestedFormErrors($type)
     {
         $dispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock();
 
@@ -1210,13 +1214,17 @@ public function testNestedFormErrors()
         $child->addError(new FormError('Error of the child form'));
         $form->add($child);
 
-        self::assertEquals($this->getContent('nested_form_errors'), $this->serialize($form));
+        $context = SerializationContext::create();
+        $context->setInitialType($type);
+
+        self::assertEquals($this->getContent('nested_form_errors'), $this->serialize($form, $context));
     }
 
     /**
      * @doesNotPerformAssertions
+     * @dataProvider initialFormTypeProvider
      */
-    public function testFormErrorsWithNonFormComponents()
+    public function testFormErrorsWithNonFormComponents($type)
     {
         if (!class_exists('Symfony\Component\Form\Extension\Core\Type\SubmitType')) {
             $this->markTestSkipped('Not using Symfony Form >= 2.3 with submit type');
@@ -1238,13 +1246,24 @@ public function testFormErrorsWithNonFormComponents()
         $form = new Form($fooConfig);
         $form->add('save', SubmitType::class);
 
+        $context = SerializationContext::create();
+        $context->setInitialType($type);
+
         try {
-            $this->serialize($form);
+            $this->serialize($form, $context);
         } catch (\Throwable $e) {
             self::assertTrue(false, 'Serialization should not throw an exception');
         }
     }
 
+    public function initialFormTypeProvider()
+    {
+        return [
+            [Form::class],
+            [FormInterface::class],
+        ];
+    }
+
     public function testConstraintViolation()
     {
         $violation = new ConstraintViolation('Message of violation', 'Message of violation', [], null, 'foo', null);