Skip to content

Commit acea33b

Browse files
authored
Merge pull request #23 from mcg-web/allow_graphql-php_0.12
Allow webonyx/graphql-php 0.12
2 parents f6881be + 147d139 commit acea33b

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

composer.json

+6-3
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,14 @@
1212
],
1313
"config" : {
1414
"sort-packages": true,
15-
"bin-dir": "bin"
15+
"bin-dir": "bin",
16+
"preferred-install": {
17+
"webonyx/graphql-php": "source"
18+
}
1619
},
1720
"require": {
18-
"php": "^5.4|~7.0",
19-
"webonyx/graphql-php": "^0.11.2"
21+
"php": "^5.5|~7.0",
22+
"webonyx/graphql-php": "^0.11.2|^0.12.0"
2023
},
2124
"require-dev": {
2225
"fabpot/php-cs-fixer": "^1.11",

tests/AbstractStarWarsTest.php

+3-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
namespace Overblog\GraphQLGenerator\Tests;
1313

14+
use GraphQL\Error\Debug;
1415
use GraphQL\GraphQL;
1516
use GraphQL\Type\Schema;
1617
use Overblog\GraphQLGenerator\Tests\Generator\AbstractTypeGeneratorTest;
@@ -45,7 +46,8 @@ public function setUp()
4546
*/
4647
protected function assertValidQuery($query, $expected, $variables = null)
4748
{
48-
$actual = GraphQL::executeQuery($this->schema, $query, null, null, $variables)->toArray();
49+
$actual = GraphQL::executeQuery($this->schema, $query, null, null, $variables)
50+
->toArray(Debug::INCLUDE_DEBUG_MESSAGE|Debug::INCLUDE_TRACE);
4951
$expected = ['data' => $expected];
5052
$this->assertEquals($expected, $actual, json_encode($actual));
5153
}

0 commit comments

Comments
 (0)