Revert "Merge branch 'superdweebie-rand-bugfix'"

This reverts commit 002ce3dee6107f2c71af8e7ce0ed1f43693ddadf, reversing
changes made to 0023a96e4756112661c11dbf4e293f4be110809a.

Note: we will need to revert this revert when merging develop to master for the
2.3.0 release. See http://git-scm.com/blog/2010/03/02/undoing-merges.html - the
section on "Reverting the Revert," for details.

composer.json

@@ -28,7 +28,7 @@
         "phpunit/PHPUnit": "~4.0"
     },
     "suggest": {
-        "zendframework/zend-cache": "Zend\\Cache component",
+        "zendframework/zend-cache": "Zend\\Cache component to support cache features",
         "zendframework/zend-db": "Zend\\Db component",
         "zendframework/zend-filter": "Zend\\Filter component",
         "zendframework/zend-json": "Zend\\Json component",

src/Adapter/DbTableGateway.php

@@ -10,7 +10,6 @@
 namespace Zend\Paginator\Adapter;
 
 use Zend\Db\Sql\Where;
-use Zend\Db\Sql\Having;
 use Zend\Db\TableGateway\TableGateway;
 use Zend\Paginator\Adapter\DbSelect;
 
@@ -19,30 +18,23 @@ class DbTableGateway extends DbSelect
     /**
      * Constructs instance.
      *
-     * @param TableGateway                      $tableGateway
-     * @param null|Where|\Closure|string|array  $where
-     * @param null|string|array                 $order
-     * @param null|string|array                 $group
-     * @param null|Having|\Closure|string|array $having
+     * @param TableGateway                $tableGateway
+     * @param Where|\Closure|string|array $where
+     * @param null                        $order
      */
-    public function __construct(TableGateway $tableGateway, $where = null, $order = null, $group = null, $having = null)
+    public function __construct(TableGateway $tableGateway, $where = null, $order = null)
     {
-        $sql    = $tableGateway->getSql();
-        $select = $sql->select();
+        $select = $tableGateway->getSql()->select();
         if ($where) {
             $select->where($where);
         }
         if ($order) {
             $select->order($order);
         }
-        if ($group) {
-            $select->group($group);
-        }
-        if ($having) {
-            $select->having($having);
-        }
 
+        $dbAdapter          = $tableGateway->getAdapter();
         $resultSetPrototype = $tableGateway->getResultSetPrototype();
-        parent::__construct($select, $sql, $resultSetPrototype);
+
+        parent::__construct($select, $dbAdapter, $resultSetPrototype);
     }
 }

test/Adapter/DbTableGatewayTest.php

@@ -10,7 +10,6 @@
 
 namespace ZendTest\Paginator\Adapter;
 
-use Zend\Db\Adapter\Platform\Sql92;
 use Zend\Paginator\Adapter\DbTableGateway;
 use Zend\Paginator\Adapter\DbSelect;
 use Zend\Db\ResultSet\ResultSet;
@@ -26,7 +25,6 @@ class DbTableGatewayTest extends \PHPUnit_Framework_TestCase
     /** @var DbTableGateway */
     protected $dbTableGateway;
 
-    /** @var \Zend\Db\TableGateway\TableGateway */
     protected $mockTableGateway;
 
     public function setup()
@@ -36,12 +34,13 @@ public function setup()
         $mockDriver->expects($this->any())
                    ->method('createStatement')
                    ->will($this->returnValue($mockStatement));
-        $mockDriver->expects($this->any())
-            ->method('formatParameterName')
-            ->will($this->returnArgument(0));
+        $mockPlatform = $this->getMock('Zend\Db\Adapter\Platform\PlatformInterface');
+        $mockPlatform->expects($this->any())
+                     ->method('getName')
+                     ->will($this->returnValue('platform'));
         $mockAdapter = $this->getMockForAbstractClass(
             'Zend\Db\Adapter\Adapter',
-            array($mockDriver, new Sql92())
+            array($mockDriver, $mockPlatform)
         );
 
         $tableName = 'foobar';
@@ -101,47 +100,4 @@ public function testGetItemsWithWhereAndOrder()
         $items = $this->dbTableGateway->getItems(2, 10);
         $this->assertInstanceOf('Zend\Db\ResultSet\ResultSet', $items);
     }
-
-    public function testGetItemsWithWhereAndOrderAndGroup()
-    {
-        $where = "foo = bar";
-        $order = "foo";
-        $group = "foo";
-        $this->dbTableGateway = new DbTableGateway($this->mockTableGateway, $where, $order, $group);
-
-        $mockResult = $this->getMock('Zend\Db\Adapter\Driver\ResultInterface');
-        $this->mockStatement
-            ->expects($this->once())
-            ->method('setSql')
-            ->with($this->equalTo('SELECT "foobar".* FROM "foobar" WHERE foo = bar GROUP BY "foo" ORDER BY "foo" ASC LIMIT limit OFFSET offset'));
-        $this->mockStatement
-             ->expects($this->any())
-             ->method('execute')
-             ->will($this->returnValue($mockResult));
-
-        $items = $this->dbTableGateway->getItems(2, 10);
-        $this->assertInstanceOf('Zend\Db\ResultSet\ResultSet', $items);
-    }
-
-    public function testGetItemsWithWhereAndOrderAndGroupAndHaving()
-    {
-        $where  = "foo = bar";
-        $order  = "foo";
-        $group  = "foo";
-        $having = "count(foo)>0";
-        $this->dbTableGateway = new DbTableGateway($this->mockTableGateway, $where, $order, $group, $having);
-
-        $mockResult = $this->getMock('Zend\Db\Adapter\Driver\ResultInterface');
-        $this->mockStatement
-            ->expects($this->once())
-            ->method('setSql')
-            ->with($this->equalTo('SELECT "foobar".* FROM "foobar" WHERE foo = bar GROUP BY "foo" HAVING count(foo)>0 ORDER BY "foo" ASC LIMIT limit OFFSET offset'));
-        $this->mockStatement
-            ->expects($this->any())
-            ->method('execute')
-            ->will($this->returnValue($mockResult));
-
-        $items = $this->dbTableGateway->getItems(2, 10);
-        $this->assertInstanceOf('Zend\Db\ResultSet\ResultSet', $items);
-    }
 }