Skip to content
This repository has been archived by the owner on Jan 30, 2020. It is now read-only.

Commit

Permalink
Merge remote-tracking branch 'weierophinney/feature/view-layer'
Browse files Browse the repository at this point in the history
  • Loading branch information
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/Paginator.php
Original file line number Diff line number Diff line change
Expand Up @@ -839,7 +839,7 @@ public function getPageItemCache()
public function getView()
{
if ($this->_view === null) {
$this->setView(new View\PhpRenderer());
$this->setView(new View\Renderer\PhpRenderer());
}

return $this->_view;
Expand Down
8 changes: 4 additions & 4 deletions test/PaginatorTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -290,14 +290,14 @@ public function testGetsPagesForPageTwo()
*/
public function testRendersWithoutPartial()
{
$this->_paginator->setView(new View\PhpRenderer());
$this->_paginator->setView(new View\Renderer\PhpRenderer());
$string = @$this->_paginator->__toString();
$this->assertEquals('', $string);
}

public function testRendersWithPartial()
{
$view = new View\PhpRenderer();
$view = new View\Renderer\PhpRenderer();
$view->resolver()->addPath(__DIR__ . '/_files/scripts');

Helper\PaginationControl::setDefaultViewPartial('partial.phtml');
Expand Down Expand Up @@ -531,14 +531,14 @@ public function testGeneratesViewIfNonexistent()

public function testGetsAndSetsView()
{
$this->_paginator->setView(new View\PhpRenderer());
$this->_paginator->setView(new View\Renderer\PhpRenderer());
$this->assertInstanceOf('Zend\\View\\Renderer', $this->_paginator->getView());
}

public function testRenders()
{
$this->setExpectedException('Zend\\View\\Exception', 'view partial');
$this->_paginator->render(new View\PhpRenderer());
$this->_paginator->render(new View\Renderer\PhpRenderer());
}

public function testGetsAndSetsPageRange()
Expand Down

0 comments on commit 7273469

Please sign in to comment.