Added branch protection permissions. Fixes #156

Author: m4tthumphrey

lib/Gitlab/Api/Repositories.php

@@ -48,11 +48,16 @@ public function deleteBranch($project_id, $branch_name)
     /**
      * @param int $project_id
      * @param string $branch_name
+     * @param bool $devPush
+     * @param bool $devMerge
      * @return mixed
      */
-    public function protectBranch($project_id, $branch_name)
+    public function protectBranch($project_id, $branch_name, $devPush = false, $devMerge = false)
     {
-        return $this->put($this->getProjectPath($project_id, 'repository/branches/'.$this->encodeBranch($branch_name).'/protect'));
+        return $this->put($this->getProjectPath($project_id, 'repository/branches/'.$this->encodeBranch($branch_name).'/protect'), array(
+            'developers_can_push' => $devPush,
+            'developers_can_merge' => $devMerge
+        ));
     }
 
     /**

lib/Gitlab/Model/Branch.php

@@ -63,11 +63,13 @@ public function show()
     }
 
     /**
+     * @param bool $devPush
+     * @param bool $devMerge
      * @return Branch
      */
-    public function protect()
+    public function protect($devPush = false, $devMerge = false)
     {
-        $data = $this->api('repositories')->protectBranch($this->project->id, $this->name);
+        $data = $this->api('repositories')->protectBranch($this->project->id, $this->name, $devPush, $devMerge);
 
         return static::fromArray($this->getClient(), $this->project, $data);
     }

lib/Gitlab/Model/Project.php

@@ -420,14 +420,16 @@ public function branch($branch_name)
 
     /**
      * @param string $branch_name
+     * @param bool $devPush
+     * @param bool $devMerge
      * @return Branch
      */
-    public function protectBranch($branch_name)
+    public function protectBranch($branch_name, $devPush = false, $devMerge = false)
     {
         $branch = new Branch($this, $branch_name);
         $branch->setClient($this->getClient());
 
-        return $branch->protect();
+        return $branch->protect($devPush, $devMerge);
     }
 
     /**

test/Gitlab/Tests/Api/RepositoriesTest.php

@@ -85,13 +85,30 @@ public function shouldProtectBranch()
         $api = $this->getApiMock();
         $api->expects($this->once())
             ->method('put')
-            ->with('projects/1/repository/branches/master/protect')
+            ->with('projects/1/repository/branches/master/protect', array('developers_can_push' => false, 'developers_can_merge' => false))
             ->will($this->returnValue($expectedArray))
         ;
 
         $this->assertEquals($expectedArray, $api->protectBranch(1, 'master'));
     }
 
+    /**
+     * @test
+     */
+    public function shouldProtectBranchWithPermissions()
+    {
+        $expectedArray = array('name' => 'master');
+
+        $api = $this->getApiMock();
+        $api->expects($this->once())
+            ->method('put')
+            ->with('projects/1/repository/branches/master/protect', array('developers_can_push' => true, 'developers_can_merge' => true))
+            ->will($this->returnValue($expectedArray))
+        ;
+
+        $this->assertEquals($expectedArray, $api->protectBranch(1, 'master', true, true));
+    }
+
     /**
      * @test
      */