Several upgrades and bug fixes

Author: pdphilip

composer.json

@@ -1,45 +1,45 @@
 {
-    "name": "pdphilip/elasticsearch",
-    "description": "An Elasticsearch implementation of Laravel's Eloquent ORM",
-    "keywords": [
-        "laravel",
-        "eloquent",
-        "elasticsearch",
-        "elastic",
-        "database",
-        "model"
-    ],
-    "homepage": "https://github.com/pdphilip/laravel-elasticsearch",
-    "authors": [
-        {
-            "name": "David Philip",
-            "homepage": "https://github.com/pdphilip"
-        }
-    ],
-    "license": "MIT",
-    "require": {
-        "illuminate/support": "^5.8|^6.0",
-        "illuminate/container": "^5.8|^6.0",
-        "illuminate/database": "^5.8|^6.0",
-        "illuminate/events": "^5.8|^6.0",
-        "elasticsearch/elasticsearch": "8.7",
-        "php-http/guzzle7-adapter": "^1.0"
-    },
-    "autoload": {
-        "psr-4": {
-            "PDPhilip\\Elasticsearch\\": "src/"
-        }
-    },
-    "extra": {
-        "laravel": {
-            "providers": [
-                "PDPhilip\\Elasticsearch\\ElasticServiceProvider"
-            ]
-        }
-    },
-    "config": {
-        "allow-plugins": {
-            "php-http/discovery": true
-        }
+  "name": "pdphilip/elasticsearch",
+  "description": "An Elasticsearch implementation of Laravel's Eloquent ORM",
+  "keywords": [
+    "laravel",
+    "eloquent",
+    "elasticsearch",
+    "elastic",
+    "database",
+    "model"
+  ],
+  "homepage": "https://github.com/pdphilip/laravel-elasticsearch",
+  "authors": [
+    {
+      "name": "David Philip",
+      "homepage": "https://github.com/pdphilip"
     }
+  ],
+  "license": "MIT",
+  "require": {
+    "illuminate/support": "^5.8|^6.0",
+    "illuminate/container": "^5.8|^6.0",
+    "illuminate/database": "^5.8|^6.0",
+    "illuminate/events": "^5.8|^6.0",
+    "elasticsearch/elasticsearch": "8.10",
+    "php-http/guzzle7-adapter": "^1.0"
+  },
+  "autoload": {
+    "psr-4": {
+      "PDPhilip\\Elasticsearch\\": "src/"
+    }
+  },
+  "extra": {
+    "laravel": {
+      "providers": [
+        "PDPhilip\\Elasticsearch\\ElasticServiceProvider"
+      ]
+    }
+  },
+  "config": {
+    "allow-plugins": {
+      "php-http/discovery": true
+    }
+  }
 }

src/Connection.php

@@ -2,13 +2,11 @@
 
 namespace PDPhilip\Elasticsearch;
 
+use Elastic\Elasticsearch\Client;
 use PDPhilip\Elasticsearch\DSL\Bridge;
 use Elastic\Elasticsearch\ClientBuilder;
 use Illuminate\Database\Connection as BaseConnection;
-use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
-use InvalidArgumentException;
-use phpDocumentor\Reflection\Types\Scalar;
 use RuntimeException;
 
 
@@ -39,18 +37,23 @@ public function __construct(array $config)
 
     }
 
-    public function getIndexPrefix()
+    public function getIndexPrefix(): string
     {
         return $this->indexPrefix;
     }
 
+    public function setIndexPrefix($newPrefix): void
+    {
+        $this->indexPrefix = $newPrefix;
+    }
 
-    public function getTablePrefix()
+    
+    public function getTablePrefix(): string
     {
         return $this->getIndexPrefix();
     }
 
-    public function setIndex($index)
+    public function setIndex($index): string
     {
         $this->index = $index;
         if ($this->indexPrefix) {
@@ -67,7 +70,7 @@ public function getSchemaGrammar()
         return new Schema\Grammar($this);
     }
 
-    public function getIndex()
+    public function getIndex(): string
     {
         return $this->index;
     }
@@ -77,12 +80,14 @@ public function setMaxSize($value)
         $this->maxSize = $value;
     }
 
+    
     public function table($table, $as = null)
     {
-        return $this->setIndex($table);
+        $query = new Query\Builder($this, new Query\Processor());
+        
+        return $query->from($table);
     }
 
-    
     /**
      * @inheritdoc
      */
@@ -104,7 +109,7 @@ public function disconnect()
     /**
      * @inheritdoc
      */
-    public function getDriverName()
+    public function getDriverName(): string
     {
         return 'elasticsearch';
     }
@@ -138,7 +143,7 @@ protected function getDefaultSchemaGrammar()
     // Connection Builder
     //----------------------------------------------------------------------
 
-    protected function buildConnection()
+    protected function buildConnection(): Client
     {
         $type = config('database.connections.elasticsearch.auth_type') ?? null;
         $type = strtolower($type);
@@ -150,7 +155,7 @@ protected function buildConnection()
 
     }
 
-    protected function _httpConnection()
+    protected function _httpConnection(): Client
     {
         $hosts = config('database.connections.elasticsearch.hosts') ?? null;
         $username = config('database.connections.elasticsearch.username') ?? null;
@@ -167,7 +172,7 @@ protected function _httpConnection()
         return $cb->build();
     }
 
-    protected function _cloudConnection()
+    protected function _cloudConnection(): Client
     {
         $cloudId = config('database.connections.elasticsearch.cloud_id') ?? null;
         $username = config('database.connections.elasticsearch.username') ?? null;
@@ -195,6 +200,10 @@ protected function _cloudConnection()
 
     public function __call($method, $parameters)
     {
+        if (!$this->index) {
+            $this->index = $this->indexPrefix.'*';
+        }
+        
         $bridge = new Bridge($this->client, $this->index, $this->maxSize);
 
         return $bridge->{'process'.Str::studly($method)}(...$parameters);