Modernization of run-tests.php

Author: dragoonis

run-tests.php

@@ -31,7 +31,7 @@
  * Minimum required PHP version: 7.0.0
  */
 
-function show_usage()
+function show_usage(): void
 {
     echo <<<HELP
 Synopsis:
@@ -146,10 +146,9 @@ function main()
 
     define('IS_WINDOWS', substr(PHP_OS, 0, 3) == "WIN");
 
-    $workerID = 0;
-    if (getenv("TEST_PHP_WORKER")) {
-        $workerID = intval(getenv("TEST_PHP_WORKER"));
-        run_worker();
+    $workerID = getWorkerId();
+    if($workerID) {
+        run_worker($workerID);
         return;
     }
 
@@ -1652,9 +1651,9 @@ function kill_children(array $children)
     }
 }
 
-function run_worker()
+function run_worker($workerID)
 {
-    global $workerID, $workerSock;
+    global $workerSock;
 
     $sockUri = getenv("TEST_PHP_URI");
 
@@ -1811,15 +1810,7 @@ function run_test($php, $file, $env)
             }
 
             // check for unknown sections
-            if (!in_array($section, array(
-                'EXPECT', 'EXPECTF', 'EXPECTREGEX', 'EXPECTREGEX_EXTERNAL', 'EXPECT_EXTERNAL', 'EXPECTF_EXTERNAL', 'EXPECTHEADERS',
-                'POST', 'POST_RAW', 'GZIP_POST', 'DEFLATE_POST', 'PUT', 'GET', 'COOKIE', 'ARGS',
-                'FILE', 'FILEEOF', 'FILE_EXTERNAL', 'REDIRECTTEST',
-                'CAPTURE_STDIO', 'STDIN', 'CGI', 'PHPDBG',
-                'INI', 'ENV', 'EXTENSIONS',
-                'SKIPIF', 'XFAIL', 'XLEAK', 'CLEAN',
-                'CREDITS', 'DESCRIPTION', 'CONFLICTS', 'WHITESPACE_SENSITIVE',
-            ))) {
+            if (isUnknownSection($section)) {
                 $bork_info = 'Unknown section "' . $section . '"';
             }
 
@@ -3623,10 +3614,31 @@ function getNumberOfWorkers($workers): int
     return $cleanWorkers;
 }
 
-function getMaxWorkersFromTestFiles($workers, $testFiles)
+function getMaxWorkersFromTestFiles($workers, $testFiles): int
 {
-    return max(1, min($workers, count($test_files)))
+    return max(1, min($workers, count($test_files)));
 }
 
+function getWorkerId(): int
+{
+    if (!getenv("TEST_PHP_WORKER")) {
+        return 0;
+    }
+
+    return intval(getenv("TEST_PHP_WORKER"));
+}
+
+function isUnknownSection(string $section): bool
+{
+    return !in_array($section, array(
+        'EXPECT', 'EXPECTF', 'EXPECTREGEX', 'EXPECTREGEX_EXTERNAL', 'EXPECT_EXTERNAL', 'EXPECTF_EXTERNAL', 'EXPECTHEADERS',
+        'POST', 'POST_RAW', 'GZIP_POST', 'DEFLATE_POST', 'PUT', 'GET', 'COOKIE', 'ARGS',
+        'FILE', 'FILEEOF', 'FILE_EXTERNAL', 'REDIRECTTEST',
+        'CAPTURE_STDIO', 'STDIN', 'CGI', 'PHPDBG',
+        'INI', 'ENV', 'EXTENSIONS',
+        'SKIPIF', 'XFAIL', 'XLEAK', 'CLEAN',
+        'CREDITS', 'DESCRIPTION', 'CONFLICTS', 'WHITESPACE_SENSITIVE',
+    ));
+}
 
 main();