feat(elasticsearch): introduce v7 support

Author: darthf1

composer.json

@@ -127,7 +127,7 @@
         "doctrine/mongodb-odm": "^2.6",
         "doctrine/mongodb-odm-bundle": "^4.0 || ^5.0",
         "doctrine/orm": "^2.17 || ^3.0",
-        "elasticsearch/elasticsearch": "^8.4",
+        "elasticsearch/elasticsearch": "^7.17 || ^8.4",
         "friends-of-behat/mink-browserkit-driver": "^1.3.1",
         "friends-of-behat/mink-extension": "^2.2",
         "friends-of-behat/symfony-extension": "^2.1",

src/Elasticsearch/State/CollectionProvider.php

@@ -21,6 +21,8 @@
 use ApiPlatform\State\ApiResource\Error;
 use ApiPlatform\State\Pagination\Pagination;
 use ApiPlatform\State\ProviderInterface;
+use Elasticsearch\Client as V7Client;
+use Elasticsearch\Common\Exceptions\Missing404Exception as V7Missing404Exception;
 use Elastic\Elasticsearch\Client;
 use Elastic\Elasticsearch\Exception\ClientResponseException;
 use Elastic\Elasticsearch\Response\Elasticsearch;
@@ -37,7 +39,7 @@ final class CollectionProvider implements ProviderInterface
     /**
      * @param RequestBodySearchCollectionExtensionInterface[] $collectionExtensions
      */
-    public function __construct(private readonly Client $client, private readonly ?DenormalizerInterface $denormalizer = null, private readonly ?Pagination $pagination = null, private readonly iterable $collectionExtensions = [], private readonly ?InflectorInterface $inflector = new Inflector())
+    public function __construct(private readonly V7Client|Client $client, private readonly ?DenormalizerInterface $denormalizer = null, private readonly ?Pagination $pagination = null, private readonly iterable $collectionExtensions = [], private readonly ?InflectorInterface $inflector = new Inflector())
     {
     }
 
@@ -69,12 +71,14 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
 
         try {
             $documents = $this->client->search($params);
+        } catch (V7Missing404Exception $e) {
+            throw new Error(status: $e->getCode(), detail: $e->getMessage(), title: $e->getMessage(), originalTrace: $e->getTrace());
         } catch (ClientResponseException $e) {
             $response = $e->getResponse();
             throw new Error(status: $response->getStatusCode(), detail: (string) $response->getBody(), title: $response->getReasonPhrase(), originalTrace: $e->getTrace());
         }
 
-        if ($documents instanceof Elasticsearch) {
+        if ($this->client instanceof Client && $documents instanceof Elasticsearch) {
             $documents = $documents->asArray();
         }
 

src/Elasticsearch/State/ItemProvider.php

@@ -20,6 +20,8 @@
 use ApiPlatform\Metadata\Util\Inflector;
 use ApiPlatform\State\ApiResource\Error;
 use ApiPlatform\State\ProviderInterface;
+use Elasticsearch\Client as V7Client;
+use Elasticsearch\Common\Exceptions\Missing404Exception as V7Missing404Exception;
 use Elastic\Elasticsearch\Client;
 use Elastic\Elasticsearch\Exception\ClientResponseException;
 use Elastic\Elasticsearch\Response\Elasticsearch;
@@ -34,7 +36,7 @@
  */
 final class ItemProvider implements ProviderInterface
 {
-    public function __construct(private readonly Client $client, private readonly ?DenormalizerInterface $denormalizer = null, private readonly ?InflectorInterface $inflector = new Inflector())
+    public function __construct(private readonly V7Client|Client $client, private readonly ?DenormalizerInterface $denormalizer = null, private readonly ?InflectorInterface $inflector = new Inflector())
     {
     }
 
@@ -56,6 +58,8 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
 
         try {
             $document = $this->client->get($params);
+        } catch (V7Missing404Exception) {
+            return null;
         } catch (ClientResponseException $e) {
             $response = $e->getResponse();
             if (404 === $response->getStatusCode()) {
@@ -65,7 +69,7 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
             throw new Error(status: $response->getStatusCode(), detail: (string) $response->getBody(), title: $response->getReasonPhrase(), originalTrace: $e->getTrace());
         }
 
-        if ($document instanceof Elasticsearch) {
+        if ($this->client instanceof Client && $documents instanceof Elasticsearch) {
             $document = $document->asArray();
         }
 

src/Elasticsearch/composer.json

@@ -27,7 +27,7 @@
         "api-platform/metadata": "^3.4 || ^4.0",
         "api-platform/serializer": "^3.4 || ^4.0",
         "api-platform/state": "^3.4 || ^4.0",
-        "elasticsearch/elasticsearch": "^8.4",
+        "elasticsearch/elasticsearch": "^7.17 || ^8.4",
         "symfony/cache": "^6.4 || ^7.0",
         "symfony/console": "^6.4 || ^7.0",
         "symfony/property-access": "^6.4 || ^7.0",