Merge 25

features/graphql/input_output.feature

@@ -5,12 +5,14 @@ Feature: GraphQL DTO input and output
 
   @createSchema
   Scenario: Retrieve an Output with GraphQL
+    Given there is a RelatedDummy with 0 friends
     When I add "Content-Type" header equal to "application/ld+json"
     And I send a "POST" request to "/dummy_dto_input_outputs" with body:
     """
     {
       "foo": "test",
-      "bar": 1
+      "bar": 1,
+      "relatedDummies": ["/related_dummies/1"]
     }
     """
     Then the response status code should be 201
@@ -22,20 +24,51 @@ Feature: GraphQL DTO input and output
         "hydra": "http://www.w3.org/ns/hydra/core#",
         "id": "OutputDto/id",
         "baz": "OutputDto/baz",
-        "bat": "OutputDto/bat"
+        "bat": "OutputDto/bat",
+        "relatedDummies": "OutputDto/relatedDummies"
       },
       "@type": "DummyDtoInputOutput",
       "@id": "/dummy_dto_input_outputs/1",
       "id": 1,
       "baz": 1,
-      "bat": "test"
+      "bat": "test",
+      "relatedDummies": [
+        {
+          "@context": "/contexts/RelatedDummy",
+          "@id": "/related_dummies/1",
+          "@type": "https://schema.org/Product",
+          "name": "RelatedDummy with friends",
+          "dummyDate": null,
+          "thirdLevel": null,
+          "relatedToDummyFriend": [],
+          "dummyBoolean": null,
+          "embeddedDummy": {
+            "dummyName": null,
+            "dummyBoolean": null,
+            "dummyDate": null,
+            "dummyFloat": null,
+            "dummyPrice": null,
+            "symfony": null
+          },
+          "id": 1,
+          "symfony": "symfony",
+          "age": null
+        }
+      ]
     }
     """
     When I send the following GraphQL request:
     """
     {
       dummyDtoInputOutput(id: "/dummy_dto_input_outputs/1") {
-        _id, id, baz
+        _id, id, baz,
+        relatedDummies {
+          edges {
+            node {
+              name
+            }
+          }
+        }
       }
     }
     """
@@ -49,7 +82,16 @@ Feature: GraphQL DTO input and output
         "dummyDtoInputOutput": {
           "_id": 1,
           "id": "/dummy_dto_input_outputs/1",
-          "baz": 1
+          "baz": 1,
+          "relatedDummies": {
+            "edges": [
+              {
+                "node": {
+                  "name": "RelatedDummy with friends"
+                }
+              }
+            ]
+          }
         }
       }
     }

features/jsonld/input_output.feature

@@ -151,13 +151,15 @@ Feature: JSON-LD DTO input and output
         "hydra": "http://www.w3.org/ns/hydra/core#",
         "id": "OutputDto/id",
         "baz": "OutputDto/baz",
-        "bat": "OutputDto/bat"
+        "bat": "OutputDto/bat",
+        "relatedDummies": "OutputDto/relatedDummies"
       },
       "@type": "DummyDtoInputOutput",
       "@id": "/dummy_dto_input_outputs/1",
       "id": 1,
       "baz": 1,
-      "bat": "test"
+      "bat": "test",
+      "relatedDummies": []
     }
     """
     When I add "Accept" header equal to "application/ld+json"
@@ -178,13 +180,15 @@ Feature: JSON-LD DTO input and output
         "hydra": "http://www.w3.org/ns/hydra/core#",
         "id": "OutputDto/id",
         "baz": "OutputDto/baz",
-        "bat": "OutputDto/bat"
+        "bat": "OutputDto/bat",
+        "relatedDummies": "OutputDto/relatedDummies"
       },
       "@type": "DummyDtoInputOutput",
       "@id": "/dummy_dto_input_outputs/1",
       "id": 1,
       "baz": 2,
-      "bat": "test"
+      "bat": "test",
+      "relatedDummies": []
     }
     """
 
@@ -237,13 +241,15 @@ Feature: JSON-LD DTO input and output
         "hydra": "http://www.w3.org/ns/hydra/core#",
         "id": "OutputDto/id",
         "baz": "OutputDto/baz",
-        "bat": "OutputDto/bat"
+        "bat": "OutputDto/bat",
+        "relatedDummies": "OutputDto/relatedDummies"
       },
       "@type": "DummyDtoNoInput",
       "@id": "/dummy_dto_no_inputs/1",
       "id": 1,
       "baz": 1,
-      "bat": "test"
+      "bat": "test",
+      "relatedDummies": []
     }
     """
 
@@ -260,13 +266,15 @@ Feature: JSON-LD DTO input and output
         "hydra": "http://www.w3.org/ns/hydra/core#",
         "id": "OutputDto/id",
         "baz": "OutputDto/baz",
-        "bat": "OutputDto/bat"
+        "bat": "OutputDto/bat",
+        "relatedDummies": "OutputDto/relatedDummies"
       },
       "@type": "DummyDtoNoInput",
       "@id": "/dummy_dto_no_inputs/1",
       "id": 1,
       "baz": 1,
-      "bat": "testtest"
+      "bat": "testtest",
+      "relatedDummies": []
     }
     """
 

phpstan.neon.dist

@@ -8,7 +8,7 @@ parameters:
 	symfony:
 		container_xml_path: tests/Fixtures/app/var/cache/test/appAppKernelTestDebugContainer.xml
 		constant_hassers: false
-	autoload_files:
+	bootstrapFiles:
 		- tests/Fixtures/app/AppKernel.php
 	excludes_analyse:
 		- tests/Fixtures/app/var/cache
@@ -132,3 +132,10 @@ parameters:
 		-
 			message: "#Call to function method_exists\\(\\) with ApiPlatform\\\\Core\\\\JsonApi\\\\Serializer\\\\ItemNormalizer and 'setCircularReferenc…' will always evaluate to false\\.#"
 			path: tests/JsonApi/Serializer/ItemNormalizerTest.php
+
+		# Waiting to be fixed by https://github.com/Roave/BetterReflection/issues/663
+		-
+			message: '#Call to private method getNestedFieldPath\(\) of class ApiPlatform\\Core\\Bridge\\Elasticsearch\\DataProvider\\Filter\\AbstractFilter\.#'
+			paths:
+				- src/Bridge/Elasticsearch/DataProvider/Filter/OrderFilter.php
+				- src/Bridge/Elasticsearch/DataProvider/Filter/AbstractSearchFilter.php

src/Bridge/Doctrine/Orm/Filter/ExistsFilter.php

@@ -22,6 +22,7 @@
 use Doctrine\ORM\Query\Expr\Join;
 use Doctrine\ORM\QueryBuilder;
 use Psr\Log\LoggerInterface;
+use Symfony\Component\HttpFoundation\InputBag;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\Serializer\NameConverter\NameConverterInterface;
@@ -204,8 +205,13 @@ protected function extractProperties(Request $request/*, string $resourceClass*/
 
         @trigger_error(sprintf('The use of "%s::extractProperties()" is deprecated since 2.2. Use the "filters" key of the context instead.', __CLASS__), E_USER_DEPRECATED);
 
-        $properties = $request->query->get($this->existsParameterName);
+        // symfony > 5.1
+        if (class_exists(InputBag::class)) {
+            return $request->query->all($this->existsParameterName);
+        }
 
+        $properties = $request->query->get($this->existsParameterName);
+        /* @phpstan-ignore-next-line */
         return \is_array($properties) ? $properties : [];
     }
 }

src/Bridge/Doctrine/Orm/Filter/OrderFilter.php

@@ -20,6 +20,7 @@
 use Doctrine\ORM\Query\Expr\Join;
 use Doctrine\ORM\QueryBuilder;
 use Psr\Log\LoggerInterface;
+use Symfony\Component\HttpFoundation\InputBag;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\Serializer\NameConverter\NameConverterInterface;
@@ -120,8 +121,14 @@ protected function filterProperty(string $property, $direction, QueryBuilder $qu
     protected function extractProperties(Request $request/*, string $resourceClass*/): array
     {
         @trigger_error(sprintf('The use of "%s::extractProperties()" is deprecated since 2.2. Use the "filters" key of the context instead.', __CLASS__), E_USER_DEPRECATED);
-        $properties = $request->query->get($this->orderParameterName);
 
+        // symfony > 5.1
+        if (class_exists(InputBag::class)) {
+            return $request->query->all($this->orderParameterName);
+        }
+
+        $properties = $request->query->get($this->orderParameterName);
+        /* @phpstan-ignore-next-line */
         return \is_array($properties) ? $properties : [];
     }
 }

src/Bridge/Symfony/Bundle/DependencyInjection/ApiPlatformExtension.php

@@ -43,6 +43,7 @@
 use Symfony\Component\Config\Resource\DirectoryResource;
 use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Exception\RuntimeException;
 use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
@@ -147,6 +148,19 @@ private function registerCommonConfiguration(ContainerBuilder $container, array
         $loader->load('data_provider.xml');
         $loader->load('filter.xml');
 
+        $container->getDefinition('api_platform.operation_method_resolver')
+            ->setDeprecated(...$this->buildDeprecationArgs('2.5', 'The "%service_id%" service is deprecated since API Platform 2.5.'));
+        $container->getDefinition('api_platform.formats_provider')
+            ->setDeprecated(...$this->buildDeprecationArgs('2.5', 'The "%service_id%" service is deprecated since API Platform 2.5.'));
+        $container->getAlias('ApiPlatform\Core\Api\OperationAwareFormatsProviderInterface')
+            ->setDeprecated(...$this->buildDeprecationArgs('2.5', 'The "%alias_id%" alias is deprecated since API Platform 2.5.'));
+        $container->getDefinition('api_platform.operation_path_resolver.underscore')
+            ->setDeprecated(...$this->buildDeprecationArgs('2.1', 'The "%service_id%" service is deprecated since API Platform 2.1 and will be removed in 3.0. Use "api_platform.path_segment_name_generator.underscore" instead.'));
+        $container->getDefinition('api_platform.operation_path_resolver.dash')
+            ->setDeprecated(...$this->buildDeprecationArgs('2.1', 'The "%service_id%" service is deprecated since API Platform 2.1 and will be removed in 3.0. Use "api_platform.path_segment_name_generator.dash" instead.'));
+        $container->getDefinition('api_platform.filters')
+            ->setDeprecated(...$this->buildDeprecationArgs('2.1', 'The "%service_id%" service is deprecated since 2.1 and will be removed in 3.0. Use the "api_platform.filter_locator" service instead.'));
+
         if (class_exists(Uuid::class)) {
             $loader->load('ramsey_uuid.xml');
         }
@@ -460,6 +474,11 @@ private function registerLegacyBundlesConfiguration(ContainerBuilder $container,
 
         if (isset($bundles['NelmioApiDocBundle']) && $config['enable_nelmio_api_doc']) {
             $loader->load('nelmio_api_doc.xml');
+
+            $container->getDefinition('api_platform.nelmio_api_doc.annotations_provider')
+                ->setDeprecated(...$this->buildDeprecationArgs('2.2', 'The "%service_id%" service is deprecated since API Platform 2.2 and will be removed in 3.0. NelmioApiDocBundle 3 has native support for API Platform.'));
+            $container->getDefinition('api_platform.nelmio_api_doc.parser')
+                ->setDeprecated(...$this->buildDeprecationArgs('2.2', 'The "%service_id%" service is deprecated since API Platform 2.2 and will be removed in 3.0. NelmioApiDocBundle 3 has native support for API Platform.'));
         }
     }
 
@@ -668,4 +687,11 @@ private function registerSecurityConfiguration(ContainerBuilder $container, XmlF
             $loader->load('security.xml');
         }
     }
+
+    private function buildDeprecationArgs(string $version, string $message): array
+    {
+        return method_exists(Definition::class, 'getDeprecation')
+            ? ['api-platform/core', $version, $message]
+            : [true, $message];
+    }
 }

src/Bridge/Symfony/Bundle/DependencyInjection/Configuration.php

@@ -27,6 +27,7 @@
 use Symfony\Bundle\FullStack;
 use Symfony\Bundle\MercureBundle\MercureBundle;
 use Symfony\Bundle\TwigBundle\TwigBundle;
+use Symfony\Component\Config\Definition\BaseNode;
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
@@ -87,7 +88,7 @@ public function getConfigTreeBuilder()
                 ->booleanNode('show_webby')->defaultTrue()->info('If true, show Webby on the documentation page')->end()
                 ->scalarNode('default_operation_path_resolver')
                     ->defaultValue('api_platform.operation_path_resolver.underscore')
-                    ->setDeprecated('The use of the `default_operation_path_resolver` has been deprecated in 2.1 and will be removed in 3.0. Use `path_segment_name_generator` instead.')
+                    ->setDeprecated(...$this->buildDeprecationArgs('2.1', 'The use of the `default_operation_path_resolver` has been deprecated in 2.1 and will be removed in 3.0. Use `path_segment_name_generator` instead.'))
                     ->info('Specify the default operation path resolver to use for generating resources operations path.')
                 ->end()
                 ->scalarNode('name_converter')->defaultNull()->info('Specify a name converter to use.')->end()
@@ -111,7 +112,7 @@ public function getConfigTreeBuilder()
                 ->booleanNode('enable_fos_user')->defaultValue(class_exists(FOSUserBundle::class))->info('Enable the FOSUserBundle integration.')->end()
                 ->booleanNode('enable_nelmio_api_doc')
                     ->defaultFalse()
-                    ->setDeprecated('Enabling the NelmioApiDocBundle integration has been deprecated in 2.2 and will be removed in 3.0. NelmioApiDocBundle 3 has native support for API Platform.')
+                    ->setDeprecated(...$this->buildDeprecationArgs('2.2', 'Enabling the NelmioApiDocBundle integration has been deprecated in 2.2 and will be removed in 3.0. NelmioApiDocBundle 3 has native support for API Platform.'))
                     ->info('Enable the NelmioApiDocBundle integration.')
                 ->end()
                 ->booleanNode('enable_swagger')->defaultTrue()->info('Enable the Swagger documentation and export.')->end()
@@ -567,4 +568,11 @@ private function addDefaultsSection(ArrayNodeDefinition $rootNode): void
             $defaultsNode->children()->variableNode($snakeCased);
         }
     }
+
+    private function buildDeprecationArgs(string $version, string $message): array
+    {
+        return method_exists(BaseNode::class, 'getDeprecation')
+            ? ['api-platform/core', $version, $message]
+            : [$message];
+    }
 }

src/Bridge/Symfony/Bundle/Resources/config/api.xml

@@ -18,7 +18,6 @@
         <service id="api_platform.operation_method_resolver" class="ApiPlatform\Core\Bridge\Symfony\Routing\OperationMethodResolver" public="false">
             <argument type="service" id="api_platform.router" />
             <argument type="service" id="api_platform.metadata.resource.metadata_factory" />
-            <deprecated>The "%service_id%" service is deprecated since API Platform 2.5.</deprecated>
         </service>
 
         <service id="api_platform.route_name_resolver" class="ApiPlatform\Core\Bridge\Symfony\Routing\RouteNameResolver" public="false">
@@ -71,11 +70,9 @@
         <service id="api_platform.formats_provider" class="ApiPlatform\Core\Api\FormatsProvider">
             <argument type="service" id="api_platform.metadata.resource.metadata_factory" />
             <argument>%api_platform.formats%</argument>
-            <deprecated>The "%service_id%" service is deprecated since API Platform 2.5.</deprecated>
         </service>
 
         <service id="ApiPlatform\Core\Api\OperationAwareFormatsProviderInterface" alias="api_platform.formats_provider">
-            <deprecated>The "%alias_id%" alias is deprecated since API Platform 2.5.</deprecated>
         </service>
 
         <!-- Serializer -->
@@ -139,13 +136,9 @@
             <argument type="service" id="api_platform.path_segment_name_generator" />
         </service>
 
-        <service id="api_platform.operation_path_resolver.underscore" class="ApiPlatform\Core\PathResolver\UnderscoreOperationPathResolver" public="false">
-            <deprecated>The "%service_id%" service is deprecated since API Platform 2.1 and will be removed in 3.0. Use "api_platform.path_segment_name_generator.underscore" instead.</deprecated>
-        </service>
+        <service id="api_platform.operation_path_resolver.underscore" class="ApiPlatform\Core\PathResolver\UnderscoreOperationPathResolver" public="false" />
 
-        <service id="api_platform.operation_path_resolver.dash" class="ApiPlatform\Core\PathResolver\DashOperationPathResolver" public="false">
-            <deprecated>The "%service_id%" service is deprecated since API Platform 2.1 and will be removed in 3.0. Use "api_platform.path_segment_name_generator.dash" instead.</deprecated>
-        </service>
+        <service id="api_platform.operation_path_resolver.dash" class="ApiPlatform\Core\PathResolver\DashOperationPathResolver" public="false" />
 
         <!-- Path name generator -->
 

src/Bridge/Symfony/Bundle/Resources/config/filter.xml

@@ -14,7 +14,6 @@
         <service id="api_platform.filter_collection_factory" class="ApiPlatform\Core\Api\FilterCollectionFactory" />
 
         <service id="api_platform.filters" class="ApiPlatform\Core\Api\FilterCollection">
-            <deprecated>The "%service_id%" service is deprecated since 2.1 and will be removed in 3.0. Use the "api_platform.filter_locator" service instead.</deprecated>
             <factory service="api_platform.filter_collection_factory" method="createFilterCollectionFromLocator" />
             <argument type="service" id="api_platform.filter_locator" />
         </service>

src/Bridge/Symfony/Bundle/Resources/config/nelmio_api_doc.xml

@@ -6,8 +6,6 @@
 
     <services>
         <service id="api_platform.nelmio_api_doc.annotations_provider" class="ApiPlatform\Core\Bridge\NelmioApiDoc\Extractor\AnnotationsProvider\ApiPlatformProvider">
-            <deprecated>The "%service_id%" service is deprecated since API Platform 2.2 and will be removed in 3.0. NelmioApiDocBundle 3 has native support for API Platform.</deprecated>
-
             <argument type="service" id="api_platform.metadata.resource.name_collection_factory" />
             <argument type="service" id="api_platform.hydra.normalizer.documentation" />
             <argument type="service" id="api_platform.metadata.resource.metadata_factory" />
@@ -18,8 +16,6 @@
         </service>
 
         <service id="api_platform.nelmio_api_doc.parser" class="ApiPlatform\Core\Bridge\NelmioApiDoc\Parser\ApiPlatformParser">
-            <deprecated>The "%service_id%" service is deprecated since API Platform 2.2 and will be removed in 3.0. NelmioApiDocBundle 3 has native support for API Platform.</deprecated>
-
             <argument type="service" id="api_platform.metadata.resource.metadata_factory" />
             <argument type="service" id="api_platform.metadata.property.name_collection_factory" />
             <argument type="service" id="api_platform.metadata.property.metadata_factory" />

src/GraphQl/Action/EntrypointAction.php

@@ -92,7 +92,7 @@ private function parseRequest(Request $request): array
     {
         $query = $request->query->get('query');
         $operationName = $request->query->get('operationName');
-        if ($variables = $request->query->get('variables', [])) {
+        if ($variables = $request->query->get('variables') ?: []) {
             $variables = $this->decodeVariables($variables);
         }