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

simplify duplicated composer executable getter

Browse Source
This commit is contained in:
crazywhalecc
2023-03-29 20:44:34 +08:00
committed by Jerry
parent 44097f9935
commit eeb3481c5a
3 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,6 +9,7 @@ use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\ConsoleSectionOutput; use Symfony\Component\Console\Output\ConsoleSectionOutput;
use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Output\OutputInterface;
use ZM\Exception\InitException; use ZM\Exception\InitException;
use ZM\Utils\ZMUtil;
#[AsCommand(name: 'init', description: '初始化框架运行的基础文件')] #[AsCommand(name: 'init', description: '初始化框架运行的基础文件')]
class InitCommand extends Command class InitCommand extends Command
@@ -75,10 +76,7 @@ class InitCommand extends Command
$section->write('<fg=gray>执行 composer dump-autoload ... </>'); $section->write('<fg=gray>执行 composer dump-autoload ... </>');
// 兼容内建 Composer // 兼容内建 Composer
$env = getenv('COMPOSER_EXECUTABLE'); $env = ZMUtil::getComposerExecutable();
if ($env === false) {
$env = 'composer';
}
passthru(PHP_BINARY . ' ' . escapeshellcmd($env) . ' dump-autoload'); passthru(PHP_BINARY . ' ' . escapeshellcmd($env) . ' dump-autoload');
$section->writeln('<info>完成</info>'); $section->writeln('<info>完成</info>');

6
src/ZM/Utils/CodeGenerator/PluginGenerator.php
View File

@@ -6,6 +6,7 @@ namespace ZM\Utils\CodeGenerator;
use ZM\Exception\FileSystemException; use ZM\Exception\FileSystemException;
use ZM\Store\FileSystem; use ZM\Store\FileSystem;
use ZM\Utils\ZMUtil;
/** /**
* Class PluginGenerator * Class PluginGenerator
@@ -81,10 +82,7 @@ class PluginGenerator
file_put_contents(zm_dir($plugin_base_dir . '/composer.json'), json_encode($composer, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE)); file_put_contents(zm_dir($plugin_base_dir . '/composer.json'), json_encode($composer, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
// TODO: 寻找 PHP 运行环境和 Composer 是否在当前目录的情况 // TODO: 寻找 PHP 运行环境和 Composer 是否在当前目录的情况
chdir($plugin_base_dir); chdir($plugin_base_dir);
$env = getenv('COMPOSER_EXECUTABLE'); $env = ZMUtil::getComposerExecutable();
if ($env === false) {
$env = 'composer';
}
passthru(PHP_BINARY . ' ' . escapeshellcmd($env) . ' dump-autoload'); passthru(PHP_BINARY . ' ' . escapeshellcmd($env) . ' dump-autoload');
chdir(WORKING_DIR); chdir(WORKING_DIR);
return $plugin_base_dir; return $plugin_base_dir;

12
src/ZM/Utils/ZMUtil.php
View File

@@ -27,4 +27,16 @@ class ZMUtil
{ {
return file_put_contents(($path ?? SOURCE_ROOT_DIR) . '/composer.json', json_encode($content, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE)); return file_put_contents(($path ?? SOURCE_ROOT_DIR) . '/composer.json', json_encode($content, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
} }
/**
* 获取当前 Composer 二进制执行命令的初始位置
*/
public static function getComposerExecutable(): string
{
$env = getenv('COMPOSER_EXECUTABLE');
if ($env === false) {
$env = 'composer';
}
return $env;
}
} }