Merge pull request KnpLabs#466 from sstok/polaris-changes

Update PullRequest::merge for polaris

Author: cursedcoder

lib/Github/Api/PullRequest.php

@@ -115,12 +115,16 @@ 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, $squash = false, $title = null)
+    public function merge($username, $repository, $id, $message, $sha, $mergeMethod = 'merge', $title = null)
     {
+        if (is_bool($mergeMethod)) {
+            $mergeMethod = $mergeMethod ? 'squash' : 'merge';
+        }
+
         $params = array(
             'commit_message' => $message,
             'sha' => $sha,
-            'squash' => $squash,
+            'merge_method' => $mergeMethod,
         );
 
         if (is_string($title)) {

test/Github/Tests/Api/PullRequestTest.php

@@ -143,12 +143,44 @@ 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), 'squash' => false))
+            ->with('/repos/ezsystems/ezpublish/pulls/15/merge', array('commit_message' => 'Merged something', 'sha' => str_repeat('A', 40), 'merge_method' => 'merge'))
             ->will($this->returnValue($expectedArray));
 
         $this->assertEquals($expectedArray, $api->merge('ezsystems', 'ezpublish', 15, 'Merged something', str_repeat('A', 40)));
     }
 
+    /**
+     * @test
+     */
+    public function shouldMergePullRequestWithSquashAsBool()
+    {
+        $expectedArray = array('some' => 'response');
+
+        $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), 'merge_method' => 'squash'))
+            ->will($this->returnValue($expectedArray));
+
+        $this->assertEquals($expectedArray, $api->merge('ezsystems', 'ezpublish', 15, 'Merged something', str_repeat('A', 40), true));
+    }
+
+    /**
+     * @test
+     */
+    public function shouldMergePullRequestWithMergeMethod()
+    {
+        $expectedArray = array('some' => 'response');
+
+        $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), 'merge_method' => 'rebase'))
+            ->will($this->returnValue($expectedArray));
+
+        $this->assertEquals($expectedArray, $api->merge('ezsystems', 'ezpublish', 15, 'Merged something', str_repeat('A', 40), 'rebase'));
+    }
+
     /**
      * @test
      */