Fixed accidental wrong ES version

Author: pdphilip

composer.json

@@ -22,7 +22,7 @@
         "illuminate/container": "^5.8|^6.0",
         "illuminate/database": "^5.8|^6.0",
         "illuminate/events": "^5.8|^6.0",
-        "elasticsearch/elasticsearch": "8.7"
+        "elasticsearch/elasticsearch": "^7.16"
     },
     "autoload": {
         "psr-4": {

src/Connection.php

@@ -3,7 +3,7 @@
 namespace PDPhilip\Elasticsearch;
 
 use PDPhilip\Elasticsearch\DSL\Bridge;
-use Elastic\Elasticsearch\ClientBuilder;
+use Elasticsearch\ClientBuilder;
 use Illuminate\Database\Connection as BaseConnection;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
@@ -142,15 +142,15 @@ protected function buildConnection()
     {
         $type = config('database.connections.elasticsearch.auth_type') ?? null;
         $type = strtolower($type);
-        if (!in_array($type, ['https', 'cloud',])) {
+        if (!in_array($type, ['http', 'cloud', 'api'])) {
             throw new RuntimeException('Invalid [auth_type] in database config. Must be: http, cloud or api');
         }
 
         return $this->{'_'.$type.'Connection'}();
 
     }
 
-    protected function _httpsConnection()
+    protected function _httpConnection()
     {
         $hosts = config('database.connections.elasticsearch.hosts') ?? null;
         $username = config('database.connections.elasticsearch.username') ?? null;
@@ -161,7 +161,7 @@ protected function _httpsConnection()
             $cb->setBasicAuthentication($username, $pass)->build();
         }
         if ($certPath) {
-            $cb->setCABundle($certPath);
+            $cb->setSSLVerification($certPath);
         }
 
         return $cb->build();
@@ -177,7 +177,7 @@ protected function _cloudConnection()
         $certPath = config('database.connections.elasticsearch.ssl_cert') ?? null;
         $cb = ClientBuilder::create()->setElasticCloudId($cloudId);
         if ($apiId && $apiKey) {
-            $cb->setApiKey($apiKey, $apiId)->build();
+            $cb->setApiKey($apiId, $apiKey)->build();
         } elseif ($username && $pass) {
             $cb->setBasicAuthentication($username, $pass)->build();
         }
@@ -189,6 +189,20 @@ protected function _cloudConnection()
     }
 
 
+    protected function _apiConnection()
+    {
+        $apiId = config('database.connections.elasticsearch.api_id') ?? null;
+        $apiKey = config('database.connections.elasticsearch.api_key') ?? null;
+        $certPath = config('database.connections.elasticsearch.ssl_cert') ?? null;
+        $cb = ClientBuilder::create()->setApiKey($apiId, $apiKey);
+        if ($certPath) {
+            $cb->setSSLVerification($certPath);
+        }
+        
+        return $cb->build();
+    }
+    
+    
     //----------------------------------------------------------------------
     // Dynamic call routing to DSL bridge
     //----------------------------------------------------------------------

src/DSL/Bridge.php

@@ -3,7 +3,7 @@
 namespace PDPhilip\Elasticsearch\DSL;
 
 use Exception;
-use Elastic\Elasticsearch\Client;
+use Elasticsearch\Client;
 
 
 class Bridge
@@ -294,13 +294,13 @@ public function processIncrementMany($wheres, $newValues, $options, $refresh): R
 
     public function processDeleteAll($wheres, $options = []): Results
     {
-        $params = [
-            'index' => $this->index,
-            'id'    => $wheres['_id'],
-        ];
+        
 
         if (isset($wheres['_id'])) {
-            
+            $params = [
+                'index' => $this->index,
+                'id'    => $wheres['_id'],
+            ];
             try {
                 $response = $this->client->delete($params);
                 $response['deleteCount'] = $response['result'] === 'deleted' ? 1 : 0;
@@ -317,7 +317,7 @@ public function processDeleteAll($wheres, $options = []): Results
 
             return $this->_return($response['deleteCount'], $response, $params, $this->_queryTag(__FUNCTION__));
         } catch (Exception $e) {
-            $error = $this->_returnError($e->getMessage(), $e->getCode(), $params, $this->_queryTag(__FUNCTION__));
+            $error = $this->_returnError($e->getMessage(), $e->getCode(), [], $this->_queryTag(__FUNCTION__));
             throw new Exception($error->errorMessage);
         }
 
@@ -370,7 +370,7 @@ public function processIndexMappings($index)
             $response = $this->client->indices()->getMapping($params);
             $result = $this->_return($response, $response, $params, $this->_queryTag(__FUNCTION__));
 
-            return $result->data->asArray();
+            return $result->data;
         } catch (Exception $e) {
             $result = $this->_returnError($e->getMessage(), $e->getCode(), $params, $this->_queryTag(__FUNCTION__));
             throw new Exception($result->errorMessage);
@@ -387,7 +387,7 @@ public function processIndexSettings($index)
             $response = $this->client->indices()->getSettings($params);
             $result = $this->_return($response, $response, $params, $this->_queryTag(__FUNCTION__));
 
-            return $result->data->asArray();
+            return $result->data;
         } catch (Exception $e) {
             $result = $this->_returnError($e->getMessage(), $e->getCode(), $params, $this->_queryTag(__FUNCTION__));
             throw new Exception($result->errorMessage);