Merge branch 'php:master' into xinclude11

configure.php

@@ -644,16 +644,20 @@ function getFileModificationHistory(): array {
 $repos[$ac['LANG']] = "{$ac['rootdir']}/{$ac['LANG']}";
 $repos = array_unique($repos);
 
-foreach ($repos as $name => $path)
+$output = "";
+foreach ( $repos as $name => $path )
 {
-    $driveSwitch = is_windows() ? '/d' : '';
-    $output = str_pad( "$name:" , 10 );
-    $output .= `cd $driveSwitch $path && git rev-parse HEAD`;
-    $output .= `cd $driveSwitch $path && git status -s`;
-    $output .= `cd $driveSwitch $path && git for-each-ref --format="%(push:track)" refs/heads`;
-    echo trim($output) . "\n";
+    $path = escapeshellarg( $path );
+    $branch = trim( `git -C $path rev-parse --abbrev-ref HEAD` );
+    $branch = $branch == "master" ? "" : " (branch $branch)";
+    $output .= str_pad( "$name:" , 10 );
+    $output .= rtrim( `git -C $path rev-parse HEAD`  ?? "" ) . "$branch\n";
+    $output .= rtrim( `git -C $path status -s` ?? "" ) . "\n";
+    $output .= rtrim( `git -C $path for-each-ref --format="%(push:track)" refs/heads` ?? "" ) . "\n";
 }
-echo "\n";
+while( str_contains( $output , "\n\n" ) )
+    $output = str_replace( "\n\n" , "\n" , $output );
+echo "\n" , trim( $output ) . "\n\n";
 
 foreach ($infiles as $in) {
     $in = chop("{$ac['basedir']}/{$in}");

scripts/genPHP_INI_ENTRY.php

@@ -180,7 +180,7 @@ function findINI($fname) {/*{{{*/
     $data = file_get_contents($fname);
     //$re = '/PHP_INI_ENTRY\("([^"]+)",\s+"([^"]+)",\s+([A-Z_]),/';
     $re = '/(PHP_INI_ENTRY|PHP_INI_ENTRY_EX|PHP_INI_BOOLEAN)\(([^)]+)/';
-    preg_match_all($re, $data, &$matches);
+    preg_match_all($re, $data, $matches);
     $re2 = '/"([^"]+)",\s*"([^"]+)",\s*([A-Z_]+)/';
 
     foreach ($matches[2] as $match) {