Merge branch 'support/laravel-13' into 4.x

Author: cklei-carly

.github/workflows/test-matrix.yml

@@ -0,0 +1,44 @@
+name: Test Matrix
+
+on:
+  pull_request:
+  push:
+    branches:
+      - '[0-9]+.x' # Trigger for main version branch (e.g. 1.x, 2.x, 3.x, 4.x)
+      - support/*
+
+jobs:
+  tests:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        php: ['8.2', '8.3']
+        laravel: ['^12.0', '^13.0']
+        exclude:
+          - php: '8.2'
+            laravel: '^13.0'
+
+    name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }}
+
+    steps:
+      - uses: actions/checkout@v5
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: mbstring, pdo, sqlite, curl, dom, fileinfo, gd, intl
+          coverage: none
+
+      - name: Validate composer
+        run: composer validate --strict
+
+      - name: Configure Laravel version
+        run: composer require "laravel/framework:${{ matrix.laravel }}" --no-update --with-all-dependencies
+
+      - name: Install dependencies
+        run: composer update --prefer-dist --no-interaction --no-progress --with-all-dependencies
+
+      - name: Run tests
+        run: vendor/bin/pest --no-coverage

composer.json

@@ -21,11 +21,11 @@
     ],
     "require": {
         "php": ">=8.2",
-        "laravel/framework": "^11.0|^12.0",
+        "laravel/framework": "^11.0|^12.0|^13.0",
         "filament/filament": "^4.0",
-        "kalnoy/nestedset": "^6.0",
+        "kalnoy/nestedset": "^6.0|^7.0",
         "php-ffmpeg/php-ffmpeg": "^1.2",
-        "spatie/eloquent-sortable": "^4.4",
+        "spatie/eloquent-sortable": "^5.0",
         "spatie/laravel-medialibrary": "^10.0|^11.0",
         "spatie/laravel-package-tools": "^1.15.0",
         "staudenmeir/laravel-adjacency-list": "^1.0"
@@ -34,11 +34,11 @@
         "larastan/larastan": "^3.0",
         "laravel/pint": "^1.0",
         "nunomaduro/collision": "^8.0",
-        "orchestra/testbench": "^9.0|^10.0",
-        "pestphp/pest": "^3.0",
-        "pestphp/pest-plugin-arch": "^3.0",
-        "pestphp/pest-plugin-laravel": "^3.0",
-        "pestphp/pest-plugin-livewire": "^3.0",
+        "orchestra/testbench": "^9.0|^10.0|^11.0",
+        "pestphp/pest": "^3.0|^4.0",
+        "pestphp/pest-plugin-arch": "^3.0|^4.0",
+        "pestphp/pest-plugin-laravel": "^3.0|^4.0",
+        "pestphp/pest-plugin-livewire": "^3.0|^4.0",
         "phpstan/extension-installer": "^1.1",
         "phpstan/phpstan-deprecation-rules": "^2.0",
         "phpstan/phpstan-phpunit": "^2.0",

src/Models/Concerns/BelongsToNestableTree.php

@@ -14,7 +14,14 @@ trait BelongsToNestableTree
 {
     public static function bootBelongsToNestableTree()
     {
-        static::observe(new BelongsToNestableTreeObserver);
+        // Instead of observe(), register the each event listener separately for support Laravel 13
+        static::created(fn ($model) => (new BelongsToNestableTreeObserver)->created($model));
+        static::updated(fn ($model) => (new BelongsToNestableTreeObserver)->updated($model));
+        static::deleting(fn ($model) => (new BelongsToNestableTreeObserver)->deleting($model));
+        if (in_array('Illuminate\Database\Eloquent\SoftDeletes', class_uses_recursive(static::class))) {
+            static::forceDeleting(fn ($model) => (new BelongsToNestableTreeObserver)->forceDeleting($model));
+        }
+        // static::observe(new BelongsToNestableTreeObserver);
     }
 
     /**

src/Models/Concerns/HasRecursiveRelationships.php

@@ -15,7 +15,14 @@ trait HasRecursiveRelationships
 
     public static function bootHasRecursiveRelationships()
     {
-        static::observe(new HasRecursiveRelationshipsObserver);
+        // Instead of observe(), register the each event listener separately for support Laravel 13
+        static::creating(fn ($model) => (new HasRecursiveRelationshipsObserver)->creating($model));
+        static::deleting(fn ($model) => (new HasRecursiveRelationshipsObserver)->deleting($model));
+        if (in_array('Illuminate\Database\Eloquent\SoftDeletes', class_uses_recursive(static::class))) {
+            static::restoring(fn ($model) => (new HasRecursiveRelationshipsObserver)->restoring($model));
+            static::forceDeleting(fn ($model) => (new HasRecursiveRelationshipsObserver)->forceDeleting($model));
+        }
+        // static::observe(new HasRecursiveRelationshipsObserver);
     }
 
     /**

tests/src/Unit/Models/MediaAssetTest.php

@@ -14,6 +14,23 @@
     $this->dummyRandImageUrl = 'https://picsum.photos/200/300';
 });
 
+it('boots media asset lifecycle without recursive boot errors', function () {
+    $mediaAsset = MediaAsset::factory()->isFolder()->create()->refresh();
+
+    $mediaAsset->title = 'Boot Lifecycle Updated';
+    $mediaAsset->save();
+
+    $mediaAsset->delete();
+    if (method_exists($mediaAsset, 'restore')) {
+        $mediaAsset->restore();
+    }
+    if (method_exists($mediaAsset, 'forceDelete')) {
+        $mediaAsset->forceDelete();
+    }
+
+    expect(true)->toBeTrue();
+});
+
 dataset('image_extensions', [
     'jpg' => ['jpg'],
     'png' => ['png'],