Laravel 12.x Compatibility (#88)

Co-authored-by: Pascal Baljet <pascal@protone.media>

Author: laravel-shift

.github/workflows/run-tests.yml

@@ -12,13 +12,15 @@ jobs:
       fail-fast: true
       matrix:
         php: [8.4, 8.3, 8.2]
-        laravel: ["10.*", "11.*"]
+        laravel: ["10.*", "11.*", "12.*"]
         dependency-version: [prefer-lowest, prefer-stable]
         include:
           - laravel: 10.*
-            testbench: 8.*
+            testbench: ^8.32
           - laravel: 11.*
-            testbench: 9.*
+            testbench: ^9.10
+          - laravel: 12.*
+            testbench: ^10.0
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}
 

composer.json

@@ -17,12 +17,12 @@
     ],
     "require": {
         "php": "^8.2|^8.3|^8.4",
-        "illuminate/support": "^10.0|^11.0"
+        "illuminate/support": "^10.48.28|^11.43|^12.0"
     },
     "require-dev": {
         "mockery/mockery": "^1.4.4",
-        "orchestra/testbench": "^8.0|^9.0",
-        "phpunit/phpunit": "^10.4"
+        "orchestra/testbench": "^8.0|^9.0|^10.0",
+        "phpunit/phpunit": "^10.4|^11.5.3"
     },
     "autoload": {
         "psr-4": {

src/Searcher.php

@@ -483,7 +483,7 @@ private function addNestedRelationToQuery(Builder $query, string $nestedRelation
      */
     private function addWhereTermsToQuery(Builder $query, $column)
     {
-        $column = $this->ignoreCase ? (new MySqlGrammar)->wrap($column) : $column;
+        $column = $this->ignoreCase ? (new MySqlGrammar($query->getConnection()))->wrap($column) : $column;
 
         $this->terms->each(function ($term) use ($query, $column) {
             $this->ignoreCase
@@ -510,8 +510,9 @@ private function addRelevanceQueryToBuilder($builder, $modelToSearchThrough)
         }
 
         $expressionsAndBindings = $modelToSearchThrough->getQualifiedColumns()->flatMap(function ($field) use ($modelToSearchThrough) {
-            $prefix = $modelToSearchThrough->getModel()->getConnection()->getTablePrefix();
-            $field = (new MySqlGrammar)->wrap($prefix . $field);
+            $connection = $modelToSearchThrough->getModel()->getConnection();
+            $prefix = $connection->getTablePrefix();
+            $field = (new MySqlGrammar($connection))->wrap($prefix . $field);
 
             return $this->termsWithoutWildcards->map(function ($term) use ($field) {
                 return [