Merge branch 'develop'

Promote develop to master, becoming the next stable release.
zendframework · Mar 12, 2014 · 60ef0d1 · 60ef0d1
commit 60ef0d1
Show file tree

Hide file tree

Showing 20 changed files with 239 additions and 31 deletions.
diff --git a/composer.json b/composer.json
@@ -13,7 +13,7 @@
         }
     },
     "require": {
-        "php": ">=5.3.3",
+        "php": ">=5.3.23",
         "zendframework/zend-stdlib": "self.version"
     },
     "require-dev": {
@@ -28,7 +28,7 @@
         "phpunit/PHPUnit": "~4.0"
     },
     "suggest": {
-        "zendframework/zend-cache": "To support cache feature",
+        "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",

diff --git a/src/Adapter/AdapterInterface.php b/src/Adapter/AdapterInterface.php
@@ -17,7 +17,7 @@
 interface AdapterInterface extends Countable
 {
     /**
-     * Returns an collection of items for a page.
+     * Returns a collection of items for a page.
      *
      * @param  int $offset Page offset
      * @param  int $itemCountPerPage Number of items per page

diff --git a/src/Adapter/Callback.php b/src/Adapter/Callback.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2014 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\Stdlib\CallbackHandler;
+
+class Callback implements AdapterInterface
+{
+    /**
+     * Callback to be executed to retrieve the items for a page.
+     *
+     * @var CallbackHandler
+     */
+    protected $itemsCallback;
+
+    /**
+     * Callback to be executed to retrieve the total number of items.
+     *
+     * @var CallbackHandler
+     */
+    protected $countCallback;
+
+    /**
+     * Constructs instance.
+     *
+     * @param CallbackHandler|callable $itemsCallback Callback to be executed to retrieve the items for a page.
+     * @param CallbackHandler|callable $countCallback Callback to be executed to retrieve the total number of items.
+     */
+    public function __construct($itemsCallback, $countCallback)
+    {
+        if (! $itemsCallback instanceof CallbackHandler) {
+            $itemsCallback = new CallbackHandler($itemsCallback);
+        }
+
+        if (! $countCallback instanceof CallbackHandler) {
+            $countCallback = new CallbackHandler($countCallback);
+        }
+
+        $this->itemsCallback = $itemsCallback;
+        $this->countCallback = $countCallback;
+    }
+
+    /**
+     * Returns an array of items for a page.
+     *
+     * Executes the {$itemsCallback}.
+     *
+     * @param  int $offset Page offset
+     * @param  int $itemCountPerPage Number of items per page
+     * @return array
+     */
+    public function getItems($offset, $itemCountPerPage)
+    {
+        return $this->itemsCallback->call(array($offset, $itemCountPerPage));
+    }
+
+    /**
+     * Returns the total number of items.
+     *
+     * Executes the {$countCallback}.
+     *
+     * @return int
+     */
+    public function count()
+    {
+        return $this->countCallback->call();
+    }
+}
diff --git a/src/Adapter/DbTableGateway.php b/src/Adapter/DbTableGateway.php
@@ -10,30 +10,38 @@
 namespace Zend\Paginator\Adapter;
 
 use Zend\Db\Sql\Where;
+use Zend\Db\Sql\Having;
 use Zend\Db\TableGateway\TableGateway;
 
 class DbTableGateway extends DbSelect
 {
     /**
      * Constructs instance.
      *
-     * @param TableGateway                $tableGateway
-     * @param Where|\Closure|string|array $where
-     * @param null                        $order
+     * @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
      */
-    public function __construct(TableGateway $tableGateway, $where = null, $order = null)
+    public function __construct(TableGateway $tableGateway, $where = null, $order = null, $group = null, $having = null)
     {
-        $select = $tableGateway->getSql()->select();
+        $sql    = $tableGateway->getSql();
+        $select = $sql->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, $dbAdapter, $resultSetPrototype);
+        parent::__construct($select, $sql, $resultSetPrototype);
     }
 }
diff --git a/test/Adapter/ArrayTest.php b/test/Adapter/ArrayTest.php
@@ -3,7 +3,7 @@
  * 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)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 

diff --git a/test/Adapter/CallbackTest.php b/test/Adapter/CallbackTest.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace ZendTest\Paginator\Adapter;
+
+use Zend\Paginator\Adapter\Callback;
+use Zend\Stdlib\CallbackHandler;
+
+/**
+ * @group      Zend_Paginator
+ */
+class CallbackTest extends \PHPUnit_Framework_TestCase
+{
+    public function testMustDefineTwoCallbacksOnContructor()
+    {
+        $itemsCallback = new CallbackHandler(function () {
+            return array();
+        });
+        $countCallback = new CallbackHandler(function () {
+            return 0;
+        });
+        $adapter = new Callback($itemsCallback, $countCallback);
+
+        $this->assertAttributeSame($itemsCallback, 'itemsCallback', $adapter);
+        $this->assertAttributeSame($countCallback, 'countCallback', $adapter);
+    }
+
+    public function testShouldAcceptAnyCallableOnContructor()
+    {
+        $itemsCallback = function () {
+            return range(1,  10);
+        };
+        $countCallback = 'rand';
+        $adapter = new Callback($itemsCallback, $countCallback);
+
+        $this->assertAttributeInstanceOf('Zend\Stdlib\CallbackHandler', 'itemsCallback', $adapter);
+        $this->assertAttributeInstanceOf('Zend\Stdlib\CallbackHandler', 'countCallback', $adapter);
+    }
+
+    public function testMustRunItemCallbackToGetItems()
+    {
+        $data = range(1,  10);
+        $itemsCallback = function () use ($data) {
+            return $data;
+        };
+        $countCallback = function () {};
+        $adapter = new Callback($itemsCallback, $countCallback);
+
+        $this->assertSame($data, $adapter->getItems(0, 10));
+    }
+
+    public function testMustPassArgumentsToGetItemCallback()
+    {
+        $data = array(0, 1, 2, 3);
+        $itemsCallback = function ($offset, $itemCountPerPage) {
+            return range($offset, $itemCountPerPage);
+        };
+        $countCallback = function () {};
+        $adapter = new Callback($itemsCallback, $countCallback);
+
+        $this->assertSame($data, $adapter->getItems(0, 3));
+    }
+
+    public function testMustRunCountCallbackToCount()
+    {
+        $count = 1988;
+        $itemsCallback = function () {};
+        $countCallback = function () use ($count) {
+            return $count;
+        };
+        $adapter = new Callback($itemsCallback, $countCallback);
+
+        $this->assertSame($count, $adapter->count());
+    }
+}
diff --git a/test/Adapter/DbSelectTest.php b/test/Adapter/DbSelectTest.php
@@ -3,7 +3,7 @@
  * 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)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 

diff --git a/test/Adapter/DbTableGatewayTest.php b/test/Adapter/DbTableGatewayTest.php
@@ -3,12 +3,13 @@
  * 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)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
 namespace ZendTest\Paginator\Adapter;
 
+use Zend\Db\Adapter\Platform\Sql92;
 use Zend\Paginator\Adapter\DbTableGateway;
 use Zend\Db\ResultSet\ResultSet;
 
@@ -23,6 +24,7 @@ class DbTableGatewayTest extends \PHPUnit_Framework_TestCase
     /** @var DbTableGateway */
     protected $dbTableGateway;
 
+    /** @var \Zend\Db\TableGateway\TableGateway */
     protected $mockTableGateway;
 
     public function setup()
@@ -32,13 +34,12 @@ public function setup()
         $mockDriver->expects($this->any())
                    ->method('createStatement')
                    ->will($this->returnValue($mockStatement));
-        $mockPlatform = $this->getMock('Zend\Db\Adapter\Platform\PlatformInterface');
-        $mockPlatform->expects($this->any())
-                     ->method('getName')
-                     ->will($this->returnValue('platform'));
+        $mockDriver->expects($this->any())
+            ->method('formatParameterName')
+            ->will($this->returnArgument(0));
         $mockAdapter = $this->getMockForAbstractClass(
             'Zend\Db\Adapter\Adapter',
-            array($mockDriver, $mockPlatform)
+            array($mockDriver, new Sql92())
         );
 
         $tableName = 'foobar';
@@ -98,4 +99,47 @@ 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);
+    }
 }
diff --git a/test/Adapter/IteratorTest.php b/test/Adapter/IteratorTest.php
@@ -3,7 +3,7 @@
  * 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)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 

diff --git a/test/Adapter/NullTest.php b/test/Adapter/NullTest.php
@@ -3,7 +3,7 @@
  * 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)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 

diff --git a/test/AdapterPluginManagerTest.php b/test/AdapterPluginManagerTest.php
@@ -3,7 +3,7 @@
  * 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)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 

diff --git a/test/FactoryTest.php b/test/FactoryTest.php
@@ -3,7 +3,7 @@
  * 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)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 

diff --git a/test/PaginatorTest.php b/test/PaginatorTest.php
@@ -3,7 +3,7 @@
  * 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)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 

diff --git a/test/ScrollingStyle/AllTest.php b/test/ScrollingStyle/AllTest.php
@@ -3,7 +3,7 @@
  * 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)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */