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

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

View File

@ -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 {}

View File

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

View File

@ -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)

View File

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