Skip to content

Commit

Permalink
Adjust elasticsearch client version
Browse files Browse the repository at this point in the history
  • Loading branch information
Matthias Richter committed Sep 16, 2024
1 parent 2f8081a commit 050b46e
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
8 changes: 4 additions & 4 deletions Classes/Common/ElasticClientBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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();
Expand Down
5 changes: 3 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
],
"require": {
"typo3/cms-core": "^12",
"elasticsearch/elasticsearch": "^7",
"elasticsearch/elasticsearch": "^8",
"illuminate/collections": "^11"
},
"require-dev": {
Expand Down Expand Up @@ -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"
Expand Down

0 comments on commit 050b46e

Please sign in to comment.