From 62d28bb49bd42dc1e95c5e0c567b0091664d9e12 Mon Sep 17 00:00:00 2001 From: Shift Date: Wed, 19 Feb 2025 04:54:56 +0000 Subject: [PATCH 1/4] Bump dependencies for Laravel 12 --- composer.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index d42fc0a..c34d70f 100644 --- a/composer.json +++ b/composer.json @@ -17,12 +17,12 @@ ], "require": { "php": "^8.2|^8.3|^8.4", - "illuminate/support": "^10.0|^11.0" + "illuminate/support": "^10.0|^11.0|^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": { @@ -50,4 +50,4 @@ ] } } -} \ No newline at end of file +} From a1d77ae82659df9ac6f5f0cb5b476ad81f782316 Mon Sep 17 00:00:00 2001 From: Shift Date: Wed, 19 Feb 2025 04:54:56 +0000 Subject: [PATCH 2/4] Update GitHub Actions for Laravel 12 --- .github/workflows/run-tests.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 2ad0120..2cc0562 100644 --- a/.github/workflows/run-tests.yml +++ b/.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.* - laravel: 11.* testbench: 9.* + - laravel: 12.* + testbench: 10.* name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} From afab6fd8bbd06f8c4464f5521b4d7febf7da3547 Mon Sep 17 00:00:00 2001 From: Pascal Baljet Date: Wed, 19 Feb 2025 14:01:03 +0100 Subject: [PATCH 3/4] Bump deps --- .github/workflows/run-tests.yml | 8 ++++---- composer.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 2cc0562..b2ba4d2 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -12,15 +12,15 @@ jobs: fail-fast: true matrix: php: [8.4, 8.3, 8.2] - laravel: ['10.*', '11.*', '12.*'] + 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.* + testbench: ^10.0 name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} diff --git a/composer.json b/composer.json index c34d70f..d21d91f 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ ], "require": { "php": "^8.2|^8.3|^8.4", - "illuminate/support": "^10.0|^11.0|^12.0" + "illuminate/support": "^10.48.28|^11.43|^12.0" }, "require-dev": { "mockery/mockery": "^1.4.4", @@ -50,4 +50,4 @@ ] } } -} +} \ No newline at end of file From 05b5bea44a366a9bfaeb95096a044cc04038c450 Mon Sep 17 00:00:00 2001 From: Pascal Baljet Date: Wed, 19 Feb 2025 14:06:40 +0100 Subject: [PATCH 4/4] Update Searcher.php --- src/Searcher.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Searcher.php b/src/Searcher.php index b159011..1d3d2bd 100644 --- a/src/Searcher.php +++ b/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 [