sapi/cli: enabled the test fork server in ZTS builds

Author: NickSdot

run-tests.php

@@ -1522,7 +1522,6 @@ function can_use_test_fork_server(): bool
     global $cli_opcache_enabled, $environment, $file_cache, $IN_REDIRECT, $num_repeats, $preload, $valgrind;
 
     return !IS_WINDOWS
-        && !PHP_ZTS
         && !$cli_opcache_enabled
         && getenv('TEST_PHP_FORK_SERVER') !== '0'
         && !isset($environment['SKIP_ASAN'])

sapi/cli/php_cli.c

@@ -181,7 +181,7 @@ typedef enum {
 	PHP_CLI_TEST_BATCH_DONE,
 } php_cli_test_batch_result;
 
-#if defined(HAVE_FORK) && !defined(ZTS)
+#ifdef HAVE_FORK
 static volatile sig_atomic_t php_cli_test_child_pid;
 
 static void php_cli_test_batch_signal(int signal) /* {{{ */
@@ -214,7 +214,7 @@ static bool php_cli_test_batch_init(php_cli_test_batch *batch, const char *token
 }
 /* }}} */
 
-#if defined(HAVE_FORK) && !defined(ZTS)
+#ifdef HAVE_FORK
 static int php_cli_test_batch_read_line(char *buffer, size_t size) /* {{{ */
 {
 	while (fgets(buffer, size, stdin)) {
@@ -365,8 +365,8 @@ static php_cli_test_batch_result php_cli_test_batch_start(
 	char **script_file
 ) /* {{{ */
 {
-#if !defined(HAVE_FORK) || defined(ZTS)
-	fprintf(stderr, "--test-fork-server requires a non-ZTS build with fork()\n");
+#ifndef HAVE_FORK
+	fprintf(stderr, "--test-fork-server requires fork()\n");
 	return PHP_CLI_TEST_BATCH_ERROR;
 #else
 	int test_output[2];
@@ -1199,7 +1199,7 @@ static int do_cli(int argc, char **argv) /* {{{ */
 				param_error = "Unable to initialize test batch.\n";
 			}
 		}
-#if defined(HAVE_FORK) && !defined(ZTS)
+#ifdef HAVE_FORK
 		if (test_batch.token) {
 			signal(SIGINT, php_cli_test_batch_signal);
 			signal(SIGTERM, php_cli_test_batch_signal);

sapi/cli/tests/test_fork_server.phpt

@@ -2,8 +2,8 @@
 CLI test fork server isolates requests and continues after a nonzero exit
 --SKIPIF--
 <?php
-if (PHP_OS_FAMILY === 'Windows' || PHP_ZTS) {
-    die('skip requires a non-ZTS build with fork');
+if (PHP_OS_FAMILY === 'Windows') {
+    die('skip requires fork');
 }
 
 $process = proc_open(

tests/run-test/fork_server_lifecycle.phpt

@@ -4,8 +4,8 @@ Test fork server timeout, termination, and failure fallback
 posix
 --SKIPIF--
 <?php
-if (PHP_OS_FAMILY === 'Windows' || PHP_ZTS) {
-    die('skip requires a non-ZTS build with fork');
+if (PHP_OS_FAMILY === 'Windows') {
+    die('skip requires fork');
 }
 
 $process = proc_open(

tests/run-test/fork_server_opcache.phpt

@@ -4,8 +4,8 @@ Test fork server is disabled when CLI OPcache is enabled
 opcache
 --SKIPIF--
 <?php
-if (PHP_OS_FAMILY === 'Windows' || PHP_ZTS) {
-    die('skip requires a non-ZTS build with fork');
+if (PHP_OS_FAMILY === 'Windows') {
+    die('skip requires fork');
 }
 
 $process = proc_open(