Merge pull request #257 from ifosch/patch-1

pilot · pilot · commit 3e777b4d53ed · 2015-03-23T20:22:10.000+02:00
Fixes GitHub Runtime Exception when message is null
diff --git a/lib/Github/Api/PullRequest.php b/lib/Github/Api/PullRequest.php
@@ -115,7 +115,7 @@ 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 = null)
+    public function merge($username, $repository, $id, $message = '')
     {
         return $this->put('repos/'.rawurlencode($username).'/'.rawurlencode($repository).'/pulls/'.rawurlencode($id).'/merge', array(
             'commit_message' => $message

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ public function merged($username, $repository, $id)`
`115`	`115`	`return $this->get('repos/'.rawurlencode($username).'/'.rawurlencode($repository).'/pulls/'.rawurlencode($id).'/merge');`
`116`	`116`	`}`
`117`	`117`
`118`		`- public function merge($username, $repository, $id, $message = null)`
	`118`	`+ public function merge($username, $repository, $id, $message = '')`
`119`	`119`	`{`
`120`	`120`	`return $this->put('repos/'.rawurlencode($username).'/'.rawurlencode($repository).'/pulls/'.rawurlencode($id).'/merge', array(`
`121`	`121`	`'commit_message' => $message`