Skip to content

Commit 1dc650e

Browse files
committed
Fix interface
1 parent df3d5b5 commit 1dc650e

File tree

10 files changed

+13
-17
lines changed

10 files changed

+13
-17
lines changed

src/Bridge/Doctrine/MongoDbOdm/ItemDataProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public function supports(string $resourceClass, string $operationName = null, ar
6363
*
6464
* @throws RuntimeException
6565
*/
66-
public function getItem(string $resourceClass, $identifiers, ?string $operationName = null, array $context = [])
66+
public function getItem(string $resourceClass, array $identifiers, ?string $operationName = null, array $context = [])
6767
{
6868
/** @var DocumentManager $manager */
6969
$manager = $this->managerRegistry->getManagerForClass($resourceClass);

src/Bridge/Elasticsearch/DataProvider/ItemDataProvider.php

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,19 +83,15 @@ public function supports(string $resourceClass, ?string $operationName = null, a
8383
/**
8484
* {@inheritdoc}
8585
*/
86-
public function getItem(string $resourceClass, $id, ?string $operationName = null, array $context = [])
86+
public function getItem(string $resourceClass, array $identifiers, ?string $operationName = null, array $context = [])
8787
{
88-
if (\is_array($id)) {
89-
$id = $id[$this->identifierExtractor->getIdentifierFromResourceClass($resourceClass)];
90-
}
91-
9288
$documentMetadata = $this->documentMetadataFactory->create($resourceClass);
9389

9490
try {
9591
$document = $this->client->get([
9692
'index' => $documentMetadata->getIndex(),
9793
'type' => $documentMetadata->getType(),
98-
'id' => (string) $id,
94+
'id' => $identifiers[$this->identifierExtractor->getIdentifierFromResourceClass($resourceClass)],
9995
]);
10096
} catch (Missing404Exception $e) {
10197
return null;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public function getContext(): array
4444
return $this->context;
4545
}
4646

47-
public function getItem(string $resourceClass, $identifiers, string $operationName = null, array $context = [])
47+
public function getItem(string $resourceClass, array $identifiers, string $operationName = null, array $context = [])
4848
{
4949
$this->context = $context;
5050
$match = false;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -277,13 +277,13 @@ private function getUsedItemDataProvider(): TraceableChainItemDataProvider
277277
{
278278
$itemDataProvider = new TraceableChainItemDataProvider(new ChainItemDataProvider([
279279
new class() implements ItemDataProviderInterface {
280-
public function getItem(string $resourceClass, $id, string $operationName = null, array $context = [])
280+
public function getItem(string $resourceClass, array $identifiers, string $operationName = null, array $context = [])
281281
{
282282
return null;
283283
}
284284
},
285285
]));
286-
$itemDataProvider->getItem('', '', null, ['item_context']);
286+
$itemDataProvider->getItem('', [], null, ['item_context']);
287287

288288
return $itemDataProvider;
289289
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,13 +118,13 @@ public function deprecatedDataProviderProvider(): iterable
118118
yield 'deprecated ChainItemDataProvider - ResourceClassNotSupportedException' => [
119119
new ChainItemDataProvider([
120120
new class() implements ItemDataProviderInterface {
121-
public function getItem(string $resourceClass, $id, string $operationName = null, array $context = [])
121+
public function getItem(string $resourceClass, array $identifiers, string $operationName = null, array $context = [])
122122
{
123123
throw new ResourceClassNotSupportedException('nope');
124124
}
125125
},
126126
new class() implements ItemDataProviderInterface {
127-
public function getItem(string $resourceClass, $id, string $operationName = null, array $context = [])
127+
public function getItem(string $resourceClass, array $identifiers, string $operationName = null, array $context = [])
128128
{
129129
return null;
130130
}

tests/Fixtures/TestBundle/DataProvider/ContainNonResourceItemDataProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public function supports(string $resourceClass, string $operationName = null, ar
3232
/**
3333
* {@inheritdoc}
3434
*/
35-
public function getItem(string $resourceClass, $identifiers, string $operationName = null, array $context = [])
35+
public function getItem(string $resourceClass, array $identifiers, string $operationName = null, array $context = [])
3636
{
3737
if (!is_scalar($identifiers['id'])) {
3838
throw new \InvalidArgumentException('The id must be a scalar.');

tests/Fixtures/TestBundle/DataProvider/ProductItemDataProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public function supports(string $resourceClass, string $operationName = null, ar
4242
/**
4343
* {@inheritdoc}
4444
*/
45-
public function getItem(string $resourceClass, $identifiers, string $operationName = null, array $context = [])
45+
public function getItem(string $resourceClass, array $identifiers, string $operationName = null, array $context = [])
4646
{
4747
return $this->managerRegistry->getRepository($this->orm ? Product::class : ProductDocument::class)->findOneBy([
4848
'code' => $identifiers['code'],

tests/Fixtures/TestBundle/DataProvider/ResourceInterfaceImplementationDataProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public function supports(string $resourceClass, string $operationName = null, ar
2626
return ResourceInterface::class === $resourceClass;
2727
}
2828

29-
public function getItem(string $resourceClass, $identifiers, string $operationName = null, array $context = [])
29+
public function getItem(string $resourceClass, array $identifiers, string $operationName = null, array $context = [])
3030
{
3131
if ('some-id' === $identifiers['foo']) {
3232
return (new ResourceInterfaceImplementation())->setFoo('single item');

tests/Fixtures/TestBundle/DataProvider/SerializableItemDataProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class SerializableItemDataProvider implements ItemDataProviderInterface, Restric
2929
/**
3030
* {@inheritdoc}
3131
*/
32-
public function getItem(string $resourceClass, $id, string $operationName = null, array $context = [])
32+
public function getItem(string $resourceClass, array $identifiers, string $operationName = null, array $context = [])
3333
{
3434
return $this->getSerializer()->deserialize(<<<'JSON'
3535
{

tests/Fixtures/TestBundle/DataProvider/TaxonItemDataProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public function supports(string $resourceClass, string $operationName = null, ar
4242
/**
4343
* {@inheritdoc}
4444
*/
45-
public function getItem(string $resourceClass, $identifiers, string $operationName = null, array $context = [])
45+
public function getItem(string $resourceClass, array $identifiers, string $operationName = null, array $context = [])
4646
{
4747
return $this->managerRegistry->getRepository($this->orm ? Taxon::class : TaxonDocument::class)->findOneBy([
4848
'code' => $identifiers['code'],

0 commit comments

Comments
 (0)