Additions after changes in validator (PR #168) (#180)

yiisoft · Feb 11, 2022 · 9843468 · 9843468
1 parent b81b2ba
commit 9843468
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/FormErrors.php b/src/FormErrors.php
@@ -80,7 +80,7 @@ public function hasErrors(?string $attribute = null): bool
         return $attribute === null ? !empty($this->attributesErrors) : isset($this->attributesErrors[$attribute]);
     }
 
-    public function clear(string $attribute = null): void
+    public function clear(?string $attribute = null): void
     {
         if ($attribute !== null) {
             unset($this->attributesErrors[$attribute]);

diff --git a/src/FormErrorsInterface.php b/src/FormErrorsInterface.php
@@ -20,9 +20,9 @@ public function addError(string $attribute, string $error): void;
     /**
      * Removes errors for all attributes.
      *
-     * @param string $attribute Attribute name. If not set, removes errors for all attributes.
+     * @param string|null $attribute Attribute name. If not set, removes errors for all attributes.
      */
-    public function clear(string $attribute = null): void;
+    public function clear(?string $attribute = null): void;
 
     /**
      * Returns errors for all attributes.

diff --git a/src/FormModel.php b/src/FormModel.php
@@ -200,7 +200,7 @@ public function processValidationResult(Result $result): void
     {
         $this->validated = false;
 
-        foreach ($result->getErrorsIndexedByAttribute() as $attribute => $errors) {
+        foreach ($result->getErrorMessagesIndexedByAttribute() as $attribute => $errors) {
             $this->formErrors->clear($attribute);
             /** @psalm-suppress InvalidArgument */
             $this->addErrors([$attribute => $errors]);