diff --git a/library/Icinga/Data/Filter/FilterException.php b/library/Icinga/Data/Filter/FilterException.php index e70ee6b77..8f770810f 100644 --- a/library/Icinga/Data/Filter/FilterException.php +++ b/library/Icinga/Data/Filter/FilterException.php @@ -4,11 +4,11 @@ namespace Icinga\Data\Filter; -use Exception; +use Icinga\Exception\IcingaException; /** * Filter Exception Class * * Filter Exceptions should be thrown on filter parse errors or similar */ -class FilterException extends Exception {} +class FilterException extends IcingaException {} diff --git a/library/Icinga/Data/Filter/FilterParseException.php b/library/Icinga/Data/Filter/FilterParseException.php index bb90067b8..5633b5adf 100644 --- a/library/Icinga/Data/Filter/FilterParseException.php +++ b/library/Icinga/Data/Filter/FilterParseException.php @@ -4,8 +4,8 @@ namespace Icinga\Data\Filter; -use Exception; +use Icinga\Exception\IcingaException; -class FilterParseException extends Exception +class FilterParseException extends IcingaException { } diff --git a/library/Icinga/Data/Filter/FilterQueryString.php b/library/Icinga/Data/Filter/FilterQueryString.php index 88d3f0a37..3dbcce473 100644 --- a/library/Icinga/Data/Filter/FilterQueryString.php +++ b/library/Icinga/Data/Filter/FilterQueryString.php @@ -15,7 +15,7 @@ class FilterQueryString protected $reportDebug = false; protected $length; - + protected function __construct() { } @@ -111,13 +111,13 @@ class FilterQueryString $extra .= "\n" . implode("\n", $this->debug); } - throw new FilterParseException(sprintf( + throw new FilterParseException( 'Invalid filter "%s", unexpected %s at pos %d%s', $this->string, $char, $this->pos, $extra - )); + ); } protected function readFilters($nestingLevel = 0, $op = null) diff --git a/modules/monitoring/library/Monitoring/Exception/UnsupportedBackendException.php b/modules/monitoring/library/Monitoring/Exception/UnsupportedBackendException.php index 3e1468e36..169fa2cfd 100644 --- a/modules/monitoring/library/Monitoring/Exception/UnsupportedBackendException.php +++ b/modules/monitoring/library/Monitoring/Exception/UnsupportedBackendException.php @@ -4,8 +4,9 @@ namespace Icinga\Module\Monitoring\Exception; -use Exception; -class UnsupportedBackendException extends Exception +use Icinga\Exception\IcingaException; + +class UnsupportedBackendException extends IcingaException { -} \ No newline at end of file +}