Merge pull request #14 from mcg-web/compatible-with-graphql-v0_10

Make compatible with `webonyx/graphql-php#v0.10`

Author: mcg-web

.travis.yml

@@ -1,10 +1,12 @@
+dist: trusty
+
 language: php
 
 php:
-    - 5.4
     - 5.5
     - 5.6
     - 7.0
+    - 7.1
     - hhvm
 
 branches:

composer.json

@@ -16,7 +16,7 @@
     },
     "require": {
         "php": "^5.4|~7.0",
-        "webonyx/graphql-php": "*"
+        "webonyx/graphql-php": "0.10.*"
     },
     "require-dev": {
         "fabpot/php-cs-fixer": "^1.11",

src/Resources/skeleton/ValueConfig.php.skeleton

@@ -1,4 +1,4 @@
-[
+<name> => [
 <spaces>'name' => <name>,
 <spaces>'value' => <value>,
 <spaces>'deprecationReason' => <deprecationReason>,

tests/AbstractStarWarsTest.php

@@ -32,7 +32,7 @@ public function setUp()
 
         $this->generateClasses();
 
-        Config::enableValidation();
+        @Config::enableValidation();
 
         Resolver::setHumanType($this->getType('Human'));
         Resolver::setDroidType($this->getType('Droid'));
@@ -48,8 +48,10 @@ public function setUp()
      */
     protected function assertValidQuery($query, $expected, $variables = null)
     {
-        $result = GraphQL::execute($this->schema, $query, null, null, $variables);
+        $actual = GraphQL::execute($this->schema, $query, null, null, $variables);
+        $expected = ['data' => $expected];
 
-        $this->assertEquals(['data' => $expected], $result, json_encode($result));
+        //$this->assertSame(array_diff($expected, $actual), array_diff($actual, $expected));
+        $this->assertEquals($expected, $actual, json_encode($actual));
     }
 }

tests/StarWarsIntrospectionTest.php

@@ -30,26 +30,26 @@ public function testAllowsQueryingTheSchemaForTypes()
         $expected = [
             '__schema' => [
                 'types' => [
-                    ['name' => 'Query'],
-                    ['name' => 'HeroInput'],
                     ['name' => 'ID'],
-                    ['name' => 'Episode'],
-                    ['name' => 'Character'],
                     ['name' => 'String'],
-                    ['name' => 'Human'],
-                    ['name' => 'Droid'],
-                    ['name' => 'DateTime'],
+                    ['name' => 'Float'],
+                    ['name' => 'Int'],
+                    ['name' => 'Boolean'],
                     ['name' => '__Schema'],
                     ['name' => '__Type'],
                     ['name' => '__TypeKind'],
-                    ['name' => 'Boolean'],
                     ['name' => '__Field'],
                     ['name' => '__InputValue'],
                     ['name' => '__EnumValue'],
                     ['name' => '__Directive'],
                     ['name' => '__DirectiveLocation'],
-                    ['name' => 'Float'],
-                    ['name' => 'Int'],
+                    ['name' => 'Query'],
+                    ['name' => 'HeroInput'],
+                    ['name' => 'Episode'],
+                    ['name' => 'Character'],
+                    ['name' => 'Human'],
+                    ['name' => 'Droid'],
+                    ['name' => 'DateTime'],
                 ]
             ]
         ];