LesLibres.org/Rss-Bridge
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

exception: Remove HttpException class

Browse source 
This class served no particular purpose (other than adding a
layer on top of Exception).
This commit is contained in:
logmanoriginal 2018-11-18 16:53:21 +01:00
parent dbffbd4d4e
commit c6a7b9ac64
5 changed files with 6 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bridges/FilterBridge.php
View file

@ -94,7 +94,7 @@ class FilterBridge extends FeedExpander {
} }
try{ try{
$this->collectExpandableDatas($this->getURI()); $this->collectExpandableDatas($this->getURI());
} catch (HttpException $e) { } catch (Exception $e) {
$this->collectExpandableDatas($this->getURI()); $this->collectExpandableDatas($this->getURI());
} }
} }

2
bridges/WordPressBridge.php
View file

@ -93,7 +93,7 @@ class WordPressBridge extends FeedExpander {
} }
try{ try{
$this->collectExpandableDatas($this->getURI() . '/feed/atom/'); $this->collectExpandableDatas($this->getURI() . '/feed/atom/');
} catch (HttpException $e) { } catch (Exception $e) {
$this->collectExpandableDatas($this->getURI() . '/?feed=atom'); $this->collectExpandableDatas($this->getURI() . '/?feed=atom');
} }

7
index.php
View file

@ -109,7 +109,7 @@ try {
// whitelist control // whitelist control
if(!Bridge::isWhitelisted($bridge)) { if(!Bridge::isWhitelisted($bridge)) {
throw new \HttpException('This bridge is not whitelisted', 401); throw new \Exception('This bridge is not whitelisted', 401);
die; die;
} }
@ -272,11 +272,8 @@ try {
} else { } else {
echo BridgeList::create($showInactive); echo BridgeList::create($showInactive);
} }
} catch(HttpException $e) { } catch(\Exception $e) {
error_log($e); error_log($e);
header('Content-Type: text/plain', true, $e->getCode()); header('Content-Type: text/plain', true, $e->getCode());
die($e->getMessage()); die($e->getMessage());
} catch(\Exception $e) {
error_log($e);
die($e->getMessage());
} }

7
lib/Exceptions.php
View file

@ -11,13 +11,6 @@
* @link https://github.com/rss-bridge/rss-bridge * @link https://github.com/rss-bridge/rss-bridge
*/ */
/**
* Implements a RSS-Bridge specific exception class
*
* @todo This class serves no purpose, remove it!
*/
class HttpException extends \Exception{}
/** /**
* Returns an URL that automatically populates a new issue on GitHub based * Returns an URL that automatically populates a new issue on GitHub based
* on the information provided * on the information provided

4
lib/error.php
View file

@ -14,14 +14,14 @@
/** /**
* Throws an exception when called. * Throws an exception when called.
* *
* @throws \HttpException when called * @throws \Exception when called
* @param string $message The error message * @param string $message The error message
* @param int $code The HTTP error code * @param int $code The HTTP error code
* @link https://en.wikipedia.org/wiki/List_of_HTTP_status_codes List of HTTP * @link https://en.wikipedia.org/wiki/List_of_HTTP_status_codes List of HTTP
* status codes * status codes
*/ */
function returnError($message, $code){ function returnError($message, $code){
throw new \HttpException($message, $code); throw new \Exception($message, $code);
} }
/** /**