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

修正composer files加载

Browse Source
This commit is contained in:
thinkphp
2018-02-05 12:05:43 +08:00
parent 728ebf7b4c
commit f671c2b2ca
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
library/think/Loader.php
View File

@@ -301,6 +301,16 @@ 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;
}
}
}
} }
// 注册命名空间定义 // 注册命名空间定义
@@ -345,17 +355,6 @@ class Loader
if ($classMap) { if ($classMap) {
self::addClassMap($classMap); self::addClassMap($classMap);
} }
}
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;
}
}
} }
} }