From 18f8ee155de5fd702e18fd963dca51cfbae0bda3 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Sat, 24 Dec 2016 21:44:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=84=E8=8C=83=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/console/output/driver/Console.php       | 2 +-
 library/think/db/exception/BindParamException.php     | 2 +-
 library/think/db/exception/DataNotFoundException.php  | 8 ++++----
 library/think/db/exception/ModelNotFoundException.php | 8 ++++----
 library/think/template/taglib/Cx.php                  | 4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/library/think/console/output/driver/Console.php b/library/think/console/output/driver/Console.php
index a6e89218..3fbe224f 100644
--- a/library/think/console/output/driver/Console.php
+++ b/library/think/console/output/driver/Console.php
@@ -219,7 +219,7 @@ class Console
     private function getMode()
     {
         if (!function_exists('proc_open')) {
-            return null;
+            return;
         }
 
         $descriptorspec = [1 => ['pipe', 'w'], 2 => ['pipe', 'w']];
diff --git a/library/think/db/exception/BindParamException.php b/library/think/db/exception/BindParamException.php
index 585a0d73..3872e7c0 100644
--- a/library/think/db/exception/BindParamException.php
+++ b/library/think/db/exception/BindParamException.php
@@ -16,7 +16,7 @@ use think\exception\DbException;
 /**
  * PDO参数绑定异常
  */
-class BindParamException extends DbException 
+class BindParamException extends DbException
 {
 
     /**
diff --git a/library/think/db/exception/DataNotFoundException.php b/library/think/db/exception/DataNotFoundException.php
index efd66d3b..cd4253ab 100644
--- a/library/think/db/exception/DataNotFoundException.php
+++ b/library/think/db/exception/DataNotFoundException.php
@@ -13,7 +13,7 @@ namespace think\db\exception;
 
 use think\exception\DbException;
 
-class DataNotFoundException extends DbException 
+class DataNotFoundException extends DbException
 {
     protected $table;
 
@@ -23,10 +23,10 @@ class DataNotFoundException extends DbException
      * @param string $table
      * @param array $config
      */
-    public function __construct($message, $table = '', Array $config = [])
+    public function __construct($message, $table = '', array $config = [])
     {
-        $this->message  = $message;
-        $this->table    = $table;
+        $this->message = $message;
+        $this->table   = $table;
 
         $this->setData('Database Config', $config);
     }
diff --git a/library/think/db/exception/ModelNotFoundException.php b/library/think/db/exception/ModelNotFoundException.php
index 69b70965..1d4724a6 100644
--- a/library/think/db/exception/ModelNotFoundException.php
+++ b/library/think/db/exception/ModelNotFoundException.php
@@ -13,7 +13,7 @@ namespace think\db\exception;
 
 use think\exception\DbException;
 
-class ModelNotFoundException extends DbException 
+class ModelNotFoundException extends DbException
 {
     protected $model;
 
@@ -22,10 +22,10 @@ class ModelNotFoundException extends DbException
      * @param string $message
      * @param string $model
      */
-    public function __construct($message, $model = '', Array $config = [])
+    public function __construct($message, $model = '', array $config = [])
     {
-        $this->message  = $message;
-        $this->model    = $model;
+        $this->message = $message;
+        $this->model   = $model;
 
         $this->setData('Database Config', $config);
     }
diff --git a/library/think/template/taglib/Cx.php b/library/think/template/taglib/Cx.php
index b15c7bba..1a23c764 100644
--- a/library/think/template/taglib/Cx.php
+++ b/library/think/template/taglib/Cx.php
@@ -620,8 +620,8 @@ class Cx extends Taglib
         return $parseStr;
     }
 
-     /**
-     * U函数的tag标签
+    /**
+     * url函数的tag标签
      * 格式：{url link="模块/控制器/方法" vars="参数" suffix="true或者false 是否带有后缀" domain="true或者false 是否携带域名" /}
      * @access public
      * @param array $tag 标签属性