Modernization of run-tests.php

Author: dragoonis

run-tests.php

@@ -146,7 +146,7 @@ function main()
 
     define('IS_WINDOWS', substr(PHP_OS, 0, 3) == "WIN");
 
-    $workerID = getWorkerId();
+    $workerID = get_worker_id();
     if($workerID) {
         run_worker($workerID);
         return;
@@ -442,7 +442,7 @@ function main()
 
             switch ($switch) {
                 case 'j':
-                    $workers = getNumberOfWorkers($argv[$i]);
+                    $workers = get_number_of_workers($argv[$i]);
                     break;
                 case 'r':
                 case 'l':
@@ -1373,7 +1373,7 @@ function run_all_tests_parallel($test_files, $env, $redir_tested)
     }
 
     // Don't start more workers than test files.
-    $workers = max(1, min($workers, count($test_files)));
+    $workers = get_max_workers_from_test_files($workers, $test_files);
 
     echo "Spawning workers… ";
 
@@ -1810,7 +1810,7 @@ function run_test($php, $file, $env)
             }
 
             // check for unknown sections
-            if (isUnknownSection($section)) {
+            if (is_section_unknown($section)) {
                 $bork_info = 'Unknown section "' . $section . '"';
             }
 
@@ -3599,7 +3599,7 @@ function check_proc_open_function_exists()
 
 
 
-function getNumberOfWorkers($workers): int
+function get_number_of_workers($workers): int
 {
     $cleanWorkers = substr($workers, 2);
     if (!preg_match('/^\d+$/', $cleanWorkers) || $cleanWorkers == 0) {
@@ -3614,12 +3614,12 @@ function getNumberOfWorkers($workers): int
     return $cleanWorkers;
 }
 
-function getMaxWorkersFromTestFiles($workers, $testFiles): int
+function get_max_workers_from_test_files($workers, $test_files): int
 {
     return max(1, min($workers, count($test_files)));
 }
 
-function getWorkerId(): int
+function get_worker_id(): int
 {
     if (!getenv("TEST_PHP_WORKER")) {
         return 0;
@@ -3628,7 +3628,7 @@ function getWorkerId(): int
     return intval(getenv("TEST_PHP_WORKER"));
 }
 
-function isUnknownSection(string $section): bool
+function is_section_unknown(string $section): bool
 {
     return !in_array($section, array(
         'EXPECT', 'EXPECTF', 'EXPECTREGEX', 'EXPECTREGEX_EXTERNAL', 'EXPECT_EXTERNAL', 'EXPECTF_EXTERNAL', 'EXPECTHEADERS',