From 5d07f38bf9ab04f0f27c340218ac942ba8e4b919 Mon Sep 17 00:00:00 2001 From: Antoine Bluchet Date: Fri, 31 Mar 2023 14:39:34 +0200 Subject: [PATCH] Revert "fix(metadata): no deprecation when elasticsearch is null (#5499)" This reverts commit aa2dfe7d429a1ff83c57a2de033aec0ac91a739d. --- .../ElasticsearchProviderResourceMetadataCollectionFactory.php | 2 +- ...asticsearchProviderResourceMetadataCollectionFactoryTest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Elasticsearch/Metadata/Resource/Factory/ElasticsearchProviderResourceMetadataCollectionFactory.php b/src/Elasticsearch/Metadata/Resource/Factory/ElasticsearchProviderResourceMetadataCollectionFactory.php index e6434f24e47..e94eeba4786 100644 --- a/src/Elasticsearch/Metadata/Resource/Factory/ElasticsearchProviderResourceMetadataCollectionFactory.php +++ b/src/Elasticsearch/Metadata/Resource/Factory/ElasticsearchProviderResourceMetadataCollectionFactory.php @@ -52,7 +52,7 @@ public function create(string $resourceClass): ResourceMetadataCollection : 'You will have to remove it when upgrading to v4'; trigger_deprecation('api-platform/core', '3.1', sprintf('Setting "elasticsearch" in Operation is deprecated. %s', $solution)); } - if (null !== $elasticsearch && $this->hasIndices($operation)) { + if ($this->hasIndices($operation)) { $operation = $operation->withElasticsearch(true); } diff --git a/tests/Elasticsearch/Metadata/Resource/Factory/ElasticsearchProviderResourceMetadataCollectionFactoryTest.php b/tests/Elasticsearch/Metadata/Resource/Factory/ElasticsearchProviderResourceMetadataCollectionFactoryTest.php index b6a0f547925..a7dfecdce25 100644 --- a/tests/Elasticsearch/Metadata/Resource/Factory/ElasticsearchProviderResourceMetadataCollectionFactoryTest.php +++ b/tests/Elasticsearch/Metadata/Resource/Factory/ElasticsearchProviderResourceMetadataCollectionFactoryTest.php @@ -95,7 +95,7 @@ public function elasticsearchProvider(): array { return [ 'elasticsearch: false' => [false, 0, false], - 'elasticsearch: null' => [null, 0, false], + 'elasticsearch: null' => [null, 1, false], 'elasticsearch: true' => [true, 1, true], ]; }