fix(graphql): type builder output (#4791)

soyuka · web-flow · commit 608518d71865 · 2022-06-14T17:19:29.000+02:00
* Revert "fix(graphql): output creates its own type in TypeBuilder (#4766)" This reverts commit 1f4085e. * fix: resources order
diff --git a/features/graphql/mutation.feature b/features/graphql/mutation.feature
@@ -819,26 +819,6 @@ Feature: GraphQL mutation support
     And the JSON node "data.testCustomArgumentsDummyCustomMutation.dummyCustomMutation.result" should be equal to "18"
     And the JSON node "data.testCustomArgumentsDummyCustomMutation.clientMutationId" should be equal to "myId"
 
-  Scenario: Execute a custom mutation with output
-    When I send the following GraphQL request:
-    """
-    mutation {
-      testOutputDummyCustomMutation(input: {id: "/dummy_custom_mutations/1", operandA: 9, clientMutationId: "myId"}) {
-        dummyCustomMutation {
-          baz
-          bat
-        }
-        clientMutationId
-      }
-    }
-    """
-    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"
-    And the JSON node "data.testOutputDummyCustomMutation.dummyCustomMutation.baz" should be equal to "98"
-    And the JSON node "data.testOutputDummyCustomMutation.dummyCustomMutation.bat" should be equal to "9"
-    And the JSON node "data.testOutputDummyCustomMutation.clientMutationId" should be equal to "myId"
-
   Scenario: Uploading a file with a custom mutation
     Given I have the following file for a GraphQL request:
       | name | file     |
diff --git a/features/graphql/query.feature b/features/graphql/query.feature
@@ -432,32 +432,6 @@ Feature: GraphQL query support
     }
     """
 
-  Scenario: Custom item query with output
-    Given there are 2 dummyCustomQuery objects
-    When I send the following GraphQL request:
-    """
-    {
-      testItemOutputDummyCustomQuery(id: "/dummy_custom_queries/1",) {
-        baz
-        bat
-      }
-    }
-    """
-    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"
-    And the JSON should be equal to:
-    """
-    {
-      "data": {
-        "testItemOutputDummyCustomQuery": {
-          "baz": 46,
-          "bat": "Success!"
-        }
-      }
-    }
-    """
-
   @createSchema
   Scenario: Retrieve an item with different serialization groups for item_query and collection_query
     Given there are 1 dummy with different GraphQL serialization groups objects
diff --git a/src/Core/GraphQl/Type/TypeBuilder.php b/src/Core/GraphQl/Type/TypeBuilder.php
@@ -54,12 +54,6 @@ public function getResourceObjectType(?string $resourceClass, ResourceMetadata $
     {
         $shortName = $resourceMetadata->getShortName();
 
-        $ioMetadata = $resourceMetadata->getGraphqlAttribute($subscriptionName ?? $mutationName ?? $queryName, $input ? 'input' : 'output', null, true);
-        if (null !== $ioMetadata && \array_key_exists('class', $ioMetadata) && null !== $ioMetadata['class']) {
-            $resourceClass = $ioMetadata['class'];
-            $shortName = $ioMetadata['name'];
-        }
-
         if (null !== $mutationName) {
             $shortName = $mutationName.ucfirst($shortName);
         }
@@ -99,6 +93,11 @@ public function getResourceObjectType(?string $resourceClass, ResourceMetadata $
             return $resourceObjectType;
         }
 
+        $ioMetadata = $resourceMetadata->getGraphqlAttribute($subscriptionName ?? $mutationName ?? $queryName, $input ? 'input' : 'output', null, true);
+        if (null !== $ioMetadata && \array_key_exists('class', $ioMetadata) && null !== $ioMetadata['class']) {
+            $resourceClass = $ioMetadata['class'];
+        }
+
         $wrapData = !$wrapped && (null !== $mutationName || null !== $subscriptionName) && !$input && $depth < 1;
 
         $configuration = [
diff --git a/src/GraphQl/Type/TypeBuilder.php b/src/GraphQl/Type/TypeBuilder.php
@@ -59,12 +59,6 @@ public function getResourceObjectType(?string $resourceClass, ResourceMetadataCo
         $shortName = $operation->getShortName();
         $operationName = $operation->getName();
 
-        $ioMetadata = $input ? $operation->getInput() : $operation->getOutput();
-        if (null !== $ioMetadata && \array_key_exists('class', $ioMetadata) && null !== $ioMetadata['class']) {
-            $resourceClass = $ioMetadata['class'];
-            $shortName = $ioMetadata['name'] ?? $shortName;
-        }
-
         if ($operation instanceof Mutation) {
             $shortName = $operationName.ucfirst($shortName);
         }
@@ -108,6 +102,11 @@ public function getResourceObjectType(?string $resourceClass, ResourceMetadataCo
             return $resourceObjectType;
         }
 
+        $ioMetadata = $input ? $operation->getInput() : $operation->getOutput();
+        if (null !== $ioMetadata && \array_key_exists('class', $ioMetadata) && null !== $ioMetadata['class']) {
+            $resourceClass = $ioMetadata['class'];
+        }
+
         $wrapData = !$wrapped && ($operation instanceof Mutation || $operation instanceof Subscription) && !$input && $depth < 1;
 
         $configuration = [
diff --git a/src/Util/ReflectionClassRecursiveIterator.php b/src/Util/ReflectionClassRecursiveIterator.php
@@ -56,7 +56,11 @@ public static function getReflectionClassesFromDirectories(array $directories):
             }
         }
 
-        $declared = array_merge(get_declared_classes(), get_declared_interfaces());
+        $sortedClasses = get_declared_classes();
+        sort($sortedClasses);
+        $sortedInterfaces = get_declared_interfaces();
+        sort($sortedInterfaces);
+        $declared = array_merge($sortedClasses, $sortedInterfaces);
         foreach ($declared as $className) {
             $reflectionClass = new \ReflectionClass($className);
             $sourceFile = $reflectionClass->getFileName();
diff --git a/tests/Fixtures/TestBundle/DataTransformer/DummyCustomMutationDtoDataTransformer.php b/tests/Fixtures/TestBundle/DataTransformer/DummyCustomMutationDtoDataTransformer.php
diff --git a/tests/Fixtures/TestBundle/DataTransformer/DummyCustomQueryDtoDataTransformer.php b/tests/Fixtures/TestBundle/DataTransformer/DummyCustomQueryDtoDataTransformer.php
diff --git a/tests/Fixtures/TestBundle/Document/DummyCustomMutation.php b/tests/Fixtures/TestBundle/Document/DummyCustomMutation.php
@@ -14,7 +14,6 @@
 namespace ApiPlatform\Tests\Fixtures\TestBundle\Document;
 
 use ApiPlatform\Core\Annotation\ApiResource;
-use ApiPlatform\Tests\Fixtures\TestBundle\Dto\OutputDto;
 use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM;
 use Symfony\Component\Serializer\Annotation\Groups;
 
@@ -51,10 +50,6 @@
  *     "testCustomArguments"={
  *         "mutation"="app.graphql.mutation_resolver.dummy_custom",
  *         "args"={"operandC"={"type"="Int!"}}
- *     },
- *     "testOutput"={
- *         "mutation"="app.graphql.mutation_resolver.dummy_custom",
- *         "output"=OutputDto::class
  *     }
  * })
  *
diff --git a/tests/Fixtures/TestBundle/Document/DummyCustomQuery.php b/tests/Fixtures/TestBundle/Document/DummyCustomQuery.php
@@ -14,7 +14,6 @@
 namespace ApiPlatform\Tests\Fixtures\TestBundle\Document;
 
 use ApiPlatform\Core\Annotation\ApiResource;
-use ApiPlatform\Tests\Fixtures\TestBundle\Dto\OutputDto;
 use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM;
 
 /**
@@ -48,10 +47,6 @@
  *             "customArgumentCustomType"={"type"="DateTime!"}
  *         }
  *     },
- *     "testItemOutput"={
- *         "item_query"="app.graphql.query_resolver.dummy_custom_item",
- *         "output"=OutputDto::class
- *     },
  *     "testCollection"={
  *         "collection_query"="app.graphql.query_resolver.dummy_custom_collection"
  *     },
diff --git a/tests/Fixtures/TestBundle/Entity/DummyCustomMutation.php b/tests/Fixtures/TestBundle/Entity/DummyCustomMutation.php
@@ -14,7 +14,6 @@
 namespace ApiPlatform\Tests\Fixtures\TestBundle\Entity;
 
 use ApiPlatform\Core\Annotation\ApiResource;
-use ApiPlatform\Tests\Fixtures\TestBundle\Dto\OutputDto;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Annotation\Groups;
 
@@ -51,10 +50,6 @@
  *     "testCustomArguments"={
  *         "mutation"="app.graphql.mutation_resolver.dummy_custom",
  *         "args"={"operandC"={"type"="Int!"}}
- *     },
- *     "testOutput"={
- *         "mutation"="app.graphql.mutation_resolver.dummy_custom",
- *         "output"=OutputDto::class
  *     }
  * })
  *
diff --git a/tests/Fixtures/TestBundle/Entity/DummyCustomQuery.php b/tests/Fixtures/TestBundle/Entity/DummyCustomQuery.php
@@ -14,7 +14,6 @@
 namespace ApiPlatform\Tests\Fixtures\TestBundle\Entity;
 
 use ApiPlatform\Core\Annotation\ApiResource;
-use ApiPlatform\Tests\Fixtures\TestBundle\Dto\OutputDto;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
@@ -48,10 +47,6 @@
  *             "customArgumentCustomType"={"type"="DateTime!"}
  *         }
  *     },
- *     "testItemOutput"={
- *         "item_query"="app.graphql.query_resolver.dummy_custom_item",
- *         "output"=OutputDto::class
- *     },
  *     "testCollection"={
  *         "collection_query"="app.graphql.query_resolver.dummy_custom_collection"
  *     },
diff --git a/tests/Fixtures/app/config/config_common.yml b/tests/Fixtures/app/config/config_common.yml
@@ -306,18 +306,6 @@ services:
         tags:
             -  { name: 'api_platform.data_transformer' }
 
-    app.data_transformer.dummy_custom_query_dto:
-        class: 'ApiPlatform\Tests\Fixtures\TestBundle\DataTransformer\DummyCustomQueryDtoDataTransformer'
-        public: false
-        tags:
-            -  { name: 'api_platform.data_transformer' }
-
-    app.data_transformer.dummy_custom_mutation_dto:
-        class: 'ApiPlatform\Tests\Fixtures\TestBundle\DataTransformer\DummyCustomMutationDtoDataTransformer'
-        public: false
-        tags:
-            -  { name: 'api_platform.data_transformer' }
-
     app.data_transformer.custom_output_dto_fallback_same_class:
         class: 'ApiPlatform\Tests\Fixtures\TestBundle\DataTransformer\OutputDtoSameClassTransformer'
         public: false
diff --git a/tests/GraphQl/Type/TypeBuilderTest.php b/tests/GraphQl/Type/TypeBuilderTest.php
@@ -103,23 +103,23 @@ public function testGetResourceObjectType(): void
     public function testGetResourceObjectTypeOutputClass(): void
     {
         $resourceMetadata = new ResourceMetadataCollection('resourceClass', []);
-        $this->typesContainerProphecy->has('outputName')->shouldBeCalled()->willReturn(false);
-        $this->typesContainerProphecy->set('outputName', Argument::type(ObjectType::class))->shouldBeCalled();
+        $this->typesContainerProphecy->has('shortName')->shouldBeCalled()->willReturn(false);
+        $this->typesContainerProphecy->set('shortName', Argument::type(ObjectType::class))->shouldBeCalled();
         $this->typesContainerProphecy->has('Node')->shouldBeCalled()->willReturn(false);
         $this->typesContainerProphecy->set('Node', Argument::type(InterfaceType::class))->shouldBeCalled();
 
         /** @var Operation $operation */
-        $operation = (new Query())->withShortName('shortName')->withDescription('description')->withOutput(['class' => 'outputClass', 'name' => 'outputName']);
+        $operation = (new Query())->withShortName('shortName')->withDescription('description')->withOutput(['class' => 'outputClass']);
         /** @var ObjectType $resourceObjectType */
         $resourceObjectType = $this->typeBuilder->getResourceObjectType('resourceClass', $resourceMetadata, $operation, false);
-        $this->assertSame('outputName', $resourceObjectType->name);
+        $this->assertSame('shortName', $resourceObjectType->name);
         $this->assertSame('description', $resourceObjectType->description);
         $this->assertSame($this->defaultFieldResolver, $resourceObjectType->resolveFieldFn);
         $this->assertArrayHasKey('interfaces', $resourceObjectType->config);
         $this->assertArrayHasKey('fields', $resourceObjectType->config);
 
         $fieldsBuilderProphecy = $this->prophesize(FieldsBuilderInterface::class);
-        $fieldsBuilderProphecy->getResourceObjectTypeFields('outputClass', $operation, false, 0, ['class' => 'outputClass', 'name' => 'outputName'])->shouldBeCalled();
+        $fieldsBuilderProphecy->getResourceObjectTypeFields('outputClass', $operation, false, 0, ['class' => 'outputClass'])->shouldBeCalled();
         $this->fieldsBuilderLocatorProphecy->get('api_platform.graphql.fields_builder')->shouldBeCalled()->willReturn($fieldsBuilderProphecy->reveal());
         $resourceObjectType->config['fields']();
     }

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,11 @@ public static function getReflectionClassesFromDirectories(array $directories):`
`56`	`56`	`}`
`57`	`57`	`}`
`58`	`58`
`59`		`- $declared = array_merge(get_declared_classes(), get_declared_interfaces());`
	`59`	`+ $sortedClasses = get_declared_classes();`
	`60`	`+ sort($sortedClasses);`
	`61`	`+ $sortedInterfaces = get_declared_interfaces();`
	`62`	`+ sort($sortedInterfaces);`
	`63`	`+ $declared = array_merge($sortedClasses, $sortedInterfaces);`
`60`	`64`	`foreach ($declared as $className) {`
`61`	`65`	`$reflectionClass = new \ReflectionClass($className);`
`62`	`66`	`$sourceFile = $reflectionClass->getFileName();`