Laravel 13.x Compatibility (#1044)

* Bump dependencies for Laravel 13

* Update GitHub Actions for Laravel 13

* Fix YAML syntax for branch patterns and Laravel versions

* Update AuditableObserver registration to use class name

* Delay AuditableObserver registration until booted

* Refactor bootAuditable to register observer conditionally

* My bad

Removed unnecessary closing brace in Auditable.php.

* Make phpstan happy

* Update version range

---------

Co-authored-by: erikn69 <erikn_69@hotmail.com>

Author: laravel-shift

.github/workflows/phpstan.yml

@@ -27,8 +27,8 @@ jobs:
 
             - name: Install larastan
               run: |
-                  composer require "larastan/larastan" --no-update
+                  composer require --dev "larastan/larastan" --no-update
                   composer update --prefer-dist --no-suggest
 
             - name: Run PHPStan
-              run: ./vendor/bin/phpstan --error-format=github
+              run: ./vendor/bin/phpstan analyse --error-format=github --no-progress

.github/workflows/run-tests.yml

@@ -11,19 +11,27 @@ on:
 jobs:
   run-tests:
     runs-on: ubuntu-latest
+
     timeout-minutes: 15
+
     env:
       COMPOSER_NO_INTERACTION: 1
+
     strategy:
       fail-fast: false
       matrix:
-        php: [ 8.2, 8.3, 8.4, 8.5 ]
-        laravel: [ 11.*, 12.* ]
+        php: [8.2, 8.3, 8.4, 8.5]
+        laravel: [11.*, 12.*, 13.*]
         include:
           - laravel: 12.*
             testbench: 10.*
           - laravel: 11.*
             testbench: 9.*
+          - laravel: 13.*
+            testbench: 11.*
+        exclude:
+          - laravel: 13.*
+            php: 8.2
 
     name: PHP${{ matrix.php }} - Laravel${{ matrix.laravel }} - ${{ matrix.dependency-version }}
 

README.md

@@ -26,7 +26,7 @@ Thank you for choosing OwenIt\LaravelAuditing!
 
 Version   | Illuminate     | Status                  | PHP Version
 :----------|:---------------|:------------------------|:------------
-14.x      | 11.x.x - 12.x.x | Active support :rocket: | > = 8.2
+14.x      | 11.x.x - 13.x.x | Active support :rocket: | > = 8.2
 13.x      | 7.x.x - 11.x.x | End of life             | > = 7.3 \| 8.0
 12.x      | 6.x.x - 9.x.x | End of life             | > = 7.3 \| 8.0
 11.x      | 5.8.x - 8.x.x | End of life             | > = 7.3

composer.json

@@ -41,14 +41,14 @@
     "require": {
         "php": "^8.2",
         "ext-json": "*",
-        "illuminate/console": "^11.0|^12.0",
-        "illuminate/database": "^11.0|^12.0",
-        "illuminate/filesystem": "^11.0|^12.0"
+        "illuminate/console": "^11.0|^12.0|^13.0",
+        "illuminate/database": "^11.0|^12.0|^13.0",
+        "illuminate/filesystem": "^11.0|^12.0|^13.0"
     },
     "require-dev": {
         "mockery/mockery": "^1.5.1",
-        "orchestra/testbench": "^9.0|^10.0",
-        "phpunit/phpunit": "^11.0"
+        "orchestra/testbench": "^9.0|^10.0|^11.0",
+        "phpunit/phpunit": "^11.0|^12.5.12"
     },
     "autoload": {
         "psr-4": {

src/Auditable.php

@@ -78,7 +78,13 @@ trait Auditable
     public static function bootAuditable()
     {
         if (App::getFacadeRoot() && static::isAuditingEnabled()) {
-            static::observe(new AuditableObserver);
+            $registerObserver = fn() => static::observe(AuditableObserver::class);
+
+            if (method_exists(static::class, 'whenBooted')) {
+                static::whenBooted($registerObserver);
+            } else {
+                $registerObserver(); // fallback for Laravel 11
+            }
         }
     }
 

src/AuditableObserver.php

@@ -115,6 +115,7 @@ protected function dispatchAudit(Auditable $model): void
      */
     protected function fireDispatchingAuditEvent(Auditable $model): bool
     {
+        // @phpstan-ignore-next-line
         return app()->make('events')
             ->until(new DispatchingAudit($model)) !== false;
     }

src/Auditor.php

@@ -105,6 +105,7 @@ protected function createDatabaseDriver(): Database
      */
     protected function fireAuditingEvent(Auditable $model, AuditDriver $driver): bool
     {
+        // @phpstan-ignore-next-line
         return $this
             ->container
             ->make('events')