fix: map uriVariables to uriTemplate vars (#5410)

Author: nikophil

src/Metadata/Resource/Factory/UriTemplateResourceMetadataCollectionFactory.php

@@ -185,7 +185,10 @@ private function configureUriVariables(ApiResource|HttpOperation $operation): Ap
  $entityClass = $options->getEntityClass();
  }
 
- $newUriVariables[$variable] = (new Link())->withFromClass($entityClass)->withIdentifiers(['id'])->withParameterName($variable);
+ $newUriVariables[$variable] = (new Link())
+ ->withFromClass($entityClass)
+ ->withIdentifiers([property_exists($entityClass, $variable) ? $variable : 'id'])
+ ->withParameterName($variable);
  }
 
  return $operation->withUriVariables($newUriVariables);

tests/Metadata/Resource/Factory/UriTemplateResourceMetadataCollectionFactoryTest.php

@@ -121,6 +121,16 @@ class: AttributeResource::class,
  ),
  ]
  ),
+ new ApiResource(
+ shortName: 'AttributeResource',
+ class: AttributeResource::class,
+ uriTemplate: '/attribute_resources/by_name/{name}',
+ ),
+ new ApiResource(
+ shortName: 'AttributeResource',
+ class: AttributeResource::class,
+ uriTemplate: '/attribute_resources/{foo}',
+ ),
  ]),
  );
 
@@ -198,6 +208,20 @@ class: AttributeResource::class,
  name: '_api_/prefix/attribute_resources/{id}{._format}_get'),
  ]
  ),
+ new ApiResource(
+ shortName: 'AttributeResource',
+ class: AttributeResource::class,
+ uriTemplate: '/attribute_resources/by_name/{name}',
+ uriVariables: ['name' => new Link(fromClass: AttributeResource::class, identifiers: ['name'], parameterName: 'name')],
+ operations: [],
+ ),
+ new ApiResource(
+ shortName: 'AttributeResource',
+ class: AttributeResource::class,
+ uriTemplate: '/attribute_resources/{foo}',
+ uriVariables: ['foo' => new Link(fromClass: AttributeResource::class, identifiers: ['id'], parameterName: 'foo')],
+ operations: [],
+ ),
  ]),
  $uriTemplateResourceMetadataCollectionFactory->create(AttributeResource::class)
  );