From 727a2d71411f781dd9cb1286accda249fb81db72 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Thu, 23 Jul 2015 13:48:49 +0200
Subject: [PATCH] Paginator: relax requirements to Paginatable

* we need no full query interface here
* introduced new interface "Paginatable"

fixes #9483
---
 library/Icinga/Data/Paginatable.php     | 9 +++++++++
 library/Icinga/Data/QueryInterface.php  | 4 +---
 library/Icinga/Web/Widget/Paginator.php | 8 ++++----
 3 files changed, 14 insertions(+), 7 deletions(-)
 create mode 100644 library/Icinga/Data/Paginatable.php

diff --git a/library/Icinga/Data/Paginatable.php b/library/Icinga/Data/Paginatable.php
new file mode 100644
index 000000000..d9a6de397
--- /dev/null
+++ b/library/Icinga/Data/Paginatable.php
@@ -0,0 +1,9 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Data;
+
+use Countable;
+
+interface Paginatable extends Limitable, Countable {};
+
diff --git a/library/Icinga/Data/QueryInterface.php b/library/Icinga/Data/QueryInterface.php
index 5a6d5d5ab..6ae6c16ca 100644
--- a/library/Icinga/Data/QueryInterface.php
+++ b/library/Icinga/Data/QueryInterface.php
@@ -3,6 +3,4 @@
 
 namespace Icinga\Data;
 
-use Countable;
-
-interface QueryInterface extends Fetchable, Filterable, Limitable, Sortable, Countable {};
+interface QueryInterface extends Fetchable, Filterable, Paginatable, Sortable {};
diff --git a/library/Icinga/Web/Widget/Paginator.php b/library/Icinga/Web/Widget/Paginator.php
index dc014e371..b0c5b6c15 100644
--- a/library/Icinga/Web/Widget/Paginator.php
+++ b/library/Icinga/Web/Widget/Paginator.php
@@ -3,7 +3,7 @@
 
 namespace Icinga\Web\Widget;
 
-use Icinga\Data\QueryInterface;
+use Icinga\Data\Paginatable;
 use Icinga\Exception\ProgrammingError;
 
 /**
@@ -14,7 +14,7 @@ class Paginator extends AbstractWidget
     /**
      * The query the paginator widget is created for
      *
-     * @var QueryInterface
+     * @var Paginatable
      */
     protected $query;
 
@@ -28,11 +28,11 @@ class Paginator extends AbstractWidget
     /**
      * Set the query to create the paginator widget for
      *
-     * @param   QueryInterface      $query
+     * @param   Paginatable      $query
      *
      * @return  $this
      */
-    public function setQuery(QueryInterface $query)
+    public function setQuery(Paginatable $query)
     {
         $this->query = $query;
         return $this;