Merge pull request #23 from mcg-web/allow_graphql-php_0.12

Allow webonyx/graphql-php 0.12
overblog · May 30, 2018 · acea33b · acea33b
2 parents f6881be + 147d139
commit acea33b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -12,11 +12,14 @@
     ],
     "config" : {
         "sort-packages": true,
-        "bin-dir": "bin"
+        "bin-dir": "bin",
+        "preferred-install": {
+            "webonyx/graphql-php": "source"
+        }
     },
     "require": {
-        "php": "^5.4|~7.0",
-        "webonyx/graphql-php": "^0.11.2"
+        "php": "^5.5|~7.0",
+        "webonyx/graphql-php": "^0.11.2|^0.12.0"
     },
     "require-dev": {
         "fabpot/php-cs-fixer": "^1.11",

diff --git a/tests/AbstractStarWarsTest.php b/tests/AbstractStarWarsTest.php
@@ -11,6 +11,7 @@
 
 namespace Overblog\GraphQLGenerator\Tests;
 
+use GraphQL\Error\Debug;
 use GraphQL\GraphQL;
 use GraphQL\Type\Schema;
 use Overblog\GraphQLGenerator\Tests\Generator\AbstractTypeGeneratorTest;
@@ -45,7 +46,8 @@ public function setUp()
      */
     protected function assertValidQuery($query, $expected, $variables = null)
     {
-        $actual = GraphQL::executeQuery($this->schema, $query, null, null, $variables)->toArray();
+        $actual = GraphQL::executeQuery($this->schema, $query, null, null, $variables)
+            ->toArray(Debug::INCLUDE_DEBUG_MESSAGE|Debug::INCLUDE_TRACE);
         $expected = ['data' => $expected];
         $this->assertEquals($expected, $actual, json_encode($actual));
     }