@@ -1083,17 +1083,17 @@ function get_binary(string $php, string $sapi, string $sapi_path): ?string
1083
1083
1084
1084
function find_files (string $ dir , bool $ is_ext_dir = false , bool $ ignore = false ): void
1085
1085
{
1086
- global $ test_files , $ exts_to_test , $ ignored_by_ext, $ exts_skipped ;
1086
+ global $ test_files , $ ignored_by_ext ;
1087
1087
1088
1088
$ o = opendir ($ dir ) or error ("cannot open directory: $ dir " );
1089
1089
1090
1090
while (($ name = readdir ($ o )) !== false ) {
1091
- if (is_dir ( "{ $ dir } / { $ name }" ) && ! in_array ($ name , ['. ' , '.. ' , '.svn ' ])) {
1092
- $ skip_ext = ( $ is_ext_dir && ! in_array ( strtolower ( $ name ), $ exts_to_test )) ;
1093
- if ( $ skip_ext ) {
1094
- $ exts_skipped [] = $ name ;
1095
- }
1096
- find_files ("{$ dir }/ {$ name }" , false , $ ignore || $ skip_ext );
1091
+ if (in_array ($ name , ['. ' , '.. ' , '.svn ' , ' .git ' ])) {
1092
+ continue ;
1093
+ }
1094
+
1095
+ if ( is_dir ( "{ $ dir } / { $ name }" )) {
1096
+ find_files ("{$ dir }/ {$ name }" , false , $ ignore );
1097
1097
}
1098
1098
1099
1099
// Cleanup any left-over tmp files from last run.
@@ -3737,10 +3737,10 @@ public function getExtensions(string $php): array
3737
3737
3738
3738
$ extDir = `$ php -d display_errors=0 -r "echo ini_get('extension_dir');" `;
3739
3739
$ extensions = explode (", " , `$ php -d display_errors=0 -r "echo implode(',', get_loaded_extensions());" `);
3740
- $ extensions = array_map ('strtolower ' , $ extensions );
3741
- if (in_array ('zend opcache ' , $ extensions )) {
3740
+ if (in_array ('Zend OPcache ' , $ extensions )) {
3742
3741
$ extensions [] = 'opcache ' ;
3743
3742
}
3743
+ $ extensions = array_map ('strtolower ' , $ extensions );
3744
3744
3745
3745
$ result = [$ extDir , $ extensions ];
3746
3746
$ this ->extensions [$ php ] = $ result ;
0 commit comments