Merge 3.4

Author: soyuka

Bundle/SwaggerUi/SwaggerUiProvider.php

@@ -14,6 +14,7 @@
 namespace ApiPlatform\Symfony\Bundle\SwaggerUi;
 
 use ApiPlatform\Documentation\Documentation;
+use ApiPlatform\Documentation\Entrypoint;
 use ApiPlatform\Metadata\Error;
 use ApiPlatform\Metadata\Get;
 use ApiPlatform\Metadata\HttpOperation;
@@ -44,6 +45,7 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
             !($operation instanceof HttpOperation)
             || !($request = $context['request'] ?? null)
             || 'html' !== $request->getRequestFormat()
+            || true === ($operation->getExtraProperties()['_api_disable_swagger_provider'] ?? false)
         ) {
             return $this->decorated->provide($operation, $uriVariables, $context);
         }
@@ -55,11 +57,12 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
         // We need to call our operation provider just in case it fails
         // when it fails we'll get an Error and we'll fix the status accordingly
         // @see features/main/content_negotiation.feature:119
-        // DocumentationAction has no content negotation as well we want HTML so render swagger ui
-        if (!$operation instanceof Error && Documentation::class !== $operation->getClass()) {
+        // When requesting DocumentationAction or EntrypointAction with Accept: text/html we render SwaggerUi
+        if (!$operation instanceof Error && !\in_array($operation->getClass(), [Documentation::class, Entrypoint::class], true)) {
             $this->decorated->provide($operation, $uriVariables, $context);
         }
 
+        // This should render only when an error occured
         $swaggerUiOperation = new Get(
             class: OpenApi::class,
             processor: 'api_platform.swagger_ui.processor',
@@ -71,7 +74,6 @@ class: OpenApi::class,
 
         // save our operation
         $request->attributes->set('_api_operation', $swaggerUiOperation);
-
         $data = $this->openApiFactory->__invoke(['base_url' => $request->getBaseUrl() ?: '/']);
         $request->attributes->set('data', $data);
 

EventListener/ErrorListener.php

@@ -79,7 +79,7 @@ protected function duplicateRequest(\Throwable $exception, Request $request): Re
         //   - use api platform to handle errors (the default behavior we handle firewall errors for example but they're out of our scope)
 
         // Let the error handler take this we don't handle HTML nor non-api platform requests
-        if ('html' === $format) {
+        if (false === ($apiOperation?->getExtraProperties()['_api_error_handler'] ?? true) || 'html' === $format) {
             $this->controller = 'error_controller';
 
             return parent::duplicateRequest($exception, $request);

Routing/IriConverter.php

@@ -75,6 +75,17 @@ public function getResourceFromIri(string $iri, array $context = [], ?Operation
             throw new InvalidArgumentException(sprintf('No resource associated to "%s".', $iri));
         }
 
+        // uri_variables come from the Request context and may not be available
+        foreach ($context['uri_variables'] ?? [] as $key => $value) {
+            if (!isset($parameters[$key]) || $parameters[$key] !== (string) $value) {
+                throw new InvalidArgumentException(sprintf('The iri "%s" does not reference the correct resource.', $iri));
+            }
+        }
+
+        if ($operation && !is_a($parameters['_api_resource_class'], $operation->getClass(), true)) {
+            throw new InvalidArgumentException(sprintf('The iri "%s" does not reference the correct resource.', $iri));
+        }
+
         $operation = $parameters['_api_operation'] = $this->resourceMetadataCollectionFactory->create($parameters['_api_resource_class'])->getOperation($parameters['_api_operation_name']);
 
         if ($operation instanceof CollectionOperationInterface) {

Tests/EventListener/QueryParameterValidateListenerTest.php

@@ -204,7 +204,7 @@ public function testDoNothingWhenListenersDisabled(): void
         $event = new RequestEvent(
             $this->prophesize(HttpKernelInterface::class)->reveal(),
             new Request([], [], ['_api_resource_class' => Dummy::class, '_api_operation_name' => 'get', '_api_platform_disable_listeners' => true]),
-            \defined(HttpKernelInterface::class.'::MAIN_REQUEST') ? HttpKernelInterface::MAIN_REQUEST : HttpKernelInterface::MASTER_REQUEST,
+            HttpKernelInterface::MAIN_REQUEST,
         );
 
         $listener->onKernelRequest($event);

composer.json

@@ -33,9 +33,9 @@
         "api-platform/state": "*@dev || ^3.1",
         "api-platform/validator": "*@dev || ^3.1",
         "api-platform/openapi": "*@dev || ^3.1",
-        "symfony/property-info": "^6.4 || ^7.0",
-        "symfony/property-access": "^6.4 || ^7.0",
-        "symfony/serializer": "^6.4 || ^7.0",
+        "symfony/property-info": "^6.4 || ^7.1",
+        "symfony/property-access": "^6.4 || ^7.1",
+        "symfony/serializer": "^6.4 || ^7.1",
         "symfony/security-core": "^6.4 || ^7.0"
     },
     "require-dev": {
@@ -72,13 +72,14 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "3.3.x-dev"
+            "dev-main": "4.0.x-dev",
+            "dev-3.4": "3.4.x-dev"
         },
         "symfony": {
-            "require": "^6.4"
+            "require": "^6.4 || ^7.1"
         }
     },
     "scripts": {
         "test": "./vendor/bin/phpunit"
     }
-}
+}