Merge branch '9.18' into 9.19

Author: GrahamCampbell

lib/Gitlab/Api/AbstractApi.php

@@ -256,10 +256,13 @@ protected function createOptionsResolver()
      */
     private function prepareBody(array $parameters = [])
     {
+        $parameters = array_filter($parameters, function ($value) {
+            return null !== $value;
+        });
+
         $raw = QueryStringBuilder::build($parameters);
-        $stream = $this->streamFactory->createStream($raw);
 
-        return $stream;
+        return $this->streamFactory->createStream($raw);
     }
 
     /**
@@ -270,6 +273,10 @@ private function prepareBody(array $parameters = [])
      */
     private function preparePath($path, array $parameters = [])
     {
+        $parameters = array_filter($parameters, function ($value) {
+            return null !== $value;
+        });
+
         if (count($parameters) > 0) {
             $path .= '?'.QueryStringBuilder::build($parameters);
         }

lib/Gitlab/HttpClient/Message/QueryStringBuilder.php

@@ -23,6 +23,12 @@ public static function build($query)
     {
         @trigger_error(sprintf('The %s() method is deprecated since version 9.18 and will be removed in 10.0.', __METHOD__), E_USER_DEPRECATED);
 
+        if (is_array($query)) {
+            $query = array_filter($query, function ($value) {
+                return null !== $value;
+            });
+        }
+
         return UtilQueryStringBuilder::build($query);
     }
 

lib/Gitlab/HttpClient/Util/QueryStringBuilder.php

@@ -22,9 +22,6 @@ public static function build($query)
         if (!is_array($query)) {
             return self::rawurlencode($query);
         }
-        $query = array_filter($query, function ($value) {
-            return null !== $value;
-        });
 
         return implode('&', array_map(function ($value, $key) {
             return self::encode($value, $key);

test/Gitlab/Tests/HttpClient/Util/QueryStringBuilderTest.php

@@ -45,9 +45,6 @@ public function queryStringProvider()
                 'source_branch' => 'test_source',
                 'target_branch' => 'test_master',
                 'title' => 'test',
-                'assignee_id' => null,
-                'target_project_id' => null,
-                'description' => null,
             ],
             'source_branch=test_source&target_branch=test_master&title=test',
         ];