Merge pull request #61 from overblog/spec-april2016

GraphQL Spec april 2016 migration
overblog · Sep 14, 2016 · f100592 · f100592
2 parents 07c1d3a + 1a35c6f
commit f100592
Show file tree

Hide file tree

Showing 10 changed files with 41 additions and 14 deletions.
diff --git a/Definition/Builder/SchemaBuilder.php b/Definition/Builder/SchemaBuilder.php
@@ -46,6 +46,11 @@ public function create($queryAlias = null, $mutationAlias = null, $subscriptionA
         $mutation = $this->typeResolver->resolve($mutationAlias);
         $subscription = $this->typeResolver->resolve($subscriptionAlias);
 
-        return new Schema($query, $mutation, $subscription);
+        return new Schema([
+            'query' => $query,
+            'mutation' => $mutation,
+            'subscription' => $subscription,
+            'types' => $this->typeResolver->getSolutions(),
+        ]);
     }
 }
diff --git a/Generator/TypeGenerator.php b/Generator/TypeGenerator.php
@@ -72,14 +72,25 @@ protected function resolveTypeCode($alias)
         return  sprintf('$container->get(\'%s\')->resolve(%s)', 'overblog_graphql.type_resolver', var_export($alias, true));
     }
 
+    /**
+     * todo replace generateResolve in vendor after spec-april2016 is merged
+     *
+     * @param array $value
+     * @return string
+     */
+    protected function generateResolve2(array $value)
+    {
+        return $this->callableCallbackFromArrayValue($value, 'resolve', '$value, $args, $context, \\GraphQL\\Type\\Definition\\ResolveInfo $info');
+    }
+
     protected function generateResolve(array $value)
     {
         $accessIsSet = $this->arrayKeyExistsAndIsNotNull($value, 'access');
         $fieldOptions = $value;
         $fieldOptions['resolve'] = $this->arrayKeyExistsAndIsNotNull($fieldOptions, 'resolve') ? $fieldOptions['resolve'] : $this->defaultResolver;
 
         if (!$accessIsSet || true === $fieldOptions['access']) { // access granted  to this field
-            $resolveCallback = parent::generateResolve($fieldOptions);
+            $resolveCallback = $this->generateResolve2($fieldOptions);
             if ('null' === $resolveCallback) {
                 return $resolveCallback;
             }
@@ -88,10 +99,10 @@ protected function generateResolve(array $value)
             $resolveInfoClass = $this->shortenClassName('\\GraphQL\\Type\\Definition\\ResolveInfo');
 
             $code = <<<'CODE'
-function ($value, $args, %s $info) <closureUseStatements> {
+function ($value, $args, $context, %s $info) <closureUseStatements> {
 <spaces><spaces>$resolverCallback = %s;
 
-<spaces><spaces>return call_user_func_array($resolverCallback, [$value, new %s($args), $info]);
+<spaces><spaces>return call_user_func_array($resolverCallback, [$value, new %s($args), $context, $info]);
 <spaces>}
 CODE;
 
@@ -101,17 +112,17 @@ function ($value, $args, %s $info) <closureUseStatements> {
 
             return sprintf('function () { throw new %s(\'Access denied to this field.\'); }', $exceptionClass);
         } else { // wrap resolver with access
-            $resolveCallback = parent::generateResolve($fieldOptions);
-            $accessChecker = $this->callableCallbackFromArrayValue($fieldOptions, 'access', '$value, $args, \\GraphQL\\Type\\Definition\\ResolveInfo $info, $object');
+            $resolveCallback = $this->generateResolve2($fieldOptions);
+            $accessChecker = $this->callableCallbackFromArrayValue($fieldOptions, 'access', '$value, $args, $context, \\GraphQL\\Type\\Definition\\ResolveInfo $info, $object');
             $resolveInfoClass = $this->shortenClassName('\\GraphQL\\Type\\Definition\\ResolveInfo');
             $argumentClass = $this->shortenClassName('\\Overblog\\GraphQLBundle\\Definition\\Argument');
 
             $code = <<<'CODE'
-function ($value, $args, %s $info) <closureUseStatements> {
+function ($value, $args, $context, %s $info) <closureUseStatements> {
 <spaces><spaces>$resolverCallback = %s;
 <spaces><spaces>$accessChecker = %s;
 <spaces><spaces>$isMutation = $info instanceof ResolveInfo && 'mutation' === $info->operation->operation && $info->parentType === $info->schema->getMutationType();
-<spaces><spaces>return $container->get('overblog_graphql.access_resolver')->resolve($accessChecker, $resolverCallback, [$value, new %s($args), $info], $isMutation);
+<spaces><spaces>return $container->get('overblog_graphql.access_resolver')->resolve($accessChecker, $resolverCallback, [$value, new %s($args), $context, $info], $isMutation);
 <spaces>}
 CODE;
 

diff --git a/Request/Executor.php b/Request/Executor.php
@@ -82,6 +82,7 @@ public function execute(array $data, array $context = [])
             $this->schema,
             isset($data['query']) ? $data['query'] : null,
             $context,
+            $context,
             $data['variables'],
             $data['operationName']
         );

diff --git a/Resolver/AbstractResolver.php b/Resolver/AbstractResolver.php
@@ -47,6 +47,14 @@ public function getSolution($name)
         return isset($this->solutions[$name]) ? $this->solutions[$name] : null;
     }
 
+    /**
+     * @return array
+     */
+    public function getSolutions()
+    {
+        return $this->solutions;
+    }
+
     /**
      * @param $name
      *

diff --git a/Resolver/Resolver.php b/Resolver/Resolver.php
@@ -22,12 +22,12 @@ class Resolver
      */
     private static $accessor;
 
-    public static function defaultResolveFn($objectOrArray, $args, ResolveInfo $info)
+    public static function defaultResolveFn($objectOrArray, $args, $context, ResolveInfo $info)
     {
         $fieldName = $info->fieldName;
         $value = static::valueFromObjectOrArray($objectOrArray, $fieldName);
 
-        return $value instanceof \Closure ? $value($objectOrArray, $args, $info) : $value;
+        return $value instanceof \Closure ? $value($objectOrArray, $args, $context, $info) : $value;
     }
 
     public static function valueFromObjectOrArray($objectOrArray, $fieldName)

diff --git a/Resolver/ResolverInterface.php b/Resolver/ResolverInterface.php
@@ -19,5 +19,7 @@ public function addSolution($name, $solution, $extraOptions = []);
 
     public function getSolution($name);
 
+    public function getSolutions();
+
     public function getSolutionOptions($name);
 }
diff --git a/Tests/Functional/Command/GraphDumpSchemaCommandTest.php b/Tests/Functional/Command/GraphDumpSchemaCommandTest.php
@@ -38,6 +38,6 @@ public function testExecute()
         );
 
         $this->assertEquals(0, $commandTester->getStatusCode());
-        $this->assertEquals(file_get_contents(__DIR__.'/schema.json'), file_get_contents($file));
+        $this->assertEquals(trim(file_get_contents(__DIR__.'/schema.json')), file_get_contents($file));
     }
 }
diff --git a/Tests/Functional/Command/schema.json b/Tests/Functional/Command/schema.json
diff --git a/Tests/Resolver/ResolverTest.php b/Tests/Resolver/ResolverTest.php
@@ -27,7 +27,7 @@ public function testDefaultResolveFn($fieldName, $source, $expected)
     {
         $info = new ResolveInfo(['fieldName' => $fieldName]);
 
-        $this->assertEquals($expected, Resolver::defaultResolveFn($source, [], $info));
+        $this->assertEquals($expected, Resolver::defaultResolveFn($source, [], [], $info));
     }
 
     public function resolverProvider()

diff --git a/composer.json b/composer.json
@@ -29,7 +29,7 @@
         "symfony/framework-bundle": "^2.7|^3.0",
         "symfony/options-resolver": "^2.7|^3.0",
         "symfony/property-access": "^2.7|^3.0",
-        "webonyx/graphql-php": "0.6.4"
+        "webonyx/graphql-php": "0.7.0"
     },
     "suggest": {
         "twig/twig": "If you want to use graphiQL."