Skip to content

Commit 453a55e

Browse files
Merge branch '6.0' into 6.1
* 6.0: (22 commits) Add missing license header Add missing license header [Workflow] Catch error when trying to get an uninitialized marking Add missing license header Allow usage of Provider domains if possible Use reference date in reverse transform Fixes #40997 Fix env resolution in lock configuration Fix Symfony not working on SMB share #45990 [Messenger] DoctrineTransportFactory works with notify and decorated PostgreSQL driver [Cache] make LockRegistry use static properties instead of static variables fix: return-path has higher priority for envelope address than from address (fixes #41322) [HttpClient] Fix sending content-length when streaming the body [Console] Header with column max width is now well wrap with separator Fix use_cookies framework session configuration [FrameworkBundle] [Command] Fix `debug:router --no-interaction` error … [Intl] Update the ICU data to 71.1 - 5.4 [Intl] Update the ICU data to 71.1 - 4.4 Add tests to messenger connection get for OraclePlatform [RateLimiter] Adding default empty value [DependencyInjection] Add TaggedIteratorArgument unit tests ...
2 parents 10216a1 + d074154 commit 453a55e

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

Process.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ class Process implements \IteratorAggregate
5555
private $hasCallback = false;
5656
private $commandline;
5757
private $cwd;
58-
private $env;
58+
private $env = [];
5959
private $input;
6060
private $starttime;
6161
private $lastOutputTime;

Tests/ProcessTest.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1503,8 +1503,11 @@ public function testPreparedCommandWithNoValues()
15031503

15041504
public function testEnvArgument()
15051505
{
1506-
$env = ['FOO' => 'Foo', 'BAR' => 'Bar'];
15071506
$cmd = '\\' === \DIRECTORY_SEPARATOR ? 'echo !FOO! !BAR! !BAZ!' : 'echo $FOO $BAR $BAZ';
1507+
$p = Process::fromShellCommandline($cmd);
1508+
$this->assertSame([], $p->getEnv());
1509+
1510+
$env = ['FOO' => 'Foo', 'BAR' => 'Bar'];
15081511
$p = Process::fromShellCommandline($cmd, null, $env);
15091512
$p->run(null, ['BAR' => 'baR', 'BAZ' => 'baZ']);
15101513

0 commit comments

Comments
 (0)