Elasticsearch 8.7+ X Laravel 6 upgrade

Author: pdphilip

composer.json

@@ -22,10 +22,8 @@
         "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",
+        "php-http/guzzle7-adapter": "^1.0"
     },
     "autoload": {
         "psr-4": {
@@ -38,5 +36,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;
@@ -14,42 +14,42 @@
 
 class Connection extends BaseConnection
 {
-
+    
     protected $client;
     protected $index;
     protected $maxSize;
     protected $indexPrefix;
-
-
+    
+    
     public function __construct(array $config)
     {
         $this->config = $config;
-
+        
         if (!empty($config['index_prefix'])) {
             $this->indexPrefix = $config['index_prefix'];
         }
-
+        
         $this->client = $this->buildConnection();
-
+        
         $this->useDefaultPostProcessor();
-
+        
         $this->useDefaultSchemaGrammar();
-
+        
         $this->useDefaultQueryGrammar();
-
+        
     }
-
+    
     public function getIndexPrefix()
     {
         return $this->indexPrefix;
     }
-
-
+    
+    
     public function getTablePrefix()
     {
         return $this->getIndexPrefix();
     }
-
+    
     public function setIndex($index)
     {
         $this->index = $index;
@@ -58,99 +58,99 @@ public function setIndex($index)
                 $this->index = $this->indexPrefix.'_'.$index;
             }
         }
-
+        
         return $this->getIndex();
     }
-
+    
     public function getSchemaGrammar()
     {
         return new Schema\Grammar($this);
     }
-
+    
     public function getIndex()
     {
         return $this->index;
     }
-
+    
     public function setMaxSize($value)
     {
         $this->maxSize = $value;
     }
-
+    
     public function table($table, $as = null)
     {
         return $this->setIndex($table);
     }
-
-
+    
+    
     /**
      * @inheritdoc
      */
     public function getSchemaBuilder()
     {
         return new Schema\Builder($this);
     }
-
-
+    
+    
     /**
      * @inheritdoc
      */
     public function disconnect()
     {
         unset($this->connection);
     }
-
-
+    
+    
     /**
      * @inheritdoc
      */
     public function getDriverName()
     {
         return 'elasticsearch';
     }
-
+    
     /**
      * @inheritdoc
      */
     protected function getDefaultPostProcessor()
     {
         return new Query\Processor();
     }
-
+    
     /**
      * @inheritdoc
      */
     protected function getDefaultQueryGrammar()
     {
         return new Query\Grammar();
     }
-
+    
     /**
      * @inheritdoc
      */
     protected function getDefaultSchemaGrammar()
     {
         return new Schema\Grammar();
     }
-
-
+    
+    
     //----------------------------------------------------------------------
     // Connection Builder
     //----------------------------------------------------------------------
-
+    
     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,12 +161,12 @@ protected function _httpConnection()
             $cb->setBasicAuthentication($username, $pass)->build();
         }
         if ($certPath) {
-            $cb->setSSLVerification($certPath);
+            $cb->setCABundle($certPath);
         }
-
+        
         return $cb->build();
     }
-
+    
     protected function _cloudConnection()
     {
         $cloudId = config('database.connections.elasticsearch.cloud_id') ?? null;
@@ -177,40 +177,26 @@ protected function _cloudConnection()
         $certPath = config('database.connections.elasticsearch.ssl_cert') ?? null;
         $cb = ClientBuilder::create()->setElasticCloudId($cloudId);
         if ($apiId && $apiKey) {
-            $cb->setApiKey($apiId, $apiKey)->build();
+            $cb->setApiKey($apiKey, $apiId)->build();
         } elseif ($username && $pass) {
             $cb->setBasicAuthentication($username, $pass)->build();
         }
         if ($certPath) {
             $cb->setSSLVerification($certPath);
         }
-
-        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
     //----------------------------------------------------------------------
-
+    
     public function __call($method, $parameters)
     {
         $bridge = new Bridge($this->client, $this->index, $this->maxSize);
-
+        
         return $bridge->{'process'.Str::studly($method)}(...$parameters);
     }
 }