revert previous change. only validate will add errors.

packaged · Oct 7, 2020 · 79393a9 · 79393a9
1 parent 28e6a0b
commit 79393a9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 11 deletions.
diff --git a/src/DataHandlers/AbstractDataHandler.php b/src/DataHandlers/AbstractDataHandler.php
@@ -167,7 +167,9 @@ public function setValue($value)
 
   public function validate(): array
   {
-    $this->validateValue($this->getValue());
+    $this->clearErrors();
+    $errors = $this->validateValue($this->getValue());
+    $this->addError(...$errors);
     return $this->getErrors();
   }
 
@@ -210,7 +212,6 @@ public function validateValue($value, array $data = []): array
         $errors = array_merge($errors, $validatorErrors);
       }
     }
-    $this->clearErrors()->addError(...$errors);
     return $errors;
   }
 

diff --git a/src/Form/Form.php b/src/Form/Form.php
@@ -94,17 +94,10 @@ public function __isset($name)
   }
 
   /**
-   * @param bool $revalidate
-   *
    * @return bool
    */
-  public function isValid(bool $revalidate = true): bool
+  public function isValid(): bool
   {
-    if(!$revalidate)
-    {
-      return empty($handlerErrors);
-    }
-
     foreach($this->_dataHandlers as $name => $handler)
     {
       $handlerErrors = $handler->validateValue($handler->getValue(), $this->getFormData());
@@ -124,9 +117,11 @@ public function validate(): array
     $keyedErrors = [];
     foreach($this->_dataHandlers as $name => $handler)
     {
+      $handler->clearErrors();
       $handlerErrors = $handler->validateValue($handler->getValue(), $this->getFormData());
       if($handlerErrors)
       {
+        $handler->addError(...$handlerErrors);
         $keyedErrors[$name] = $handlerErrors;
       }
     }

diff --git a/tests/FormTest.php b/tests/FormTest.php
@@ -27,7 +27,6 @@ public function testProperties()
     $this->assertTrue($form->isValid());
 
     $form->number->setValue('a');
-    $this->assertTrue($form->isValid(false));
     $this->assertFalse($form->isValid());
 
     $errors = $form->validate();