- Remove the use of Laravel's basePath() method in favor of Laravel base_path function.

- Replace calls to ->getLaravel() with app()

Author: igorsgm

src/Traits/WithCommitMessage.php

@@ -31,9 +31,7 @@ public function handle()
     {
         $file = $this->argument('file');
 
-        $message = $this->messageStorage->get(
-            $this->getLaravel()->basePath($file)
-        );
+        $message = $this->messageStorage->get(base_path($file));
 
         try {
             $this->sendMessageThroughHooks(
@@ -58,7 +56,7 @@ private function getMessagePath(): string
     {
         $file = $this->argument('file');
 
-        return $this->getLaravel()->basePath($file);
+        return base_path($file);
     }
 
     /**

src/Traits/WithPipeline.php

@@ -17,15 +17,12 @@ trait WithPipeline
      */
     protected function makePipeline(): Pipeline
     {
-        $pipeline = new HooksPipeline(
-            $this->getLaravel(),
-            $this->getHook()
-        );
+        $pipeline = new HooksPipeline(app(), $this->getHook());
 
         return $pipeline
             ->through($this->getRegisteredHooks())
-            ->withCallback($this->showInfoAboutHook())
-            ->withExceptionCallback($this->showHookErrorAndExit());
+            ->withCallback($this->showInfoAboutHook());
+//            ->withExceptionCallback($this->showHookErrorAndExit());
     }
 
     /**

tests/Console/Commands/CommitMessageTest.php

@@ -34,15 +34,6 @@ public function test_requires_file_argument()
 
     public function test_a_message_should_be_send_through_the_hook_pipes()
     {
-        $app = $this->makeApplication();
-        $app->allows('basePath')->andReturnUsing(function ($path = null) {
-            return $path;
-        });
-
-        $app->allows('make')->andReturnUsing(function ($class) {
-            return new $class;
-        });
-
         Config::set('git-hooks', [
             'commit-msg' => [
                 CommitMessageTestHook1::class,
@@ -58,12 +49,10 @@ public function test_a_message_should_be_send_through_the_hook_pipes()
 
         $commitMessageStorage
             ->expects('update')
-            ->with('tmp/COMMIT_MESSAGE', 'Test commit hook1 hook2');
+            ->with(base_path('tmp/COMMIT_MESSAGE'), 'Test commit hook1 hook2');
 
         $command = new CommitMessage($commitMessageStorage);
 
-        $command->setLaravel($app);
-
         $input = Mockery::mock(\Symfony\Component\Console\Input\InputInterface::class);
         $input->allows('getArgument')
             ->with('file')
@@ -90,15 +79,6 @@ public function test_a_message_should_be_send_through_the_hook_pipes()
 
     public function test_pass_hook_config_into_hook_object()
     {
-        $app = $this->makeApplication();
-        $app->allows('make')->andReturnUsing(function ($class, array $parameters = []) {
-            return new $class(...array_values($parameters));
-        });
-
-        $app->allows('basePath')->andReturnUsing(function ($path = null) {
-            return $path;
-        });
-
         Config::set('git-hooks', [
             'commit-msg' => [
                 CommitMessageTestHook4::class => [
@@ -116,12 +96,10 @@ public function test_pass_hook_config_into_hook_object()
 
         $commitMessageStorage
             ->expects('update')
-            ->with('tmp/COMMIT_MESSAGE', 'Test commit hello world');
+            ->with(base_path('tmp/COMMIT_MESSAGE'), 'Test commit hello world');
 
         $command = new CommitMessage($commitMessageStorage);
 
-        $command->setLaravel($app);
-
         $input = Mockery::mock(\Symfony\Component\Console\Input\InputInterface::class);
         $input->allows('getArgument')
             ->with('file')

tests/Console/Commands/PostCommitTest.php

@@ -45,9 +45,7 @@ public function test_a_message_should_be_send_through_the_hook_pipes()
             ],
         ]);
 
-        $app = $this->makeApplication();
         $command = new PostCommit();
-        $command->setLaravel($app);
 
         $gitHelper = Mockery::mock('alias:'.GitHelper::class);
         $gitHelper->expects('getLastCommitFromLog')

tests/Console/Commands/PreCommitTest.php

@@ -46,9 +46,7 @@ public function test_a_message_should_be_send_through_the_hook_pipes()
             ],
         ]);
 
-        $app = $this->makeApplication();
         $command = new PreCommit();
-        $command->setLaravel($app);
 
         $gitHelper = Mockery::mock('alias:'.GitHelper::class);
         $gitHelper->expects('getListOfChangedFiles')->andReturns('AM src/ChangedFiles.php');

tests/Console/Commands/PrePushTest.php

@@ -45,9 +45,7 @@ public function test_a_message_should_be_send_through_the_hook_pipes()
             ],
         ]);
 
-        $app = $this->makeApplication();
         $command = new PrePush();
-        $command->setLaravel($app);
 
         $gitHelper = Mockery::mock('alias:'.GitHelper::class);
         $gitHelper->expects('getLastCommitFromLog')

tests/Console/Commands/PrepareCommitMessageTest.php

@@ -34,15 +34,6 @@ public function test_requires_file_argument()
 
     public function test_a_message_should_be_send_through_the_hook_pipes()
     {
-        $app = $this->makeApplication();
-        $app->allows('basePath')->andReturnUsing(function ($path = null) {
-            return $path;
-        });
-
-        $app->allows('make')->andReturnUsing(function ($class) {
-            return new $class;
-        });
-
         Config::set('git-hooks', [
             'prepare-commit-msg' => [
                 PrepareCommitMessageTestHook1::class,
@@ -58,7 +49,7 @@ public function test_a_message_should_be_send_through_the_hook_pipes()
 
         $commitMessageStorage
             ->expects('update')
-            ->with('tmp/COMMIT_MESSAGE', 'Test commit hook1 hook2');
+            ->with(base_path('tmp/COMMIT_MESSAGE'), 'Test commit hook1 hook2');
 
         $command = new PrepareCommitMessage($commitMessageStorage);
 
@@ -68,7 +59,6 @@ public function test_a_message_should_be_send_through_the_hook_pipes()
             ->with('file')
             ->andReturns('tmp/COMMIT_MESSAGE');
 
-        $command->setLaravel($app);
         $command->setInput($input);
 
         $output = Mockery::mock(OutputStyle::class);