Merge pull request #989 from mcg-web/fix-type-shorthand

Add type shorthand failling test

Author: mcg-web

src/Generator/TypeBuilder.php

@@ -694,10 +694,12 @@ public function buildField(array $fieldConfig, string $fieldname)
         // Convert to object for better readability
         $c = (object) $fieldConfig;
 
+        // TODO(any): modify `InputValidator` and `TypeDecoratorListener` to support it before re-enabling this
+        // see https://github.com/overblog/GraphQLBundle/issues/973
         // If there is only 'type', use shorthand
-        if (1 === count($fieldConfig) && isset($c->type)) {
+        /*if (1 === count($fieldConfig) && isset($c->type)) {
             return $this->buildType($c->type);
-        }
+        }*/
 
         $field = Collection::assoc()
             ->addItem('type', $this->buildType($c->type));

tests/Functional/App/config/typeShorthand/config.yml

@@ -0,0 +1,20 @@
+imports:
+    - { resource: ../config.yml }
+framework:
+    annotations: true
+    validation:
+        enabled: true
+        enable_annotations: true
+
+overblog_graphql:
+    errors_handler:
+        debug: true
+    definitions:
+        class_namespace: "Overblog\\GraphQLBundle\\TypeShorthand\\__DEFINITIONS__"
+        schema:
+            query: RootQuery
+        mappings:
+            types:
+                -
+                    type: yaml
+                    dir: "%kernel.project_dir%/config/typeShorthand/mapping"

tests/Functional/App/config/typeShorthand/mapping/schema.types.yml

@@ -0,0 +1,41 @@
+RootQuery:
+    type: object
+    config:
+        fields:
+            user:
+               type: User!
+               args:
+                    auth:
+                        type: AuthInput!
+                        validation: cascade
+               resolve: >
+                     @={
+                       "username": args["auth"]["username"],
+                       "address": {
+                         "street": args["auth"]["username"] ~ " foo street",
+                         "zipcode": "12345"
+                       }
+                     }
+
+AuthInput:
+    type: input-object
+    config:
+        fields:
+            username:
+                type: String!
+                validation:
+                  - NotBlank: ~
+            password: String!
+User:
+    type: object
+    config:
+        fields:
+            username: String!
+            address: Address!
+
+Address:
+    type: object
+    config:
+        fields:
+            street: String!
+            zipcode: String!

tests/Functional/TypeShorthand/TypeShorthandTest.php

@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Overblog\GraphQLBundle\Tests\Functional\AutoConfigure;
+
+use Doctrine\Common\Annotations\Reader;
+use Overblog\GraphQLBundle\Tests\Functional\TestCase;
+use Symfony\Component\Validator\Validation;
+
+class TypeShorthandTest extends TestCase
+{
+    protected function setUp(): void
+    {
+        if (!class_exists(Validation::class)) {
+            $this->markTestSkipped('Symfony validator component is not installed');
+        }
+        if (!interface_exists(Reader::class)) {
+            $this->markTestSkipped('Symfony validator component requires doctrine/annotations but it is not installed');
+        }
+        static::bootKernel(['test_case' => 'typeShorthand']);
+    }
+
+    public function testQuery(): void
+    {
+        $query = 'query { user(auth: {username: "bar", password: "baz"}) {username, address {street, zipcode}} }';
+        $expectedData = ['user' => ['username' => 'bar', 'address' => ['street' => 'bar foo street', 'zipcode' => '12345']]];
+
+        $this->assertGraphQL($query, $expectedData);
+    }
+}