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

Commit

Permalink
Merge branch 'master' of https://github.com/zendframework/zf2
Browse files Browse the repository at this point in the history
  • Loading branch information
Jean Carlo Machado committed May 17, 2014
135 parents d840e32 + 24f2e71 + 82ff3ba + 1b53cdf + acb21e9 + 57fe8e9 + 49b845f + 1506bd8 + 0422a6e + 990f5f1 + 4798483 + a33ceb1 + 3787c5a + be1f78e + 944eef9 + aa16b4a + 24e6305 + f8d98c4 + 61cfbb8 + 96d0551 + acc2a46 + f70a8c2 + 7b89f79 + 943d58e + c40b665 + 42ba32c + 1730b26 + 932edde + dc9b974 + 1a05b42 + 01cbd6f + fe46ab5 + 9442908 + 7a5a1b8 + 5e96208 + ac5855b + 3d91eec + b6038ed + 4ead487 + 314f415 + 0b54361 + d7353a4 + 31b63d7 + ec487e1 + ce398bb + 5b4137d + 8353126 + 1e8c7b8 + a5fd1c1 + 485628f + 4f2f689 + a44cce0 + 4a5aec0 + c931a3d + dbb4a85 + 61b2b6a + 66509ee + 7e24d5d + 01cfc3b + c0e12d0 + 5071c77 + f4c654e + 803ce88 + 11b33de + b45194c + a993356 + b58900f + 6f28391 + 80ebd20 + e572be4 + 2ce0c75 + 99c1db1 + 75447c2 + 4e63318 + 7f1db80 + 536bdd5 + 92c20ae + 67690dc + 75fad5c + 94f88dc + 9379d5a + 5f8209d + f70afcc + 493858c + eeacea8 + cecc8e5 + 59d9085 + 4c9c2fc + 50e8d8a + 7563fb1 + 6b50c1b + 914c8bd + e1d5120 + 8f7913e + 85b6a8e + 7cb373f + d917e2a + e375cf4 + f9b74b8 + 25e480d + aeffc49 + 3f8e166 + 99084c3 + aead0e9 + 02447d8 + 21c18f9 + 8860d1d + 431f220 + 67ec1da + d33b5ba + 011e4c8 + d728180 + 028a1ef + 0b023c0 + 98db888 + 8dd2f16 + 817fb7c + 9aaf514 + 9e4ca8d + 33fece8 + 7d1f532 + a347838 + 16acbbd + f5555a4 + b6f5beb + a5273cd + f39ef4b + 01e4b13 + b1693f6 + f661746 + 1a2045d + 38c8ebc + 4915a06 + 279bcbe + 731a4d7 commit 879d52a
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 20 deletions.
6 changes: 3 additions & 3 deletions composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
}
},
"require": {
"php": ">=5.3.3"
"php": ">=5.3.23"
},
"require-dev": {
"zendframework/zend-cache": "self.version",
Expand All @@ -26,8 +26,8 @@
},
"extra": {
"branch-alias": {
"dev-master": "2.2-dev",
"dev-develop": "2.3-dev"
"dev-master": "2.3-dev",
"dev-develop": "2.4-dev"
}
},
"autoload-dev": {
Expand Down
22 changes: 11 additions & 11 deletions src/MemoryManager.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ class MemoryManager
/**
* This function is intended to generate unique id, used by memory manager
*/
private function _generateMemManagerId()
private function generateMemManagerId()
{
/**
* @todo !!!
Expand All @@ -132,7 +132,7 @@ public function __construct(CacheStorage $cache = null)
}

$this->cache = $cache;
$this->_generateMemManagerId();
$this->generateMemManagerId();

$memoryLimitStr = trim(ini_get('memory_limit'));
if ($memoryLimitStr != '' && $memoryLimitStr != -1) {
Expand Down Expand Up @@ -180,7 +180,7 @@ public function setMemoryLimit($newLimit)
{
$this->memoryLimit = $newLimit;

$this->_swapCheck();
$this->swapCheck();
}

/**
Expand Down Expand Up @@ -255,7 +255,7 @@ private function _create($value, $locked)
}

// Commit other objects modifications
$this->_commit();
$this->commit();

$valueObject = new Container\Movable($this, $id, $value);

Expand Down Expand Up @@ -322,15 +322,15 @@ public function processUpdate(Container\Movable $container, $id)
$this->memorySize -= $this->sizes[$id];

// Commit changes of previously modified object if necessary
$this->_commit();
$this->commit();

$this->lastModified = $container;
}

/**
* Commit modified object and put it back to the loaded objects list
*/
private function _commit()
private function commit()
{
if (($container = $this->lastModified) === null) {
return;
Expand All @@ -350,15 +350,15 @@ private function _commit()

$container->startTrace();

$this->_swapCheck();
$this->swapCheck();
}

/**
* Check and swap objects if necessary
*
* @throws Exception\RuntimeException
*/
private function _swapCheck()
private function swapCheck()
{
if ($this->memoryLimit < 0 || $this->memorySize < $this->memoryLimit) {
// Memory limit is not reached
Expand All @@ -368,7 +368,7 @@ private function _swapCheck()

// walk through loaded objects in access history order
foreach ($this->unloadCandidates as $id => $container) {
$this->_swap($container, $id);
$this->swap($container, $id);
unset($this->unloadCandidates[$id]);

if ($this->memorySize < $this->memoryLimit) {
Expand All @@ -388,7 +388,7 @@ private function _swapCheck()
* @param \Zend\Memory\Container\Movable $container
* @param int $id
*/
private function _swap(Container\Movable $container, $id)
private function swap(Container\Movable $container, $id)
{
if ($container->isLocked()) {
return;
Expand Down Expand Up @@ -418,7 +418,7 @@ public function load(Container\Movable $container, $id)
// Try to swap other objects if necessary
// (do not include specified object into check)
$this->memorySize += strlen($value);
$this->_swapCheck();
$this->swapCheck();

// Add loaded object to the end of loaded objects list
$container->setValue($value);
Expand Down
2 changes: 1 addition & 1 deletion test/AccessControllerTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/

Expand Down
2 changes: 1 addition & 1 deletion test/LockedTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/

Expand Down
2 changes: 1 addition & 1 deletion test/MemoryManagerTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/

Expand Down
4 changes: 2 additions & 2 deletions test/MovableTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/

Expand Down Expand Up @@ -137,7 +137,7 @@ class DummyMemoryManager extends Memory\MemoryManager
/** @var integer */
public $processedId;

/** @var Zend_Memory_Container_Movable */
/** @var Container\Movable */
public $processedObject;

/**
Expand Down
2 changes: 1 addition & 1 deletion test/ValueTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/

Expand Down

0 comments on commit 879d52a

Please sign in to comment.