Skip to content

Commit 0fcbefb

Browse files
darthf1Frank Verschuren
and
Frank Verschuren
authored
feat(elasticsearch): re-introduce v7 support (#6827)
* feat(elasticsearch): re-introduce v7 support * feat(elasticsearch): re-introduce v7 support * feat(elasticsearch): re-introduce v7 support * feat(elasticsearch): re-introduce v7 support * fix: use global namespace * style: apply cs * fix: ignore es7/8 related phpstan issues --------- Co-authored-by: Frank Verschuren <[email protected]> Co-authored-by: darthf1 <[email protected]>
1 parent fe6e3a8 commit 0fcbefb

File tree

3 files changed

+13
-2
lines changed

3 files changed

+13
-2
lines changed

Bundle/DependencyInjection/ApiPlatformExtension.php

+5-1
Original file line numberDiff line numberDiff line change
@@ -812,7 +812,11 @@ private function registerElasticsearchConfiguration(ContainerBuilder $container,
812812
return;
813813
}
814814

815-
$clientClass = class_exists(\Elasticsearch\Client::class) ? \Elasticsearch\Client::class : \Elastic\Elasticsearch\Client::class;
815+
$clientClass = !class_exists(\Elasticsearch\Client::class)
816+
// ES v7
817+
? \Elastic\Elasticsearch\Client::class
818+
// ES v8 and up
819+
: \Elasticsearch\Client::class;
816820

817821
$clientDefinition = new Definition($clientClass);
818822
$container->setDefinition('api_platform.elasticsearch.client', $clientDefinition);

Bundle/DependencyInjection/Compiler/ElasticsearchClientPass.php

+2
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,10 @@ public function process(ContainerBuilder $container): void
4040
}
4141

4242
if (class_exists(\Elasticsearch\ClientBuilder::class)) {
43+
// ES v7
4344
$builderName = \Elasticsearch\ClientBuilder::class;
4445
} else {
46+
// ES v8 and up
4547
$builderName = \Elastic\Elasticsearch\ClientBuilder::class;
4648
}
4749

Bundle/DependencyInjection/Configuration.php

+6-1
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,12 @@ private function addElasticsearchSection(ArrayNodeDefinition $rootNode): void
470470
->validate()
471471
->ifTrue()
472472
->then(static function (bool $v): bool {
473-
if (!(class_exists(\Elasticsearch\Client::class) || class_exists(\Elastic\Elasticsearch\Client::class))) {
473+
if (
474+
// ES v7
475+
!class_exists(\Elasticsearch\Client::class)
476+
// ES v8 and up
477+
&& !class_exists(\Elastic\Elasticsearch\Client::class)
478+
) {
474479
throw new InvalidConfigurationException('The elasticsearch/elasticsearch package is required for Elasticsearch support.');
475480
}
476481

0 commit comments

Comments
 (0)