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

应用命名空间取消配置 便于在配置文件中调用应用类

Browse Source
This commit is contained in:
thinkphp
2017-04-24 15:04:59 +08:00
parent 74a2cedd0c
commit 2d225b0f80
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
convention.php
View File

@@ -5,8 +5,6 @@ return [
// | 应用设置 // | 应用设置
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
// 应用命名空间
'app_namespace' => 'app',
// 应用调试模式 // 应用调试模式
'app_debug' => true, 'app_debug' => true,
// 应用Trace // 应用Trace

6
library/think/App.php
View File

@@ -414,6 +414,9 @@ class App
public static function initCommon() public static function initCommon()
{ {
if (empty(self::$init)) { if (empty(self::$init)) {
// 注册应用命名空间
Loader::addNamespace(self::$namespace, APP_PATH);
// 初始化应用 // 初始化应用
$config = self::init(); $config = self::init();
self::$suffix = $config['class_suffix']; self::$suffix = $config['class_suffix'];
@@ -433,9 +436,6 @@ class App
} }
} }
// 注册应用命名空间
self::$namespace = $config['app_namespace'];
Loader::addNamespace($config['app_namespace'], APP_PATH);
if (!empty($config['root_namespace'])) { if (!empty($config['root_namespace'])) {
Loader::addNamespace($config['root_namespace']); Loader::addNamespace($config['root_namespace']);
} }