crazywhalecc/static-php-cli
1
0
Fork 0
mirror of https://github.com/crazywhalecc/static-php-cli.git synced 2026-03-18 04:44:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix dependency util suggest calculate bug (#441)

Browse Source 
* fix dependency util suggest calculate bug

* fix dependency util suggest calculate bug
This commit is contained in:
Jerry Ma 2024-05-06 14:23:32 +08:00 committed by GitHub
parent bde18054e5
commit 7416b8079b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/SPC/util/DependencyUtil.php
View File

@ -62,12 +62,17 @@ class DependencyUtil
if ($include_suggested_libs) { if ($include_suggested_libs) {
foreach ($dep_list as $name => $obj) { foreach ($dep_list as $name => $obj) {
$del_list = [];
foreach ($obj['suggests'] as $id => $suggest) { foreach ($obj['suggests'] as $id => $suggest) {
if (!str_starts_with($suggest, 'ext@')) { if (!str_starts_with($suggest, 'ext@')) {
$dep_list[$name]['depends'][] = $suggest; $dep_list[$name]['depends'][] = $suggest;
array_splice($dep_list[$name]['suggests'], $id, 1); $del_list[] = $id;
} }
} }
foreach ($del_list as $id) {
unset($dep_list[$name]['suggests'][$id]);
}
$dep_list[$name]['suggests'] = array_values($dep_list[$name]['suggests']);
} }
} }
@ -93,12 +98,17 @@ class DependencyUtil
if ($include_suggested_exts) { if ($include_suggested_exts) {
// check every deps suggests contains ext@ // check every deps suggests contains ext@
foreach ($dep_list as $name => $obj) { foreach ($dep_list as $name => $obj) {
$del_list = [];
foreach ($obj['suggests'] as $id => $suggest) { foreach ($obj['suggests'] as $id => $suggest) {
if (str_starts_with($suggest, 'ext@')) { if (str_starts_with($suggest, 'ext@')) {
$dep_list[$name]['depends'][] = $suggest; $dep_list[$name]['depends'][] = $suggest;
array_splice($dep_list[$name]['suggests'], $id, 1); $del_list[] = $id;
} }
} }
foreach ($del_list as $id) {
unset($dep_list[$name]['suggests'][$id]);
}
$dep_list[$name]['suggests'] = array_values($dep_list[$name]['suggests']);
} }
} }
@ -106,12 +116,17 @@ class DependencyUtil
if ($include_suggested_libs) { if ($include_suggested_libs) {
// check every deps suggests // check every deps suggests
foreach ($dep_list as $name => $obj) { foreach ($dep_list as $name => $obj) {
$del_list = [];
foreach ($obj['suggests'] as $id => $suggest) { foreach ($obj['suggests'] as $id => $suggest) {
if (!str_starts_with($suggest, 'ext@')) { if (!str_starts_with($suggest, 'ext@')) {
$dep_list[$name]['depends'][] = $suggest; $dep_list[$name]['depends'][] = $suggest;
array_splice($dep_list[$name]['suggests'], $id, 1); $del_list[] = $id;
} }
} }
foreach ($del_list as $id) {
unset($dep_list[$name]['suggests'][$id]);
}
$dep_list[$name]['suggests'] = array_values($dep_list[$name]['suggests']);
} }
} }