Merge branch 'develop'

Prepping for 2.2.0RC1.

src/Adapter/AdapterInterface.php

@@ -19,8 +19,8 @@ interface AdapterInterface extends Countable
     /**
      * Returns an collection of items for a page.
      *
-     * @param  integer $offset Page offset
-     * @param  integer $itemCountPerPage Number of items per page
+     * @param  int $offset Page offset
+     * @param  int $itemCountPerPage Number of items per page
      * @return array
      */
     public function getItems($offset, $itemCountPerPage);

src/Adapter/ArrayAdapter.php

@@ -21,7 +21,7 @@ class ArrayAdapter implements AdapterInterface
     /**
      * Item count
      *
-     * @var integer
+     * @var int
      */
     protected $count = null;
 
@@ -39,8 +39,8 @@ public function __construct(array $array = array())
     /**
      * Returns an array of items for a page.
      *
-     * @param  integer $offset Page offset
-     * @param  integer $itemCountPerPage Number of items per page
+     * @param  int $offset Page offset
+     * @param  int $itemCountPerPage Number of items per page
      * @return array
      */
     public function getItems($offset, $itemCountPerPage)
@@ -51,7 +51,7 @@ public function getItems($offset, $itemCountPerPage)
     /**
      * Returns the total number of rows in the array.
      *
-     * @return integer
+     * @return int
      */
     public function count()
     {

src/Adapter/DbSelect.php

@@ -13,8 +13,8 @@
 use Zend\Db\Sql\Sql;
 use Zend\Db\Sql\Expression;
 use Zend\Db\Sql\Select;
-use Zend\Db\ResultSet\ResultSetInterface;
 use Zend\Db\ResultSet\ResultSet;
+use Zend\Db\ResultSet\ResultSetInterface;
 
 class DbSelect implements AdapterInterface
 {
@@ -39,7 +39,7 @@ class DbSelect implements AdapterInterface
     /**
      * Total item count
      *
-     * @var integer
+     * @var int
      */
     protected $rowCount = null;
 
@@ -72,8 +72,8 @@ public function __construct(Select $select, $adapterOrSqlObject, ResultSetInterf
     /**
      * Returns an array of items for a page.
      *
-     * @param  integer $offset           Page offset
-     * @param  integer $itemCountPerPage Number of items per page
+     * @param  int $offset           Page offset
+     * @param  int $itemCountPerPage Number of items per page
      * @return array
      */
     public function getItems($offset, $itemCountPerPage)
@@ -94,7 +94,7 @@ public function getItems($offset, $itemCountPerPage)
     /**
      * Returns the total number of rows in the result set.
      *
-     * @return integer
+     * @return int
      */
     public function count()
     {

src/Adapter/DbTableGateway.php

@@ -0,0 +1,40 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Paginator\Adapter;
+
+use Zend\Db\Sql\Where;
+use Zend\Db\TableGateway\TableGateway;
+use Zend\Paginator\Adapter\DbSelect;
+
+class DbTableGateway extends DbSelect
+{
+    /**
+     * Constructs instance.
+     *
+     * @param TableGateway                $tableGateway
+     * @param Where|\Closure|string|array $where
+     * @param null                        $order
+     */
+    public function __construct(TableGateway $tableGateway, $where = null, $order = null)
+    {
+        $select = $tableGateway->getSql()->select();
+        if ($where) {
+            $select->where($where);
+        }
+        if ($order) {
+            $select->order($order);
+        }
+
+        $dbAdapter          = $tableGateway->getAdapter();
+        $resultSetPrototype = $tableGateway->getResultSetPrototype();
+
+        parent::__construct($select, $dbAdapter, $resultSetPrototype);
+    }
+}

src/Adapter/Iterator.php

@@ -23,7 +23,7 @@ class Iterator implements AdapterInterface
     /**
      * Item count
      *
-     * @var integer
+     * @var int
      */
     protected $count = null;
 
@@ -46,8 +46,8 @@ public function __construct(\Iterator $iterator)
     /**
      * Returns an iterator of items for a page, or an empty array.
      *
-     * @param  integer $offset Page offset
-     * @param  integer $itemCountPerPage Number of items per page
+     * @param  int $offset Page offset
+     * @param  int $itemCountPerPage Number of items per page
      * @return array|\Zend\Paginator\SerializableLimitIterator
      */
     public function getItems($offset, $itemCountPerPage)
@@ -61,7 +61,7 @@ public function getItems($offset, $itemCountPerPage)
     /**
      * Returns the total number of rows in the collection.
      *
-     * @return integer
+     * @return int
      */
     public function count()
     {

src/Adapter/Null.php

@@ -14,14 +14,14 @@ class Null implements AdapterInterface
     /**
      * Item count
      *
-     * @var integer
+     * @var int
      */
     protected $count = null;
 
     /**
      * Constructor.
      *
-     * @param integer $count Total item count (Optional)
+     * @param int $count Total item count (Optional)
      */
     public function __construct($count = 0)
     {
@@ -31,8 +31,8 @@ public function __construct($count = 0)
     /**
      * Returns an array of items for a page.
      *
-     * @param  integer $offset Page offset
-     * @param  integer $itemCountPerPage Number of items per page
+     * @param  int $offset Page offset
+     * @param  int $itemCountPerPage Number of items per page
      * @return array
      */
     public function getItems($offset, $itemCountPerPage)
@@ -50,7 +50,7 @@ public function getItems($offset, $itemCountPerPage)
     /**
      * Returns the total number of rows in the array.
      *
-     * @return integer
+     * @return int
      */
     public function count()
     {