[Process] Do not throw LogicException in ProcessBuilder::getProcess i…

…f no arguments are set but a prefix is
symfony · Apr 23, 2013 · 1de29b9 · 1de29b9
1 parent 209799b
commit 1de29b9
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 1 deletion.
diff --git a/src/Symfony/Component/Process/ProcessBuilder.php b/src/Symfony/Component/Process/ProcessBuilder.php
@@ -154,7 +154,7 @@ public function setOption($name, $value)
 
     public function getProcess()
     {
-        if (!count($this->arguments)) {
+        if (!$this->prefix && !count($this->arguments)) {
             throw new LogicException('You must add() command arguments before calling getProcess().');
         }
 

diff --git a/src/Symfony/Component/Process/Tests/ProcessBuilderTest.php b/src/Symfony/Component/Process/Tests/ProcessBuilderTest.php
@@ -152,4 +152,29 @@ public function testShouldEscapeArgumentsAndPrefix()
             $this->assertSame("'%prefix%' 'arg'", $proc->getCommandLine());
         }
     }
+
+    /**
+     * @expectedException \Symfony\Component\Process\Exception\LogicException
+     */
+    public function testShouldThrowALogicExceptionIfNoPrefixAndNoArgument()
+    {
+        ProcessBuilder::create()->getProcess();
+    }
+
+    public function testShouldNotThrowALogicExceptionIfNoArgument()
+    {
+        $process = ProcessBuilder::create()
+            ->setPrefix('/usr/bin/php')
+            ->getProcess();
+
+        $this->assertEquals("'/usr/bin/php'", $process->getCommandLine());
+    }
+
+    public function testShouldNotThrowALogicExceptionIfNoPrefix()
+    {
+        $process = ProcessBuilder::create(array('/usr/bin/php'))
+            ->getProcess();
+
+        $this->assertEquals("'/usr/bin/php'", $process->getCommandLine());
+    }
 }