Merge branch 'master' into develop

rebing · Dec 17, 2018 · 9dc64aa · 9dc64aa
2 parents a6e3521 + dd1a5af
commit 9dc64aa
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 8 deletions.
diff --git a/src/Rebing/GraphQL/GraphQL.php b/src/Rebing/GraphQL/GraphQL.php
@@ -33,13 +33,7 @@ public function schema($schema = null)
             $this->type($name);
         }
 
-        $schemaName = is_string($schema) ? $schema : config('graphql.default_schema', 'default');
-
-        if (!is_array($schema) && !isset($this->schemas[$schemaName])) {
-            throw new SchemaNotFound('Type '.$schemaName.' not found.');
-        }
-
-        $schema = is_array($schema) ? $schema:$this->schemas[$schemaName];
+        $schema = $this->getSchemaConfiguration($schema);
 
         $schemaQuery = array_get($schema, 'query', []);
         $schemaMutation = array_get($schema, 'mutation', []);
@@ -69,7 +63,7 @@ public function schema($schema = null)
         $mutation = $this->objectType($schemaMutation, [
             'name' => 'Mutation'
         ]);
-        
+
         $subscription = $this->objectType($schemaSubscription, [
             'name' => 'Subscription'
         ]);
@@ -336,4 +330,15 @@ public static function routeNameTransformer ($name, $schemaParameterPattern, $qu
 
         return $routeName ?: preg_replace($schemaParameterPattern, '{' . $name . '}', $queryRoute);
     }
+
+    protected function getSchemaConfiguration($schema)
+    {
+        $schemaName = is_string($schema) ? $schema : config('graphql.default_schema', 'default');
+
+        if (!is_array($schema) && !isset($this->schemas[$schemaName])) {
+            throw new SchemaNotFound('Type ' . $schemaName . ' not found.');
+        }
+
+        return is_array($schema) ? $schema : $this->schemas[$schemaName];
+    }
 }
diff --git a/src/Rebing/GraphQL/Support/Field.php b/src/Rebing/GraphQL/Support/Field.php
@@ -9,6 +9,7 @@
 use GraphQL\Type\Definition\InputObjectType;
 use GraphQL\Type\Definition\ListOfType;
 use GraphQL\Type\Definition\WrappingType;
+use GraphQL\Type\Definition\NonNull;
 
 class Field extends Fluent {
 
@@ -93,6 +94,11 @@ public function inferRulesFromType($type, $prefix, $resolutionArguments)
     {
         $rules = [];
 
+        // make sure we are dealing with the actual type
+        if ($type instanceof NonNull) {
+            $type = $type->getWrappedType();
+        }
+
         // if it is an array type, add an array validation component
         if ($type instanceof ListOfType) {
             $prefix = "{$prefix}.*";