Merge pull request #6 from devNoiseConsulting/laravel-11-compatibility

Laravel 11 compatibility

Author: devNoiseConsulting

.github/workflows/tests.yml

@@ -13,11 +13,13 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.0, 8.1, 8.2]
-        laravel: [^9, ^10]
-        scout: [^9, ^10]
+        php: [8.1, 8.2, 8.3, 8.4]
+        laravel: [^10, ^11]
+        scout: [^10]
         exclude:
-          - php: 8.0
+          - php: 8.1
+            laravel: ^11
+          - php: 8.4
             laravel: ^10
 
     name: Test PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} - Scout ${{ matrix.scout }}

.gitignore

@@ -1,3 +1,4 @@
 /vendor
 .phpunit.result.cache
-composer.lock
+composer.lock
+.DS_Store

composer.json

@@ -28,19 +28,19 @@
         }
     ],
     "require": {
-        "php": "^8.0|^8.1|^8.2",
-        "illuminate/contracts": "^9|^10",
-        "illuminate/database": "^9|^10",
-        "illuminate/support": "^9|^10",
-        "laravel/scout": "^9|^10"
+        "php": "^8.1|^8.2|^8.3|^8.4",
+        "illuminate/contracts": "^10|^11",
+        "illuminate/database": "^10|^11",
+        "illuminate/support": "^10|^11",
+        "laravel/scout": "^10|^11"
     },
     "require-dev": {
-        "laravel/pint": "^1.10",
-        "mockery/mockery": "^1.5",
-        "nunomaduro/larastan": "^2.6",
-        "orchestra/testbench": "^8.5",
+        "laravel/pint": "^1.18",
+        "mockery/mockery": "^1.6",
+        "nunomaduro/larastan": "^2.9",
+        "orchestra/testbench": "^8.28",
         "phpunit/phpunit": "^9.6",
-        "tightenco/duster": "^2.0"
+        "tightenco/duster": "^2.7"
     },
     "autoload": {
         "psr-4": {
@@ -62,4 +62,4 @@
             ]
         }
     }
-}
+}

phpstan-baseline.neon

@@ -1,17 +1,21 @@
 parameters:
 	ignoreErrors:
 		-
-			message: "#^Call to an undefined method Illuminate\\\\Database\\\\Eloquent\\\\Model\\:\\:getDeletedAtColumn\\(\\)\\.$#"
-			count: 1
+			message: "#^Call to an undefined method Illuminate\\\\Database\\\\Eloquent\\\\Model\\:\\:searchableAs\\(\\)\\.$#"
+			count: 2
 			path: src/PostgresEngine.php
 
 		-
-			message: "#^Call to an undefined method Illuminate\\\\Database\\\\Eloquent\\\\Model\\:\\:searchableAs\\(\\)\\.$#"
-			count: 4
+			message: "#^Call to an undefined method Illuminate\\\\Database\\\\Eloquent\\\\Model\\:\\:toSearchableArray\\(\\)\\.$#"
+			count: 1
+			path: src/PostgresEngine.php
+		-
+			message: "#^Call to an undefined method TModel of Illuminate\\\\Database\\\\Eloquent\\\\Model\\:\\:searchableAs\\(\\)\\.$#"
+			count: 2
 			path: src/PostgresEngine.php
 
 		-
-			message: "#^Call to an undefined method Illuminate\\\\Database\\\\Eloquent\\\\Model\\:\\:toSearchableArray\\(\\)\\.$#"
+			message: "#^Call to an undefined method TModel of Illuminate\\\\Database\\\\Eloquent\\\\Model\\:\\:getDeletedAtColumn\\(\\)\\.$#"
 			count: 1
 			path: src/PostgresEngine.php
 

phpstan.neon

@@ -7,8 +7,6 @@ parameters:
     paths:
         - src/
 
-    checkGenericClassInNonGenericObjectType: false
-
     # Level 9 is the highest level
     level: 9