Merge pull request #463 from veewee/fix-force-unix-hooks

Force git hooks to contain unix styled commands
phpro · Feb 23, 2018 · 70e9d25 · 70e9d25
2 parents a93b32c + 4bb61aa
commit 70e9d25
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 15 deletions.
diff --git a/spec/Process/ProcessBuilderSpec.php b/spec/Process/ProcessBuilderSpec.php
@@ -27,9 +27,19 @@ function it_is_initializable()
 
     function it_should_be_able_to_create_process_arguments_based_on_taskname(ExternalCommand $externalCommandLocator)
     {
-        $externalCommandLocator->locate('grumphp')->willReturn('/usr/bin/grumphp');
+        $externalCommandLocator->locate('grumphp', false)->willReturn('/usr/bin/grumphp');
 
-        $arguments = $this->createArgumentsForCommand('grumphp');
+        $arguments = $this->createArgumentsForCommand('grumphp', false);
+        $arguments->shouldHaveType(ProcessArgumentsCollection::class);
+        $arguments[0]->shouldBe('/usr/bin/grumphp');
+        $arguments->count()->shouldBe(1);
+    }
+
+    function it_should_be_able_to_create_process_arguments_based_on_taskname_and_force_unix_path(ExternalCommand $externalCommandLocator)
+    {
+        $externalCommandLocator->locate('grumphp', true)->willReturn('/usr/bin/grumphp');
+
+        $arguments = $this->createArgumentsForCommand('grumphp', true);
         $arguments->shouldHaveType(ProcessArgumentsCollection::class);
         $arguments[0]->shouldBe('/usr/bin/grumphp');
         $arguments->count()->shouldBe(1);

diff --git a/src/Console/Command/Git/InitCommand.php b/src/Console/Command/Git/InitCommand.php
@@ -141,7 +141,7 @@ protected function generateHookCommand($command)
     {
         $configFile = $this->useExoticConfigFile();
 
-        $arguments = $this->processBuilder->createArgumentsForCommand('grumphp');
+        $arguments = $this->processBuilder->createArgumentsForCommand('grumphp', true);
         $arguments->add($command);
         $arguments->addOptionalArgument('--config=%s', $configFile);
 

diff --git a/src/Process/ProcessBuilder.php b/src/Process/ProcessBuilder.php
@@ -42,12 +42,13 @@ public function __construct(GrumPHP $config, ExternalCommand $externalCommandLoc
 
     /**
      * @param string $command
+     * @param bool $forceUnix
      *
      * @return ProcessArgumentsCollection
      */
-    public function createArgumentsForCommand($command)
+    public function createArgumentsForCommand($command, $forceUnix = false)
     {
-        $executable = $this->getCommandLocation($command);
+        $executable = $this->externalCommandLocator->locate($command, $forceUnix);
 
         return ProcessArgumentsCollection::forExecutable($executable);
     }
@@ -87,16 +88,6 @@ private function guardWindowsCmdMaxInputStringLimitation(Process $process)
         throw PlatformException::commandLineStringLimit($process);
     }
 
-    /**
-     * @param string $command
-     *
-     * @return string
-     */
-    private function getCommandLocation($command)
-    {
-        return $this->externalCommandLocator->locate($command);
-    }
-
     /**
      * @param Process $process
      */