IHF: Simplified.

Author: dmitry-ivanov

src/classes/Artisan/Command.php

@@ -9,12 +9,14 @@ class Command
     private $command;
     private $before;
     private $after;
+    private $phpBinary;
 
     public function __construct($command, $before = null, $after = null)
     {
         $this->command = $command;
         $this->before = $before;
         $this->after = $after;
+        $this->phpBinary = (new PhpExecutableFinder)->find();
     }
 
     public static function factory($command, $before = null, $after = null)
@@ -40,7 +42,7 @@ protected function composeForRun()
             $parts[] = (string) $this->before;
         }
 
-        $parts[] = "{$this->getPhpBinary()} {$this->getArtisan()} {$this->command}";
+        $parts[] = "{$this->phpBinary} {$this->getArtisan()} {$this->command}";
 
         if (!empty($this->after)) {
             $parts[] = (string) $this->after;
@@ -49,12 +51,6 @@ protected function composeForRun()
         return implode(' && ', $parts);
     }
 
-    protected function getPhpBinary()
-    {
-        $finder = new PhpExecutableFinder();
-        return $finder->find();
-    }
-
     protected function getArtisan()
     {
         return defined('ARTISAN_BINARY') ? ARTISAN_BINARY : 'artisan';

tests/classes/Artisan/CommandTest.php

@@ -15,7 +15,7 @@ protected function setUp()
         self::$functions = Mockery::mock();
 
         $phpBinaryMock = Mockery::mock('overload:Symfony\Component\Process\PhpExecutableFinder');
-        $phpBinaryMock->shouldReceive('find')->withNoArgs()->zeroOrMoreTimes()->andReturn('php');
+        $phpBinaryMock->shouldReceive('find')->withNoArgs()->once()->andReturn('php');
     }
 
     /** @test */