Merge 3.1 into 3.2

Author: soyuka

CHANGELOG.md

@@ -157,6 +157,13 @@ Notes:
 * [92a81f024](https://github.com/api-platform/core/commit/92a81f024541054b9322e7457b75c721261e14e0) feat(graphql): allow to disable the introspection query (#5711)
 * [d793ffb92](https://github.com/api-platform/core/commit/d793ffb9228a21655ee35f0b90a959f93281a4cf) feat: union/intersect types (#5470)
 
+## v3.1.22
+
+### Bug fixes
+
+* [157faafd5](https://github.com/api-platform/core/commit/157faafd54db75214b39fc8c7c6a97a171513c67) fix(state): wrong variable name
+* [b2d9ce40c](https://github.com/api-platform/core/commit/b2d9ce40cf27ee9743aafff4f163e195ae47b880) fix(serializer): pass $context to IriConverter (#5908)
+
 ## v3.1.21
 
 ### Bug fixes

src/Doctrine/EventListener/PurgeHttpCacheListener.php

@@ -126,6 +126,11 @@ private function gatherRelationTags(EntityManagerInterface $em, object $entity):
     {
         $associationMappings = $em->getClassMetadata(ClassUtils::getClass($entity))->getAssociationMappings();
         foreach (array_keys($associationMappings) as $property) {
+            if (
+                \array_key_exists('targetEntity', $associationMappings[$property])
+                && !$this->resourceClassResolver->isResourceClass($associationMappings[$property]['targetEntity'])) {
+                return;
+            }
             if ($this->propertyAccessor->isReadable($entity, $property)) {
                 $this->addTagsFor($this->propertyAccessor->getValue($entity, $property));
             }

src/Serializer/AbstractItemNormalizer.php

@@ -789,7 +789,7 @@ protected function normalizeRelation(ApiProperty $propertyMetadata, ?object $rel
             return $normalizedRelatedObject;
         }
 
-        $iri = $this->iriConverter->getIriFromResource($relatedObject);
+        $iri = $this->iriConverter->getIriFromResource(resource: $relatedObject, context: $context);
 
         if (isset($context['resources'])) {
             $context['resources'][$iri] = $iri;

src/State/UriVariablesResolverTrait.php

@@ -53,14 +53,14 @@ private function getOperationUriVariables(HttpOperation $operation = null, array
 
                 foreach ($currentIdentifiers as $key => $value) {
                     $identifiers[$key] = $value;
-                    $uriVariableMap[$key] = $uriVariableDefinition;
+                    $uriVariablesMap[$key] = $uriVariableDefinition;
                 }
 
                 continue;
             }
 
             $identifiers[$parameterName] = $parameters[$parameterName];
-            $uriVariableMap[$parameterName] = $uriVariableDefinition;
+            $uriVariablesMap[$parameterName] = $uriVariableDefinition;
         }
 
         if ($this->uriVariablesConverter) {

tests/Doctrine/EventListener/PurgeHttpCacheListenerTest.php

@@ -201,13 +201,16 @@ public function testNotAResourceClass(): void
         // @phpstan-ignore-next-line
         $dummyClassMetadata->associationMappings = [
             'notAResource' => [],
+            'collectionOfNotAResource' => ['targetEntity' => NotAResource::class],
         ];
         $emProphecy->getClassMetadata(ContainNonResource::class)->willReturn($dummyClassMetadata);
         $eventArgs = new OnFlushEventArgs($emProphecy->reveal());
 
         $propertyAccessorProphecy = $this->prophesize(PropertyAccessorInterface::class);
         $propertyAccessorProphecy->isReadable(Argument::type(ContainNonResource::class), 'notAResource')->willReturn(true);
+        $propertyAccessorProphecy->isReadable(Argument::type(ContainNonResource::class), 'collectionOfNotAResource')->shouldNotBeCalled();
         $propertyAccessorProphecy->getValue(Argument::type(ContainNonResource::class), 'notAResource')->shouldBeCalled()->willReturn($nonResource);
+        $propertyAccessorProphecy->getValue(Argument::type(ContainNonResource::class), 'collectionOfNotAResource')->shouldNotBeCalled();
 
         $listener = new PurgeHttpCacheListener($purgerProphecy->reveal(), $iriConverterProphecy->reveal(), $resourceClassResolverProphecy->reveal(), $propertyAccessorProphecy->reveal());
         $listener->onFlush($eventArgs);

tests/Hal/Serializer/ItemNormalizerTest.php

@@ -132,7 +132,7 @@ public function testNormalize(): void
 
         $iriConverterProphecy = $this->prophesize(IriConverterInterface::class);
         $iriConverterProphecy->getIriFromResource($dummy, Argument::cetera())->willReturn('/dummies/1');
-        $iriConverterProphecy->getIriFromResource($relatedDummy)->willReturn('/related-dummies/2');
+        $iriConverterProphecy->getIriFromResource($relatedDummy, Argument::cetera())->willReturn('/related-dummies/2');
 
         $resourceClassResolverProphecy = $this->prophesize(ResourceClassResolverInterface::class);
         $resourceClassResolverProphecy->isResourceClass(RelatedDummy::class)->willReturn(true);
@@ -260,7 +260,7 @@ public function testNormalizeWithoutCache(): void
 
         $iriConverterProphecy = $this->prophesize(IriConverterInterface::class);
         $iriConverterProphecy->getIriFromResource($dummy, Argument::cetera())->willReturn('/dummies/1');
-        $iriConverterProphecy->getIriFromResource($relatedDummy)->willReturn('/related-dummies/2');
+        $iriConverterProphecy->getIriFromResource($relatedDummy, Argument::cetera())->willReturn('/related-dummies/2');
 
         $resourceClassResolverProphecy = $this->prophesize(ResourceClassResolverInterface::class);
         $resourceClassResolverProphecy->getResourceClass($dummy, null)->willReturn(Dummy::class);

tests/Symfony/Bundle/Twig/ApiPlatformProfilerPanelTest.php

@@ -115,7 +115,7 @@ public function testProfilerGeneralLayoutNotResourceClass(): void
         $this->assertSame(200, $client->getResponse()->getStatusCode());
 
         // Check that the Api-Platform sidebar link is active
-        $this->assertNotEmpty($menuLink = $crawler->filter('a[href$="panel=api_platform.data_collector.request"]'));
+        $this->assertNotEmpty($menuLink = $crawler->filter('a[href*="panel=api_platform.data_collector.request"]'));
         $this->assertNotEmpty($menuLink->filter('.disabled'), 'The sidebar menu should be disabled.');
 
         $metrics = $crawler->filter('.metrics');