bug fixed for collect rules, when sence is not empty.

Author: inhere

src/FieldValidation.php

@@ -56,16 +56,20 @@ protected function collectRules()
 
             // an rule for special scene.
             if (!empty($rule['on'])) {
+                if (!$scene) {
+                    continue;
+                }
+
                 $sceneList = \is_string($rule['on']) ? Helper::explode($rule['on']) : (array)$rule['on'];
 
-                if ($scene && !\in_array($scene, $sceneList, true)) {
+                if (!\in_array($scene, $sceneList, true)) {
                     continue;
                 }
 
                 unset($rule['on']);
-                $this->_usedRules[] = $rule;
             }
 
+            $this->_usedRules[] = $rule;
             $field = array_shift($rule);
 
             if (\is_object($rule[0])) {

src/ValidationTrait.php

@@ -402,22 +402,22 @@ protected function collectRules()
                 throw new \InvalidArgumentException('The rule validator is must be setting! position: rule[1].');
             }
 
-            // global rule.
-            if (empty($rule['on'])) {
-                $this->_usedRules[] = $rule;
+            // only use to special scene.
+            if (!empty($rule['on'])) {
+                if (!$scene) {
+                    continue;
+                }
 
-                // only use to special scene.
-            } else {
                 $sceneList = \is_string($rule['on']) ? Helper::explode($rule['on']) : (array)$rule['on'];
 
-                if ($scene && !\in_array($scene, $sceneList, true)) {
+                if (!\in_array($scene, $sceneList, true)) {
                     continue;
                 }
 
                 unset($rule['on']);
-                $this->_usedRules[] = $rule;
             }
 
+            $this->_usedRules[] = $rule;
             $fields = array_shift($rule);
 
             yield $fields => $this->prepareRule($rule);