From 9e114083b8dca3ed6e36dcac0ca7bada615975b9 Mon Sep 17 00:00:00 2001
From: Marc Bennewitz <marc-bennewitz@arcor.de>
Date: Mon, 28 May 2012 22:14:00 +0200
Subject: [PATCH 1/2] updated Zend\Feed & Zend\Memory to use the simplified
 cache API

---
 src/Reader/Reader.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Reader/Reader.php b/src/Reader/Reader.php
index 56f62378..fc5aecd9 100644
--- a/src/Reader/Reader.php
+++ b/src/Reader/Reader.php
@@ -253,7 +253,7 @@ public static function import($uri, $etag = null, $lastModified = null)
             return self::importString($responseXml);
         } elseif ($cache) {
             $data = $cache->getItem($cacheId);
-            if ($data !== false) {
+            if ($data) {
                 return self::importString($data);
             }
             $response = $client->send();

From c2198f5cdf7ec996f46413de439ba3ea7d208e2f Mon Sep 17 00:00:00 2001
From: Marc Bennewitz <marc-bennewitz@arcor.de>
Date: Mon, 28 May 2012 23:30:09 +0200
Subject: [PATCH 2/2] updated Zend\Feed to use the simplified cache API

---
 src/Reader/Reader.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Reader/Reader.php b/src/Reader/Reader.php
index fc5aecd9..ee42b652 100644
--- a/src/Reader/Reader.php
+++ b/src/Reader/Reader.php
@@ -20,7 +20,7 @@
 
 namespace Zend\Feed\Reader;
 
-use Zend\Cache\Storage\Adapter\AdapterInterface as CacheAdapter,
+use Zend\Cache\Storage\StorageInterface as CacheStorage,
     Zend\Http,
     Zend\Loader,
     Zend\Stdlib\ErrorHandler,
@@ -66,7 +66,7 @@ class Reader
     /**
      * Cache instance
      *
-     * @var CacheAdapter
+     * @var CacheStorage
      */
     protected static $_cache = null;
 
@@ -112,7 +112,7 @@ class Reader
     /**
      * Get the Feed cache
      *
-     * @return CacheAdapter
+     * @return CacheStorage
      */
     public static function getCache()
     {
@@ -122,10 +122,10 @@ public static function getCache()
     /**
      * Set the feed cache
      *
-     * @param  CacheAdapter $cache
+     * @param  CacheStorage $cache
      * @return void
      */
-    public static function setCache(CacheAdapter $cache)
+    public static function setCache(CacheStorage $cache)
     {
         self::$_cache = $cache;
     }