Merge pull request KnpLabs#336 from GrahamCampbell/patch-1

Fixed broken merge function

Author: cursedcoder

lib/Github/Api/PullRequest.php

@@ -115,10 +115,10 @@ 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 = '')
+    public function merge($username, $repository, $id, $message, $sha)
     {
         return $this->put('repos/'.rawurlencode($username).'/'.rawurlencode($repository).'/pulls/'.rawurlencode($id).'/merge', array(
-            'commit_message' => $message
+            'commit_message' => $message, 'sha' => $sha
         ));
     }
 }

test/Github/Tests/Api/PullRequestTest.php

@@ -143,10 +143,10 @@ public function shouldMergePullRequest()
         $api = $this->getApiMock();
         $api->expects($this->once())
             ->method('put')
-            ->with('repos/ezsystems/ezpublish/pulls/15/merge', array('commit_message' => 'Merged something'))
+            ->with('repos/ezsystems/ezpublish/pulls/15/merge', array('commit_message' => 'Merged something', 'sha' => str_repeat('A', 40)))
             ->will($this->returnValue($expectedArray));
 
-        $this->assertEquals($expectedArray, $api->merge('ezsystems', 'ezpublish', 15, 'Merged something'));
+        $this->assertEquals($expectedArray, $api->merge('ezsystems', 'ezpublish', 15, 'Merged something', str_repeat('A', 40)));
     }
 
     /**