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

改进composer自动加载

Browse Source
This commit is contained in:
thinkphp
2018-02-06 14:27:03 +08:00
parent f671c2b2ca
commit 357052f1b4
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
library/think/Loader.php
View File

@@ -301,16 +301,6 @@ class Loader
} else { } else {
self::registerComposerLoader(); self::registerComposerLoader();
} }
if (is_file(VENDOR_PATH . 'composer/autoload_files.php')) {
$includeFiles = require VENDOR_PATH . 'composer/autoload_files.php';
foreach ($includeFiles as $fileIdentifier => $file) {
if (empty(self::$autoloadFiles[$fileIdentifier])) {
__require_file($file);
self::$autoloadFiles[$fileIdentifier] = true;
}
}
}
} }
// 注册命名空间定义 // 注册命名空间定义
@@ -325,6 +315,8 @@ class Loader
self::addClassMap(__include_file(RUNTIME_PATH . 'classmap' . EXT)); self::addClassMap(__include_file(RUNTIME_PATH . 'classmap' . EXT));
} }
self::loadComposerAutoloadFiles();
// 自动加载 extend 目录 // 自动加载 extend 目录
self::$fallbackDirsPsr4[] = rtrim(EXTEND_PATH, DS); self::$fallbackDirsPsr4[] = rtrim(EXTEND_PATH, DS);
} }
@@ -358,6 +350,20 @@ class Loader
} }
} }
// 加载composer autofile文件
public static function loadComposerAutoloadFiles()
{
if (is_file(VENDOR_PATH . 'composer/autoload_files.php')) {
$includeFiles = require VENDOR_PATH . 'composer/autoload_files.php';
foreach ($includeFiles as $fileIdentifier => $file) {
if (empty(self::$autoloadFiles[$fileIdentifier])) {
__require_file($file);
self::$autoloadFiles[$fileIdentifier] = true;
}
}
}
}
/** /**
* 导入所需的类库 同 Java 的 Import 本函数有缓存功能 * 导入所需的类库 同 Java 的 Import 本函数有缓存功能
* @access public * @access public