Enhance DateRule to support custom date formats and improve validation logic; update tests accordingly

Author: Fa-BRAIK

src/Validation/Rules/DateRule.php

@@ -2,8 +2,16 @@
 
 namespace Nuxtifyts\PhpDto\Validation\Rules;
 
+use Nuxtifyts\PhpDto\Exceptions\ValidationRuleException;
+use Nuxtifyts\PhpDto\Support\Arr;
+
 class DateRule implements ValidationRule
 {
+    /** 
+     *  @var list<string>
+     */
+    protected array $formats = [];    
+
     public string $name {
         get {
             return 'date';
@@ -12,19 +20,42 @@ class DateRule implements ValidationRule
 
     public function evaluate(mixed $value): bool
     {
-        return is_string($value) && strtotime($value) !== false;
+        return empty($this->formats)
+            ? is_string($value) && strtotime($value) !== false
+            : is_string($value) && array_any(
+                $this->formats,
+                static fn (string $format): bool => (bool) date_create_from_format($format, $value)
+            );
     }
 
     /** 
-     *  @param ?array<string, mixed> $parameters
+     * @param ?array<string, mixed> $parameters
+     * 
+     * @throws ValidationRuleException
      */
     public static function make(?array $parameters = null): self
     {
-        return new self();
+        $instance = new self();
+
+        $formats = Arr::getArray($parameters ?? [], 'formats', []);
+
+        if (array_any(
+            $formats,
+            static fn (mixed $format): bool => !is_string($format)
+        )) {
+            throw ValidationRuleException::invalidParameters();
+        }
+
+        /** @var array<array-key, string> $formats */
+        $instance->formats = array_values($formats);
+
+        return $instance;
     }
 
     public function validationMessage(): string
     {
-        return 'The :attribute must be a valid date.';
+        return empty($this->formats) 
+            ? 'The :attribute must be a valid date.'
+            : 'The :attribute must be a valid date in one of the following formats: ' . implode(', ', $this->formats);
     }
 }

tests/Unit/Validation/DateRuleTest.php

@@ -2,12 +2,15 @@
 
 namespace Nuxtifyts\PhpDto\Tests\Unit\Validation;
 
-use Nuxtifyts\PhpDto\Validation\Rules\DateRule;
-use PHPUnit\Framework\Attributes\CoversClass;
-use PHPUnit\Framework\Attributes\Test;
 use Throwable;
+use PHPUnit\Framework\Attributes\Test;
+use PHPUnit\Framework\Attributes\CoversClass;
+use Nuxtifyts\PhpDto\Validation\Rules\DateRule;
+use Nuxtifyts\PhpDto\Exceptions\ValidationRuleException;
+use Nuxtifyts\PhpDto\Validation\Rules\ValidationRule;
 
 #[CoversClass(DateRule::class)]
+#[CoversClass(ValidationRuleException::class)]
 final class DateRuleTest extends ValidationRuleTestCase
 {
     /** 
@@ -24,8 +27,8 @@ public function validate_validation_message(): void
         );
     }
 
-    /** 
-     *  @return array<string, array{
+    /**
+     * @return array<string, array{
      *     validationRuleClassString: class-string<ValidationRule>,
      *     makeParams: ?array<string, mixed>,
      *     expectedMakeException: ?class-string<ValidationRuleException>,
@@ -64,6 +67,27 @@ public static function data_provider(): array
                 'valueToBeEvaluated' => '2021-01-01 00:00:00',
                 'expectedResult' => true
             ],
+            'Will evaluate false when a custom datetime string is provided but no formats are set' => [
+                'validationRuleClassString' => DateRule::class,
+                'makeParams' => null,
+                'expectedMakeException' => null,
+                'valueToBeEvaluated' => '2021/01-01 00/00/00',
+                'expectedResult' => false
+            ],
+            'Will evaluate true when a custom datetime string is provided and a format is set' => [
+                'validationRuleClassString' => DateRule::class,
+                'makeParams' => ['formats' => ['Y/m-d H/m/s']],
+                'expectedMakeException' => null,
+                'valueToBeEvaluated' => '2021/01-01 00/00/00',
+                'expectedResult' => true
+            ],
+            'Will throw an exception when an invalid non string format is passed' => [
+                'validationRuleClassString' => DateRule::class,
+                'makeParams' => ['formats' => ['Y/m-d H/m/s', 123]],
+                'expectedMakeException' => ValidationRuleException::class,
+                'valueToBeEvaluated' => '2021/01-01 00/00/00',
+                'expectedResult' => false
+            ],
         ];
     }
 }