From 050b46e1f1c56bbb3066c70c8c23cc2e99e9d7bd Mon Sep 17 00:00:00 2001
From: Matthias Richter <matthias.richter@slub-dresden.de>
Date: Mon, 16 Sep 2024 17:34:12 +0200
Subject: [PATCH] Adjust elasticsearch client version

---
 Classes/Common/ElasticClientBuilder.php | 8 ++++----
 composer.json                           | 5 +++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Classes/Common/ElasticClientBuilder.php b/Classes/Common/ElasticClientBuilder.php
index 7633faf..c2ab8a7 100644
--- a/Classes/Common/ElasticClientBuilder.php
+++ b/Classes/Common/ElasticClientBuilder.php
@@ -12,8 +12,8 @@
  */
 
 use Illuminate\Support\Collection;
-use Elasticsearch\Client;
-use Elasticsearch\ClientBuilder;
+use Elastic\Elasticsearch\Client;
+use Elastic\Elasticsearch\ClientBuilder;
 use TYPO3\CMS\Core\Configuration\ExtensionConfiguration;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
@@ -74,12 +74,12 @@ private function setPassword(): void
 		if ($this->extConf->get('elasticPwdFileName') == '') {
             $this->password = '';
             return;
-		} 
+		}
 
         $passwordFilePath = $this->extConf->
             only('elasticCredentialsFilePath', 'elasticPwdFileName')->
             implode('/');
-        $passwordFile = fopen($passwordFilePath, 'r') or 
+        $passwordFile = fopen($passwordFilePath, 'r') or
             die($passwordFilePath . ' not found. Check your extension\'s configuration');
 
         $this->password = $passwordFile->getContents();
diff --git a/composer.json b/composer.json
index 0109403..28d7433 100644
--- a/composer.json
+++ b/composer.json
@@ -7,7 +7,7 @@
     ],
     "require": {
         "typo3/cms-core": "^12",
-        "elasticsearch/elasticsearch": "^7",
+        "elasticsearch/elasticsearch": "^8",
         "illuminate/collections": "^11"
     },
     "require-dev": {
@@ -42,7 +42,8 @@
     "config": {
         "allow-plugins": {
             "typo3/class-alias-loader": true,
-            "typo3/cms-composer-installers": true
+            "typo3/cms-composer-installers": true,
+            "php-http/discovery": true
         },
         "vendor-dir": "vendor",
         "bin-dir": "bin"