¨4.0.1¨

Modules/Support/Search/Builder.php

@@ -2,12 +2,15 @@
 
 namespace Modules\Support\Search;
 
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Collection;
+
 class Builder
 {
     /**
      * The model instance.
      *
-     * @var \Illuminate\Database\Eloquent\Model
+     * @var Model
      */
     private $model;
 
@@ -25,11 +28,13 @@ class Builder
      */
     private $keys = [];
 
+
     /**
      * Create a new instance.
      *
-     * @param \Illuminate\Database\Eloquent\Model $model
+     * @param Model $model
      * @param \Laravel\Scout\Builder $scoutBuilder
+     *
      * @return void
      */
     public function __construct($model, $scoutBuilder)
@@ -38,6 +43,7 @@ class Builder
         $this->scoutBuilder = $scoutBuilder;
     }
 
+
     /**
      * Apply filter to the search results.
      *
@@ -48,6 +54,7 @@ class Builder
         return $filter->apply($this->query());
     }
 
+
     /**
      * Get the query builder of the model.
      *
@@ -64,6 +71,7 @@ class Builder
         return $query;
     }
 
+
     /**
      * Get keys of search result.
      *
@@ -78,6 +86,18 @@ class Builder
         return $this->keys;
     }
 
+
+    /**
+     * Get the results of the search.
+     *
+     * @return Collection
+     */
+    public function get()
+    {
+        return $this->query()->get();
+    }
+
+
     /**
      * Determine if query should order by relevance.
      *
@@ -85,13 +105,15 @@ class Builder
      */
     private function shouldOrderByRelevance()
     {
-        return ! request()->has('sort') || request('sort') === 'relevance';
+        return !request()->has('sort') || request('sort') === 'relevance';
     }
 
+
     /**
      * Order query by relevance.
      *
      * @param \Illuminate\Database\Query\Builder $query
+     *
      * @return void
      */
     private function orderByRelevance($query)
@@ -102,14 +124,4 @@ class Builder
             $query->orderByRaw("FIELD({$this->model->getQualifiedKeyName()}, {$ids->implode(',')})");
         }
     }
-
-    /**
-     * Get the results of the search.
-     *
-     * @return \Illuminate\Database\Eloquent\Collection
-     */
-    public function get()
-    {
-        return $this->query()->get();
-    }
 }

Modules/Support/Search/MySqlSearchEngine.php

@@ -5,6 +5,9 @@ namespace Modules\Support\Search;
 use Laravel\Scout\Builder;
 use Laravel\Scout\Engines\Engine;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Collection;
+use Illuminate\Support\LazyCollection;
+use Illuminate\Database\Eloquent\Model;
 
 class MySqlSearchEngine extends Engine
 {
@@ -13,26 +16,49 @@ class MySqlSearchEngine extends Engine
         //
     }
 
+
     public function delete($models)
     {
         //
     }
 
+
     /**
      * Pluck and return the primary keys of the given results.
      *
      * @param mixed $results
-     * @return \Illuminate\Support\Collection
+     *
+     * @return Collection
      */
     public function mapIds($results)
     {
         return $results['results'];
     }
 
+
     /**
      * Perform the given search on the engine.
      *
-     * @param \Laravel\Scout\Builder $builder
+     * @param \Modules\Support\Search\Builder $builder
+     * @param int $perPage
+     * @param int $page
+     *
+     * @return mixed
+     */
+    public function paginate(Builder $builder, $perPage, $page)
+    {
+        $builder->limit = $perPage;
+        $builder->offset = ($perPage * $page) - $perPage;
+
+        return $this->search($builder);
+    }
+
+
+    /**
+     * Perform the given search on the engine.
+     *
+     * @param Builder $builder
+     *
      * @return mixed
      */
     public function search(Builder $builder)
@@ -51,7 +77,7 @@ class MySqlSearchEngine extends Engine
 
         $result['count'] = $query->count();
 
-        if (property_exists($builder, 'orders') && ! empty($builder->orders)) {
+        if (property_exists($builder, 'orders') && !empty($builder->orders)) {
             foreach ($builder->orders as $order) {
                 $query->orderBy($order['column'], $order['direction']);
             }
@@ -70,10 +96,94 @@ class MySqlSearchEngine extends Engine
         return $result;
     }
 
+
+    /**
+     * Map the given results to instances of the given model.
+     *
+     * @param Laravel\Scout\Builder $builder
+     * @param Model $model
+     *
+     * @return Collection
+     */
+    public function map(Builder $builder, $results, $model)
+    {
+        return $results['results'];
+    }
+
+
+    /**
+     * Map the given results to instances of the given model via a lazy collection.
+     *
+     * @param Builder $builder
+     * @param mixed $results
+     * @param Model $model
+     *
+     * @return LazyCollection
+     */
+    public function lazyMap(Builder $builder, $results, $model)
+    {
+        //
+    }
+
+
+    /**
+     * Get the totalPrice count from a raw result returned by the engine.
+     *
+     * @param mixed $results
+     *
+     * @return int
+     */
+    public function getTotalCount($results)
+    {
+        return $results['count'];
+    }
+
+
+    /**
+     * Flush all the model's records from the engine.
+     *
+     * @param Model $model
+     *
+     * @return void
+     */
+    public function flush($model)
+    {
+        //
+    }
+
+
+    /**
+     * Create a search index.
+     *
+     * @param string $name
+     * @param array $options
+     *
+     * @return mixed
+     */
+    public function createIndex($name, array $options = [])
+    {
+        //
+    }
+
+
+    /**
+     * Delete a search index.
+     *
+     * @param string $name
+     *
+     * @return mixed
+     */
+    public function deleteIndex($name)
+    {
+        //
+    }
+
+
     /**
      * Get the search query.
      *
-     * @param \Laravel\Scout\Builder $builder
+     * @param Builder $builder
+     *
      * @return string
      */
     private function getSearchKeyword($builder)
@@ -84,90 +194,4 @@ class MySqlSearchEngine extends Engine
 
         return '+' . preg_replace('/[-+~*()><@"]/', ' ', $builder->query) . '*';
     }
-
-    /**
-     * Perform the given search on the engine.
-     *
-     * @param \Modules\Support\Search\Builder $builder
-     * @param int $perPage
-     * @param int $page
-     * @return mixed
-     */
-    public function paginate(Builder $builder, $perPage, $page)
-    {
-        $builder->limit = $perPage;
-        $builder->offset = ($perPage * $page) - $perPage;
-
-        return $this->search($builder);
-    }
-
-    /**
-     * Map the given results to instances of the given model.
-     *
-     * @param Laravel\Scout\Builder $builder
-     * @param \Illuminate\Database\Eloquent\Model $model
-     * @return \Illuminate\Support\Collection
-     */
-    public function map(Builder $builder, $results, $model)
-    {
-        return $results['results'];
-    }
-
-    /**
-     * Map the given results to instances of the given model via a lazy collection.
-     *
-     * @param \Laravel\Scout\Builder $builder
-     * @param mixed $results
-     * @param \Illuminate\Database\Eloquent\Model $model
-     * @return \Illuminate\Support\LazyCollection
-     */
-    public function lazyMap(Builder $builder, $results, $model)
-    {
-        //
-    }
-
-    /**
-     * Get the total count from a raw result returned by the engine.
-     *
-     * @param mixed $results
-     * @return int
-     */
-    public function getTotalCount($results)
-    {
-        return $results['count'];
-    }
-
-    /**
-     * Flush all of the model's records from the engine.
-     *
-     * @param  \Illuminate\Database\Eloquent\Model  $model
-     * @return void
-     */
-    public function flush($model)
-    {
-        //
-    }
-
-    /**
-     * Create a search index.
-     *
-     * @param string $name
-     * @param array $options
-     * @return mixed
-     */
-    public function createIndex($name, array $options = [])
-    {
-        //
-    }
-
-    /**
-     * Delete a search index.
-     *
-     * @param string $name
-     * @return mixed
-     */
-    public function deleteIndex($name)
-    {
-        //
-    }
 }

Modules/Support/Search/Searchable.php

@@ -15,9 +15,10 @@ trait Searchable
      *
      * @param string $query
      * @param Closure $callback
-     * @return \Modules\Support\Search\Builder
+     *
+     * @return Builder
      */
-    public function search($query, $callback = null)
+    public function search($query, $callback = null): Builder
     {
         $scoutBuilder = $this->scoutSearch($query, $callback);