Tweaked URI building

Author: GrahamCampbell

src/Api/AbstractApi.php

@@ -211,17 +211,6 @@ protected function getProjectPath($id, string $uri)
         return 'projects/'.self::encodePath($id).'/'.$uri;
     }
 
-    /**
-     * @param int    $id
-     * @param string $uri
-     *
-     * @return string
-     */
-    protected function getGroupPath(int $id, string $uri)
-    {
-        return 'groups/'.self::encodePath($id).'/'.$uri;
-    }
-
     /**
      * Create a new OptionsResolver with page and per_page options.
      *

src/Api/Groups.php

@@ -343,7 +343,7 @@ public function variables(int $group_id, array $parameters = [])
     {
         $resolver = $this->createOptionsResolver();
 
-        return $this->get($this->getGroupPath($group_id, 'variables'), $resolver->resolve($parameters));
+        return $this->get('groups/'.self::encodePath($group_id).'/variables', $resolver->resolve($parameters));
     }
 
     /**
@@ -354,7 +354,7 @@ public function variables(int $group_id, array $parameters = [])
      */
     public function variable(int $group_id, string $key)
     {
-        return $this->get($this->getGroupPath($group_id, 'variables/'.self::encodePath($key)));
+        return $this->get('groups/'.self::encodePath($group_id).'/variables/'.self::encodePath($key));
     }
 
     /**
@@ -376,7 +376,7 @@ public function addVariable(int $group_id, string $key, string $value, ?bool $pr
             $payload['protected'] = $protected;
         }
 
-        return $this->post($this->getGroupPath($group_id, 'variables'), $payload);
+        return $this->post('groups/'.self::encodePath($group_id).'/variables', $payload);
     }
 
     /**
@@ -397,7 +397,7 @@ public function updateVariable(int $group_id, string $key, string $value, ?bool
             $payload['protected'] = $protected;
         }
 
-        return $this->put($this->getGroupPath($group_id, 'variables/'.self::encodePath($key)), $payload);
+        return $this->put('groups/'.self::encodePath($group_id).'/variables/'.self::encodePath($key), $payload);
     }
 
     /**
@@ -408,7 +408,7 @@ public function updateVariable(int $group_id, string $key, string $value, ?bool
      */
     public function removeVariable(int $group_id, string $key)
     {
-        return $this->delete($this->getGroupPath($group_id, 'variables/'.self::encodePath($key)));
+        return $this->delete('groups/'.self::encodePath($group_id).'/variables/'.self::encodePath($key));
     }
 
     /**

src/Api/GroupsBoards.php

@@ -16,7 +16,7 @@ public function all(?int $group_id = null, array $parameters = [])
     {
         $resolver = $this->createOptionsResolver();
 
-        $path = null === $group_id ? 'boards' : $this->getGroupPath($group_id, 'boards');
+        $path = null === $group_id ? 'boards' : 'groups/'.self::encodePath($group_id).'/boards';
 
         return $this->get($path, $resolver->resolve($parameters));
     }
@@ -29,7 +29,7 @@ public function all(?int $group_id = null, array $parameters = [])
      */
     public function show(int $group_id, int $board_id)
     {
-        return $this->get($this->getGroupPath($group_id, 'boards/'.self::encodePath($board_id)));
+        return $this->get('groups/'.self::encodePath($group_id).'/boards/'.self::encodePath($board_id));
     }
 
     /**
@@ -40,7 +40,7 @@ public function show(int $group_id, int $board_id)
      */
     public function create(int $group_id, array $params)
     {
-        return $this->post($this->getGroupPath($group_id, 'boards'), $params);
+        return $this->post('groups/'.self::encodePath($group_id).'/boards', $params);
     }
 
     /**
@@ -52,7 +52,7 @@ public function create(int $group_id, array $params)
      */
     public function update(int $group_id, int $board_id, array $params)
     {
-        return $this->put($this->getGroupPath($group_id, 'boards/'.self::encodePath($board_id)), $params);
+        return $this->put('groups/'.self::encodePath($group_id).'/boards/'.self::encodePath($board_id), $params);
     }
 
     /**
@@ -63,7 +63,7 @@ public function update(int $group_id, int $board_id, array $params)
      */
     public function remove(int $group_id, int $board_id)
     {
-        return $this->delete($this->getGroupPath($group_id, 'boards/'.self::encodePath($board_id)));
+        return $this->delete('groups/'.self::encodePath($group_id).'/boards/'.self::encodePath($board_id));
     }
 
     /**
@@ -74,7 +74,7 @@ public function remove(int $group_id, int $board_id)
      */
     public function allLists(int $group_id, int $board_id)
     {
-        return $this->get($this->getGroupPath($group_id, 'boards/'.self::encodePath($board_id).'/lists'));
+        return $this->get('groups/'.self::encodePath($group_id).'/boards/'.self::encodePath($board_id).'/lists');
     }
 
     /**
@@ -86,7 +86,7 @@ public function allLists(int $group_id, int $board_id)
      */
     public function showList(int $group_id, int $board_id, int $list_id)
     {
-        return $this->get($this->getGroupPath($group_id, 'boards/'.self::encodePath($board_id).'/lists/'.self::encodePath($list_id)));
+        return $this->get('groups/'.self::encodePath($group_id).'/boards/'.self::encodePath($board_id).'/lists/'.self::encodePath($list_id));
     }
 
     /**
@@ -102,7 +102,7 @@ public function createList(int $group_id, int $board_id, int $label_id)
             'label_id' => $label_id,
         ];
 
-        return $this->post($this->getGroupPath($group_id, 'boards/'.self::encodePath($board_id).'/lists'), $params);
+        return $this->post('groups/'.self::encodePath($group_id).'/boards/'.self::encodePath($board_id).'/lists', $params);
     }
 
     /**
@@ -119,7 +119,7 @@ public function updateList(int $group_id, int $board_id, int $list_id, int $posi
             'position' => $position,
         ];
 
-        return $this->put($this->getGroupPath($group_id, 'boards/'.self::encodePath($board_id).'/lists/'.self::encodePath($list_id)), $params);
+        return $this->put('groups/'.self::encodePath($group_id).'/boards/'.self::encodePath($board_id).'/lists/'.self::encodePath($list_id), $params);
     }
 
     /**
@@ -131,6 +131,6 @@ public function updateList(int $group_id, int $board_id, int $list_id, int $posi
      */
     public function deleteList(int $group_id, int $board_id, int $list_id)
     {
-        return $this->delete($this->getGroupPath($group_id, 'boards/'.self::encodePath($board_id).'/lists/'.self::encodePath($list_id)));
+        return $this->delete('groups/'.self::encodePath($group_id).'/boards/'.self::encodePath($board_id).'/lists/'.self::encodePath($list_id));
     }
 }

src/Api/GroupsMilestones.php

@@ -41,7 +41,7 @@ public function all(int $group_id, array $parameters = [])
         ;
         $resolver->setDefined('search');
 
-        return $this->get($this->getGroupPath($group_id, 'milestones'), $resolver->resolve($parameters));
+        return $this->get('groups/'.self::encodePath($group_id).'/milestones', $resolver->resolve($parameters));
     }
 
     /**
@@ -52,7 +52,7 @@ public function all(int $group_id, array $parameters = [])
      */
     public function show(int $group_id, int $milestone_id)
     {
-        return $this->get($this->getGroupPath($group_id, 'milestones/'.self::encodePath($milestone_id)));
+        return $this->get('groups/'.self::encodePath($group_id).'/milestones/'.self::encodePath($milestone_id));
     }
 
     /**
@@ -63,7 +63,7 @@ public function show(int $group_id, int $milestone_id)
      */
     public function create(int $group_id, array $params)
     {
-        return $this->post($this->getGroupPath($group_id, 'milestones'), $params);
+        return $this->post('groups/'.self::encodePath($group_id).'/milestones', $params);
     }
 
     /**
@@ -75,7 +75,7 @@ public function create(int $group_id, array $params)
      */
     public function update(int $group_id, int $milestone_id, array $params)
     {
-        return $this->put($this->getGroupPath($group_id, 'milestones/'.self::encodePath($milestone_id)), $params);
+        return $this->put('groups/'.self::encodePath($group_id).'/milestones/'.self::encodePath($milestone_id), $params);
     }
 
     /**
@@ -86,7 +86,7 @@ public function update(int $group_id, int $milestone_id, array $params)
      */
     public function remove(int $group_id, int $milestone_id)
     {
-        return $this->delete($this->getGroupPath($group_id, 'milestones/'.self::encodePath($milestone_id)));
+        return $this->delete('groups/'.self::encodePath($group_id).'/milestones/'.self::encodePath($milestone_id));
     }
 
     /**
@@ -97,7 +97,7 @@ public function remove(int $group_id, int $milestone_id)
      */
     public function issues(int $group_id, int $milestone_id)
     {
-        return $this->get($this->getGroupPath($group_id, 'milestones/'.self::encodePath($milestone_id).'/issues'));
+        return $this->get('groups/'.self::encodePath($group_id).'/milestones/'.self::encodePath($milestone_id).'/issues');
     }
 
     /**
@@ -108,6 +108,6 @@ public function issues(int $group_id, int $milestone_id)
      */
     public function mergeRequests(int $group_id, int $milestone_id)
     {
-        return $this->get($this->getGroupPath($group_id, 'milestones/'.self::encodePath($milestone_id).'/merge_requests'));
+        return $this->get('groups/'.self::encodePath($group_id).'/milestones/'.self::encodePath($milestone_id).'/merge_requests');
     }
 }

src/Api/IssueLinks.php

@@ -34,7 +34,7 @@ public function create($project_id, int $issue_iid, $target_project_id, int $tar
         $parameters['target_project_id'] = $target_project_id;
         $parameters['target_issue_iid'] = $target_issue_iid;
 
-        return $this->post($this->getProjectPath($project_id, 'issues/'.$this->encodePath($issue_iid).'/links'), $parameters);
+        return $this->post($this->getProjectPath($project_id, 'issues/'.self::encodePath($issue_iid).'/links'), $parameters);
     }
 
     /**
@@ -50,6 +50,6 @@ public function create($project_id, int $issue_iid, $target_project_id, int $tar
      */
     public function remove($project_id, int $issue_iid, $issue_link_id, array $parameters = [])
     {
-        return $this->delete($this->getProjectPath($project_id, 'issues/'.$this->encodePath($issue_iid)).'/links/'.$this->encodePath($issue_link_id), $parameters);
+        return $this->delete($this->getProjectPath($project_id, 'issues/'.self::encodePath($issue_iid)).'/links/'.self::encodePath($issue_link_id), $parameters);
     }
 }

src/Api/Issues.php

@@ -51,7 +51,7 @@ public function all($project_id = null, array $parameters = [])
     public function group(int $group_id, array $parameters = [])
     {
         return $this->get(
-            $this->getGroupPath($group_id, 'issues'),
+            'groups/'.self::encodePath($group_id).'/issues',
             $this->createOptionsResolver()->resolve($parameters)
         );
     }

src/Api/IssuesStatistics.php

@@ -38,7 +38,7 @@ public function project($project_id, array $parameters)
      */
     public function group(int $group_id, array $parameters)
     {
-        return $this->get($this->getGroupPath($group_id, 'issues_statistics'), $this->createOptionsResolver()->resolve($parameters));
+        return $this->get('groups/'.self::encodePath($group_id).'/issues_statistics', $this->createOptionsResolver()->resolve($parameters));
     }
 
     /**