Skip to content

Commit 264ca18

Browse files
committed
Merge branch '4.4' into 5.1
* 4.4: do not depend on the actual time to fix a transient test Run Redis Sentinel tests in GithubAction Minor : Removed typo (extra "the" term) Check if method inheritEnvironmentVariables exists [PhpUnitBridge] Fix test fixture file name
2 parents 29ac2a3 + 6dd958a commit 264ca18

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Dotenv.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ private function resolveCommands(string $value, array $loadedVars): string
456456

457457
$process = method_exists(Process::class, 'fromShellCommandline') ? Process::fromShellCommandline('echo '.$matches[0]) : new Process('echo '.$matches[0]);
458458

459-
if (!method_exists(Process::class, 'fromShellCommandline')) {
459+
if (!method_exists(Process::class, 'fromShellCommandline') && method_exists(Process::class, 'inheritEnvironmentVariables')) {
460460
// Symfony 3.4 does not inherit env vars by default:
461461
$process->inheritEnvironmentVariables();
462462
}

0 commit comments

Comments
 (0)