[Process] Use new ProcessUtils::escapeArgument to escape ProcessBuilder prefix

romainneutron · romainneutron · commit 209799b18eb4 · 2013-04-23T22:48:37.000+02:00
diff --git a/src/Symfony/Component/Process/ProcessBuilder.php b/src/Symfony/Component/Process/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/src/Symfony/Component/Process/Tests/ProcessBuilderTest.php b/src/Symfony/Component/Process/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());
+        }
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -139,4 +139,17 @@ public function testShouldEscapeArguments()`
`139`	`139`	`$this->assertSame("'%path%' 'foo \" bar'", $proc->getCommandLine());`
`140`	`140`	`}`
`141`	`141`	`}`
	`142`	`+`
	`143`	`+ public function testShouldEscapeArgumentsAndPrefix()`
	`144`	`+ {`
	`145`	`+ $pb = new ProcessBuilder(array('arg'));`
	`146`	`+ $pb->setPrefix('%prefix%');`
	`147`	`+ $proc = $pb->getProcess();`
	`148`	`+`
	`149`	`+ if (defined('PHP_WINDOWS_VERSION_BUILD')) {`
	`150`	`+ $this->assertSame('^%"prefix"^% "arg"', $proc->getCommandLine());`
	`151`	`+ } else {`
	`152`	`+ $this->assertSame("'%prefix%' 'arg'", $proc->getCommandLine());`
	`153`	`+ }`
	`154`	`+ }`
`142`	`155`	`}`