fix(symfony): catch InvalidUriVariableException in IriConverter (#7271)

Author: alexndlm

src/Metadata/UriVariablesConverterInterface.php

@@ -14,6 +14,7 @@
 namespace ApiPlatform\Metadata;
 
 use ApiPlatform\Metadata\Exception\InvalidIdentifierException;
+use ApiPlatform\Metadata\Exception\InvalidUriVariableException;
 
 /**
  * Identifier converter.
@@ -29,6 +30,7 @@ interface UriVariablesConverterInterface
      * @param string $class The class to which the URI variables belong to
      *
      * @throws InvalidIdentifierException
+     * @throws InvalidUriVariableException
      *
      * @return array Array indexed by identifiers properties with their values denormalized
      */

src/Symfony/Routing/IriConverter.php

@@ -16,6 +16,7 @@
 use ApiPlatform\Metadata\CollectionOperationInterface;
 use ApiPlatform\Metadata\Exception\InvalidArgumentException;
 use ApiPlatform\Metadata\Exception\InvalidIdentifierException;
+use ApiPlatform\Metadata\Exception\InvalidUriVariableException;
 use ApiPlatform\Metadata\Exception\ItemNotFoundException;
 use ApiPlatform\Metadata\Exception\OperationNotFoundException;
 use ApiPlatform\Metadata\Exception\RuntimeException;
@@ -99,7 +100,7 @@ public function getResourceFromIri(string $iri, array $context = [], ?Operation
 
         try {
             $uriVariables = $this->getOperationUriVariables($operation, $parameters, $attributes['resource_class']);
-        } catch (InvalidIdentifierException $e) {
+        } catch (InvalidIdentifierException|InvalidUriVariableException $e) {
             throw new InvalidArgumentException($e->getMessage(), $e->getCode(), $e);
         }
 

tests/Functional/Issues/Issue7135Test.php

@@ -70,7 +70,7 @@ public function testInvalidPostRequestWithIriWhenIdentifierIsUuid(): void
         ]);
 
         self::assertEquals(400, $response->getStatusCode());
-        self::assertJsonContains(['detail' => 'Identifier "id" could not be transformed.']);
+        self::assertJsonContains(['detail' => 'Invalid IRI "pull-request-7135/bar/invalid-uuid".']);
     }
 
     public function testInvalidGetRequestWhenIdentifierIsUuid(): void