merged branch oodle/ticket_7196 (PR symfony#8227)

fabpot · fabpot · commit 6089f32d6118 · 2013-06-13T08:44:22.000+02:00
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes symfony#8227). Discussion ---------- [Process] fix issue where $_ENV contains array vals There are cases where $env or $_ENV can contain a value that is an array This will cause Process to throw an Array to String conversion exception Initially I submitted a patch of Process.php, however Fabien indicated that it shouldn't be fixed there (see below pull request). Before recently, a simple work around would be in php.ini to set: register_argc_argv = On However with recent changes, this seems to no longer work. Original pull request: symfony#7354 See ticket symfony#7196 ``` | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | 7196 | License | MIT | Doc PR | none ``` Commits ------- 2c6af95 [Process] fix issue where $_ENV contains array vals
diff --git a/src/Symfony/Component/Process/ProcessBuilder.php b/src/Symfony/Component/Process/ProcessBuilder.php
@@ -151,6 +151,9 @@ public function getProcess()
             $env = $this->env;
         }
 
+        // Process can not handle env values that are arrays
+        $env = $env ? array_filter($env, function ($value) { if (!is_array($value)) { return true; } }) : $env;
+
         return new Process($script, $this->cwd, $env, $this->stdin, $this->timeout, $options);
     }
 }
diff --git a/src/Symfony/Component/Process/Tests/ProcessBuilderTest.php b/src/Symfony/Component/Process/Tests/ProcessBuilderTest.php
@@ -45,6 +45,22 @@ public function testProcessShouldInheritAndOverrideEnvironmentVars()
         $_ENV = $snapshot;
     }
 
+    public function testProcessBuilderShouldNotPassEnvArrays()
+    {
+        $snapshot = $_ENV;
+        $_ENV = array('a' => array('b', 'c'), 'd' => 'e', 'f' => 'g');
+        $expected = array('d' => 'e', 'f' => 'g');
+
+        $pb = new ProcessBuilder();
+        $pb->add('a')->inheritEnvironmentVariables()
+            ->setEnv('d', 'e');
+        $proc = $pb->getProcess();
+
+        $this->assertEquals($expected, $proc->getEnv(), '->inheritEnvironmentVariables() removes array values from $_ENV');
+
+        $_ENV = $snapshot;
+    }
+
     public function testInheritEnvironmentVarsByDefault()
     {
         $pb = new ProcessBuilder();

Original file line number	Diff line number	Diff line change
`@@ -151,6 +151,9 @@ public function getProcess()`
`151`	`151`	`$env = $this->env;`
`152`	`152`	`}`
`153`	`153`
	`154`	`+ // Process can not handle env values that are arrays`
	`155`	`+ $env = $env ? array_filter($env, function ($value) { if (!is_array($value)) { return true; } }) : $env;`
	`156`	`+`
`154`	`157`	`return new Process($script, $this->cwd, $env, $this->stdin, $this->timeout, $options);`
`155`	`158`	`}`
`156`	`159`	`}`