Move to permanent branch for laravel 6 and ES 7.17

Author: pdphilip

composer.json

@@ -22,10 +22,7 @@
         "illuminate/container": "^5.8|^6.0",
         "illuminate/database": "^5.8|^6.0",
         "illuminate/events": "^5.8|^6.0",
-        "elasticsearch/elasticsearch": "^7.16",
-        "ongr/elasticsearch-dsl": "^7.2"
-    },
-    "require-dev": {
+        "elasticsearch/elasticsearch": "8.7"
     },
     "autoload": {
         "psr-4": {
@@ -38,5 +35,10 @@
                 "PDPhilip\\Elasticsearch\\ElasticServiceProvider"
             ]
         }
+    },
+    "config": {
+        "allow-plugins": {
+            "php-http/discovery": true
+        }
     }
 }

src/Connection.php

@@ -3,7 +3,7 @@
 namespace PDPhilip\Elasticsearch;
 
 use PDPhilip\Elasticsearch\DSL\Bridge;
-use Elasticsearch\ClientBuilder;
+use Elastic\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, ['http', 'cloud', 'api'])) {
+        if (!in_array($type, ['https', 'cloud',])) {
             throw new RuntimeException('Invalid [auth_type] in database config. Must be: http, cloud or api');
         }
 
         return $this->{'_'.$type.'Connection'}();
 
     }
 
-    protected function _httpConnection()
+    protected function _httpsConnection()
     {
         $hosts = config('database.connections.elasticsearch.hosts') ?? null;
         $username = config('database.connections.elasticsearch.username') ?? null;
@@ -161,7 +161,7 @@ protected function _httpConnection()
             $cb->setBasicAuthentication($username, $pass)->build();
         }
         if ($certPath) {
-            $cb->setSSLVerification($certPath);
+            $cb->setCABundle($certPath);
         }
 
         return $cb->build();
@@ -187,21 +187,7 @@ protected function _cloudConnection()
 
         return $cb->build();
     }
-
-
-    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