Merge 918a001 into b81374f

Author: soyuka

src/Api/IdentifiersExtractor.php

@@ -51,13 +51,17 @@ public function __construct(PropertyNameCollectionFactoryInterface $propertyName
  public function getIdentifiersFromResourceClass(string $resourceClass): array
  {
  $identifiers = [];
- foreach ($this->propertyNameCollectionFactory->create($resourceClass) as $property) {
+ foreach ($properties = $this->propertyNameCollectionFactory->create($resourceClass) as $property) {
  if ($this->propertyMetadataFactory->create($resourceClass, $property)->isIdentifier() ?? false) {
  $identifiers[] = $property;
  }
  }
 
  if (!$identifiers) {
+ if (\in_array('id', iterator_to_array($properties), true)) {
+ return ['id'];
+ }
+
  throw new RuntimeException(sprintf('No identifier defined "%s". You should add #[\ApiPlatform\Core\Annotation\ApiProperty(identifier: true)]" on the property identifying the resource."', $resourceClass));
  }
 
@@ -71,14 +75,14 @@ public function getIdentifiersFromItem($item): array
  {
  $identifiers = [];
  $resourceClass = $this->getResourceClass($item, true);
+ $identifierProperties = $this->getIdentifiersFromResourceClass($resourceClass);
 
  foreach ($this->propertyNameCollectionFactory->create($resourceClass) as $propertyName) {
- $propertyMetadata = $this->propertyMetadataFactory->create($resourceClass, $propertyName);
- $identifier = $propertyMetadata->isIdentifier();
- if (null === $identifier || false === $identifier) {
+ if (!\in_array($propertyName, $identifierProperties, true)) {
  continue;
  }
 
+ $propertyMetadata = $this->propertyMetadataFactory->create($resourceClass, $propertyName);
  $identifier = $identifiers[$propertyName] = $this->propertyAccessor->getValue($item, $propertyName);
 
  if (!\is_object($identifier)) {

tests/Api/IdentifiersExtractorTest.php

@@ -252,4 +252,16 @@ private function getMetadataFactoryProphecies($class, $identifiers, array $proph
 
  return [$propertyNameCollectionFactoryProphecy, $propertyMetadataFactoryProphecy];
  }
+
+ public function testDefaultIdentifierId(): void
+ {
+ $propertyNameCollectionFactoryProphecy = $this->prophesize(PropertyNameCollectionFactoryInterface::class);
+ $propertyNameCollectionFactoryProphecy->create(Dummy::class)->willReturn(new PropertyNameCollection(['id']));
+ $propertyMetadataFactoryProphecy = $this->prophesize(PropertyMetadataFactoryInterface::class);
+ $propertyMetadataFactoryProphecy->create(Dummy::class, 'id')->willReturn(new PropertyMetadata());
+ $resourceClassResolverProphecy = $this->prophesize(ResourceClassResolverInterface::class);
+ $identifiersExtractor = new IdentifiersExtractor($propertyNameCollectionFactoryProphecy->reveal(), $propertyMetadataFactoryProphecy->reveal(), null, $resourceClassResolverProphecy->reveal());
+
+ $this->assertSame(['id'], $identifiersExtractor->getIdentifiersFromResourceClass(Dummy::class));
+ }
 }