1
0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00

Merge branch 'PHP-8.3' into PHP-8.4

This commit is contained in:
Jakub Zelenka
2024-12-22 14:58:08 +01:00

View File

@@ -389,11 +389,15 @@ class Tester
?bool $debug = null,
string $clientTransport = 'stream'
) {
$this->configTemplate = $configTemplate;
$this->code = $code;
$this->options = $options;
$this->fileName = $fileName ?: self::getCallerFileName();
$this->debug = $debug !== null ? $debug : (bool)getenv('TEST_FPM_DEBUG');
$this->configTemplate = $configTemplate;
$this->code = $code;
$this->options = $options;
$this->fileName = $fileName ?: self::getCallerFileName();
if (($debugFilter = getenv('TEST_FPM_DEBUG_FILTER')) !== false) {
$this->debug = str_contains(basename($this->fileName), $debugFilter);
} else {
$this->debug = $debug !== null ? $debug : (bool)getenv('TEST_FPM_DEBUG');
}
$this->logReader = new LogReader($this->debug);
$this->logTool = new LogTool($this->logReader, $this->debug);
$this->clientTransport = $clientTransport;
@@ -920,6 +924,7 @@ class Tester
$requestData['headers'] ?? [],
$requestData['uri'] ?? null
);
$this->trace('Request params', $params);
if (isset($requestData['delay'])) {
usleep($requestData['delay']);