Merge pull request #380 from Soullivaneuh/patch-3

Add merge by squash option
KnpLabs · May 29, 2016 · fe91371 · fe91371
2 parents 6632c88 + 021d924
commit fe91371
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/lib/Github/Api/PullRequest.php b/lib/Github/Api/PullRequest.php
@@ -115,10 +115,18 @@ public function merged($username, $repository, $id)
         return $this->get('repos/'.rawurlencode($username).'/'.rawurlencode($repository).'/pulls/'.rawurlencode($id).'/merge');
     }
 
-    public function merge($username, $repository, $id, $message, $sha)
+    public function merge($username, $repository, $id, $message, $sha, $squash = false, $title = null)
     {
-        return $this->put('repos/'.rawurlencode($username).'/'.rawurlencode($repository).'/pulls/'.rawurlencode($id).'/merge', array(
-            'commit_message' => $message, 'sha' => $sha
-        ));
+        $params = array(
+            'commit_message' => $message,
+            'sha' => $sha,
+            'squash' => $squash,
+        );
+
+        if (is_string($title)) {
+            $params['commit_title'] = $title;
+        }
+
+        return $this->put('repos/'.rawurlencode($username).'/'.rawurlencode($repository).'/pulls/'.rawurlencode($id).'/merge', $params);
     }
 }
diff --git a/test/Github/Tests/Api/PullRequestTest.php b/test/Github/Tests/Api/PullRequestTest.php
@@ -143,7 +143,7 @@ public function shouldMergePullRequest()
         $api = $this->getApiMock();
         $api->expects($this->once())
             ->method('put')
-            ->with('repos/ezsystems/ezpublish/pulls/15/merge', array('commit_message' => 'Merged something', 'sha' => str_repeat('A', 40)))
+            ->with('repos/ezsystems/ezpublish/pulls/15/merge', array('commit_message' => 'Merged something', 'sha' => str_repeat('A', 40), 'squash' => false))
             ->will($this->returnValue($expectedArray));
 
         $this->assertEquals($expectedArray, $api->merge('ezsystems', 'ezpublish', 15, 'Merged something', str_repeat('A', 40)));