Merge branch 'master' of https://github.com/zendframework/zf2 into zf…

…5256
zendframework · Nov 18, 2013 · d4e61ff · d4e61ff
commit d4e61ff
Show file tree

Hide file tree

Showing 10 changed files with 1 addition and 10 deletions.
diff --git a/src/PatternPluginManager.php b/src/PatternPluginManager.php
@@ -14,7 +14,7 @@
 /**
  * Plugin manager implementation for cache pattern adapters
  *
- * Enforces that adatpers retrieved are instances of
+ * Enforces that retrieved adapters are instances of
  * Pattern\PatternInterface. Additionally, it registers a number of default
  * patterns available.
  */

diff --git a/src/Storage/Adapter/Redis.php b/src/Storage/Adapter/Redis.php
@@ -14,7 +14,6 @@
 use stdClass;
 use Zend\Cache\Storage\Adapter\AbstractAdapter;
 use Zend\Cache\Exception;
-use Zend\Cache\Storage\AvailableSpaceCapableInterface;
 use Zend\Cache\Storage\Capabilities;
 use Zend\Cache\Storage\FlushableInterface;
 use Zend\Cache\Storage\TotalSpaceCapableInterface;

diff --git a/src/Storage/Adapter/RedisOptions.php b/src/Storage/Adapter/RedisOptions.php
@@ -9,7 +9,6 @@
 
 namespace Zend\Cache\Storage\Adapter;
 
-use Redis as RedisResource;
 use Zend\Cache\Exception;
 use Zend\Cache\Storage\Adapter\AdapterOptions;
 

diff --git a/src/Storage/Adapter/RedisResourceManager.php b/src/Storage/Adapter/RedisResourceManager.php
@@ -10,7 +10,6 @@
 namespace Zend\Cache\Storage\Adapter;
 
 use Redis as RedisResource;
-use RedisException as RedisResourceException;
 use ReflectionClass;
 use Traversable;
 use Zend\Cache\Exception;

diff --git a/src/Storage/Adapter/SessionOptions.php b/src/Storage/Adapter/SessionOptions.php
@@ -9,7 +9,6 @@
 
 namespace Zend\Cache\Storage\Adapter;
 
-use Zend\Cache\Exception;
 use Zend\Session\Container as SessionContainer;
 
 /**

diff --git a/src/Storage/Plugin/ClearExpiredByFactor.php b/src/Storage/Plugin/ClearExpiredByFactor.php
@@ -9,7 +9,6 @@
 
 namespace Zend\Cache\Storage\Plugin;
 
-use Zend\Cache\Exception;
 use Zend\Cache\Storage\ClearExpiredInterface;
 use Zend\Cache\Storage\PostEvent;
 use Zend\EventManager\EventManagerInterface;

diff --git a/src/Storage/Plugin/OptimizeByFactor.php b/src/Storage/Plugin/OptimizeByFactor.php
@@ -9,7 +9,6 @@
 
 namespace Zend\Cache\Storage\Plugin;
 
-use Zend\Cache\Exception;
 use Zend\Cache\Storage\OptimizableInterface;
 use Zend\Cache\Storage\PostEvent;
 use Zend\EventManager\EventManagerInterface;

diff --git a/src/Storage/Plugin/Serializer.php b/src/Storage/Plugin/Serializer.php
@@ -10,7 +10,6 @@
 namespace Zend\Cache\Storage\Plugin;
 
 use stdClass;
-use Zend\Cache\Exception;
 use Zend\Cache\Storage\Capabilities;
 use Zend\Cache\Storage\Event;
 use Zend\Cache\Storage\PostEvent;

diff --git a/test/Storage/Adapter/CommonAdapterTest.php b/test/Storage/Adapter/CommonAdapterTest.php
@@ -20,7 +20,6 @@
 use Zend\Cache\Storage\OptimizableInterface;
 use Zend\Cache\Storage\TaggableInterface;
 use Zend\Cache\Storage\TotalSpaceCapableInterface;
-use Zend\Http\Header\Expires;
 use Zend\Stdlib\ErrorHandler;
 
 /**

diff --git a/test/Storage/Adapter/KeyListIteratorTest.php b/test/Storage/Adapter/KeyListIteratorTest.php
@@ -10,7 +10,6 @@
 namespace ZendTest\Cache\Storage\Adapter;
 
 use Zend\Cache;
-use Zend\Cache\Storage\Adapter\Memory as MemoryStorage;
 use Zend\Cache\Storage\Adapter\KeyListIterator;
 
 /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,7 +9,6 @@ @@
     namespace Zend\Cache\Storage\Adapter;
-    use Zend\Cache\Exception;
     use Zend\Session\Container as SessionContainer;
     /**
@@ Expand Down @@