- Refactored the code to use a new trait WithCommitLog

- Added exception callback in makePipeline method
- Changed return type of RegisterHooks::handle() and PrePush::handle() methods to void, because they don't have any returns anymore

Author: igorsgm

src/Console/Commands/PostCommit.php

@@ -3,15 +3,12 @@
 namespace Igorsgm\GitHooks\Console\Commands;
 
 use Igorsgm\GitHooks\Contracts\HookCommand;
-use Igorsgm\GitHooks\Exceptions\HookFailException;
-use Igorsgm\GitHooks\Git\GitHelper;
-use Igorsgm\GitHooks\Git\Log;
-use Igorsgm\GitHooks\Traits\WithPipeline;
+use Igorsgm\GitHooks\Traits\WithCommitLog;
 use Illuminate\Console\Command;
 
 class PostCommit extends Command implements HookCommand
 {
-    use WithPipeline;
+    use WithCommitLog;
 
     /**
      * The name and signature of the console command.
@@ -34,34 +31,4 @@ public function getHook(): string
     {
         return 'post-commit';
     }
-
-    /**
-     * Execute the console command.
-     *
-     * @return mixed
-     */
-    public function handle()
-    {
-        try {
-            $this->sendLogCommitThroughHooks(
-                new Log(
-                    GitHelper::getLastCommitFromLog()
-                )
-            );
-        } catch (HookFailException $e) {
-            return 1;
-        }
-    }
-
-    /**
-     * Send the log commit through the pipes
-     *
-     * @param  Log  $log
-     */
-    protected function sendLogCommitThroughHooks(Log $log): void
-    {
-        $this->makePipeline()
-            ->send($log)
-            ->thenReturn();
-    }
 }

src/Console/Commands/PreCommit.php

@@ -38,7 +38,7 @@ public function getHook(): string
     /**
      * Execute the console command.
      *
-     * @return mixed
+     * @return int|void
      */
     public function handle()
     {

src/Console/Commands/PrePush.php

@@ -3,15 +3,12 @@
 namespace Igorsgm\GitHooks\Console\Commands;
 
 use Igorsgm\GitHooks\Contracts\HookCommand;
-use Igorsgm\GitHooks\Exceptions\HookFailException;
-use Igorsgm\GitHooks\Git\GitHelper;
-use Igorsgm\GitHooks\Git\Log;
-use Igorsgm\GitHooks\Traits\WithPipeline;
+use Igorsgm\GitHooks\Traits\WithCommitLog;
 use Illuminate\Console\Command;
 
 class PrePush extends Command implements HookCommand
 {
-    use WithPipeline;
+    use WithCommitLog;
 
     /**
      * The name and signature of the console command.
@@ -34,34 +31,4 @@ public function getHook(): string
     {
         return 'pre-push';
     }
-
-    /**
-     * Execute the console command.
-     *
-     * @return mixed
-     */
-    public function handle()
-    {
-        try {
-            $this->sendLogCommitThroughHooks(
-                new Log(
-                    GitHelper::getLastCommitFromLog()
-                )
-            );
-        } catch (HookFailException $e) {
-            return 1;
-        }
-    }
-
-    /**
-     * Send the log commit through the pipes
-     *
-     * @param  Log  $log
-     */
-    protected function sendLogCommitThroughHooks(Log $log): void
-    {
-        $this->makePipeline()
-            ->send($log)
-            ->thenReturn();
-    }
 }

src/Console/Commands/RegisterHooks.php

@@ -25,6 +25,8 @@ class RegisterHooks extends Command
      * Execute the console command.
      *
      * @param  GitHooks  $gitHooks
+     * @return void
+     * @throws \Exception
      */
     public function handle(GitHooks $gitHooks)
     {

src/Git/Log.php

@@ -56,7 +56,7 @@ public function __construct(string $log)
      */
     private function parse(array $lines): void
     {
-        foreach ($lines as $key => $line) {
+        foreach ($lines as $line) {
             if (strpos($line, 'commit') === 0) {
                 preg_match('/(?<hash>[a-z0-9]{40})/', $line, $matches);
                 $this->hash = $matches['hash'] ?? null;

src/GitHooks.php

@@ -2,6 +2,8 @@
 
 namespace Igorsgm\GitHooks;
 
+use Exception;
+
 class GitHooks
 {
     /**
@@ -37,12 +39,14 @@ public function getAvailableHooks()
     /**
      * Install git hook
      *
-     * @param  string  $hook
+     * @param  string  $hookName
+     * @return void
+     * @throws Exception
      */
     public function install($hookName)
     {
         if (! is_dir($this->getGitHooksDir())) {
-            throw new \Exception('Git not initialized in this project.');
+            throw new Exception('Git not initialized in this project.');
         }
 
         $command = 'git-hooks:'.$hookName;

src/HooksPipeline.php

@@ -3,7 +3,6 @@
 namespace Igorsgm\GitHooks;
 
 use Closure;
-use Exception;
 use Illuminate\Contracts\Container\Container;
 use Illuminate\Pipeline\Pipeline;
 use Throwable;
@@ -97,10 +96,8 @@ protected function carry()
                                     : $pipe(...$parameters);
 
                     return $this->handleCarry($carry);
-                } catch (Exception $e) {
-                    $this->handleException($passable, $e);
                 } catch (Throwable $e) {
-                    $this->handleException($passable, $e);
+                    return $this->handleException($passable, $e);
                 }
             };
         };

src/Traits/WithCommitLog.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace Igorsgm\GitHooks\Traits;
+
+use Igorsgm\GitHooks\Exceptions\HookFailException;
+use Igorsgm\GitHooks\Git\GitHelper;
+use Igorsgm\GitHooks\Git\Log;
+
+trait WithCommitLog
+{
+    use WithPipeline;
+
+    /**
+     * Execute the console command.
+     *
+     * @return int|void
+     */
+    public function handle()
+    {
+        try {
+            $this->sendLogCommitThroughHooks(
+                new Log(
+                    GitHelper::getLastCommitFromLog()
+                )
+            );
+        } catch (HookFailException $e) {
+            return 1;
+        }
+    }
+
+    /**
+     * Send the log commit through the pipes
+     *
+     * @param  Log  $log
+     */
+    protected function sendLogCommitThroughHooks(Log $log): void
+    {
+        $this->makePipeline()
+            ->send($log)
+            ->thenReturn();
+    }
+}

src/Traits/WithPipeline.php

@@ -21,8 +21,8 @@ protected function makePipeline(): Pipeline
 
         return $pipeline
             ->through($this->getRegisteredHooks())
-            ->withCallback($this->showInfoAboutHook());
-//            ->withExceptionCallback($this->showHookErrorAndExit());
+            ->withCallback($this->showInfoAboutHook())
+            ->withExceptionCallback($this->showHookErrorAndExit());
     }
 
     /**
@@ -61,11 +61,7 @@ public function getRegisteredHooks(): array
         $hooks = collect((array) config('git-hooks.'.$this->getHook()));
 
         return $hooks->map(function ($hook, $i) {
-            if (is_int($i)) {
-                return $hook;
-            }
-
-            return $i;
+            return is_int($i) ? $hook : $i;
         })->all();
     }
 }