Bug symfony#13291 [Form] Forward Form::submit(Request) to Form::HandleRequest

0mars · 0mars · commit ef46e56534e1 · 2015-10-02T20:56:54.000+02:00
Fixes the issue with uploaded files exceeding post_max_size,
and form marked valid with empty fields
diff --git a/src/Symfony/Component/Form/Form.php b/src/Symfony/Component/Form/Form.php
@@ -21,6 +21,7 @@
 use Symfony\Component\Form\Util\InheritDataAwareIterator;
 use Symfony\Component\Form\Util\OrderedHashMap;
 use Symfony\Component\PropertyAccess\PropertyPath;
+use Symfony\Component\HttpFoundation\Request;
 
 /**
  * Form represents a form.
@@ -507,6 +508,11 @@ public function handleRequest($request = null)
      */
     public function submit($submittedData, $clearMissing = true)
     {
+        if ($submittedData instanceof Request) {
+            @trigger_error('Passing a Symfony\Component\HttpFoundation\Request object to the '.__CLASS__.'::bind and '.__METHOD__.' methods is deprecated since 2.3 and will be removed in 3.0. Use the '.__CLASS__.'::handleRequest method instead. If you want to test whether the form was submitted separately, you can use the '.__CLASS__.'::isSubmitted method.', E_USER_DEPRECATED);
+            return $this->handleRequest($submittedData);
+        }
+
         if ($this->submitted) {
             throw new AlreadySubmittedException('A form can only be submitted once');
         }
diff --git a/src/Symfony/Component/Form/Tests/SimpleFormTest.php b/src/Symfony/Component/Form/Tests/SimpleFormTest.php
@@ -909,6 +909,25 @@ public function testHandleRequestForwardsToRequestHandler()
         $this->assertSame($form, $form->handleRequest('REQUEST'));
     }
 
+    /**
+     * Shall be removed in 3.0
+     */
+    public function testSubmitForwardsToRequestHandlerUsingRequestArgument()
+    {
+        $handler = $this->getMock('Symfony\Component\Form\RequestHandlerInterface');
+
+        $form = $this->getBuilder()
+            ->setRequestHandler($handler)
+            ->getForm();
+
+        $request = $this->getMock('Symfony\Component\HttpFoundation\Request');
+
+        $handler->expects($this->once())
+            ->method('handleRequest')
+            ->with($this->identicalTo($form), $request);
+        $this->assertSame($form, $form->submit($request));
+    }
+
     public function testFormInheritsParentData()
     {
         $child = $this->getBuilder('child')
