optimize validator

Author: thomas-kl1

Model/ResourceModel/ActionEntity/Validator.php

@@ -9,7 +9,6 @@
 
 use Magento\Framework\Validator\AbstractValidator;
 use Magento\Framework\Validator\ValidatorInterface;
-use function array_merge_recursive;
 
 final class Validator extends AbstractValidator
 {
@@ -26,15 +25,14 @@ public function __construct(
 
     public function isValid($value): bool
     {
-        $isValid = true;
-        $messages = [];
+        $this->_clearMessages();
 
         foreach ($this->validators as $validator) {
-            $isValid = $isValid && $validator->isValid($value);
-            $messages[] = $validator->getMessages();
+            if (!$validator->isValid($value)) {
+                $this->_addMessages($validator->getMessages());
+            }
         }
-        $this->_addMessages(array_merge_recursive(...$messages));
 
-        return $isValid && !$this->hasMessages();
+        return !$this->hasMessages();
     }
 }

Model/ResourceModel/ActionEntity/Validator/StateValidator.php

@@ -33,14 +33,19 @@ public function __construct(
      */
     public function isValid($actionEntity): bool
     {
-        if (!in_array($actionEntity->getState(), array_column($this->actionStates->toOptionArray(), 'value'), true)) {
+        $this->_clearMessages();
+        $isValid = in_array(
+            $actionEntity->getState(),
+            array_column($this->actionStates->toOptionArray(), 'value'),
+            true
+        );
+
+        if (!$isValid) {
             $this->_addMessages([
                 'state' => new Phrase('State "%1" does not exists.', [$actionEntity->getState()])
             ]);
-
-            return false;
         }
 
-        return true;
+        return $isValid;
     }
 }