mirror of
https://gitee.com/fastadminnet/framework.git
synced 2026-07-01 12:42:48 +08:00
改进Composer自动加载的判断机制 增加 vendor目录下面的think_autoload文件判断
This commit is contained in:
@@ -40,7 +40,7 @@ class Controller
|
||||
|
||||
/**
|
||||
* 架构函数
|
||||
* @param \think\Request $request Request对象
|
||||
* @param Request $request Request对象
|
||||
* @access public
|
||||
*/
|
||||
public function __construct(Request $request = null)
|
||||
|
||||
@@ -33,13 +33,7 @@ class Loader
|
||||
// PSR-0
|
||||
private static $prefixesPsr0 = [];
|
||||
// Composer自动加载
|
||||
private static $composerLoader = true;
|
||||
|
||||
// 自动加载Composer
|
||||
public static function composerAutoLoader($auto)
|
||||
{
|
||||
self::$composerLoader = $auto;
|
||||
}
|
||||
private static $composerLoader = false;
|
||||
|
||||
// 自动加载
|
||||
public static function autoload($class)
|
||||
@@ -126,9 +120,17 @@ class Loader
|
||||
{
|
||||
// 注册系统自动加载
|
||||
spl_autoload_register($autoload ?: 'think\\Loader::autoload');
|
||||
// 注册composer自动加载
|
||||
if (self::$composerLoader) {
|
||||
|
||||
if (is_dir(VENDOR_PATH . 'composer')) {
|
||||
// 注册Composer自动加载
|
||||
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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user