From 081bf602ff8451539ad1cb98f8644e98d9fee02b Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Thu, 11 Feb 2016 17:33:33 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=A8=A1=E5=BC=8F=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E6=96=87=E4=BB=B6=E8=A7=84=E8=8C=83=20namespace?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E7=BB=9F=E4=B8=80=E9=87=87=E7=94=A8=E6=95=B0?=
 =?UTF-8?q?=E7=BB=84=E5=AE=9A=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/cache/driver/Sqlite.php |  2 --
 mode/common.php                       | 22 ++++++++++------------
 mode/console.php                      | 17 ++++++++---------
 mode/sae.php                          | 20 ++++++++++----------
 start.php                             |  2 +-
 5 files changed, 29 insertions(+), 34 deletions(-)

diff --git a/library/think/cache/driver/Sqlite.php b/library/think/cache/driver/Sqlite.php
index 254bdebc..e2c63d4d 100644
--- a/library/think/cache/driver/Sqlite.php
+++ b/library/think/cache/driver/Sqlite.php
@@ -32,9 +32,7 @@ class Sqlite
 
     /**
      * 架构函数
-     *
      * @param array $options 缓存参数
-     *
      * @throws Exception
      * @access public
      */
diff --git a/mode/common.php b/mode/common.php
index 3879e1ff..465617b3 100644
--- a/mode/common.php
+++ b/mode/common.php
@@ -12,13 +12,20 @@
 /**
  * ThinkPHP 普通模式定义
  */
-
 return [
+    // 命名空间
+    'namespace' => [
+        'think'       => LIB_PATH . 'think' . DS,
+        'behavior'    => LIB_PATH . 'behavior' . DS,
+        'traits'      => LIB_PATH . 'traits' . DS,
+        APP_NAMESPACE => APP_PATH,
+    ],
+
     // 配置文件
-    'config' => THINK_PATH . 'convention' . EXT,
+    'config'    => THINK_PATH . 'convention' . EXT,
 
     // 别名定义
-    'alias'  => [
+    'alias'     => [
         'think\App'                  => CORE_PATH . 'App' . EXT,
         'think\Build'                => CORE_PATH . 'Build' . EXT,
         'think\Cache'                => CORE_PATH . 'Cache' . EXT,
@@ -46,13 +53,4 @@ return [
         'think\log\driver\File'      => CORE_PATH . 'log' . DS . 'driver' . DS . 'File' . EXT,
         'think\cache\driver\File'    => CORE_PATH . 'cache' . DS . 'driver' . DS . 'File' . EXT,
     ],
-
-    // 命名空间
-    'namespace' => [
-            'think'         => LIB_PATH . 'think' . DS,
-            'behavior'      => LIB_PATH . 'behavior' . DS,
-            'traits'        => LIB_PATH . 'traits' . DS,
-            APP_NAMESPACE   => APP_PATH,
-    ],
-
 ];
diff --git a/mode/console.php b/mode/console.php
index 82c46c5e..194893b9 100644
--- a/mode/console.php
+++ b/mode/console.php
@@ -12,19 +12,18 @@
 /**
  * ThinkPHP CLI模式定义
  */
-
 return [
 
-    'config' => [
-        'commands' => []
-    ],
-
     // 命名空间
     'namespace' => [
-            'think'         => LIB_PATH . 'think' . DS,
-            'behavior'      => LIB_PATH . 'behavior' . DS,
-            'traits'        => LIB_PATH . 'traits' . DS,
-            APP_NAMESPACE   => APP_PATH,
+        'think'       => LIB_PATH . 'think' . DS,
+        'behavior'    => LIB_PATH . 'behavior' . DS,
+        'traits'      => LIB_PATH . 'traits' . DS,
+        APP_NAMESPACE => APP_PATH,
+    ],
+
+    'config'    => [
+        'commands' => [],
     ],
 
 ];
diff --git a/mode/sae.php b/mode/sae.php
index ff3aba1f..e54e4eb1 100644
--- a/mode/sae.php
+++ b/mode/sae.php
@@ -13,8 +13,16 @@
  * ThinkPHP SAE应用模式定义文件
  */
 return [
+    // 命名空间
+    'namespace' => [
+        'think'       => LIB_PATH . 'think' . DS,
+        'behavior'    => LIB_PATH . 'behavior' . DS,
+        'traits'      => LIB_PATH . 'traits' . DS,
+        APP_NAMESPACE => APP_PATH,
+    ],
+
     // 配置文件
-    'config' => array_merge(include THINK_PATH . 'convention' . EXT, [
+    'config'    => array_merge(include THINK_PATH . 'convention' . EXT, [
         /* 数据库设置 */
         'database'         => [
             // 数据库类型
@@ -64,7 +72,7 @@ return [
     ]),
 
     // 别名定义
-    'alias'  => [
+    'alias'     => [
         'think\App'                  => CORE_PATH . 'App' . EXT,
         'think\Build'                => CORE_PATH . 'Build' . EXT,
         'think\Cache'                => CORE_PATH . 'Cache' . EXT,
@@ -96,12 +104,4 @@ return [
         'think\template\driver\Sae'  => CORE_PATH . 'template' . DS . 'driver' . DS . 'Sae' . EXT,
     ],
 
-    // 命名空间
-    'namespace' => [
-            'think'         => LIB_PATH . 'think' . DS,
-            'behavior'      => LIB_PATH . 'behavior' . DS,
-            'traits'        => LIB_PATH . 'traits' . DS,
-            APP_NAMESPACE   => APP_PATH,
-    ],
-
 ];
diff --git a/start.php b/start.php
index ce9ebbb8..3f55c5cf 100644
--- a/start.php
+++ b/start.php
@@ -24,7 +24,7 @@ $mode = require MODE_PATH . APP_MODE . EXT;
 
 // 加载空间别名定义
 if (isset($mode['namespace'])) {
-    Loader::addNamespace(is_array($mode['namespace']) ? $mode['namespace'] : include $mode['namespace']);
+    Loader::addNamespace($mode['namespace']);
 }
 
 // 加载模式别名定义