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

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history 
Preparing to tag 2.1.0 -- all new features from develop are now merged to master.
  • Loading branch information
@weierophinney
weierophinney committed Jan 29, 2013
112 parents 565433c + be0baa3 + 8d2dae7 + e9406c0 + e59ea5a + fbff658 + 48d0341 + 401d180 + 4e95264 + 5431207 + a7a7974 + 7c3f597 + a50748b + 700cf3a + 1582c31 + 016f50c + 9852497 + 073b126 + bd99c5c + 56451bd + 8fe4cad + 18812d8 + 89590ab + 0f8f25b + c2a03a9 + 4c690cd + 52cb4e6 + f7ed984 + 1d190a2 + 3c5d19b + c3c849d + faa6e57 + ad46181 + 12a401e + 3738445 + 65aacba + bf5f5a3 + c2ac9c0 + 6d7cf99 + 1841b47 + f81171b + 5ffaadf + cd6d5f2 + a512601 + 926e71f + 1f29b3e + a75171a + 9a8e72f + 814716e + 88d9371 + 678232d + a0560e8 + 4ff045c + ac805a6 + 41f360c + 1939a3c + 730da5d + dd0a1b5 + 1bc1ed5 + cea3413 + f2b47df + 2b8aa6a + 42cb3fe + 46afe3b + ef4289e + f40a98a + 8c27e9d + 512d6ca + b1452f8 + 9f6e228 + cf96a5a + aa9ef86 + 04be01e + 93487ba + c640cb5 + ab2b436 + a876e82 + 01f54c9 + f0abecc + 920eae1 + db4f625 + f51678c + 5975f0e + e9d78fe + 03de5ee + d7320d7 + 16ff5c5 + f170b61 + b506606 + f6c7309 + 675c421 + 22dc55a + 4fe9653 + 0835021 + 26ee41a + be4158f + a1e2d7e + 4abdf38 + 43220df + c076d41 + bb1710e + ba17210 + bf83129 + 40926a2 + a7690f0 + 5077dc6 + 7d6f60c + a5f3296 + e036825 + 337996c + 285fc46 + 277a8aa commit 31378a4
Show file tree
Hide file tree
Showing 80 changed files with 2,952 additions and 741 deletions.
5 changes: 0 additions & 5 deletions src/Exception/BadMethodCallException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,10 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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_Cache
*/

namespace Zend\Cache\Exception;

/**
* @category Zend
* @package Zend_Cache
*/
class BadMethodCallException extends \BadMethodCallException implements
ExceptionInterface
{
Expand Down
6 changes: 0 additions & 6 deletions src/Exception/ExceptionInterface.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,10 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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_Cache
*/

namespace Zend\Cache\Exception;

/**
* @category Zend
* @package Zend_Cache
* @subpackage Exception
*/
interface ExceptionInterface
{
}
5 changes: 0 additions & 5 deletions src/Exception/ExtensionNotLoadedException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,10 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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_Cache
*/

namespace Zend\Cache\Exception;

/**
* @category Zend
* @package Zend_Cache
*/
class ExtensionNotLoadedException extends RuntimeException
{
}
5 changes: 0 additions & 5 deletions src/Exception/InvalidArgumentException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,10 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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_Cache
*/

namespace Zend\Cache\Exception;

/**
* @category Zend
* @package Zend_Cache
*/
class InvalidArgumentException extends \InvalidArgumentException implements
ExceptionInterface
{
Expand Down
5 changes: 0 additions & 5 deletions src/Exception/LogicException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,10 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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_Cache
*/

namespace Zend\Cache\Exception;

/**
* @category Zend
* @package Zend_Cache
*/
class LogicException extends \LogicException implements ExceptionInterface
{
}
5 changes: 0 additions & 5 deletions src/Exception/MissingDependencyException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,10 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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_Cache
*/

namespace Zend\Cache\Exception;

/**
* @category Zend
* @package Zend_Cache
*/
class MissingDependencyException extends RuntimeException
{
}
5 changes: 0 additions & 5 deletions src/Exception/MissingKeyException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,10 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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_Cache
*/

namespace Zend\Cache\Exception;

/**
* @category Zend
* @package Zend_Cache
*/
class MissingKeyException extends RuntimeException
{
}
5 changes: 0 additions & 5 deletions src/Exception/OutOfSpaceException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,10 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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_Cache
*/

namespace Zend\Cache\Exception;

/**
* @category Zend
* @package Zend_Cache
*/
class OutOfSpaceException extends \OverflowException implements ExceptionInterface
{
}
5 changes: 0 additions & 5 deletions src/Exception/RuntimeException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,10 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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_Cache
*/

namespace Zend\Cache\Exception;

/**
* @category Zend
* @package Zend_Cache
*/
class RuntimeException extends \RuntimeException implements ExceptionInterface
{
}
5 changes: 0 additions & 5 deletions src/Exception/UnexpectedValueException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,10 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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_Cache
*/

namespace Zend\Cache\Exception;

/**
* @category Zend
* @package Zend_Cache
*/
class UnexpectedValueException extends \UnexpectedValueException implements
ExceptionInterface
{
Expand Down
5 changes: 0 additions & 5 deletions src/Exception/UnsupportedMethodCallException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,10 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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_Cache
*/

namespace Zend\Cache\Exception;

/**
* @category Zend
* @package Zend_Cache
*/
class UnsupportedMethodCallException extends \BadMethodCallException implements
ExceptionInterface
{
Expand Down
6 changes: 0 additions & 6 deletions src/Pattern/AbstractPattern.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,13 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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_Cache
*/

namespace Zend\Cache\Pattern;

use Traversable;
use Zend\Cache\Exception;

/**
* @category Zend
* @package Zend_Cache
* @subpackage Pattern
*/
abstract class AbstractPattern implements PatternInterface
{
/**
Expand Down
6 changes: 0 additions & 6 deletions src/Pattern/CallbackCache.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,13 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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_Cache
*/

namespace Zend\Cache\Pattern;

use Zend\Cache\Exception;
use Zend\Stdlib\ErrorHandler;

/**
* @category Zend
* @package Zend_Cache
* @subpackage Pattern
*/
class CallbackCache extends AbstractPattern
{
/**
Expand Down
6 changes: 0 additions & 6 deletions src/Pattern/CaptureCache.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,13 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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_Cache
*/

namespace Zend\Cache\Pattern;

use Zend\Cache\Exception;
use Zend\Stdlib\ErrorHandler;

/**
* @category Zend
* @package Zend_Cache
* @subpackage Pattern
*/
class CaptureCache extends AbstractPattern
{
/**
Expand Down
5 changes: 0 additions & 5 deletions src/Pattern/ClassCache.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,13 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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_Cache
*/

namespace Zend\Cache\Pattern;

use Zend\Cache;
use Zend\Cache\Exception;

/**
* @category Zend
* @package Zend_Cache
*/
class ClassCache extends CallbackCache
{
/**
Expand Down
6 changes: 0 additions & 6 deletions src/Pattern/ObjectCache.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,12 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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_Cache
*/

namespace Zend\Cache\Pattern;

use Zend\Cache\Exception;

/**
* @category Zend
* @package Zend_Cache
* @subpackage Pattern
*/
class ObjectCache extends CallbackCache
{
/**
Expand Down
6 changes: 0 additions & 6 deletions src/Pattern/OutputCache.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,12 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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_Cache
*/

namespace Zend\Cache\Pattern;

use Zend\Cache\Exception;

/**
* @category Zend
* @package Zend_Cache
* @subpackage Pattern
*/
class OutputCache extends AbstractPattern
{
/**
Expand Down
6 changes: 0 additions & 6 deletions src/Pattern/PatternInterface.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,10 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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_Cache
*/

namespace Zend\Cache\Pattern;

/**
* @category Zend
* @package Zend_Cache
* @subpackage Pattern
*/
interface PatternInterface
{
/**
Expand Down
6 changes: 0 additions & 6 deletions src/Pattern/PatternOptions.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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_Cache
*/

namespace Zend\Cache\Pattern;
Expand All @@ -16,11 +15,6 @@
use Zend\Cache\Storage\StorageInterface as Storage;
use Zend\Stdlib\AbstractOptions;

/**
* @category Zend
* @package Zend_Cache
* @subpackage Pattern
*/
class PatternOptions extends AbstractOptions
{
/**
Expand Down
7 changes: 1 addition & 6 deletions src/PatternFactory.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,14 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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_Cache
*/

namespace Zend\Cache;

use Traversable;
use Zend\Stdlib\ArrayUtils;

/**
* @category Zend
* @package Zend_Cache
*/
class PatternFactory
abstract class PatternFactory
{
/**
* The pattern manager
Expand Down
4 changes: 0 additions & 4 deletions src/PatternPluginManager.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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_Cache
*/

namespace Zend\Cache;
Expand All @@ -18,9 +17,6 @@
* Enforces that adatpers retrieved are instances of
* Pattern\PatternInterface. Additionally, it registers a number of default
* patterns available.
*
* @category Zend
* @package Zend_Cache
*/
class PatternPluginManager extends AbstractPluginManager
{
Expand Down
Loading

0 comments on commit 31378a4

Please sign in to comment.