tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-28 16:24:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/exceptions-with-printf-params-6931'

Browse Source 
fixes #6931
This commit is contained in:
Alexander Klimov 2014-08-27 16:32:23 +02:00
commit 70fdd58fe4
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/Icinga/Data/Filter/FilterException.php
View File

@ -4,11 +4,11 @@
namespace Icinga\Data\Filter; namespace Icinga\Data\Filter;
use Exception; use Icinga\Exception\IcingaException;
/** /**
* Filter Exception Class * Filter Exception Class
* *
* Filter Exceptions should be thrown on filter parse errors or similar * Filter Exceptions should be thrown on filter parse errors or similar
*/ */
class FilterException extends Exception {} class FilterException extends IcingaException {}

4
library/Icinga/Data/Filter/FilterParseException.php
View File

@ -4,8 +4,8 @@
namespace Icinga\Data\Filter; namespace Icinga\Data\Filter;
use Exception; use Icinga\Exception\IcingaException;
class FilterParseException extends Exception class FilterParseException extends IcingaException
{ {
} }

6
library/Icinga/Data/Filter/FilterQueryString.php
View File

@ -15,7 +15,7 @@ class FilterQueryString
protected $reportDebug = false; protected $reportDebug = false;
protected $length; protected $length;
protected function __construct() protected function __construct()
{ {
} }
@ -111,13 +111,13 @@ class FilterQueryString
$extra .= "\n" . implode("\n", $this->debug); $extra .= "\n" . implode("\n", $this->debug);
} }
throw new FilterParseException(sprintf( throw new FilterParseException(
'Invalid filter "%s", unexpected %s at pos %d%s', 'Invalid filter "%s", unexpected %s at pos %d%s',
$this->string, $this->string,
$char, $char,
$this->pos, $this->pos,
$extra $extra
)); );
} }
protected function readFilters($nestingLevel = 0, $op = null) protected function readFilters($nestingLevel = 0, $op = null)

7
modules/monitoring/library/Monitoring/Exception/UnsupportedBackendException.php
View File

@ -4,8 +4,9 @@
namespace Icinga\Module\Monitoring\Exception; namespace Icinga\Module\Monitoring\Exception;
use Exception;
class UnsupportedBackendException extends Exception use Icinga\Exception\IcingaException;
class UnsupportedBackendException extends IcingaException
{ {
} }