Revert "Pest Tests and Improvements"

Author: igorsgm

composer.json

@@ -22,20 +22,18 @@
     ],
     "require": {
         "php": "^7.2|^8.0",
-        "illuminate/config": "^6.0|^7.0|^8.0|^9.0",
-        "illuminate/console": "^6.0|^7.0|^8.0|^9.0",
-        "illuminate/container": "^6.0|^7.0|^8.0|^9.0",
-        "illuminate/contracts": "^6.0|^7.0|^8.0|^9.0",
-        "illuminate/pipeline": "^6.0|^7.0|^8.0|^9.0",
-        "illuminate/support": "^6.0|^7.0|^8.0|^9.0"
+        "illuminate/container": "^5.6|^6.0|^7.0|^8.0|^9.0",
+        "illuminate/config": "^5.6|^6.0|^7.0|^8.0|^9.0",
+        "illuminate/support": "^5.6|^6.0|^7.0|^8.0|^9.0",
+        "illuminate/contracts": "^5.6|^6.0|^7.0|^8.0|^9.0",
+        "illuminate/console": "^5.6|^6.0|^7.0|^8.0|^9.0",
+        "illuminate/pipeline": "^5.6|^6.0|^7.0|^8.0|^9.0"
     },
     "require-dev": {
-        "laravel/pint": "^1.2",
-        "mockery/mockery": "^1.5.1",
-        "orchestra/testbench": "^7.0",
-        "pestphp/pest": "^1.22",
-        "pestphp/pest-plugin-mock": "^1.0",
-        "phpunit/phpunit": "^9.0"
+        "orchestra/testbench": "^6.0",
+        "phpunit/phpunit": "^9.0",
+        "mockery/mockery": "^1.4.4",
+        "laravel/pint": "^1.2"
     },
     "autoload": {
         "psr-4": {
@@ -52,18 +50,15 @@
         "test-coverage": "vendor/bin/phpunit --coverage-html coverage"
     },
     "config": {
-        "sort-packages": true,
-        "allow-plugins": {
-            "pestphp/pest-plugin": true
-        }
+        "sort-packages": true
     },
     "extra": {
         "laravel": {
             "providers": [
                 "Igorsgm\\GitHooks\\GitHooksServiceProvider"
             ],
             "aliases": {
-                "GitHooks": "Igorsgm\\GitHooks\\Facades\\GitHooks"
+                "GitHooks": "Igorsgm\\GitHooks\\GitHooksFacade"
             }
         }
     },

config/git-hooks.php

@@ -78,8 +78,6 @@
     | Pre-Rebase Hooks
     |-----------------------------------------------------------------
     |
-    | @TODO Implement support to pre-rebase hooks
-    |
     | The pre-rebase hook runs before you rebase anything and can halt the process by exiting non-zero.
     | You can use this hook to disallow rebasing any commits that have already been pushed.
     | The example pre-rebase hook that Git installs does this, although it makes some assumptions that may not
@@ -95,8 +93,6 @@
     | Post-Rewrite Hooks
     |-----------------------------------------------------------------
     |
-    | @TODO Implement support to post-rewrite hook
-    |
     | The post-rewrite hook is run by commands that replace commits, such as git commit --amend and git rebase
     | (though not by git filter-branch). Its single argument is which command triggered the rewrite, and it receives
     | a list of rewrites on stdin. This hook has many of the same uses as the post-checkout and post-merge hooks.
@@ -111,8 +107,6 @@
     | Post-Checkout Hooks
     |-----------------------------------------------------------------
     |
-    | @TODO Implement support to post-checkout hook
-    |
     | After you run a successful git checkout, the post-checkout hook runs; you can use it to set up your working
     | directory properly for your project environment. This may mean moving in large binary files that you don't want
     | source controlled, auto-generating documentation, or something along those lines.
@@ -127,13 +121,10 @@
     | Post-Merge Hooks
     |-----------------------------------------------------------------
     |
-    | @TODO Implement support to post-merge hook
-    |
     | The post-merge hook runs after a successful merge command. You can use it to restore data in the working tree
     | that Git can't track, such as permissions data. This hook can likewise validate the presence of files external
     | to Git control that you may want copied in when the working tree changes.
     |
-    |
     */
     'post-merge' => [
 

phpunit.xml

@@ -1,18 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
+         backupGlobals="false"
+         backupStaticAttributes="false"
          bootstrap="vendor/autoload.php"
          colors="true"
->
-    <testsuites>
-        <testsuite name="Test Suite">
-            <directory suffix="Test.php">./tests</directory>
-        </testsuite>
-    </testsuites>
-    <coverage processUncoveredFiles="true">
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+    <coverage>
         <include>
-            <directory suffix=".php">./app</directory>
             <directory suffix=".php">./src</directory>
         </include>
     </coverage>
+    <testsuites>
+        <testsuite name="Unit">
+            <directory suffix="Test.php">./tests</directory>
+        </testsuite>
+    </testsuites>
 </phpunit>

src/Console/Commands/PreCommit.php

@@ -4,8 +4,8 @@
 
 use Igorsgm\GitHooks\Contracts\HookCommand;
 use Igorsgm\GitHooks\Exceptions\HookFailException;
-use Igorsgm\GitHooks\Facades\GitHooks;
 use Igorsgm\GitHooks\Git\ChangedFiles;
+use Igorsgm\GitHooks\Git\GitHelper;
 use Igorsgm\GitHooks\Traits\WithPipeline;
 use Illuminate\Console\Command;
 
@@ -45,7 +45,7 @@ public function handle()
         try {
             $this->sendChangedFilesThroughHooks(
                 new ChangedFiles(
-                    GitHooks::getListOfChangedFiles()
+                    GitHelper::getListOfChangedFiles()
                 )
             );
         } catch (HookFailException $e) {

src/Console/Commands/RegisterHooks.php

@@ -12,14 +12,14 @@ class RegisterHooks extends Command
      *
      * @var string
      */
-    protected $signature = 'git-hooks:register';
+    protected $signature = 'git-hooks:register-hooks';
 
     /**
      * The console command description.
      *
      * @var string
      */
-    protected $description = 'Register or re-register git hooks for application';
+    protected $description = 'Register git hooks for application';
 
     /**
      * Execute the console command.
@@ -37,6 +37,6 @@ public function handle(GitHooks $gitHooks)
             $gitHooks->install($hook);
         }
 
-        $this->info('Git hooks have been successfully installed.');
+        $this->info('Git hooks have been successfully created');
     }
 }

src/Traits/GitHelper.php renamed to src/Git/GitHelper.php

@@ -1,36 +1,37 @@
 <?php
 
-namespace Igorsgm\GitHooks\Traits;
+namespace Igorsgm\GitHooks\Git;
 
+use Igorsgm\GitHooks\Traits\ProcessHelper;
 use Symfony\Component\Process\Exception\ProcessFailedException;
 
-trait GitHelper
+class GitHelper
 {
     use ProcessHelper;
 
     /**
      * @return string
      */
-    public function getListOfChangedFiles()
+    public static function getListOfChangedFiles()
     {
-        return $this->runCommandAndGetOutput('git status --short');
+        return self::execAndGetCommandOutput('git status --short');
     }
 
     /**
      * @return string
      */
-    public function getLastCommitFromLog()
+    public static function getLastCommitFromLog()
     {
-        return $this->runCommandAndGetOutput('git log -1 HEAD');
+        return self::execAndGetCommandOutput('git log -1 HEAD');
     }
 
     /**
      * @param  string|array  $commands
      * @return string
      */
-    private function runCommandAndGetOutput($commands)
+    private static function execAndGetCommandOutput($commands)
     {
-        $process = $this->runCommands($commands);
+        $process = self::execCommands($commands);
 
         if (! $process->isSuccessful()) {
             throw new ProcessFailedException($process);
@@ -45,7 +46,7 @@ private function runCommandAndGetOutput($commands)
      * @param  string  $filePath
      * @return string
      */
-    public function getCommitMessageContentFromFile(string $filePath): string
+    public static function getCommitMessageContentFromFile(string $filePath): string
     {
         return file_get_contents($filePath);
     }
@@ -56,7 +57,7 @@ public function getCommitMessageContentFromFile(string $filePath): string
      * @param  string  $path
      * @param  string  $message
      */
-    public function updateCommitMessageContentInFile(string $path, string $message): void
+    public static function updateCommitMessageContentInFile(string $path, string $message): void
     {
         file_put_contents($path, $message);
     }

src/GitHooks.php

@@ -3,12 +3,9 @@
 namespace Igorsgm\GitHooks;
 
 use Exception;
-use Igorsgm\GitHooks\Traits\GitHelper;
 
 class GitHooks
 {
-    use GitHelper;
-
     /**
      * Get all supported git hooks
      */

src/Facades/GitHooks.php renamed to src/GitHooksFacade.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace Igorsgm\GitHooks\Facades;
+namespace Igorsgm\GitHooks;
 
 use Illuminate\Support\Facades\Facade;
 
 /**
  * @see \Igorsgm\GitHooks\GitHooks
  */
-class GitHooks extends Facade
+class GitHooksFacade extends Facade
 {
     /**
      * Get the registered name of the component.

src/HooksPipeline.php

@@ -12,12 +12,12 @@ class HooksPipeline extends Pipeline
     /**
      * @var Closure
      */
-    protected $pipeStartCallback;
+    protected $callback;
 
     /**
      * @var Closure
      */
-    protected $pipeEndCallback;
+    protected $exceptionCallback;
 
     /**
      * @var string
@@ -38,9 +38,9 @@ public function __construct(Container $container, string $hook)
      * @param  Closure  $callback
      * @return $this
      */
-    public function withPipeStartCallback(Closure $callback)
+    public function withCallback(Closure $callback)
     {
-        $this->pipeStartCallback = $callback;
+        $this->callback = $callback;
 
         return $this;
     }
@@ -49,9 +49,9 @@ public function withPipeStartCallback(Closure $callback)
      * @param  Closure  $callback
      * @return $this
      */
-    public function withPipeEndCallback(Closure $callback)
+    public function withExceptionCallback(Closure $callback)
     {
-        $this->pipeEndCallback = $callback;
+        $this->exceptionCallback = $callback;
 
         return $this;
     }
@@ -79,10 +79,8 @@ protected function carry()
                         // execute the pipe function giving in the parameters that are required.
                         $pipe = $this->getContainer()->make($pipe, ['parameters' => $hookParameters]);
 
-                        $this->handlePipeEnd(true);
-
-                        if ($this->pipeStartCallback) {
-                            call_user_func_array($this->pipeStartCallback, [$pipe]);
+                        if ($this->callback) {
+                            call_user_func_array($this->callback, [$pipe]);
                         }
 
                         $parameters = [$passable, $stack];
@@ -94,8 +92,8 @@ protected function carry()
                     }
 
                     $carry = method_exists($pipe, $this->method)
-                                ? $pipe->{$this->method}(...$parameters)
-                                : $pipe(...$parameters);
+                                    ? $pipe->{$this->method}(...$parameters)
+                                    : $pipe(...$parameters);
 
                     return $this->handleCarry($carry);
                 } catch (Throwable $e) {
@@ -106,43 +104,13 @@ protected function carry()
     }
 
     /**
-     * Handle the call back call once a specific pipe has finished or errored.
-     *
-     * @param  bool  $success
-     * @return void
+     * {@inheritDoc}
      */
-    protected function handlePipeEnd($success)
+    protected function handleException($passable, $e)
     {
-        if ($this->pipeEndCallback) {
-            call_user_func_array($this->pipeEndCallback, [$success]);
+        if ($this->exceptionCallback) {
+            return call_user_func_array($this->exceptionCallback, [$e]);
         }
-    }
-
-    /**
-     * Handle the value returned from each pipe before passing it to the next.
-     *
-     * @param  mixed  $carry
-     * @return mixed
-     */
-    protected function handleCarry($carry)
-    {
-        $this->handlePipeEnd(true);
-
-        return $carry;
-    }
-
-    /**
-     * Handle the given exception.
-     *
-     * @param  mixed  $passable
-     * @param  \Throwable  $e
-     * @return mixed
-     *
-     * @throws \Throwable
-     */
-    protected function handleException($passable, Throwable $e)
-    {
-        $this->handlePipeEnd(false);
 
         throw $e;
     }