[Form] add 'force_submit' option

HeahDude · HeahDude · commit 7748f5ea391b · 2016-03-08T09:31:14.000+01:00
closes #16491. Add a `force_submit` option to BaseType with default false, to submit the form even if its name is not among submitted data keys in request handlers.
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/FormType.php b/src/Symfony/Component/Form/Extension/Core/Type/FormType.php
@@ -172,6 +172,9 @@ public function configureOptions(OptionsResolver $resolver)
             'action' => '',
             'attr' => array(),
             'post_max_size_message' => 'The uploaded file was too large. Please try to upload a smaller file.',
+            // Allow submission in request handlers if the form name does not belong
+            // to submitted data keys, see https://github.com/symfony/symfony/issues/16491
+            'force_submit' => false,
         ));
 
         $resolver->setAllowedTypes('label_attr', 'array');
diff --git a/src/Symfony/Component/Form/Extension/HttpFoundation/HttpFoundationRequestHandler.php b/src/Symfony/Component/Form/Extension/HttpFoundation/HttpFoundationRequestHandler.php
@@ -58,7 +58,7 @@ public function handleRequest(FormInterface $form, $request = null)
         // For request methods that must not have a request body we fetch data
         // from the query string. Otherwise we look for data in the request body.
         if ('GET' === $method || 'HEAD' === $method || 'TRACE' === $method) {
-            if ('' === $name) {
+            if ('' === $name || $form->getConfig()->getOption('force_submit')) {
                 $data = $request->query->all();
             } else {
                 // Don't submit GET requests if the form's name does not exist
@@ -89,7 +89,7 @@ public function handleRequest(FormInterface $form, $request = null)
                 return;
             }
 
-            if ('' === $name) {
+            if ('' === $name || $form->getConfig()->getOption('force_submit')) {
                 $params = $request->request->all();
                 $files = $request->files->all();
             } elseif ($request->request->has($name) || $request->files->has($name)) {
diff --git a/src/Symfony/Component/Form/NativeRequestHandler.php b/src/Symfony/Component/Form/NativeRequestHandler.php
@@ -66,7 +66,7 @@ public function handleRequest(FormInterface $form, $request = null)
         // For request methods that must not have a request body we fetch data
         // from the query string. Otherwise we look for data in the request body.
         if ('GET' === $method || 'HEAD' === $method || 'TRACE' === $method) {
-            if ('' === $name) {
+            if ('' === $name || $form->getConfig()->getOption('force_submit')) {
                 $data = $_GET;
             } else {
                 // Don't submit GET requests if the form's name does not exist
@@ -102,7 +102,7 @@ public function handleRequest(FormInterface $form, $request = null)
                 $fixedFiles[$fileKey] = self::stripEmptyFiles(self::fixPhpFilesArray($file));
             }
 
-            if ('' === $name) {
+            if ('' === $name || $form->getConfig()->getOption('force_submit')) {
                 $params = $_POST;
                 $files = $fixedFiles;
             } elseif (array_key_exists($name, $_POST) || array_key_exists($name, $fixedFiles)) {
diff --git a/src/Symfony/Component/Form/Tests/AbstractRequestHandlerTest.php b/src/Symfony/Component/Form/Tests/AbstractRequestHandlerTest.php
@@ -117,6 +117,24 @@ public function testDoNoSubmitSimpleFormIfNameNotInRequestAndNotGetRequest($meth
         $this->requestHandler->handleRequest($form, $this->request);
     }
 
+    /**
+     * @dataProvider methodProvider
+     */
+    public function testForceSubmitSimpleFormIfNameNotInGetRequest($method)
+    {
+        $form = $this->getMockForm('param1', $method, false, true);
+
+        $submittedData = array('test');
+
+        $this->setRequestData($method, $submittedData);
+
+        $form->expects($this->once())
+            ->method('submit')
+            ->with($submittedData);
+
+        $this->requestHandler->handleRequest($form, $this->request);
+    }
+
     /**
      * @dataProvider methodExceptGetProvider
      */
@@ -361,7 +379,7 @@ abstract protected function getRequestHandler();
 
     abstract protected function getMockFile($suffix = '');
 
-    protected function getMockForm($name, $method = null, $compound = true)
+    protected function getMockForm($name, $method = null, $compound = true, $forceSubmit = false)
     {
         $config = $this->getMock('Symfony\Component\Form\FormConfigInterface');
         $config->expects($this->any())
@@ -370,6 +388,10 @@ protected function getMockForm($name, $method = null, $compound = true)
         $config->expects($this->any())
             ->method('getCompound')
             ->will($this->returnValue($compound));
+        $config->expects($this->any())
+            ->method('getOption')
+            ->with('force_submit')
+            ->will($this->returnValue($forceSubmit));
 
         $form = $this->getMock('Symfony\Component\Form\Test\FormInterface');
         $form->expects($this->any())
