- Removed the dependency of Repository in all commands.

- Changed the way that hook classes are instantiated, now they receive an array with their configuration as parameter instead of receiving directly the repository object and getting its own configuration from it.
- Replaced Illuminate\Config\Repository with Config facade in Test files
- Removed config dependency from commands constructors

Author: igorsgm

src/Console/Commands/CommitMessage.php

@@ -6,7 +6,6 @@
 use Igorsgm\GitHooks\Contracts\HookCommand;
 use Igorsgm\GitHooks\Traits\WithCommitMessage;
 use Illuminate\Console\Command;
-use Illuminate\Contracts\Config\Repository;
 
 class CommitMessage extends Command implements HookCommand
 {
@@ -25,14 +24,11 @@ class CommitMessage extends Command implements HookCommand
     protected $description = 'Run hook commit-msg';
 
     /**
-     * @param  Repository  $config
      * @param  CommitMessageStorage  $messageStorage
      */
-    public function __construct(Repository $config, CommitMessageStorage $messageStorage)
+    public function __construct(CommitMessageStorage $messageStorage)
     {
         parent::__construct();
-
-        $this->config = $config;
         $this->messageStorage = $messageStorage;
     }
 

src/Console/Commands/PostCommit.php

@@ -8,7 +8,6 @@
 use Igorsgm\GitHooks\Git\Log;
 use Igorsgm\GitHooks\Traits\WithPipeline;
 use Illuminate\Console\Command;
-use Illuminate\Contracts\Config\Repository;
 
 class PostCommit extends Command implements HookCommand
 {
@@ -28,21 +27,6 @@ class PostCommit extends Command implements HookCommand
      */
     protected $description = 'Run hook post-commit';
 
-    /**
-     * @var Repository
-     */
-    protected $config;
-
-    /**
-     * @param  Repository  $config
-     */
-    public function __construct(Repository $config)
-    {
-        parent::__construct();
-
-        $this->config = $config;
-    }
-
     /**
      * {@inheritDoc}
      */

src/Console/Commands/PreCommit.php

@@ -8,7 +8,6 @@
 use Igorsgm\GitHooks\Git\GitHelper;
 use Igorsgm\GitHooks\Traits\WithPipeline;
 use Illuminate\Console\Command;
-use Illuminate\Contracts\Config\Repository;
 
 class PreCommit extends Command implements HookCommand
 {
@@ -28,21 +27,6 @@ class PreCommit extends Command implements HookCommand
      */
     protected $description = 'Run hook pre-commit';
 
-    /**
-     * @var Repository
-     */
-    protected $config;
-
-    /**
-     * @param  Repository  $config
-     */
-    public function __construct(Repository $config)
-    {
-        parent::__construct();
-
-        $this->config = $config;
-    }
-
     /**
      * {@inheritDoc}
      */

src/Console/Commands/PrePush.php

@@ -8,7 +8,6 @@
 use Igorsgm\GitHooks\Git\Log;
 use Igorsgm\GitHooks\Traits\WithPipeline;
 use Illuminate\Console\Command;
-use Illuminate\Contracts\Config\Repository;
 
 class PrePush extends Command implements HookCommand
 {
@@ -28,21 +27,6 @@ class PrePush extends Command implements HookCommand
      */
     protected $description = 'Run hook pre-push';
 
-    /**
-     * @var Repository
-     */
-    protected $config;
-
-    /**
-     * @param  Repository  $config
-     */
-    public function __construct(Repository $config)
-    {
-        parent::__construct();
-
-        $this->config = $config;
-    }
-
     /**
      * {@inheritDoc}
      */

src/Console/Commands/PrepareCommitMessage.php

@@ -6,7 +6,6 @@
 use Igorsgm\GitHooks\Contracts\HookCommand;
 use Igorsgm\GitHooks\Traits\WithCommitMessage;
 use Illuminate\Console\Command;
-use Illuminate\Contracts\Config\Repository;
 
 class PrepareCommitMessage extends Command implements HookCommand
 {
@@ -27,14 +26,11 @@ class PrepareCommitMessage extends Command implements HookCommand
     protected $description = 'Run hook prepare-commit-msg';
 
     /**
-     * @param  Repository  $config
      * @param  CommitMessageStorage  $messageStorage
      */
-    public function __construct(Repository $config, CommitMessageStorage $messageStorage)
+    public function __construct(CommitMessageStorage $messageStorage)
     {
         parent::__construct();
-
-        $this->config = $config;
         $this->messageStorage = $messageStorage;
     }
 

src/Contracts/HookCommand.php

@@ -2,17 +2,8 @@
 
 namespace Igorsgm\GitHooks\Contracts;
 
-use Illuminate\Contracts\Config\Repository;
-
 interface HookCommand
 {
-    /**
-     * Get config repository
-     *
-     * @return Repository
-     */
-    public function getConfig(): Repository;
-
     /**
      * Get hook name
      *

src/HooksPipeline.php

@@ -4,7 +4,6 @@
 
 use Closure;
 use Exception;
-use Illuminate\Contracts\Config\Repository;
 use Illuminate\Contracts\Container\Container;
 use Illuminate\Pipeline\Pipeline;
 use Throwable;
@@ -21,25 +20,18 @@ class HooksPipeline extends Pipeline
      */
     protected $exceptionCallback;
 
-    /**
-     * @var Repository
-     */
-    protected $config;
-
     /**
      * @var string
      */
     protected $hook;
 
     /**
      * @param  \Illuminate\Contracts\Container\Container|null  $container
-     * @param  Repository  $config
      * @param  string  $hook
      */
-    public function __construct(Container $container, Repository $config, string $hook)
+    public function __construct(Container $container, string $hook)
     {
         parent::__construct($container);
-        $this->config = $config;
         $this->hook = $hook;
     }
 
@@ -81,12 +73,12 @@ protected function carry()
                         // the appropriate method and arguments, returning the results back out.
                         return $pipe($passable, $stack);
                     } elseif (! is_object($pipe)) {
-                        $config = (array) $this->config->get('git-hooks.'.$this->hook.'.'.$pipe);
+                        $hookParameters = (array) config('git-hooks.'.$this->hook.'.'.$pipe);
 
                         // If the pipe is a string we will parse the string and resolve the class out
                         // of the dependency injection container. We can then build a callable and
                         // execute the pipe function giving in the parameters that are required.
-                        $pipe = $this->getContainer()->make($pipe, ['config' => $config]);
+                        $pipe = $this->getContainer()->make($pipe, ['parameters' => $hookParameters]);
 
                         if ($this->callback) {
                             call_user_func_array($this->callback, [$pipe]);

src/Traits/WithPipeline.php

@@ -5,21 +5,11 @@
 use Closure;
 use Igorsgm\GitHooks\Contracts\Hook;
 use Igorsgm\GitHooks\HooksPipeline;
-use Illuminate\Contracts\Config\Repository;
 use Illuminate\Pipeline\Pipeline;
-use Illuminate\Support\Collection;
 use Throwable;
 
 trait WithPipeline
 {
-    /**
-     * {@inheritDoc}
-     */
-    public function getConfig(): Repository
-    {
-        return $this->config;
-    }
-
     /**
      * Make pipeline instance
      *
@@ -29,7 +19,6 @@ protected function makePipeline(): Pipeline
     {
         $pipeline = new HooksPipeline(
             $this->getLaravel(),
-            $this->getConfig(),
             $this->getHook()
         );
 
@@ -72,7 +61,7 @@ protected function showHookErrorAndExit(): Closure
      */
     public function getRegisteredHooks(): array
     {
-        $hooks = new Collection((array) $this->config->get('git-hooks.'.$this->getHook()));
+        $hooks = collect((array) config('git-hooks.'.$this->getHook()));
 
         return $hooks->map(function ($hook, $i) {
             if (is_int($i)) {

tests/Console/Commands/CommitMessageTest.php

@@ -8,28 +8,26 @@
 use Igorsgm\GitHooks\Contracts\MessageHook;
 use Igorsgm\GitHooks\Git\GitHelper;
 use Igorsgm\GitHooks\Tests\TestCase;
-use Illuminate\Config\Repository;
 use Illuminate\Console\OutputStyle;
+use Illuminate\Support\Facades\Config;
 use Mockery;
 
 class CommitMessageTest extends TestCase
 {
     public function test_get_command_name()
     {
-        $config = $this->makeConfig();
         $commitMessageStorage = $this->makeCommitMessageStorage();
 
-        $command = new CommitMessage($config, $commitMessageStorage);
+        $command = new CommitMessage($commitMessageStorage);
 
         $this->assertEquals('git-hooks:commit-msg', $command->getName());
     }
 
     public function test_requires_file_argument()
     {
-        $config = $this->makeConfig();
         $commitMessageStorage = $this->makeCommitMessageStorage();
 
-        $command = new CommitMessage($config, $commitMessageStorage);
+        $command = new CommitMessage($commitMessageStorage);
 
         $this->assertTrue($command->getDefinition()->hasArgument('file'));
     }
@@ -45,12 +43,10 @@ public function test_a_message_should_be_send_through_the_hook_pipes()
             return new $class;
         });
 
-        $config = new Repository([
-            'git-hooks' => [
-                'commit-msg' => [
-                    CommitMessageTestHook1::class,
-                    CommitMessageTestHook2::class,
-                ],
+        Config::set('git-hooks', [
+            'commit-msg' => [
+                CommitMessageTestHook1::class,
+                CommitMessageTestHook2::class,
             ],
         ]);
 
@@ -64,7 +60,7 @@ public function test_a_message_should_be_send_through_the_hook_pipes()
             ->expects('update')
             ->with('tmp/COMMIT_MESSAGE', 'Test commit hook1 hook2');
 
-        $command = new CommitMessage($config, $commitMessageStorage);
+        $command = new CommitMessage($commitMessageStorage);
 
         $command->setLaravel($app);
 
@@ -103,13 +99,11 @@ public function test_pass_hook_config_into_hook_object()
             return $path;
         });
 
-        $config = new Repository([
-            'git-hooks' => [
-                'commit-msg' => [
-                    CommitMessageTestHook4::class => [
-                        'param1' => 'hello',
-                        'param2' => 'world',
-                    ],
+        Config::set('git-hooks', [
+            'commit-msg' => [
+                CommitMessageTestHook4::class => [
+                    'param1' => 'hello',
+                    'param2' => 'world',
                 ],
             ],
         ]);
@@ -124,7 +118,7 @@ public function test_pass_hook_config_into_hook_object()
             ->expects('update')
             ->with('tmp/COMMIT_MESSAGE', 'Test commit hello world');
 
-        $command = new CommitMessage($config, $commitMessageStorage);
+        $command = new CommitMessage($commitMessageStorage);
 
         $command->setLaravel($app);
 
@@ -218,19 +212,19 @@ class CommitMessageTestHook4 implements MessageHook
     /**
      * @var array
      */
-    protected $config;
+    protected $parameters;
 
-    public function __construct(array $config)
+    public function __construct(array $parameters)
     {
-        $this->config = $config;
+        $this->parameters = $parameters;
     }
 
     /**
      * {@inheritDoc}
      */
     public function handle(\Igorsgm\GitHooks\Git\CommitMessage $message, Closure $next)
     {
-        $message->setMessage($message->getMessage().' '.$this->config['param1'].' '.$this->config['param2']);
+        $message->setMessage($message->getMessage().' '.$this->parameters['param1'].' '.$this->parameters['param2']);
 
         return $next($message);
     }

tests/Console/Commands/PostCommitTest.php

@@ -8,15 +8,14 @@
 use Igorsgm\GitHooks\Git\GitHelper;
 use Igorsgm\GitHooks\Git\Log;
 use Igorsgm\GitHooks\Tests\TestCase;
-use Illuminate\Config\Repository;
+use Illuminate\Support\Facades\Config;
 use Mockery;
 
 class PostCommitTest extends TestCase
 {
     public function test_get_command_name()
     {
-        $config = $this->makeConfig();
-        $command = new PostCommit($config);
+        $command = new PostCommit();
 
         $this->assertEquals('git-hooks:post-commit', $command->getName());
     }
@@ -39,17 +38,15 @@ public function test_a_message_should_be_send_through_the_hook_pipes()
                 return $closure($log);
             });
 
-        $config = new Repository([
-            'git-hooks' => [
-                'post-commit' => [
-                    $hook1,
-                    $hook2,
-                ],
+        Config::set('git-hooks', [
+            'post-commit' => [
+                $hook1,
+                $hook2,
             ],
         ]);
 
         $app = $this->makeApplication();
-        $command = new PostCommit($config);
+        $command = new PostCommit();
         $command->setLaravel($app);
 
         $gitHelper = Mockery::mock('alias:'.GitHelper::class);