fix(V): 校验规则传入关联数组作为选项无效

twinh · Oct 26, 2020 · b62cd31 · b62cd31
1 parent e1e5169
commit b62cd31
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 3 deletions.
diff --git a/lib/V.php b/lib/V.php
@@ -50,13 +50,13 @@
  * @method $this notUppercase()
  *
  * Length
- * @method $this length($length, $min = null, $max = null) Check if the length (or size) is equals or in specified range
+ * @method $this length($length, $min = null, $max = null) Check if the length ( or size) is equals or in specified range
  * @method $this notLength($length, $min = null, $max = null)
  * @method $this charLength($length) Check if the characters length of input is equals specified length
  * @method $this notCharLength($length)
- * @method $this minLength($min) Check if the length (or size) of input is greater than specified length
+ * @method $this minLength($min) Check if the length ( or size) of input is greater than specified length
  * @method $this notMinLength($min)
- * @method $this maxLength($max) Check if the length (or size) of input is lower than specified length
+ * @method $this maxLength($max) Check if the length ( or size) of input is lower than specified length
  * @method $this notMaxLength($max)
  *
  * Comparison
@@ -214,6 +214,12 @@ public function __call($name, $args)
         if (method_exists($this, $name)) {
             return $this->{$name}(...$args);
         }
+
+        // Convert options [[option: xx]] to [option: xx]
+        if (count($args) === 1 && is_array($args[0])) {
+            $args = $args[0];
+        }
+
         return $this->addRule($name, $args);
     }
 

diff --git a/tests/unit/VTest.php b/tests/unit/VTest.php
@@ -157,6 +157,25 @@ public function testCheckBeforeModelUpdate()
         $this->assertRetSuc($ret);
     }
 
+    public function testOptions()
+    {
+        $ret = V::key('name')->maxLength([
+            'max' => 1,
+            'countByChars' => false,
+        ])->check([
+            'name' => '我',
+        ]);
+        $this->assertRetErr($ret, null, 'This value must have a length lower than 1');
+
+        $ret = V::key('name')->maxLength([
+            'max' => 1,
+            'countByChars' => true,
+        ])->check([
+            'name' => '我',
+        ]);
+        $this->assertRetSuc($ret);
+    }
+
     protected function checkModel(bool $isNew, $data)
     {
         return V::key('name', 'Name')->required($isNew)->notBlank()