Skip to content

Commit 597f3ff

Browse files
committed
Merge branch '4.4' into 5.4
* 4.4: [FrameworkBundle] [Command] Fix `debug:router --no-interaction` error … [Intl] Update the ICU data to 71.1 - 4.4 Add tests to messenger connection get for OraclePlatform [Process] Fix Process::getEnv() when setEnv() hasn't been called before [ExpressionLanguage] Fix matching null against a regular expression
2 parents 38a44b2 + 9eedd60 commit 597f3ff

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
@@ -1505,8 +1505,11 @@ public function testPreparedCommandWithNoValues()
15051505

15061506
public function testEnvArgument()
15071507
{
1508-
$env = ['FOO' => 'Foo', 'BAR' => 'Bar'];
15091508
$cmd = '\\' === \DIRECTORY_SEPARATOR ? 'echo !FOO! !BAR! !BAZ!' : 'echo $FOO $BAR $BAZ';
1509+
$p = Process::fromShellCommandline($cmd);
1510+
$this->assertSame([], $p->getEnv());
1511+
1512+
$env = ['FOO' => 'Foo', 'BAR' => 'Bar'];
15101513
$p = Process::fromShellCommandline($cmd, null, $env);
15111514
$p->run(null, ['BAR' => 'baR', 'BAZ' => 'baZ']);
15121515

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy