From 8b80794b39a602656e5600afa475dfd9edf3f4db Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Tue, 29 Nov 2016 16:00:23 +0800
Subject: [PATCH] =?UTF-8?q?Validate=E7=B1=BB=E6=9E=B6=E6=9E=84=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=E5=A2=9E=E5=8A=A0field=E5=8F=82=E6=95=B0=20=E7=94=A8?=
 =?UTF-8?q?=E4=BA=8E=E8=AE=BE=E7=BD=AE=E9=AA=8C=E8=AF=81=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E7=9A=84=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/Validate.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/library/think/Validate.php b/library/think/Validate.php
index 17c6ae89..ac2f1925 100644
--- a/library/think/Validate.php
+++ b/library/think/Validate.php
@@ -34,6 +34,8 @@ class Validate
 
     // 验证提示信息
     protected $message = [];
+    // 验证字段描述
+    protected $field = [];
 
     // 验证规则默认提示信息
     protected static $typeMsg = [
@@ -107,11 +109,13 @@ class Validate
      * @access public
      * @param array $rules 验证规则
      * @param array $message 验证提示信息
+     * @param array $field 验证字段描述信息
      */
-    public function __construct(array $rules = [], $message = [])
+    public function __construct(array $rules = [], $message = [], $field = [])
     {
         $this->rule    = array_merge($this->rule, $rules);
         $this->message = array_merge($this->message, $message);
+        $this->field   = $field;
     }
 
     /**
@@ -119,12 +123,13 @@ class Validate
      * @access public
      * @param array     $rules 验证规则
      * @param array     $message 验证提示信息
+     * @param array     $field 验证字段描述信息
      * @return Validate
      */
-    public static function make($rules = [], $message = [])
+    public static function make($rules = [], $message = [], $field = [])
     {
         if (is_null(self::$instance)) {
-            self::$instance = new self($rules, $message);
+            self::$instance = new self($rules, $message, $field);
         }
         return self::$instance;
     }
@@ -291,7 +296,7 @@ class Validate
                 // 字段|描述 用于指定属性名称
                 list($key, $title) = explode('|', $key);
             } else {
-                $title = $key;
+                $title = isset($this->field[$key]) ? $this->field[$key] : $key;
             }
 
             // 场景检测