Merge branch 'hotfix/zendframework/zendframework#6574-db-select-pagin…

…ator-factory-should-use-mutable-creation-options' into develop

Close zendframework/zendframework#6574
Close zendframework/zendframework#6403

src/Adapter/Service/DbSelectFactory.php

@@ -9,33 +9,41 @@
 
 namespace Zend\Paginator\Adapter\Service;
 
+use Zend\Paginator\Adapter\DbSelect;
 use Zend\ServiceManager\FactoryInterface;
+use Zend\ServiceManager\MutableCreationOptionsInterface;
 use Zend\ServiceManager\ServiceLocatorInterface;
 
-class DbSelectFactory implements FactoryInterface
+class DbSelectFactory implements
+    FactoryInterface,
+    MutableCreationOptionsInterface
 {
     /**
      * Adapter options
+     *
      * @var array
      */
     protected $creationOptions;
 
     /**
-     * Construct with adapter options
-     * @param array $creationOptions
+     * {@inheritDoc}
      */
-    public function __construct(array $creationOptions)
+    public function setCreationOptions(array $creationOptions)
     {
         $this->creationOptions = $creationOptions;
     }
 
     /**
-     * @param ServiceLocatorInterface $serviceLocator
+     * {@inheritDoc}
+     *
      * @return \Zend\Paginator\Adapter\DbSelect
      */
     public function createService(ServiceLocatorInterface $serviceLocator)
     {
-        $class = new \ReflectionClass('Zend\Paginator\Adapter\DbSelect');
-        return $class->newInstanceArgs($this->creationOptions);
+        return new DbSelect(
+            $this->creationOptions[0],
+            $this->creationOptions[1],
+            isset($this->creationOptions[2]) ? $this->creationOptions[2] : null
+        );
     }
 }