[Form] allow additional http methods in FormType

alekitto · alekitto · commit ac73e7977bde · 2018-09-25T02:31:32.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml
@@ -29,7 +29,6 @@
         <!-- FormFactory -->
         <service id="form.factory" class="Symfony\Component\Form\FormFactory" public="true">
             <argument type="service" id="form.registry" />
-            <argument type="service" id="form.resolved_type_factory" />
         </service>
         <service id="Symfony\Component\Form\FormFactoryInterface" alias="form.factory" />
 
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/FormType.php b/src/Symfony/Component/Form/Extension/Core/Type/FormType.php
@@ -24,6 +24,19 @@
 
 class FormType extends BaseType
 {
+    /**
+     * The accepted request methods.
+     *
+     * @var array
+     */
+    private const ALLOWED_METHODS = array(
+        'GET',
+        'PUT',
+        'POST',
+        'DELETE',
+        'PATCH',
+    );
+
     private $propertyAccessor;
 
     public function __construct(PropertyAccessorInterface $propertyAccessor = null)
@@ -185,6 +198,14 @@ public function configureOptions(OptionsResolver $resolver)
         $resolver->setAllowedTypes('label_attr', 'array');
         $resolver->setAllowedTypes('upload_max_size_message', array('callable'));
         $resolver->setAllowedTypes('help', array('string', 'null'));
+
+        $resolver->setAllowedValues('method', function ($value) {
+            return \in_array(\strtoupper($value), self::ALLOWED_METHODS);
+        });
+
+        $resolver->setNormalizer('method', function (Options $options, string $value): string {
+            return \strtoupper($value);
+        });
     }
 
     /**
diff --git a/src/Symfony/Component/Form/FormConfigBuilder.php b/src/Symfony/Component/Form/FormConfigBuilder.php
@@ -34,19 +34,6 @@ class FormConfigBuilder implements FormConfigBuilderInterface
      */
     private static $nativeRequestHandler;
 
-    /**
-     * The accepted request methods.
-     *
-     * @var array
-     */
-    private static $allowedMethods = array(
-        'GET',
-        'PUT',
-        'POST',
-        'DELETE',
-        'PATCH',
-    );
-
     /**
      * @var bool
      */
@@ -788,13 +775,7 @@ public function setMethod($method)
             throw new BadMethodCallException('The config builder cannot be modified anymore.');
         }
 
-        $upperCaseMethod = strtoupper($method);
-
-        if (!\in_array($upperCaseMethod, self::$allowedMethods)) {
-            throw new InvalidArgumentException(sprintf('The form method is "%s", but should be one of "%s".', $method, implode('", "', self::$allowedMethods)));
-        }
-
-        $this->method = $upperCaseMethod;
+        $this->method = strtoupper($method);
 
         return $this;
     }
diff --git a/src/Symfony/Component/Form/Tests/FormConfigTest.php b/src/Symfony/Component/Form/Tests/FormConfigTest.php
@@ -138,14 +138,6 @@ public function testSetMethodAllowsPatch()
         self::assertSame('PATCH', $formConfigBuilder->getMethod());
     }
 
-    /**
-     * @expectedException \Symfony\Component\Form\Exception\InvalidArgumentException
-     */
-    public function testSetMethodDoesNotAllowOtherValues()
-    {
-        $this->getConfigBuilder()->setMethod('foo');
-    }
-
     private function getConfigBuilder($name = 'name')
     {
         $dispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock();

Original file line number	Diff line number	Diff line change
`@@ -138,14 +138,6 @@ public function testSetMethodAllowsPatch()`
`138`	`138`	`self::assertSame('PATCH', $formConfigBuilder->getMethod());`
`139`	`139`	`}`
`140`	`140`
`141`		`- /**`
`142`		`- * @expectedException \Symfony\Component\Form\Exception\InvalidArgumentException`
`143`		`- */`
`144`		`- public function testSetMethodDoesNotAllowOtherValues()`
`145`		`- {`
`146`		`- $this->getConfigBuilder()->setMethod('foo');`
`147`		`- }`
`148`		`-`
`149`	`141`	`private function getConfigBuilder($name = 'name')`
`150`	`142`	`{`
`151`	`143`	`$dispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock();`