Laravel 13.x Compatibility

.github/workflows/ci.yml

@@ -7,6 +7,7 @@ on:
 jobs:
   lint:
     runs-on: ubuntu-24.04
+
     timeout-minutes: 5
 
     env:
@@ -20,6 +21,7 @@ jobs:
       pint: 1
 
     name: Lint
+
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -60,6 +62,7 @@ jobs:
 
   static-analysis:
     runs-on: ubuntu-24.04
+
     timeout-minutes: 5
 
     env:
@@ -73,6 +76,7 @@ jobs:
       pint: 1
 
     name: Static Analysis
+
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -113,19 +117,24 @@ jobs:
 
   tests:
     runs-on: ubuntu-24.04
+
     timeout-minutes: 5
 
-    needs: [lint, static-analysis]
+    needs:
+      - lint
+      - static-analysis
 
     strategy:
       fail-fast: true
       matrix:
         php: [8.3, 8.4]
-        laravel: [11, 12]
+        laravel: [11, 12, 13]
         filament: [4, 5]
         exclude:
           - laravel: 11
             filament: 5
+          - laravel: 13
+            filament: 4
         include:
           - laravel: 11
             testbench: 9
@@ -135,6 +144,10 @@ jobs:
             testbench: 10
             larastan: 3
             pint: 1
+          - laravel: 13
+            testbench: 11
+            larastan: 3
+            pint: 1
           - filament: 4
             livewire: 3
             pest: 3
@@ -143,6 +156,7 @@ jobs:
             pest: 4
 
     name: Tests - PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} - Filament ${{ matrix.filament }}
+
     steps:
       - name: Checkout code
         uses: actions/checkout@v4

composer.json

@@ -23,8 +23,8 @@
     "require": {
         "spatie/laravel-package-tools": "^1.18",
         "league/html-to-markdown": "^5.1",
-        "illuminate/support": "^11.0|^12.0",
-        "illuminate/database": "^11.0|^12.0",
+        "illuminate/support": "^11.0|^12.0|^13.0",
+        "illuminate/database": "^11.0|^12.0|^13.0",
         "livewire/livewire": "^3.5|^4.0",
         "filament/support": "^3.2|^4.0|^5.0",
         "filament/notifications": "^3.2|^4.0|^5.0",
@@ -39,8 +39,8 @@
     },
     "require-dev": {
         "pestphp/pest": "^3.7|^4.0",
-        "illuminate/auth": "^11.0|^12.0",
-        "orchestra/testbench": "^9.9|^10.0",
+        "illuminate/auth": "^11.0|^12.0|^13.0",
+        "orchestra/testbench": "^9.9|^10.0|^11.0",
         "pestphp/pest-plugin-laravel": "^3.1|^4.0",
         "pestphp/pest-plugin-livewire": "^3.0|^4.0",
         "laravel/pint": "^1.21",

config/commentions.php

@@ -1,5 +1,11 @@
 <?php
 
+use App\Models\User;
+use Kirschbaum\Commentions\Comment;
+use Kirschbaum\Commentions\Listeners\SendUserMentionedNotification;
+use Kirschbaum\Commentions\Notifications\UserMentionedInComment;
+use Kirschbaum\Commentions\Policies\CommentPolicy;
+
 return [
     /*
     |--------------------------------------------------------------------------
@@ -18,7 +24,7 @@
     |--------------------------------------------------------------------------
     */
     'commenter' => [
-        'model' => \App\Models\User::class,
+        'model' => User::class,
     ],
 
     /*
@@ -27,8 +33,8 @@
     |--------------------------------------------------------------------------
     */
     'comment' => [
-        'model' => \Kirschbaum\Commentions\Comment::class,
-        'policy' => \Kirschbaum\Commentions\Policies\CommentPolicy::class,
+        'model' => Comment::class,
+        'policy' => CommentPolicy::class,
     ],
 
     /*
@@ -74,8 +80,8 @@
 
             'channels' => explode(',', env('COMMENTIONS_NOTIFICATIONS_MENTIONS_CHANNELS', 'mail')),
 
-            'listener' => \Kirschbaum\Commentions\Listeners\SendUserMentionedNotification::class,
-            'notification' => \Kirschbaum\Commentions\Notifications\UserMentionedInComment::class,
+            'listener' => SendUserMentionedNotification::class,
+            'notification' => UserMentionedInComment::class,
 
             'mail' => [
                 'subject' => env('COMMENTIONS_NOTIFICATIONS_MENTIONS_MAIL_SUBJECT', 'You were mentioned in a comment'),

database/factories/CommentFactory.php

@@ -8,7 +8,7 @@
 use Kirschbaum\Commentions\Contracts\Commenter;
 
 /**
- * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\Comment>
+ * @extends Factory<\App\Models\Comment>
  */
 class CommentFactory extends Factory
 {

src/Livewire/Comments.php

@@ -33,11 +33,17 @@ class Comments extends Component
     #[Renderless]
     public function save()
     {
+        $user = Config::resolveAuthenticatedUser();
+
+        if (! $user) {
+            return;
+        }
+
         $this->validate();
 
         SaveComment::run(
             $this->record,
-            Config::resolveAuthenticatedUser(),
+            $user,
             $this->commentBody
         );
 

tests/CommentTest.php

@@ -9,6 +9,7 @@
 use Kirschbaum\Commentions\Events\UserWasMentionedEvent;
 use Tests\Models\Post;
 use Tests\Models\User;
+use Tests\Policies\BlockedCommentPolicy;
 
 test('it can save a comment', function () {
     $user = User::factory()->create();
@@ -29,7 +30,7 @@
     $user = User::factory()->create();
     $post = Post::factory()->create();
 
-    \Gate::policy(Comment::class, \Tests\Policies\BlockedCommentPolicy::class);
+    \Gate::policy(Comment::class, BlockedCommentPolicy::class);
 
     expect(fn () => $post->comment('This is a test comment', $user))
         ->toThrow(AuthorizationException::class)

tests/Livewire/CommentTest.php

@@ -7,6 +7,7 @@
 use Kirschbaum\Commentions\RenderableComment;
 use Tests\Models\Post;
 use Tests\Models\User;
+use Tests\Policies\BlockedCommentPolicy;
 
 use function Pest\Laravel\actingAs;
 use function Pest\Livewire\livewire;
@@ -63,7 +64,7 @@
     $user = User::factory()->create();
     actingAs($user);
 
-    \Gate::policy(Comment::class, \Tests\Policies\BlockedCommentPolicy::class);
+    Gate::policy(Comment::class, BlockedCommentPolicy::class);
 
     $post = Post::factory()->create();
     $comment = CommentModel::factory()->author($user)->commentable($post)->create();
@@ -141,7 +142,7 @@
     $user = User::factory()->create();
     actingAs($user);
 
-    \Gate::policy(Comment::class, \Tests\Policies\BlockedCommentPolicy::class);
+    Gate::policy(Comment::class, BlockedCommentPolicy::class);
 
     $post = Post::factory()->create();
     $comment = CommentModel::factory()->author($user)->commentable($post)->create([
@@ -211,7 +212,7 @@
     $user = User::factory()->create();
     actingAs($user);
 
-    \Gate::policy(Comment::class, \Tests\Policies\BlockedCommentPolicy::class);
+    Gate::policy(Comment::class, BlockedCommentPolicy::class);
 
     $post = Post::factory()->create();
     $comment = CommentModel::factory()->author($user)->commentable($post)->create();

tests/Livewire/CommentsSubscriptionTest.php

@@ -1,5 +1,6 @@
 <?php
 
+use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Event;
 use Kirschbaum\Commentions\CommentSubscription;
@@ -56,7 +57,7 @@
     livewire(Comments::class, [
         'record' => $post,
     ])->assertSet('isSubscribed', false)
-        ->assertSet('subscribers', fn ($subscribers) => $subscribers instanceof \Illuminate\Support\Collection && $subscribers->isEmpty());
+        ->assertSet('subscribers', fn ($subscribers) => $subscribers instanceof Collection && $subscribers->isEmpty());
 
     $post->subscribe($user);
 

tests/Livewire/CommentsTest.php

@@ -68,13 +68,11 @@
 
     $post = Post::factory()->create();
 
-    expect(function () use ($post) {
-        livewire(Comments::class, [
-            'record' => $post,
-        ])
-            ->set('commentBody', 'This is a test comment')
-            ->call('save');
-    })->toThrow(TypeError::class);
+    livewire(Comments::class, [
+        'record' => $post,
+    ])
+        ->set('commentBody', 'This is a test comment')
+        ->call('save');
 
     $this->assertDatabaseMissing('comments', [
         'body' => 'This is a test comment',

tests/Pest.php

@@ -2,6 +2,7 @@
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Collection;
+use Tests\TestCase;
 
 /*
 |--------------------------------------------------------------------------
@@ -14,7 +15,7 @@
 |
 */
 
-pest()->extend(Tests\TestCase::class);
+pest()->extend(TestCase::class);
 
 /*
 |--------------------------------------------------------------------------