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 git://github.com/zendframework/zf2 into cach…
Browse files Browse the repository at this point in the history 
…e_plugin_priority

Conflicts:
	library/Zend/Cache/Storage/Adapter/AbstractAdapter.php
	library/Zend/Cache/Storage/Plugin/ClearByFactor.php
	library/Zend/Cache/Storage/Plugin/ExceptionHandler.php
	library/Zend/Cache/Storage/Plugin/IgnoreUserAbort.php
	library/Zend/Cache/Storage/Plugin/OptimizeByFactor.php
	library/Zend/Cache/Storage/Plugin/Serializer.php
  • Loading branch information
@marc-mabe
marc-mabe committed May 7, 2012
40 parents 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 + fe46ab5 + e572be4 + 2ce0c75 commit 7f1db80
Show file tree
Hide file tree
Showing 12 changed files with 22 additions and 36 deletions.
5 changes: 1 addition & 4 deletions src/Container/AbstractContainer.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,14 @@

namespace Zend\Memory\Container;

use Zend\Memory\Container;

/**
* Memory value container
*
* @uses \Zend\Memory\Container
* @category Zend
* @package Zend_Memory
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
abstract class AbstractContainer implements Container
abstract class AbstractContainer implements ContainerInterface
{
}
11 changes: 3 additions & 8 deletions src/Container/AccessController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@

namespace Zend\Memory\Container;

use Zend\Memory\Container;

/**
* Memory object container access controller.
*
Expand All @@ -34,27 +32,25 @@
*
* Class also provides Zend\Memory\Container interface and works as proxy for such cases.
*
* @uses \Zend\Memory\Container
* @uses \Zend\Memory\Container\Movable
* @category Zend
* @package Zend_Memory
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class AccessController implements Container
class AccessController implements ContainerInterface
{
/**
* Memory container object
*
* @var \Zend\Memory\Container\AbstractContainer
* @var Movable
*/
private $_memContainer;


/**
* Object constructor
*
* @param \Zend\Memory\Container\Movable $memContainer
* @param Movable $memContainer
*/
public function __construct(Movable $memContainer)
{
Expand Down Expand Up @@ -128,7 +124,6 @@ public function isLocked()
*
* @param string $property
* @return string
* @throws \Zend\Memory\Exception
*/
public function __get($property)
{
Expand Down
4 changes: 2 additions & 2 deletions src/Container.php → src/Container/ContainerInterface.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
* @license http://framework.zend.com/license/new-bsd New BSD License
*/

namespace Zend\Memory;
namespace Zend\Memory\Container;

/**
* Memory value container interface
Expand All @@ -28,7 +28,7 @@
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
interface Container
interface ContainerInterface
{
/**
* Get string value reference
Expand Down
1 change: 0 additions & 1 deletion src/Container/Locked.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
*
* Locked (always stored in memory).
*
* @uses \Zend\Memory\Container\AbstractContainer
* @category Zend
* @package Zend_Memory
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
Expand Down
6 changes: 2 additions & 4 deletions src/Container/Movable.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
*/

namespace Zend\Memory\Container;

use Zend\Memory,
Zend\Memory\Exception;

Expand All @@ -27,9 +28,6 @@
*
* Movable (may be swapped with specified backend and unloaded).
*
* @uses \Zend\Memory\Container\AbstractContainer
* @uses \Zend\Memory\Exception
* @uses \Zend\Memory\Value
* @category Zend
* @package Zend_Memory
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
Expand Down Expand Up @@ -131,7 +129,7 @@ public function isLocked()
*
* @param string $property
* @return string
* @throws \Zend\Memory\Exception
* @throws Exception\InvalidArgumentException
*/
public function __get($property)
{
Expand Down
4 changes: 2 additions & 2 deletions src/Exception.php → src/Exception/ExceptionInterface.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@
* @license http://framework.zend.com/license/new-bsd New BSD License
*/

namespace Zend\Memory;
namespace Zend\Memory\Exception;

/**
* @category Zend
* @package Zend_Memory
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
interface Exception
interface ExceptionInterface
{}

4 changes: 1 addition & 3 deletions src/Exception/InvalidArgumentException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,17 @@
*/

namespace Zend\Memory\Exception;
use Zend\Memory\Exception;

/**
* Exception for Zend_Memory component.
*
* @uses Zend\Exception
* @category Zend
* @package Zend_Memory
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class InvalidArgumentException
extends \InvalidArgumentException
implements Exception
implements ExceptionInterface
{
}
4 changes: 1 addition & 3 deletions src/Exception/RuntimeException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,17 @@
*/

namespace Zend\Memory\Exception;
use Zend\Memory\Exception;

/**
* Exception for Zend_Memory component.
*
* @uses Zend\Exception
* @category Zend
* @package Zend_Memory
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class RuntimeException
extends \RuntimeException
implements Exception
implements ExceptionInterface
{
}
2 changes: 1 addition & 1 deletion src/MemoryManager.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

namespace Zend\Memory;

use Zend\Cache\Storage\Adapter as CacheAdapter;
use Zend\Cache\Storage\Adapter\AdapterInterface as CacheAdapter;

/**
* Memory manager
Expand Down
9 changes: 5 additions & 4 deletions src/Value.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,21 @@

namespace Zend\Memory;

use ArrayAccess,
Countable;

/**
* String value object
*
* It's an OO string wrapper.
* Used to intercept string updates.
*
* @uses ArrayAccess
* @uses Countable
* @category Zend
* @package Zend_Memory
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Value implements \ArrayAccess,\Countable
class Value implements ArrayAccess, Countable
{
/**
* Value
Expand All @@ -45,7 +46,7 @@ class Value implements \ArrayAccess,\Countable
/**
* Container
*
* @var \Zend\Memory\Container
* @var Container\Movable
*/
private $_container;

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 @@ -22,7 +22,7 @@
namespace ZendTest\Memory;

use Zend\Cache\StorageFactory as CacheFactory,
Zend\Cache\Storage\Adapter as CacheAdapter,
Zend\Cache\Storage\Adapter\AdapterInterface as CacheAdapter,
Zend\Memory,
Zend\Memory\Container;

Expand Down
6 changes: 3 additions & 3 deletions test/MemoryManagerTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
namespace ZendTest\Memory;

use Zend\Cache\StorageFactory as CacheFactory,
Zend\Cache\Storage\Adapter as CacheAdapter,
Zend\Cache\Storage\Adapter\AdapterInterface as CacheAdapter,
Zend\Memory,
Zend\Memory\Container;

Expand Down Expand Up @@ -55,7 +55,7 @@ public function tearDown()
}

/**
* tests the Memory Manager creation
* tests the Memory ManagerInterface creation
*/
public function testCreation()
{
Expand All @@ -71,7 +71,7 @@ public function testCreation()
}

/**
* tests the Memory Manager settings
* tests the Memory ManagerInterface settings
*/
public function testSettings()
{
Expand Down

0 comments on commit 7f1db80

Please sign in to comment.