Merge pull request #718 from hypervel/upstream-sync-validation-rule-builders

Add fluent validation rule builders

Author: binaryfire

src/contracts/src/Validation/ParameterizedRule.php

@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hypervel\Contracts\Validation;
+
+use Stringable;
+
+interface ParameterizedRule extends Stringable
+{
+    /**
+     * Get the rule name followed by its parameters.
+     */
+    public function toArray(): array;
+}

src/contracts/src/Validation/Validator.php

@@ -39,7 +39,7 @@ public function failed(): array;
     /**
      * Add conditions to a given field based on a Closure.
      */
-    public function sometimes(array|string $attribute, array|string $rules, callable $callback): static;
+    public function sometimes(array|string $attribute, array|object|string $rules, callable $callback): static;
 
     /**
      * Add an after validation callback.

src/data/src/Attributes/Validation/AcceptedIf.php

@@ -14,14 +14,18 @@ class AcceptedIf extends StringValidationAttribute
 {
     protected FieldReference $field;
 
+    protected array $values;
+
     /**
      * Create an accepted-if rule attribute.
      */
     public function __construct(
         string|FieldReference $field,
         protected string|bool|int|float|BackedEnum|ExternalReference $value,
+        string|bool|int|float|BackedEnum|ExternalReference ...$values,
     ) {
         $this->field = $this->parseFieldReference($field);
+        $this->values = $values;
     }
 
     /**
@@ -40,6 +44,7 @@ public function parameters(): array
         return [
             $this->field,
             $this->value,
+            $this->values,
         ];
     }
 

src/data/src/Attributes/Validation/Confirmed.php

@@ -5,10 +5,21 @@
 namespace Hypervel\Data\Attributes\Validation;
 
 use Attribute;
+use Hypervel\Data\Support\Validation\References\FieldReference;
 
 #[Attribute(Attribute::TARGET_PROPERTY | Attribute::TARGET_PARAMETER)]
 class Confirmed extends StringValidationAttribute
 {
+    protected ?FieldReference $field;
+
+    /**
+     * Create a confirmed rule attribute.
+     */
+    public function __construct(string|FieldReference|null $field = null)
+    {
+        $this->field = $field === null ? null : $this->parseFieldReference($field);
+    }
+
     /**
      * Get the Validator rule keyword.
      */
@@ -22,6 +33,6 @@ public static function keyword(): string
      */
     public function parameters(): array
     {
-        return [];
+        return $this->field === null ? [] : [$this->field];
     }
 }

src/data/src/Attributes/Validation/DateEquals.php

@@ -7,14 +7,15 @@
 use Attribute;
 use DateTimeInterface;
 use Hypervel\Data\Support\Validation\References\ExternalReference;
+use Hypervel\Data\Support\Validation\References\FieldReference;
 
 #[Attribute(Attribute::TARGET_PROPERTY | Attribute::TARGET_PARAMETER)]
 class DateEquals extends StringValidationAttribute
 {
     /**
      * Create a date-equals rule attribute.
      */
-    public function __construct(protected string|DateTimeInterface|ExternalReference $date)
+    public function __construct(protected string|DateTimeInterface|FieldReference|ExternalReference $date)
     {
     }
 

src/data/src/Attributes/Validation/DeclinedIf.php

@@ -14,14 +14,18 @@ class DeclinedIf extends StringValidationAttribute
 {
     protected FieldReference $field;
 
+    protected array $values;
+
     /**
      * Create a declined-if rule attribute.
      */
     public function __construct(
         string|FieldReference $field,
         protected string|bool|int|float|BackedEnum|ExternalReference $value,
+        string|bool|int|float|BackedEnum|ExternalReference ...$values,
     ) {
         $this->field = $this->parseFieldReference($field);
+        $this->values = $values;
     }
 
     /**
@@ -40,6 +44,7 @@ public function parameters(): array
         return [
             $this->field,
             $this->value,
+            $this->values,
         ];
     }
 

src/data/src/Attributes/Validation/ExcludeIf.php

@@ -14,14 +14,18 @@ class ExcludeIf extends StringValidationAttribute
 {
     protected FieldReference $field;
 
+    protected array $values;
+
     /**
      * Create a new exclude-if validation attribute.
      */
     public function __construct(
         string|FieldReference $field,
         protected string|bool|int|float|BackedEnum|ExternalReference $value,
+        string|bool|int|float|BackedEnum|ExternalReference ...$values,
     ) {
         $this->field = $this->parseFieldReference($field);
+        $this->values = $values;
     }
 
     /**
@@ -43,6 +47,7 @@ public function parameters(): array
         return [
             $this->field,
             $this->value,
+            $this->values,
         ];
     }
 }

src/data/src/Attributes/Validation/ExcludeUnless.php

@@ -14,14 +14,18 @@ class ExcludeUnless extends StringValidationAttribute
 {
     protected FieldReference $field;
 
+    protected array $values;
+
     /**
      * Create a new exclude-unless validation attribute.
      */
     public function __construct(
         string|FieldReference $field,
         protected string|bool|int|float|BackedEnum|ExternalReference $value,
+        string|bool|int|float|BackedEnum|ExternalReference ...$values,
     ) {
         $this->field = $this->parseFieldReference($field);
+        $this->values = $values;
     }
 
     /**
@@ -40,6 +44,7 @@ public function parameters(): array
         return [
             $this->field,
             $this->value,
+            $this->values,
         ];
     }
 }

src/data/src/Attributes/Validation/ExcludeWithout.php

@@ -12,13 +12,18 @@ class ExcludeWithout extends StringValidationAttribute
 {
     protected FieldReference $field;
 
+    /** @var array<array-key, FieldReference> */
+    protected array $fields;
+
     /**
      * Create a new exclude-without validation attribute.
      */
     public function __construct(
         string|FieldReference $field,
+        string|FieldReference ...$fields,
     ) {
         $this->field = $this->parseFieldReference($field);
+        $this->fields = array_map($this->parseFieldReference(...), $fields);
     }
 
     /**
@@ -36,6 +41,7 @@ public function parameters(): array
     {
         return [
             $this->field,
+            $this->fields,
         ];
     }
 }

src/data/src/Support/Validation/DataValidationCompiler.php

@@ -8,6 +8,7 @@
 use Closure;
 use DateTimeInterface;
 use Hypervel\Contracts\Container\Container;
+use Hypervel\Contracts\Validation\ParameterizedRule;
 use Hypervel\Data\Attributes\Validation\ArrayType;
 use Hypervel\Data\Attributes\Validation\BooleanType;
 use Hypervel\Data\Attributes\Validation\Enum;
@@ -1591,9 +1592,7 @@ protected function hasDistinctRule(array $rules): bool
                 return true;
             }
 
-            if (is_string($rule)
-                && strtolower(trim(explode(':', $rule, 2)[0])) === 'distinct'
-            ) {
+            if ($this->ruleKeyword($rule) === 'distinct') {
                 return true;
             }
         }
@@ -1633,20 +1632,26 @@ protected function hasPresenceRule(array $rules): bool
                 return true;
             }
 
-            if (! is_string($rule)) {
-                continue;
-            }
-
-            $name = strtolower(trim(explode(':', $rule, 2)[0]));
-
-            if (in_array($name, self::PRESENCE_RULES, true)) {
+            if (in_array($this->ruleKeyword($rule), self::PRESENCE_RULES, true)) {
                 return true;
             }
         }
 
         return false;
     }
 
+    /**
+     * Get the keyword of a string or structured validation rule.
+     */
+    protected function ruleKeyword(mixed $rule): ?string
+    {
+        if ($rule instanceof ParameterizedRule) {
+            $rule = $rule->toArray()[0];
+        }
+
+        return is_string($rule) ? strtolower(trim(explode(':', $rule, 2)[0])) : null;
+    }
+
     /**
      * Determine if item rules can differ across one collection.
      *