Revert "Merge pull request #106 from ggcasuso/feature/execute-hooks-only-if-previous-was-successful"

This reverts commit 676162c, reversing
changes made to 97888dd.

Author: BrainMaestro

src/Commands/AddCommand.php

@@ -82,7 +82,7 @@ private function addHook($hook, $contents)
         // On windows, the shebang needs to point to bash
         // See: https://github.com/BrainMaestro/composer-git-hooks/issues/7
         $shebang = ($this->windows ? '#!/bin/bash' : '#!/bin/sh') . PHP_EOL . PHP_EOL;
-        $contents = get_hook_contents($contents);
+        $contents = is_array($contents) ? implode(PHP_EOL, $contents) : $contents;
         $hookContents = $shebang . $contents . PHP_EOL;
 
         if (! $this->force && $exists) {

src/Commands/HookCommand.php

@@ -29,7 +29,7 @@ protected function configure()
 
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $contents = get_hook_contents($this->contents);
+        $contents = is_array($this->contents) ? implode(PHP_EOL, $this->contents) : $this->contents;
 
         $outputMessage = [];
         $returnCode    = 0;

src/helpers.php

@@ -57,17 +57,3 @@ function git_dir()
         return realpath($gitDir);
     }
 }
-
-if (! function_exists('get_hook_contents')) {
-    /**
-     * Return hook contents
-     *
-     * @param array|string $contents
-     *
-     * @return string
-     */
-    function get_hook_contents($contents)
-    {
-        return is_array($contents) ? implode(" && \\" . PHP_EOL, $contents) : $contents;
-    }
-}

tests/AddCommandTest.php

@@ -260,7 +260,7 @@ public function it_handles_commands_defined_in_an_array()
             $this->assertContains("Added {$hook} hook", $this->commandTester->getDisplay());
 
             $content = file_get_contents(".git/hooks/" . $hook);
-            $this->assertContains(implode(" && \\" . PHP_EOL, $scripts), $content);
+            $this->assertContains(implode(PHP_EOL, $scripts), $content);
         }
     }
 

tests/HookCommandTest.php

@@ -20,24 +20,4 @@ public function it_tests_hooks_that_exist()
             $this->assertContains(str_replace('echo ', '', $script), $commandTester->getDisplay());
         }
     }
-
-    /**
-     * @test
-     */
-    public function it_terminates_if_previous_hook_fails()
-    {
-        $hook = [
-            'pre-commit' => [
-                'echo execution-error;exit 1',
-                'echo before-commit'
-            ],
-        ];
-
-        $command = new HookCommand('pre-commit', $hook['pre-commit']);
-        $commandTester = new CommandTester($command);
-
-        $commandTester->execute([]);
-        $this->assertContains('execution-error', $commandTester->getDisplay());
-        $this->assertNotContains('before-commit', $commandTester->getDisplay());
-    }
 }

tests/UpdateCommandTest.php

@@ -138,7 +138,7 @@ public function it_handles_commands_defined_in_an_array()
             $this->assertContains("Updated {$hook} hook", $this->commandTester->getDisplay());
 
             $content = file_get_contents(".git/hooks/" . $hook);
-            $this->assertContains(implode(" && \\" . PHP_EOL, $scripts), $content);
+            $this->assertContains(implode(PHP_EOL, $scripts), $content);
         }
     }