Merge pull request #7 from overblog/spec-april2016

Migrate to spec april 2016

Author: mcg-web

composer.json

@@ -15,7 +15,8 @@
         "bin-dir": "bin"
     },
     "require": {
-        "php": "^5.4|~7.0"
+        "php": "^5.4|~7.0",
+        "webonyx/graphql-php": "^0.7.2"
     },
     "require-dev": {
         "fabpot/php-cs-fixer": "^1.11",
@@ -24,8 +25,7 @@
         "symfony/expression-language": "^2.7|^3.0",
         "symfony/filesystem": "^2.7|^3.0",
         "symfony/process": "^2.7|^3.0",
-        "symfony/yaml": "^2.7|^3.0",
-        "webonyx/graphql-php": "0.6.2"
+        "symfony/yaml": "^2.7|^3.0"
     },
     "autoload": {
         "psr-4": {

src/Generator/TypeGenerator.php

@@ -85,7 +85,7 @@ protected function generateTypes(array $value)
      */
     protected function generateResolve(array $value)
     {
-        return $this->callableCallbackFromArrayValue($value, 'resolve', '$value, $args, \\GraphQL\\Type\\Definition\\ResolveInfo $info');
+        return $this->callableCallbackFromArrayValue($value, 'resolve', '$value, $args, $context, \\GraphQL\\Type\\Definition\\ResolveInfo $info');
     }
 
     /**
@@ -94,7 +94,7 @@ protected function generateResolve(array $value)
      */
     protected function generateResolveType(array $value)
     {
-        return $this->callableCallbackFromArrayValue($value, 'resolveType', '$value');
+        return $this->callableCallbackFromArrayValue($value, 'resolveType', '$value, $context, \\GraphQL\\Type\\Definition\\ResolveInfo $info');
     }
 
     /**
@@ -103,7 +103,7 @@ protected function generateResolveType(array $value)
      */
     protected function generateIsTypeOf(array $value)
     {
-        return $this->callableCallbackFromArrayValue($value, 'isTypeOf', '$value, \\GraphQL\\Type\\Definition\\ResolveInfo $info');
+        return $this->callableCallbackFromArrayValue($value, 'isTypeOf', '$value, $context, \\GraphQL\\Type\\Definition\\ResolveInfo $info');
     }
 
     /**
@@ -112,7 +112,7 @@ protected function generateIsTypeOf(array $value)
      */
     protected function generateResolveField(array $value)
     {
-        return $this->callableCallbackFromArrayValue($value, 'resolveField', '$value, $args, \\GraphQL\\Type\\Definition\\ResolveInfo $info');
+        return $this->callableCallbackFromArrayValue($value, 'resolveField', '$value, $args, $context, \\GraphQL\\Type\\Definition\\ResolveInfo $info');
     }
 
     /**

tests/AbstractStarWarsTest.php

@@ -37,15 +37,18 @@ public function setUp()
         Resolver::setHumanType($this->getType('Human'));
         Resolver::setDroidType($this->getType('Droid'));
 
-        $this->schema = new Schema($this->getType('Query'));
+        $this->schema = new Schema(['query' => $this->getType('Query')]);
     }
 
     /**
      * Helper function to test a query and the expected response.
+     * @param $query
+     * @param $expected
+     * @param null $params
      */
     protected function assertValidQuery($query, $expected, $params = null)
     {
-        $result = GraphQL::execute($this->schema, $query, null, $params);
+        $result = GraphQL::execute($this->schema, $query, null, null, $params);
 
         $this->assertEquals(['data' => $expected], $result, json_encode($result));
     }

tests/StarWarsIntrospectionTest.php

@@ -33,8 +33,8 @@ public function testAllowsQueryingTheSchemaForTypes()
                     ['name' => 'Query'],
                     ['name' => 'Episode'],
                     ['name' => 'Character'],
-                    ['name' => 'Human'],
                     ['name' => 'String'],
+                    ['name' => 'Human'],
                     ['name' => 'Droid'],
                     ['name' => '__Schema'],
                     ['name' => '__Type'],
@@ -44,9 +44,10 @@ public function testAllowsQueryingTheSchemaForTypes()
                     ['name' => '__InputValue'],
                     ['name' => '__EnumValue'],
                     ['name' => '__Directive'],
+                    ['name' => '__DirectiveLocation'],
                     ['name' => 'ID'],
                     ['name' => 'Float'],
-                    ['name' => 'Int']
+                    ['name' => 'Int'],
                 ]
             ]
         ];