Merge pull request #91 from petecoop/build-schema

Build Schema & Schema Printer
webonyx · Feb 21, 2017 · ed41a4c · ed41a4c
2 parents 0bd7c9d + 664af3d
commit ed41a4c
Show file tree

Hide file tree

Showing 9 changed files with 2,599 additions and 8 deletions.
diff --git a/src/Executor/Values.php b/src/Executor/Values.php
@@ -94,7 +94,7 @@ public static function getVariableValues(Schema $schema, $definitionNodes, array
      * @return array
      * @throws Error
      */
-    public static function getArgumentValues($def, $node, $variableValues)
+    public static function getArgumentValues($def, $node, $variableValues = null)
     {
         $argDefs = $def->args;
         $argNodes = $node->arguments;

diff --git a/src/Type/Definition/Directive.php b/src/Type/Definition/Directive.php
@@ -107,7 +107,7 @@ public static function getInternalDirectives()
                         new FieldArgument([
                             'name' => 'if',
                             'type' => Type::nonNull(Type::boolean()),
-                            'description' => 'Skipped when true'
+                            'description' => 'Skipped when true.'
                         ])
                     ]
                 ]),

diff --git a/src/Type/Introspection.php b/src/Type/Introspection.php
@@ -235,8 +235,8 @@ public static function _schema()
                 'description' =>
                     'A GraphQL Schema defines the capabilities of a GraphQL ' .
                     'server. It exposes all available types and directives on ' .
-                    'the server, as well as the entry points for query and ' .
-                    'mutation operations.',
+                    'the server, as well as the entry points for query, mutation, and ' .
+                    'subscription operations.',
                 'fields' => [
                     'types' => [
                         'description' => 'A list of all types supported by this server.',
@@ -288,7 +288,7 @@ public static function _directive()
                 'name' => '__Directive',
                 'description' =>     'A Directive provides a way to describe alternate runtime execution and ' .
                     'type validation behavior in a GraphQL document.' .
-                    '\n\nIn some cases, you need to provide options to alter GraphQL’s ' .
+                    "\n\nIn some cases, you need to provide options to alter GraphQL's " .
                     'execution behavior in ways field arguments will not suffice, such as ' .
                     'conditionally including or skipping a field. Directives provide this by ' .
                     'describing additional information to the executor.',
@@ -664,7 +664,7 @@ public static function _typeKind()
         if (!isset(self::$map['__TypeKind'])) {
             self::$map['__TypeKind'] = new EnumType([
                 'name' => '__TypeKind',
-                'description' => 'An enum describing what kind of type a given __Type is.',
+                'description' => 'An enum describing what kind of type a given `__Type` is.',
                 'values' => [
                     'SCALAR' => [
                         'value' => TypeKind::SCALAR,

diff --git a/src/Utils.php b/src/Utils.php
@@ -180,6 +180,14 @@ public static function groupBy($traversable, callable $keyFn)
         return $grouped;
     }
 
+    public static function keyValMap($traversable, callable $keyFn, callable $valFn)
+    {
+        return array_reduce($traversable, function ($map, $item) use ($keyFn, $valFn) {
+            $map[$keyFn($item)] = $valFn($item);
+            return $map;
+        }, []);
+    }
+
     /**
      * @param $traversable
      * @param callable $predicate