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

改进Composer自动加载的判断机制 增加 vendor目录下面的think_autoload文件判断

Browse Source
This commit is contained in:
thinkphp
2016-06-20 19:17:43 +08:00
parent a032828d5c
commit 5c7618f2fa
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library/think/Controller.php
View File

@@ -40,7 +40,7 @@ class Controller
/** /**
* 架构函数 * 架构函数
* @param \think\Request $request Request对象 * @param Request $request Request对象
* @access public * @access public
*/ */
public function __construct(Request $request = null) public function __construct(Request $request = null)

20
library/think/Loader.php
View File

@@ -33,13 +33,7 @@ class Loader
// PSR-0 // PSR-0
private static $prefixesPsr0 = []; private static $prefixesPsr0 = [];
// Composer自动加载 // Composer自动加载
private static $composerLoader = true; private static $composerLoader = false;
// 自动加载Composer
public static function composerAutoLoader($auto)
{
self::$composerLoader = $auto;
}
// 自动加载 // 自动加载
public static function autoload($class) public static function autoload($class)
@@ -126,9 +120,17 @@ class Loader
{ {
// 注册系统自动加载 // 注册系统自动加载
spl_autoload_register($autoload ?: 'think\\Loader::autoload'); spl_autoload_register($autoload ?: 'think\\Loader::autoload');
// 注册composer自动加载
if (self::$composerLoader) { if (is_dir(VENDOR_PATH . 'composer')) {
// 注册Composer自动加载
self::registerComposerLoader(); self::registerComposerLoader();
self::$composerLoader = true;
} elseif(is_file(VENDOR_PATH . 'think_autoload.php')) {
// 读取Composer自动加载文件
$autoload = include VENDOR_PATH . 'think_autoload.php';
if (is_array($autoload)) {
self::addMap($autoload);
}
} }
} }