Replace all calls of http_build_query with PathSerializer

Author: Art4

src/Redmine/Api/Attachment.php

@@ -2,6 +2,8 @@
 
 namespace Redmine\Api;
 
+use Redmine\Serializer\PathSerializer;
+
 /**
  * Attachment details.
  *
@@ -51,7 +53,10 @@ public function download($id)
      */
     public function upload($attachment, $params = [])
     {
-        return $this->post('/uploads.json?'.http_build_query($params), $attachment);
+        return $this->post(
+            PathSerializer::create('/uploads.json', $params)->getPath(),
+            $attachment
+        );
     }
 
     /**

src/Redmine/Api/Group.php

@@ -4,6 +4,7 @@
 
 use Exception;
 use Redmine\Exception\MissingParameterException;
+use Redmine\Serializer\PathSerializer;
 
 /**
  * Handling of groups.
@@ -110,7 +111,9 @@ public function update($id, array $params = [])
      */
     public function show($id, array $params = [])
     {
-        return $this->get('/groups/'.urlencode($id).'.json?'.http_build_query($params));
+        return $this->get(
+            PathSerializer::create('/groups/'.urlencode($id).'.json', $params)->getPath()
+        );
     }
 
     /**

src/Redmine/Api/Issue.php

@@ -2,6 +2,8 @@
 
 namespace Redmine\Api;
 
+use Redmine\Serializer\PathSerializer;
+
 /**
  * Listing issues, searching, editing and closing your projects issues.
  *
@@ -59,7 +61,9 @@ public function show($id, array $params = [])
             $params['include'] = implode(',', $params['include']);
         }
 
-        return $this->get('/issues/'.urlencode($id).'.json?'.http_build_query($params));
+        return $this->get(
+            PathSerializer::create('/issues/'.urlencode($id).'.json', $params)->getPath()
+        );
     }
 
     /**

src/Redmine/Api/Project.php

@@ -3,6 +3,7 @@
 namespace Redmine\Api;
 
 use Redmine\Exception\MissingParameterException;
+use Redmine\Serializer\PathSerializer;
 
 /**
  * Listing projects, creating, editing.
@@ -90,7 +91,9 @@ public function show($id, array $params = [])
             $params['include'] = 'trackers,issue_categories,attachments,relations';
         }
 
-        return $this->get('/projects/'.urlencode($id).'.json?'.http_build_query($params));
+        return $this->get(
+            PathSerializer::create('/projects/'.urlencode($id).'.json', $params)->getPath()
+        );
     }
 
     /**

src/Redmine/Api/User.php

@@ -3,6 +3,7 @@
 namespace Redmine\Api;
 
 use Redmine\Exception\MissingParameterException;
+use Redmine\Serializer\PathSerializer;
 
 /**
  * Listing users, creating, editing.
@@ -117,11 +118,9 @@ public function show($id, array $params = [])
         );
         $params['include'] = implode(',', $params['include']);
 
-        return $this->get(sprintf(
-            '/users/%s.json?%s',
-            urlencode($id),
-            http_build_query($params)
-        ));
+        return $this->get(
+            PathSerializer::create('/users/'.urlencode($id).'.json', $params)->getPath()
+        );
     }
 
     /**

src/Redmine/Api/Wiki.php

@@ -2,6 +2,8 @@
 
 namespace Redmine\Api;
 
+use Redmine\Serializer\PathSerializer;
+
 /**
  * Listing Wiki pages.
  *
@@ -44,11 +46,19 @@ public function all($project, array $params = [])
      */
     public function show($project, $page, $version = null)
     {
-        $path = null === $version
-            ? '/projects/'.$project.'/wiki/'.$page.'.json?include=attachments'
-            : '/projects/'.$project.'/wiki/'.$page.'/'.$version.'.json?include=attachments';
+        $params = [
+            'include' => 'attachments',
+        ];
+
+        if ($version === null) {
+            $path = '/projects/'.$project.'/wiki/'.$page.'.json';
+        } else {
+            $path = '/projects/'.$project.'/wiki/'.$page.'/'.$version.'.json';
+        }
 
-        return $this->get($path);
+        return $this->get(
+            PathSerializer::create($path, $params)->getPath()
+        );
     }
 
     /**

tests/Integration/UrlTest.php

@@ -28,7 +28,7 @@ public function testAttachment()
         $res = $api->upload('asdf');
         $res = json_decode($res, true);
 
-        $this->assertEquals('/uploads.json?', $res['path']);
+        $this->assertEquals('/uploads.json', $res['path']);
         $this->assertEquals('POST', $res['method']);
     }
 
@@ -59,7 +59,7 @@ public function testGroup()
 
         $res = $api->show(1);
 
-        $this->assertEquals('/groups/1.json?', $res['path']);
+        $this->assertEquals('/groups/1.json', $res['path']);
         $this->assertEquals('GET', $res['method']);
 
         $res = $api->remove(1);
@@ -112,7 +112,7 @@ public function testIssue()
 
         $res = $api->show(1);
 
-        $this->assertEquals('/issues/1.json?', $res['path']);
+        $this->assertEquals('/issues/1.json', $res['path']);
         $this->assertEquals('GET', $res['method']);
 
         $res = $api->remove(1);