Fix coercing of false values (#303)

Author: crisu83

src/Execution/CoercedValue.php

@@ -18,10 +18,10 @@ class CoercedValue
 
     /**
      * CoercedValue constructor.
-     * @param mixed      $value
-     * @param array|null $errors
+     * @param mixed $value
+     * @param array $errors
      */
-    public function __construct($value, ?array $errors)
+    public function __construct($value, array $errors = [])
     {
         $this->errors = $errors;
         $this->value  = $value;
@@ -32,7 +32,7 @@ public function __construct($value, ?array $errors)
      */
     public function getErrors(): array
     {
-        return $this->errors ?? [];
+        return $this->errors;
     }
 
     /**

src/Execution/ValuesHelper.php

@@ -258,8 +258,8 @@ private function coerceValue($value, $type, $blameNode, ?Path $path = null): Coe
             return $this->coerceValueForNonNullType($value, $type, $blameNode, $path);
         }
 
-        if (empty($value)) {
-            return new CoercedValue(null, null);
+        if (null === $value) {
+            return new CoercedValue(null);
         }
 
         if ($type instanceof ScalarType) {
@@ -327,12 +327,12 @@ protected function coerceValueForScalarType(
     ): CoercedValue {
         try {
             $parseResult = $type->parseValue($value);
-            if (empty($parseResult)) {
+            if (null === $parseResult) {
                 return new CoercedValue(null, [
                     new GraphQLException(sprintf('Expected type %s', (string)$type))
                 ]);
             }
-            return new CoercedValue($parseResult, null);
+            return new CoercedValue($parseResult);
         } catch (InvalidTypeException|CoercingException $ex) {
             return new CoercedValue(null, [
                 $this->buildCoerceException(

tests/Functional/Execution/ValuesHelperTest.php

@@ -17,34 +17,32 @@
 
 class ValuesHelperTest extends TestCase
 {
-    /**
-     * @throws \Digia\GraphQL\Error\InvariantException
-     * @throws \Digia\GraphQL\Error\SyntaxErrorException
-     */
     public function testCoerceArgumentValues()
     {
+        /** @noinspection PhpUnhandledExceptionInspection */
         $schema = newSchema([
-            'query' =>
-                newObjectType([
-                    'name'   => 'Greeting',
-                    'fields' => [
-                        'greeting' => [
-                            'type' => stringType(),
-                            'args' => [
-                                'name' => [
-                                    'type' => stringType(),
-                                ]
-                            ]
-                        ]
-                    ]
-                ])
+            'query' => newObjectType([
+                'name'   => 'Greeting',
+                'fields' => [
+                    'greeting' => [
+                        'type' => stringType(),
+                        'args' => [
+                            'name' => [
+                                'type' => stringType(),
+                            ],
+                        ],
+                    ],
+                ],
+            ]),
         ]);
 
+        /** @noinspection PhpUnhandledExceptionInspection */
         $documentNode = parse('query Hello($name: String) { Greeting(name: $name) }');
         /** @var OperationDefinitionNode $operation */
         $operation = $documentNode->getDefinitions()[0];
         /** @var ArgumentsAwareInterface $node */
-        $node       = $operation->getSelectionSet()->getSelections()[0];
+        $node = $operation->getSelectionSet()->getSelections()[0];
+        /** @noinspection PhpUnhandledExceptionInspection */
         $definition = $schema->getQueryType()->getFields()['greeting'];
 
         $context = new ExecutionContext(
@@ -56,30 +54,26 @@ public function testCoerceArgumentValues()
         $this->assertSame(['name' => 'Han Solo'], $args);
     }
 
-    /**
-     * @throws \Digia\GraphQL\Error\InvariantException
-     * @throws \Digia\GraphQL\Error\SyntaxErrorException
-     */
     public function testCoerceVariableValues(): void
     {
-        // Test that non-nullable booleans are handled correctly
+        /** @noinspection PhpUnhandledExceptionInspection */
         $schema = newSchema([
-            'query' =>
-                newObjectType([
-                    'name'   => 'nonNullBoolean',
-                    'fields' => [
-                        'greeting' => [
-                            'type' => stringType(),
-                            'args' => [
-                                'shout' => [
-                                    'type' => newNonNull(booleanType()),
-                                ]
-                            ]
-                        ]
-                    ]
-                ])
+            'query' => newObjectType([
+                'name'   => 'nonNullBoolean',
+                'fields' => [
+                    'greeting' => [
+                        'type' => stringType(),
+                        'args' => [
+                            'shout' => [
+                                'type' => newNonNull(booleanType()),
+                            ],
+                        ],
+                    ],
+                ],
+            ]),
         ]);
 
+        /** @noinspection PhpUnhandledExceptionInspection */
         $documentNode = parse('
             query ($shout: Boolean!) {
                 nonNullBoolean(shout: $shout)
@@ -92,11 +86,11 @@ public function testCoerceVariableValues(): void
 
         // Try with true and false and null (null should give errors, the rest shouldn't)
         $coercedValue = coerceVariableValues($schema, $variableDefinitions, ['shout' => true]);
-        $this->assertEquals(['shout' => true], $coercedValue->getValue());
+        $this->assertSame(['shout' => true], $coercedValue->getValue());
         $this->assertFalse($coercedValue->hasErrors());
 
         $coercedValue = coerceVariableValues($schema, $variableDefinitions, ['shout' => false]);
-        $this->assertEquals(['shout' => false], $coercedValue->getValue());
+        $this->assertSame(['shout' => false], $coercedValue->getValue());
         $this->assertFalse($coercedValue->hasErrors());
 
         $coercedValue = coerceVariableValues($schema, $variableDefinitions, ['shout' => null]);