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

Commit

Permalink
Merge branch 'hotfix/paginator-factory-removal'
Browse files Browse the repository at this point in the history
  • Loading branch information
@weierophinney
weierophinney committed Aug 28, 2012
97 parents b273434 + 5b111b1 + ee4a022 + 5130ae3 + aff706f + f73a53d + d4a913a + b29f072 + 651a727 + 430d154 + 1839a34 + 0d5d64e + 5cde84e + dc8ee4d + 85d900a + 887c312 + 9c949ae + 0fc5669 + e29d393 + e25c698 + ca5bdbb + 18e54b8 + 73cc878 + a514416 + 778823f + fff1957 + 35beb1b + ecb2a1a + 67a31fa + c0ee14a + 7273469 + 62e104e + 293b0d0 + c59092f + b3e8431 + 615f1cb + 198a3b9 + 1630584 + 7627438 + 84a5bf6 + ad86c9d + a84a8ca + 4198a62 + e822871 + 431867b + 200dbe0 + 7277f0b + 2408da8 + 2413f67 + 4731ffc + d177c96 + b27c24b + ec13154 + 8e7b30c + 6c4437a + 2a2ed86 + 366d656 + 5f3d390 + 666d47b + dd0e03b + 1a5602a + c01cd9c + 6849552 + 8b79ca2 + e84f0d1 + 9f1b34e + c453b3e + 3d74be7 + 999502e + a46d96f + fba87c0 + ce665da + ef2dd94 + a66c89a + b997097 + da0e97d + 1302f0b + a1bbaa9 + 6bfa503 + b4b9ece + 9b1ac2d + 30880b8 + e308f6d + 8da89be + 199755f + 2310cd0 + 4e7316f + 1d6c476 + c2593db + c6ff37b + 5344902 + a35c230 + 39052a9 + 8152f2f + e0f8777 + d1f068b + 614d6d5 commit 27f9b6d
Show file tree
Hide file tree
Showing 12 changed files with 176 additions and 448 deletions.
67 changes: 0 additions & 67 deletions src/AdapterPluginManager.php
View file

This file was deleted.

88 changes: 1 addition & 87 deletions src/Paginator.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,6 @@
*/
class Paginator implements Countable, IteratorAggregate
{
/**
* Specifies that the factory should try to detect the proper adapter type first
*
* @var string
*/
const INTERNAL_ADAPTER = 'Zend\Paginator\Adapter\Internal';

/**
* The cache tag prefix used to namespace Paginator results in the cache
Expand Down Expand Up @@ -164,87 +158,13 @@ class Paginator implements Countable, IteratorAggregate
*/
protected $view = null;

/**
* Factory.
*
* @param mixed $data
* @param string $adapter
* @throws Exception\InvalidArgumentException
* @return Paginator
*/
public static function factory($data, $adapter = self::INTERNAL_ADAPTER)
{
if ($data instanceof AdapterAggregateInterface) {
return new self($data->getPaginatorAdapter());
}

if ($adapter == self::INTERNAL_ADAPTER) {
if (is_array($data)) {
$adapter = 'array';
} elseif ($data instanceof Sql\Select) {
$adapter = 'db_select';
} elseif ($data instanceof Iterator) {
$adapter = 'iterator';
} elseif (is_integer($data)) {
$adapter = 'null';
} else {
$type = (is_object($data)) ? get_class($data) : gettype($data);
throw new Exception\InvalidArgumentException('No adapter for type ' . $type);
}
}

$adapters = self::getAdapterPluginManager();
$adapter = $adapters->get($adapter, $data);
return new self($adapter);
}

/**
* Set the adapter plugin manager
*
* @param string|AdapterPluginManager $adapters
* @throws Exception\InvalidArgumentException
*/
public static function setAdapterPluginManager($adapters)
{
if (is_string($adapters)) {
if (!class_exists($adapters)) {
throw new Exception\InvalidArgumentException(sprintf(
'Unable to locate adapter plugin manager with class "%s"; class not found',
$adapters
));
}
$adapters = new $adapters();
}
if (!$adapters instanceof AdapterPluginManager) {
throw new Exception\InvalidArgumentException(sprintf(
'Pagination adapter manager must extend AdapterPluginManager; received "%s"',
(is_object($adapters) ? get_class($adapters) : gettype($adapters))
));
}
self::$adapters = $adapters;
}

/**
* Returns the adapter plugin manager. If it doesn't exist it's created.
*
* @return AdapterPluginManager
*/
public static function getAdapterPluginManager()
{
if (self::$adapters === null) {
self::setAdapterPluginManager(new AdapterPluginManager());
}

return self::$adapters;
}

/**
* Set a global config
*
* @param array|\Traversable $config
* @throws Exception\InvalidArgumentException
*/
public static function setOptions($config)
public static function setGlobalConfig($config)
{
if ($config instanceof Traversable) {
$config = ArrayUtils::iteratorToArray($config);
Expand All @@ -255,12 +175,6 @@ public static function setOptions($config)

self::$config = $config;

if (isset($config['adapter_plugins'])
&& null !== ($adapters = $config['adapter_plugins'])
) {
self::setAdapterPluginManager($adapters);
}

if (isset($config['scrolling_style_plugins'])
&& null !== ($adapters = $config['scrolling_style_plugins'])
) {
Expand Down
16 changes: 8 additions & 8 deletions test/Adapter/ArrayTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,42 +23,42 @@ class ArrayTest extends \PHPUnit_Framework_TestCase
/**
* @var Zend\Paginator\Adapter\Array
*/
private $_adapter;
private $adapter;

/**
* Prepares the environment before running a test.
*/
protected function setUp ()
{
parent::setUp();
$this->_adapter = new Adapter\ArrayAdapter(range(1, 101));
$this->adapter = new Adapter\ArrayAdapter(range(1, 101));
}
/**
* Cleans up the environment after running a test.
*/
protected function tearDown ()
{
$this->_adapter = null;
$this->adapter = null;
parent::tearDown();
}

public function testGetsItemsAtOffsetZero()
{
$expected = range(1, 10);
$actual = $this->_adapter->getItems(0, 10);
$actual = $this->adapter->getItems(0, 10);
$this->assertEquals($expected, $actual);
}

public function testGetsItemsAtOffsetTen()
{
$expected = range(11, 20);
$actual = $this->_adapter->getItems(10, 10);
$actual = $this->adapter->getItems(10, 10);
$this->assertEquals($expected, $actual);
}

public function testReturnsCorrectCount()
{
$this->assertEquals(101, $this->_adapter->count());
$this->assertEquals(101, $this->adapter->count());
}


Expand All @@ -67,8 +67,8 @@ public function testReturnsCorrectCount()
*/
public function testEmptySet()
{
$this->_adapter = new Adapter\ArrayAdapter(array());
$actual = $this->_adapter->getItems(0, 10);
$this->adapter = new Adapter\ArrayAdapter(array());
$actual = $this->adapter->getItems(0, 10);
$this->assertEquals(array(), $actual);
}
}
23 changes: 12 additions & 11 deletions test/Adapter/IteratorTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
namespace ZendTest\Paginator\Adapter;

use Zend\Paginator\Adapter;
use Zend\Paginator\Paginator;
use Zend\Paginator\Exception;

/**
Expand All @@ -24,7 +25,7 @@ class IteratorTest extends \PHPUnit_Framework_TestCase
/**
* @var \Zend\Paginator\Adapter\Iterator
*/
private $_adapter;
private $adapter;

/**
* Prepares the environment before running a test.
Expand All @@ -33,20 +34,20 @@ protected function setUp ()
{
parent::setUp();
$iterator = new \ArrayIterator(range(1, 101));
$this->_adapter = new Adapter\Iterator($iterator);
$this->adapter = new Adapter\Iterator($iterator);
}
/**
* Cleans up the environment after running a test.
*/
protected function tearDown ()
{
$this->_adapter = null;
$this->adapter = null;
parent::tearDown();
}

public function testGetsItemsAtOffsetZero()
{
$actual = $this->_adapter->getItems(0, 10);
$actual = $this->adapter->getItems(0, 10);
$this->assertInstanceOf('LimitIterator', $actual);

$i = 1;
Expand All @@ -58,7 +59,7 @@ public function testGetsItemsAtOffsetZero()

public function testGetsItemsAtOffsetTen()
{
$actual = $this->_adapter->getItems(10, 10);
$actual = $this->adapter->getItems(10, 10);
$this->assertInstanceOf('LimitIterator', $actual);

$i = 11;
Expand All @@ -70,7 +71,7 @@ public function testGetsItemsAtOffsetTen()

public function testReturnsCorrectCount()
{
$this->assertEquals(101, $this->_adapter->count());
$this->assertEquals(101, $this->adapter->count());
}

public function testThrowsExceptionIfNotCountable()
Expand All @@ -86,8 +87,8 @@ public function testThrowsExceptionIfNotCountable()
*/
public function testDoesNotThrowOutOfBoundsExceptionIfIteratorIsEmpty()
{
$this->_paginator = \Zend\Paginator\Paginator::factory(new \ArrayIterator(array()));
$items = $this->_paginator->getCurrentItems();
$this->paginator = new Paginator(new Adapter\Iterator(new \ArrayIterator(array())));
$items = $this->paginator->getCurrentItems();

foreach ($items as $item);
}
Expand All @@ -97,7 +98,7 @@ public function testDoesNotThrowOutOfBoundsExceptionIfIteratorIsEmpty()
*/
public function testGetItemsSerializable()
{
$items = $this->_adapter->getItems(0, 1);
$items = $this->adapter->getItems(0, 1);
$innerIterator = $items->getInnerIterator();
$items = unserialize(serialize($items));
$this->assertTrue( ($items->getInnerIterator() == $innerIterator), 'getItems has to be serializable to use caching');
Expand All @@ -109,8 +110,8 @@ public function testGetItemsSerializable()
public function testEmptySet()
{
$iterator = new \ArrayIterator(array());
$this->_adapter = new Adapter\Iterator($iterator);
$actual = $this->_adapter->getItems(0, 10);
$this->adapter = new Adapter\Iterator($iterator);
$actual = $this->adapter->getItems(0, 10);
$this->assertEquals(array(), $actual);
}
}
Loading

0 comments on commit 27f9b6d

Please sign in to comment.