fix: reordering arraylist validator

utopia-php · Sep 10, 2024 · a2fa010 · a2fa010
1 parent 1c94e0b
commit a2fa010
Showing 1 changed file with 9 additions and 18 deletions.
diff --git a/src/Http/Validator/ArrayList.php b/src/Http/Validator/ArrayList.php
@@ -11,15 +11,10 @@
  */
 class ArrayList extends Validator
 {
-    /**
-     * @var ?Validator
-     */
-    protected ?Validator $validator;
-
     /**
      * @var Validator
      */
-    protected Validator $cleanValidator;
+    protected Validator $validator;
 
     /**
      * @var int
@@ -36,7 +31,7 @@ class ArrayList extends Validator
      */
     public function __construct(Validator $validator, int $length = 0)
     {
-        $this->cleanValidator = $validator;
+        $this->validator = $validator;
         $this->length = $length;
     }
 
@@ -55,7 +50,7 @@ public function getDescription(): string
             $msg .= ' no longer than ' . $this->length . ' items';
         }
 
-        if ($this->validator != null && !empty($this->validator->getDescription())) {
+        if (!empty($this->validator->getDescription())) {
             $msg .= ' and ' . $this->validator->getDescription();
         }
 
@@ -83,7 +78,7 @@ public function isArray(): bool
      */
     public function getType(): string
     {
-        return $this->cleanValidator->getType();
+        return $this->validator->getType();
     }
 
     /**
@@ -93,7 +88,7 @@ public function getType(): string
      */
     public function getValidator(): Validator
     {
-        return $this->cleanValidator;
+        return $this->validator;
     }
 
     /**
@@ -106,24 +101,20 @@ public function getValidator(): Validator
      */
     public function isValid(mixed $value): bool
     {
-        $this->validator = null;
-
         if (!\is_array($value)) {
             return false;
         }
 
-        if ($this->length && \count($value) > $this->length) {
-            return false;
-        }
-
-        $this->validator = clone $this->cleanValidator;
-
         foreach ($value as $element) {
             if (!$this->validator->isValid($element)) {
                 return false;
             }
         }
 
+        if ($this->length && \count($value) > $this->length) {
+            return false;
+        }
+
         return true;
     }
 }