Skip to content

Commit 9b1d2e9

Browse files
committed
Fix FPM tester default env vars change
This broke cloexec test
1 parent 11caf09 commit 9b1d2e9

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

sapi/fpm/tests/tester.inc

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -417,11 +417,12 @@ class Tester
417417
/**
418418
* Start PHP-FPM master process
419419
*
420-
* @param array $extraArgs Command extra arguments.
421-
* @param bool $forceStderr Whether to output to stderr so error log is used.
422-
* @param bool $daemonize Whether to start FPM daemonized
423-
* @param array $extensions List of extension to add if shared build used.
424-
* @param array $iniEntries List of ini entries to use.
420+
* @param array $extraArgs Command extra arguments.
421+
* @param bool $forceStderr Whether to output to stderr so error log is used.
422+
* @param bool $daemonize Whether to start FPM daemonized
423+
* @param array $extensions List of extension to add if shared build used.
424+
* @param array $iniEntries List of ini entries to use.
425+
* @param array|null $envVars List of env variable to execute FPM with or null to use the current ones.
425426
*
426427
* @return bool
427428
* @throws \Exception
@@ -432,7 +433,7 @@ class Tester
432433
bool $daemonize = false,
433434
array $extensions = [],
434435
array $iniEntries = [],
435-
array $envVars = [],
436+
?array $envVars = null,
436437
) {
437438
$configFile = $this->createConfig();
438439
$desc = $this->outDesc ? [] : [1 => array('pipe', 'w'), 2 => array('redirect', 1)];

0 commit comments

Comments
 (0)