Merge branch 'PHP-7.4'

diff --cc run-tests.php
index ee1b380832de42c01708eac5ac8667fc262a9a43,07e3d2d797d0ba0e5064450e08479a25d439999f..2863fd709eb584802f99e34b3dd17a0cf574d06a
--- 1/run-tests.php
--- 2/run-tests.php
+++ b/run-tests.php
@@@ -652,81 -649,81 +649,81 @@@ HELP
                                }
                        }
                }
+       }
  
-               // Default to PHP_BINARY as executable
-               if (!isset($environment['TEST_PHP_EXECUTABLE'])) {
-                       $php = PHP_BINARY;
-                       putenv("TEST_PHP_EXECUTABLE=$php");
-                       $environment['TEST_PHP_EXECUTABLE'] = $php;
-               }
+       // Default to PHP_BINARY as executable
+       if (!isset($environment['TEST_PHP_EXECUTABLE'])) {
+               $php = PHP_BINARY;
+               putenv("TEST_PHP_EXECUTABLE=$php");
+               $environment['TEST_PHP_EXECUTABLE'] = $php;
+       }
  
-               if (strlen($conf_passed)) {
-                       if (IS_WINDOWS) {
-                               $pass_options .= " -c " . escapeshellarg($conf_passed);
-                       } else {
-                               $pass_options .= " -c '" . realpath($conf_passed) . "'";
-                       }
+       if (strlen($conf_passed)) {
 -              if (substr(PHP_OS, 0, 3) == "WIN") {
++              if (IS_WINDOWS) {
+                       $pass_options .= " -c " . escapeshellarg($conf_passed);
+               } else {
+                       $pass_options .= " -c '" . realpath($conf_passed) . "'";
                }
+       }
  
-               $test_files = array_unique($test_files);
-               $test_files = array_merge($test_files, $redir_tests);
- 
-               // Run selected tests.
-               $test_cnt = count($test_files);
+       $test_files = array_unique($test_files);
+       $test_files = array_merge($test_files, $redir_tests);
  
-               if ($test_cnt) {
-                       putenv('NO_INTERACTION=1');
-                       verify_config();
-                       write_information();
-                       usort($test_files, "test_sort");
-                       $start_time = time();
+       // Run selected tests.
+       $test_cnt = count($test_files);
  
-                       if (!$html_output) {
-                               echo "Running selected tests.\n";
-                       } else {
-                               show_start($start_time);
-                       }
+       if ($test_cnt) {
+               putenv('NO_INTERACTION=1');
+               verify_config();
+               write_information();
+               usort($test_files, "test_sort");
+               $start_time = time();
  
-                       $test_idx = 0;
-                       run_all_tests($test_files, $environment);
-                       $end_time = time();
+               if (!$html_output) {
+                       echo "Running selected tests.\n";
+               } else {
+                       show_start($start_time);
+               }
  
-                       if ($html_output) {
-                               show_end($end_time);
-                       }
+               $test_idx = 0;
+               run_all_tests($test_files, $environment);
+               $end_time = time();
  
-                       if ($failed_tests_file) {
-                               fclose($failed_tests_file);
-                       }
+               if ($html_output) {
+                       show_end($end_time);
+               }
  
-                       if ($result_tests_file) {
-                               fclose($result_tests_file);
-                       }
+               if ($failed_tests_file) {
+                       fclose($failed_tests_file);
+               }
  
-                       compute_summary();
-                       if ($html_output) {
-                               fwrite($html_file, "<hr/>\n" . get_summary(false, true));
-                       }
-                       echo "=====================================================================";
-                       echo get_summary(false, false);
+               if ($result_tests_file) {
+                       fclose($result_tests_file);
+               }
  
-                       if ($html_output) {
-                               fclose($html_file);
-                       }
+               compute_summary();
+               if ($html_output) {
+                       fwrite($html_file, "<hr/>\n" . get_summary(false, true));
+               }
+               echo "=====================================================================";
+               echo get_summary(false, false);
  
-                       if ($output_file != '' && $just_save_results) {
-                               save_or_mail_results();
-                       }
+               if ($html_output) {
+                       fclose($html_file);
+               }
  
-                       junit_save_xml();
+               if ($output_file != '' && $just_save_results) {
+                       save_or_mail_results();
+               }
  
-                       if (getenv('REPORT_EXIT_STATUS') !== '0' &&
-                               getenv('REPORT_EXIT_STATUS') !== 'no' && ($sum_results['FAILED'] || $sum_results['BORKED'] || $sum_results['LEAKED'])) {
-                               exit(1);
-                       }
+               junit_save_xml();
  
-                       return;
+               if (getenv('REPORT_EXIT_STATUS') !== '0' &&
+                       getenv('REPORT_EXIT_STATUS') !== 'no' && ($sum_results['FAILED'] || $sum_results['BORKED'] || $sum_results['LEAKED'])) {
+                       exit(1);
                }
+ 
+               return;
        }
  
        verify_config();