From ca5ef2da2bb9ce21701a32a668c149c0608fc8bb Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Mon, 4 May 2015 11:07:50 +0200 Subject: [PATCH] Merge Queryable into QueryInterface A *Query*Interface describes an object as being queryable, now. refs #8826 --- library/Icinga/Data/QueryInterface.php | 2 +- library/Icinga/Data/SimpleQuery.php | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/library/Icinga/Data/QueryInterface.php b/library/Icinga/Data/QueryInterface.php index 4d43d1059..7f82c8c09 100644 --- a/library/Icinga/Data/QueryInterface.php +++ b/library/Icinga/Data/QueryInterface.php @@ -5,4 +5,4 @@ namespace Icinga\Data; use Countable; -interface QueryInterface extends Browsable, Fetchable, Filterable, Limitable, Sortable, Countable {}; +interface QueryInterface extends Queryable, Browsable, Fetchable, Filterable, Limitable, Sortable, Countable {}; diff --git a/library/Icinga/Data/SimpleQuery.php b/library/Icinga/Data/SimpleQuery.php index 16f82cbe4..ea8eca3d2 100644 --- a/library/Icinga/Data/SimpleQuery.php +++ b/library/Icinga/Data/SimpleQuery.php @@ -3,14 +3,13 @@ namespace Icinga\Data; +use Zend_Paginator; use Icinga\Application\Icinga; use Icinga\Data\Filter\Filter; -use Icinga\Web\Paginator\Adapter\QueryAdapter; -use Zend_Paginator; -use Exception; use Icinga\Exception\IcingaException; +use Icinga\Web\Paginator\Adapter\QueryAdapter; -class SimpleQuery implements QueryInterface, Queryable +class SimpleQuery implements QueryInterface { /** * Query data source