mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 05:50:42 +02:00
Code Issues Releases Wiki Activity

[ticket/11603] Fix github API calls

Browse Source 
- Some URLs changed
- Response is a plain array now
- Added error messages when API limit is reached

PHPBB3-11603
This commit is contained in:
Joas Schilling
2013-06-13 13:05:33 +02:00
parent bcc98ae3e7
commit e4ccc5e6ea
2 changed files with 57 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
git-tools/merge.php
View File

@@ -128,6 +128,7 @@ function api_request($query)
curl_setopt($c, CURLOPT_URL, "https://api.github.com/$query");
curl_setopt($c, CURLOPT_RETURNTRANSFER, true);
curl_setopt($c, CURLOPT_USERAGENT, 'phpBB/1.0');
curl_setopt($c, CURLOPT_HEADER, true);
$contents = curl_exec($c);
curl_close($c);
@@ -135,13 +136,19 @@ function api_request($query)
{
throw new RuntimeException("Error: failed to retrieve pull request data\n", 4);
}
$contents = json_decode($contents);
return json_decode($contents);
if (isset($contents->message) && strpos($contents->message, 'API Rate Limit') === 0)
{
exit('Reached github API Rate Limit. Please try again later' . "\n");
}
return $contents;
}
function get_pull($username, $repository, $pull_id)
{
$request = api_request("pulls/$username/$repository/$pull_id");
$request = api_request("repos/$username/$repository/pulls/$pull_id");
$pull = $request->pull;