[Process] Use new ProcessUtils::escapeArgument to escape ProcessBuild…

…er prefix
symfony · Apr 23, 2013 · 6e1fe78 · 6e1fe78
1 parent 04b4f33
commit 6e1fe78
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/ProcessBuilder.php b/ProcessBuilder.php
@@ -160,8 +160,8 @@ public function getProcess()
 
         $options = $this->options;
 
-        $script = ($this->prefix ? escapeshellarg($this->prefix) . ' ' : '')
-            .implode(' ', array_map(array(__NAMESPACE__.'\\ProcessUtils', 'escapeArgument'), $this->arguments));
+        $arguments = $this->prefix ? array_merge(array($this->prefix), $this->arguments) : $this->arguments;
+        $script = implode(' ', array_map(array(__NAMESPACE__.'\\ProcessUtils', 'escapeArgument'), $arguments));
 
         if ($this->inheritEnv) {
             $env = $this->env ? $this->env + $_ENV : null;

diff --git a/Tests/ProcessBuilderTest.php b/Tests/ProcessBuilderTest.php
@@ -139,4 +139,17 @@ public function testShouldEscapeArguments()
             $this->assertSame("'%path%' 'foo \" bar'", $proc->getCommandLine());
         }
     }
+
+    public function testShouldEscapeArgumentsAndPrefix()
+    {
+        $pb = new ProcessBuilder(array('arg'));
+        $pb->setPrefix('%prefix%');
+        $proc = $pb->getProcess();
+
+        if (defined('PHP_WINDOWS_VERSION_BUILD')) {
+            $this->assertSame('^%"prefix"^% "arg"', $proc->getCommandLine());
+        } else {
+            $this->assertSame("'%prefix%' 'arg'", $proc->getCommandLine());
+        }
+    }
 }