wip

Author: igorsgm

composer.json

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

phpunit.xml

@@ -1,23 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         backupGlobals="false"
-         backupStaticAttributes="false"
+         xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
          bootstrap="vendor/autoload.php"
          colors="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">./src</directory>
-        </include>
-    </coverage>
+>
     <testsuites>
-        <testsuite name="Unit">
+        <testsuite name="Test Suite">
             <directory suffix="Test.php">./tests</directory>
         </testsuite>
     </testsuites>
+    <coverage processUncoveredFiles="true">
+        <include>
+            <directory suffix=".php">./app</directory>
+            <directory suffix=".php">./src</directory>
+        </include>
+    </coverage>
 </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(
-                    GitHelper::getListOfChangedFiles()
+                    GitHooks::getListOfChangedFiles()
                 )
             );
         } catch (HookFailException $e) {

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

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

src/GitHooks.php

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

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

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

src/Traits/ProcessHelper.php

@@ -61,18 +61,6 @@ public function runCommands($commands, $params = [])
         return $process;
     }
 
-    /**
-     * Static alias for runCommands.
-     *
-     * @param  array|string  $commands
-     * @param  array  $params
-     * @return Process
-     */
-    public static function execCommands($commands, $params = [])
-    {
-        return (new self)->runCommands($commands, $params);
-    }
-
     /**
      * @param  array  $commands
      * @param  callable  $callback

src/Traits/WithCommitLog.php

@@ -3,7 +3,7 @@
 namespace Igorsgm\GitHooks\Traits;
 
 use Igorsgm\GitHooks\Exceptions\HookFailException;
-use Igorsgm\GitHooks\Git\GitHelper;
+use Igorsgm\GitHooks\Facades\GitHooks;
 use Igorsgm\GitHooks\Git\Log;
 
 trait WithCommitLog
@@ -20,7 +20,7 @@ public function handle()
         try {
             $this->sendLogCommitThroughHooks(
                 new Log(
-                    GitHelper::getLastCommitFromLog()
+                    GitHooks::getLastCommitFromLog()
                 )
             );
         } catch (HookFailException $e) {

src/Traits/WithCommitMessage.php

@@ -4,9 +4,9 @@
 
 use Closure;
 use Igorsgm\GitHooks\Exceptions\HookFailException;
+use Igorsgm\GitHooks\Facades\GitHooks;
 use Igorsgm\GitHooks\Git\ChangedFiles;
 use Igorsgm\GitHooks\Git\CommitMessage;
-use Igorsgm\GitHooks\Git\GitHelper;
 
 trait WithCommitMessage
 {
@@ -18,15 +18,15 @@ trait WithCommitMessage
     public function handle()
     {
         try {
-            $message = GitHelper::getCommitMessageContentFromFile(
+            $message = GitHooks::getCommitMessageContentFromFile(
                 $this->getMessagePath()
             );
 
             $this->sendMessageThroughHooks(
                 new CommitMessage(
                     $message,
                     new ChangedFiles(
-                        GitHelper::getListOfChangedFiles()
+                        GitHooks::getListOfChangedFiles()
                     )
                 )
             );
@@ -67,7 +67,7 @@ protected function sendMessageThroughHooks(CommitMessage $message): void
     protected function storeMessage(): Closure
     {
         return function (CommitMessage $message) {
-            GitHelper::updateCommitMessageContentInFile(
+            GitHooks::updateCommitMessageContentInFile(
                 $this->getMessagePath(),
                 (string) $message
             );