Skip to content

Commit 7f99ec2

Browse files
committed
Merge branch '4.3' into 4.4
* 4.3: fixed CS fixed CS fixed CS Do not log or call the proxy function when the locale is the same Added missing required dependencies on psr/cache and psr/container in symfony/cache-contracts and symfony/service-contracts respectively. [HttpClient] fix closing debug stream prematurely [Mailer] made code more robust Restore compatibility with php 5.5 fixed sender/recipients in SMTP Envelope collect called listeners information only once [HttpKernel] Remove TestEventDispatcher.
2 parents 85bc441 + 57dc7d5 commit 7f99ec2

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
@@ -401,7 +401,7 @@ private function resolveCommands($value)
401401
throw new \LogicException('Resolving commands requires the Symfony Process component.');
402402
}
403403

404-
$process = \method_exists(Process::class, 'fromShellCommandline') ? Process::fromShellCommandline('echo '.$matches[0]) : new Process('echo '.$matches[0]);
404+
$process = method_exists(Process::class, 'fromShellCommandline') ? Process::fromShellCommandline('echo '.$matches[0]) : new Process('echo '.$matches[0]);
405405
$process->inheritEnvironmentVariables(true);
406406
$process->setEnv($this->values);
407407
try {

0 commit comments

Comments
 (0)