From 0e33689e27a72f4d34544802a5a0c78063f153e3 Mon Sep 17 00:00:00 2001 From: Gina Peter Banyard Date: Tue, 19 May 2026 17:20:15 +0100 Subject: [PATCH 1/2] tree: move ServerClientTestCase.inc to ext/standard So that ext/standard doesn't have an implicit dependency on ext/openssl --- ext/soap/tests/http_status_line_no_code.phpt | 2 +- ext/standard/tests/ServerClientTestCase.inc | 232 ++++++++++++++++++ ext/standard/tests/http/gh17976.phpt | 2 +- .../tests/http/ghsa-52jp-hrpf-2jff-001.phpt | 2 +- .../tests/http/ghsa-52jp-hrpf-2jff-002.phpt | 2 +- .../tests/http/ghsa-hgf5-96fm-v528-001.phpt | 2 +- .../tests/http/ghsa-hgf5-96fm-v528-002.phpt | 2 +- .../tests/http/ghsa-hgf5-96fm-v528-003.phpt | 2 +- .../tests/http/ghsa-pcmh-g36c-qc44-001.phpt | 2 +- .../tests/http/ghsa-pcmh-g36c-qc44-002.phpt | 2 +- .../tests/http/ghsa-v8xr-gpvj-cx9g-001.phpt | 2 +- .../tests/http/ghsa-v8xr-gpvj-cx9g-002.phpt | 2 +- .../tests/http/ghsa-v8xr-gpvj-cx9g-003.phpt | 2 +- .../tests/http/ghsa-v8xr-gpvj-cx9g-004.phpt | 2 +- .../tests/http/ghsa-v8xr-gpvj-cx9g-005.phpt | 2 +- .../http/http_empty_location_redirect.phpt | 2 +- .../http_single_char_location_redirect.phpt | 2 +- ext/standard/tests/streams/bug51056.phpt | 2 +- ext/standard/tests/streams/gh11418.phpt | 2 +- .../stream_context_tcp_nodelay_server.phpt | 2 +- ..._copy_to_stream_file_to_socket_maxlen.phpt | 2 +- ..._copy_to_stream_file_to_socket_medium.phpt | 2 +- ...opy_to_stream_file_to_socket_over_eof.phpt | 2 +- .../stream_copy_to_stream_pipe_to_socket.phpt | 2 +- ...m_copy_to_stream_socket_to_file_large.phpt | 2 +- ..._copy_to_stream_socket_to_file_maxlen.phpt | 2 +- ..._copy_to_stream_socket_to_file_single.phpt | 2 +- ...m_copy_to_stream_socket_to_file_small.phpt | 2 +- ...tream_copy_to_stream_socket_to_socket.phpt | 2 +- ...tream_copy_to_stream_socket_to_stdout.phpt | 2 +- 30 files changed, 261 insertions(+), 29 deletions(-) create mode 100644 ext/standard/tests/ServerClientTestCase.inc diff --git a/ext/soap/tests/http_status_line_no_code.phpt b/ext/soap/tests/http_status_line_no_code.phpt index de943571a492..1a95e8f587d7 100644 --- a/ext/soap/tests/http_status_line_no_code.phpt +++ b/ext/soap/tests/http_status_line_no_code.phpt @@ -26,7 +26,7 @@ $client = new SoapClient(null, [ var_dump($client->__doRequest('', 'http://{{ ADDR }}', 'T', 1)); CODE; -include sprintf('%s/../../openssl/tests/ServerClientTestCase.inc', __DIR__); +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --EXPECT-- diff --git a/ext/standard/tests/ServerClientTestCase.inc b/ext/standard/tests/ServerClientTestCase.inc new file mode 100644 index 000000000000..f0336fdd3921 --- /dev/null +++ b/ext/standard/tests/ServerClientTestCase.inc @@ -0,0 +1,232 @@ +notify($worker, $message); +} + +function phpt_wait($worker = WORKER_DEFAULT_NAME, $timeout = null): ?string +{ + return ServerClientTestCase::getInstance()->wait($worker, $timeout); +} + +function phpt_notify_server_start($server): void +{ + ServerClientTestCase::getInstance()->notify_server_start($server); +} + +function phpt_has_sslv3() { + static $result = null; + if (!is_null($result)) { + return $result; + } + $server = @stream_socket_server('sslv3://127.0.0.1:10013'); + if ($result = !!$server) { + fclose($server); + } + return $result; +} + +function phpt_extract_tls_records($rawData) { + $records = []; + $offset = 0; + $dataLength = strlen($rawData); + + while ($offset < $dataLength) { + // Ensure there's enough data left for the header. + if ($offset + 5 > $dataLength) { + break; + } + + // Extract the length of the current record. + $length = unpack("n", substr($rawData, $offset + 3, 2))[1]; + + // Check if the total length is within the bounds of the rawData. + if ($offset + 5 + $length > $dataLength) { + break; + } + + // Extract the record and add it to the records array. + $records[] = substr($rawData, $offset, 5 + $length); + + // Move the offset past the current record. + $offset += 5 + $length; + } + + return $records; +} + +/** + * This is a singleton to let the wait/notify functions work + * I know it's horrible, but it's a means to an end + */ +class ServerClientTestCase +{ + private $isWorker = false; + + private $workerHandle = []; + + private $workerStdIn = []; + + private $workerStdOut = []; + + private static $instance; + + public static function getInstance($isWorker = false) + { + if (!isset(self::$instance)) { + self::$instance = new self($isWorker); + } + + return self::$instance; + } + + public function __construct($isWorker = false) + { + if (!isset(self::$instance)) { + self::$instance = $this; + } + + $this->isWorker = $isWorker; + } + + private function spawnWorkerProcess($worker, $code) + { + if (defined("PHP_WINDOWS_VERSION_MAJOR")) { + $ini = php_ini_loaded_file(); + $cmd = sprintf( + '%s %s "%s" %s', + PHP_BINARY, $ini ? "-n -c $ini" : "", + __FILE__, + WORKER_ARGV_VALUE + ); + } else { + $cmd = sprintf( + '%s %s "%s" %s %s', + PHP_BINARY, + getenv('TEST_PHP_EXTRA_ARGS'), + __FILE__, + WORKER_ARGV_VALUE, + $worker + ); + } + $this->workerHandle[$worker] = proc_open( + $cmd, + [['pipe', 'r'], ['pipe', 'w'], STDERR], + $pipes + ); + $this->workerStdIn[$worker] = $pipes[0]; + $this->workerStdOut[$worker] = $pipes[1]; + + fwrite($this->workerStdIn[$worker], $code . "\n---\n"); + } + + private function cleanupWorkerProcess($worker) + { + fclose($this->workerStdIn[$worker]); + fclose($this->workerStdOut[$worker]); + proc_close($this->workerHandle[$worker]); + } + + private function stripPhpTagsFromCode($code) + { + return preg_replace('/^\s*<\?(?:php)?|\?>\s*$/i', '', $code); + } + + public function runWorker() + { + $code = ''; + + while (1) { + $line = fgets(STDIN); + + if (trim($line) === "---") { + break; + } + + $code .= $line; + } + + eval($code); + } + + /** + * Run client and all workers + * + * @param string $clientCode The client PHP code + * @param string|array $workerCode + * @param bool $ephemeral Select whether automatic port selection and automatic awaiting is used + * @return void + * @throws Exception + */ + public function run(string $clientCode, string|array $workerCode, bool $ephemeral = true): void + { + if (!is_array($workerCode)) { + $workerCode = [WORKER_DEFAULT_NAME => $workerCode]; + } + reset($workerCode); + $code = current($workerCode); + $worker = key($workerCode); + while ($worker != null) { + $this->spawnWorkerProcess($worker, $this->stripPhpTagsFromCode($code)); + $code = next($workerCode); + if ($ephemeral) { + $addr = trim($this->wait($worker)); + if (empty($addr)) { + throw new \Exception("Failed server start"); + } + if (strpos($addr, 'SERVER_EXCEPTION') !== false) { + echo $addr; + } + if ($code === false) { + $clientCode = preg_replace('/{{\s*ADDR\s*}}/', $addr, $clientCode); + } else { + $code = preg_replace('/{{\s*ADDR\s*}}/', $addr, $code); + } + } + $worker = key($workerCode); + } + + eval($this->stripPhpTagsFromCode($clientCode)); + foreach ($workerCode as $worker => $code) { + $this->cleanupWorkerProcess($worker); + } + } + + public function wait($worker, $timeout = null): ?string + { + $handle = $this->isWorker ? STDIN : $this->workerStdOut[$worker]; + if ($timeout === null) { + return fgets($handle); + } + + stream_set_blocking($handle, false); + $read = [$handle]; + $result = stream_select($read, $write, $except, $timeout); + if (!$result) { + return null; + } + + $result = fgets($handle); + stream_set_blocking($handle, true); + return $result; + } + + public function notify(string $worker, string $message = ""): void + { + fwrite($this->isWorker ? STDOUT : $this->workerStdIn[$worker], "$message\n"); + } + + public function notify_server_start($server): void + { + echo stream_socket_get_name($server, false) . "\n"; + } +} + +if (isset($argv[1]) && $argv[1] === WORKER_ARGV_VALUE) { + ServerClientTestCase::getInstance(true)->runWorker(); +} diff --git a/ext/standard/tests/http/gh17976.phpt b/ext/standard/tests/http/gh17976.phpt index bba9a7a0fcf3..c54ca8ce8d6d 100644 --- a/ext/standard/tests/http/gh17976.phpt +++ b/ext/standard/tests/http/gh17976.phpt @@ -48,7 +48,7 @@ $clientCode = <<<'CODE' echo (str_contains($raw, "Injected-Nul:") ? "FAIL" : "OK") . ": user_agent NUL+CRLF\n"; CODE; -include sprintf("%s/../../../openssl/tests/ServerClientTestCase.inc", __DIR__); +include dirname(__DIR__) . "/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --EXPECTF-- diff --git a/ext/standard/tests/http/ghsa-52jp-hrpf-2jff-001.phpt b/ext/standard/tests/http/ghsa-52jp-hrpf-2jff-001.phpt index a8786d15a6de..a16caa7711fe 100644 --- a/ext/standard/tests/http/ghsa-52jp-hrpf-2jff-001.phpt +++ b/ext/standard/tests/http/ghsa-52jp-hrpf-2jff-001.phpt @@ -39,7 +39,7 @@ $clientCode = <<<'CODE' var_dump(http_get_last_response_headers()); CODE; -include sprintf("%s/../../../openssl/tests/ServerClientTestCase.inc", __DIR__); +include dirname(__DIR__) . "/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --EXPECTF-- diff --git a/ext/standard/tests/http/ghsa-52jp-hrpf-2jff-002.phpt b/ext/standard/tests/http/ghsa-52jp-hrpf-2jff-002.phpt index b6df1099a097..f7bcbe4b7246 100644 --- a/ext/standard/tests/http/ghsa-52jp-hrpf-2jff-002.phpt +++ b/ext/standard/tests/http/ghsa-52jp-hrpf-2jff-002.phpt @@ -39,7 +39,7 @@ $clientCode = <<<'CODE' var_dump(http_get_last_response_headers()); CODE; -include sprintf("%s/../../../openssl/tests/ServerClientTestCase.inc", __DIR__); +include dirname(__DIR__) . "/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --EXPECTF-- diff --git a/ext/standard/tests/http/ghsa-hgf5-96fm-v528-001.phpt b/ext/standard/tests/http/ghsa-hgf5-96fm-v528-001.phpt index 0bd496ca72d0..cf9f8e6f12ee 100644 --- a/ext/standard/tests/http/ghsa-hgf5-96fm-v528-001.phpt +++ b/ext/standard/tests/http/ghsa-hgf5-96fm-v528-001.phpt @@ -36,7 +36,7 @@ $clientCode = <<<'CODE' var_dump(http_get_last_response_headers()); CODE; -include sprintf("%s/../../../openssl/tests/ServerClientTestCase.inc", __DIR__); +include dirname(__DIR__) . "/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --EXPECTF-- diff --git a/ext/standard/tests/http/ghsa-hgf5-96fm-v528-002.phpt b/ext/standard/tests/http/ghsa-hgf5-96fm-v528-002.phpt index d470cdda3f5c..4b88c0553f57 100644 --- a/ext/standard/tests/http/ghsa-hgf5-96fm-v528-002.phpt +++ b/ext/standard/tests/http/ghsa-hgf5-96fm-v528-002.phpt @@ -36,7 +36,7 @@ $clientCode = <<<'CODE' var_dump(http_get_last_response_headers()); CODE; -include sprintf("%s/../../../openssl/tests/ServerClientTestCase.inc", __DIR__); +include dirname(__DIR__) . "/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --EXPECTF-- diff --git a/ext/standard/tests/http/ghsa-hgf5-96fm-v528-003.phpt b/ext/standard/tests/http/ghsa-hgf5-96fm-v528-003.phpt index 594dc8d14e35..257f6908da3c 100644 --- a/ext/standard/tests/http/ghsa-hgf5-96fm-v528-003.phpt +++ b/ext/standard/tests/http/ghsa-hgf5-96fm-v528-003.phpt @@ -36,7 +36,7 @@ $clientCode = <<<'CODE' var_dump(http_get_last_response_headers()); CODE; -include sprintf("%s/../../../openssl/tests/ServerClientTestCase.inc", __DIR__); +include dirname(__DIR__) . "/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --EXPECTF-- diff --git a/ext/standard/tests/http/ghsa-pcmh-g36c-qc44-001.phpt b/ext/standard/tests/http/ghsa-pcmh-g36c-qc44-001.phpt index 83363fbbcc2f..9211ca4080dd 100644 --- a/ext/standard/tests/http/ghsa-pcmh-g36c-qc44-001.phpt +++ b/ext/standard/tests/http/ghsa-pcmh-g36c-qc44-001.phpt @@ -35,7 +35,7 @@ $clientCode = <<<'CODE' var_dump(http_get_last_response_headers()); CODE; -include sprintf("%s/../../../openssl/tests/ServerClientTestCase.inc", __DIR__); +include dirname(__DIR__) . "/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --EXPECTF-- diff --git a/ext/standard/tests/http/ghsa-pcmh-g36c-qc44-002.phpt b/ext/standard/tests/http/ghsa-pcmh-g36c-qc44-002.phpt index db89ebb1d9ec..f4c949357e18 100644 --- a/ext/standard/tests/http/ghsa-pcmh-g36c-qc44-002.phpt +++ b/ext/standard/tests/http/ghsa-pcmh-g36c-qc44-002.phpt @@ -35,7 +35,7 @@ $clientCode = <<<'CODE' var_dump(http_get_last_response_headers()); CODE; -include sprintf("%s/../../../openssl/tests/ServerClientTestCase.inc", __DIR__); +include dirname(__DIR__) . "/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --EXPECTF-- diff --git a/ext/standard/tests/http/ghsa-v8xr-gpvj-cx9g-001.phpt b/ext/standard/tests/http/ghsa-v8xr-gpvj-cx9g-001.phpt index 94439534d9a5..db5a35b86939 100644 --- a/ext/standard/tests/http/ghsa-v8xr-gpvj-cx9g-001.phpt +++ b/ext/standard/tests/http/ghsa-v8xr-gpvj-cx9g-001.phpt @@ -35,7 +35,7 @@ $clientCode = <<<'CODE' var_dump(http_get_last_response_headers()); CODE; -include sprintf("%s/../../../openssl/tests/ServerClientTestCase.inc", __DIR__); +include dirname(__DIR__) . "/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --EXPECTF-- diff --git a/ext/standard/tests/http/ghsa-v8xr-gpvj-cx9g-002.phpt b/ext/standard/tests/http/ghsa-v8xr-gpvj-cx9g-002.phpt index 6ad3e1bc2ca3..dfbe8c735ebc 100644 --- a/ext/standard/tests/http/ghsa-v8xr-gpvj-cx9g-002.phpt +++ b/ext/standard/tests/http/ghsa-v8xr-gpvj-cx9g-002.phpt @@ -35,7 +35,7 @@ $clientCode = <<<'CODE' var_dump(http_get_last_response_headers()); CODE; -include sprintf("%s/../../../openssl/tests/ServerClientTestCase.inc", __DIR__); +include dirname(__DIR__) . "/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --EXPECTF-- diff --git a/ext/standard/tests/http/ghsa-v8xr-gpvj-cx9g-003.phpt b/ext/standard/tests/http/ghsa-v8xr-gpvj-cx9g-003.phpt index 497d6d92fbd2..a6fbfa611ebe 100644 --- a/ext/standard/tests/http/ghsa-v8xr-gpvj-cx9g-003.phpt +++ b/ext/standard/tests/http/ghsa-v8xr-gpvj-cx9g-003.phpt @@ -35,7 +35,7 @@ $clientCode = <<<'CODE' var_dump(http_get_last_response_headers()); CODE; -include sprintf("%s/../../../openssl/tests/ServerClientTestCase.inc", __DIR__); +include dirname(__DIR__) . "/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --EXPECTF-- diff --git a/ext/standard/tests/http/ghsa-v8xr-gpvj-cx9g-004.phpt b/ext/standard/tests/http/ghsa-v8xr-gpvj-cx9g-004.phpt index 358a85ce0f71..854d2b91618c 100644 --- a/ext/standard/tests/http/ghsa-v8xr-gpvj-cx9g-004.phpt +++ b/ext/standard/tests/http/ghsa-v8xr-gpvj-cx9g-004.phpt @@ -35,7 +35,7 @@ $clientCode = <<<'CODE' var_dump(http_get_last_response_headers()); CODE; -include sprintf("%s/../../../openssl/tests/ServerClientTestCase.inc", __DIR__); +include dirname(__DIR__) . "/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --EXPECTF-- diff --git a/ext/standard/tests/http/ghsa-v8xr-gpvj-cx9g-005.phpt b/ext/standard/tests/http/ghsa-v8xr-gpvj-cx9g-005.phpt index 457681ab2947..62f384a29512 100644 --- a/ext/standard/tests/http/ghsa-v8xr-gpvj-cx9g-005.phpt +++ b/ext/standard/tests/http/ghsa-v8xr-gpvj-cx9g-005.phpt @@ -35,7 +35,7 @@ $clientCode = <<<'CODE' var_dump(http_get_last_response_headers()); CODE; -include sprintf("%s/../../../openssl/tests/ServerClientTestCase.inc", __DIR__); +include dirname(__DIR__) . "/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --EXPECTF-- diff --git a/ext/standard/tests/http/http_empty_location_redirect.phpt b/ext/standard/tests/http/http_empty_location_redirect.phpt index a7f99bf1e249..6dbec68dc3c4 100644 --- a/ext/standard/tests/http/http_empty_location_redirect.phpt +++ b/ext/standard/tests/http/http_empty_location_redirect.phpt @@ -29,7 +29,7 @@ $ctx = stream_context_create(['http' => ['follow_location' => 1]]); echo @file_get_contents("http://{{ ADDR }}/a/b", false, $ctx), "\n"; CODE; -include sprintf("%s/../../../openssl/tests/ServerClientTestCase.inc", __DIR__); +include dirname(__DIR__) . "/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --EXPECT-- diff --git a/ext/standard/tests/http/http_single_char_location_redirect.phpt b/ext/standard/tests/http/http_single_char_location_redirect.phpt index 66af7a432537..407a55edc385 100644 --- a/ext/standard/tests/http/http_single_char_location_redirect.phpt +++ b/ext/standard/tests/http/http_single_char_location_redirect.phpt @@ -32,7 +32,7 @@ $ctx = stream_context_create(['http' => ['follow_location' => 1]]); echo @file_get_contents("http://{{ ADDR }}/a/b", false, $ctx), "\n"; CODE; -include sprintf("%s/../../../openssl/tests/ServerClientTestCase.inc", __DIR__); +include dirname(__DIR__) . "/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --EXPECT-- diff --git a/ext/standard/tests/streams/bug51056.phpt b/ext/standard/tests/streams/bug51056.phpt index ac5909da7a55..9a8ebf8f0bc2 100644 --- a/ext/standard/tests/streams/bug51056.phpt +++ b/ext/standard/tests/streams/bug51056.phpt @@ -32,7 +32,7 @@ while (!feof($fp)) { } CODE; -include sprintf("%s/../../../openssl/tests/ServerClientTestCase.inc", __DIR__); +include dirname(__DIR__) . "/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> diff --git a/ext/standard/tests/streams/gh11418.phpt b/ext/standard/tests/streams/gh11418.phpt index 384755b99cc0..83ad052b39a3 100644 --- a/ext/standard/tests/streams/gh11418.phpt +++ b/ext/standard/tests/streams/gh11418.phpt @@ -26,7 +26,7 @@ echo fgets($fp); CODE; -include sprintf("%s/../../../openssl/tests/ServerClientTestCase.inc", __DIR__); +include dirname(__DIR__) . "/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> diff --git a/ext/standard/tests/streams/stream_context_tcp_nodelay_server.phpt b/ext/standard/tests/streams/stream_context_tcp_nodelay_server.phpt index d25223b34db2..bb4f9a5be438 100644 --- a/ext/standard/tests/streams/stream_context_tcp_nodelay_server.phpt +++ b/ext/standard/tests/streams/stream_context_tcp_nodelay_server.phpt @@ -32,7 +32,7 @@ $clientCode = <<<'CODE' echo phpt_wait(); CODE; -include sprintf("%s/../../../openssl/tests/ServerClientTestCase.inc", __DIR__); +include dirname(__DIR__) . "/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --EXPECTF-- diff --git a/ext/standard/tests/streams/stream_copy_to_stream_file_to_socket_maxlen.phpt b/ext/standard/tests/streams/stream_copy_to_stream_file_to_socket_maxlen.phpt index dc9e52a721d7..37e91c5474a2 100644 --- a/ext/standard/tests/streams/stream_copy_to_stream_file_to_socket_maxlen.phpt +++ b/ext/standard/tests/streams/stream_copy_to_stream_file_to_socket_maxlen.phpt @@ -46,7 +46,7 @@ $clientCode = <<<'CODE' var_dump(trim(phpt_wait()) === "match"); CODE; -include sprintf("%s/../../../openssl/tests/ServerClientTestCase.inc", __DIR__); +include dirname(__DIR__) . "/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --EXPECT-- diff --git a/ext/standard/tests/streams/stream_copy_to_stream_file_to_socket_medium.phpt b/ext/standard/tests/streams/stream_copy_to_stream_file_to_socket_medium.phpt index c7bd9afeedac..8f651cd916d2 100644 --- a/ext/standard/tests/streams/stream_copy_to_stream_file_to_socket_medium.phpt +++ b/ext/standard/tests/streams/stream_copy_to_stream_file_to_socket_medium.phpt @@ -39,7 +39,7 @@ $clientCode = <<<'CODE' var_dump(trim(phpt_wait()) === "match"); CODE; -include sprintf("%s/../../../openssl/tests/ServerClientTestCase.inc", __DIR__); +include dirname(__DIR__) . "/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --EXPECT-- diff --git a/ext/standard/tests/streams/stream_copy_to_stream_file_to_socket_over_eof.phpt b/ext/standard/tests/streams/stream_copy_to_stream_file_to_socket_over_eof.phpt index 7834e9420a71..c0abfbc67798 100644 --- a/ext/standard/tests/streams/stream_copy_to_stream_file_to_socket_over_eof.phpt +++ b/ext/standard/tests/streams/stream_copy_to_stream_file_to_socket_over_eof.phpt @@ -43,7 +43,7 @@ $clientCode = <<<'CODE' var_dump(trim(phpt_wait()) === "match"); CODE; -include sprintf("%s/../../../openssl/tests/ServerClientTestCase.inc", __DIR__); +include dirname(__DIR__) . "/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --EXPECT-- diff --git a/ext/standard/tests/streams/stream_copy_to_stream_pipe_to_socket.phpt b/ext/standard/tests/streams/stream_copy_to_stream_pipe_to_socket.phpt index c7a9b9293e4b..af2578290b8e 100644 --- a/ext/standard/tests/streams/stream_copy_to_stream_pipe_to_socket.phpt +++ b/ext/standard/tests/streams/stream_copy_to_stream_pipe_to_socket.phpt @@ -45,7 +45,7 @@ $clientCode = <<<'CODE' var_dump(trim(phpt_wait()) === "match"); CODE; -include sprintf("%s/../../../openssl/tests/ServerClientTestCase.inc", __DIR__); +include dirname(__DIR__) . "/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --EXPECT-- diff --git a/ext/standard/tests/streams/stream_copy_to_stream_socket_to_file_large.phpt b/ext/standard/tests/streams/stream_copy_to_stream_socket_to_file_large.phpt index 6d66bf4f81ba..d2e07e976132 100644 --- a/ext/standard/tests/streams/stream_copy_to_stream_socket_to_file_large.phpt +++ b/ext/standard/tests/streams/stream_copy_to_stream_socket_to_file_large.phpt @@ -35,7 +35,7 @@ $clientCode = <<<'CODE' fclose($source); CODE; -include sprintf("%s/../../../openssl/tests/ServerClientTestCase.inc", __DIR__); +include dirname(__DIR__) . "/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --EXPECT-- diff --git a/ext/standard/tests/streams/stream_copy_to_stream_socket_to_file_maxlen.phpt b/ext/standard/tests/streams/stream_copy_to_stream_socket_to_file_maxlen.phpt index 13fcc475059b..2d911e4440ef 100644 --- a/ext/standard/tests/streams/stream_copy_to_stream_socket_to_file_maxlen.phpt +++ b/ext/standard/tests/streams/stream_copy_to_stream_socket_to_file_maxlen.phpt @@ -39,7 +39,7 @@ $clientCode = <<<'CODE' fclose($source); CODE; -include sprintf("%s/../../../openssl/tests/ServerClientTestCase.inc", __DIR__); +include dirname(__DIR__) . "/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --EXPECT-- diff --git a/ext/standard/tests/streams/stream_copy_to_stream_socket_to_file_single.phpt b/ext/standard/tests/streams/stream_copy_to_stream_socket_to_file_single.phpt index a5b694ce5650..f4d57efde454 100644 --- a/ext/standard/tests/streams/stream_copy_to_stream_socket_to_file_single.phpt +++ b/ext/standard/tests/streams/stream_copy_to_stream_socket_to_file_single.phpt @@ -41,7 +41,7 @@ $clientCode = <<<'CODE' fclose($source); CODE; -include sprintf("%s/../../../openssl/tests/ServerClientTestCase.inc", __DIR__); +include dirname(__DIR__) . "/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --EXPECT-- diff --git a/ext/standard/tests/streams/stream_copy_to_stream_socket_to_file_small.phpt b/ext/standard/tests/streams/stream_copy_to_stream_socket_to_file_small.phpt index 9b4f8befce93..ea3a25796640 100644 --- a/ext/standard/tests/streams/stream_copy_to_stream_socket_to_file_small.phpt +++ b/ext/standard/tests/streams/stream_copy_to_stream_socket_to_file_small.phpt @@ -35,7 +35,7 @@ $clientCode = <<<'CODE' fclose($source); CODE; -include sprintf("%s/../../../openssl/tests/ServerClientTestCase.inc", __DIR__); +include dirname(__DIR__) . "/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --EXPECTF-- diff --git a/ext/standard/tests/streams/stream_copy_to_stream_socket_to_socket.phpt b/ext/standard/tests/streams/stream_copy_to_stream_socket_to_socket.phpt index d462d5117091..421bc524a44d 100644 --- a/ext/standard/tests/streams/stream_copy_to_stream_socket_to_socket.phpt +++ b/ext/standard/tests/streams/stream_copy_to_stream_socket_to_socket.phpt @@ -57,7 +57,7 @@ $clientCode = <<<'CODE' fclose($dest); CODE; -include sprintf("%s/../../../openssl/tests/ServerClientTestCase.inc", __DIR__); +include dirname(__DIR__) . "/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, [ 'source' => $sourceCode, 'dest' => $destCode, diff --git a/ext/standard/tests/streams/stream_copy_to_stream_socket_to_stdout.phpt b/ext/standard/tests/streams/stream_copy_to_stream_socket_to_stdout.phpt index f378207f4ef3..709e8f8acaff 100644 --- a/ext/standard/tests/streams/stream_copy_to_stream_socket_to_stdout.phpt +++ b/ext/standard/tests/streams/stream_copy_to_stream_socket_to_stdout.phpt @@ -25,7 +25,7 @@ $clientCode = <<<'CODE' fclose($fd); CODE; -include sprintf("%s/../../../openssl/tests/ServerClientTestCase.inc", __DIR__); +include dirname(__DIR__) . "/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --EXPECT-- From b3e7f75c64cbe26995cfde14db03faab55d09c50 Mon Sep 17 00:00:00 2001 From: Gina Peter Banyard Date: Wed, 28 Oct 2026 15:50:44 +0000 Subject: [PATCH 2/2] openssl: use ServerClientTestCase.inc version from ext/standard --- ext/openssl/tests/GHSA-xr7j-rvgx-xq5p.phpt | 2 +- ext/openssl/tests/ServerClientTestCase.inc | 237 ------------------ ext/openssl/tests/bug46127.phpt | 2 +- ext/openssl/tests/bug48182.phpt | 2 +- ext/openssl/tests/bug54992.phpt | 2 +- ext/openssl/tests/bug62890.phpt | 2 +- ext/openssl/tests/bug65538_001.phpt | 2 +- ext/openssl/tests/bug65538_003.phpt | 2 +- ext/openssl/tests/bug65729.phpt | 2 +- ext/openssl/tests/bug68265.phpt | 2 +- ext/openssl/tests/bug68879.phpt | 2 +- ext/openssl/tests/bug68920.phpt | 2 +- ext/openssl/tests/bug69215.phpt | 2 +- ext/openssl/tests/bug72333.phpt | 2 +- ext/openssl/tests/bug73072.phpt | 2 +- ext/openssl/tests/bug74159.phpt | 2 +- ext/openssl/tests/bug74796.phpt | 2 +- ext/openssl/tests/bug76705.phpt | 6 +- ext/openssl/tests/bug77390.phpt | 2 +- ext/openssl/tests/bug80770.phpt | 2 +- ext/openssl/tests/capture_peer_cert_001.phpt | 2 +- ext/openssl/tests/gh10495.phpt | 2 +- ext/openssl/tests/gh13860.phpt | 2 +- ext/openssl/tests/gh19245.phpt | 6 +- ext/openssl/tests/gh20802.phpt | 2 +- ext/openssl/tests/gh21031.phpt | 2 +- ext/openssl/tests/gh22081.phpt | 2 +- ext/openssl/tests/gh9310.phpt | 24 +- .../tests/openssl_peer_fingerprint_basic.phpt | 2 +- ext/openssl/tests/peer_verification.phpt | 2 +- ext/openssl/tests/san_absent_cn_fallback.phpt | 2 +- ext/openssl/tests/san_ipv6_peer_matching.phpt | 2 +- ext/openssl/tests/san_no_cn_fallback.phpt | 2 +- ext/openssl/tests/san_peer_matching.phpt | 2 +- ext/openssl/tests/san_srv_no_cn_fallback.phpt | 2 +- ext/openssl/tests/san_uri_no_cn_fallback.phpt | 2 +- ext/openssl/tests/session_meta_capture.phpt | 2 +- .../tests/session_meta_capture_tlsv13.phpt | 2 +- .../session_resumption_cache_disabled.phpt | 2 +- .../session_resumption_client_basic.phpt | 2 +- .../session_resumption_get_cb_no_ticket.phpt | 2 +- ...esumption_get_cb_num_tickets_positive.phpt | 2 +- ...on_resumption_get_cb_num_tickets_zero.phpt | 2 +- ...sion_resumption_import_export_session.phpt | 2 +- .../session_resumption_invalid_callback.phpt | 2 +- .../session_resumption_invalid_data.phpt | 2 +- .../session_resumption_new_cb_no_context.phpt | 2 +- .../session_resumption_persistent_reject.phpt | 2 +- .../session_resumption_require_new_cb.phpt | 2 +- .../session_resumption_serialize_session.phpt | 2 +- ...ption_server_external_with_context_id.phpt | 2 +- ...server_external_with_context_id_tls12.phpt | 2 +- ...mption_server_external_with_no_verify.phpt | 2 +- .../session_resumption_server_internal.phpt | 2 +- .../tests/session_unserialize_repeat.phpt | 2 +- ext/openssl/tests/sni_server.phpt | 2 +- ext/openssl/tests/sni_server_key_cert.phpt | 2 +- .../tests/stream_cafile_no_valid_certs.phpt | 2 +- .../stream_copy_to_stream_ssl_to_file.phpt | 2 +- ...stream_crypto_enable_timeout_blocking.phpt | 2 +- .../tests/stream_crypto_flags_001.phpt | 2 +- .../tests/stream_crypto_flags_002.phpt | 2 +- .../tests/stream_crypto_flags_003.phpt | 2 +- .../tests/stream_crypto_flags_004.phpt | 2 +- .../tests/stream_eof_after_close_notify.phpt | 2 +- .../tests/stream_poll_handle_cast.phpt | 2 +- ext/openssl/tests/stream_security_level.phpt | 2 +- .../tests/stream_server_reneg_limit.phpt | 2 +- .../stream_server_reneg_limit_trampoline.phpt | 2 +- ...am_socket_get_crypto_status_handshake.phpt | 2 +- .../stream_socket_get_crypto_status_read.phpt | 2 +- ...t_get_crypto_status_supplemental_read.phpt | 2 +- .../stream_supplemental_read_timeout.phpt | 2 +- .../tests/stream_verify_peer_name_001.phpt | 2 +- .../tests/stream_verify_peer_name_002.phpt | 2 +- .../tests/stream_verify_peer_name_003.phpt | 2 +- ext/openssl/tests/streams_crypto_method.phpt | 2 +- ext/openssl/tests/tls_early_data_basic.phpt | 2 +- ext/openssl/tests/tls_early_data_invalid.phpt | 2 +- ext/openssl/tests/tls_early_data_large.phpt | 2 +- .../tests/tls_early_data_unsupported.phpt | 2 +- .../tests/tls_min_v1.0_max_v1.1_wrapper.phpt | 2 +- .../tests/tls_psk_callback_not_callable.phpt | 2 +- .../tests/tls_psk_callback_wrong_type.phpt | 2 +- .../tests/tls_psk_client_callback_null.phpt | 2 +- .../tests/tls_psk_client_callback_throws.phpt | 2 +- .../tests/tls_psk_client_no_identity.phpt | 2 +- ext/openssl/tests/tls_psk_mismatch.phpt | 2 +- ext/openssl/tests/tls_psk_tls12_basic.phpt | 2 +- ext/openssl/tests/tls_psk_tls13_basic.phpt | 2 +- .../tests/tls_psk_tls13_unknown_identity.phpt | 2 +- ext/openssl/tests/tls_wrapper.phpt | 2 +- .../tests/tls_wrapper_with_tls_v1.3.phpt | 2 +- ext/openssl/tests/tlsv1.0_wrapper.phpt | 2 +- ext/openssl/tests/tlsv1.1_wrapper.phpt | 2 +- ext/openssl/tests/tlsv1.2_wrapper.phpt | 2 +- ext/openssl/tests/tlsv1.3_wrapper.phpt | 2 +- 97 files changed, 112 insertions(+), 347 deletions(-) delete mode 100644 ext/openssl/tests/ServerClientTestCase.inc diff --git a/ext/openssl/tests/GHSA-xr7j-rvgx-xq5p.phpt b/ext/openssl/tests/GHSA-xr7j-rvgx-xq5p.phpt index daf5b878bbf8..c73f48c09af8 100644 --- a/ext/openssl/tests/GHSA-xr7j-rvgx-xq5p.phpt +++ b/ext/openssl/tests/GHSA-xr7j-rvgx-xq5p.phpt @@ -44,7 +44,7 @@ include 'CertificateGenerator.inc'; $certificateGenerator = new CertificateGenerator(); $certificateGenerator->saveNewCertAsFileWithKey('a*aaaa', $certFile, null, $san); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --CLEAN-- diff --git a/ext/openssl/tests/ServerClientTestCase.inc b/ext/openssl/tests/ServerClientTestCase.inc deleted file mode 100644 index 0c3c49db7259..000000000000 --- a/ext/openssl/tests/ServerClientTestCase.inc +++ /dev/null @@ -1,237 +0,0 @@ -notify($worker, $message); -} - -function phpt_wait($worker = WORKER_DEFAULT_NAME, $timeout = null): ?string -{ - return ServerClientTestCase::getInstance()->wait($worker, $timeout); -} - -function phpt_notify_server_start($server): void -{ - ServerClientTestCase::getInstance()->notify_server_start($server); -} - -function phpt_has_sslv3() { - static $result = null; - if (!is_null($result)) { - return $result; - } - $server = @stream_socket_server('sslv3://127.0.0.1:0'); - if ($result = !!$server) { - fclose($server); - } - return $result; -} - -function phpt_extract_tls_records($rawData) { - $records = []; - $offset = 0; - $dataLength = strlen($rawData); - - while ($offset < $dataLength) { - // Ensure there's enough data left for the header. - if ($offset + 5 > $dataLength) { - break; - } - - // Extract the length of the current record. - $length = unpack("n", substr($rawData, $offset + 3, 2))[1]; - - // Check if the total length is within the bounds of the rawData. - if ($offset + 5 + $length > $dataLength) { - break; - } - - // Extract the record and add it to the records array. - $records[] = substr($rawData, $offset, 5 + $length); - - // Move the offset past the current record. - $offset += 5 + $length; - } - - return $records; -} - -/** - * This is a singleton to let the wait/notify functions work - * I know it's horrible, but it's a means to an end - */ -class ServerClientTestCase -{ - private $isWorker = false; - - private $workerHandle = []; - - private $workerStdIn = []; - - private $workerStdOut = []; - - private static $instance; - - public static function getInstance($isWorker = false) - { - if (!isset(self::$instance)) { - self::$instance = new self($isWorker); - } - - return self::$instance; - } - - public function __construct($isWorker = false) - { - if (!isset(self::$instance)) { - self::$instance = $this; - } - - $this->isWorker = $isWorker; - } - - private function spawnWorkerProcess($worker, $code) - { - if (defined("PHP_WINDOWS_VERSION_MAJOR")) { - $ini = php_ini_loaded_file(); - $cmd = sprintf( - '%s %s "%s" %s', - // XXX: TEST_PHP_EXTRA_ARGS for run-test values won't work here? - PHP_BINARY, $ini ? "-n -c $ini -d error_include_args=0" : "", - __FILE__, - WORKER_ARGV_VALUE - ); - } else { - $cmd = sprintf( - '%s %s "%s" %s %s', - PHP_BINARY, - getenv('TEST_PHP_EXTRA_ARGS'), - __FILE__, - WORKER_ARGV_VALUE, - $worker - ); - } - $this->workerHandle[$worker] = proc_open( - $cmd, - [['pipe', 'r'], ['pipe', 'w'], STDERR], - $pipes - ); - $this->workerStdIn[$worker] = $pipes[0]; - $this->workerStdOut[$worker] = $pipes[1]; - - fwrite($this->workerStdIn[$worker], $code . "\n---\n"); - } - - private function cleanupWorkerProcess($worker) - { - fclose($this->workerStdIn[$worker]); - /* Drain stdout to EOF before closing it, so late worker writes (e.g. - * buffered error output) don't fail and abort the worker mid-output. */ - stream_set_blocking($this->workerStdOut[$worker], true); - stream_get_contents($this->workerStdOut[$worker]); - fclose($this->workerStdOut[$worker]); - proc_close($this->workerHandle[$worker]); - } - - private function stripPhpTagsFromCode($code) - { - return preg_replace('/^\s*<\?(?:php)?|\?>\s*$/i', '', $code); - } - - public function runWorker() - { - $code = ''; - - while (1) { - $line = fgets(STDIN); - - if (trim($line) === "---") { - break; - } - - $code .= $line; - } - - eval($code); - } - - /** - * Run client and all workers - * - * @param string $clientCode The client PHP code - * @param string|array $workerCode - * @param bool $ephemeral Select whether automatic port selection and automatic awaiting is used - * @return void - * @throws Exception - */ - public function run(string $clientCode, string|array $workerCode, bool $ephemeral = true): void - { - if (!is_array($workerCode)) { - $workerCode = [WORKER_DEFAULT_NAME => $workerCode]; - } - reset($workerCode); - $code = current($workerCode); - $worker = key($workerCode); - while ($worker != null) { - $this->spawnWorkerProcess($worker, $this->stripPhpTagsFromCode($code)); - $code = next($workerCode); - if ($ephemeral) { - $addr = trim($this->wait($worker)); - if (empty($addr)) { - throw new \Exception("Failed server start"); - } - if (strpos($addr, 'SERVER_EXCEPTION') !== false) { - echo $addr; - } - if ($code === false) { - $clientCode = preg_replace('/{{\s*ADDR\s*}}/', $addr, $clientCode); - } else { - $code = preg_replace('/{{\s*ADDR\s*}}/', $addr, $code); - } - } - $worker = key($workerCode); - } - - eval($this->stripPhpTagsFromCode($clientCode)); - foreach ($workerCode as $worker => $code) { - $this->cleanupWorkerProcess($worker); - } - } - - public function wait($worker, $timeout = null): ?string - { - $handle = $this->isWorker ? STDIN : $this->workerStdOut[$worker]; - if ($timeout === null) { - return fgets($handle); - } - - stream_set_blocking($handle, false); - $read = [$handle]; - $result = stream_select($read, $write, $except, $timeout); - if (!$result) { - return null; - } - - $result = fgets($handle); - stream_set_blocking($handle, true); - return $result; - } - - public function notify(string $worker, string $message = ""): void - { - fwrite($this->isWorker ? STDOUT : $this->workerStdIn[$worker], "$message\n"); - } - - public function notify_server_start($server): void - { - echo stream_socket_get_name($server, false) . "\n"; - } -} - -if (isset($argv[1]) && $argv[1] === WORKER_ARGV_VALUE) { - ServerClientTestCase::getInstance(true)->runWorker(); -} diff --git a/ext/openssl/tests/bug46127.phpt b/ext/openssl/tests/bug46127.phpt index 7c38192fca95..5ac43bee3916 100644 --- a/ext/openssl/tests/bug46127.phpt +++ b/ext/openssl/tests/bug46127.phpt @@ -43,7 +43,7 @@ include 'CertificateGenerator.inc'; $certificateGenerator = new CertificateGenerator(); $certificateGenerator->saveNewCertAsFileWithKey('bug46127', $certFile); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --CLEAN-- diff --git a/ext/openssl/tests/bug48182.phpt b/ext/openssl/tests/bug48182.phpt index 057b257038f2..9e328450f6f8 100644 --- a/ext/openssl/tests/bug48182.phpt +++ b/ext/openssl/tests/bug48182.phpt @@ -53,7 +53,7 @@ $certificateGenerator = new CertificateGenerator(); $certificateGenerator->saveCaCert($cacertFile); $certificateGenerator->saveNewCertAsFileWithKey($peerName, $certFile); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --CLEAN-- diff --git a/ext/openssl/tests/bug54992.phpt b/ext/openssl/tests/bug54992.phpt index bc5df171c5f0..54b062384973 100644 --- a/ext/openssl/tests/bug54992.phpt +++ b/ext/openssl/tests/bug54992.phpt @@ -47,7 +47,7 @@ $certificateGenerator = new CertificateGenerator(); $certificateGenerator->saveCaCert($cacertFile); $certificateGenerator->saveNewCertAsFileWithKey($peerName, $certFile); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --CLEAN-- diff --git a/ext/openssl/tests/bug62890.phpt b/ext/openssl/tests/bug62890.phpt index aa9bec0e6963..da9753653df4 100644 --- a/ext/openssl/tests/bug62890.phpt +++ b/ext/openssl/tests/bug62890.phpt @@ -41,7 +41,7 @@ include 'CertificateGenerator.inc'; $certificateGenerator = new CertificateGenerator(); $certificateGenerator->saveNewCertAsFileWithKey('bug62890', $certFile); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --CLEAN-- diff --git a/ext/openssl/tests/bug65538_001.phpt b/ext/openssl/tests/bug65538_001.phpt index e04f6cf820e4..0a1b21f6b607 100644 --- a/ext/openssl/tests/bug65538_001.phpt +++ b/ext/openssl/tests/bug65538_001.phpt @@ -58,7 +58,7 @@ $certificateGenerator = new CertificateGenerator(); $certificateGenerator->saveCaCert($cacertFile); $certificateGenerator->saveNewCertAsFileWithKey($peerName, $certFile); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --CLEAN-- diff --git a/ext/openssl/tests/bug65538_003.phpt b/ext/openssl/tests/bug65538_003.phpt index c18a024f0761..d79415ac924b 100644 --- a/ext/openssl/tests/bug65538_003.phpt +++ b/ext/openssl/tests/bug65538_003.phpt @@ -65,7 +65,7 @@ $certificateGenerator->saveNewCertAsFileWithKey($peerName, $certFile); $phar = new Phar($cacertPhar); $phar->addFromString($cacertFile, $certificateGenerator->getCaCert()); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --CLEAN-- diff --git a/ext/openssl/tests/bug65729.phpt b/ext/openssl/tests/bug65729.phpt index 6df22fd4a7aa..22e1d486a630 100644 --- a/ext/openssl/tests/bug65729.phpt +++ b/ext/openssl/tests/bug65729.phpt @@ -50,7 +50,7 @@ $certificateGenerator = new CertificateGenerator(); $certificateGenerator->saveCaCert($cacertFile); $certificateGenerator->saveNewCertAsFileWithKey('*.test.com', $certFile); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --CLEAN-- diff --git a/ext/openssl/tests/bug68265.phpt b/ext/openssl/tests/bug68265.phpt index ca82543520ca..fd67ff1296e6 100644 --- a/ext/openssl/tests/bug68265.phpt +++ b/ext/openssl/tests/bug68265.phpt @@ -41,7 +41,7 @@ include 'CertificateGenerator.inc'; $certificateGenerator = new CertificateGenerator(); $certificateGenerator->saveNewCertAsFileWithKey('test.com', $certFile, null, $san); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --CLEAN-- diff --git a/ext/openssl/tests/bug68879.phpt b/ext/openssl/tests/bug68879.phpt index cf87d2b54376..e42299974de9 100644 --- a/ext/openssl/tests/bug68879.phpt +++ b/ext/openssl/tests/bug68879.phpt @@ -41,7 +41,7 @@ include 'CertificateGenerator.inc'; $certificateGenerator = new CertificateGenerator(); $certificateGenerator->saveNewCertAsFileWithKey('test.com', $certFile, null, $san); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --CLEAN-- diff --git a/ext/openssl/tests/bug68920.phpt b/ext/openssl/tests/bug68920.phpt index a2d669e5b7d7..acecf521b3d6 100644 --- a/ext/openssl/tests/bug68920.phpt +++ b/ext/openssl/tests/bug68920.phpt @@ -52,7 +52,7 @@ include 'CertificateGenerator.inc'; $certificateGenerator = new CertificateGenerator(); $certificateGenerator->saveNewCertAsFileWithKey('bug68920', $certFile); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --CLEAN-- diff --git a/ext/openssl/tests/bug69215.phpt b/ext/openssl/tests/bug69215.phpt index 8b5dc5a261f3..9896421e1ccd 100644 --- a/ext/openssl/tests/bug69215.phpt +++ b/ext/openssl/tests/bug69215.phpt @@ -51,7 +51,7 @@ $certificateGenerator->saveCaCert($caCertFile); $certificateGenerator->saveNewCertAsFileWithKey('bug69215-client', $clientCertFile); $certificateGenerator->saveNewCertAsFileWithKey('bug69215-server', $serverCertFile); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --CLEAN-- diff --git a/ext/openssl/tests/bug72333.phpt b/ext/openssl/tests/bug72333.phpt index 57faf4d8fc99..cf940cf28010 100644 --- a/ext/openssl/tests/bug72333.phpt +++ b/ext/openssl/tests/bug72333.phpt @@ -69,7 +69,7 @@ include 'CertificateGenerator.inc'; $certificateGenerator = new CertificateGenerator(); $certificateGenerator->saveNewCertAsFileWithKey($peerName, $certFile); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --CLEAN-- diff --git a/ext/openssl/tests/bug73072.phpt b/ext/openssl/tests/bug73072.phpt index 881de20937f2..dd11ac337ff4 100644 --- a/ext/openssl/tests/bug73072.phpt +++ b/ext/openssl/tests/bug73072.phpt @@ -38,7 +38,7 @@ $clientCode = <<<'CODE' @stream_socket_client("tls://{{ ADDR }}", $errno, $errstr, 1, $flags, $ctx); CODE; -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --EXPECT-- diff --git a/ext/openssl/tests/bug74159.phpt b/ext/openssl/tests/bug74159.phpt index 523169e364a8..ff7dc4b35f0d 100644 --- a/ext/openssl/tests/bug74159.phpt +++ b/ext/openssl/tests/bug74159.phpt @@ -113,7 +113,7 @@ $certificateGenerator = new CertificateGenerator(); $certificateGenerator->saveCaCert($cacertFile); $certificateGenerator->saveNewCertAsFileWithKey($peerName, $certFile); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --CLEAN-- diff --git a/ext/openssl/tests/bug74796.phpt b/ext/openssl/tests/bug74796.phpt index 8ec5590c064f..9cfda0a41ffb 100644 --- a/ext/openssl/tests/bug74796.phpt +++ b/ext/openssl/tests/bug74796.phpt @@ -169,7 +169,7 @@ $clientCode = <<<'CODE' CODE; $clientCode = sprintf($clientCode, $caFile); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, [ 'server' => $serverCode, 'proxy' => $proxyCode, diff --git a/ext/openssl/tests/bug76705.phpt b/ext/openssl/tests/bug76705.phpt index 6e898c57b64f..34bd289ae9aa 100644 --- a/ext/openssl/tests/bug76705.phpt +++ b/ext/openssl/tests/bug76705.phpt @@ -8,11 +8,12 @@ if (!function_exists("proc_open")) die("skip no proc_open"); ?> --FILE-- [ - 'local_cert' => __DIR__ . '/bug76705.pem' + 'local_cert' => '%s' ]]); $server = stream_socket_server($serverUri, $errno, $errstr, $serverFlags, $serverCtx); @@ -20,6 +21,7 @@ $serverCode = <<<'CODE' @stream_socket_accept($server, 1); CODE; +$serverCode = sprintf($serverCode, $certFile); $clientCode = <<<'CODE' $serverUri = "ssl://{{ ADDR }}"; @@ -36,7 +38,7 @@ $clientCode = <<<'CODE' var_dump(stream_socket_client($serverUri, $errno, $errstr, 2, $clientFlags, $clientCtx)); CODE; -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --EXPECTF-- diff --git a/ext/openssl/tests/bug77390.phpt b/ext/openssl/tests/bug77390.phpt index a55ee16f4bf0..d96f0efdaa6c 100644 --- a/ext/openssl/tests/bug77390.phpt +++ b/ext/openssl/tests/bug77390.phpt @@ -109,7 +109,7 @@ $certificateGenerator = new CertificateGenerator(); $certificateGenerator->saveCaCert($cacertFile); $certificateGenerator->saveNewCertAsFileWithKey($peerName, $certFile); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, [ 'server' => $serverCode, 'proxy' => $proxyCode, diff --git a/ext/openssl/tests/bug80770.phpt b/ext/openssl/tests/bug80770.phpt index 21860dc78eb7..743ec2658ec0 100644 --- a/ext/openssl/tests/bug80770.phpt +++ b/ext/openssl/tests/bug80770.phpt @@ -73,7 +73,7 @@ $clientCode = <<<'CODE' CODE; $clientCode = sprintf($clientCode, $clientCertFile); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --CLEAN-- diff --git a/ext/openssl/tests/capture_peer_cert_001.phpt b/ext/openssl/tests/capture_peer_cert_001.phpt index bbf9e6d2c5f5..d440dc9cc4b7 100644 --- a/ext/openssl/tests/capture_peer_cert_001.phpt +++ b/ext/openssl/tests/capture_peer_cert_001.phpt @@ -45,7 +45,7 @@ $certificateGenerator = new CertificateGenerator(); $certificateGenerator->saveCaCert($cacertFile); $certificateGenerator->saveNewCertAsFileWithKey($peerName, $certFile); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --CLEAN-- diff --git a/ext/openssl/tests/gh10495.phpt b/ext/openssl/tests/gh10495.phpt index 5ef4894890c1..d0d699c8640b 100644 --- a/ext/openssl/tests/gh10495.phpt +++ b/ext/openssl/tests/gh10495.phpt @@ -94,7 +94,7 @@ $certificateGenerator = new CertificateGenerator(); $certificateGenerator->saveCaCert($cacertFile); $certificateGenerator->saveNewCertAsFileWithKey($peerName, $certFile); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, [ 'server' => $serverCode, 'proxy' => $proxyCode, diff --git a/ext/openssl/tests/gh13860.phpt b/ext/openssl/tests/gh13860.phpt index 35eb473fe12d..c3325f6b4e96 100644 --- a/ext/openssl/tests/gh13860.phpt +++ b/ext/openssl/tests/gh13860.phpt @@ -43,7 +43,7 @@ $clientCode = <<<'CODE' fclose($fp); CODE; -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --EXPECT-- diff --git a/ext/openssl/tests/gh19245.phpt b/ext/openssl/tests/gh19245.phpt index 13433cc42a32..a3006668b5bb 100644 --- a/ext/openssl/tests/gh19245.phpt +++ b/ext/openssl/tests/gh19245.phpt @@ -8,7 +8,7 @@ if (!function_exists("proc_open")) die("skip no proc_open"); ?> --FILE-- [ @@ -42,7 +42,7 @@ $clientCode = <<<'CODE' @stream_socket_client($serverUri, $errno, $errstr, 2, $clientFlags, $clientCtx); CODE; -$serverCode = sprintf($serverCodeTemplate, $baseDirCertFile . "\0test", $baseDirPkFile); +$serverCode = sprintf($serverCodeTemplate, $baseDir, $baseDirCertFile . "\0test", $baseDirPkFile); ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> diff --git a/ext/openssl/tests/gh20802.phpt b/ext/openssl/tests/gh20802.phpt index e078f461fc44..39e4a28ccc00 100644 --- a/ext/openssl/tests/gh20802.phpt +++ b/ext/openssl/tests/gh20802.phpt @@ -49,7 +49,7 @@ include 'CertificateGenerator.inc'; $certificateGenerator = new CertificateGenerator(); $certificateGenerator->saveNewCertAsFileWithKey('gh20802-snioptions', $certFile); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --CLEAN-- diff --git a/ext/openssl/tests/gh21031.phpt b/ext/openssl/tests/gh21031.phpt index 25bdb385a791..b97bbaac0506 100644 --- a/ext/openssl/tests/gh21031.phpt +++ b/ext/openssl/tests/gh21031.phpt @@ -48,7 +48,7 @@ $clientCode = <<<'CODE' phpt_notify(); CODE; -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --EXPECT-- diff --git a/ext/openssl/tests/gh22081.phpt b/ext/openssl/tests/gh22081.phpt index f8069bc180f7..c1a5e1942bc5 100644 --- a/ext/openssl/tests/gh22081.phpt +++ b/ext/openssl/tests/gh22081.phpt @@ -60,7 +60,7 @@ include 'CertificateGenerator.inc'; $certificateGenerator = new CertificateGenerator(); $certificateGenerator->saveNewCertAsFileWithKey('gh22081-server-reneg-nonblocking', $certFile); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --CLEAN-- diff --git a/ext/openssl/tests/gh9310.phpt b/ext/openssl/tests/gh9310.phpt index 874ed4c781d3..33dcb6a455c5 100644 --- a/ext/openssl/tests/gh9310.phpt +++ b/ext/openssl/tests/gh9310.phpt @@ -8,7 +8,7 @@ if (!function_exists("proc_open")) die("skip no proc_open"); ?> --FILE-- [ @@ -70,7 +70,7 @@ CODE; $sniServerCodeV1 = <<<'CODE' ini_set('log_errors', 'On'); - ini_set('open_basedir', __DIR__ . '/gh9310'); + ini_set('open_basedir', '%s'); $flags = STREAM_SERVER_BIND|STREAM_SERVER_LISTEN; $ctx = stream_context_create(['ssl' => [ 'SNI_server_certs' => [ @@ -83,11 +83,11 @@ $sniServerCodeV1 = <<<'CODE' stream_socket_accept($server); CODE; -$sniServerCodeV1 = sprintf($sniServerCodeV1, $sniCsFile); +$sniServerCodeV1 = sprintf($sniServerCodeV1, $baseDir, $sniCsFile); $sniServerCodeV2 = <<<'CODE' ini_set('log_errors', 'On'); - ini_set('open_basedir', __DIR__ . '/gh9310'); + ini_set('open_basedir', '%s'); $flags = STREAM_SERVER_BIND|STREAM_SERVER_LISTEN; $ctx = stream_context_create(['ssl' => [ 'SNI_server_certs' => [ @@ -103,11 +103,11 @@ $sniServerCodeV2 = <<<'CODE' stream_socket_accept($server); CODE; -$sniServerCodeV2 = sprintf($sniServerCodeV2, $baseDirSniUkCertFile, $sniUkKeyFile); +$sniServerCodeV2 = sprintf($sniServerCodeV2, $baseDir, $baseDirSniUkCertFile, $sniUkKeyFile); $sniServerCodeV3 = <<<'CODE' ini_set('log_errors', 'On'); - ini_set('open_basedir', __DIR__ . '/gh9310'); + ini_set('open_basedir', '%s'); $flags = STREAM_SERVER_BIND|STREAM_SERVER_LISTEN; $ctx = stream_context_create(['ssl' => [ 'SNI_server_certs' => [ @@ -123,7 +123,7 @@ $sniServerCodeV3 = <<<'CODE' stream_socket_accept($server); CODE; -$sniServerCodeV3 = sprintf($sniServerCodeV3, $sniUsCertFile, $sniUsKeyFile); +$sniServerCodeV3 = sprintf($sniServerCodeV3, $baseDir, $sniUsCertFile, $sniUsKeyFile); $sniClientCodeTemplate = <<<'CODE' $flags = STREAM_CLIENT_CONNECT; @@ -136,16 +136,16 @@ $sniClientCodeTemplate = <<<'CODE' @stream_socket_client("tls://{{ ADDR }}", $errno, $errstr, 1, $flags, $ctx); CODE; -$serverCode = sprintf($serverCodeTemplate, $baseDirCertFile . "\0test", $baseDirPkFile); +$serverCode = sprintf($serverCodeTemplate, $baseDir, $baseDirCertFile . "\0test", $baseDirPkFile); ServerClientTestCase::getInstance()->run($clientCode, $serverCode); -$serverCode = sprintf($serverCodeTemplate, $baseDirCertFile, $baseDirPkFile . "\0test"); +$serverCode = sprintf($serverCodeTemplate, $baseDir, $baseDirCertFile, $baseDirPkFile . "\0test"); ServerClientTestCase::getInstance()->run($clientCode, $serverCode); -$serverCode = sprintf($serverCodeTemplate, $certFile, $pkFile); +$serverCode = sprintf($serverCodeTemplate, $baseDir, $certFile, $pkFile); ServerClientTestCase::getInstance()->run($clientCode, $serverCode); -$serverCode = sprintf($serverCodeTemplate, $baseDirCertFile, $pkFile); +$serverCode = sprintf($serverCodeTemplate, $baseDir, $baseDirCertFile, $pkFile); ServerClientTestCase::getInstance()->run($clientCode, $serverCode); $sniClientCode = sprintf($sniClientCodeTemplate, $sniCaFile, 'cs.php.net'); diff --git a/ext/openssl/tests/openssl_peer_fingerprint_basic.phpt b/ext/openssl/tests/openssl_peer_fingerprint_basic.phpt index 34080446088d..7ad47d8cceee 100644 --- a/ext/openssl/tests/openssl_peer_fingerprint_basic.phpt +++ b/ext/openssl/tests/openssl_peer_fingerprint_basic.phpt @@ -60,7 +60,7 @@ $actualSha256 = $certificateGenerator->getCertDigest('sha256'); $clientCode = sprintf($clientCode, $cacertFile, $peerName, $brokenMd5, $actualSha256); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --CLEAN-- diff --git a/ext/openssl/tests/peer_verification.phpt b/ext/openssl/tests/peer_verification.phpt index bda68c933ca4..1a8505949f6e 100644 --- a/ext/openssl/tests/peer_verification.phpt +++ b/ext/openssl/tests/peer_verification.phpt @@ -63,7 +63,7 @@ $certificateGenerator = new CertificateGenerator(); $certificateGenerator->saveCaCert($cacertFile); $certificateGenerator->saveNewCertAsFileWithKey($peerName, $certFile); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --CLEAN-- diff --git a/ext/openssl/tests/san_absent_cn_fallback.phpt b/ext/openssl/tests/san_absent_cn_fallback.phpt index 30f4821b5fe5..c94c2725cf36 100644 --- a/ext/openssl/tests/san_absent_cn_fallback.phpt +++ b/ext/openssl/tests/san_absent_cn_fallback.phpt @@ -43,7 +43,7 @@ include 'CertificateGenerator.inc'; $certificateGenerator = new CertificateGenerator(); $certificateGenerator->saveNewCertAsFileWithKey('cn.example.org', $certFile); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --CLEAN-- diff --git a/ext/openssl/tests/san_ipv6_peer_matching.phpt b/ext/openssl/tests/san_ipv6_peer_matching.phpt index bc3bd02f269c..ed4b3e227821 100644 --- a/ext/openssl/tests/san_ipv6_peer_matching.phpt +++ b/ext/openssl/tests/san_ipv6_peer_matching.phpt @@ -49,7 +49,7 @@ include 'CertificateGenerator.inc'; $certificateGenerator = new CertificateGenerator(); $certificateGenerator->saveNewCertAsFileWithKey(null, $certFile, null, $san); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --CLEAN-- diff --git a/ext/openssl/tests/san_no_cn_fallback.phpt b/ext/openssl/tests/san_no_cn_fallback.phpt index ae19be414ee7..ef160a61b40f 100644 --- a/ext/openssl/tests/san_no_cn_fallback.phpt +++ b/ext/openssl/tests/san_no_cn_fallback.phpt @@ -46,7 +46,7 @@ $certificateGenerator = new CertificateGenerator(); $certificateGenerator->saveNewCertAsFileWithKey( 'cn.example.org', $certFile, null, 'DNS:san.example.org'); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --CLEAN-- diff --git a/ext/openssl/tests/san_peer_matching.phpt b/ext/openssl/tests/san_peer_matching.phpt index cca4d360d8bd..088eb1bba856 100644 --- a/ext/openssl/tests/san_peer_matching.phpt +++ b/ext/openssl/tests/san_peer_matching.phpt @@ -44,7 +44,7 @@ include 'CertificateGenerator.inc'; $certificateGenerator = new CertificateGenerator(); $certificateGenerator->saveNewCertAsFileWithKey(null, $certFile, null, $san); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --CLEAN-- diff --git a/ext/openssl/tests/san_srv_no_cn_fallback.phpt b/ext/openssl/tests/san_srv_no_cn_fallback.phpt index 9c130e757b78..7438035a392f 100644 --- a/ext/openssl/tests/san_srv_no_cn_fallback.phpt +++ b/ext/openssl/tests/san_srv_no_cn_fallback.phpt @@ -41,7 +41,7 @@ $certificateGenerator = new CertificateGenerator(); $certificateGenerator->saveNewCertAsFileWithKey( 'cn.example.org', $certFile, null, 'otherName:1.3.6.1.5.5.7.8.7;IA5STRING:_https.san.example.org'); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --CLEAN-- diff --git a/ext/openssl/tests/san_uri_no_cn_fallback.phpt b/ext/openssl/tests/san_uri_no_cn_fallback.phpt index b621d52312bc..3e3b4f6dc6d6 100644 --- a/ext/openssl/tests/san_uri_no_cn_fallback.phpt +++ b/ext/openssl/tests/san_uri_no_cn_fallback.phpt @@ -41,7 +41,7 @@ $certificateGenerator = new CertificateGenerator(); $certificateGenerator->saveNewCertAsFileWithKey( 'cn.example.org', $certFile, null, 'URI:https://san.example.org/x'); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --CLEAN-- diff --git a/ext/openssl/tests/session_meta_capture.phpt b/ext/openssl/tests/session_meta_capture.phpt index c642126a1269..fa71b80689d3 100644 --- a/ext/openssl/tests/session_meta_capture.phpt +++ b/ext/openssl/tests/session_meta_capture.phpt @@ -59,7 +59,7 @@ $certificateGenerator = new CertificateGenerator(); $certificateGenerator->saveCaCert($cacertFile); $certificateGenerator->saveNewCertAsFileWithKey($peerName, $certFile); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --CLEAN-- diff --git a/ext/openssl/tests/session_meta_capture_tlsv13.phpt b/ext/openssl/tests/session_meta_capture_tlsv13.phpt index daeba0c9f1e3..b01d61a981b4 100644 --- a/ext/openssl/tests/session_meta_capture_tlsv13.phpt +++ b/ext/openssl/tests/session_meta_capture_tlsv13.phpt @@ -47,7 +47,7 @@ $certificateGenerator = new CertificateGenerator(); $certificateGenerator->saveCaCert($cacertFile); $certificateGenerator->saveNewCertAsFileWithKey($peerName, $certFile); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --CLEAN-- diff --git a/ext/openssl/tests/session_resumption_cache_disabled.phpt b/ext/openssl/tests/session_resumption_cache_disabled.phpt index 9e0e8a82f399..727df1dafc5e 100644 --- a/ext/openssl/tests/session_resumption_cache_disabled.phpt +++ b/ext/openssl/tests/session_resumption_cache_disabled.phpt @@ -72,7 +72,7 @@ include 'CertificateGenerator.inc'; $certificateGenerator = new CertificateGenerator(); $certificateGenerator->saveNewCertAsFileWithKey('session_disabled_test', $certFile); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --CLEAN-- diff --git a/ext/openssl/tests/session_resumption_client_basic.phpt b/ext/openssl/tests/session_resumption_client_basic.phpt index ee1d126a6d9f..ed8673aff210 100644 --- a/ext/openssl/tests/session_resumption_client_basic.phpt +++ b/ext/openssl/tests/session_resumption_client_basic.phpt @@ -74,7 +74,7 @@ include 'CertificateGenerator.inc'; $certificateGenerator = new CertificateGenerator(); $certificateGenerator->saveNewCertAsFileWithKey('session_resumption_test', $certFile); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --CLEAN-- diff --git a/ext/openssl/tests/session_resumption_get_cb_no_ticket.phpt b/ext/openssl/tests/session_resumption_get_cb_no_ticket.phpt index 74db2f3474ba..8586a9eb2045 100644 --- a/ext/openssl/tests/session_resumption_get_cb_no_ticket.phpt +++ b/ext/openssl/tests/session_resumption_get_cb_no_ticket.phpt @@ -67,7 +67,7 @@ include 'CertificateGenerator.inc'; $certificateGenerator = new CertificateGenerator(); $certificateGenerator->saveNewCertAsFileWithKey('session_no_ticket_test', $certFile); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --CLEAN-- diff --git a/ext/openssl/tests/session_resumption_get_cb_num_tickets_positive.phpt b/ext/openssl/tests/session_resumption_get_cb_num_tickets_positive.phpt index 5c7512d73a35..5f29e3f5bcb7 100644 --- a/ext/openssl/tests/session_resumption_get_cb_num_tickets_positive.phpt +++ b/ext/openssl/tests/session_resumption_get_cb_num_tickets_positive.phpt @@ -70,7 +70,7 @@ include 'CertificateGenerator.inc'; $certificateGenerator = new CertificateGenerator(); $certificateGenerator->saveNewCertAsFileWithKey('session_num_tickets_test', $certFile); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --CLEAN-- diff --git a/ext/openssl/tests/session_resumption_get_cb_num_tickets_zero.phpt b/ext/openssl/tests/session_resumption_get_cb_num_tickets_zero.phpt index 13654cd451e9..e9e1ae535280 100644 --- a/ext/openssl/tests/session_resumption_get_cb_num_tickets_zero.phpt +++ b/ext/openssl/tests/session_resumption_get_cb_num_tickets_zero.phpt @@ -96,7 +96,7 @@ include 'CertificateGenerator.inc'; $certificateGenerator = new CertificateGenerator(); $certificateGenerator->saveNewCertAsFileWithKey('session_no_tickets_zero_test', $certFile); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --CLEAN-- diff --git a/ext/openssl/tests/session_resumption_import_export_session.phpt b/ext/openssl/tests/session_resumption_import_export_session.phpt index 9c1f40fc88bf..61a981b89478 100644 --- a/ext/openssl/tests/session_resumption_import_export_session.phpt +++ b/ext/openssl/tests/session_resumption_import_export_session.phpt @@ -71,7 +71,7 @@ include 'CertificateGenerator.inc'; $certificateGenerator = new CertificateGenerator(); $certificateGenerator->saveNewCertAsFileWithKey('session_resumption_test', $certFile); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --CLEAN-- diff --git a/ext/openssl/tests/session_resumption_invalid_callback.phpt b/ext/openssl/tests/session_resumption_invalid_callback.phpt index b6cfc90a0554..6e334773523b 100644 --- a/ext/openssl/tests/session_resumption_invalid_callback.phpt +++ b/ext/openssl/tests/session_resumption_invalid_callback.phpt @@ -49,7 +49,7 @@ include 'CertificateGenerator.inc'; $certificateGenerator = new CertificateGenerator(); $certificateGenerator->saveNewCertAsFileWithKey('session_invalid_cb_test', $certFile); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --CLEAN-- diff --git a/ext/openssl/tests/session_resumption_invalid_data.phpt b/ext/openssl/tests/session_resumption_invalid_data.phpt index 93d9329ca0e9..193943f725e4 100644 --- a/ext/openssl/tests/session_resumption_invalid_data.phpt +++ b/ext/openssl/tests/session_resumption_invalid_data.phpt @@ -51,7 +51,7 @@ include 'CertificateGenerator.inc'; $certificateGenerator = new CertificateGenerator(); $certificateGenerator->saveNewCertAsFileWithKey('session_invalid_test', $certFile); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --CLEAN-- diff --git a/ext/openssl/tests/session_resumption_new_cb_no_context.phpt b/ext/openssl/tests/session_resumption_new_cb_no_context.phpt index ee2852c54ad7..d5059bbba7db 100644 --- a/ext/openssl/tests/session_resumption_new_cb_no_context.phpt +++ b/ext/openssl/tests/session_resumption_new_cb_no_context.phpt @@ -66,7 +66,7 @@ $certificateGenerator = new CertificateGenerator(); $certificateGenerator->saveCaCert($caCertFile); $certificateGenerator->saveNewCertAsFileWithKey('session_verify_test', $certFile); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --CLEAN-- diff --git a/ext/openssl/tests/session_resumption_persistent_reject.phpt b/ext/openssl/tests/session_resumption_persistent_reject.phpt index 835e9bb51648..4a1e351dffef 100644 --- a/ext/openssl/tests/session_resumption_persistent_reject.phpt +++ b/ext/openssl/tests/session_resumption_persistent_reject.phpt @@ -49,7 +49,7 @@ include 'CertificateGenerator.inc'; $certificateGenerator = new CertificateGenerator(); $certificateGenerator->saveNewCertAsFileWithKey('session_persistent_test', $certFile); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --CLEAN-- diff --git a/ext/openssl/tests/session_resumption_require_new_cb.phpt b/ext/openssl/tests/session_resumption_require_new_cb.phpt index a08408e2d90b..4acf675507f0 100644 --- a/ext/openssl/tests/session_resumption_require_new_cb.phpt +++ b/ext/openssl/tests/session_resumption_require_new_cb.phpt @@ -62,7 +62,7 @@ include 'CertificateGenerator.inc'; $certificateGenerator = new CertificateGenerator(); $certificateGenerator->saveNewCertAsFileWithKey('session_require_cb_test', $certFile); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --CLEAN-- diff --git a/ext/openssl/tests/session_resumption_serialize_session.phpt b/ext/openssl/tests/session_resumption_serialize_session.phpt index ca43c46c3901..6b9f3069a975 100644 --- a/ext/openssl/tests/session_resumption_serialize_session.phpt +++ b/ext/openssl/tests/session_resumption_serialize_session.phpt @@ -63,7 +63,7 @@ include 'CertificateGenerator.inc'; $certificateGenerator = new CertificateGenerator(); $certificateGenerator->saveNewCertAsFileWithKey('session_resumption_test', $certFile); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --CLEAN-- diff --git a/ext/openssl/tests/session_resumption_server_external_with_context_id.phpt b/ext/openssl/tests/session_resumption_server_external_with_context_id.phpt index f8aa9ce33050..113d4265e933 100644 --- a/ext/openssl/tests/session_resumption_server_external_with_context_id.phpt +++ b/ext/openssl/tests/session_resumption_server_external_with_context_id.phpt @@ -100,7 +100,7 @@ include 'CertificateGenerator.inc'; $certificateGenerator = new CertificateGenerator(); $certificateGenerator->saveNewCertAsFileWithKey('session_external_proper_test', $certFile); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --CLEAN-- diff --git a/ext/openssl/tests/session_resumption_server_external_with_context_id_tls12.phpt b/ext/openssl/tests/session_resumption_server_external_with_context_id_tls12.phpt index 7b4d8bfa5a99..5f8c08a3bbb8 100644 --- a/ext/openssl/tests/session_resumption_server_external_with_context_id_tls12.phpt +++ b/ext/openssl/tests/session_resumption_server_external_with_context_id_tls12.phpt @@ -100,7 +100,7 @@ include 'CertificateGenerator.inc'; $certificateGenerator = new CertificateGenerator(); $certificateGenerator->saveNewCertAsFileWithKey('session_external_proper_test', $certFile); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --CLEAN-- diff --git a/ext/openssl/tests/session_resumption_server_external_with_no_verify.phpt b/ext/openssl/tests/session_resumption_server_external_with_no_verify.phpt index 28bb97faff28..cb42b637a1b9 100644 --- a/ext/openssl/tests/session_resumption_server_external_with_no_verify.phpt +++ b/ext/openssl/tests/session_resumption_server_external_with_no_verify.phpt @@ -106,7 +106,7 @@ include 'CertificateGenerator.inc'; $certificateGenerator = new CertificateGenerator(); $certificateGenerator->saveNewCertAsFileWithKey('session_server_test', $certFile); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --CLEAN-- diff --git a/ext/openssl/tests/session_resumption_server_internal.phpt b/ext/openssl/tests/session_resumption_server_internal.phpt index d7c2633601e8..60a4548d0f88 100644 --- a/ext/openssl/tests/session_resumption_server_internal.phpt +++ b/ext/openssl/tests/session_resumption_server_internal.phpt @@ -83,7 +83,7 @@ include 'CertificateGenerator.inc'; $certificateGenerator = new CertificateGenerator(); $certificateGenerator->saveNewCertAsFileWithKey('session_internal_cache_test', $certFile); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --CLEAN-- diff --git a/ext/openssl/tests/session_unserialize_repeat.phpt b/ext/openssl/tests/session_unserialize_repeat.phpt index 20084df4fb24..218eb5dc64b7 100644 --- a/ext/openssl/tests/session_unserialize_repeat.phpt +++ b/ext/openssl/tests/session_unserialize_repeat.phpt @@ -72,7 +72,7 @@ include 'CertificateGenerator.inc'; $certificateGenerator = new CertificateGenerator(); $certificateGenerator->saveNewCertAsFileWithKey('session-unserialize-repeat', $certFile); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --CLEAN-- diff --git a/ext/openssl/tests/sni_server.phpt b/ext/openssl/tests/sni_server.phpt index db0b0190dab3..47e74fcc381f 100644 --- a/ext/openssl/tests/sni_server.phpt +++ b/ext/openssl/tests/sni_server.phpt @@ -66,7 +66,7 @@ $clientCode = <<<'CODE' CODE; $clientCode = sprintf($clientCode, $caFile); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --CLEAN-- diff --git a/ext/openssl/tests/sni_server_key_cert.phpt b/ext/openssl/tests/sni_server_key_cert.phpt index 878f97c1e359..330f998328bc 100644 --- a/ext/openssl/tests/sni_server_key_cert.phpt +++ b/ext/openssl/tests/sni_server_key_cert.phpt @@ -82,7 +82,7 @@ $clientCode = <<<'CODE' CODE; $clientCode = sprintf($clientCode, $caFile); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --CLEAN-- diff --git a/ext/openssl/tests/stream_cafile_no_valid_certs.phpt b/ext/openssl/tests/stream_cafile_no_valid_certs.phpt index 4622dfbf5765..a38ec5c630c3 100644 --- a/ext/openssl/tests/stream_cafile_no_valid_certs.phpt +++ b/ext/openssl/tests/stream_cafile_no_valid_certs.phpt @@ -30,7 +30,7 @@ $clientCode = <<<'CODE' CODE; $clientCode = sprintf($clientCode, __DIR__ . '/plain.txt'); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --EXPECTF-- diff --git a/ext/openssl/tests/stream_copy_to_stream_ssl_to_file.phpt b/ext/openssl/tests/stream_copy_to_stream_ssl_to_file.phpt index 76684d2917be..1f893b004f9b 100644 --- a/ext/openssl/tests/stream_copy_to_stream_ssl_to_file.phpt +++ b/ext/openssl/tests/stream_copy_to_stream_ssl_to_file.phpt @@ -57,7 +57,7 @@ $certificateGenerator = new CertificateGenerator(); $certificateGenerator->saveCaCert($cacertFile); $certificateGenerator->saveNewCertAsFileWithKey($peerName, $certFile); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --CLEAN-- diff --git a/ext/openssl/tests/stream_crypto_enable_timeout_blocking.phpt b/ext/openssl/tests/stream_crypto_enable_timeout_blocking.phpt index 39a8f973b866..48c5849de3a6 100644 --- a/ext/openssl/tests/stream_crypto_enable_timeout_blocking.phpt +++ b/ext/openssl/tests/stream_crypto_enable_timeout_blocking.phpt @@ -42,7 +42,7 @@ $clientCode = <<<'CODE' phpt_notify(); CODE; -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --EXPECT-- diff --git a/ext/openssl/tests/stream_crypto_flags_001.phpt b/ext/openssl/tests/stream_crypto_flags_001.phpt index ed22864a32e5..d138fc372882 100644 --- a/ext/openssl/tests/stream_crypto_flags_001.phpt +++ b/ext/openssl/tests/stream_crypto_flags_001.phpt @@ -52,7 +52,7 @@ $certificateGenerator = new CertificateGenerator(); $certificateGenerator->saveCaCert($cacertFile); $certificateGenerator->saveNewCertAsFileWithKey($peerName, $certFile); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --CLEAN-- diff --git a/ext/openssl/tests/stream_crypto_flags_002.phpt b/ext/openssl/tests/stream_crypto_flags_002.phpt index 8b73f883c3fd..4ae3ffe28b3e 100644 --- a/ext/openssl/tests/stream_crypto_flags_002.phpt +++ b/ext/openssl/tests/stream_crypto_flags_002.phpt @@ -59,7 +59,7 @@ $certificateGenerator = new CertificateGenerator(); $certificateGenerator->saveCaCert($cacertFile); $certificateGenerator->saveNewCertAsFileWithKey($peerName, $certFile); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --CLEAN-- diff --git a/ext/openssl/tests/stream_crypto_flags_003.phpt b/ext/openssl/tests/stream_crypto_flags_003.phpt index 012ccdfd4597..7bfaf02ae397 100644 --- a/ext/openssl/tests/stream_crypto_flags_003.phpt +++ b/ext/openssl/tests/stream_crypto_flags_003.phpt @@ -59,7 +59,7 @@ $certificateGenerator = new CertificateGenerator(); $certificateGenerator->saveCaCert($cacertFile); $certificateGenerator->saveNewCertAsFileWithKey($peerName, $certFile); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --CLEAN-- diff --git a/ext/openssl/tests/stream_crypto_flags_004.phpt b/ext/openssl/tests/stream_crypto_flags_004.phpt index cfd54c9bc1c8..eac5891e2dcb 100644 --- a/ext/openssl/tests/stream_crypto_flags_004.phpt +++ b/ext/openssl/tests/stream_crypto_flags_004.phpt @@ -64,7 +64,7 @@ $certificateGenerator = new CertificateGenerator(); $certificateGenerator->saveCaCert($cacertFile); $certificateGenerator->saveNewCertAsFileWithKey($peerName, $certFile); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --CLEAN-- diff --git a/ext/openssl/tests/stream_eof_after_close_notify.phpt b/ext/openssl/tests/stream_eof_after_close_notify.phpt index 4755e171544d..2f991e3ccf5e 100644 --- a/ext/openssl/tests/stream_eof_after_close_notify.phpt +++ b/ext/openssl/tests/stream_eof_after_close_notify.phpt @@ -45,7 +45,7 @@ CODE; include 'CertificateGenerator.inc'; (new CertificateGenerator())->saveNewCertAsFileWithKey('stream_eof_after_close_notify', $certFile); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --CLEAN-- diff --git a/ext/openssl/tests/stream_poll_handle_cast.phpt b/ext/openssl/tests/stream_poll_handle_cast.phpt index 5ef35f552bff..2ec81c2e102d 100644 --- a/ext/openssl/tests/stream_poll_handle_cast.phpt +++ b/ext/openssl/tests/stream_poll_handle_cast.phpt @@ -54,7 +54,7 @@ CODE; include 'CertificateGenerator.inc'; (new CertificateGenerator())->saveNewCertAsFileWithKey('stream_poll_handle_cast', $certFile); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --CLEAN-- diff --git a/ext/openssl/tests/stream_security_level.phpt b/ext/openssl/tests/stream_security_level.phpt index 84d847ef0d9a..27887a713888 100644 --- a/ext/openssl/tests/stream_security_level.phpt +++ b/ext/openssl/tests/stream_security_level.phpt @@ -55,7 +55,7 @@ $certificateGenerator = new CertificateGenerator(); $certificateGenerator->saveCaCert($cacertFile); $certificateGenerator->saveNewCertAsFileWithKey('stream_security_level', $certFile, $keyLength); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --CLEAN-- diff --git a/ext/openssl/tests/stream_server_reneg_limit.phpt b/ext/openssl/tests/stream_server_reneg_limit.phpt index b8e7c1726734..76f23bd8587a 100644 --- a/ext/openssl/tests/stream_server_reneg_limit.phpt +++ b/ext/openssl/tests/stream_server_reneg_limit.phpt @@ -98,7 +98,7 @@ include 'CertificateGenerator.inc'; $certificateGenerator = new CertificateGenerator(); $certificateGenerator->saveNewCertAsFileWithKey('stream_security_level', $certFile); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($serverCode, $clientCode, false); ?> --CLEAN-- diff --git a/ext/openssl/tests/stream_server_reneg_limit_trampoline.phpt b/ext/openssl/tests/stream_server_reneg_limit_trampoline.phpt index a44e9fdffe65..16298412096a 100644 --- a/ext/openssl/tests/stream_server_reneg_limit_trampoline.phpt +++ b/ext/openssl/tests/stream_server_reneg_limit_trampoline.phpt @@ -104,7 +104,7 @@ include 'CertificateGenerator.inc'; $certificateGenerator = new CertificateGenerator(); $certificateGenerator->saveNewCertAsFileWithKey('stream_security_level', $certFile); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($serverCode, $clientCode, false); ?> --CLEAN-- diff --git a/ext/openssl/tests/stream_socket_get_crypto_status_handshake.phpt b/ext/openssl/tests/stream_socket_get_crypto_status_handshake.phpt index 7e0f660c980d..692d506f1a36 100644 --- a/ext/openssl/tests/stream_socket_get_crypto_status_handshake.phpt +++ b/ext/openssl/tests/stream_socket_get_crypto_status_handshake.phpt @@ -123,7 +123,7 @@ include 'CertificateGenerator.inc'; $certificateGenerator = new CertificateGenerator(); $certificateGenerator->saveNewCertAsFileWithKey($peerName, $certFile); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, [ 'server' => $serverCode, 'proxy' => $proxyCode, diff --git a/ext/openssl/tests/stream_socket_get_crypto_status_read.phpt b/ext/openssl/tests/stream_socket_get_crypto_status_read.phpt index 308950a8ef03..dcde1b5a6ee2 100644 --- a/ext/openssl/tests/stream_socket_get_crypto_status_read.phpt +++ b/ext/openssl/tests/stream_socket_get_crypto_status_read.phpt @@ -81,7 +81,7 @@ include 'CertificateGenerator.inc'; $certificateGenerator = new CertificateGenerator(); $certificateGenerator->saveNewCertAsFileWithKey($peerName, $certFile); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --CLEAN-- diff --git a/ext/openssl/tests/stream_socket_get_crypto_status_supplemental_read.phpt b/ext/openssl/tests/stream_socket_get_crypto_status_supplemental_read.phpt index 9044b1bbdbe4..951eb5967ecc 100644 --- a/ext/openssl/tests/stream_socket_get_crypto_status_supplemental_read.phpt +++ b/ext/openssl/tests/stream_socket_get_crypto_status_supplemental_read.phpt @@ -71,7 +71,7 @@ include 'CertificateGenerator.inc'; $certificateGenerator = new CertificateGenerator(); $certificateGenerator->saveNewCertAsFileWithKey($peerName, $certFile); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --CLEAN-- diff --git a/ext/openssl/tests/stream_supplemental_read_timeout.phpt b/ext/openssl/tests/stream_supplemental_read_timeout.phpt index 0e36f146bf9e..879500166107 100644 --- a/ext/openssl/tests/stream_supplemental_read_timeout.phpt +++ b/ext/openssl/tests/stream_supplemental_read_timeout.phpt @@ -78,7 +78,7 @@ include 'CertificateGenerator.inc'; $certificateGenerator = new CertificateGenerator(); $certificateGenerator->saveNewCertAsFileWithKey($peerName, $certFile); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --CLEAN-- diff --git a/ext/openssl/tests/stream_verify_peer_name_001.phpt b/ext/openssl/tests/stream_verify_peer_name_001.phpt index e4f74ede2f7f..3660a37d59ba 100644 --- a/ext/openssl/tests/stream_verify_peer_name_001.phpt +++ b/ext/openssl/tests/stream_verify_peer_name_001.phpt @@ -43,7 +43,7 @@ include 'CertificateGenerator.inc'; $certificateGenerator = new CertificateGenerator(); $certificateGenerator->saveNewCertAsFileWithKey($peerName, $certFile); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --CLEAN-- diff --git a/ext/openssl/tests/stream_verify_peer_name_002.phpt b/ext/openssl/tests/stream_verify_peer_name_002.phpt index c6c4045a1a62..6764dac6d88e 100644 --- a/ext/openssl/tests/stream_verify_peer_name_002.phpt +++ b/ext/openssl/tests/stream_verify_peer_name_002.phpt @@ -46,7 +46,7 @@ $certificateGenerator = new CertificateGenerator(); $certificateGenerator->saveCaCert($cacertFile); $certificateGenerator->saveNewCertAsFileWithKey($actualPeerName, $certFile); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --CLEAN-- diff --git a/ext/openssl/tests/stream_verify_peer_name_003.phpt b/ext/openssl/tests/stream_verify_peer_name_003.phpt index 1ebd42c2fd45..baafb4976bde 100644 --- a/ext/openssl/tests/stream_verify_peer_name_003.phpt +++ b/ext/openssl/tests/stream_verify_peer_name_003.phpt @@ -45,7 +45,7 @@ $certificateGenerator = new CertificateGenerator(); $certificateGenerator->saveCaCert($cacertFile); $certificateGenerator->saveNewCertAsFileWithKey($actualPeerName, $certFile); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --CLEAN-- diff --git a/ext/openssl/tests/streams_crypto_method.phpt b/ext/openssl/tests/streams_crypto_method.phpt index 39584b50cdbf..c9eb7e044960 100644 --- a/ext/openssl/tests/streams_crypto_method.phpt +++ b/ext/openssl/tests/streams_crypto_method.phpt @@ -54,7 +54,7 @@ include 'CertificateGenerator.inc'; $certificateGenerator = new CertificateGenerator(); $certificateGenerator->saveNewCertAsFileWithKey('streams_crypto_method', $certFile); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --CLEAN-- diff --git a/ext/openssl/tests/tls_early_data_basic.phpt b/ext/openssl/tests/tls_early_data_basic.phpt index 9e4691192705..cfcd03686dd9 100644 --- a/ext/openssl/tests/tls_early_data_basic.phpt +++ b/ext/openssl/tests/tls_early_data_basic.phpt @@ -76,7 +76,7 @@ include 'CertificateGenerator.inc'; $certificateGenerator = new CertificateGenerator(); $certificateGenerator->saveNewCertAsFileWithKey('tls_early_data_basic', $certFile); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --CLEAN-- diff --git a/ext/openssl/tests/tls_early_data_invalid.phpt b/ext/openssl/tests/tls_early_data_invalid.phpt index 2989f5481ce3..4d80f5d3bab4 100644 --- a/ext/openssl/tests/tls_early_data_invalid.phpt +++ b/ext/openssl/tests/tls_early_data_invalid.phpt @@ -39,7 +39,7 @@ include 'CertificateGenerator.inc'; $certificateGenerator = new CertificateGenerator(); $certificateGenerator->saveNewCertAsFileWithKey('tls_early_data_invalid', $certFile); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --CLEAN-- diff --git a/ext/openssl/tests/tls_early_data_large.phpt b/ext/openssl/tests/tls_early_data_large.phpt index 15940f866d7d..a13ecac5328b 100644 --- a/ext/openssl/tests/tls_early_data_large.phpt +++ b/ext/openssl/tests/tls_early_data_large.phpt @@ -68,7 +68,7 @@ include 'CertificateGenerator.inc'; $certificateGenerator = new CertificateGenerator(); $certificateGenerator->saveNewCertAsFileWithKey('tls_early_data_large', $certFile); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --CLEAN-- diff --git a/ext/openssl/tests/tls_early_data_unsupported.phpt b/ext/openssl/tests/tls_early_data_unsupported.phpt index 8d121dc9f48b..b84a3600db1d 100644 --- a/ext/openssl/tests/tls_early_data_unsupported.phpt +++ b/ext/openssl/tests/tls_early_data_unsupported.phpt @@ -65,7 +65,7 @@ include 'CertificateGenerator.inc'; $certificateGenerator = new CertificateGenerator(); $certificateGenerator->saveNewCertAsFileWithKey('tls_early_data_unsupported', $certFile); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --CLEAN-- diff --git a/ext/openssl/tests/tls_min_v1.0_max_v1.1_wrapper.phpt b/ext/openssl/tests/tls_min_v1.0_max_v1.1_wrapper.phpt index 5be76547f209..589b24b1e039 100644 --- a/ext/openssl/tests/tls_min_v1.0_max_v1.1_wrapper.phpt +++ b/ext/openssl/tests/tls_min_v1.0_max_v1.1_wrapper.phpt @@ -59,7 +59,7 @@ include 'CertificateGenerator.inc'; $certificateGenerator = new CertificateGenerator(); $certificateGenerator->saveNewCertAsFileWithKey('tls_min_v1.0_max_v1.1_wrapper', $certFile); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --CLEAN-- diff --git a/ext/openssl/tests/tls_psk_callback_not_callable.phpt b/ext/openssl/tests/tls_psk_callback_not_callable.phpt index 14b2a0508e51..ed1586157a75 100644 --- a/ext/openssl/tests/tls_psk_callback_not_callable.phpt +++ b/ext/openssl/tests/tls_psk_callback_not_callable.phpt @@ -38,7 +38,7 @@ $clientCode = <<<'CODE' } CODE; -include __DIR__ . '/ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --EXPECTF-- diff --git a/ext/openssl/tests/tls_psk_callback_wrong_type.phpt b/ext/openssl/tests/tls_psk_callback_wrong_type.phpt index 78d950f19974..ac5b56f61306 100644 --- a/ext/openssl/tests/tls_psk_callback_wrong_type.phpt +++ b/ext/openssl/tests/tls_psk_callback_wrong_type.phpt @@ -41,7 +41,7 @@ $clientCode = <<<'CODE' } CODE; -include __DIR__ . '/ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --EXPECT-- diff --git a/ext/openssl/tests/tls_psk_client_callback_null.phpt b/ext/openssl/tests/tls_psk_client_callback_null.phpt index e7acdf77094b..7c61693be940 100644 --- a/ext/openssl/tests/tls_psk_client_callback_null.phpt +++ b/ext/openssl/tests/tls_psk_client_callback_null.phpt @@ -37,7 +37,7 @@ $clientCode = <<<'CODE' var_dump($client); CODE; -include __DIR__ . '/ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --EXPECT-- diff --git a/ext/openssl/tests/tls_psk_client_callback_throws.phpt b/ext/openssl/tests/tls_psk_client_callback_throws.phpt index 350756130b14..965cde55a9f0 100644 --- a/ext/openssl/tests/tls_psk_client_callback_throws.phpt +++ b/ext/openssl/tests/tls_psk_client_callback_throws.phpt @@ -40,7 +40,7 @@ $clientCode = <<<'CODE' } CODE; -include __DIR__ . '/ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --EXPECT-- diff --git a/ext/openssl/tests/tls_psk_client_no_identity.phpt b/ext/openssl/tests/tls_psk_client_no_identity.phpt index 8a84d822b4c1..d0942a6d2a87 100644 --- a/ext/openssl/tests/tls_psk_client_no_identity.phpt +++ b/ext/openssl/tests/tls_psk_client_no_identity.phpt @@ -41,7 +41,7 @@ $clientCode = <<<'CODE' } CODE; -include __DIR__ . '/ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --EXPECT-- diff --git a/ext/openssl/tests/tls_psk_mismatch.phpt b/ext/openssl/tests/tls_psk_mismatch.phpt index ada49402bbde..f37f125043e3 100644 --- a/ext/openssl/tests/tls_psk_mismatch.phpt +++ b/ext/openssl/tests/tls_psk_mismatch.phpt @@ -36,7 +36,7 @@ $clientCode = <<<'CODE' var_dump($client); CODE; -include __DIR__ . '/ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --EXPECT-- diff --git a/ext/openssl/tests/tls_psk_tls12_basic.phpt b/ext/openssl/tests/tls_psk_tls12_basic.phpt index 2f2a558c4b40..7417ffbc9c4b 100644 --- a/ext/openssl/tests/tls_psk_tls12_basic.phpt +++ b/ext/openssl/tests/tls_psk_tls12_basic.phpt @@ -53,7 +53,7 @@ $clientCode = <<<'CODE' fclose($client); CODE; -include __DIR__ . '/ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --EXPECT-- diff --git a/ext/openssl/tests/tls_psk_tls13_basic.phpt b/ext/openssl/tests/tls_psk_tls13_basic.phpt index a7642624252a..619d9b85d725 100644 --- a/ext/openssl/tests/tls_psk_tls13_basic.phpt +++ b/ext/openssl/tests/tls_psk_tls13_basic.phpt @@ -46,7 +46,7 @@ $clientCode = <<<'CODE' fclose($client); CODE; -include __DIR__ . '/ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --EXPECT-- diff --git a/ext/openssl/tests/tls_psk_tls13_unknown_identity.phpt b/ext/openssl/tests/tls_psk_tls13_unknown_identity.phpt index ddd05fd37ab4..65b263c09ad8 100644 --- a/ext/openssl/tests/tls_psk_tls13_unknown_identity.phpt +++ b/ext/openssl/tests/tls_psk_tls13_unknown_identity.phpt @@ -36,7 +36,7 @@ $clientCode = <<<'CODE' var_dump($client); CODE; -include __DIR__ . '/ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --EXPECT-- diff --git a/ext/openssl/tests/tls_wrapper.phpt b/ext/openssl/tests/tls_wrapper.phpt index 125fa558d97a..beb05b08723d 100644 --- a/ext/openssl/tests/tls_wrapper.phpt +++ b/ext/openssl/tests/tls_wrapper.phpt @@ -57,7 +57,7 @@ include 'CertificateGenerator.inc'; $certificateGenerator = new CertificateGenerator(); $certificateGenerator->saveNewCertAsFileWithKey('tls_wrapper', $certFile); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --CLEAN-- diff --git a/ext/openssl/tests/tls_wrapper_with_tls_v1.3.phpt b/ext/openssl/tests/tls_wrapper_with_tls_v1.3.phpt index 706641a8bfb6..6877b879ce6d 100644 --- a/ext/openssl/tests/tls_wrapper_with_tls_v1.3.phpt +++ b/ext/openssl/tests/tls_wrapper_with_tls_v1.3.phpt @@ -60,7 +60,7 @@ include 'CertificateGenerator.inc'; $certificateGenerator = new CertificateGenerator(); $certificateGenerator->saveNewCertAsFileWithKey('tls_wrapper_with_tls_v1.3', $certFile); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --CLEAN-- diff --git a/ext/openssl/tests/tlsv1.0_wrapper.phpt b/ext/openssl/tests/tlsv1.0_wrapper.phpt index 38d44847cdb5..41a722199713 100644 --- a/ext/openssl/tests/tlsv1.0_wrapper.phpt +++ b/ext/openssl/tests/tlsv1.0_wrapper.phpt @@ -48,7 +48,7 @@ include 'CertificateGenerator.inc'; $certificateGenerator = new CertificateGenerator(); $certificateGenerator->saveNewCertAsFileWithKey('tlsv1.0_wrapper', $certFile); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --CLEAN-- diff --git a/ext/openssl/tests/tlsv1.1_wrapper.phpt b/ext/openssl/tests/tlsv1.1_wrapper.phpt index 6cdcd52fe500..4bcf1f8e0a9a 100644 --- a/ext/openssl/tests/tlsv1.1_wrapper.phpt +++ b/ext/openssl/tests/tlsv1.1_wrapper.phpt @@ -48,7 +48,7 @@ include 'CertificateGenerator.inc'; $certificateGenerator = new CertificateGenerator(); $certificateGenerator->saveNewCertAsFileWithKey('tlsv1.1_wrapper', $certFile); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --CLEAN-- diff --git a/ext/openssl/tests/tlsv1.2_wrapper.phpt b/ext/openssl/tests/tlsv1.2_wrapper.phpt index e429687b52c4..604c224a9d38 100644 --- a/ext/openssl/tests/tlsv1.2_wrapper.phpt +++ b/ext/openssl/tests/tlsv1.2_wrapper.phpt @@ -46,7 +46,7 @@ include 'CertificateGenerator.inc'; $certificateGenerator = new CertificateGenerator(); $certificateGenerator->saveNewCertAsFileWithKey('tlsv1.2_wrapper', $certFile); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --CLEAN-- diff --git a/ext/openssl/tests/tlsv1.3_wrapper.phpt b/ext/openssl/tests/tlsv1.3_wrapper.phpt index baee3948bf5d..584afda06b34 100644 --- a/ext/openssl/tests/tlsv1.3_wrapper.phpt +++ b/ext/openssl/tests/tlsv1.3_wrapper.phpt @@ -46,7 +46,7 @@ include 'CertificateGenerator.inc'; $certificateGenerator = new CertificateGenerator(); $certificateGenerator->saveNewCertAsFileWithKey('tlsv1.3_wrapper', $certFile); -include 'ServerClientTestCase.inc'; +include dirname(__DIR__, 2) . "/standard/tests/ServerClientTestCase.inc"; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> --CLEAN--