Merge pull request #1174 from veewee/windows-command-locator

Change command locator suffix order to avoid issues on Windows

Author: veewee

spec/Locator/ExternalCommandSpec.php

@@ -4,6 +4,7 @@
 
 use GrumPHP\Exception\RuntimeException;
 use GrumPHP\Locator\ExternalCommand;
+use GrumPHP\Util\Platform;
 use PhpSpec\ObjectBehavior;
 use Symfony\Component\Process\ExecutableFinder;
 
@@ -23,25 +24,35 @@ function it_throws_exception_when_external_command_is_not_found(ExecutableFinder
     {
         $executableFinder->find('test', null, ['bin'])->willReturn(false);
         $executableFinder->find('test.phar', null, ['bin'])->willReturn(false);
+        $executableFinder->find('test.bat', null, ['bin'])->willReturn(false);
         $this->shouldThrow(RuntimeException::class)->duringLocate('test');
     }
 
     function it_locates_external_commands(ExecutableFinder $executableFinder)
     {
+        $executableFinder->find('test.bat', null, ['bin'])->willReturn(false);
         $executableFinder->find('test', null, ['bin'])->willReturn('bin/test');
         $this->locate('test')->shouldEqual('bin/test');
     }
 
     function it_locates_external_commands_with_a_suffix(ExecutableFinder $executableFinder)
     {
+        $executableFinder->find('test.bat', null, ['bin'])->willReturn(false);
         $executableFinder->find('test', null, ['bin'])->willReturn(false);
         $executableFinder->find('test.phar', null, ['bin'])->willReturn('bin/test.phar');
         $this->locate('test')->shouldEqual('bin/test.phar');
     }
 
     function it_locates_external_commands_without_suffix_first(ExecutableFinder $executableFinder) {
+        $executableFinder->find('test.bat', null, ['bin'])->willReturn('bin/test.bat');
         $executableFinder->find('test', null, ['bin'])->willReturn('bin/test');
         $executableFinder->find('test.phar', null, ['bin'])->willReturn('bin/test.phar');
+
+        if (Platform::isWindows()) {
+            $this->locate('test')->shouldEqual('bin/test.bat');
+            return;
+        }
+
         $this->locate('test')->shouldEqual('bin/test');
     }
 }

src/Locator/ExternalCommand.php

@@ -6,15 +6,11 @@
 
 use GrumPHP\Exception\ExecutableNotFoundException;
 use GrumPHP\Util\Paths;
+use GrumPHP\Util\Platform;
 use Symfony\Component\Process\ExecutableFinder;
 
 class ExternalCommand
 {
-    /**
-     * @var list<string>
-     */
-    private $suffixes = ['', '.phar'];
-
     /**
      * @var string
      */
@@ -41,9 +37,9 @@ public static function loadWithPaths(Paths $paths, ExecutableFinder $executableF
 
     public function locate(string $command): string
     {
-        foreach ($this->suffixes as $suffix) {
+        $suffixes = Platform::isWindows() ? ['.bat', '', '.phar'] : ['', '.phar'];
+        foreach ($suffixes as $suffix) {
             $cmdName = $command . $suffix;
-            // Search executable:
             $executable = $this->executableFinder->find($cmdName, null, [$this->binDir]);
 
             if ($executable) {