[Form] Fixed: If a form is not present in a request, it is not automa…

…tically submitted
symfony · Aug 1, 2013 · cb5e765 · cb5e765
1 parent bd30a5c
commit cb5e765
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 12 deletions.
diff --git a/src/Symfony/Component/Form/Extension/HttpFoundation/HttpFoundationRequestHandler.php b/src/Symfony/Component/Form/Extension/HttpFoundation/HttpFoundationRequestHandler.php
@@ -56,10 +56,13 @@ public function handleRequest(FormInterface $form, $request = null)
             if ('' === $name) {
                 $params = $request->request->all();
                 $files = $request->files->all();
-            } else {
+            } elseif ($request->request->has($name) || $request->files->has($name)) {
                 $default = $form->getConfig()->getCompound() ? array() : null;
                 $params = $request->request->get($name, $default);
                 $files = $request->files->get($name, $default);
+            } else {
+                // Don't submit the form if it is not present in the request
+                return;
             }
 
             if (is_array($params) && is_array($files)) {

diff --git a/src/Symfony/Component/Form/NativeRequestHandler.php b/src/Symfony/Component/Form/NativeRequestHandler.php
@@ -72,10 +72,13 @@ public function handleRequest(FormInterface $form, $request = null)
             if ('' === $name) {
                 $params = $_POST;
                 $files = $fixedFiles;
-            } else {
+            } elseif (array_key_exists($name, $_POST) || array_key_exists($name, $fixedFiles)) {
                 $default = $form->getConfig()->getCompound() ? array() : null;
-                $params = isset($_POST[$name]) ? $_POST[$name] : $default;
-                $files = isset($fixedFiles[$name]) ? $fixedFiles[$name] : $default;
+                $params = array_key_exists($name, $_POST) ? $_POST[$name] : $default;
+                $files = array_key_exists($name, $fixedFiles) ? $fixedFiles[$name] : $default;
+            } else {
+                // Don't submit the form if it is not present in the request
+                return;
             }
 
             if (is_array($params) && is_array($files)) {

diff --git a/src/Symfony/Component/Form/Tests/AbstractRequestHandlerTest.php b/src/Symfony/Component/Form/Tests/AbstractRequestHandlerTest.php
@@ -86,35 +86,33 @@ public function testDoNotSubmitIfWrongRequestMethod($method)
     /**
      * @dataProvider methodExceptGetProvider
      */
-    public function testSubmitSimpleFormWithNullIfNameNotInRequestAndNotGetRequest($method)
+    public function testDoNoSubmitSimpleFormIfNameNotInRequestAndNotGetRequest($method)
     {
         $form = $this->getMockForm('param1', $method, false);
 
         $this->setRequestData($method, array(
             'paramx' => array(),
         ));
 
-        $form->expects($this->once())
-            ->method('submit')
-            ->with($this->identicalTo(null), 'PATCH' !== $method);
+        $form->expects($this->never())
+            ->method('submit');
 
         $this->requestHandler->handleRequest($form, $this->request);
     }
 
     /**
      * @dataProvider methodExceptGetProvider
      */
-    public function testSubmitCompoundFormWithArrayIfNameNotInRequestAndNotGetRequest($method)
+    public function testDoNotSubmitCompoundFormIfNameNotInRequestAndNotGetRequest($method)
     {
         $form = $this->getMockForm('param1', $method, true);
 
         $this->setRequestData($method, array(
             'paramx' => array(),
         ));
 
-        $form->expects($this->once())
-            ->method('submit')
-            ->with($this->identicalTo(array()), 'PATCH' !== $method);
+        $form->expects($this->never())
+            ->method('submit');
 
         $this->requestHandler->handleRequest($form, $this->request);
     }