Merge pull request #13 from mcg-web/fix-default-value

Fix input and args defaultValue

Author: mcg-web

.styleci.yml

@@ -5,3 +5,4 @@ enabled:
 
 disabled:
     - unalign_equals
+    - psr0

src/Generator/AbstractTypeGenerator.php

@@ -151,12 +151,17 @@ protected function varExport($var, $default = null, array $compilerNames = [])
                 // handle multi-line strings
                 $lines = explode("\n", $string);
                 if (count($lines) > 1) {
-                    $firstLine = array_shift($lines) . "'" . ' . "\n"';
-                    $lastLine = "'" . array_pop($lines);
-                    $lines = array_map(function($s) { return "'" . $s . "'" . ' . "\n"'; }, $lines);
+                    $firstLine = sprintf('%s\' . "\n"', array_shift($lines));
+                    $lastLine = sprintf("'%s", array_pop($lines));
+                    $lines = array_map(
+                        function ($line) {
+                            return sprintf('\'%s\' . "\n"', $line);
+                        },
+                        $lines
+                    );
                     array_unshift($lines, $firstLine);
                     array_push($lines, $lastLine);
-                    $string = implode(" . \n", $lines);
+                    $string = implode(' . ', $lines);
                 }
 
                 return $string;

src/Generator/TypeGenerator.php

@@ -55,7 +55,12 @@ protected function generateDeprecationReason(array $value)
 
     protected function generateDefaultValue(array $value)
     {
-        return $this->varExportFromArrayValue($value, 'defaultValue');
+        $key = 'defaultValue';
+        if (!array_key_exists($key, $value)) {
+            return '';
+        }
+
+        return sprintf("\n<spaces>'%s' => %s,", $key, $this->varExportFromArrayValue($value, $key));
     }
 
     protected function generateType(array $value)

src/Resources/skeleton/ArgConfig.php.skeleton

@@ -1,6 +1,5 @@
 [
 <spaces>'name' => <name>,
 <spaces>'type' => <type>,
-<spaces>'description' => <description>,
-<spaces>'defaultValue' => <defaultValue>,
+<spaces>'description' => <description>,<defaultValue>
 ],

src/Resources/skeleton/InputFieldConfig.php.skeleton

@@ -1,5 +1,4 @@
 <name> => [
 <spaces>'type' => <type>,
-<spaces>'defaultValue' => <defaultValue>,
-<spaces>'description' => <description>,
+<spaces>'description' => <description>,<defaultValue>
 ],

tests/AbstractStarWarsTest.php

@@ -44,11 +44,11 @@ public function setUp()
      * Helper function to test a query and the expected response.
      * @param $query
      * @param $expected
-     * @param null $params
+     * @param null $variables
      */
-    protected function assertValidQuery($query, $expected, $params = null)
+    protected function assertValidQuery($query, $expected, $variables = null)
     {
-        $result = GraphQL::execute($this->schema, $query, null, null, $params);
+        $result = GraphQL::execute($this->schema, $query, null, null, $variables);
 
         $this->assertEquals(['data' => $expected], $result, json_encode($result));
     }

tests/Resolver.php

@@ -72,7 +72,7 @@ public static function getFriends($droidOrHuman)
 
     public static function getHero($root, $args)
     {
-        return StarWarsData::getHero(isset($args['episode']) ? $args['episode'] : null);
+        return StarWarsData::getHero(isset($args['episode']['name']) ? $args['episode']['name'] : null);
     }
 
     public static function getHuman($root, $args)

tests/StarWarsIntrospectionTest.php

@@ -31,6 +31,8 @@ public function testAllowsQueryingTheSchemaForTypes()
             '__schema' => [
                 'types' => [
                     ['name' => 'Query'],
+                    ['name' => 'HeroInput'],
+                    ['name' => 'ID'],
                     ['name' => 'Episode'],
                     ['name' => 'Character'],
                     ['name' => 'String'],
@@ -46,7 +48,6 @@ public function testAllowsQueryingTheSchemaForTypes()
                     ['name' => '__EnumValue'],
                     ['name' => '__Directive'],
                     ['name' => '__DirectiveLocation'],
-                    ['name' => 'ID'],
                     ['name' => 'Float'],
                     ['name' => 'Int'],
                 ]
@@ -311,12 +312,12 @@ public function testAllowsQueryingTheSchemaForFieldArgs()
                             'name' => 'hero',
                             'args' => [
                                 [
-                                    'defaultValue' =>  'null',
+                                    'defaultValue' =>  null,
                                     'description' => "If omitted, returns the hero of the whole saga.\nIf provided, returns the hero of that particular episode.\n",
                                     'name' => 'episode',
                                     'type' => [
-                                        'kind' => 'ENUM',
-                                        'name' => 'Episode',
+                                        'kind' => 'INPUT_OBJECT',
+                                        'name' => 'HeroInput',
                                         'ofType' => null,
                                     ],
                                 ],
@@ -370,7 +371,7 @@ public function testAllowsQueryingTheSchemaForFieldArgs()
                                         'kind' => 'SCALAR',
                                         'ofType' => null,
                                     ],
-                                    'defaultValue' => 'null',
+                                    'defaultValue' => null,
                                 ]
                             ],
                         ],

tests/StarWarsQueryTest.php

@@ -336,8 +336,8 @@ public function testVerifyThatR2D2IsADroid()
     public function testVerifyThatLukeIsHuman()
     {
         $query = '
-        query CheckTypeOfLuke {
-          hero(episode: EMPIRE) {
+        query CheckTypeOfLuke($episode: HeroInput!) {
+          hero(episode: $episode) {
             __typename
             name
           }
@@ -349,7 +349,7 @@ public function testVerifyThatLukeIsHuman()
                 'name' => 'Luke Skywalker'
             ],
         ];
-        $this->assertValidQuery($query, $expected);
+        $this->assertValidQuery($query, $expected, ['episode' => ['name' => 'EMPIRE']]);
     }
 
     public function testDateTime()

tests/TestCase.php

@@ -19,7 +19,7 @@ public function assertCodeStandard($pathToCode, $level = null, $fixers = null)
     {
         // Run linter in dry-run mode so it changes nothing.
         $csBuilder = new ProcessBuilder([
-            'php-cs-fixer',
+            __DIR__ . '/../bin/php-cs-fixer',
             'fix',
             '--dry-run',
             '--diff',

tests/starWarsSchema.yml

@@ -142,7 +142,7 @@ Query:
                 type: "Character"
                 args:
                     episode:
-                        type: "Episode"
+                        type: "HeroInput"
                         description: |
                           If omitted, returns the hero of the whole saga.
                           If provided, returns the hero of that particular episode.
@@ -178,5 +178,8 @@ HeroInput:
     type: input-object
     config:
         fields:
+            id:
+                type: "ID"
             name:
-                type: "Episode!"
+                type: "Episode"
+                defaultValue: 4