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

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

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Paginator.php b/src/Paginator.php
@@ -25,7 +25,7 @@
     Iterator,
     IteratorAggregate,
     Traversable,
-    Zend\Cache\Storage\Adapter as CacheAdapter,
+    Zend\Cache\Storage\Adapter\AdapterInterface as CacheAdapter,
     Zend\Db\Select as DbSelect,
     Zend\Db\Table\AbstractRowset as DbAbstractRowset,
     Zend\Db\Table\Select as DbTableSelect,

diff --git a/test/PaginatorTest.php b/test/PaginatorTest.php
@@ -23,7 +23,7 @@
 
 use PHPUnit_Framework_TestCase as TestCase,
     Zend\Cache\StorageFactory as CacheFactory,
-    Zend\Cache\Storage\Adapter as CacheAdapter,
+    Zend\Cache\Storage\Adapter\AdapterInterface as CacheAdapter,
     Zend\Config,
     Zend\Paginator,
     Zend\Paginator\Adapter,