Add missing required options to JSON output

yceruto · yceruto · commit d67dc0062f9b · 2017-08-15T14:05:16.000-04:00
diff --git a/src/Symfony/Component/Form/Console/Descriptor/JsonDescriptor.php b/src/Symfony/Component/Form/Console/Descriptor/JsonDescriptor.php
@@ -29,6 +29,7 @@ protected function describeResolvedFormType(ResolvedFormTypeInterface $resolvedF
             'overridden' => $this->overriddenOptions,
             'parent' => $this->parentOptions,
             'extension' => $this->extensionOptions,
+            'required' => $this->requiredOptions,
         );
         $this->sortOptions($formOptions);
 
diff --git a/src/Symfony/Component/Form/Tests/Console/Descriptor/AbstractDescriptorTest.php b/src/Symfony/Component/Form/Tests/Console/Descriptor/AbstractDescriptorTest.php
@@ -30,7 +30,11 @@ public function testDescribeResolvedFormType(ResolvedFormTypeInterface $type, ar
         $expectedDescription = $this->getExpectedDescription($fixtureName);
         $describedObject = $this->getObjectDescription($type, $options);
 
-        $this->assertEquals(trim($expectedDescription), trim(str_replace(PHP_EOL, "\n", $describedObject)));
+        if ('json' === $this->getFormat()) {
+            $this->assertEquals(json_encode(json_decode($expectedDescription), JSON_PRETTY_PRINT), json_encode(json_decode($describedObject), JSON_PRETTY_PRINT));
+        } else {
+            $this->assertEquals(trim($expectedDescription), trim(str_replace(PHP_EOL, "\n", $describedObject)));
+        }
     }
 
     public function getDescribeResolvedFormTypeTestData()
diff --git a/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/resolved_form_type_1.json b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/resolved_form_type_1.json
@@ -56,7 +56,8 @@
                 "csrf_token_id",
                 "csrf_token_manager"
             ]
-        }
+        },
+        "required": []
     },
     "parent_types": [
         "Symfony\\Component\\Form\\Extension\\Core\\Type\\FormType"
