Fixed type issues

matchory · Sep 18, 2020 · efb3e4e · efb3e4e
1 parent 5f686c6
commit efb3e4e
Show file tree

Hide file tree

Showing 16 changed files with 178 additions and 142 deletions.
diff --git a/src/Classes/Search.php b/src/Classes/Search.php
@@ -4,6 +4,8 @@
 
 use Matchory\Elasticsearch\Query;
 
+use function is_callable;
+
 /**
  * Class Search
  *
@@ -60,7 +62,7 @@ public function __construct(
         $this->query = $query;
         $this->queryString = $queryString;
 
-        if (is_callback_function($settings)) {
+        if (is_callable($settings)) {
             $settings($this);
         }
 

diff --git a/src/Collection.php b/src/Collection.php
@@ -23,7 +23,7 @@ class Collection extends BaseCollection
     protected $maxScore;
 
     /**
-     * @var int|null
+     * @var float|null
      */
     protected $duration;
 
@@ -98,7 +98,7 @@ public function getMaxScore(): ?int
         return $this->maxScore;
     }
 
-    public function getDuration(): ?int
+    public function getDuration(): ?float
     {
         return $this->duration;
     }

diff --git a/src/Commands/CreateIndexCommand.php b/src/Commands/CreateIndexCommand.php
@@ -7,6 +7,11 @@
 use Matchory\Elasticsearch\Connection;
 use RuntimeException;
 
+use function app;
+use function array_keys;
+use function config;
+use function is_null;
+
 class CreateIndexCommand extends Command
 {
     /**
@@ -47,11 +52,6 @@ public function handle(): void
     {
         $connectionName = $this->option("connection") ?: config('es.default');
         $connection = $this->es->connection($connectionName);
-
-        if ( ! $connection) {
-            throw new RuntimeException('No connection');
-        }
-
         $client = $connection->raw();
         $indices = ! is_null($this->argument('index'))
             ? [$this->argument('index')]

diff --git a/src/Commands/DropIndexCommand.php b/src/Commands/DropIndexCommand.php
@@ -7,6 +7,11 @@
 use Matchory\Elasticsearch\Connection;
 use RuntimeException;
 
+use function app;
+use function array_keys;
+use function config;
+use function is_null;
+
 class DropIndexCommand extends Command
 {
     /**
@@ -48,11 +53,6 @@ public function handle(): void
     {
         $connectionName = $this->option("connection") ?: config('es.default');
         $connection = $this->es->connection($connectionName);
-
-        if ( ! $connection) {
-            throw new RuntimeException('No connection');
-        }
-
         $force = $this->option("force") ?: 0;
         $client = $connection->raw();
         $indices = ! is_null($this->argument('index'))

diff --git a/src/Commands/ListIndicesCommand.php b/src/Commands/ListIndicesCommand.php
@@ -8,6 +8,14 @@
 use Matchory\Elasticsearch\Connection;
 use RuntimeException;
 
+use function app;
+use function array_key_exists;
+use function config;
+use function count;
+use function explode;
+use function is_array;
+use function trim;
+
 /**
  * Class ListIndicesCommand
  *
@@ -71,11 +79,6 @@ public function handle(): void
     {
         $connectionName = $this->option("connection") ?: config('es.default');
         $connection = $this->es->connection($connectionName);
-
-        if ( ! $connection) {
-            throw new RuntimeException('No connection');
-        }
-
         $indices = $connection->raw()->cat()->indices();
         $indices = is_array($indices)
             ? $this->getIndicesFromArrayResponse($indices)

diff --git a/src/Commands/ReindexCommand.php b/src/Commands/ReindexCommand.php
@@ -7,6 +7,13 @@
 use Matchory\Elasticsearch\Connection;
 use RuntimeException;
 
+use function app;
+use function array_key_exists;
+use function ceil;
+use function config;
+use function count;
+use function json_encode;
+
 /**
  * Class ReindexCommand
  *
@@ -83,7 +90,7 @@ public function handle(): void
         $this->size = (int)$this->option("bulk-size");
         $this->scroll = $this->option("scroll");
 
-        if ($this->size <= 0 || ! is_numeric($this->size)) {
+        if ($this->size <= 0) {
             $this->warn("Invalid size value");
 
             return;
@@ -128,10 +135,6 @@ public function migrate(
     ): void {
         $connection = $this->es->connection($this->connection);
 
-        if ( ! $connection) {
-            throw new RuntimeException('No connection');
-        }
-
         if ($page === 1) {
             $pages = (int)ceil(
                 $connection

diff --git a/src/Commands/UpdateIndexCommand.php b/src/Commands/UpdateIndexCommand.php
@@ -7,6 +7,11 @@
 use Matchory\Elasticsearch\Connection;
 use RuntimeException;
 
+use function app;
+use function array_keys;
+use function config;
+use function is_null;
+
 class UpdateIndexCommand extends Command
 {
     /**
@@ -46,11 +51,6 @@ public function handle(): void
     {
         $connectionName = $this->option("connection") ?: config('es.default');
         $connection = $this->es->connection($connectionName);
-
-        if ( ! $connection) {
-            throw new RuntimeException('No connection');
-        }
-
         $client = $connection->raw();
         $indices = ! is_null($this->argument('index'))
             ? [$this->argument('index')]

diff --git a/src/Connection.php b/src/Connection.php
@@ -11,6 +11,7 @@
 use Monolog\Logger;
 use RuntimeException;
 
+use function app;
 use function array_key_exists;
 use function call_user_func_array;
 use function method_exists;

diff --git a/src/ElasticsearchServiceProvider.php b/src/ElasticsearchServiceProvider.php
@@ -16,7 +16,9 @@
 use RuntimeException;
 
 use function class_exists;
+use function config;
 use function config_path;
+use function method_exists;
 use function str_starts_with;
 use function version_compare;
 
@@ -46,7 +48,10 @@ public function boot(): void
 
         // Auto configuration with lumen framework.
 
-        if (Str::contains($this->app->version(), 'Lumen')) {
+        if (
+            method_exists($this->app, 'configure') &&
+            Str::contains($this->app->version(), 'Lumen')
+        ) {
             $this->app->configure('es');
         }
 

diff --git a/src/Index.php b/src/Index.php
@@ -9,7 +9,6 @@
 use function count;
 use function func_get_args;
 use function is_array;
-use function is_callback_function;
 
 /**
  * Class Index
@@ -42,7 +41,7 @@ class Index
     /**
      * Index create callback
      *
-     * @var null
+     * @var callable|null
      */
     public $callback;
 
@@ -63,7 +62,7 @@ class Index
     /**
      * Index mapping
      *
-     * @var int
+     * @var array
      */
     public $mappings = [];
 
@@ -152,10 +151,7 @@ public function exists(): bool
     public function create(): array
     {
         $callback = $this->callback;
-
-        if (is_callback_function($callback)) {
-            $callback($this);
-        }
+        $callback($this);
 
         $params = [
             'index' => $this->name,

diff --git a/src/Model.php b/src/Model.php
@@ -1,13 +1,18 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Matchory\Elasticsearch;
 
 use Illuminate\Support\Str;
 use InvalidArgumentException;
+use JsonException;
 use RuntimeException;
 
+use function app;
 use function array_diff;
 use function array_key_exists;
+use function config;
 use function in_array;
 use function json_encode;
 use function method_exists;
@@ -118,7 +123,7 @@ public function __construct($attributes = [], $exists = false)
     /**
      * Get all model records
      *
-     * @return mixed
+     * @return Collection
      * @throws InvalidArgumentException
      * @throws RuntimeException
      */
@@ -363,16 +368,22 @@ public function toArray(): array
      * @param int $options
      *
      * @return string
+     * @throws JsonException
      */
     public function toJson($options = 0): string
     {
-        return json_encode($this->toArray(), $options);
+        return json_encode(
+            $this->toArray(),
+            JSON_THROW_ON_ERROR | $options
+        );
     }
 
     /**
      * Delete model record
      *
      * @return $this
+     * @throws InvalidArgumentException
+     * @throws RuntimeException
      */
     public function delete(): ?self
     {
@@ -393,9 +404,11 @@ public function delete(): ?self
     /**
      * Save data to model
      *
-     * @return string
+     * @return $this
+     * @throws InvalidArgumentException
+     * @throws RuntimeException
      */
-    public function save(): string
+    public function save(): self
     {
         $fields = array_diff($this->attributes, [
             '_index',
@@ -411,29 +424,30 @@ public function save(): string
                 ->newQuery()
                 ->id($this->getID())
                 ->update($fields);
+
+            return $this;
+        }
+
+        // Check if model key exists in items
+        if (array_key_exists('_id', $this->attributes)) {
+            $created = $this
+                ->newQuery()
+                ->id($this->attributes['_id'])
+                ->insert($fields);
+            $this->_id = $this->attributes['_id'];
         } else {
-            // Check if model key exists in items
-
-            if (array_key_exists('_id', $this->attributes)) {
-                $created = $this
-                    ->newQuery()
-                    ->id($this->attributes['_id'])
-                    ->insert($fields);
-                $this->_id = $this->attributes['_id'];
-            } else {
-                $created = $this->newQuery()->insert($fields);
-                $this->_id = $created->_id;
-            }
+            $created = $this->newQuery()->insert($fields);
+            $this->_id = $created->_id;
+        }
 
-            $this->setConnection($this->getConnection());
-            $this->setIndex($created->_index);
+        $this->setConnection($this->getConnection());
+        $this->setIndex($created->_index);
 
-            // Match earlier versions
-            $this->_index = $created->_index;
-            $this->_type = $this->type;
+        // Match earlier versions
+        $this->_index = $created->_index;
+        $this->_type = $this->type;
 
-            $this->exists = true;
-        }
+        $this->exists = true;
 
         return $this;
     }
@@ -465,6 +479,8 @@ public function getID()
      * @param array  $parameters
      *
      * @return mixed
+     * @throws InvalidArgumentException
+     * @throws RuntimeException
      */
     public function __call(string $method, array $parameters)
     {