zhamao-robot/zhamao-framework
1
0
Fork 0
mirror of https://github.com/zhamao-robot/zhamao-framework.git synced 2026-03-17 20:54:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #190 from zhamao-robot/fix-init-command-dir

Browse Source 
修复相对路径问题
This commit is contained in:
sunxyw 2022-12-21 01:25:49 +08:00 committed by GitHub
commit 3545e1173e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ZM/Bootstrap/LoadGlobalDefines.php
View File

@ -8,6 +8,6 @@ class LoadGlobalDefines
{
public function bootstrap(array $config): void
{
require zm_dir(SOURCE_ROOT_DIR . '/src/Globals/global_defines_framework.php');
require FRAMEWORK_ROOT_DIR . '/src/Globals/global_defines_framework.php';
}
}

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

@ -44,9 +44,7 @@ class InitCommand extends Command
'Module\\' => 'src/Module',
'Custom\\' => 'src/Custom',
],
'files' => [
'src/Custom/global_function.php',
],
'files' => [],
];
$section->write('<fg=gray>更新 composer.json ... </>');
@ -117,7 +115,6 @@ class InitCommand extends Command
'/zhamao',
'/.gitignore',
'/config/*',
'/src/Globals/*.php',
];
return $this->getFilesFromPatterns($patterns);
@ -184,12 +181,7 @@ class InitCommand extends Command
private function getVendorPath(string $file): string
{
try {
$package_name = json_decode(file_get_contents(__DIR__ . '/../../../composer.json'), true, 512, JSON_THROW_ON_ERROR)['name'];
} catch (\JsonException) {
throw new InitException('无法读取框架包的 composer.json', '请检查框架包完整性，或者重新安装框架包');
}
return $this->base_path . '/vendor/' . $package_name . $file;
return FRAMEWORK_ROOT_DIR . $file;
}
private function extractFiles(array $files, OutputInterface $output): void

14
src/ZM/ConsoleApplication.php
View File

@ -28,7 +28,19 @@ final class ConsoleApplication extends Application
}
// 初始化命令
$command_classes = FileSystem::getClassesPsr4(zm_dir('src/ZM/Command'), 'ZM\\Command');
$command_classes = [];
// 先加载框架内置命令
$command_classes = array_merge(
$command_classes,
FileSystem::getClassesPsr4(FRAMEWORK_ROOT_DIR . '/src/ZM/Command', 'ZM\\Command')
);
// 再加载用户自定义命令（如存在）
if (is_dir(SOURCE_ROOT_DIR . '/src/Command')) {
$command_classes = array_merge(
$command_classes,
FileSystem::getClassesPsr4(SOURCE_ROOT_DIR . '/src/Command', 'Command')
);
}
$commands = [];
foreach ($command_classes as $command_class) {
try {