Add ArrayArgument to set arguments as array.

Author: panvid

src/Argument.php

@@ -61,7 +61,7 @@ public function __toString(): string
                 break;
             case 'object':
                 $value = Assert::validate(self::class, $this->value)
-                    ? $this->buildStringFromArgument($this->value)
+                    ? $this->buildStringFromArray([$this->value])
                     : null;
                 break;
             default:
@@ -74,21 +74,12 @@ public function __toString(): string
      * @param  Argument[] $values
      * @return string|null
      */
-    private function buildStringFromArray(array $values): ?string
+    protected function buildStringFromArray(array $values): ?string
     {
         $returnArray = [];
         foreach ($values as $value) {
-            $returnArray[] = $this->buildStringFromArgument($value);
+            $returnArray[] = (string) $value;
         }
-        return '[' . implode(',', $returnArray) . ']';
-    }
-
-    /**
-     * @param  Argument $argument
-     * @return string|null
-     */
-    private function buildStringFromArgument(Argument $argument): ?string
-    {
-        return '{' . $argument . '}';
+        return '{' . implode(',', $returnArray) . '}';
     }
 }

src/ArrayArgument.php

@@ -0,0 +1,25 @@
+<?php
+declare(strict_types=1);
+
+namespace GraphQL\RequestBuilder;
+
+/**
+ * @author  david.pauli
+ * @package GraphQLTest\RequestBuilder
+ * @since   15.08.2018
+ */
+class ArrayArgument extends Argument
+{
+    /**
+     * @param  Argument[] $values
+     * @return string|null
+     */
+    protected function buildStringFromArray(array $values): ?string
+    {
+        $returnArray = [];
+        foreach ($values as $value) {
+            $returnArray[] = '{' . (string) $value . '}';
+        }
+        return '[' . implode(',', $returnArray) . ']';
+    }
+}

tests/ArgumentTest.php

@@ -56,8 +56,8 @@ public function testToStringArgumentArray(): void
         $argument = new Argument(self::ARGUMENT_NAME, [$innerArgument, $innerArgument2]);
 
         static::assertEquals(
-            self::ARGUMENT_NAME . ':[{' . self::ARGUMENT_NAME_INNER . ':"' . self::ARGUMENT_VALUE_STRING . '"},{'
-                . self::ARGUMENT_NAME_INNER_2 . ':' . self::ARGUMENT_VALUE_INT_POSITIVE . '}]',
+            self::ARGUMENT_NAME . ':{' . self::ARGUMENT_NAME_INNER . ':"' . self::ARGUMENT_VALUE_STRING . '",'
+                . self::ARGUMENT_NAME_INNER_2 . ':' . self::ARGUMENT_VALUE_INT_POSITIVE . '}',
             (string) $argument,
             'Setting array of Arguments should return correct string.'
         );

tests/ArrayArgumentTest.php

@@ -0,0 +1,37 @@
+<?php
+declare(strict_types=1);
+
+namespace GraphQLTest\RequestBuilder;
+
+use GraphQL\RequestBuilder\Argument;
+use GraphQL\RequestBuilder\ArrayArgument;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * @author  david.pauli
+ * @package GraphQLTest\RequestBuilder
+ * @since   15.08.2018
+ */
+class ArrayArgumentTest extends TestCase
+{
+    private const ARGUMENT_NAME = 'argumentName';
+    private const ARGUMENT_NAME_INNER = 'argumentNameInner';
+    private const ARGUMENT_NAME_INNER_2 = 'argumentNameInner2';
+    private const ARGUMENT_VALUE_INT_POSITIVE = 2;
+    private const ARGUMENT_VALUE_STRING = 'argumentValueString';
+
+    public function testToStringArgumentArray(): void
+    {
+        $innerArgument = new Argument(self::ARGUMENT_NAME_INNER, self::ARGUMENT_VALUE_STRING);
+        $innerArgument2 = new ArrayArgument(self::ARGUMENT_NAME_INNER_2, self::ARGUMENT_VALUE_INT_POSITIVE);
+
+        $argument = new ArrayArgument(self::ARGUMENT_NAME, [$innerArgument, $innerArgument2]);
+
+        static::assertEquals(
+            self::ARGUMENT_NAME . ':[{' . self::ARGUMENT_NAME_INNER . ':"' . self::ARGUMENT_VALUE_STRING . '"},{'
+            . self::ARGUMENT_NAME_INNER_2 . ':' . self::ARGUMENT_VALUE_INT_POSITIVE . '}]',
+            (string) $argument,
+            'Setting array of Arguments should return correct string.'
+        );
+    }
+}