Laravel 11.x Support (#905)

owen-it · Mar 14, 2024 · 01ffb56 · 01ffb56
1 parent 42ebec8
commit 01ffb56
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 13 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -13,8 +13,10 @@ jobs:
       fail-fast: false
       matrix:
         php: [7.4, 8.0, 8.1, 8.2, 8.3]
-        laravel: [ 10.*, 9.*, 8.*, 7.* ]
+        laravel: [ 11.*, 10.*, 9.*, 8.*, 7.* ]
         include:
+          - laravel: 11.*
+            testbench: 9.*
           - laravel: 10.*
             testbench: 8.*
           - laravel: 9.*
@@ -24,6 +26,12 @@ jobs:
           - 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.*

diff --git a/README.md b/README.md
@@ -26,7 +26,7 @@ Thank you for choosing OwenIt\LaravelAuditing!
 
 Version   | Illuminate     | Status                  | PHP Version
 :----------|:---------------|:------------------------|:------------
-13.x      | 7.x.x - 10.x.x | Active support :rocket: | > = 7.3 \| 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 | Active support          | > = 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

diff --git a/composer.json b/composer.json
@@ -40,15 +40,15 @@
     ],
     "require": {
         "php": "^7.3|^8.0",
-        "illuminate/console": "^7.0|^8.0|^9.0|^10.0",
-        "illuminate/database": "^7.0|^8.0|^9.0|^10.0",
-        "illuminate/filesystem": "^7.0|^8.0|^9.0|^10.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": "*"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.0",
+        "phpunit/phpunit": "^9.6|^10.5|^11.0",
         "mockery/mockery": "^1.0",
-        "orchestra/testbench": "^5.0|^6.0|^7.0|^8.0",
+        "orchestra/testbench": "^5.0|^6.0|^7.0|^8.0|^9.0",
         "laravel/legacy-factories": "*"
     },
     "autoload": {

diff --git a/tests/Functional/AuditingTest.php b/tests/Functional/AuditingTest.php
@@ -325,7 +325,7 @@ public function itWillNotAuditDueToUnsupportedDriver()
     public function itWillNotAuditDueToClassWithoutDriverInterface()
     {
         // We just pass a FQCN that does not implement the AuditDriver interface
-        $this->app['config']->set('audit.driver', self::class);
+        $this->app['config']->set('audit.driver', Article::class);
 
         $this->expectException(AuditingException::class);
         $this->expectExceptionMessage('The driver must implement the AuditDriver contract');

diff --git a/tests/Unit/AuditableObserverTest.php b/tests/Unit/AuditableObserverTest.php
@@ -91,7 +91,7 @@ public function itExecutesTheAuditorSuccessfully(string $eventMethod, bool $expe
     /**
      * @return array
      */
-    public function auditableObserverTestProvider(): array
+    public static function auditableObserverTestProvider(): array
     {
         return [
             [
@@ -130,7 +130,7 @@ public function auditableObserverTestProvider(): array
     /**
      * @return array
      */
-    public function auditableObserverDispatchTestProvider(): array
+    public static function auditableObserverDispatchTestProvider(): array
     {
         return [
             [

diff --git a/tests/Unit/AuditableTest.php b/tests/Unit/AuditableTest.php
@@ -275,7 +275,7 @@ public function itFailsWhenTheCustomAttributeGettersAreMissing(
     /**
      * @return array
      */
-    public function auditCustomAttributeGetterFailTestProvider(): array
+    public static function auditCustomAttributeGetterFailTestProvider(): array
     {
         return [
             [
@@ -489,7 +489,7 @@ public function itReturnsTheAuditDataIncludingUserAttributes(
     /**
      * @return array
      */
-    public function userResolverProvider(): array
+    public static function userResolverProvider(): array
     {
         return [
             [
@@ -1202,7 +1202,7 @@ public function itWorksWithStringKeyModels()
     /**
      * @return array
      */
-    public function auditableTransitionTestProvider(): array
+    public static function auditableTransitionTestProvider(): array
     {
         return [
             //