[GithubIssueBridge] Don't return error messages in detectParameters()
detectParameters() is called in a loop for all bridges on a URL, thus if a bridge returns an error message, the output messages get mixed up and all detect operations fail. This seems to be a limitation of the detect function for now.
This commit is contained in:
parent
2559dbbf49
commit
6d6d6037a3
1 changed files with 2 additions and 22 deletions
|
@ -242,24 +242,8 @@ class GithubIssueBridge extends BridgeAbstract {
|
||||||
|
|
||||||
public function detectParameters($url) {
|
public function detectParameters($url) {
|
||||||
|
|
||||||
$help = <<<EOD
|
|
||||||
|
|
||||||
|
|
||||||
Usage:
|
|
||||||
For project issues the URL must include /<user>/<project>
|
|
||||||
For issue comments the URL must include /<user>/<project>/issues/<issue-number>
|
|
||||||
|
|
||||||
Examples:
|
|
||||||
- https://github.com/rss-bridge/rss-bridge
|
|
||||||
- https://github.com/rss-bridge/rss-bridge/issues/1
|
|
||||||
|
|
||||||
Issue comments for project issues are enabled if the URL points to issues
|
|
||||||
https://github.com/rss-bridge/rss-bridge/issues
|
|
||||||
EOD;
|
|
||||||
|
|
||||||
if(filter_var($url, FILTER_VALIDATE_URL, FILTER_FLAG_PATH_REQUIRED) === false
|
if(filter_var($url, FILTER_VALIDATE_URL, FILTER_FLAG_PATH_REQUIRED) === false
|
||||||
|| strpos($url, self::URI) !== 0) {
|
|| strpos($url, self::URI) !== 0) {
|
||||||
returnClientError('Invalid URL' . $help);
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -273,11 +257,7 @@ EOD;
|
||||||
} break;
|
} break;
|
||||||
case 3: { // Project issues with issue comments
|
case 3: { // Project issues with issue comments
|
||||||
if($path_segments[2] !== 'issues') {
|
if($path_segments[2] !== 'issues') {
|
||||||
returnClientError('Invalid path. Expected "/issues/", found "/'
|
return null;
|
||||||
. $path_segments[2]
|
|
||||||
. '/"'
|
|
||||||
. $help
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
list($user, $project) = $path_segments;
|
list($user, $project) = $path_segments;
|
||||||
$show_comments = 'on';
|
$show_comments = 'on';
|
||||||
|
@ -286,7 +266,7 @@ EOD;
|
||||||
list($user, $project, /* issues */, $issue) = $path_segments;
|
list($user, $project, /* issues */, $issue) = $path_segments;
|
||||||
} break;
|
} break;
|
||||||
default: {
|
default: {
|
||||||
returnClientError('Invalid path.' . $help);
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue