Merge pull request #20 from casskir/master

Add description field to custom-scalar type
overblog · Dec 13, 2017 · c7107b1 · c7107b1
2 parents a2b3771 + 2eee9a1
commit c7107b1
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,9 +6,8 @@ matrix:
     fast_finish: true
     include:
         - php: 5.5
-          env: GRAPHQLPHP_VERSION=0.10.*
-        - php: 5.6
-          env: GRAPHQLPHP_VERSION=0.10.*
+#        - php: 5.6
+#          env: GRAPHQLPHP_VERSION=0.10.*
         - php: 5.6
         - php: 7.0
         - php: 7.1

diff --git a/composer.json b/composer.json
@@ -16,7 +16,7 @@
     },
     "require": {
         "php": "^5.4|~7.0",
-        "webonyx/graphql-php": "^0.10.0 || ^0.11.0"
+        "webonyx/graphql-php": "^0.11.0"
     },
     "require-dev": {
         "fabpot/php-cs-fixer": "^1.11",

diff --git a/src/Resources/skeleton/CustomScalarConfig.php.skeleton b/src/Resources/skeleton/CustomScalarConfig.php.skeleton
@@ -1,5 +1,6 @@
 [
 <spaces>'name' => <name>,
+<spaces>'description' => <description>,
 <spaces>'serialize' => <serialize>,
 <spaces>'parseValue' => <parseValue>,
 <spaces>'parseLiteral' => <parseLiteral>,

diff --git a/tests/StarWarsQueryTest.php b/tests/StarWarsQueryTest.php
@@ -365,5 +365,6 @@ public function testDateTime()
             'dateTime' => '2016-01-18 23:00:00',
         ];
         $this->assertValidQuery($query, $expected);
+        $this->assertEquals('The DateTime type', $this->getType('DateTime')->description);
     }
 }
diff --git a/tests/starWarsSchema.yml b/tests/starWarsSchema.yml
@@ -2,6 +2,7 @@
 DateTime:
     type: custom-scalar
     config:
+        description: "The DateTime type"
         serialize: ["Overblog\\GraphQLGenerator\\Tests\\DateTimeType", "serialize"]
         parseValue: ["Overblog\\GraphQLGenerator\\Tests\\DateTimeType", "parseValue"]
         parseLiteral: ["Overblog\\GraphQLGenerator\\Tests\\DateTimeType", "parseLiteral"]