Remove extra space from resulting command; Add omitErrors to build co…

…mmand unit test
omnilight · Mar 29, 2020 · bb19640 · bb19640
1 parent e97bac5
commit bb19640
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/src/Event.php b/src/Event.php
@@ -154,7 +154,7 @@ protected function runCommandInForeground(Application $app)
      */
     public function buildCommand()
     {
-        $command = $this->command . $this->_redirect . $this->_output . ' ' . (($this->_omitErrors) ? ' 2>&1 &' : '');
+        $command = $this->command . $this->_redirect . $this->_output . (($this->_omitErrors) ? ' 2>&1 &' : '');
         return $this->_user ? 'sudo -u ' . $this->_user . ' ' . $command : $command;
     }
 

diff --git a/tests/EventTest.php b/tests/EventTest.php
@@ -10,20 +10,24 @@ class EventTest extends \PHPUnit_Framework_TestCase
     public function buildCommandData()
     {
         return [
-            ['php -i', '/dev/null', "php -i > /dev/null &"],
-            ['php -i', '/my folder/foo.log', "php -i > /my folder/foo.log &"],
+            [false, 'php -i', '/dev/null', 'php -i > /dev/null'],
+            [false, 'php -i', '/my folder/foo.log', 'php -i > /my folder/foo.log'],
+            [true, 'php -i', '/dev/null', 'php -i > /dev/null 2>&1 &'],
+            [true, 'php -i', '/my folder/foo.log', 'php -i > /my folder/foo.log 2>&1 &'],
         ];
     }
 
     /**
      * @dataProvider buildCommandData
-     * @param $command
-     * @param $outputTo
-     * @param $result
+     * @param bool $omitErrors
+     * @param string $command
+     * @param string $outputTo
+     * @param string $result
      */
-    public function testBuildCommandSendOutputTo($command, $outputTo, $result)
+    public function testBuildCommandSendOutputTo($omitErrors, $command, $outputTo, $result)
     {
         $event = new Event($this->getMock(Mutex::className()), $command);
+        $event->omitErrors($omitErrors);
         $event->sendOutputTo($outputTo);
         $this->assertSame($result, $event->buildCommand());
     }