调整验证分组方法名

top-think · Dec 18, 2024 · 76f2d71 · 76f2d71
1 parent 4752b4d
commit 76f2d71
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/think/Validate.php b/src/think/Validate.php
@@ -636,10 +636,6 @@ public function check(array $data, array | string $rules = []): bool
     {
         $this->error = [];
 
-        if ($this->currentScene) {
-            $this->getScene($this->currentScene);
-        }
-
         if (empty($rules)) {
             // 读取验证规则
             $rules = $this->rules();
@@ -659,6 +655,10 @@ public function check(array $data, array | string $rules = []): bool
             $rules =  $rules->getRules();
         }
 
+        if ($this->currentScene) {
+            $this->getScene($this->currentScene);
+        }
+
         foreach ($this->append as $key => $rule) {
             if (!isset($rules[$key])) {
                 $rules[$key] = $rule;
@@ -2107,7 +2107,7 @@ protected function getScene(string $scene): void
      */
     protected function getGroupRules(string $group)
     {
-        $method = 'group' . Str::studly($group);
+        $method = 'rules' . Str::studly($group);
         if (method_exists($this, $method)) {
             $validate = call_user_func_array([$this, $method], [new self]);
             return $validate->alias($this->alias)