crazywhalecc/static-php-cli
1
0
Fork 0
mirror of https://github.com/crazywhalecc/static-php-cli.git synced 2026-07-09 09:55:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix gen-ext-test-matrix AND bug (should be OR)

Browse Source
This commit is contained in:
crazywhalecc
2026-07-07 15:48:35 +08:00
parent cc448d463b
commit 331da67049
2 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/StaticPHP/Command/Dev/GenExtTestMatrixCommand.php
View File

@@ -248,22 +248,23 @@ class GenExtTestMatrixCommand extends BaseCommand
} }
} }
if (!empty($filter_extensions)) { if (!empty($filter_extensions) || !empty($filter_libs)) {
$entries = array_values(array_filter($entries, function (array $entry) use ($filter_extensions): bool { $entries = array_values(array_filter($entries, function (array $entry) use ($filter_extensions, $filter_libs, $all_ext_lib_deps): bool {
$names = explode(',', $entry['extension']); $names = explode(',', $entry['extension']);
return count(array_intersect($names, $filter_extensions)) > 0;
}));
}
if (!empty($filter_libs)) { if (!empty($filter_extensions) && count(array_intersect($names, $filter_extensions)) > 0) {
$entries = array_values(array_filter($entries, function (array $entry) use ($filter_libs, $all_ext_lib_deps): bool { return true;
$names = explode(',', $entry['extension']); }
$lib_deps = $all_ext_lib_deps[$entry['os']] ?? [];
foreach ($names as $name) { if (!empty($filter_libs)) {
if (count(array_intersect($lib_deps[$name] ?? [], $filter_libs)) > 0) { $lib_deps = $all_ext_lib_deps[$entry['os']] ?? [];
return true; foreach ($names as $name) {
if (count(array_intersect($lib_deps[$name] ?? [], $filter_libs)) > 0) {
return true;
}
} }
} }
return false; return false;
})); }));
} }

13
tests/StaticPHP/Command/Dev/GenExtTestMatrixCommandTest.php
View File

@@ -190,6 +190,17 @@ class GenExtTestMatrixCommandTest extends TestCase
} }
} }
/**
* Multiple filters should include entries matching any changed package.
*/
public function testExtensionAndLibraryFiltersAreCombinedAsUnion(): void
{
$matrix = $this->runMatrix(['--os' => 'Linux', '--for-extensions' => 'simdjson', '--for-libs' => 'libde265']);
$this->assertNotEmpty($this->findEntriesContaining($matrix, 'simdjson'), 'simdjson entry must be included');
$this->assertNotEmpty($this->findEntriesContaining($matrix, 'imagick'), 'imagick entry must be included through libde265');
}
/** /**
* --tier2 must produce only Tier2 runners and no Windows entries. * --tier2 must produce only Tier2 runners and no Windows entries.
*/ */
@@ -272,6 +283,7 @@ class GenExtTestMatrixCommandTest extends TestCase
* - ext-swoole-hook-* virtual (arg-type: none) — must be bundled with swoole * - ext-swoole-hook-* virtual (arg-type: none) — must be bundled with swoole
* - ext-curl simple orphan, depended on by swoole but must NOT be pulled into swoole entry * - ext-curl simple orphan, depended on by swoole but must NOT be pulled into swoole entry
* - ext-redis simple orphan * - ext-redis simple orphan
* - ext-simdjson simple orphan used for combined filter tests
* - ext-xml depends on lib 'libxml2' * - ext-xml depends on lib 'libxml2'
* - ext-dom depends on ext-xml (DFS chain) * - ext-dom depends on ext-xml (DFS chain)
* - ext-imagick depends on imagemagick -> libheif -> libde265 * - ext-imagick depends on imagemagick -> libheif -> libde265
@@ -295,6 +307,7 @@ class GenExtTestMatrixCommandTest extends TestCase
// Simple orphans // Simple orphans
'ext-curl' => $ext(), 'ext-curl' => $ext(),
'ext-redis' => $ext(), 'ext-redis' => $ext(),
'ext-simdjson' => $ext(),
// DFS chain: dom depends on xml; xml depends on lib 'libxml2' // DFS chain: dom depends on xml; xml depends on lib 'libxml2'
'ext-xml' => $ext(['arg-type' => 'standard'], ['depends' => ['libxml2']]), 'ext-xml' => $ext(['arg-type' => 'standard'], ['depends' => ['libxml2']]),