IHF: Simplified.

Author: dmitry-ivanov

src/classes/Artisan/Command.php

@@ -3,7 +3,6 @@
 namespace Illuminated\Helpers\Artisan;
 
 use Symfony\Component\Process\PhpExecutableFinder;
-use Symfony\Component\Process\ProcessUtils;
 
 class Command
 {
@@ -53,23 +52,11 @@ protected function composeForRun()
     protected function getPhpBinary()
     {
         $finder = new PhpExecutableFinder();
-        $phpBinary = $finder->find(false);
-
-        $phpBinary = ProcessUtils::escapeArgument($phpBinary);
-        if (defined('HHVM_VERSION')) {
-            $phpBinary .= ' --php';
-        }
-
-        return $phpBinary;
+        return $finder->find();
     }
 
     protected function getArtisan()
     {
-        $artisan = 'artisan';
-        if (defined('ARTISAN_BINARY')) {
-            $artisan = ProcessUtils::escapeArgument(ARTISAN_BINARY);
-        }
-
-        return $artisan;
+        return defined('ARTISAN_BINARY') ? ARTISAN_BINARY : 'artisan';
     }
 }

tests/classes/Artisan/CommandTest.php

@@ -15,12 +15,7 @@ protected function setUp()
         self::$functions = Mockery::mock();
 
         $phpBinaryMock = Mockery::mock('overload:Symfony\Component\Process\PhpExecutableFinder');
-        $phpBinaryMock->shouldReceive('find')->with(false)->zeroOrMoreTimes()->andReturn('php');
-
-        $utilsMock = Mockery::mock('alias:Symfony\Component\Process\ProcessUtils');
-        $utilsMock->shouldReceive('escapeArgument')->withAnyArgs()->zeroOrMoreTimes()->andReturnUsing(function ($value) {
-            return $value;
-        });
+        $phpBinaryMock->shouldReceive('find')->withNoArgs()->zeroOrMoreTimes()->andReturn('php');
     }
 
     /** @test */
@@ -80,20 +75,6 @@ public function run_in_background_supports_before_and_after_subcommands_together
         $command->runInBackground();
     }
 
-    /**
-     * @test
-     * @runInSeparateProcess
-     * @preserveGlobalState disabled
-     */
-    public function it_adds_php_option_for_hhvm()
-    {
-        $this->shouldReceiveExecCallOnceWith('(before && php --php artisan test:command && after) > /dev/null 2>&1 &');
-
-        define('HHVM_VERSION', true);
-        $command = Command::factory('test:command', 'before', 'after');
-        $command->runInBackground();
-    }
-
     /**
      * @test
      * @runInSeparateProcess