connector upgrade

Author: pdphilip

composer.json

@@ -23,14 +23,24 @@
     "illuminate/container": "^8.0",
     "illuminate/database": "^8.0",
     "illuminate/events": "^8.0",
-    "elasticsearch/elasticsearch": "8.10"
+    "elasticsearch/elasticsearch": "^8.10"
+  },
+  "require-dev": {
+    "phpunit/phpunit": "^9.5.8",
+    "orchestra/testbench": "^7.19",
+    "mockery/mockery": "^1.3.1",
+    "doctrine/dbal": "^2.13.3|^3.1.4"
   },
-  "require-dev": {},
   "autoload": {
     "psr-4": {
       "PDPhilip\\Elasticsearch\\": "src/"
     }
   },
+  "autoload-dev": {
+    "psr-4": {
+      "PDPhilip\\Elasticsearch\\Tests\\": "tests/"
+    }
+  },
   "extra": {
     "laravel": {
       "providers": [

src/Connection.php

@@ -17,11 +17,11 @@ class Connection extends BaseConnection
     protected $index;
     protected $maxSize;
     protected $indexPrefix;
-    protected $retires = null; //null will use default
+    protected $allowIdSort = false;
     protected $sslVerification = true;
-    protected $elasticMetaHeader = true;
+    protected $retires = null; //null will use default
+    protected $elasticMetaHeader = null;
     protected $rebuild = false;
-    protected $allowIdSort = false;
 
     public function __construct(array $config)
     {
@@ -44,21 +44,21 @@ public function setOptions($config)
         if (!empty($config['index_prefix'])) {
             $this->indexPrefix = $config['index_prefix'];
         }
-        if (!empty($config['options']['allow_id_sort'])) {
+        if (isset($config['options']['allow_id_sort'])) {
             $this->allowIdSort = $config['options']['allow_id_sort'];
         }
-        if (!empty($config['options']['ssl_verification'])) {
+        if (isset($config['options']['ssl_verification'])) {
             $this->sslVerification = $config['options']['ssl_verification'];
         }
-        if (!empty($config['options']['retires'])) {
+        if (isset($config['options']['retires'])) {
             $this->retires = $config['options']['retires'];
         }
-        if (!empty($config['options']['meta_header'])) {
+        if (isset($config['options']['meta_header'])) {
             $this->elasticMetaHeader = $config['options']['meta_header'];
         }
     }
 
-    public function getIndexPrefix(): string|null
+    public function getIndexPrefix()
     {
         return $this->indexPrefix;
     }
@@ -69,7 +69,7 @@ public function setIndexPrefix($newPrefix): void
     }
 
 
-    public function getTablePrefix(): string|null
+    public function getTablePrefix()
     {
         return $this->getIndexPrefix();
     }
@@ -239,8 +239,11 @@ protected function _cloudConnection(): Client
     protected function _builderOptions($cb)
     {
         $cb->setSSLVerification($this->sslVerification);
-        $cb->setElasticMetaHeader($this->elasticMetaHeader);
-        if ($this->retires) {
+        if (isset($this->elasticMetaHeader)) {
+            $cb->setElasticMetaHeader($this->elasticMetaHeader);
+        }
+        
+        if (isset($this->retires)) {
             $cb->setRetries($this->retires);
         }
         $caBundle = config('database.connections.elasticsearch.ssl_cert') ?? null;