修复验证器重写字段描述后bug

Author: lphkxd

LICENSE

@@ -33,6 +33,5 @@
   },
   "config": {
     "sort-packages": true
-  },
-  "prefer-stable": true
+  }
 }

README.md

@@ -93,32 +93,20 @@ private function validationData($validation, $verData, $class, $proceedingJoinPo
             }
             $rules = $validate->getSceneRule($validation->scene);
         }
+
         if ($validate->batch($validation->batch)->check($verData, $rules, $validation->scene) === false) {
             throw new ValidateException($validate->getError());
         }
         if ($validation->security) {
-            $fields = [];
-            foreach ($rules as $field => $rule) {
-                if (is_numeric($field)) {
-                    $field = $rule;
-                }
-                $fields[$field] = 1;
-            }
+            $fields = $this->getFields($rules);
             foreach ($verData as $key => $item) {
-                if (!isset($fields[$key])) {
+                if (!in_array($key, $fields)) {
                     throw new ValidateException('params ' . $key . ' invalid');
                 }
             }
         };
-
         if ($validation->filter) {
-            $fields = [];
-            foreach ($rules as $field => $rule) {
-                if (is_numeric($field)) {
-                    $field = $rule;
-                }
-                $fields[] = $field;
-            }
+            $fields = $this->getFields($rules);
             $verData = array_filter($verData, function ($value, $key) use ($fields) {
                 return in_array($key, $fields);
             }, ARRAY_FILTER_USE_BOTH);
@@ -135,4 +123,20 @@ private function validationData($validation, $verData, $class, $proceedingJoinPo
             }
         }
     }
+
+    protected function getFields(array $rules)
+    {
+        $fields = [];
+        foreach ($rules as $field => $rule) {
+            if (is_numeric($field)) {
+                $field = $rule;
+            }
+            if (strpos($field, '|')) {
+                // 字段|描述 用于指定属性名称
+                list($field,) = explode('|', $field);
+            }
+            $fields[] = $field;
+        }
+        return $fields;
+    }
 }

composer.json

@@ -418,11 +418,6 @@ public function check($data, $rules = [], $scene = '')
                 $title = isset($this->field[$key]) ? $this->field[$key] : $key;
             }
 
-            // 场景检测
-            if (!empty($this->only) && !in_array($key, $this->only)) {
-                continue;
-            }
-
             // 获取数据 支持二维数组
             $value = $this->getDataValue($data, $key);
             switch (true) {