Skip to content

Commit b50ab03

Browse files
committed
dedup loaded ext names remap
1 parent 637eb05 commit b50ab03

File tree

1 file changed

+15
-8
lines changed

1 file changed

+15
-8
lines changed

run-tests.php

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -880,10 +880,7 @@ function write_information(): void
880880
// load list of enabled and loadable extensions
881881
save_text($info_file, <<<'PHP'
882882
<?php
883-
$exts = [];
884-
foreach (get_loaded_extensions() as $ext) {
885-
$exts[] = ['Zend OPcache' => 'opcache'][$ext] ?? $ext;
886-
}
883+
$exts = remap_loaded_extensions_names(get_loaded_extensions());
887884
$ext_dir = ini_get('extension_dir');
888885
foreach (scandir($ext_dir) as $file) {
889886
if (!preg_match('/^(?:php_)?([_a-zA-Z0-9]+)\.(?:so|dll)$/', $file, $matches)) {
@@ -2784,6 +2781,19 @@ function run_test(string $php, $file, array $env): string
27842781
return $restype[0] . 'ED';
27852782
}
27862783

2784+
function remap_loaded_extensions_names(array $names): array
2785+
{
2786+
$exts = [];
2787+
foreach ($names as $name) {
2788+
if ($name === 'Core') {
2789+
continue;
2790+
}
2791+
$exts[] = strtolower(['Zend OPcache' => 'opcache'][$name] ?? $name);
2792+
}
2793+
2794+
return $exts;
2795+
}
2796+
27872797
/**
27882798
* @return bool|int
27892799
*/
@@ -3675,10 +3685,7 @@ public function getExtensions(string $php): array
36753685

36763686
$extDir = shell_exec("$php -d display_errors=0 -r \"echo ini_get('extension_dir');\"");
36773687
$extensions = explode(",", shell_exec("$php -d display_errors=0 -r \"echo implode(',', get_loaded_extensions());\""));
3678-
$extensions = array_map('strtolower', $extensions);
3679-
if (in_array('zend opcache', $extensions)) {
3680-
$extensions[] = 'opcache';
3681-
}
3688+
$extensions = remap_loaded_extensions_names($extensions);
36823689

36833690
$result = [$extDir, $extensions];
36843691
$this->extensions[$php] = $result;

0 commit comments

Comments
 (0)