Adjusted logical rules

Added validation messages tree

Author: Fa-BRAIK

src/Support/Collection.php

@@ -54,6 +54,17 @@ public function first(?callable $callable = null): mixed
             : array_find($this->items, $callable);
     }
 
+    /**
+     * @template TNewValue of mixed
+     * @param callable(TValue $item): TNewValue $callable
+     *
+     * @return self<TKey, TNewValue>
+     */
+    public function map(callable $callable): self
+    {
+        return new self(array_map($callable, $this->items));
+    }
+
     public function isNotEmpty(): bool
     {
         return !empty($this->items);
@@ -79,4 +90,12 @@ public function some(callable $callable): bool
     {
         return array_any($this->items, $callable);
     }
+
+    /**
+     * @return array<TKey, TValue>
+     */
+    public function all(): array
+    {
+        return $this->items;
+    }
 }

src/Validation/Logic/AndRule.php

@@ -12,4 +12,13 @@ public function evaluate(mixed $value): bool
             static fn (RuleEvaluator $rule) => $rule->evaluate($value)
         );
     }
+
+    public function validationMessages(): array
+    {
+        return [
+            'and' => $this->rules
+                ->map(self::resolveValidationMessages(...))
+                ->all()
+        ];
+    }
 }

src/Validation/Logic/LogicalRule.php

@@ -5,6 +5,7 @@
 use Nuxtifyts\PhpDto\Support\Collection;
 use Nuxtifyts\PhpDto\Validation\Contracts\RuleEvaluator;
 use Nuxtifyts\PhpDto\Validation\Contracts\RuleGroup;
+use Nuxtifyts\PhpDto\Validation\Rules\ValidationRule;
 
 abstract class LogicalRule implements RuleGroup, RuleEvaluator
 {
@@ -28,4 +29,23 @@ public function addRule(RuleEvaluator $rule): static
         $this->rules->push($rule);
         return $this;
     }
+
+    /**
+     * @return array<string, mixed>
+     */
+    abstract public function validationMessages(): array;
+
+    /**
+     * @return ?array<string, mixed>
+     */
+    protected static function resolveValidationMessages(?RuleEvaluator $rule): ?array
+    {
+        return match (true) {
+            $rule instanceof LogicalRule => $rule->validationMessages(),
+            $rule instanceof ValidationRule => [
+                $rule->name => $rule->validationMessage()
+            ],
+            default => null
+        };
+    }
 }

src/Validation/Logic/OrRule.php

@@ -12,4 +12,13 @@ public function evaluate(mixed $value): bool
             static fn (RuleEvaluator $rule) => $rule->evaluate($value)
         );
     }
+
+    public function validationMessages(): array
+    {
+        return [
+            'or' => $this->rules
+                ->map(self::resolveValidationMessages(...))
+                ->all()
+        ];
+    }
 }

src/Validation/Logic/SingularRule.php

@@ -26,4 +26,11 @@ public function evaluate(mixed $value): bool
     {
         return (bool) $this->rules->first()?->evaluate($value);
     }
+
+    public function validationMessages(): array
+    {
+        return [
+            'singular' => self::resolveValidationMessages($this->rules->first())
+        ];
+    }
 }