Scrutinizer Tweaks

Added a lot of "/** @scrutinizer ignore-type */" so suppress type mismatches.

Author: devNoiseConsulting

src/PostgresEngine.php

@@ -7,6 +7,7 @@
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Arr;
+use Illuminate\Support\LazyCollection;
 use Laravel\Scout\Builder;
 use Laravel\Scout\Engines\Engine;
 use ScoutEngines\Postgres\TsQuery\PhraseToTsQuery;
@@ -76,14 +77,14 @@ public function update($models)
      * Perform update of the given model.
      *
      * @param \Illuminate\Database\Eloquent\Model $model
-     * @return bool
+     * @return bool|int
      */
     protected function performUpdate(Model $model)
     {
-        $data = collect([$this->getIndexColumn($model) => $this->toVector($model)]);
+        $data = collect(/** @scrutinizer ignore-type */ [$this->getIndexColumn($model) => $this->toVector($model)]);
 
         $query = $this->database
-            ->table($model->searchableAs())
+            ->table(/** @scrutinizer ignore-type */ $model->searchableAs())
             ->where($model->getKeyName(), '=', $model->getKey());
 
         if (method_exists($model, 'searchableAdditionalArray')) {
@@ -109,12 +110,12 @@ protected function performUpdate(Model $model)
      */
     protected function toVector(Model $model)
     {
-        $fields = collect($model->toSearchableArray())
+        $fields = collect(/** @scrutinizer ignore-type */ $model->toSearchableArray())
             ->map(function ($value) {
                 return $value === null ? '' : $value;
             });
 
-        $bindings = collect([]);
+        $bindings = collect(/** @scrutinizer ignore-type */ []);
 
         // The choices of parser, dictionaries and which types of tokens to index are determined
         // by the selected text search configuration which can be set globally in config/scout.php
@@ -123,7 +124,7 @@ protected function toVector(Model $model)
         $vector = 'to_tsvector(COALESCE(?, get_current_ts_config()), ?)';
 
         $select = $fields->map(function ($value, $key) use ($model, $vector, $bindings) {
-            $bindings->push($this->searchConfig($model) ?: null)
+            $bindings->push(/** @scrutinizer ignore-type */ $this->searchConfig($model) ?: null)
                 ->push($value);
 
             // Set a field weight if it was specified in Model's searchableOptions()
@@ -225,7 +226,7 @@ protected function performSearch(Builder $builder, $perPage = 0, $page = 1)
 
         // Build the SQL query
         $query = $this->database
-            ->table($builder->index ?: $builder->model->searchableAs())
+            ->table(/** @scrutinizer ignore-type */ $builder->index ?: $builder->model->searchableAs())
             ->select($builder->model->getKeyName())
             ->selectRaw("{$this->rankingExpression($builder->model, $indexColumn)} AS rank")
             ->selectRaw('COUNT(*) OVER () AS total_count')
@@ -240,7 +241,7 @@ protected function performSearch(Builder $builder, $perPage = 0, $page = 1)
         if (! $this->isExternalIndex($builder->model)) {
             // and the model uses soft deletes we need to exclude trashed rows
             if ($this->usesSoftDeletes($builder->model)) {
-                $query->whereNull($builder->model->getDeletedAtColumn());
+                $query->whereNull(/** @scrutinizer ignore-type */ $builder->model->getDeletedAtColumn());
             }
         }
 
@@ -407,7 +408,7 @@ protected function connect()
      */
     protected function rankingExpression(Model $model, $indexColumn)
     {
-        $args = collect([$indexColumn, '"tsquery"']);
+        $args = collect(/** @scrutinizer ignore-type */ [$indexColumn, '"tsquery"']);
 
         if ($weights = $this->rankWeights($model)) {
             $args->prepend("'$weights'");
@@ -426,15 +427,15 @@ protected function rankingExpression(Model $model, $indexColumn)
      * Get rank function.
      *
      * @param \Illuminate\Database\Eloquent\Model $model
-     * @return int
+     * @return string
      */
     protected function rankFunction(Model $model)
     {
         $default = 'ts_rank';
 
         $function = $this->option($model, 'rank.function', $default);
 
-        return collect(['ts_rank', 'ts_rank_cd'])->contains($function) ? $function : $default;
+        return collect(/** @scrutinizer ignore-type */ ['ts_rank', 'ts_rank_cd'])->contains($function) ? $function : $default;
     }
 
     /**
@@ -448,7 +449,7 @@ protected function rankFieldWeightLabel(Model $model, $field)
     {
         $label = $this->option($model, "rank.fields.$field");
 
-        return collect(['A', 'B', 'C', 'D'])
+        return collect(/** @scrutinizer ignore-type */ ['A', 'B', 'C', 'D'])
             ->contains($label) ? $label : '';
     }
 
@@ -535,7 +536,7 @@ protected function option(Model $model, $key, $default = null)
 
         $options = $model->searchableOptions() ?: [];
 
-        return Arr::get($options, $key, $default);
+        return Arr::get(/** @scrutinizer ignore-type */ $options, $key, $default);
     }
 
     /**
@@ -595,7 +596,7 @@ public function flush($model)
         $indexColumn = $this->getIndexColumn($model);
 
         $this->database
-            ->table($model->searchableAs())
+            ->table(/** @scrutinizer ignore-type */ $model->searchableAs())
             ->update([$indexColumn => null]);
     }
 }