Enhance StringRule to support alpha numeric validation and improve RegexRule to accept numeric values

Author: Fa-BRAIK

src/Validation/Rules/RegexRule.php

@@ -21,10 +21,10 @@ class RegexRule implements ValidationRule
 
     public function evaluate(mixed $value): bool
     {
-        return is_string($value) 
+        return (is_string($value) || is_numeric($value)) 
             && preg_match(
                 pattern: $this->pattern, 
-                subject: $value,
+                subject: (string) $value,
                 flags: $this->flags,
                 offset: $this->offset
             );

src/Validation/Rules/StringRule.php

@@ -11,6 +11,15 @@ class StringRule extends RegexRule
 {
     use Concerns\MinMaxValues;
 
+    protected const TYPE_STRING = 'string';
+    protected const TYPE_ALPHA = 'alpha';
+
+    /** @var list<string> */
+    protected const TYPES = [
+        self::TYPE_STRING,
+        self::TYPE_ALPHA,
+    ];
+
     public string $name {
         get {
             return 'string';
@@ -27,12 +36,24 @@ public static function make(?array $parameters = null): self
     {
         $instance = new self();
 
+        $strType = Arr::getString($parameters ?? [], 'type', self::TYPE_STRING);
+
+        if (!in_array($strType, self::TYPES)) {
+            throw ValidationRuleException::invalidParameters();
+        }
+
+        /** @var 'string' | 'alpha' $strType */
+        $strPattern = match ($strType) {
+            self::TYPE_STRING => '[a-zA-Z]',
+            self::TYPE_ALPHA => '[a-zA-Z0-9]'
+        };
+
         [$minLen, $maxLen] = self::getMinMaxValues($parameters, 'minLen', 'maxLen');
 
-        $lengthPattern = is_null($minLen) ? '.{0,' : '.{' . $minLen . ',';
+        $lengthPattern = is_null($minLen) ? '{0,' : '{' . $minLen . ',';
         $lengthPattern .= is_null($maxLen) ? '}' : $maxLen . '}';
 
-        $instance->pattern = '/^' . $lengthPattern . '$/u';
+        $instance->pattern = '/^' . $strPattern . $lengthPattern . '$/';
 
         return $instance;
     }

tests/Unit/Validation/StringRuleTest.php

@@ -43,7 +43,7 @@ public static function data_provider(): array
                 'validationRuleClassString' => StringRule::class,
                 'makeParams' => null,
                 'expectedMakeException' => null,
-                'valueToBeEvaluated' => 123,
+                'valueToBeEvaluated' => 'test1234',
                 'expectedResult' => false
             ],
             'Will evaluate true when a string value is provided' => [
@@ -109,6 +109,20 @@ public static function data_provider(): array
                 'valueToBeEvaluated' => 'test',
                 'expectedResult' => false
             ],
+            'Will evaluate alpha numeric strings as true when a param is passed' => [
+                'validationRuleClassString' => StringRule::class,
+                'makeParams' => ['type' => 'alpha'],
+                'expectedMakeException' => null,
+                'valueToBeEvaluated' => 'test123',
+                'expectedResult' => true
+            ],
+            'Will throw a validation exception when an invalid type is passed' => [
+                'validationRuleClassString' => StringRule::class,
+                'makeParams' => ['type' => 'invalid'],
+                'expectedMakeException' => ValidationRuleException::class,
+                'valueToBeEvaluated' => 'test',
+                'expectedResult' => false
+            ],
         ];
     }
 }