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

改进Loader类

Browse Source
This commit is contained in:
thinkphp
2016-06-21 17:33:58 +08:00
parent 7229a1d76a
commit d95ef85e86
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
library/think/Loader.php
View File

@@ -150,22 +150,22 @@ class Loader
include $file; include $file;
} }
} }
} else { } elseif (is_dir(VENDOR_PATH)) {
self::scanComposerPackage(); self::scanComposerPackage(VENDOR_PATH);
} }
} }
} }
// 扫描composer package // 扫描composer package
private static function scanComposerPackage() private static function scanComposerPackage($path)
{ {
// 自动扫描下载Composer安装类库 // 自动扫描下载Composer安装类库
$dirs = scandir(VENDOR_PATH, 1); $dirs = scandir($path, 1);
$namespace = []; $namespace = [];
foreach ($dirs as $dir) { foreach ($dirs as $dir) {
if ('.' != $dir && '..' != $dir && is_file(VENDOR_PATH . $dir . DS . 'composer.json')) { if ('.' != $dir && '..' != $dir && is_file($path . $dir . DS . 'composer.json')) {
// 解析 package的composer.json 文件 // 解析 package的composer.json 文件
$namespace = array_merge($namespace, self::parseComposerPackage(VENDOR_PATH . $dir . DS)); $namespace = array_merge($namespace, self::parseComposerPackage($path . $dir . DS));
} }
} }
if (!empty($namespace)) { if (!empty($namespace)) {