phprojects · admpub · Feb 17, 2017 · Jan 9, 2017 · Jan 10, 2017 · Jan 10, 2017
diff --git a/README.md b/README.md
@@ -32,7 +32,7 @@ ThinkPHP5在保持快速开发和大道至简的核心理念不变的同时，PH
 
 > ThinkPHP5的运行环境要求PHP5.4以上。
 
-详细开发文档参考 [ThinkPHP5完全开发手册](http://www.kancloud.cn/manual/thinkphp5)
+详细开发文档参考 [ThinkPHP5完全开发手册](http://www.kancloud.cn/manual/thinkphp5) 以及[ThinkPHP5入门系列教程](http://www.kancloud.cn/special/thinkphp5_quickstart)
 
 ## 目录结构
 

diff --git a/convention.php b/convention.php
@@ -206,7 +206,7 @@
         // 是否自动开启 SESSION
         'auto_start'     => true,
         'httponly'       => true,
-        'secure'         => true,
+        'secure'         => false,
     ],
 
     // +----------------------------------------------------------------------

diff --git a/lang/zh-cn.php b/lang/zh-cn.php
@@ -64,4 +64,5 @@
     'invalid request'           => '非法请求',
     'bind attr has exists'      => '模型的属性已经存在',
     'relation data not exists'  => '关联数据不存在',
+    'relation not support'      => '关联不支持',
 ];
diff --git a/library/think/Config.php b/library/think/Config.php
@@ -87,7 +87,7 @@ public static function has($name, $range = '')
             return isset(self::$config[$range][strtolower($name)]);
         } else {
             // 二维数组设置和获取支持
-            $name = explode('.', $name);
+            $name = explode('.', $name, 2);
             return isset(self::$config[$range][strtolower($name[0])][$name[1]]);
         }
     }
@@ -111,7 +111,7 @@ public static function get($name = null, $range = '')
             return isset(self::$config[$range][$name]) ? self::$config[$range][$name] : null;
         } else {
             // 二维数组设置和获取支持
-            $name    = explode('.', $name);
+            $name    = explode('.', $name, 2);
             $name[0] = strtolower($name[0]);
             return isset(self::$config[$range][$name[0]][$name[1]]) ? self::$config[$range][$name[0]][$name[1]] : null;
         }
@@ -135,7 +135,7 @@ public static function set($name, $value = null, $range = '')
                 self::$config[$range][strtolower($name)] = $value;
             } else {
                 // 二维数组设置和获取支持
-                $name                                                 = explode('.', $name);
+                $name                                                 = explode('.', $name, 2);
                 self::$config[$range][strtolower($name[0])][$name[1]] = $value;
             }
             return;

diff --git a/library/think/Controller.php b/library/think/Controller.php
@@ -40,7 +40,7 @@ class Controller
     protected $beforeActionList = [];
 
     /**
-     * 架构函数
+     * 构造方法
      * @param Request $request Request对象
      * @access public
      */

diff --git a/library/think/Model.php b/library/think/Model.php
@@ -109,7 +109,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
     protected static $initialized = [];
 
     /**
-     * 架构函数
+     * 构造方法
      * @access public
      * @param array|object $data 数据
      */
@@ -1081,7 +1081,7 @@ public function delete()
 
         // 删除条件
         $pk = $this->getPk();
-        if (isset($this->data[$pk])) {
+        if (is_string($pk) && isset($this->data[$pk])) {
             $where = [$pk => $this->data[$pk]];
         } elseif (!empty($this->updateWhere)) {
             $where = $this->updateWhere;
@@ -1426,16 +1426,11 @@ public static function useGlobalScope($use)
      */
     public static function has($relation, $operator = '>=', $count = 1, $id = '*')
     {
-        $model    = new static();
-        $relation = $model->$relation();
-        if ($relation instanceof HasMany) {
-            if (is_array($operator) || $operator instanceof \Closure) {
-                return $relation->hasWhere($operator);
-            }
-            return $relation->has($operator, $count, $id);
-        } else {
-            return $relation;
+        $relation = (new static())->$relation();
+        if (is_array($operator) || $operator instanceof \Closure) {
+            return $relation->hasWhere($operator);
         }
+        return $relation->has($operator, $count, $id);
     }
 
     /**
@@ -1447,13 +1442,7 @@ public static function has($relation, $operator = '>=', $count = 1, $id = '*')
      */
     public static function hasWhere($relation, $where = [])
     {
-        $model    = new static();
-        $relation = $model->$relation();
-        if ($relation instanceof HasMany) {
-            return $relation->hasWhere($where);
-        } else {
-            return $relation;
-        }
+        return (new static())->$relation()->hasWhere($where);
     }
 
     /**

diff --git a/library/think/Paginator.php b/library/think/Paginator.php
@@ -341,15 +341,15 @@ public function toArray()
     {
         try {
             $total = $this->total();
-        } catch (Exception $e) {
+        } catch (\DomainException $e) {
             $total = null;
         }
 
         return [
             'total'        => $total,
             'per_page'     => $this->listRows(),
             'current_page' => $this->currentPage(),
-            'data'         => $this->items->toArray()
+            'data'         => $this->items->toArray(),
         ];
     }
 

diff --git a/library/think/Request.php b/library/think/Request.php
@@ -120,7 +120,7 @@ class Request
     protected $isCheckCache;
 
     /**
-     * 架构函数
+     * 构造函数
      * @access protected
      * @param array $options 参数
      */

diff --git a/library/think/Response.php b/library/think/Response.php
@@ -40,7 +40,7 @@ class Response
     protected $content = null;
 
     /**
-     * 架构函数
+     * 构造函数
      * @access   public
      * @param mixed $data    输出数据
      * @param int   $code

diff --git a/library/think/Route.php b/library/think/Route.php
@@ -232,6 +232,7 @@ protected static function registerRules($rules, $type = '*')
     public static function rule($rule, $route = '', $type = '*', $option = [], $pattern = [])
     {
         $group = self::getGroup('name');
+
         if (!is_null($group)) {
             // 路由分组
             $option  = array_merge(self::getGroup('option'), $option);
@@ -308,6 +309,9 @@ protected static function setRule($rule, $route, $type = '*', $option = [], $pat
             $suffix = isset($option['ext']) ? $option['ext'] : null;
             self::name($name, [$key, $vars, self::$domain, $suffix]);
         }
+        if (isset($option['modular'])) {
+            $route = $option['modular'] . '/' . $route;
+        }
         if ($group) {
             if ('*' != $type) {
                 $option['method'] = $type;
@@ -1166,7 +1170,7 @@ private static function checkRule($rule, $route, $url, $pattern, $option, $depr)
         $len1 = substr_count($url, '|');
         $len2 = substr_count($rule, '/');
         // 多余参数是否合并
-        $merge = !empty($option['merge_extra_vars']) ? true : false;
+        $merge = !empty($option['merge_extra_vars']);
         if ($merge && $len1 > $len2) {
             $url = str_replace('|', $depr, $url);
             $url = implode('|', explode($depr, $url, $len2 + 1));
@@ -1277,9 +1281,6 @@ private static function parseUrlPath($url)
         } elseif (strpos($url, '/')) {
             // [模块/控制器/操作]
             $path = explode('/', $url);
-        } elseif (false !== strpos($url, '=')) {
-            // 参数1=值1&参数2=值2...
-            parse_str($url, $var);
         } else {
             $path = [$url];
         }

diff --git a/library/think/Template.php b/library/think/Template.php
@@ -57,7 +57,7 @@ class Template
     protected $storage;
 
     /**
-     * 架构函数
+     * 构造函数
      * @access public
      */
     public function __construct(array $config = [])

diff --git a/library/think/Validate.php b/library/think/Validate.php
@@ -102,7 +102,7 @@ class Validate
     protected $batch = false;
 
     /**
-     * 架构函数
+     * 构造函数
      * @access public
      * @param array $rules 验证规则
      * @param array $message 验证提示信息

diff --git a/library/think/View.php b/library/think/View.php
@@ -25,7 +25,7 @@ class View
     protected $replace = [];
 
     /**
-     * 架构函数
+     * 构造函数
      * @access public
      * @param array $engine  模板引擎参数
      * @param array $replace  字符串替换参数

diff --git a/library/think/cache/driver/File.php b/library/think/cache/driver/File.php
@@ -28,7 +28,7 @@ class File extends Driver
     ];
 
     /**
-     * 架构函数
+     * 构造函数
      * @param array $options
      */
     public function __construct($options = [])

diff --git a/library/think/cache/driver/Lite.php b/library/think/cache/driver/Lite.php
@@ -26,7 +26,7 @@ class Lite extends Driver
     ];
 
     /**
-     * 架构函数
+     * 构造函数
      * @access public
      *
      * @param array $options

diff --git a/library/think/cache/driver/Memcache.php b/library/think/cache/driver/Memcache.php
@@ -25,7 +25,7 @@ class Memcache extends Driver
     ];
 
     /**
-     * 架构函数
+     * 构造函数
      * @param array $options 缓存参数
      * @access public
      * @throws \BadFunctionCallException

diff --git a/library/think/cache/driver/Memcached.php b/library/think/cache/driver/Memcached.php
@@ -27,7 +27,7 @@ class Memcached extends Driver
     ];
 
     /**
-     * 架构函数
+     * 构造函数
      * @param array $options 缓存参数
      * @access public
      */

diff --git a/library/think/cache/driver/Redis.php b/library/think/cache/driver/Redis.php
@@ -34,7 +34,7 @@ class Redis extends Driver
     ];
 
     /**
-     * 架构函数
+     * 构造函数
      * @param array $options 缓存参数
      * @access public
      */

diff --git a/library/think/cache/driver/Sqlite.php b/library/think/cache/driver/Sqlite.php
@@ -28,7 +28,7 @@ class Sqlite extends Driver
     ];
 
     /**
-     * 架构函数
+     * 构造函数
      * @param array $options 缓存参数
      * @throws \BadFunctionCallException
      * @access public

diff --git a/library/think/cache/driver/Wincache.php b/library/think/cache/driver/Wincache.php
@@ -25,7 +25,7 @@ class Wincache extends Driver
     ];
 
     /**
-     * 架构函数
+     * 构造函数
      * @param array $options 缓存参数
      * @throws \BadFunctionCallException
      * @access public

diff --git a/library/think/cache/driver/Xcache.php b/library/think/cache/driver/Xcache.php
@@ -25,7 +25,7 @@ class Xcache extends Driver
     ];
 
     /**
-     * 架构函数
+     * 构造函数
      * @param array $options 缓存参数
      * @access public
      * @throws \BadFunctionCallException

diff --git a/library/think/controller/Rest.php b/library/think/controller/Rest.php
@@ -32,7 +32,7 @@ abstract class Rest
     ];
 
     /**
-     * 架构函数 取得模板对象实例
+     * 构造函数 取得模板对象实例
      * @access public
      */
     public function __construct()

diff --git a/library/think/controller/Yar.php b/library/think/controller/Yar.php
@@ -18,7 +18,7 @@ abstract class Yar
 {
 
     /**
-     * 架构函数
+     * 构造函数
      * @access public
      */
     public function __construct()

diff --git a/library/think/db/Builder.php b/library/think/db/Builder.php
@@ -32,7 +32,7 @@ abstract class Builder
     protected $deleteSql    = 'DELETE FROM %TABLE% %USING% %JOIN% %WHERE% %ORDER%%LIMIT% %LOCK%%COMMENT%';
 
     /**
-     * 架构函数
+     * 构造函数
      * @access public
      * @param Connection    $connection 数据库连接对象实例
      * @param Query         $query      数据库查询对象实例
@@ -379,7 +379,7 @@ protected function parseWhereItem($field, $val, $rule = '', $options = [], $bind
                 } else {
                     $zone = implode(',', $this->parseValue($value, $field));
                 }
-                $whereStr .= $key . ' ' . $exp . ' (' . $zone . ')';
+                $whereStr .= $key . ' ' . $exp . ' (' . (empty($zone) ? "''" : $zone) . ')';
             }
         } elseif (in_array($exp, ['NOT BETWEEN', 'BETWEEN'])) {
             // BETWEEN 查询

diff --git a/library/think/db/Connection.php b/library/think/db/Connection.php
@@ -125,7 +125,7 @@ abstract class Connection
     protected $bind = [];
 
     /**
-     * 架构函数 读取数据库配置信息
+     * 构造函数 读取数据库配置信息
      * @access public
      * @param array $config 数据库配置数组
      */
@@ -365,8 +365,8 @@ public function query($sql, $bind = [], $master = false, $pdo = false)
             $this->bind = $bind;
         }
 
-        //释放前次的查询结果
-        if (!empty($this->PDOStatement) && $this->PDOStatement->queryString != $sql) {
+        // 释放前次的查询结果
+        if (!empty($this->PDOStatement)) {
             $this->free();
         }