File tree Expand file tree Collapse file tree 2 files changed +13
-9
lines changed Expand file tree Collapse file tree 2 files changed +13
-9
lines changed Original file line number Diff line number Diff line change @@ -56,16 +56,20 @@ protected function collectRules()
56
56
57
57
// an rule for special scene.
58
58
if (!empty ($ rule ['on ' ])) {
59
+ if (!$ scene ) {
60
+ continue ;
61
+ }
62
+
59
63
$ sceneList = \is_string ($ rule ['on ' ]) ? Helper::explode ($ rule ['on ' ]) : (array )$ rule ['on ' ];
60
64
61
- if ($ scene && !\in_array ($ scene , $ sceneList , true )) {
65
+ if (!\in_array ($ scene , $ sceneList , true )) {
62
66
continue ;
63
67
}
64
68
65
69
unset($ rule ['on ' ]);
66
- $ this ->_usedRules [] = $ rule ;
67
70
}
68
71
72
+ $ this ->_usedRules [] = $ rule ;
69
73
$ field = array_shift ($ rule );
70
74
71
75
if (\is_object ($ rule [0 ])) {
Original file line number Diff line number Diff line change @@ -402,22 +402,22 @@ protected function collectRules()
402
402
throw new \InvalidArgumentException ('The rule validator is must be setting! position: rule[1]. ' );
403
403
}
404
404
405
- // global rule.
406
- if (empty ($ rule ['on ' ])) {
407
- $ this ->_usedRules [] = $ rule ;
405
+ // only use to special scene.
406
+ if (!empty ($ rule ['on ' ])) {
407
+ if (!$ scene ) {
408
+ continue ;
409
+ }
408
410
409
- // only use to special scene.
410
- } else {
411
411
$ sceneList = \is_string ($ rule ['on ' ]) ? Helper::explode ($ rule ['on ' ]) : (array )$ rule ['on ' ];
412
412
413
- if ($ scene && !\in_array ($ scene , $ sceneList , true )) {
413
+ if (!\in_array ($ scene , $ sceneList , true )) {
414
414
continue ;
415
415
}
416
416
417
417
unset($ rule ['on ' ]);
418
- $ this ->_usedRules [] = $ rule ;
419
418
}
420
419
420
+ $ this ->_usedRules [] = $ rule ;
421
421
$ fields = array_shift ($ rule );
422
422
423
423
yield $ fields => $ this ->prepareRule ($ rule );
You can’t perform that action at this time.
0 commit comments