diff --git a/library/think/Loader.php b/library/think/Loader.php index 141f8200..e75fe53c 100644 --- a/library/think/Loader.php +++ b/library/think/Loader.php @@ -301,16 +301,6 @@ class Loader } else { 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::loadComposerAutoloadFiles(); + // 自动加载 extend 目录 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 本函数有缓存功能 * @access public