Merge branch 'master' into master

Author: willpower232

.gitattributes

@@ -2,10 +2,12 @@ tests            export-ignore
 .gitattributes   export-ignore
 .github          export-ignore
 .gitignore       export-ignore
+.pint.json       export-ignore
 .scrutinizer.yml export-ignore
 .styleci.yml     export-ignore
 .travis.yml      export-ignore
 CHANGELOG.md     export-ignore
 CONTRIBUTING.md  export-ignore
 phpunit.xml      export-ignore
 README.md        export-ignore
+phpstan*         export-ignore

.github/workflows/fix-php-code-style-issues.yml

@@ -0,0 +1,26 @@
+name: Fix PHP code style issues
+
+on:
+  pull_request:
+    paths:
+      - '**.php'
+      - '.github/workflows/fix-php-code-style-issues.yml'
+      - '.pint.json'
+
+jobs:
+  php-code-styling:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Fix PHP code style issues
+        uses: aglipanci/laravel-pint-action@v2
+        with:
+          configPath: ".pint.json"
+
+      - name: Commit changes
+        uses: stefanzweifel/git-auto-commit-action@v5
+        with:
+          commit_message: Fix styling

.github/workflows/phpstan.yml

@@ -0,0 +1,34 @@
+name: PHPStan
+
+on:
+    pull_request:
+        paths:
+            - '**.php'
+            - 'phpstan.neon.dist'
+
+jobs:
+    phpstan:
+        name: phpstan
+        runs-on: ubuntu-latest
+        timeout-minutes: 15
+        env:
+          COMPOSER_NO_INTERACTION: 1
+        steps:
+            - uses: actions/checkout@v4
+
+            - name: Setup PHP
+              uses: shivammathur/setup-php@v2
+              with:
+                  php-version: 8.4
+                  coverage: none
+
+            - name: Install composer dependencies
+              uses: ramsey/composer-install@v3
+
+            - name: Install larastan
+              run: |
+                  composer require "larastan/larastan" --no-update
+                  composer update --prefer-dist --no-suggest
+
+            - name: Run PHPStan
+              run: ./vendor/bin/phpstan --error-format=github

.github/workflows/run-tests.yml

@@ -2,57 +2,29 @@ name: run-tests
 
 on:
   push:
-    branches: [master]
-  pull_request:
-    branches: [master]
+    branches:
+      - '*'
 
 jobs:
   run-tests:
     runs-on: ubuntu-latest
+    timeout-minutes: 15
+    env:
+      COMPOSER_NO_INTERACTION: 1
     strategy:
       fail-fast: false
       matrix:
-        php: [7.4, 8.0, 8.1, 8.2, 8.3]
-        laravel: [ 11.*, 10.*, 9.*, 8.*, 7.* ]
+        php: [ 8.2, 8.3, 8.4 ]
+        laravel: [ 11.*, 12.* ]
         include:
+          - laravel: 12.*
+            testbench: 10.*
           - 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: 8.*
-            php: 8.3
-          - laravel: 7.*
-            php: 8.1
-          - laravel: 7.*
-            php: 8.2
-          - laravel: 7.*
-            php: 8.3
 
     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
 
@@ -65,11 +37,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 "orchestra/testbench:${{ matrix.testbench }}" --dev --no-interaction --no-update
-          composer update --prefer-dist --no-interaction --no-suggest
+          composer require "illuminate/console:${{ matrix.laravel }}" "illuminate/database:${{ matrix.laravel }}" "illuminate/filesystem:${{ matrix.laravel }}" --no-update
+          composer require "orchestra/testbench:${{ matrix.testbench }}" --dev --no-update
+          composer update --prefer-dist --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

@@ -2,4 +2,6 @@
 /vendor
 composer.lock
 .vscode
+.phpunit.cache
 .phpunit.result.cache
+/build/phpstan

.pint.json

@@ -0,0 +1,15 @@
+{
+    "preset": "laravel",
+    "verbose": false,
+    "test": false,
+    "dry": false,
+    "ignore": [
+        "vendor"
+    ],
+    "remove": [],
+    "config": {
+        "braces": {
+            "allow_single_line_closure": true
+        }
+    }
+}

CHANGELOG.md

@@ -1,4 +1,8 @@
-## v13.0.0
+## Note that changelogs not listed here are included in the [releases](https://github.com/owen-it/laravel-auditing/releases).
+
+---
+
+## v13.0.0 (2022-03-02)
 
 ### Added
 

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

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "owen-it/laravel-auditing",
-    "description": "Audit changes of your Eloquent models in Laravel/Lumen",
+    "description": "Audit changes of your Eloquent models in Laravel",
     "keywords": [
         "accountability",
         "audit",
@@ -39,17 +39,16 @@
         }
     ],
     "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.2",
+        "ext-json": "*",
+        "illuminate/console": "^11.0|^12.0",
+        "illuminate/database": "^11.0|^12.0",
+        "illuminate/filesystem": "^11.0|^12.0"
     },
     "require-dev": {
-        "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": "*"
+        "mockery/mockery": "^1.5.1",
+        "orchestra/testbench": "^9.0|^10.0",
+        "phpunit/phpunit": "^11.0"
     },
     "autoload": {
         "psr-4": {
@@ -61,19 +60,21 @@
             "OwenIt\\Auditing\\Tests\\": "tests/"
         }
     },
-    "suggest": {
-        "irazasyed/larasupport": "Needed to publish the package configuration in Lumen"
-    },
     "extra": {
         "branch-alias": {
-            "dev-master": "v13-dev"
+            "dev-master": "v14-dev"
         },
         "laravel": {
             "providers": [
                 "OwenIt\\Auditing\\AuditingServiceProvider"
             ]
         }
     },
+    "scripts": {
+        "test": "phpunit",
+        "format": "composer require --dev laravel/pint --quiet && pint --config .pint.json && composer remove --dev laravel/pint --no-update",
+        "analyse": "composer require --dev larastan/larastan --quiet && phpstan analyse && composer remove --dev larastan/larastan --no-update"
+    },
     "minimum-stability": "dev",
     "prefer-stable": 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,
         ],
     ],
@@ -179,10 +179,10 @@
     */
 
     'queue' => [
-        'enable'     => false,
+        'enable' => false,
         'connection' => 'sync',
-        'queue'      => 'default',
-        'delay'      => 0,
+        'queue' => 'default',
+        'delay' => 0,
     ],
 
     /*