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 'upstream/master' into reflection
Browse files Browse the repository at this point in the history
  • Loading branch information
@pierredup
pierredup committed Jan 11, 2013
96 parents 0c18fe7 + 02447d8 + 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 + 990f5f1 + 4798483 + a33ceb1 + 3f8e166 + 99084c3 commit 21c18f9
Show file tree
Hide file tree
Showing 15 changed files with 33 additions and 33 deletions.
2 changes: 1 addition & 1 deletion src/Container/AbstractContainer.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-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Memory
*/
Expand Down
4 changes: 2 additions & 2 deletions src/Container/AccessController.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-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Memory
*/
Expand Down Expand Up @@ -97,7 +97,7 @@ public function unlock()
/**
* Return true if object is locked
*
* @return boolean
* @return bool
*/
public function isLocked()
{
Expand Down
4 changes: 2 additions & 2 deletions src/Container/ContainerInterface.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-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Memory
*/
Expand Down Expand Up @@ -48,7 +48,7 @@ public function unlock();
/**
* Return true if object is locked
*
* @return boolean
* @return bool
*/
public function isLocked();
}
4 changes: 2 additions & 2 deletions src/Container/Locked.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-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Memory
*/
Expand Down Expand Up @@ -57,7 +57,7 @@ public function unlock()
/**
* Return true if object is locked
*
* @return boolean
* @return bool
*/
public function isLocked()
{
Expand Down
6 changes: 3 additions & 3 deletions src/Container/Movable.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-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Memory
*/
Expand Down Expand Up @@ -102,7 +102,7 @@ public function unlock()
/**
* Return true if object is locked
*
* @return boolean
* @return bool
*/
public function isLocked()
{
Expand Down Expand Up @@ -248,7 +248,7 @@ public function markAsSwapped()
* Check if object is marked as swapped
*
* @internal
* @return boolean
* @return bool
*/
public function isSwapped()
{
Expand Down
2 changes: 1 addition & 1 deletion src/Exception/ExceptionInterface.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-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Memory
*/
Expand Down
2 changes: 1 addition & 1 deletion src/Exception/InvalidArgumentException.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-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Memory
*/
Expand Down
2 changes: 1 addition & 1 deletion src/Exception/RuntimeException.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-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Memory
*/
Expand Down
4 changes: 2 additions & 2 deletions src/MemoryManager.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-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Memory
*/
Expand Down Expand Up @@ -246,7 +246,7 @@ public function createLocked($value = '')
* Create new Zend_Memory object
*
* @param string $value
* @param boolean $locked
* @param bool $locked
* @return \Zend\Memory\Container\ContainerInterface
* @throws \Zend\Memory\Exception\ExceptionInterface
*/
Expand Down
6 changes: 3 additions & 3 deletions src/Value.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-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Memory
*/
Expand Down Expand Up @@ -41,7 +41,7 @@ class Value implements ArrayAccess, Countable
/**
* Boolean flag which signals to trace value modifications
*
* @var boolean
* @var bool
*/
private $trace;

Expand Down Expand Up @@ -84,7 +84,7 @@ public function count()
* returns true if string offset exists
*
* @param integer $offset
* @return boolean
* @return bool
*/
public function offsetExists($offset)
{
Expand Down
8 changes: 4 additions & 4 deletions 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-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Memory
*/
Expand Down Expand Up @@ -80,12 +80,12 @@ public function testLock()
$memoryManager = new Memory\MemoryManager($this->_cache);
$memObject = $memoryManager->create('012345678');

$this->assertFalse((boolean)$memObject->isLocked());
$this->assertFalse((bool) $memObject->isLocked());

$memObject->lock();
$this->assertTrue((boolean)$memObject->isLocked());
$this->assertTrue((bool) $memObject->isLocked());

$memObject->unlock();
$this->assertFalse((boolean)$memObject->isLocked());
$this->assertFalse((bool) $memObject->isLocked());
}
}
8 changes: 4 additions & 4 deletions 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-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Memory
*/
Expand Down Expand Up @@ -62,14 +62,14 @@ public function testLock()
$memObject = new Container\Locked('0123456789');

// It's always locked
$this->assertTrue((boolean)$memObject->isLocked());
$this->assertTrue((bool) $memObject->isLocked());

$memObject->lock();
$this->assertTrue((boolean)$memObject->isLocked());
$this->assertTrue((bool) $memObject->isLocked());

$memObject->unlock();
// It's always locked
$this->assertTrue((boolean)$memObject->isLocked());
$this->assertTrue((bool) $memObject->isLocked());
}

/**
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-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Memory
*/
Expand Down
10 changes: 5 additions & 5 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-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Memory
*/
Expand Down Expand Up @@ -66,13 +66,13 @@ public function testLock()
$memoryManager = new DummyMemoryManager();
$memObject = new Container\Movable($memoryManager, 10, '0123456789');

$this->assertFalse((boolean)$memObject->isLocked());
$this->assertFalse((bool) $memObject->isLocked());

$memObject->lock();
$this->assertTrue((boolean)$memObject->isLocked());
$this->assertTrue((bool) $memObject->isLocked());

$memObject->unlock();
$this->assertFalse((boolean)$memObject->isLocked());
$this->assertFalse((bool) $memObject->isLocked());
}

/**
Expand Down Expand Up @@ -136,7 +136,7 @@ public function testInvalidSetThrowException()
*/
class DummyMemoryManager extends Memory\MemoryManager
{
/** @var boolean */
/** @var bool */
public $processUpdatePassed = false;

/** @var integer */
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-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Memory
*/
Expand Down

0 comments on commit 21c18f9

Please sign in to comment.