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

optimize:autoload增加对extend扩展目录的扫描

Browse Source
This commit is contained in:
yunwuxin
2016-08-10 14:34:12 +08:00
parent 784294f846
commit 37a6494457
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,7 +30,7 @@ class Autoload extends Command
$classmapFile = <<<EOF $classmapFile = <<<EOF
<?php <?php
/** /**
* ThinkPHP 类库映射定义 * 类库映射
*/ */
return [ return [
@@ -42,6 +42,7 @@ EOF;
'think\\' => LIB_PATH . 'think', 'think\\' => LIB_PATH . 'think',
'behavior\\' => LIB_PATH . 'behavior', 'behavior\\' => LIB_PATH . 'behavior',
'traits\\' => LIB_PATH . 'traits', 'traits\\' => LIB_PATH . 'traits',
'' => realpath(rtrim(EXTEND_PATH))
]; ];
krsort($namespacesToScan); krsort($namespacesToScan);
@@ -76,7 +77,7 @@ EOF;
foreach ($this->createMap($dir, $namespace) as $class => $path) { foreach ($this->createMap($dir, $namespace) as $class => $path) {
$pathCode = $this->getPathCode($path) . ",\n"; $pathCode = $this->getPathCode($path) . ",\n";
if (!isset($classMap[$class])) { if (!isset($classMap[$class])) {
$classMap[$class] = $pathCode; $classMap[$class] = $pathCode;
} elseif ($classMap[$class] !== $pathCode && !preg_match('{/(test|fixture|example|stub)s?/}i', strtr($classMap[$class] . ' ' . $path, '\\', '/'))) { } elseif ($classMap[$class] !== $pathCode && !preg_match('{/(test|fixture|example|stub)s?/}i', strtr($classMap[$class] . ' ' . $path, '\\', '/'))) {
@@ -114,7 +115,6 @@ EOF;
return $baseDir . (($path !== false) ? var_export($path, true) : ""); return $baseDir . (($path !== false) ? var_export($path, true) : "");
} }
protected function normalizePath($path) protected function normalizePath($path)
{ {
$parts = []; $parts = [];
@@ -202,7 +202,6 @@ EOF;
return $map; return $map;
} }
protected function findClasses($path) protected function findClasses($path)
{ {
$extraTypes = '|trait'; $extraTypes = '|trait';