Skip to content

The Merge methods API is now official #562

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Apr 18, 2017
Merged

The Merge methods API is now official #562

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d66c81e
The Merge methods API is now official
bobeagan Apr 7, 2017
75c8f6c
retain weird bool support for this value
bobeagan Apr 7, 2017
5045173
let github throw errors instead
bobeagan Apr 14, 2017
38bd1a4
add back in $apiVersion to make it easier to handle preview versions …
bobeagan Apr 14, 2017
af435f6
throw invalidargumentexception when trying to use invalid merge method
bobeagan Apr 14, 2017
574a927
add missing use
bobeagan Apr 14, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions lib/Github/Api/PullRequest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
use Github\Api\PullRequest\Comments;
use Github\Api\PullRequest\Review;
use Github\Api\PullRequest\ReviewRequest;
use Github\Exception\InvalidArgumentException;
use Github\Exception\MissingArgumentException;

/**
Expand All @@ -28,7 +29,7 @@ class PullRequest extends AbstractApi
*/
public function configure($bodyType = null, $apiVersion = null)
{
if (!in_array($apiVersion, array('polaris-preview'))) {
if (!in_array($apiVersion, array())) {
$apiVersion = $this->client->getApiVersion();
}

Expand All @@ -40,7 +41,7 @@ public function configure($bodyType = null, $apiVersion = null)
$bodyType .= '+json';
}

$this->acceptHeaderValue = sprintf('application/vnd.github.%s.%s', $this->client->getApiVersion(), $bodyType);
$this->acceptHeaderValue = sprintf('application/vnd.github.%s.%s', $apiVersion, $bodyType);

return $this;
}
Expand Down Expand Up @@ -163,6 +164,10 @@ public function merge($username, $repository, $id, $message, $sha, $mergeMethod
$mergeMethod = $mergeMethod ? 'squash' : 'merge';
}

if (!in_array($mergeMethod, array('merge', 'squash', 'rebase'), true)) {
throw new InvalidArgumentException(sprintf('"$mergeMethod" must be one of ["merge", "squash", "rebase"] ("%s" given).', $mergeMethod));
}

$params = array(
'commit_message' => $message,
'sha' => $sha,
Expand Down