aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2013-06-19 13:45:42 +0200
committerJoas Schilling <nickvergessen@gmx.de>2013-06-19 13:45:42 +0200
commit99e486dc8234d28aae1e9c3ed108f0b78d0033f0 (patch)
tree872cd918ce566d06839eb482792fc2ba560d5c35
parent[ticket/11603] Avoid using cURL (diff)
downloadphpbb-99e486dc8234d28aae1e9c3ed108f0b78d0033f0.tar.gz
phpbb-99e486dc8234d28aae1e9c3ed108f0b78d0033f0.tar.bz2
phpbb-99e486dc8234d28aae1e9c3ed108f0b78d0033f0.zip
[ticket/11603] Throw RuntimeExceptions instead of using exit()
PHPBB3-11603
-rwxr-xr-xgit-tools/merge.php2
-rwxr-xr-xgit-tools/setup_github_network.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/git-tools/merge.php b/git-tools/merge.php
index 08c0ecfbd0..f6142095fb 100755
--- a/git-tools/merge.php
+++ b/git-tools/merge.php
@@ -143,7 +143,7 @@ function api_url_request($url)
if (isset($contents->message) && strpos($contents->message, 'API Rate Limit') === 0)
{
- exit('Reached github API Rate Limit. Please try again later' . "\n");
+ throw new RuntimeException('Reached github API Rate Limit. Please try again later' . "\n", 4);
}
return $contents;
diff --git a/git-tools/setup_github_network.php b/git-tools/setup_github_network.php
index e5bc89bf91..bc85d67ab5 100755
--- a/git-tools/setup_github_network.php
+++ b/git-tools/setup_github_network.php
@@ -187,7 +187,7 @@ function api_url_request($url)
if (isset($contents->message) && strpos($contents->message, 'API Rate Limit') === 0)
{
- exit('Reached github API Rate Limit. Please try again later' . "\n");
+ throw new RuntimeException('Reached github API Rate Limit. Please try again later' . "\n", 4);
}
return ($sub_request_result) ? array_merge($sub_request_result, $contents) : $contents;