Forward port zendframework/zendframework#5672

Conflicts: library/Zend/EventManager/EventManagerAwareTrait.php library/Zend/Form/View/Helper/FormRow.php library/Zend/I18n/Translator/TranslatorAwareTrait.php library/Zend/Stdlib/Hydrator/AbstractHydrator.php tests/.php_cs tests/ZendTest/Loader/AutoloadDoesNotHideParseError.php tests/ZendTest/Loader/AutoloadableClass.php tests/ZendTest/Loader/MyLoader.php tests/ZendTest/Loader/MyOverloader.php tests/ZendTest/Loader/TestAsset/UnMappedClass.php tests/ZendTest/Version/VersionTest.php tests/ZendTest/View/_stubs/FilterDir1/Foo.php tests/ZendTest/View/_stubs/HelperDir1/Stub1.php tests/ZendTest/View/_stubs/HelperDir1/StubEmpty.php tests/ZendTest/View/_stubs/HelperDir2/Datetime.php tests/ZendTest/View/_stubs/HelperDir2/Stub1.php tests/ZendTest/View/_stubs/HelperDir2/Stub2.php
zendframework · Jan 4, 2014 · b920175 · b920175
commit b920175
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 2 deletions.
diff --git a/src/Storage/Adapter/Redis.php b/src/Storage/Adapter/Redis.php
@@ -12,7 +12,6 @@
 use Redis as RedisResource;
 use RedisException as RedisResourceException;
 use stdClass;
-use Zend\Cache\Storage\Adapter\AbstractAdapter;
 use Zend\Cache\Exception;
 use Zend\Cache\Storage\Capabilities;
 use Zend\Cache\Storage\FlushableInterface;

diff --git a/src/Storage/Adapter/RedisOptions.php b/src/Storage/Adapter/RedisOptions.php
@@ -10,7 +10,6 @@
 namespace Zend\Cache\Storage\Adapter;
 
 use Zend\Cache\Exception;
-use Zend\Cache\Storage\Adapter\AdapterOptions;
 
 class RedisOptions extends AdapterOptions
 {