Merge pull request #10 from Fooriva/master

Fix null default value error on queries parameters

Author: moufmouf

src/QueryField.php

@@ -61,7 +61,7 @@ public function __construct(string $name, TypeInterface $type, array $arguments,
                     } elseif ($type->getKind() === TypeMap::KIND_INPUT_OBJECT) {
                         $val = $this->hydrator->hydrate($val, $type);
                     }
-                } elseif (isset($arr['default'])) {
+                } elseif (array_key_exists('default', $arr)) {
                     $val = $arr['default'];
                 } else {
                     throw new GraphQLException("Expected argument '$name' was not provided.");

tests/ControllerQueryProviderTest.php

@@ -52,18 +52,25 @@ public function testQueryProvider()
 
         $mockResolveInfo = $this->createMock(ResolveInfo::class);
 
-        $result = $usersQuery->resolve('foo', ['int'=>42, 'string'=>'foo', 'list'=>[
-                ['test'=>42],
-                ['test'=>12],
-            ],
+        $context = ['int'=>42, 'string'=>'foo', 'list'=>[
+            ['test'=>42],
+            ['test'=>12],
+        ],
             'boolean'=>true,
             'float'=>4.2,
             'dateTimeImmutable'=>'2017-01-01 01:01:01',
             'dateTime'=>'2017-01-01 01:01:01'
-        ], $mockResolveInfo);
+        ];
+
+        $result = $usersQuery->resolve('foo', $context, $mockResolveInfo);
 
         $this->assertInstanceOf(TestObject::class, $result);
         $this->assertSame('foo424212true4.22017010101010120170101010101default', $result->getTest());
+
+        unset($context['string']); // Testing null default value
+        $result = $usersQuery->resolve('foo', $context, $mockResolveInfo);
+
+        $this->assertSame('424212true4.22017010101010120170101010101default', $result->getTest());
     }
 
     public function testMutations()

tests/Fixtures/TestController.php

@@ -13,15 +13,16 @@ class TestController
     /**
      * @Query
      * @param int $int
-     * @param null|string $string
      * @param TestObject[] $list
      * @param bool|null $boolean
      * @param float|null $float
      * @param \DateTimeImmutable|null $dateTimeImmutable
-     * @param \DateTime|null $dateTime
+     * @param \DateTime|\DateTimeInterface|null $dateTime
+     * @param string $withDefault
+     * @param null|string $string
      * @return TestObject
      */
-    public function test(int $int, ?string $string, array $list, ?bool $boolean, ?float $float, ?\DateTimeImmutable $dateTimeImmutable, ?\DateTimeInterface $dateTime, string $withDefault = 'default'): TestObject
+    public function test(int $int, array $list, ?bool $boolean, ?float $float, ?\DateTimeImmutable $dateTimeImmutable, ?\DateTimeInterface $dateTime, string $withDefault = 'default', ?string $string = null): TestObject
     {
         $str = '';
         foreach ($list as $test) {