mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-01 12:42:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

调整模式定义文件规范 namespace定义统一采用数组定义

Browse Source
This commit is contained in:
thinkphp
2016-02-11 17:33:33 +08:00
parent 6ee3e78168
commit 081bf602ff
5 changed files with 29 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library/think/cache/driver/Sqlite.php vendored
View File

@@ -32,9 +32,7 @@ class Sqlite
/** /**
* 架构函数 * 架构函数
*
* @param array $options 缓存参数 * @param array $options 缓存参数
*
* @throws Exception * @throws Exception
* @access public * @access public
*/ */

22
mode/common.php
View File

@@ -12,13 +12,20 @@
/** /**
* ThinkPHP 普通模式定义 * ThinkPHP 普通模式定义
*/ */
return [ 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\App' => CORE_PATH . 'App' . EXT,
'think\Build' => CORE_PATH . 'Build' . EXT, 'think\Build' => CORE_PATH . 'Build' . EXT,
'think\Cache' => CORE_PATH . 'Cache' . 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\log\driver\File' => CORE_PATH . 'log' . DS . 'driver' . DS . 'File' . EXT,
'think\cache\driver\File' => CORE_PATH . 'cache' . 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,
],
]; ];

17
mode/console.php
View File

@@ -12,19 +12,18 @@
/** /**
* ThinkPHP CLI模式定义 * ThinkPHP CLI模式定义
*/ */
return [ return [
'config' => [
'commands' => []
],
// 命名空间 // 命名空间
'namespace' => [ 'namespace' => [
'think' => LIB_PATH . 'think' . DS, 'think' => LIB_PATH . 'think' . DS,
'behavior' => LIB_PATH . 'behavior' . DS, 'behavior' => LIB_PATH . 'behavior' . DS,
'traits' => LIB_PATH . 'traits' . DS, 'traits' => LIB_PATH . 'traits' . DS,
APP_NAMESPACE => APP_PATH, APP_NAMESPACE => APP_PATH,
],
'config' => [
'commands' => [],
], ],
]; ];

20
mode/sae.php
View File

@@ -13,8 +13,16 @@
* ThinkPHP SAE应用模式定义文件 * ThinkPHP SAE应用模式定义文件
*/ */
return [ 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' => [ 'database' => [
// 数据库类型 // 数据库类型
@@ -64,7 +72,7 @@ return [
]), ]),
// 别名定义 // 别名定义
'alias' => [ 'alias' => [
'think\App' => CORE_PATH . 'App' . EXT, 'think\App' => CORE_PATH . 'App' . EXT,
'think\Build' => CORE_PATH . 'Build' . EXT, 'think\Build' => CORE_PATH . 'Build' . EXT,
'think\Cache' => CORE_PATH . 'Cache' . EXT, 'think\Cache' => CORE_PATH . 'Cache' . EXT,
@@ -96,12 +104,4 @@ return [
'think\template\driver\Sae' => CORE_PATH . 'template' . DS . 'driver' . DS . 'Sae' . EXT, '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,
],
]; ];

2
start.php
View File

@@ -24,7 +24,7 @@ $mode = require MODE_PATH . APP_MODE . EXT;
// 加载空间别名定义 // 加载空间别名定义
if (isset($mode['namespace'])) { if (isset($mode['namespace'])) {
Loader::addNamespace(is_array($mode['namespace']) ? $mode['namespace'] : include $mode['namespace']); Loader::addNamespace($mode['namespace']);
} }
// 加载模式别名定义 // 加载模式别名定义