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

fixes #6931

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

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

library/Icinga/Data/Filter/FilterQueryString.php

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

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