Move AJAX check towards RequiredValidator class

Author: jissereitsma

Validator/RequiredValidator.php

@@ -3,17 +3,23 @@
 namespace Loki\Components\Validator;
 
 use Loki\Components\Component\ComponentInterface;
+use Loki\Components\Util\Ajax;
 use Loki\Components\Util\IsEmpty;
 
 class RequiredValidator implements ValidatorInterface
 {
     public function __construct(
-        private IsEmpty $isEmpty,
+        private readonly IsEmpty $isEmpty,
+        private readonly Ajax $ajax,
     ) {
     }
 
     public function validate(mixed $value, ?ComponentInterface $component = null): bool|array
     {
+        if (false === $this->ajax->isAjax()) {
+            return true;
+        }
+
         if ($this->isEmpty->execute($component, $value)) {
             return [(string)__('Value is required')];
         }

Validator/Validator.php

@@ -2,18 +2,14 @@
 
 namespace Loki\Components\Validator;
 
-use Loki\Components\Util\IsEmpty;
 use Magento\Framework\Phrase;
 use Loki\Components\Component\ComponentInterface;
 use Loki\Components\Messages\LocalMessage;
-use Loki\Components\Util\Ajax;
 
 class Validator
 {
     public function __construct(
         private readonly ValidatorRegistry $validatorRegistry,
-        private readonly Ajax $ajax,
-        private readonly IsEmpty $isEmpty,
     ) {
     }
 
@@ -22,17 +18,6 @@ public function validate(
         mixed $data = null,
         string $scope = ''
     ): bool {
-        // @todo: Move this to the RequiredValidator class
-        if ($this->isRequired($component)
-            && $this->isEmpty->execute($component, $data)
-            && false === $this->ajax->isAjax()) {
-            return true;
-        }
-
-        if ($this->isRequired($component) && $this->isEmpty->execute($component, $data)) {
-            return false;
-        }
-
         if (is_array($data)) {
             foreach ($data as $value) {
                 if (false === $this->validate($component, $value)) {
@@ -74,9 +59,4 @@ public function validate(
 
         return true;
     }
-
-    private function isRequired(ComponentInterface $component): bool
-    {
-        return in_array('required', $component->getValidators());
-    }
 }

Validator/ValidatorRegistry.php

@@ -23,6 +23,12 @@ public function __construct(
      */
     public function getApplicableValidators(array $validators = []): array
     {
+        $key = array_search('required', $validators);
+        if ($key !== false) {
+            unset($validators[$key]);
+            array_unshift($validators, 'required');
+        }
+
         $applicableValidators = [];
         foreach ($validators as $validatorName) {
             if (array_key_exists($validatorName, $this->validators)) {