Add ‘regex’ rule for strings

Author: cdtweb

src/Validator.php

@@ -628,10 +628,10 @@ protected function validateString($value, array $rule = []): bool
 
         if (isset($rule['equals']) && is_string($rule['equals'])) {
             $valid = $valid && $value == $rule['equals'];
-        }
-
-        if (isset($rule['in']) && is_array($rule['in'])) {
+        } elseif (isset($rule['in']) && is_array($rule['in'])) {
             $valid = $valid && in_array($value, $rule['in']);
+        } elseif (isset($rule['regex']) && is_string($rule['regex'])) {
+            $valid = $valid && preg_match($rule['regex'], $value);
         }
 
         if (isset($rule['allow_empty']) && $rule['allow_empty'] === false) {
@@ -826,7 +826,7 @@ protected function validateDateTime($value, array $rule = []): bool
         $value = (string) $value;
         $compare = $value;
 
-        if(strlen($compare) == 4){
+        if (strlen($compare) == 4) {
             // Value is presumably a 4-digit year (e.g. 2016) and as-is doesn't
             // play nice with strtotime() or date_create()
             $compare .= "-01-01";

tests/ValidatorTest.php

@@ -342,6 +342,7 @@ public function testValidateString()
         $str_allow_null = ['allow_null' => true];
         $str_equals = ['equals' => 'Hello, World!'];
         $str_in = ['in' => ['hello', 'world', 'foo', 'bar']];
+        $str_regex = ['regex' => "/php/i"];
 
         $this->assertTrue(Validator::isString('abc', array_merge($str_min_length, $str_max_length)));
         $this->assertFalse(Validator::isString('', $str_min_length));
@@ -354,6 +355,8 @@ public function testValidateString()
         $this->assertFalse(Validator::isString('Hello World!', $str_equals));
         $this->assertTrue(Validator::isString('foo', $str_in));
         $this->assertFalse(Validator::isString('cat', $str_in));
+        $this->assertTrue(Validator::isString('PHP is my favorite!', $str_regex));
+        $this->assertFalse(Validator::isString('Java is my favorite!', $str_regex));
     }
 
     /**