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

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

View File

@@ -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,
],
];