Only revert encoded slashes when dealing with branch names. Fixes GitLabPHP#89

Author: Matt Humphrey

lib/Gitlab/Api/AbstractApi.php

@@ -122,6 +122,6 @@ protected function encodePath($path)
     {
         $path = rawurlencode($path);
 
-        return str_replace(array('%2F', '.'), array('/', '%2E'), $path);
+        return str_replace('.', '%2E', $path);
     }
 }

lib/Gitlab/Api/Repositories.php

@@ -18,7 +18,7 @@ public function branches($project_id)
      */
     public function branch($project_id, $branch_id)
     {
-        return $this->get($this->getProjectPath($project_id, 'repository/branches/'.$this->encodePath($branch_id)));
+        return $this->get($this->getProjectPath($project_id, 'repository/branches/'.$this->encodeBranch($branch_id)));
     }
 
     /**
@@ -42,7 +42,7 @@ public function createBranch($project_id, $branch_name, $ref)
      */
     public function deleteBranch($project_id, $branch_name)
     {
-        return $this->delete($this->getProjectPath($project_id, 'repository/branches/'.$this->encodePath($branch_name)));
+        return $this->delete($this->getProjectPath($project_id, 'repository/branches/'.$this->encodeBranch($branch_name)));
     }
 
     /**
@@ -52,7 +52,7 @@ public function deleteBranch($project_id, $branch_name)
      */
     public function protectBranch($project_id, $branch_name)
     {
-        return $this->put($this->getProjectPath($project_id, 'repository/branches/'.$this->encodePath($branch_name).'/protect'));
+        return $this->put($this->getProjectPath($project_id, 'repository/branches/'.$this->encodeBranch($branch_name).'/protect'));
     }
 
     /**
@@ -62,7 +62,7 @@ public function protectBranch($project_id, $branch_name)
      */
     public function unprotectBranch($project_id, $branch_name)
     {
-        return $this->put($this->getProjectPath($project_id, 'repository/branches/'.$this->encodePath($branch_name).'/unprotect'));
+        return $this->put($this->getProjectPath($project_id, 'repository/branches/'.$this->encodeBranch($branch_name).'/unprotect'));
     }
 
     /**
@@ -155,7 +155,7 @@ public function compare($project_id, $fromShaOrMaster, $toShaOrMaster)
     {
         return $this->get($this->getProjectPath(
             $project_id,
-            'repository/compare?from='.$this->encodePath($fromShaOrMaster).'&to='.$this->encodePath($toShaOrMaster)
+            'repository/compare?from='.$this->encodeBranch($fromShaOrMaster).'&to='.$this->encodeBranch($toShaOrMaster)
         ));
     }
 
@@ -270,4 +270,15 @@ public function contributors($project_id)
     {
         return $this->get($this->getProjectPath($project_id, 'repository/contributors'));
     }
+
+    /**
+     * @param string $path
+     * @return string
+     */
+    protected function encodeBranch($path)
+    {
+        $path = $this->encodePath($path);
+
+        return str_replace('%2F', '/', $path);
+    }
 }

test/Gitlab/Tests/Api/ProjectsTest.php

@@ -83,7 +83,7 @@ public function shouldSearchProjects()
         $api = $this->getMultipleProjectsRequestMock('projects/search/a%2Eproject', $expectedArray);
         $this->assertEquals($expectedArray, $api->search('a.project'));
 
-        $api = $this->getMultipleProjectsRequestMock('projects/search/a/project', $expectedArray);
+        $api = $this->getMultipleProjectsRequestMock('projects/search/a%2Fproject', $expectedArray);
         $this->assertEquals($expectedArray, $api->search('a/project'));
     }