From bd498a587e28577bdec0d7974378858529a3e655 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Fri, 3 Jun 2016 16:45:55 +0800
Subject: [PATCH] =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=B1=BB=E7=9A=84check?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=20=E5=92=8C=20=E6=A8=A1=E5=9E=8B=E7=B1=BB?=
 =?UTF-8?q?=E7=9A=84=20validateData=20=E6=96=B9=E6=B3=95=20=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E5=BC=95=E7=94=A8=E4=BC=A0=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/Model.php    |  2 +-
 library/think/Validate.php | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/library/think/Model.php b/library/think/Model.php
index b9c359c3..79eb1be1 100644
--- a/library/think/Model.php
+++ b/library/think/Model.php
@@ -520,7 +520,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
      * @param array $data 验证数据
      * @return bool
      */
-    protected function validateData(&$data)
+    protected function validateData($data)
     {
         if (!empty($this->validate)) {
             $info = $this->validate;
diff --git a/library/think/Validate.php b/library/think/Validate.php
index a83a3134..ed772d95 100644
--- a/library/think/Validate.php
+++ b/library/think/Validate.php
@@ -227,7 +227,7 @@ class Validate
      * @param string $scene 验证场景
      * @return bool
      */
-    public function check(&$data, $rules = [], $scene = '')
+    public function check($data, $rules = [], $scene = '')
     {
         $this->error = [];
 
@@ -276,7 +276,7 @@ class Validate
 
             // 场景检测
             if (!empty($scene)) {
-                if ($scene instanceof \Closure && !call_user_func_array($scene, [$key, &$data])) {
+                if ($scene instanceof \Closure && !call_user_func_array($scene, [$key, $data])) {
                     continue;
                 } elseif (is_array($scene)) {
                     if (!in_array($key, $array)) {
@@ -323,11 +323,11 @@ class Validate
      * @param array $msg  提示信息
      * @return mixed
      */
-    protected function checkItem($field, $value, $rules, &$data, $title = '', $msg = [])
+    protected function checkItem($field, $value, $rules, $data, $title = '', $msg = [])
     {
         if ($rules instanceof \Closure) {
             // 匿名函数验证 支持传入当前字段和所有字段两个数据
-            $result = call_user_func_array($rules, [$value, &$data]);
+            $result = call_user_func_array($rules, [$value, $data]);
         } else {
             // 支持多规则验证 require|in:a,b,c|... 或者 ['require','in'=>'a,b,c',...]
             if (is_string($rules)) {
@@ -336,7 +336,7 @@ class Validate
             $i = 0;
             foreach ($rules as $key => $rule) {
                 if ($rule instanceof \Closure) {
-                    $result = call_user_func_array($rule, [$value, &$data]);
+                    $result = call_user_func_array($rule, [$value, $data]);
                 } else {
                     // 判断验证类型
                     if (is_numeric($key) && strpos($rule, ':')) {
@@ -358,7 +358,7 @@ class Validate
                         // 验证类型
                         $callback = isset(self::$type[$type]) ? self::$type[$type] : [$this, $type];
                         // 验证数据
-                        $result = call_user_func_array($callback, [$value, $rule, &$data, $field]);
+                        $result = call_user_func_array($callback, [$value, $rule, $data, $field]);
                     } else {
                         $result = true;
                     }
@@ -686,7 +686,7 @@ class Validate
     protected function method($value, $rule)
     {
         $method = Request::instance()->method();
-        return $method == strtoupper($rule);
+        return strtoupper($rule) == $method;
     }
 
     /**