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']); } // 加载模式别名定义