Merge branch 'feature/di' into local-rs/feature/di

zendframework · Jul 13, 2011 · 1aaf7f9 · 1aaf7f9
19 parents 5e55e82 + 352e42b + fa459f5 + 3eff137 + 3648ab6 + 4096125 + 0037391 + 9bdfcd9 + 6cd1498 + ecac99d + 199ed75 + b8507f7 + ef400bd + decb6ae + 860b39d + 243eca6 + f65c9f6 + c54156c + d56af72
commit 1aaf7f9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/src/Reader/Reader.php b/src/Reader/Reader.php
@@ -65,7 +65,7 @@ class Reader
     /**
      * Cache instance
      *
-     * @var \Zend\Cache\Core
+     * @var \Zend\Cache\Frontend\Core
      */
     protected static $_cache = null;
 
@@ -111,7 +111,7 @@ class Reader
     /**
      * Get the Feed cache
      *
-     * @return \Zend\Cache\Core
+     * @return \Zend\Cache\Frontend\Core
      */
     public static function getCache()
     {
@@ -121,10 +121,10 @@ public static function getCache()
     /**
      * Set the feed cache
      *
-     * @param \Zend\Cache\Core $cache
+     * @param \Zend\Cache\Frontend\Core $cache
      * @return void
      */
-    public static function setCache(\Zend\Cache\Core $cache)
+    public static function setCache(\Zend\Cache\Frontend\Core $cache)
     {
         self::$_cache = $cache;
     }

diff --git a/src/Writer/Feed.php b/src/Writer/Feed.php
@@ -246,7 +246,7 @@ public function export($type, $ignoreExceptions = false)
             throw new Exception('Invalid feed type specified: ' . $type . '.'
             . ' Should be one of "rss" or "atom".');
         }
-        $renderClass = 'Renderer\\Feed\\' . $type;
+        $renderClass = '\\Zend\\Feed\\Writer\\Renderer\\Feed\\' . $type;
         $renderer = new $renderClass($this);
         if ($ignoreExceptions) {
             $renderer->ignoreExceptions();

diff --git a/tools/phptools b/tools/phptools