chore: remove 3.4 deprecation

Author: maxhelias

features/openapi/docs.feature

@@ -5,10 +5,11 @@ Feature: Documentation support
 
   @createSchema
   Scenario: Retrieve the OpenAPI documentation
-    Given I send a "GET" request to "/docs.json"
+    Given I add "Accept" header equal to "application/vnd.openapi+json"
+    And I send a "GET" request to "/docs"
     Then the response status code should be 200
     And the response should be in JSON
-    And the header "Content-Type" should be equal to "application/json; charset=utf-8"
+    And the header "Content-Type" should be equal to "application/vnd.openapi+json; charset=utf-8"
     # Context
     And the JSON node "openapi" should be equal to "3.1.0"
     # Root properties
@@ -288,10 +289,11 @@ Feature: Documentation support
     And I should see text matching "openapi"
 
   Scenario: OpenAPI extension properties is enabled in JSON docs
-    Given I send a "GET" request to "/docs.json"
+    Given I add "Accept" header equal to "application/vnd.openapi+json"
+    And I send a "GET" request to "/docs.jsonopenapi"
     Then the response status code should be 200
     And the response should be in JSON
-    And the header "Content-Type" should be equal to "application/json; charset=utf-8"
+    And the header "Content-Type" should be equal to "application/vnd.openapi+json; charset=utf-8"
     And the JSON node "paths./dummy_addresses.get.x-visibility" should be equal to "hide"
 
   Scenario: OpenAPI UI is enabled for an arbitrary endpoint
@@ -302,21 +304,23 @@ Feature: Documentation support
 
   @!mongodb
   Scenario: Retrieve the OpenAPI documentation with API Gateway compatibility
-    Given I send a "GET" request to "/docs.json?api_gateway=true"
+    Given I add "Accept" header equal to "application/vnd.openapi+json"
+    And I send a "GET" request to "/docs.jsonopenapi?api_gateway=true"
     Then the response status code should be 200
     And the response should be in JSON
-    And the header "Content-Type" should be equal to "application/json; charset=utf-8"
+    And the header "Content-Type" should be equal to "application/vnd.openapi+json; charset=utf-8"
     And the JSON node "basePath" should be equal to "/"
     And the JSON node "components.schemas.RamseyUuidDummy.properties.id.description" should be equal to "The dummy id."
     And the JSON node "components.schemas.RelatedDummy-barcelona" should not exist
     And the JSON node "components.schemas.RelatedDummybarcelona" should exist
 
   @!mongodb
   Scenario: Retrieve the OpenAPI documentation to see if shortName property is used
-    Given I send a "GET" request to "/docs.json"
+    Given I add "Accept" header equal to "application/vnd.openapi+json"
+    And I send a "GET" request to "/docs.jsonopenapi"
     Then the response status code should be 200
     And the response should be in JSON
-    And the header "Content-Type" should be equal to "application/json; charset=utf-8"
+    And the header "Content-Type" should be equal to "application/vnd.openapi+json; charset=utf-8"
     And the OpenAPI class "Resource" exists
     And the OpenAPI class "ResourceRelated" exists
     And the "resourceRelated" property for the OpenAPI class "Resource" should be equal to:
@@ -348,7 +352,7 @@ Feature: Documentation support
     And the JSON node "info.description" should contain "Made with love"
     # Security Schemes
     And the JSON node "components.securitySchemes" should be equal to:
-     """
+    """
     {
         "oauth": {
             "type": "oauth2",
@@ -383,10 +387,11 @@ Feature: Documentation support
 
   @!mongodb
   Scenario: Retrieve the OpenAPI documentation for Entity Dto Wrappers
-    Given I send a "GET" request to "/docs.json"
+    Given I add "Accept" header equal to "application/vnd.openapi+json"
+    And I send a "GET" request to "/docs.jsonopenapi"
     Then the response status code should be 200
     And the response should be in JSON
-    And the header "Content-Type" should be equal to "application/json; charset=utf-8"
+    And the header "Content-Type" should be equal to "application/vnd.openapi+json; charset=utf-8"
     And the OpenAPI class "WrappedResponseEntity-read" exists
     And the "id" property exists for the OpenAPI class "WrappedResponseEntity-read"
     And the "id" property for the OpenAPI class "WrappedResponseEntity-read" should be equal to:

src/Doctrine/Odm/State/LinksHandlerTrait.php

@@ -59,12 +59,8 @@ private function handleLinks(Builder $aggregationBuilder, array $identifiers, ar
     /**
      * @throws RuntimeException
      */
-    private function buildAggregation(string $toClass, array $links, array $identifiers, array $context, array $executeOptions, string $previousAggregationClass, Builder $previousAggregationBuilder, ?Operation $operation = null): Builder
+    private function buildAggregation(string $toClass, array $links, array $identifiers, array $context, array $executeOptions, string $previousAggregationClass, Builder $previousAggregationBuilder, Operation $operation): Builder
     {
-        if (!$operation) {
-            trigger_deprecation('api-platform/core', '3.2', 'In API Platform 4 the last argument "operation" will be required and this trait will be internal. Use the "handleLinks" feature instead.');
-        }
-
         if (\count($links) <= 0) {
             return $previousAggregationBuilder;
         }
@@ -88,10 +84,8 @@ private function buildAggregation(string $toClass, array $links, array $identifi
 
         $manager = $this->managerRegistry->getManagerForClass($aggregationClass);
         if (!$manager instanceof DocumentManager) {
-            if ($operation) {
-                $aggregationClass = $this->getLinkFromClass($link, $operation);
-                $manager = $this->managerRegistry->getManagerForClass($aggregationClass);
-            }
+            $aggregationClass = $this->getLinkFromClass($link, $operation);
+            $manager = $this->managerRegistry->getManagerForClass($aggregationClass);
 
             if (!$manager instanceof DocumentManager) {
                 throw new RuntimeException(\sprintf('The manager for "%s" must be an instance of "%s".', $aggregationClass, DocumentManager::class));

src/GraphQl/Action/EntrypointAction.php

@@ -41,12 +41,10 @@ public function __construct(
         private readonly SchemaBuilderInterface $schemaBuilder,
         private readonly ExecutorInterface $executor,
         private readonly ?GraphiQlAction $graphiQlAction,
-        private readonly ?GraphQlPlaygroundAction $graphQlPlaygroundAction,
         private readonly NormalizerInterface $normalizer,
         private readonly ErrorHandlerInterface $errorHandler,
         bool $debug = false,
         private readonly bool $graphiqlEnabled = false,
-        private readonly bool $graphQlPlaygroundEnabled = false,
         private readonly ?string $defaultIde = null,
         ?Negotiator $negotiator = null,
     ) {
@@ -64,10 +62,6 @@ public function __invoke(Request $request): Response
                 if ('graphiql' === $this->defaultIde && $this->graphiqlEnabled && $this->graphiQlAction) {
                     return ($this->graphiQlAction)($request);
                 }
-
-                if ('graphql-playground' === $this->defaultIde && $this->graphQlPlaygroundEnabled && $this->graphQlPlaygroundAction) {
-                    return ($this->graphQlPlaygroundAction)($request);
-                }
             }
 
             [$query, $operationName, $variables] = $this->parseRequest($request);

src/GraphQl/Action/GraphQlPlaygroundAction.php

@@ -15,7 +15,6 @@
 
 use ApiPlatform\GraphQl\Action\EntrypointAction;
 use ApiPlatform\GraphQl\Action\GraphiQlAction;
-use ApiPlatform\GraphQl\Action\GraphQlPlaygroundAction;
 use ApiPlatform\GraphQl\Error\ErrorHandler;
 use ApiPlatform\GraphQl\ExecutorInterface;
 use ApiPlatform\GraphQl\Serializer\Exception\ErrorNormalizer;
@@ -270,8 +269,7 @@ private function getEntrypointAction(array $variables = ['graphqlVariable']): En
         $routerProphecy->generate('api_graphql_entrypoint')->willReturn('/graphiql');
 
         $graphiQlAction = new GraphiQlAction($twigProphecy->reveal(), $routerProphecy->reveal(), true);
-        $graphQlPlaygroundAction = new GraphQlPlaygroundAction($twigProphecy->reveal(), $routerProphecy->reveal(), true);
 
-        return new EntrypointAction($schemaBuilderProphecy->reveal(), $executorProphecy->reveal(), $graphiQlAction, $graphQlPlaygroundAction, $normalizer, $errorHandler, false, true, true, 'graphiql');
+        return new EntrypointAction($schemaBuilderProphecy->reveal(), $executorProphecy->reveal(), $graphiQlAction, $normalizer, $errorHandler, false, true, 'graphiql');
     }
 }

src/GraphQl/Tests/Action/EntrypointActionTest.php

@@ -158,10 +158,10 @@
 use Illuminate\Routing\Router;
 use Illuminate\Support\ServiceProvider;
 use Negotiation\Negotiator;
-use phpDocumentor\Reflection\DocBlockFactory;
+use PHPStan\PhpDocParser\Parser\PhpDocParser;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\PropertyAccess\PropertyAccessorInterface;
-use Symfony\Component\PropertyInfo\Extractor\PhpDocExtractor;
+use Symfony\Component\PropertyInfo\Extractor\PhpStanExtractor;
 use Symfony\Component\PropertyInfo\Extractor\ReflectionExtractor;
 use Symfony\Component\PropertyInfo\PropertyInfoExtractor;
 use Symfony\Component\PropertyInfo\PropertyInfoExtractorInterface;
@@ -196,13 +196,13 @@ public function register(): void
         $this->mergeConfigFrom(__DIR__.'/config/api-platform.php', 'api-platform');
 
         $this->app->singleton(PropertyInfoExtractorInterface::class, function () {
-            $phpDocExtractor = class_exists(DocBlockFactory::class) ? new PhpDocExtractor() : null;
+            $phpstanExtractor = class_exists(PhpDocParser::class) ? new PhpStanExtractor() : null;
             $reflectionExtractor = new ReflectionExtractor();
 
             return new PropertyInfoExtractor(
                 [$reflectionExtractor],
-                $phpDocExtractor ? [$phpDocExtractor, $reflectionExtractor] : [$reflectionExtractor],
-                $phpDocExtractor ? [$phpDocExtractor] : [],
+                $phpstanExtractor ? [$phpstanExtractor, $reflectionExtractor] : [$reflectionExtractor],
+                [],
                 [$reflectionExtractor],
                 [$reflectionExtractor]
             );

src/GraphQl/Tests/Action/GraphQlPlaygroundActionTest.php

@@ -51,7 +51,7 @@ public function __construct(
         private readonly ?ProviderInterface $provider = null,
         private readonly ?ProcessorInterface $processor = null,
         ?Negotiator $negotiator = null,
-        private readonly array $documentationFormats = [OpenApiNormalizer::JSON_FORMAT => ['application/vnd.openapi+json'], OpenApiNormalizer::FORMAT => ['application/json']],
+        private readonly array $documentationFormats = [OpenApiNormalizer::JSON_FORMAT => ['application/vnd.openapi+json']],
         private readonly bool $swaggerUiEnabled = true,
     ) {
         $this->negotiator = $negotiator ?? new Negotiator();
@@ -69,7 +69,7 @@ public function __invoke(Request $request): Response
         $this->addRequestFormats($request, $this->documentationFormats);
         $format = $this->getRequestFormat($request, $this->documentationFormats);
 
-        if ('html' === $format || OpenApiNormalizer::FORMAT === $format || OpenApiNormalizer::JSON_FORMAT === $format || OpenApiNormalizer::YAML_FORMAT === $format) {
+        if ('html' === $format || OpenApiNormalizer::JSON_FORMAT === $format || OpenApiNormalizer::YAML_FORMAT === $format) {
             return $this->getOpenApiDocumentation($context, $format, $request);
         }
 

src/Laravel/ApiPlatformProvider.php

@@ -48,17 +48,17 @@
         "illuminate/support": "^11.0 || ^12.0",
         "illuminate/container": "^11.0 || ^12.0",
         "symfony/web-link": "^6.4 || ^7.1",
-        "willdurand/negotiation": "^3.1",
-        "phpstan/phpdoc-parser": "^1.29 || ^2.0",
-        "phpdocumentor/reflection-docblock": "^5.1"
+        "willdurand/negotiation": "^3.1"
     },
     "require-dev": {
+        "api-platform/graphql": "^4.1",
         "doctrine/dbal": "^4.0",
         "larastan/larastan": "^2.0 || ^3.0",
+        "laravel/sanctum": "^4.0",
         "orchestra/testbench": "^9.1",
-        "phpunit/phpunit": "11.5.x-dev",
-        "api-platform/graphql": "^4.1",
-        "laravel/sanctum": "^4.0"
+        "phpdocumentor/type-resolver": "^1.7",
+        "phpstan/phpdoc-parser": "^1.29 || ^2.0",
+        "phpunit/phpunit": "11.5.x-dev"
     },
     "autoload": {
         "psr-4": {
@@ -74,7 +74,7 @@
     },
     "suggest": {
         "api-platform/graphql": "Enable GraphQl support.",
-        "phpdocumentor/reflection-docblock": ""
+        "phpstan/phpdoc-parser": "To support extracting metadata from PHPDoc."
     },
     "extra": {
         "laravel": {