Fix interface

Author: soyuka

src/Bridge/Doctrine/MongoDbOdm/ItemDataProvider.php

@@ -63,7 +63,7 @@ public function supports(string $resourceClass, string $operationName = null, ar
      *
      * @throws RuntimeException
      */
-    public function getItem(string $resourceClass, $identifiers, ?string $operationName = null, array $context = [])
+    public function getItem(string $resourceClass, array $identifiers, ?string $operationName = null, array $context = [])
     {
         /** @var DocumentManager $manager */
         $manager = $this->managerRegistry->getManagerForClass($resourceClass);

src/Bridge/Elasticsearch/DataProvider/ItemDataProvider.php

@@ -83,19 +83,15 @@ public function supports(string $resourceClass, ?string $operationName = null, a
     /**
      * {@inheritdoc}
      */
-    public function getItem(string $resourceClass, $id, ?string $operationName = null, array $context = [])
+    public function getItem(string $resourceClass, array $identifiers, ?string $operationName = null, array $context = [])
     {
-        if (\is_array($id)) {
-            $id = $id[$this->identifierExtractor->getIdentifierFromResourceClass($resourceClass)];
-        }
-
         $documentMetadata = $this->documentMetadataFactory->create($resourceClass);
 
         try {
             $document = $this->client->get([
                 'index' => $documentMetadata->getIndex(),
                 'type' => $documentMetadata->getType(),
-                'id' => (string) $id,
+                'id' => $identifiers[$this->identifierExtractor->getIdentifierFromResourceClass($resourceClass)],
             ]);
         } catch (Missing404Exception $e) {
             return null;

src/Bridge/Symfony/Bundle/DataProvider/TraceableChainItemDataProvider.php

@@ -44,7 +44,7 @@ public function getContext(): array
         return $this->context;
     }
 
-    public function getItem(string $resourceClass, $identifiers, string $operationName = null, array $context = [])
+    public function getItem(string $resourceClass, array $identifiers, string $operationName = null, array $context = [])
     {
         $this->context = $context;
         $match = false;

tests/Bridge/Symfony/Bundle/DataCollector/RequestDataCollectorTest.php

@@ -277,13 +277,13 @@ private function getUsedItemDataProvider(): TraceableChainItemDataProvider
     {
         $itemDataProvider = new TraceableChainItemDataProvider(new ChainItemDataProvider([
             new class() implements ItemDataProviderInterface {
-                public function getItem(string $resourceClass, $id, string $operationName = null, array $context = [])
+                public function getItem(string $resourceClass, array $identifiers, string $operationName = null, array $context = [])
                 {
                     return null;
                 }
             },
         ]));
-        $itemDataProvider->getItem('', '', null, ['item_context']);
+        $itemDataProvider->getItem('', [], null, ['item_context']);
 
         return $itemDataProvider;
     }

tests/Bridge/Symfony/Bundle/DataProvider/TraceableChainItemDataCollectorTest.php

@@ -118,13 +118,13 @@ public function deprecatedDataProviderProvider(): iterable
         yield 'deprecated ChainItemDataProvider - ResourceClassNotSupportedException' => [
             new ChainItemDataProvider([
                 new class() implements ItemDataProviderInterface {
-                    public function getItem(string $resourceClass, $id, string $operationName = null, array $context = [])
+                    public function getItem(string $resourceClass, array $identifiers, string $operationName = null, array $context = [])
                     {
                         throw new ResourceClassNotSupportedException('nope');
                     }
                 },
                 new class() implements ItemDataProviderInterface {
-                    public function getItem(string $resourceClass, $id, string $operationName = null, array $context = [])
+                    public function getItem(string $resourceClass, array $identifiers, string $operationName = null, array $context = [])
                     {
                         return null;
                     }

tests/Fixtures/TestBundle/DataProvider/ContainNonResourceItemDataProvider.php

@@ -32,7 +32,7 @@ public function supports(string $resourceClass, string $operationName = null, ar
     /**
      * {@inheritdoc}
      */
-    public function getItem(string $resourceClass, $identifiers, string $operationName = null, array $context = [])
+    public function getItem(string $resourceClass, array $identifiers, string $operationName = null, array $context = [])
     {
         if (!is_scalar($identifiers['id'])) {
             throw new \InvalidArgumentException('The id must be a scalar.');

tests/Fixtures/TestBundle/DataProvider/ProductItemDataProvider.php

@@ -42,7 +42,7 @@ public function supports(string $resourceClass, string $operationName = null, ar
     /**
      * {@inheritdoc}
      */
-    public function getItem(string $resourceClass, $identifiers, string $operationName = null, array $context = [])
+    public function getItem(string $resourceClass, array $identifiers, string $operationName = null, array $context = [])
     {
         return $this->managerRegistry->getRepository($this->orm ? Product::class : ProductDocument::class)->findOneBy([
             'code' => $identifiers['code'],

tests/Fixtures/TestBundle/DataProvider/ResourceInterfaceImplementationDataProvider.php

@@ -26,7 +26,7 @@ public function supports(string $resourceClass, string $operationName = null, ar
         return ResourceInterface::class === $resourceClass;
     }
 
-    public function getItem(string $resourceClass, $identifiers, string $operationName = null, array $context = [])
+    public function getItem(string $resourceClass, array $identifiers, string $operationName = null, array $context = [])
     {
         if ('some-id' === $identifiers['foo']) {
             return (new ResourceInterfaceImplementation())->setFoo('single item');

tests/Fixtures/TestBundle/DataProvider/SerializableItemDataProvider.php

@@ -29,7 +29,7 @@ class SerializableItemDataProvider implements ItemDataProviderInterface, Restric
     /**
      * {@inheritdoc}
      */
-    public function getItem(string $resourceClass, $id, string $operationName = null, array $context = [])
+    public function getItem(string $resourceClass, array $identifiers, string $operationName = null, array $context = [])
     {
         return $this->getSerializer()->deserialize(<<<'JSON'
 {

tests/Fixtures/TestBundle/DataProvider/TaxonItemDataProvider.php

@@ -42,7 +42,7 @@ public function supports(string $resourceClass, string $operationName = null, ar
     /**
      * {@inheritdoc}
      */
-    public function getItem(string $resourceClass, $identifiers, string $operationName = null, array $context = [])
+    public function getItem(string $resourceClass, array $identifiers, string $operationName = null, array $context = [])
     {
         return $this->managerRegistry->getRepository($this->orm ? Taxon::class : TaxonDocument::class)->findOneBy([
             'code' => $identifiers['code'],