The Merge methods API is now official

see: https://developer.github.com/changes/2017-04-07-end-merge-methods-api-preview/
this removes the apiVersion (that wasn't being used anyway..)
also adds support for rebase mergeMethod per https://developer.github.com/v3/pulls/#merge-a-pull-request-merge-button

Since this previously looked for the value to be bool, this is a breaking change

Author: bobeagan

lib/Github/Api/PullRequest.php

@@ -22,16 +22,11 @@ class PullRequest extends AbstractApi
      *
      * @link https://developer.github.com/v3/pulls/#custom-media-types
      * @param string|null $bodyType
-     * @param string|null $apiVersion
      *
      * @return self
      */
-    public function configure($bodyType = null, $apiVersion = null)
+    public function configure($bodyType = null)
     {
-        if (!in_array($apiVersion, array('polaris-preview'))) {
-            $apiVersion = $this->client->getApiVersion();
-        }
-
         if (!in_array($bodyType, array('text', 'html', 'full', 'diff', 'patch'))) {
             $bodyType = 'raw';
         }
@@ -159,8 +154,8 @@ public function merged($username, $repository, $id)
 
     public function merge($username, $repository, $id, $message, $sha, $mergeMethod = 'merge', $title = null)
     {
-        if (is_bool($mergeMethod)) {
-            $mergeMethod = $mergeMethod ? 'squash' : 'merge';
+        if (!in_array($mergeMethod, array('squash', 'rebase'))) {
+            $mergeMethod = 'merge';
         }
 
         $params = array(