Use QueryStringBuilder in AbstractAPI::put

Author: gregoire-jianda

lib/Gitlab/Api/AbstractApi.php

@@ -8,6 +8,7 @@
 use Http\Message\MultipartStream\MultipartStreamBuilder;
 use Http\Message\StreamFactory;
 use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\StreamInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
@@ -89,7 +90,7 @@ protected function post($path, array $parameters = array(), $requestHeaders = ar
 
         $body = null;
         if (empty($files) && !empty($parameters)) {
-            $body = $this->streamFactory->createStream(QueryStringBuilder::build($parameters));
+            $body = $this->prepareBody($parameters);
             $requestHeaders['Content-Type'] = 'application/x-www-form-urlencoded';
         } elseif (!empty($files)) {
             $builder = new MultipartStreamBuilder($this->streamFactory);
@@ -128,7 +129,7 @@ protected function put($path, array $parameters = array(), $requestHeaders = arr
 
         $body = null;
         if (!empty($parameters)) {
-            $body = $this->streamFactory->createStream(http_build_query($parameters));
+            $body = $this->prepareBody($parameters);
             $requestHeaders['Content-Type'] = 'application/x-www-form-urlencoded';
         }
 
@@ -197,6 +198,18 @@ protected function createOptionsResolver()
         return $resolver;
     }
 
+    /**
+     * @param array $parameters
+     * @return StreamInterface
+     */
+    private function prepareBody(array $parameters = [])
+    {
+        $raw = QueryStringBuilder::build($parameters);
+        $stream = $this->streamFactory->createStream($raw);
+
+        return $stream;
+    }
+
     private function preparePath($path, array $parameters = [])
     {
         if (count($parameters) > 0) {

test/Gitlab/Tests/Api/AbstractApiTest.php

@@ -0,0 +1,59 @@
+<?php namespace Gitlab\Tests\Api;
+
+use Gitlab\Client;
+use Http\Client\HttpClient;
+use ReflectionClass;
+
+class AbstractApiTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @test
+     */
+    public function shouldPrepareBodyWithCleanArrays()
+    {
+        $parameters = [
+            'array_param' => [
+                'value1',
+                'value2'
+            ]
+        ];
+        $expectedBody = 'array_param[]=value1&array_param[]=value2';
+
+        $abstractApiMock = $this->getAbstractApiMock();
+        $reflection = new ReflectionClass(get_class($abstractApiMock));
+        $method = $reflection->getMethod('prepareBody');
+        $method->setAccessible(true);
+        $stream = $method->invokeArgs(
+            $abstractApiMock,
+            [
+                $parameters
+            ]
+        );
+
+        $this->assertEquals($expectedBody, urldecode((string)$stream));
+    }
+
+    protected function getAbstractApiMock(array $methods = [])
+    {
+        $httpClient = $this->getMockBuilder(HttpClient::class)
+            ->setMethods(array('sendRequest'))
+            ->getMock()
+        ;
+        $httpClient
+            ->expects($this->any())
+            ->method('sendRequest')
+        ;
+        $client = Client::createWithHttpClient($httpClient);
+
+        $abstractApiMock = $this->getMockBuilder('Gitlab\Api\AbstractApi')
+            ->setConstructorArgs([
+                $client,
+                null
+            ])
+            ->setMethods($methods)
+            ->getMockForAbstractClass()
+        ;
+
+        return $abstractApiMock;
+    }
+}