chore: changed All rule to EachValue with Validator as an argument

Author: andrepimpao

src/Exception/AllException.php src/Exception/EachValueException.phpsrc/Exception/AllException.php renamed to src/Exception/EachValueException.php

@@ -2,4 +2,4 @@
 
 namespace ProgrammatorDev\YetAnotherPhpValidator\Exception;
 
-class AllException extends ValidationException {}
+class EachValueException extends ValidationException {}

src/Rule/All.php src/Rule/EachValue.phpsrc/Rule/All.php renamed to src/Rule/EachValue.php

@@ -2,31 +2,20 @@
 
 namespace ProgrammatorDev\YetAnotherPhpValidator\Rule;
 
-use ProgrammatorDev\YetAnotherPhpValidator\Exception\AllException;
+use ProgrammatorDev\YetAnotherPhpValidator\Exception\EachValueException;
 use ProgrammatorDev\YetAnotherPhpValidator\Exception\UnexpectedValueException;
 use ProgrammatorDev\YetAnotherPhpValidator\Exception\ValidationException;
-use ProgrammatorDev\YetAnotherPhpValidator\Rule\Util\ValidatableTrait;
+use ProgrammatorDev\YetAnotherPhpValidator\Validator;
 
-class All extends AbstractRule implements RuleInterface
+class EachValue extends AbstractRule implements RuleInterface
 {
-    use ValidatableTrait;
-
-    /**
-     * @param RuleInterface[] $constraints
-     */
     public function __construct(
-        private readonly array $constraints,
-        private readonly string $message = 'At "{{ key }}": {{ message }}'
+        private readonly Validator $validator,
+        private readonly string $message = 'At key "{{ key }}": {{ message }}'
     ) {}
 
     public function assert(mixed $value, string $name): void
     {
-        if (!$this->isValidatable($this->constraints)) {
-            throw new UnexpectedValueException(
-                'All constraints must be of type "RuleInterface".'
-            );
-        }
-
         if (!\is_array($value)) {
             throw new UnexpectedValueException(
                 \sprintf('Expected value of type "array", "%s" given.', get_debug_type($value))
@@ -35,13 +24,11 @@ public function assert(mixed $value, string $name): void
 
         try {
             foreach ($value as $key => $input) {
-                foreach ($this->constraints as $constraint) {
-                    $constraint->assert($input, $name);
-                }
+                $this->validator->assert($input, $name);
             }
         }
         catch (ValidationException $exception) {
-            throw new AllException(
+            throw new EachValueException(
                 message: $this->message,
                 parameters: [
                     'value' => $value,

tests/AllTest.php tests/EachValueTest.phptests/AllTest.php renamed to tests/EachValueTest.php

@@ -2,8 +2,8 @@
 
 namespace ProgrammatorDev\YetAnotherPhpValidator\Test;
 
-use ProgrammatorDev\YetAnotherPhpValidator\Exception\AllException;
-use ProgrammatorDev\YetAnotherPhpValidator\Rule\All;
+use ProgrammatorDev\YetAnotherPhpValidator\Exception\EachValueException;
+use ProgrammatorDev\YetAnotherPhpValidator\Rule\EachValue;
 use ProgrammatorDev\YetAnotherPhpValidator\Rule\GreaterThan;
 use ProgrammatorDev\YetAnotherPhpValidator\Rule\NotBlank;
 use ProgrammatorDev\YetAnotherPhpValidator\Test\Util\TestRuleFailureConditionTrait;
@@ -12,7 +12,7 @@
 use ProgrammatorDev\YetAnotherPhpValidator\Test\Util\TestRuleUnexpectedValueTrait;
 use ProgrammatorDev\YetAnotherPhpValidator\Validator;
 
-class AllTest extends AbstractTest
+class EachValueTest extends AbstractTest
 {
     use TestRuleUnexpectedValueTrait;
     use TestRuleFailureConditionTrait;
@@ -21,36 +21,25 @@ class AllTest extends AbstractTest
 
     public static function provideRuleUnexpectedValueData(): \Generator
     {
-        yield 'invalid constraint' => [
-            new All([new NotBlank(), 'invalid']),
-            [1, 2, 3],
-            '/All constraints must be of type "RuleInterface"./'
-        ];
         yield 'invalid value type' => [
-            new All([new NotBlank()]),
+            new EachValue(new Validator(new NotBlank())),
             'invalid',
             '/Expected value of type "array", "(.*)" given./'
         ];
         yield 'unexpected value propagation' => [
-            new All([new GreaterThan(10)]),
+            new EachValue(new Validator(new GreaterThan(10))),
             ['a'],
             '/Cannot compare a type "(.*)" with a type "(.*)"./'
         ];
     }
 
     public static function provideRuleFailureConditionData(): \Generator
     {
-        $exception = AllException::class;
-        $message = '/At "(.*)": The "(.*)" value should not be blank, "(.*)" given./';
+        $exception = EachValueException::class;
+        $message = '/At key "(.*)": The "(.*)" value should not be blank, "(.*)" given./';
 
         yield 'constraint' => [
-            new All([new NotBlank()]),
-            [1, 2, ''],
-            $exception,
-            $message
-        ];
-        yield 'validator' => [
-            new All([(new Validator(new NotBlank()))]),
+            new EachValue(new Validator(new NotBlank())),
             [1, 2, ''],
             $exception,
             $message
@@ -59,31 +48,17 @@ public static function provideRuleFailureConditionData(): \Generator
 
     public static function provideRuleSuccessConditionData(): \Generator
     {
-        yield 'constraints' => [
-            new All([new NotBlank(), new GreaterThan(1)]),
-            [2, 3, 4]
-        ];
-        yield 'validators' => [
-            new All([
-                (new Validator(new NotBlank())),
-                (new Validator(new GreaterThan(1)))
-            ]),
-            [2, 3, 4]
-        ];
-        yield 'constraints and validators' => [
-            new All([
-                new NotBlank(),
-                (new Validator(new GreaterThan(1)))
-            ]),
+        yield 'constraint' => [
+            new EachValue(new Validator(new NotBlank(), new GreaterThan(1))),
             [2, 3, 4]
         ];
     }
 
     public static function provideRuleMessageOptionData(): \Generator
     {
         yield 'constraint' => [
-            new All(
-                constraints: [new NotBlank()],
+            new EachValue(
+                validator: new Validator(new NotBlank()),
                 message: 'The "{{ name }}" value "{{ value }}" failed at key "{{ key }}".'
             ),
             [1, 2, ''],