Merge branch 'master' of git://github.com/zendframework/zf2 into hotf…

…ix/ZF2-270
zendframework · May 3, 2012 · f40a98a · f40a98a
commit f40a98a
Show file tree

Hide file tree

Showing 49 changed files with 645 additions and 350 deletions.
diff --git a/src/Exception/BadMethodCallException.php b/src/Exception/BadMethodCallException.php
@@ -20,14 +20,12 @@
 
 namespace Zend\Cache\Exception;
 
-use Zend\Cache\Exception;
-
 /**
  * @category   Zend
  * @package    Zend_Cache
  * @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 BadMethodCallException extends \BadMethodCallException implements Exception
+class BadMethodCallException extends \BadMethodCallException implements ExceptionInterface
 {
 }
diff --git a/src/Exception.php → src/Exception/ExceptionInterface.php b/src/Exception.php → src/Exception/ExceptionInterface.php
@@ -14,18 +14,20 @@
  *
  * @category   Zend
  * @package    Zend_Cache
+ * @subpackage Exception
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-namespace Zend\Cache;
+namespace Zend\Cache\Exception;
 
 /**
  * @category   Zend
  * @package    Zend_Cache
+ * @subpackage Exception
  * @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
 {
 }
diff --git a/src/Exception/ExtensionNotLoadedException.php b/src/Exception/ExtensionNotLoadedException.php
@@ -20,14 +20,12 @@
 
 namespace Zend\Cache\Exception;
 
-use Zend\Cache\Exception;
-
 /**
  * @category   Zend
  * @package    Zend_Cache
  * @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 ExtensionNotLoadedException extends RuntimeException implements Exception
+class ExtensionNotLoadedException extends RuntimeException implements ExceptionInterface
 {
 }
diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
@@ -20,14 +20,12 @@
 
 namespace Zend\Cache\Exception;
 
-use Zend\Cache\Exception;
-
 /**
  * @category   Zend
  * @package    Zend_Cache
  * @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
+class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
 {
 }
diff --git a/src/Exception/LogicException.php b/src/Exception/LogicException.php
@@ -20,14 +20,12 @@
 
 namespace Zend\Cache\Exception;
 
-use Zend\Cache\Exception;
-
 /**
  * @category   Zend
  * @package    Zend_Cache
  * @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 LogicException extends \LogicException implements Exception
+class LogicException extends \LogicException implements ExceptionInterface
 {
 }
diff --git a/src/Exception/OutOfCapacityException.php b/src/Exception/OutOfCapacityException.php
@@ -20,14 +20,12 @@
 
 namespace Zend\Cache\Exception;
 
-use Zend\Cache\Exception;
-
 /**
  * @category   Zend
  * @package    Zend_Cache
  * @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 OutOfCapacityException extends \OverflowException implements Exception
+class OutOfCapacityException extends \OverflowException implements ExceptionInterface
 {
 }
diff --git a/src/Exception/RuntimeException.php b/src/Exception/RuntimeException.php
@@ -20,14 +20,12 @@
 
 namespace Zend\Cache\Exception;
 
-use Zend\Cache\Exception;
-
 /**
  * @category   Zend
  * @package    Zend_Cache
  * @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
+class RuntimeException extends \RuntimeException implements ExceptionInterface
 {
 }
diff --git a/src/Exception/UnexpectedValueException.php b/src/Exception/UnexpectedValueException.php
@@ -20,14 +20,12 @@
 
 namespace Zend\Cache\Exception;
 
-use Zend\Cache\Exception;
-
 /**
  * @category   Zend
  * @package    Zend_Cache
  * @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 UnexpectedValueException extends \UnexpectedValueException implements Exception
+class UnexpectedValueException extends \UnexpectedValueException implements ExceptionInterface
 {
 }
diff --git a/src/Exception/UnsupportedMethodCallException.php b/src/Exception/UnsupportedMethodCallException.php
@@ -20,14 +20,12 @@
 
 namespace Zend\Cache\Exception;
 
-use Zend\Cache\Exception;
-
 /**
  * @category   Zend
  * @package    Zend_Cache
  * @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 UnsupportedMethodCallException extends \BadMethodCallException implements Exception
+class UnsupportedMethodCallException extends \BadMethodCallException implements ExceptionInterface
 {
 }
diff --git a/src/Pattern/AbstractPattern.php b/src/Pattern/AbstractPattern.php
@@ -22,7 +22,6 @@
 namespace Zend\Cache\Pattern;
 
 use Zend\Cache\Exception,
-    Zend\Cache\Pattern,
     Traversable;
 
 /**
@@ -32,7 +31,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
  */
-abstract class AbstractPattern implements Pattern
+abstract class AbstractPattern implements PatternInterface
 {
     /**
      * @var PatternOptions

diff --git a/src/Pattern/CallbackCache.php b/src/Pattern/CallbackCache.php
@@ -23,7 +23,7 @@
 
 use Zend\Cache\Exception,
     Zend\Cache\StorageFactory,
-    Zend\Cache\Storage\Adapter as StorageAdapter;
+    Zend\Cache\Storage\Adapter\AdapterInterface as StorageAdapter;
 
 /**
  * @category   Zend

diff --git a/src/Pattern/CaptureCache.php b/src/Pattern/CaptureCache.php
@@ -22,7 +22,7 @@
 namespace Zend\Cache\Pattern;
 
 use Zend\Cache\Exception,
-    Zend\Cache\Storage\Adapter as StorageAdapter;
+    Zend\Cache\Storage\Adapter\AdapterInterface as StorageAdapter;
 
 /**
  * @category   Zend

diff --git a/src/Pattern/OutputCache.php b/src/Pattern/OutputCache.php
@@ -23,7 +23,7 @@
 
 use Zend\Cache\Exception,
     Zend\Cache\StorageFactory,
-    Zend\Cache\Storage\Adapter as StorageAdapter;
+    Zend\Cache\Storage\Adapter\AdapterInterface as StorageAdapter;
 
 /**
  * @category   Zend
@@ -62,7 +62,7 @@ public function setOptions(PatternOptions $options)
      * else start buffering output until end() is called or the script ends.
      *
      * @param  string  $key            Key
-     * @param  array   $storageOptions Options passing to Zend\Cache\Storage\Adapter::getItem
+     * @param  array   $storageOptions Options passing to Zend\Cache\Storage\Adapter\AdapterInterface::getItem
      * @return boolean
      * @throws Exception
      */
@@ -88,7 +88,7 @@ public function start($key, array $storageOptions = array())
      * Stops bufferung output, write buffered data to cache using the given key on start()
      * and displays the buffer.
      *
-     * @param  array   $storageOptions Options passed to Zend\Cache\Storage\Adapter::setItem
+     * @param  array   $storageOptions Options passed to Zend\Cache\Storage\Adapter\AdapterInterface::setItem
      * @return boolean TRUE on success, FALSE on failure writing to cache
      * @throws Exception
      */

diff --git a/src/Pattern.php → src/Pattern/PatternInterface.php b/src/Pattern.php → src/Pattern/PatternInterface.php
@@ -14,27 +14,29 @@
  *
  * @category   Zend
  * @package    Zend_Cache
+ * @subpackage Pattern
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-namespace Zend\Cache;
+namespace Zend\Cache\Pattern;
 
 /**
  * @category   Zend
  * @package    Zend_Cache
+ * @subpackage Pattern
  * @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 Pattern
+interface PatternInterface
 {
     /**
      * Set pattern options
      *
-     * @param  Pattern\PatternOptions $options
+     * @param  PatternOptions $options
      * @return Pattern
      */
-    public function setOptions(Pattern\PatternOptions $options);
+    public function setOptions(PatternOptions $options);
 
     /**
      * Get all pattern options

diff --git a/src/Pattern/PatternOptions.php b/src/Pattern/PatternOptions.php
@@ -23,7 +23,7 @@
 
 use Zend\Cache\Exception,
     Zend\Cache\StorageFactory,
-    Zend\Cache\Storage\Adapter as StorageAdapter,
+    Zend\Cache\Storage\Adapter\AdapterInterface as StorageAdapter,
     Zend\Stdlib\Options;
 
 /**
@@ -869,7 +869,7 @@ protected function storageFactory($storage)
             $storage = StorageFactory::adapterFactory($storage);
         } elseif ( !($storage instanceof StorageAdapter) ) {
             throw new Exception\InvalidArgumentException(
-                'The storage must be an instanceof Zend\Cache\Storage\Adapter '
+                'The storage must be an instanceof Zend\Cache\Storage\Adapter\AdapterInterface '
                 . 'or an array passed to Zend\Cache\Storage::factory '
                 . 'or simply the name of the storage adapter'
             );

diff --git a/src/PatternBroker.php b/src/PatternBroker.php
@@ -46,8 +46,10 @@ class PatternBroker extends PluginBroker
      */
     protected function validatePlugin($plugin)
     {
-        if (!$plugin instanceof Pattern) {
-            throw new Exception\RuntimeException('Cache pattern must implement Zend\Cache\Pattern');
+        if (!$plugin instanceof Pattern\PatternInterface) {
+            throw new Exception\RuntimeException(
+                'Cache pattern must implement Zend\Cache\Pattern\PatternInterface'
+            );
         }
         return true;
     }

diff --git a/src/PatternFactory.php b/src/PatternFactory.php
@@ -42,9 +42,9 @@ class PatternFactory
     /**
      * Instantiate a cache pattern
      *
-     * @param  string|Pattern $patternName
+     * @param  string|Pattern\PatternInterface $patternName
      * @param  array|Traversable|Pattern\PatternOptions $options
-     * @return Pattern
+     * @return Pattern\PatternInterface
      * @throws Exception\RuntimeException
      */
     public static function factory($patternName, $options = array())
@@ -64,7 +64,7 @@ public static function factory($patternName, $options = array())
             ));
         }
 
-        if ($patternName instanceof Pattern) {
+        if ($patternName instanceof Pattern\PatternInterface) {
             $patternName->setOptions($options);
             return $patternName;
         }