From 130fea314687196b10c2bfe1381236c98f09327e Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Mon, 18 May 2015 11:25:02 +0200 Subject: [PATCH] Revert "Merge Queryable into QueryInterface" This reverts commit ca5ef2da2bb9ce21701a32a668c149c0608fc8bb. A perfect example of a change as a result of being mentally deranged. --- library/Icinga/Data/QueryInterface.php | 2 +- library/Icinga/Data/SimpleQuery.php | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/library/Icinga/Data/QueryInterface.php b/library/Icinga/Data/QueryInterface.php index 7f82c8c09..4d43d1059 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 Queryable, Browsable, Fetchable, Filterable, Limitable, Sortable, Countable {}; +interface QueryInterface extends Browsable, Fetchable, Filterable, Limitable, Sortable, Countable {}; diff --git a/library/Icinga/Data/SimpleQuery.php b/library/Icinga/Data/SimpleQuery.php index 875f5222a..c38cf9c53 100644 --- a/library/Icinga/Data/SimpleQuery.php +++ b/library/Icinga/Data/SimpleQuery.php @@ -3,13 +3,14 @@ namespace Icinga\Data; -use Zend_Paginator; use Icinga\Application\Icinga; use Icinga\Data\Filter\Filter; -use Icinga\Exception\IcingaException; use Icinga\Web\Paginator\Adapter\QueryAdapter; +use Zend_Paginator; +use Exception; +use Icinga\Exception\IcingaException; -class SimpleQuery implements QueryInterface +class SimpleQuery implements QueryInterface, Queryable { /** * Query data source