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

修复optimize:autoload命令在EXTEND_PATH目录不存在的情况下，类库映射生成错误问题

Browse Source
This commit is contained in:
tale
2017-03-27 17:15:43 +08:00
committed by 云无心
parent 25411d35eb
commit def37e7512
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
library/think/console/command/optimize/Autoload.php
View File

@@ -102,22 +102,22 @@ EOF;
{ {
$baseDir = ''; $baseDir = '';
$appPath = $this->normalizePath(realpath(APP_PATH));
$libPath = $this->normalizePath(realpath(LIB_PATH)); $libPath = $this->normalizePath(realpath(LIB_PATH));
$appPath = $this->normalizePath(realpath(APP_PATH));
$extendPath = $this->normalizePath(realpath(EXTEND_PATH)); $extendPath = $this->normalizePath(realpath(EXTEND_PATH));
$rootPath = $this->normalizePath(realpath(ROOT_PATH)); $rootPath = $this->normalizePath(realpath(ROOT_PATH));
$path = $this->normalizePath($path); $path = $this->normalizePath($path);
if (strpos($path, $libPath . '/') === 0) { if ($libPath !== null && strpos($path, $libPath . '/') === 0) {
$path = substr($path, strlen(LIB_PATH)); $path = substr($path, strlen(LIB_PATH));
$baseDir = 'LIB_PATH'; $baseDir = 'LIB_PATH';
} elseif (strpos($path, $appPath . '/') === 0) { } elseif ($appPath !== null && strpos($path, $appPath . '/') === 0) {
$path = substr($path, strlen($appPath) + 1); $path = substr($path, strlen($appPath) + 1);
$baseDir = 'APP_PATH'; $baseDir = 'APP_PATH';
} elseif (strpos($path, $extendPath . '/') === 0) { } elseif ($extendPath !== null && strpos($path, $extendPath . '/') === 0) {
$path = substr($path, strlen($extendPath) + 1); $path = substr($path, strlen($extendPath) + 1);
$baseDir = 'EXTEND_PATH'; $baseDir = 'EXTEND_PATH';
} elseif (strpos($path, $rootPath . '/') === 0) { } elseif ($rootPath !== null && strpos($path, $rootPath . '/') === 0) {
$path = substr($path, strlen($rootPath) + 1); $path = substr($path, strlen($rootPath) + 1);
$baseDir = 'ROOT_PATH'; $baseDir = 'ROOT_PATH';
} }
@@ -131,6 +131,9 @@ EOF;
protected function normalizePath($path) protected function normalizePath($path)
{ {
if ($path === false) {
return null;
}
$parts = []; $parts = [];
$path = strtr($path, '\\', '/'); $path = strtr($path, '\\', '/');
$prefix = ''; $prefix = '';