V14 catchup

.gitattributes

@@ -9,3 +9,5 @@ CHANGELOG.md     export-ignore
 CONTRIBUTING.md  export-ignore
 phpunit.xml      export-ignore
 README.md        export-ignore
+phpstan*         export-ignore
+.php-cs-fixer.dist.php export-ignore

.github/workflows/phpstan.yml

@@ -0,0 +1,26 @@
+name: PHPStan
+
+on:
+    push:
+        paths:
+            - '**.php'
+            - 'phpstan.neon'
+
+jobs:
+    phpstan:
+        name: phpstan
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v4
+
+            - name: Setup PHP
+              uses: shivammathur/setup-php@v2
+              with:
+                  php-version: 8.3
+                  coverage: none
+
+            - name: Install composer dependencies
+              uses: ramsey/composer-install@v2
+
+            - name: Run PHPStan
+              run: ./vendor/bin/phpstan --error-format=github

.github/workflows/run-tests.yml

@@ -2,63 +2,41 @@ name: run-tests
 
 on:
   push:
-    branches: [master]
-  pull_request:
-    branches: [master]
+    branches:
+      - '*'
 
 jobs:
   run-tests:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        php: [7.4, 8.0, 8.1, 8.2, 8.3, 8.4]
-        laravel: [ 11.*, 10.*, 9.*, 8.*, 7.* ]
+        php: [ 8.0, 8.1, 8.2, 8.3, 8.4 ]
+        laravel: [ 11.*, 10.*, 9.* ]
         include:
           - laravel: 11.*
             testbench: 9.*
           - laravel: 10.*
             testbench: 8.*
           - laravel: 9.*
             testbench: 7.*
-          - laravel: 8.*
-            testbench: 6.*
-          - laravel: 7.*
-            testbench: 5.*
         exclude:
           - laravel: 11.*
             php: 8.1
           - laravel: 11.*
             php: 8.0
           - laravel: 11.*
             php: 7.4
-          - laravel: 10.*
-            php: 7.4
           - laravel: 10.*
             php: 8.0
           - laravel: 9.*
             php: 7.4
           - laravel: 9.*
             php: 8.4
-          - laravel: 8.*
-            php: 8.3
-          - laravel: 8.*
-            php: 8.4
-          - laravel: 7.*
-            php: 8.1
-          - laravel: 7.*
-            php: 8.2
-          - laravel: 7.*
-            php: 8.3
-          - laravel: 7.*
-            php: 8.4
 
     name: PHP${{ matrix.php }} - Laravel${{ matrix.laravel }} - ${{ matrix.dependency-version }}
 
     steps:
-      - name: Update apt
-        run: sudo apt-get update --fix-missing
-
       - name: Checkout code
         uses: actions/checkout@v4
 
@@ -71,11 +49,11 @@ jobs:
 
       - name: Install dependencies
         run: |
-          composer require "illuminate/console:${{ matrix.laravel }}" "illuminate/database:${{ matrix.laravel }}" "illuminate/filesystem:${{ matrix.laravel }}" "nesbot/carbon:^2.62.1" --no-interaction --no-update
+          composer require "illuminate/console:${{ matrix.laravel }}" "illuminate/database:${{ matrix.laravel }}" "illuminate/filesystem:${{ matrix.laravel }}" --no-interaction --no-update
           composer require "orchestra/testbench:${{ matrix.testbench }}" --dev --no-interaction --no-update
           composer update --prefer-dist --no-interaction --no-suggest
 
       - name: Execute tests
         run: |
           vendor/bin/phpunit
-          vendor/bin/phpunit tests/Unit/AuditTest.php --group command-line-url-resolver
+          vendor/bin/phpunit tests/Unit/AuditTest.php --group command-line-url-resolver

.gitignore

@@ -1,5 +1,7 @@
 .idea
 /vendor
+/build
 composer.lock
 .vscode
 .phpunit.result.cache
+.php-cs-fixer.cache

.php-cs-fixer.dist.php

@@ -0,0 +1,16 @@
+<?php
+
+$finder = PhpCsFixer\Finder::create()
+    ->in(__DIR__ . '/src')
+    ->name('*.php');
+
+$config = new PhpCsFixer\Config();
+return $config->setRules([
+    '@PSR12'       => true,
+    'strict_param' => true,
+    'array_syntax' => ['syntax' => 'short'],
+    'binary_operator_spaces' => [
+        'default' => 'single_space',
+    ],
+])
+    ->setFinder($finder);

README.md

@@ -12,7 +12,7 @@
     <a href="https://discord.gg/csD9ysg"><img src="https://img.shields.io/badge/chat-on%20discord-7289DA.svg" alt="Chat"></a>
 </p>
 
-This package will help you understand changes in your Eloquent models, by providing information about possible discrepancies and anomalies that could indicate business concerns or suspect activities. 
+This package will help you understand changes in your Eloquent models, by providing information about possible discrepancies and anomalies that could indicate business concerns or suspect activities.
 
 Laravel Auditing allows you to keep a history of model changes by simply using a trait. Retrieving the audited data is straightforward, making it possible to display it in various ways.
 
@@ -24,20 +24,21 @@ Thank you for choosing OwenIt\LaravelAuditing!
 
 ## Version Information
 
-Version   | Illuminate     | Status                  | PHP Version
-:----------|:---------------|:------------------------|:------------
-13.x      | 7.x.x - 11.x.x | Active support :rocket: | > = 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
-10.x      | 5.8.x - 7.x.x | End of life             | > = 7.2.5
-9.x       | 5.8.x - 6.x.x | End of life             | > = 7.1.3
-8.x       | 5.2.x - 5.7.x | End of life             | > = 7.0.13
-7.x       | 5.2.x - 5.6.x | End of life             | > = 7.0.13
-6.x       | 5.2.x - 5.6.x | End of life             | > = 7.0.13
-5.x       | 5.2.x - 5.5.x | End of life             | > = 7.0.13
-4.x       | 5.2.x - 5.5.x | End of life             | > = 5.5.9
-3.x       | 5.2.x - 5.4.x | End of life             | > = 5.5.9
-2.x       | 5.1.x - 5.3.x | End of life             | > = 5.5.9
+Version  | Illuminate     | Status                  | PHP Version
+:--------|:---------------|:------------------------|:------------
+14.x     | 9.x.x - 11.x.x | Active support :rocket: | > = 8.0
+13.x     | 7.x.x - 11.x.x | Active support :rocket: | > = 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
+10.x     | 5.8.x - 7.x.x  | End of life             | > = 7.2.5
+9.x      | 5.8.x - 6.x.x  | End of life             | > = 7.1.3
+8.x      | 5.2.x - 5.7.x  | End of life             | > = 7.0.13
+7.x      | 5.2.x - 5.6.x  | End of life             | > = 7.0.13
+6.x      | 5.2.x - 5.6.x  | End of life             | > = 7.0.13
+5.x      | 5.2.x - 5.5.x  | End of life             | > = 7.0.13
+4.x      | 5.2.x - 5.5.x  | End of life             | > = 5.5.9
+3.x      | 5.2.x - 5.4.x  | End of life             | > = 5.5.9
+2.x      | 5.1.x - 5.3.x  | End of life             | > = 5.5.9
 
 ## Contributing
 Please see the [contributing](http://laravel-auditing.com/docs/master/contributing) entry for more details.

composer.json

@@ -39,17 +39,19 @@
         }
     ],
     "require": {
-        "php": "^7.3|^8.0",
-        "illuminate/console": "^7.0|^8.0|^9.0|^10.0|^11.0",
-        "illuminate/database": "^7.0|^8.0|^9.0|^10.0|^11.0",
-        "illuminate/filesystem": "^7.0|^8.0|^9.0|^10.0|^11.0",
-        "ext-json": "*"
+        "php": "^8.0",
+        "ext-json": "*",
+        "illuminate/console": "^9.0|^10.0|^11.0",
+        "illuminate/database": "^9.0|^10.0|^11.0",
+        "illuminate/filesystem": "^9.0|^10.0|^11.0"
     },
     "require-dev": {
+        "larastan/larastan": "^2.0",
+        "mockery/mockery": "^1.5.1",
+        "orchestra/testbench": "^7.22.1|^8.0|^9.0",
+        "phpstan/extension-installer": "^1.4",
         "phpunit/phpunit": "^9.6|^10.5|^11.0",
-        "mockery/mockery": "^1.0",
-        "orchestra/testbench": "^5.0|^6.0|^7.0|^8.0|^9.0",
-        "laravel/legacy-factories": "*"
+        "squizlabs/php_codesniffer": "^3.10"
     },
     "autoload": {
         "psr-4": {
@@ -66,14 +68,24 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "v13-dev"
+            "dev-master": "v14-dev"
         },
         "laravel": {
             "providers": [
                 "OwenIt\\Auditing\\AuditingServiceProvider"
             ]
         }
     },
+    "scripts": {
+        "test": "phpunit",
+        "format": "php-cs-fixer fix --allow-risky=yes",
+        "analyse": "phpstan analyse"
+    },
     "minimum-stability": "dev",
-    "prefer-stable": true
+    "prefer-stable": true,
+    "config": {
+        "allow-plugins": {
+            "phpstan/extension-installer": true
+        }
+    }
 }

config/audit.php

@@ -24,13 +24,13 @@
     |
     */
 
-    'user'      => [
+    'user' => [
         'morph_prefix' => 'user',
-        'guards'       => [
+        'guards' => [
             'web',
-            'api'
+            'api',
         ],
-        'resolver'     => OwenIt\Auditing\Resolvers\UserResolver::class
+        'resolver' => OwenIt\Auditing\Resolvers\UserResolver::class,
     ],
 
     /*
@@ -44,7 +44,7 @@
     'resolvers' => [
         'ip_address' => OwenIt\Auditing\Resolvers\IpAddressResolver::class,
         'user_agent' => OwenIt\Auditing\Resolvers\UserAgentResolver::class,
-        'url'        => OwenIt\Auditing\Resolvers\UrlResolver::class,
+        'url' => OwenIt\Auditing\Resolvers\UrlResolver::class,
     ],
 
     /*
@@ -60,7 +60,7 @@
         'created',
         'updated',
         'deleted',
-        'restored'
+        'restored',
     ],
 
     /*
@@ -101,9 +101,9 @@
     |
     */
 
-    'empty_values'         => true,
+    'empty_values' => true,
     'allowed_empty_values' => [
-        'retrieved'
+        'retrieved',
     ],
 
     /*
@@ -164,7 +164,7 @@
 
     'drivers' => [
         'database' => [
-            'table'      => 'audits',
+            'table' => 'audits',
             'connection' => null,
         ],
     ],
@@ -181,8 +181,8 @@
     'queue' => [
         'enable'     => false,
         'connection' => 'sync',
-        'queue'      => 'default',
-        'delay'      => 0,
+        'queue' => 'default',
+        'delay' => 0,
     ],
 
     /*

database/migrations/audits.stub

@@ -4,14 +4,12 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreateAuditsTable extends Migration
+return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         $connection = config('audit.drivers.database.connection', config('database.default'));
         $table = config('audit.drivers.database.table', 'audits');
@@ -39,14 +37,12 @@ class CreateAuditsTable extends Migration
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         $connection = config('audit.drivers.database.connection', config('database.default'));
         $table = config('audit.drivers.database.table', 'audits');
 
         Schema::connection($connection)->drop($table);
     }
-}
+};

phpstan.neon

@@ -0,0 +1,10 @@
+parameters:
+    bootstrapFiles:
+        - tests/ClassAliases.php
+    level: 8
+    paths:
+        - src
+        - config
+        - database/migrations/audits.stub
+        - stubs
+    tmpDir: build/phpstan