Merge branch 'bugfix/GQL-50' into develop

Author: mghoneimy

src/Mutation.php

@@ -15,4 +15,14 @@ class Mutation extends Query
      * @var string
      */
     protected const OPERATION_TYPE = 'mutation';
+
+    /**
+     * @return string
+     */
+    protected function constructSelectionSet(): string
+    {
+        if (empty($this->selectionSet)) return '';
+
+        return parent::constructSelectionSet();
+    }
 }

src/Query.php

@@ -2,7 +2,6 @@
 
 namespace GraphQL;
 
-use Exception;
 use GraphQL\Exception\ArgumentException;
 use GraphQL\Exception\InvalidSelectionException;
 use GraphQL\Exception\InvalidVariableException;
@@ -20,7 +19,7 @@ class Query
      *
      * @var string
      */
-    protected const QUERY_FORMAT = "%s%s {\n%s\n}";
+    protected const QUERY_FORMAT = "%s%s%s";
 
     /**
      * Stores the name of the type of the operation to be executed on the GraphQL server
@@ -34,42 +33,42 @@ class Query
      *
      * @var string
      */
-    private $operationName;
+    protected $operationName;
 
     /**
      * Stores the object being queried for
      *
      * @var string
      */
-    private $fieldName;
+    protected $fieldName;
 
     /**
      * Stores the list of variables to be used in the query
      *
      * @var array|Variable[]
      */
-    private $variables;
+    protected $variables;
 
     /**
      * Stores the list of arguments used when querying data
      *
      * @var array
      */
-    private $arguments;
+    protected $arguments;
 
     /**
      * Stores the selection set desired to get from the query, can include nested queries
      *
      * @var array
      */
-    private $selectionSet;
+    protected $selectionSet;
 
     /**
      * Private member that's not accessible from outside the class, used internally to deduce if query is nested or not
      *
      * @var bool
      */
-    private $isNested;
+    protected $isNested;
 
     /**
      * GQLQueryBuilder constructor.
@@ -238,7 +237,7 @@ protected function constructArguments(): string
      */
     protected function constructSelectionSet(): string
     {
-        $attributesString = '';
+        $attributesString = " {\n";
         $first            = true;
         foreach ($this->selectionSet as $attribute) {
 
@@ -257,6 +256,7 @@ protected function constructSelectionSet(): string
             // Append attribute to returned attributes list
             $attributesString .= $attribute;
         }
+        $attributesString .= "\n}";
 
         return $attributesString;
     }

src/QueryBuilder/QueryBuilder.php

@@ -3,7 +3,6 @@
 namespace GraphQL\QueryBuilder;
 
 use GraphQL\Query;
-use GraphQL\Variable;
 
 /**
  * Class QueryBuilder

tests/MutationTest.php

@@ -16,27 +16,39 @@ public function testMutationWithoutOperationType()
 
         $this->assertEquals(
             'mutation {
-createObject {
-
-}
+createObject
 }',
             (string) $mutation
         );
     }
 
+//    /**
+//     *
+//     */
+//    public function testMutationWithOperationType()
+//    {
+//        $mutation = new Mutation('mutation');
+//
+//        $this->assertEquals(
+//            'mutation {
+//
+//}',
+//            (string) $mutation
+//        );
+//    }
+
     /**
      *
      */
-    public function testMutationWithOperationType()
+    public function testMutationWithoutSelectedFields()
     {
-        $mutation = new Mutation('mutation');
-
+        $mutation = (new Mutation('createObject'))
+            ->setArguments(['name' => 'TestObject', 'type' => 'TestType']);
         $this->assertEquals(
             'mutation {
-
+createObject(name: "TestObject" type: "TestType")
 }',
-            (string) $mutation
-        );
+            (string) $mutation);
     }
 
     /**