update, add more test

Author: inhere

src/ValidationTrait.php

@@ -23,14 +23,12 @@ trait ValidationTrait
     use DataFiltersTrait, ErrorMessageTrait, UserAndContextValidatorsTrait;
 
     /**
-     * the rules is by setRules()
-     * @var array
+     * @var array The rules is by setRules()
      */
     private $_rules = [];
 
     /**
-     * Through the validation of the data
-     * @var array
+     * @var array Through the validation of the data
      */
     private $_safeData = [];
 
@@ -55,7 +53,9 @@ trait ValidationTrait
      */
     protected $scene = '';
 
-    /** @var array used rules at current scene */
+    /**
+     * @var array Used rules at current scene
+     */
     protected $_usedRules = [];
 
     /**
@@ -152,7 +152,7 @@ public function afterValidate()
      * @throws \InvalidArgumentException
      * @throws \RuntimeException
      */
-    public function validate(array $onlyChecked = null, $stopOnError = null)
+    public function validate(array $onlyChecked = null, bool $stopOnError = null)
     {
         if (!property_exists($this, 'data')) {
             throw new \InvalidArgumentException('Must be defined property "data"(array) in the sub-class used.');

test/RuleValidationTest.php

@@ -262,6 +262,27 @@ public function testValidateFailed()
         $this->assertEquals($v->getSafe('tagId'), null);
     }
 
+    public function testValidateRegex()
+    {
+        $v = RuleValidation::check([
+            'text1' => 'hello-world',
+            'text2' => 'hello world中文',
+        ],[
+            ['text1, text2', 'string'],
+            ['text1', 'regex', '/^[\w-]+$/'],
+            ['text2', 'regex', '/[\x{4e00}-\x{9fa5}]+/u'],
+        ]);
+
+        $this->assertTrue($v->isOk());
+        $this->assertFalse($v->isFail());
+
+        $errors = $v->getErrors();
+        $this->assertEmpty($errors);
+
+        $safeData = $v->getSafeData();
+        $this->assertArrayHasKey('text2', $safeData);
+    }
+
     public function testValidateString()
     {
         $val = '123482';

test/ValidatorsTest.php

@@ -176,6 +176,7 @@ public function testRegexp()
         $this->assertFalse(Validators::regexp('test', '/^\d+$/'));
         $this->assertFalse(Validators::regexp('test-dd', '/^\w+$/'));
 
+        $this->assertTrue(Validators::regexp('compose启动服务', '/[\x{4e00}-\x{9fa5}]+/u'));
         $this->assertTrue(Validators::regexp('test56', '/^\w+$/'));
     }