bug #45931 [Process] Fix Process::getEnv() when setEnv() hasn't been called before (asika32764)

nicolas-grekas · nicolas-grekas · commit 81c9e39686ad · 2022-04-04T12:19:45.000+02:00
This PR was merged into the 4.4 branch. Discussion ---------- [Process] Fix Process::getEnv() when setEnv() hasn't been called before | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | - | License | MIT ----- AS `getEnv()` return type is array, if a `Process` object has no default env and is NULL value, calling `getEnv()` will get error. ``` php $process = $someObject->createProcess(); // Get process from some object, but we don't know the environment // We want to check the env $env = $process->getEnv(); // Error: return type must be array, NULL given. ``` Commits ------- a5bf740 [Process] Fix Process::getEnv() when setEnv() hasn't been called before
diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php
@@ -53,7 +53,7 @@ class Process implements \IteratorAggregate
     private $hasCallback = false;
     private $commandline;
     private $cwd;
-    private $env;
+    private $env = [];
     private $input;
     private $starttime;
     private $lastOutputTime;
diff --git a/src/Symfony/Component/Process/Tests/ProcessTest.php b/src/Symfony/Component/Process/Tests/ProcessTest.php
@@ -1505,8 +1505,11 @@ public function testPreparedCommandWithNoValues()
 
     public function testEnvArgument()
     {
-        $env = ['FOO' => 'Foo', 'BAR' => 'Bar'];
         $cmd = '\\' === \DIRECTORY_SEPARATOR ? 'echo !FOO! !BAR! !BAZ!' : 'echo $FOO $BAR $BAZ';
+        $p = Process::fromShellCommandline($cmd);
+        $this->assertSame([], $p->getEnv());
+
+        $env = ['FOO' => 'Foo', 'BAR' => 'Bar'];
         $p = Process::fromShellCommandline($cmd, null, $env);
         $p->run(null, ['BAR' => 'baR', 'BAZ' => 'baZ']);
 
