Merge branch 'PHP-7.4'

Author: nikic

run-tests.php

@@ -746,7 +746,7 @@ function main()
 	$ignored_by_ext = 0;
 	sort($exts_to_test);
 	$test_dirs = array();
-	$optionals = array('tests', 'ext', 'Zend');
+	$optionals = array('Zend', 'tests', 'ext', 'sapi');
 
 	foreach ($optionals as $dir) {
 		if (is_dir($dir)) {

sapi/cli/tests/006.phpt

@@ -97,21 +97,23 @@ string(%d) "Extension [ <persistent> extension #%d pcre version %s ] {
     }
     Function [ <internal:pcre> function preg_replace_callback ] {
 
-      - Parameters [5] {
+      - Parameters [6] {
         Parameter #0 [ <required> $regex ]
         Parameter #1 [ <required> $callback ]
         Parameter #2 [ <required> $subject ]
         Parameter #3 [ <optional> $limit ]
         Parameter #4 [ <optional> &$count ]
+        Parameter #5 [ <optional> $flags ]
       }
     }
     Function [ <internal:pcre> function preg_replace_callback_array ] {
 
-      - Parameters [4] {
+      - Parameters [5] {
         Parameter #0 [ <required> $pattern ]
         Parameter #1 [ <required> $subject ]
         Parameter #2 [ <optional> $limit ]
         Parameter #3 [ <optional> &$count ]
+        Parameter #4 [ <optional> $flags ]
       }
     }
     Function [ <internal:pcre> function preg_filter ] {

sapi/cli/tests/cli_get_process_title_error.phpt

@@ -26,7 +26,7 @@ prompt> halloarray(2) {
     [4]=>
     int(1)
     [5]=>
-    int(3)
+    int(2)
     [8]=>
     int(2)
   }