Merge a8ef63b into 26c324d

laminas · Aug 29, 2020 · 91edc13 · 91edc13
2 parents 26c324d + a8ef63b
commit 91edc13
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 4 deletions.
diff --git a/src/Paginator.php b/src/Paginator.php
@@ -791,18 +791,21 @@ public function normalizePageNumber($pageNumber)
     /**
      * Renders the paginator.
      *
-     * @param  \Laminas\View\Renderer\RendererInterface $view
+     * @param View\Renderer\RendererInterface|null $view
+     * @param array                                $params
      * @return string
      */
-    public function render(View\Renderer\RendererInterface $view = null)
-    {
+    public function render(
+        View\Renderer\RendererInterface $view = null,
+        array $params = []
+    ) {
         if (null !== $view) {
             $this->setView($view);
         }
 
         $view = $this->getView();
 
-        return $view->paginationControl($this);
+        return $view->paginationControl($this, null, null, $params);
     }
 
     /**

diff --git a/test/PaginatorTest.php b/test/PaginatorTest.php
@@ -249,6 +249,20 @@ public function testRendersWithPartial()
         $this->assertEquals('partial rendered successfully', $string);
     }
 
+    public function testSetParamsOnRenderShouldPassToView()
+    {
+        $view = new View\Renderer\PhpRenderer();
+        $view->resolver()->addPath(__DIR__ . '/_files/scripts');
+
+        Helper\PaginationControl::setDefaultViewPartial('partial-with-vars.phtml');
+
+        $message = 'partial rendered successfully with vars';
+        $this->assertSame(
+            'partial rendered successfully with vars',
+            $this->paginator->render($view, ['message' => $message])
+        );
+    }
+
     public function testGetsPageCount()
     {
         $this->assertEquals(11, $this->paginator->count());

diff --git a/test/_files/scripts/partial-with-vars.phtml b/test/_files/scripts/partial-with-vars.phtml
@@ -0,0 +1 @@
+<?= $message ?>