bug #39083 [Dotenv] Check if method inheritEnvironmentVariables exists (Chi-teck)

fabpot · fabpot · commit 3eec466502a5 · 2020-11-17T06:58:42.000+01:00
This PR was merged into the 4.4 branch. Discussion ---------- [Dotenv] Check if method inheritEnvironmentVariables exists | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #38201 | License | MIT | Doc PR | - Commits ------- bd72a56 Check if method inheritEnvironmentVariables exists
diff --git a/src/Symfony/Component/Dotenv/Dotenv.php b/src/Symfony/Component/Dotenv/Dotenv.php
@@ -401,7 +401,7 @@ private function resolveCommands(string $value, array $loadedVars): string
 
             $process = method_exists(Process::class, 'fromShellCommandline') ? Process::fromShellCommandline('echo '.$matches[0]) : new Process('echo '.$matches[0]);
 
-            if (!method_exists(Process::class, 'fromShellCommandline')) {
+            if (!method_exists(Process::class, 'fromShellCommandline') && method_exists(Process::class, 'inheritEnvironmentVariables')) {
                 // Symfony 3.4 does not inherit env vars by default:
                 $process->inheritEnvironmentVariables();
             }

Original file line number	Diff line number	Diff line change
`@@ -401,7 +401,7 @@ private function resolveCommands(string $value, array $loadedVars): string`
`401`	`401`
`402`	`402`	`$process = method_exists(Process::class, 'fromShellCommandline') ? Process::fromShellCommandline('echo '.$matches[0]) : new Process('echo '.$matches[0]);`
`403`	`403`
`404`		`- if (!method_exists(Process::class, 'fromShellCommandline')) {`
	`404`	`+ if (!method_exists(Process::class, 'fromShellCommandline') && method_exists(Process::class, 'inheritEnvironmentVariables')) {`
`405`	`405`	`// Symfony 3.4 does not inherit env vars by default:`
`406`	`406`	`$process->inheritEnvironmentVariables();`
`407`	`407`	`}`