Merge pull request #26 from dsbilling/master

Update Pint defaults
igorsgm · Jan 4, 2024 · b29c74b · b29c74b
2 parents 3a68f06 + 7b45bb3
commit b29c74b
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 47 deletions.
diff --git a/config/git-hooks.php b/config/git-hooks.php
@@ -170,8 +170,8 @@
     'code_analyzers' => [
         'laravel_pint' => [
             'path' => env('LARAVEL_PINT_PATH', 'vendor/bin/pint'),
-            'config' => env('LARAVEL_PINT_CONFIG', 'pint.json'),
-            'preset' => env('LARAVEL_PINT_PRESET', 'psr12'),
+            'config' => env('LARAVEL_PINT_CONFIG'),
+            'preset' => env('LARAVEL_PINT_PRESET', 'laravel'),
             'file_extensions' => env('LARAVEL_PINT_FILE_EXTENSIONS', '/\.php$/'),
         ],
         'php_code_sniffer' => [

diff --git a/src/Contracts/Hook.php b/src/Contracts/Hook.php
@@ -9,8 +9,6 @@ interface Hook
 {
     /**
      * Get hook name
-     *
-     * @return string
      */
     public function getName(): ?string;
 }
diff --git a/tests/Features/Commands/PostCommitTest.php b/tests/Features/Commands/PostCommitTest.php
@@ -6,15 +6,15 @@
 use Igorsgm\GitHooks\Git\Log;
 
 test('Git Log is sent through HookPipes', function (string $logText) {
-// This approach is broken in the current version of Mockery
-// @TODO: Update this test once Pest or Mockery versions are updated
-//    $postCommitHook1 = mock(PostCommitHook::class)->expect(
-//        handle: fn (Log $log, Closure $closure) => expect($log->getHash())->toBe(mockCommitHash())
-//    );
+    // This approach is broken in the current version of Mockery
+    // @TODO: Update this test once Pest or Mockery versions are updated
+    //    $postCommitHook1 = mock(PostCommitHook::class)->expect(
+    //        handle: fn (Log $log, Closure $closure) => expect($log->getHash())->toBe(mockCommitHash())
+    //    );
 
     $postCommitHook1 = mock(PostCommitHook::class);
     $postCommitHook1->expects('handle')
-        ->withArgs(fn($log, $closure) => $log->getHash() === mockCommitHash());
+        ->withArgs(fn ($log, $closure) => $log->getHash() === mockCommitHash());
 
     $postCommitHook2 = clone $postCommitHook1;
 
@@ -29,13 +29,13 @@
 })->with('lastCommitLogText');
 
 it('Returns 1 on HookFailException', function ($logText) {
-// This approach is broken in the current version of Mockery
-// @TODO: Update this test once Pest or Mockery versions are updated
-//    $postCommitHook1 = mock(PostCommitHook::class)->expect(
-//        handle: function (Log $log, Closure $closure) {
-//            throw new HookFailException();
-//        }
-//    );
+    // This approach is broken in the current version of Mockery
+    // @TODO: Update this test once Pest or Mockery versions are updated
+    //    $postCommitHook1 = mock(PostCommitHook::class)->expect(
+    //        handle: function (Log $log, Closure $closure) {
+    //            throw new HookFailException();
+    //        }
+    //    );
 
     $postCommitHook1 = mock(PostCommitHook::class);
     $postCommitHook1->expects('handle')

diff --git a/tests/Features/Commands/PreCommitTest.php b/tests/Features/Commands/PreCommitTest.php
@@ -6,14 +6,14 @@
 use Igorsgm\GitHooks\Git\ChangedFiles;
 
 test('Sends ChangedFiles through HookPipes', function (string $listOfChangedFiles) {
-// This approach is broken in the current version of Mockery
-// @TODO: Update this test once Pest or Mockery versions are updated
-//    $preCommitHook1 = mock(PreCommitHook::class)->expect(
-//        handle: function (ChangedFiles $files, Closure $closure) use ($listOfChangedFiles) {
-//            $firstChangedFile = (string) $files->getFiles()->first();
-//            expect($firstChangedFile)->toBe($listOfChangedFiles);
-//        }
-//    );
+    // This approach is broken in the current version of Mockery
+    // @TODO: Update this test once Pest or Mockery versions are updated
+    //    $preCommitHook1 = mock(PreCommitHook::class)->expect(
+    //        handle: function (ChangedFiles $files, Closure $closure) use ($listOfChangedFiles) {
+    //            $firstChangedFile = (string) $files->getFiles()->first();
+    //            expect($firstChangedFile)->toBe($listOfChangedFiles);
+    //        }
+    //    );
     $preCommitHook1 = mock(PreCommitHook::class);
     $preCommitHook1->expects('handle')
         ->andReturnUsing(function (ChangedFiles $files, Closure $closure) use ($listOfChangedFiles) {
@@ -34,20 +34,19 @@
 })->with('listOfChangedFiles');
 
 it('Returns 1 on HookFailException', function ($listOfChangedFiles) {
-// This approach is broken in the current version of Mockery
-// @TODO: Update this test once Pest or Mockery versions are updated
-//    $preCommitHook1 = mock(PreCommitHook::class)->expect(
-//        handle: function (ChangedFiles $files, Closure $closure) {
-//            throw new HookFailException();
-//        }
-//    );
+    // This approach is broken in the current version of Mockery
+    // @TODO: Update this test once Pest or Mockery versions are updated
+    //    $preCommitHook1 = mock(PreCommitHook::class)->expect(
+    //        handle: function (ChangedFiles $files, Closure $closure) {
+    //            throw new HookFailException();
+    //        }
+    //    );
     $preCommitHook1 = mock(PreCommitHook::class);
     $preCommitHook1->expects('handle')
         ->andReturnUsing(function (ChangedFiles $files, Closure $closure) {
             throw new HookFailException();
         });
 
-
     $this->config->set('git-hooks.pre-commit', [
         $preCommitHook1,
     ]);

diff --git a/tests/Features/Commands/PrePushTest.php b/tests/Features/Commands/PrePushTest.php
@@ -5,14 +5,14 @@
 use Igorsgm\GitHooks\Git\Log;
 
 test('Git Log is sent through HookPipes', function (string $logText) {
-// This approach is broken in the current version of Mockery
-// @TODO: Update this test once Pest or Mockery versions are updated
-//    $prePushHook1 = mock(PostCommitHook::class)->expect(
-//        handle: fn (Log $log, Closure $closure) => expect($log->getHash())->toBe(mockCommitHash())
-//    );
+    // This approach is broken in the current version of Mockery
+    // @TODO: Update this test once Pest or Mockery versions are updated
+    //    $prePushHook1 = mock(PostCommitHook::class)->expect(
+    //        handle: fn (Log $log, Closure $closure) => expect($log->getHash())->toBe(mockCommitHash())
+    //    );
     $prePushHook1 = mock(PostCommitHook::class);
     $prePushHook1->expects('handle')
-        ->withArgs(fn(Log $log, Closure $closure) => $log->getHash() === mockCommitHash())
+        ->withArgs(fn (Log $log, Closure $closure) => $log->getHash() === mockCommitHash())
         ->once();
 
     $prePushHook2 = clone $prePushHook1;

diff --git a/tests/Features/Commands/PrepareCommitMessageTest.php b/tests/Features/Commands/PrepareCommitMessageTest.php
@@ -35,20 +35,19 @@
 })->with('listOfChangedFiles');
 
 it('Returns 1 on HookFailException', function ($listOfChangedFiles) {
-// This approach is broken in the current version of Mockery
-// @TODO: Update this test once Pest or Mockery versions are updated
-//    $postCommitHook1 = mock(MessageHook::class)->expect(
-//        handle: function (CommitMessage $commitMessage, Closure $closure) {
-//            throw new HookFailException();
-//        }
-//    );
+    // This approach is broken in the current version of Mockery
+    // @TODO: Update this test once Pest or Mockery versions are updated
+    //    $postCommitHook1 = mock(MessageHook::class)->expect(
+    //        handle: function (CommitMessage $commitMessage, Closure $closure) {
+    //            throw new HookFailException();
+    //        }
+    //    );
     $postCommitHook1 = mock(MessageHook::class);
     $postCommitHook1->expects('handle')
         ->andReturnUsing(function (CommitMessage $commitMessage, Closure $closure) {
             throw new HookFailException();
         });
 
-
     $this->config->set('git-hooks.prepare-commit-msg', [
         $postCommitHook1,
     ]);