bug fixed,update

Author: inhere

src/ValidationTrait.php

@@ -71,6 +71,11 @@ trait ValidationTrait
      */
     private $_hasValidated = false;
 
+    private $_position = [
+        'attr'      => 0,
+        'validator' => 1,
+    ];
+
     /**
      * @return array
      */
@@ -215,37 +220,43 @@ public function validate(array $onlyChecked = [], $hasErrorStop=false)
      */
     protected function doValidate($data, $name, $validator, $copy)
     {
-        $result = ValidatorList::required($data, $name);
+        if ( !isset($data[$name]) ) {
+            return [false, $validator instanceof \Closure ? 'callback' : $validator];
+        }
 
-        if ($result && $validator !== 'required') {
-            array_unshift($copy, $data[$name]);// 压入当前属性值
+        if ( $validator === 'required' ) {
+            $result = ValidatorList::required($data, $name);
 
-            // if it's a closure
-            if ( is_callable($validator) && $validator instanceof \Closure) {
-                $callback  = $validator;
-                $validator = 'callback';
+            return [$result,$validator];
+        }
 
-            // if it is a custom add callback in the property {@see $_validators}.
-            } elseif ( is_string($validator) && isset($this->_validators['validator']) ) {
+        array_unshift($copy, $data[$name]);// 压入当前属性值
 
-                $callback = $this->_validators['validator'];
+        // if it's a closure
+        if ( is_callable($validator) && $validator instanceof \Closure) {
+            $callback  = $validator;
+            $validator = 'callback';
 
-            // if it is a custom method of the subclass.
-            } elseif ( is_string($validator) && method_exists($this, $validator) ) {
+        // if it is a custom add callback in the property {@see $_validators}.
+        } elseif ( is_string($validator) && isset($this->_validators['validator']) ) {
 
-                $callback = [ $this, $validator ];
+            $callback = $this->_validators['validator'];
 
-            // it's a method of the class 'ValidatorList'
-            } elseif ( is_string($validator) && is_callable([ValidatorList::class, $validator]) ) {
+        // if it is a custom method of the subclass.
+        } elseif ( is_string($validator) && method_exists($this, $validator) ) {
 
-                $callback = [ ValidatorList::class, $validator];
-            } else {
-                throw new \InvalidArgumentException("validator [$validator] don't exists!");
-            }
+            $callback = [ $this, $validator ];
 
-            $result = call_user_func_array($callback, $copy);
+        // it's a method of the class 'ValidatorList'
+        } elseif ( is_string($validator) && is_callable([ValidatorList::class, $validator]) ) {
+
+            $callback = [ ValidatorList::class, $validator];
+        } else {
+            throw new \InvalidArgumentException("validator [$validator] don't exists!");
         }
 
+        $result = call_user_func_array($callback, $copy);
+
         return [$result,$validator];
     }
 
@@ -288,6 +299,12 @@ protected function collectRules()
 
         // 循环规则, 搜集当前场景的规则
         foreach ($this->getRules() as $rule) {
+
+            // check validator
+            if ( !is_string($rule[1]) && !($rule[1] instanceof \Closure) ) {
+                throw new \InvalidArgumentException("validator setting error!");
+            }
+
             if ( empty($rule['scene']) ) {
                 $availableRules[] = $rule;
             } else {

src/ValidatorList.php

@@ -83,7 +83,7 @@ public static function inputHasVar($type, $varName)
      */
     public static function required($data, $required)
     {
-        return isset($data[$required]) && $data[$required]!=='';
+        return isset($data[$required]) && $data[$required]!=='' && $data[$required]!==null;
     }
 
     /**
@@ -103,6 +103,10 @@ public static function required($data, $required)
      */
     public static function integer($int, array $options=[], $flags=0)
     {
+        if (!is_numeric($int)) {
+            return false;
+        }
+
         $settings = [];
 
         if ($options) {
@@ -143,10 +147,14 @@ public static function size($var, $min = null, $max = null)
     {
         $options   = [];
 
-        if (is_string($var)) {
+        if (is_numeric($var)) {
+            $var = (int)$var;
+        } elseif (is_string($var)) {
             $var = StrHelper::strlen($var);
         } elseif (is_array($var)) {
             $var = count($var);
+        } else {
+            return false;
         }
 
         if ( is_numeric($min) ) {