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

Commit

Permalink
Merge branch 'develop' of git://github.com/zendframework/zf2 into fea…
Browse files Browse the repository at this point in the history 
…ture/cache-session-storage

Conflicts:
	CHANGELOG.md
  • Loading branch information
@marc-mabe
marc-mabe committed Nov 26, 2012
120 parents a56d05b + 37045c3 + 6903d5f + cdad453 + 9db7df2 + 9bb9d9a + 41b2dc0 + 5295cf8 + 27f9b6d + 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 + 006fb88 + 6261074 + 8bf6181 + 33e79d4 + 7400cfb + 8794fff + 0877be7 + 9c75f77 + 261c157 + 94f1dd4 + ae538e5 + bf68265 + d4ad9b4 + 2716d1a + c2442b4 commit c222657
Showing 1 changed file with 26 additions and 26 deletions.
52 changes: 26 additions & 26 deletions src/Paginator.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,18 +172,18 @@ public static function setGlobalConfig($config)
throw new Exception\InvalidArgumentException(__METHOD__ . ' expects an array or Traversable');
}

self::$config = $config;
static::$config = $config;

if (isset($config['scrolling_style_plugins'])
&& null !== ($adapters = $config['scrolling_style_plugins'])
) {
self::setScrollingStylePluginManager($adapters);
static::setScrollingStylePluginManager($adapters);
}

$scrollingStyle = isset($config['scrolling_style']) ? $config['scrolling_style'] : null;

if ($scrollingStyle != null) {
self::setDefaultScrollingStyle($scrollingStyle);
static::setDefaultScrollingStyle($scrollingStyle);
}
}

Expand All @@ -194,7 +194,7 @@ public static function setGlobalConfig($config)
*/
public static function getDefaultScrollingStyle()
{
return self::$defaultScrollingStyle;
return static::$defaultScrollingStyle;
}

/**
Expand All @@ -204,7 +204,7 @@ public static function getDefaultScrollingStyle()
*/
public static function getDefaultItemCountPerPage()
{
return self::$defaultItemCountPerPage;
return static::$defaultItemCountPerPage;
}

/**
Expand All @@ -214,7 +214,7 @@ public static function getDefaultItemCountPerPage()
*/
public static function setDefaultItemCountPerPage($count)
{
self::$defaultItemCountPerPage = (int) $count;
static::$defaultItemCountPerPage = (int) $count;
}

/**
Expand All @@ -224,7 +224,7 @@ public static function setDefaultItemCountPerPage($count)
*/
public static function setCache(CacheStorage $cache)
{
self::$cache = $cache;
static::$cache = $cache;
}

/**
Expand All @@ -234,7 +234,7 @@ public static function setCache(CacheStorage $cache)
*/
public static function setDefaultScrollingStyle($scrollingStyle = 'Sliding')
{
self::$defaultScrollingStyle = $scrollingStyle;
static::$defaultScrollingStyle = $scrollingStyle;
}

public static function setScrollingStylePluginManager($scrollingAdapters)
Expand All @@ -254,7 +254,7 @@ public static function setScrollingStylePluginManager($scrollingAdapters)
(is_object($scrollingAdapters) ? get_class($scrollingAdapters) : gettype($scrollingAdapters))
));
}
self::$scrollingStyles = $scrollingAdapters;
static::$scrollingStyles = $scrollingAdapters;
}

/**
Expand All @@ -265,11 +265,11 @@ public static function setScrollingStylePluginManager($scrollingAdapters)
*/
public static function getScrollingStylePluginManager()
{
if (self::$scrollingStyles === null) {
self::$scrollingStyles = new ScrollingStylePluginManager();
if (static::$scrollingStyles === null) {
static::$scrollingStyles = new ScrollingStylePluginManager();
}

return self::$scrollingStyles;
return static::$scrollingStyles;
}

/**
Expand All @@ -291,7 +291,7 @@ public function __construct($adapter)
);
}

$config = self::$config;
$config = static::$config;

if (!empty($config)) {
$setupMethods = array('ItemCountPerPage', 'PageRange');
Expand Down Expand Up @@ -375,19 +375,19 @@ public function clearPageItemCache($pageNumber = null)

if (null === $pageNumber) {
$prefixLength = strlen(self::CACHE_TAG_PREFIX);
$cacheIterator = self::$cache->getIterator();
$cacheIterator = static::$cache->getIterator();
$cacheIterator->setMode(CacheIterator::CURRENT_AS_KEY);
foreach ($cacheIterator as $key) {
$tags = self::$cache->getTags($key);
$tags = static::$cache->getTags($key);
if ($tags && in_array($this->_getCacheInternalId(), $tags)) {
if (substr($key, 0, $prefixLength) == self::CACHE_TAG_PREFIX) {
self::$cache->removeItem($this->_getCacheId((int)substr($key, $prefixLength)));
static::$cache->removeItem($this->_getCacheId((int)substr($key, $prefixLength)));
}
}
}
} else {
$cleanId = $this->_getCacheId($pageNumber);
self::$cache->removeItem($cleanId);
static::$cache->removeItem($cleanId);
}
return $this;
}
Expand Down Expand Up @@ -544,7 +544,7 @@ public function getItem($itemNumber, $pageNumber = null)
public function getItemCountPerPage()
{
if (empty($this->itemCountPerPage)) {
$this->itemCountPerPage = self::getDefaultItemCountPerPage();
$this->itemCountPerPage = static::getDefaultItemCountPerPage();
}

return $this->itemCountPerPage;
Expand Down Expand Up @@ -599,7 +599,7 @@ public function getItemsByPage($pageNumber)
$pageNumber = $this->normalizePageNumber($pageNumber);

if ($this->cacheEnabled()) {
$data = self::$cache->getItem($this->_getCacheId($pageNumber));
$data = static::$cache->getItem($this->_getCacheId($pageNumber));
if ($data) {
return $data;
}
Expand All @@ -621,8 +621,8 @@ public function getItemsByPage($pageNumber)

if ($this->cacheEnabled()) {
$cacheId = $this->_getCacheId($pageNumber);
self::$cache->setItem($cacheId, $items);
self::$cache->setTags($cacheId, array($this->_getCacheInternalId()));
static::$cache->setItem($cacheId, $items);
static::$cache->setTags($cacheId, array($this->_getCacheInternalId()));
}

return $items;
Expand Down Expand Up @@ -712,10 +712,10 @@ public function getPageItemCache()
$data = array();
if ($this->cacheEnabled()) {
$prefixLength = strlen(self::CACHE_TAG_PREFIX);
$cacheIterator = self::$cache->getIterator();
$cacheIterator = static::$cache->getIterator();
$cacheIterator->setMode(CacheIterator::CURRENT_AS_VALUE);
foreach ($cacheIterator as $key => $value) {
$tags = self::$cache->getTags($key);
$tags = static::$cache->getTags($key);
if ($tags && in_array($this->_getCacheInternalId(), $tags)) {
if (substr($key, 0, $prefixLength) == self::CACHE_TAG_PREFIX) {
$data[(int) substr($key, $prefixLength)] = $value;
Expand Down Expand Up @@ -839,7 +839,7 @@ public function toJson()
*/
protected function cacheEnabled()
{
return ((self::$cache !== null) && $this->cacheEnabled);
return ((static::$cache !== null) && $this->cacheEnabled);
}

/**
Expand Down Expand Up @@ -941,7 +941,7 @@ protected function _createPages($scrollingStyle = null)
protected function _loadScrollingStyle($scrollingStyle = null)
{
if ($scrollingStyle === null) {
$scrollingStyle = self::$defaultScrollingStyle;
$scrollingStyle = static::$defaultScrollingStyle;
}

switch (strtolower(gettype($scrollingStyle))) {
Expand All @@ -955,7 +955,7 @@ protected function _loadScrollingStyle($scrollingStyle = null)
return $scrollingStyle;

case 'string':
return self::getScrollingStylePluginManager()->get($scrollingStyle);
return static::getScrollingStylePluginManager()->get($scrollingStyle);

case 'null':
// Fall through to default case
Expand Down

0 comments on commit c222657

Please sign in to comment.