Merge pull request #582 from scootstah/issue/581

Call Form::isSubmitted() before Form::isValid()
FriendsOfSymfony · Jan 23, 2019 · fcaa25c · fcaa25c
2 parents a038aa7 + f3cbdb5
commit fcaa25c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/Form/Handler/AuthorizeFormHandler.php b/Form/Handler/AuthorizeFormHandler.php
@@ -92,7 +92,7 @@ public function process()
         }
 
         $this->form->handleRequest($request);
-        if (!$this->form->isValid()) {
+        if ($this->form->isSubmitted() && $this->form->isValid() === false) {
             return false;
         }
 

diff --git a/Tests/Form/Handler/AuthorizeFormHandlerTest.php b/Tests/Form/Handler/AuthorizeFormHandlerTest.php
@@ -369,6 +369,13 @@ public function testProcessWillHandleRequestOnPost()
             ->willReturn($this->form)
         ;
 
+        $this->form
+            ->expects($this->once())
+            ->method('isSubmitted')
+            ->with()
+            ->willReturn(true)
+        ;
+
         $this->form
             ->expects($this->once())
             ->method('isValid')
@@ -428,6 +435,13 @@ public function testProcessWillHandleRequestOnPostAndWillProcessDataIfFormIsVali
             ->willReturn($this->form)
         ;
 
+        $this->form
+            ->expects($this->once())
+            ->method('isSubmitted')
+            ->with()
+            ->willReturn(true)
+        ;
+
         $this->form
             ->expects($this->once())
             ->method('isValid')