Merge branch 'hotfix/zendframework/zendframework#6577-adding-missing-…

…paginator-adapter-plugin-manager-registered-services'

Close zendframework/zendframework#6577

src/Adapter/Service/CallbackFactory.php

@@ -0,0 +1,44 @@
+<?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\Service;
+
+use Zend\Paginator\Adapter\Callback;
+use Zend\ServiceManager\MutableCreationOptionsInterface;
+use Zend\ServiceManager\FactoryInterface;
+use Zend\ServiceManager\ServiceLocatorInterface;
+
+class CallbackFactory implements
+    FactoryInterface,
+    MutableCreationOptionsInterface
+{
+    /**
+     * Adapter options
+     * @var array
+     */
+    protected $creationOptions;
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setCreationOptions(array $creationOptions)
+    {
+        $this->creationOptions = $creationOptions;
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @return Callback
+     */
+    public function createService(ServiceLocatorInterface $serviceLocator)
+    {
+        return new Callback($this->creationOptions[0], $this->creationOptions[1]);
+    }
+}

src/Adapter/Service/DbTableGatewayFactory.php

@@ -0,0 +1,50 @@
+<?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\Service;
+
+use Zend\Paginator\Adapter\DbTableGateway;
+use Zend\ServiceManager\MutableCreationOptionsInterface;
+use Zend\ServiceManager\FactoryInterface;
+use Zend\ServiceManager\ServiceLocatorInterface;
+
+class DbTableGatewayFactory implements
+    FactoryInterface,
+    MutableCreationOptionsInterface
+{
+    /**
+     * Adapter options
+     * @var array
+     */
+    protected $creationOptions;
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setCreationOptions(array $creationOptions)
+    {
+        $this->creationOptions = $creationOptions;
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @return DbTableGateway
+     */
+    public function createService(ServiceLocatorInterface $serviceLocator)
+    {
+        return new DbTableGateway(
+            $this->creationOptions[0],
+            isset($this->creationOptions[1]) ? $this->creationOptions[1] : null,
+            isset($this->creationOptions[2]) ? $this->creationOptions[2] : null,
+            isset($this->creationOptions[3]) ? $this->creationOptions[3] : null,
+            isset($this->creationOptions[4]) ? $this->creationOptions[4] : null
+        );
+    }
+}

src/AdapterPluginManager.php

@@ -37,7 +37,9 @@ class AdapterPluginManager extends AbstractPluginManager
      * @var array
      */
     protected $factories = array(
-        'dbselect'         => 'Zend\Paginator\Adapter\Service\DbSelectFactory'
+        'dbselect'         => 'Zend\Paginator\Adapter\Service\DbSelectFactory',
+        'dbtablegateway'   => 'Zend\Paginator\Adapter\Service\DbTableGatewayFactory',
+        'callback'         => 'Zend\Paginator\Adapter\Service\CallbackFactory',
     );
 
     /**

test/AdapterPluginManagerTest.php

@@ -9,6 +9,8 @@
 
 namespace ZendTest\Paginator;
 
+use Zend\Stdlib\CallbackHandler;
+use Zend\Db\Adapter\Platform\Sql92;
 use Zend\Paginator\AdapterPluginManager;
 use Zend\ServiceManager\ServiceManager;
 use Zend\Mvc\Service\ServiceManagerConfig;
@@ -55,6 +57,40 @@ public function testCanRetrieveAdapterPlugin()
         $this->assertInstanceOf('Zend\Paginator\Adapter\DbSelect', $plugin);
         $plugin = $this->adapaterPluginManager->get('null', 101);
         $this->assertInstanceOf('Zend\Paginator\Adapter\Null', $plugin);
+
+        //test dbtablegateway
+        $mockStatement = $this->getMock('Zend\Db\Adapter\Driver\StatementInterface');
+        $mockDriver = $this->getMock('Zend\Db\Adapter\Driver\DriverInterface');
+        $mockDriver->expects($this->any())
+                   ->method('createStatement')
+                   ->will($this->returnValue($mockStatement));
+        $mockDriver->expects($this->any())
+            ->method('formatParameterName')
+            ->will($this->returnArgument(0));
+        $mockAdapter = $this->getMockForAbstractClass(
+            'Zend\Db\Adapter\Adapter',
+            array($mockDriver, new Sql92())
+        );
+        $mockTableGateway = $this->getMockForAbstractClass(
+            'Zend\Db\TableGateway\TableGateway',
+            array('foobar', $mockAdapter)
+        );
+        $where  = "foo = bar";
+        $order  = "foo";
+        $group  = "foo";
+        $having = "count(foo)>0";
+        $plugin = $this->adapaterPluginManager->get('dbtablegateway', array($mockTableGateway, $where, $order, $group, $having));
+        $this->assertInstanceOf('Zend\Paginator\Adapter\DbTableGateway', $plugin);
+
+        //test callback
+        $itemsCallback = new CallbackHandler(function () {
+            return array();
+        });
+        $countCallback = new CallbackHandler(function () {
+            return 0;
+        });
+        $plugin = $this->adapaterPluginManager->get('callback', array($itemsCallback, $countCallback));
+        $this->assertInstanceOf('Zend\Paginator\Adapter\Callback', $plugin);
     }
 
     public function testCanRetrievePluginManagerWithServiceManager()