Form // fix handling of isValid when the Form has errors. Add missing…

… method mock in FormTest::testIsValid().
Chrico · Jun 28, 2023 · 6bd447a · 6bd447a
1 parent 699c974
commit 6bd447a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/Element/Form.php b/src/Element/Form.php
@@ -124,7 +124,11 @@ public function isValid(): bool
 
         // Either on "submit" we have erroneous Elements, or the
         // Form itself has errors assigned through Form::withErrors().
-        return $this->hasErrors() || $this->isValid;
+        if ($this->hasErrors()) {
+            return false;
+        }
+
+        return $this->isValid;
     }
 
     /**

diff --git a/tests/phpunit/Unit/Element/FormTest.php b/tests/phpunit/Unit/Element/FormTest.php
@@ -61,6 +61,8 @@ public function testIsValid(): void
             ->andReturn($expected_value);
         $element->allows('withErrors')
             ->with($expected_error);
+        $element->allows('hasErrors')
+            ->andReturnTrue();
         $element->allows('validate')
             ->andReturnFalse();