Merge pull request #1073 from sparklink-pro/transformer_fix

Fix tests & arguments transformer when data is not set

Author: Vincz

src/Transformer/ArgumentsTransformer.php

@@ -102,6 +102,9 @@ private function populateObject(Type $type, $data, bool $multiple, ResolveInfo $
             $fields = $type->getFields();
 
             foreach ($fields as $name => $field) {
+                if (!array_key_exists($name, $data)) {
+                    continue;
+                }
                 $fieldData = $this->accessor->getValue($data, sprintf('[%s]', $name));
                 $fieldType = $field->getType();
 

tests/Definition/Type/PhpEnumTypeTest.php

@@ -74,9 +74,7 @@ public function testValidParseValue(): void
     public function testInvalidSerialize(): void
     {
         $this->expectException(SerializationError::class);
-        $this->expectExceptionMessage(sprintf(
-            'Cannot serialize value Overblog\GraphQLBundle\Tests\Definition\Type\PhpEnumTypeTest as it must be an instance of enum',
-        ));
+        $this->expectExceptionMessageMatches('/Cannot serialize value (.*) as it must be an instance of enum/');
 
         $this->getEnum()->serialize(self::class);
     }

tests/Relay/Connection/ConnectionBuilderTest.php

@@ -271,15 +271,13 @@ public function testReturnsAllElementsIfCursorsAreOnTheOutside(): void
 
     public function testReturnsNoElementsIfCursorsCross(): void
     {
-        $actual = call_user_func(
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('Arguments "before" and "after" cannot be intersected');
+        call_user_func(
             [static::getBuilder(), 'connectionFromArray'],
             $this->letters,
             ['before' => 'YXJyYXljb25uZWN0aW9uOjI=', 'after' => 'YXJyYXljb25uZWN0aW9uOjQ=']
         );
-
-        $expected = $this->getExpectedConnection([], false, false);
-
-        $this->assertSameConnection($expected, $actual);
     }
 
     /**

tests/Transformer/ArgumentsTransformerTest.php

@@ -125,6 +125,9 @@ public function testPopulating(): void
         $this->assertEquals($res->field1, $data['field1']);
         $this->assertEquals($res->field2, $data['field2']);
         $this->assertEquals($res->field3, $data['field3']);
+        $this->assertEquals($res->field4, 'default_value_when_not_set_in_data');
+        $this->assertEquals($res->field5, []);
+        $this->assertEquals($res->field6, null);
 
         $data = [
             'field1' => [

tests/Transformer/InputType1.php

@@ -20,4 +20,19 @@ final class InputType1
      * @var mixed
      */
     public $field3;
+
+    /**
+     * @var mixed
+     */
+    public $field4 = 'default_value_when_not_set_in_data';
+
+    /**
+     * @var array
+     */
+    public $field5 = [];
+
+    /**
+     * @var mixed
+     */
+    public $field6;
 }