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

fix unpack autoload not working, change exclude_annotate to another name (build 444)

Browse Source
This commit is contained in:
crazywhalecc
2022-03-20 16:51:48 +08:00
parent 7ce3ef41df
commit 74e91a2950
5 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/ZM/Module/ModuleUnpacker.php
View File

@@ -30,7 +30,8 @@ class ModuleUnpacker
/**
* 解包模块
* @param bool $ignore_depends
*
* @param mixed $ignore_depends
* @throws ModulePackException
* @throws ZMException
*/
@@ -61,7 +62,8 @@ class ModuleUnpacker
/**
* 检查模块依赖关系
* @param bool $ignore_depends
*
* @param mixed $ignore_depends
* @throws ModulePackException
* @throws ZMException
*/
@@ -125,8 +127,8 @@ class ModuleUnpacker
throw new ModulePackException(zm_internal_errcode('E00068'));
}
$composer = json_decode(file_get_contents($composer_file), true);
if (isset($this->module_config['composer-extend-autoload'])) {
$autoload = $this->module_config['composer-extend-autoload'];
if (isset($this->module_config['unpack']['composer-autoload-items'])) {
$autoload = $this->module_config['unpack']['composer-autoload-items'];
if (isset($autoload['psr-4'])) {
Console::info('Adding extended autoload psr-4 for composer');
$composer['autoload']['psr-4'] = isset($composer['autoload']['psr-4']) ? array_merge($composer['autoload']['psr-4'], $autoload['psr-4']) : $autoload['psr-4'];
@@ -136,6 +138,7 @@ class ModuleUnpacker
$composer['autoload']['files'] = isset($composer['autoload']['files']) ? array_merge($composer['autoload']['files'], $autoload['files']) : $autoload['files'];
}
}
if (isset($this->module_config['composer-extend-require'])) {
foreach ($this->module_config['composer-extend-require'] as $k => $v) {
Console::info('Adding extended required composer library: ' . $k);