Add a nonNull wrapper around input objets (#2696)

Author: alanpoulain

features/graphql/mutation.feature

@@ -17,6 +17,10 @@ Feature: GraphQL mutation support
             type {
               name
               kind
+              ofType {
+                name
+                kind
+              }
             }
           }
         }
@@ -31,8 +35,9 @@ Feature: GraphQL mutation support
     And the JSON node "data.__type.fields[0].type.name" should match "/^delete[A-z0-9]+Payload$/"
     And the JSON node "data.__type.fields[0].type.kind" should be equal to "OBJECT"
     And the JSON node "data.__type.fields[0].args[0].name" should be equal to "input"
-    And the JSON node "data.__type.fields[0].args[0].type.name" should match "/^delete[A-z0-9]+Input$/"
-    And the JSON node "data.__type.fields[0].args[0].type.kind" should be equal to "INPUT_OBJECT"
+    And the JSON node "data.__type.fields[0].args[0].type.kind" should be equal to "NON_NULL"
+    And the JSON node "data.__type.fields[0].args[0].type.ofType.name" should match "/^delete[A-z0-9]+Input$/"
+    And the JSON node "data.__type.fields[0].args[0].type.ofType.kind" should be equal to "INPUT_OBJECT"
 
   Scenario: Create an item
     When I send the following GraphQL request:

src/GraphQl/Type/SchemaBuilder.php

@@ -26,6 +26,7 @@
 use Doctrine\Common\Inflector\Inflector;
 use GraphQL\Type\Definition\InputObjectType;
 use GraphQL\Type\Definition\InterfaceType;
+use GraphQL\Type\Definition\NonNull;
 use GraphQL\Type\Definition\ObjectType;
 use GraphQL\Type\Definition\Type as GraphQLType;
 use GraphQL\Type\Definition\WrappingType;
@@ -99,7 +100,13 @@ public function getSchema(): Schema
                 'fields' => $queryFields,
             ]),
             'typeLoader' => function ($name) {
-                return $this->graphqlTypes[$name];
+                $type = $this->graphqlTypes[$name];
+
+                if ($type instanceof WrappingType) {
+                    return $type->getWrappedType(true);
+                }
+
+                return $type;
             },
         ];
 
@@ -394,7 +401,7 @@ private function convertType(Type $type, bool $input = false, string $mutationNa
     /**
      * Gets the object type of the given resource.
      *
-     * @return ObjectType|InputObjectType
+     * @return ObjectType|NonNull
      */
     private function getResourceObjectType(?string $resourceClass, ResourceMetadata $resourceMetadata, bool $input = false, string $mutationName = null, bool $wrapped = false, int $depth = 0): GraphQLType
     {
@@ -451,7 +458,7 @@ private function getResourceObjectType(?string $resourceClass, ResourceMetadata
             'interfaces' => $wrapData ? [] : [$this->getNodeInterface()],
         ];
 
-        return $this->graphqlTypes[$shortName] = $input ? new InputObjectType($configuration) : new ObjectType($configuration);
+        return $this->graphqlTypes[$shortName] = $input ? GraphQLType::nonNull(new InputObjectType($configuration)) : new ObjectType($configuration);
     }
 
     /**