From 89bf8dc082d39c7b6f65c2cd98b9d1af5497681c Mon Sep 17 00:00:00 2001 From: Vakylenko A Date: Thu, 3 Feb 2022 07:45:44 +0900 Subject: [PATCH 1/2] Update foolz/sphinxql-query-builder --- composer.json | 2 +- src/Eloquent/Query/Grammar.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 4a02801..54276a8 100644 --- a/composer.json +++ b/composer.json @@ -6,7 +6,7 @@ "type": "project", "require": { "php": ">=7.2", - "foolz/sphinxql-query-builder": "^2.0" + "foolz/sphinxql-query-builder": "^3.0" }, "require-dev": { "illuminate/database": "^6.0|^7.0|^8.0", diff --git a/src/Eloquent/Query/Grammar.php b/src/Eloquent/Query/Grammar.php index b6c20ad..b1ca4aa 100644 --- a/src/Eloquent/Query/Grammar.php +++ b/src/Eloquent/Query/Grammar.php @@ -9,7 +9,7 @@ namespace Fobia\Database\SphinxConnection\Eloquent\Query; use Foolz\SphinxQL\Facet; -use Foolz\SphinxQL\Match; +use Foolz\SphinxQL\MatchBuilder; use Illuminate\Database\Query\Builder as BaseBuilder; use Illuminate\Database\Query\Grammars\Grammar as BaseGrammar; @@ -190,10 +190,10 @@ public function compileMatch(Builder $queryBuilder, $matchs) foreach ($matchs as $match) { $pre = ''; if ($match['column'] instanceof \Closure) { - $sub = new Match($sphinxQL); + $sub = new MatchBuilder($sphinxQL); call_user_func($match['column'], $sub); $pre .= $sub->compile()->getCompiled(); - } elseif ($match['column'] instanceof Match) { + } elseif ($match['column'] instanceof MatchBuilder) { $pre .= $match['column']->compile()->getCompiled(); } elseif (empty($match['column'])) { $pre .= ''; From bb09fbcf38652457d3f4d83a8a45b9d125156740 Mon Sep 17 00:00:00 2001 From: Vakylenko A Date: Thu, 3 Feb 2022 07:50:16 +0900 Subject: [PATCH 2/2] Change name --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 54276a8..71e7e47 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "fobia/laravel-sphinx", + "name": "tjslash/laravel-sphinx", "description": "A Laravel query builder for SphinxQL", "keywords": ["laravel", "database", "sphinxql", "sphinx", "SQL", "query builder", "sphinx eloquent"], "license": "MIT",