zhamao-robot/zhamao-framework
1
0
Fork 0
mirror of https://github.com/zhamao-robot/zhamao-framework.git synced 2026-07-24 17:15:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #295 from zhamao-robot/fix-init-command-compatibility

Browse Source 
修复初始化命令兼容性问题
This commit is contained in:
sunxyw
2023-02-11 19:42:16 +08:00
committed by GitHub
parent 9db6bac131 50cc73c132
commit 68a668a513
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ZM/Command/InitCommand.php
View File

@@ -62,7 +62,7 @@ class InitCommand extends Command
if (!isset($composer['autoload'])) { if (!isset($composer['autoload'])) {
$composer['autoload'] = $autoload; $composer['autoload'] = $autoload;
} else { } else {
$composer['autoload'] = array_merge_recursive($composer['autoload'], $autoload); $composer['autoload'] = array_merge($composer['autoload'], $autoload);
} }
try { try {
@@ -125,7 +125,7 @@ class InitCommand extends Command
$files = []; $files = [];
foreach ($patterns as $pattern) { foreach ($patterns as $pattern) {
// TODO: 优化代码，避免在循环中使用 array_merge 以减少资源消耗 // TODO: 优化代码，避免在循环中使用 array_merge 以减少资源消耗
$files = array_merge($files, glob($this->getVendorPath($pattern), GLOB_BRACE)); $files = array_merge($files, glob($this->getVendorPath($pattern)));
} }
return array_map(fn ($file) => str_replace($this->getVendorPath(''), '', $file), $files); return array_map(fn ($file) => str_replace($this->getVendorPath(''), '', $file), $files);
} }