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

…ix/ZF2-270

src/SaveHandler/Cache.php

@@ -21,15 +21,12 @@
 namespace Zend\Session\SaveHandler;
 
 use Zend\Session\SaveHandler as Savable,
-    Zend\Cache\Storage\Adapter as StorageAdapter,
+    Zend\Cache\Storage\Adapter\AdapterInterface as StorageAdapter,
     Zend\Session\Exception;
 
 /**
  * Cache session save handler
  *
- * @uses       Zend\Config
- * @uses       Zend\Cache\Storage\Adapter
- * @uses       Zend\Session\SaveHandler\Exception
  * @category   Zend
  * @package    Zend_Session
  * @subpackage SaveHandler
@@ -61,7 +58,7 @@ class Cache implements Savable
     /**
      * Constructor
      *
-     * @param  Zend\Cache\Storage\Adapter $storageAdapter
+     * @param  Zend\Cache\Storage\Adapter\AdapterInterface $storageAdapter
      * @return void
      * @throws Zend\Session\Exception
      */
@@ -146,7 +143,7 @@ public function gc($maxlifetime)
      *
      * Allows passing a string class name or StorageAdapter object.
      *
-     * @param Zend\Cache\Storage\Adapter
+     * @param Zend\Cache\Storage\Adapter\AdapterInterface
      * @return void
      */
     public function setStorageAdapter(StorageAdapter $storageAdapter)
@@ -157,7 +154,7 @@ public function setStorageAdapter(StorageAdapter $storageAdapter)
     /**
      * Get Cache Storage Adapter Object
      *
-     * @return Zend\Cache\Storage\Adapter
+     * @return Zend\Cache\Storage\Adapter\AdapterInterface
      */
     public function getStorageAdapter()
     {

test/SaveHandler/CacheTest.php

@@ -25,7 +25,7 @@
     Zend\Session\SaveHandler\Exception as SaveHandlerException,
     Zend\Session\Manager,
     Zend\Cache\StorageFactory as CacheFactory,
-    Zend\Cache\Storage\Adapter as CacheAdapter;
+    Zend\Cache\Storage\Adapter\AdapterInterface as CacheAdapter;
 
 /**
  * Unit testing for DbTable include all tests for