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

zendframework · Jun 26, 2011 · c54156c · c54156c
17 parents db0d75c + 5e55e82 + 352e42b + fa459f5 + 3eff137 + 3648ab6 + 4096125 + 0037391 + 9bdfcd9 + 6cd1498 + ecac99d + 199ed75 + b8507f7 + ef400bd + decb6ae + 860b39d + 243eca6
commit c54156c
Show file tree

Hide file tree

Showing 13 changed files with 99 additions and 98 deletions.
diff --git a/src/Exception.php b/src/Exception.php
@@ -28,12 +28,12 @@
  *
  * Class to represent exceptions that occur during Feed operations.
  *
- * @uses       \Zend\Exception
+ * @uses       \Exception
  * @category   Zend
  * @package    Zend_Feed
  * @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Exception extends \Zend\Exception
+class Exception extends \Exception
 {}
 
diff --git a/src/PubSubHubbub/Exception.php b/src/PubSubHubbub/Exception.php
@@ -24,11 +24,11 @@
 namespace Zend\Feed\PubSubHubbub;
 
 /**
- * @uses       \Zend\Exception
+ * @uses       \Exception
  * @category   Zend
  * @package    Zend_Feed_Pubsubhubbub
  * @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Exception extends \Zend\Exception
+class Exception extends \Exception
 {}
diff --git a/src/Reader/Exception.php b/src/Reader/Exception.php
@@ -19,20 +19,20 @@
 */
 
 /**
-* @namespace
-*/
+ * @namespace
+ */
 namespace Zend\Feed\Reader;
 
 /**
 * Feed exceptions
 *
 * Class to represent exceptions that occur during Feed operations.
 *
-* @uses \Zend\Exception
+* @uses \Exception
 * @category Zend
 * @package Zend_Feed
 * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
 * @license http://framework.zend.com/license/new-bsd New BSD License
 */
-class Exception extends \Zend\Exception
+class Exception extends \Exception
 {}
diff --git a/src/Reader/Feed/AbstractFeed.php b/src/Reader/Feed/AbstractFeed.php
@@ -19,10 +19,12 @@
  */
 
 /**
-* @namespace
-*/
+ * @namespace
+ */
 namespace Zend\Feed\Reader\Feed;
-use Zend\Feed\Reader;
+
+use Zend\Feed\Reader,
+    Zend\Feed\Reader\Exception;
 
 /**
 * @uses \Zend\Feed\Exception
@@ -291,13 +293,18 @@ public function getExtension($name)
 
     protected function _loadExtensions()
     {
-        $all = Reader\Reader::getExtensions();
+        $all  = Reader\Reader::getExtensions();
         $feed = $all['feed'];
         foreach ($feed as $extension) {
             if (in_array($extension, $all['core'])) {
                 continue;
             }
-            $className = Reader\Reader::getPluginLoader()->getClassName($extension);
+            if (!$className = Reader\Reader::getPluginLoader()->getClassName($extension)) {
+                continue;
+            }
+            if (!class_exists($className)) {
+                throw new Exception(sprintf('Unable to load extension "%s"; cannot find class', $extension));
+            }
             $this->_extensions[$extension] = new $className(
                 $this->getDomDocument(), $this->_data['type'], $this->_xpath
             );

diff --git a/src/Reader/Feed/Rss.php b/src/Reader/Feed/Rss.php
@@ -52,10 +52,10 @@ public function __construct(\DomDocument $dom, $type = null)
     {
         parent::__construct($dom, $type);
 
-        $dublinCoreClass = Reader\Reader::getPluginLoader()->getClassName('DublinCore\\Feed');
-        $this->_extensions['DublinCore\\Feed'] = new $dublinCoreClass($dom, $this->_data['type'], $this->_xpath);
+        $dublinCoreClass = Reader\Reader::getPluginLoader()->getClassName('DublinCore\Feed');
+        $this->_extensions['DublinCore\Feed'] = new $dublinCoreClass($dom, $this->_data['type'], $this->_xpath);
         $atomClass = Reader\Reader::getPluginLoader()->getClassName('Atom\\Feed');
-        $this->_extensions['Atom\\Feed'] = new $atomClass($dom, $this->_data['type'], $this->_xpath);
+        $this->_extensions['Atom\Feed'] = new $atomClass($dom, $this->_data['type'], $this->_xpath);
 
         if ($this->getType() !== Reader\Reader::TYPE_RSS_10 && $this->getType() !== Reader\Reader::TYPE_RSS_090) {
             $xpathPrefix = '/rss/channel';

diff --git a/src/Reader/Reader.php b/src/Reader/Reader.php
@@ -22,17 +22,11 @@
 * @namespace
 */
 namespace Zend\Feed\Reader;
-use Zend\HTTP;
-use Zend\Loader;
+
+use Zend\Http,
+    Zend\Loader;
 
 /**
-* @uses \Zend\Feed\Feed
-* @uses \Zend\Feed\Exception
-* @uses \Zend\Feed\Reader\FeedSet
-* @uses \Zend\Feed\Reader\Feed\Atom\Atom
-* @uses \Zend\Feed\Reader\Feed\RSS
-* @uses \Zend\HTTP\Client
-* @uses \Zend\Loader\PluginLoader
 * @category Zend
 * @package Zend_Feed_Reader
 * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
@@ -78,7 +72,7 @@ class Reader
     /**
      * HTTP client object to use for retrieving feeds
      *
-     * @var \Zend\HTTP\Client
+     * @var \Zend\Http\Client
      */
     protected static $_httpClient = null;
 
@@ -140,24 +134,24 @@ public static function setCache(\Zend\Cache\Core $cache)
      *
      * Sets the HTTP client object to use for retrieving the feeds.
      *
-     * @param  \Zend\HTTP\Client $httpClient
+     * @param  \Zend\Http\Client $httpClient
      * @return void
      */
-    public static function setHttpClient(HTTP\Client $httpClient)
+    public static function setHttpClient(Http\Client $httpClient)
     {
         self::$_httpClient = $httpClient;
     }
 
 
     /**
-     * Gets the HTTP client object. If none is set, a new \Zend\HTTP\Client will be used.
+     * Gets the HTTP client object. If none is set, a new \Zend\Http\Client will be used.
      *
-     * @return \Zend\HTTP\Client
+     * @return \Zend\Http\Client
      */
     public static function getHttpClient()
     {
-        if (!self::$_httpClient instanceof HTTP\Client) {
-            self::$_httpClient = new HTTP\Client();
+        if (!self::$_httpClient instanceof Http\Client) {
+            self::$_httpClient = new Http\Client();
         }
 
         return self::$_httpClient;
@@ -481,23 +475,23 @@ public static function detectType($feed, $specOnly = false)
     /**
      * Set plugin loader for use with Extensions
      *
-     * @param  \Zend\Loader\ShortNameLocater $loader
+     * @param  \Zend\Loader\ShortNameLocator $loader
      */
-    public static function setPluginLoader(Loader\ShortNameLocater $loader)
+    public static function setPluginLoader(Loader\ShortNameLocator $loader)
     {
         self::$_pluginLoader = $loader;
     }
 
     /**
      * Get plugin loader for use with Extensions
      *
-     * @return  \Zend\Loader\PluginLoader $loader
+     * @return  \Zend\Loader\PrefixPathLoader $loader
      */
     public static function getPluginLoader()
     {
         if (!isset(self::$_pluginLoader)) {
-            self::setPluginLoader(new Loader\PluginLoader(array(
-                'Zend\\Feed\\Reader\\Extension\\' => 'Zend/Feed/Reader/Extension/',
+            self::setPluginLoader(new Loader\PrefixPathLoader(array(
+                'Zend\Feed\Reader\Extension\\' => 'Zend/Feed/Reader/Extension/',
             )));
         }
         return self::$_pluginLoader;
@@ -553,27 +547,23 @@ public static function registerExtension($name)
     {
         $feedName  = $name . '\Feed';
         $entryName = $name . '\Entry';
+        $loader    = self::getPluginLoader();
         if (self::isRegistered($name)) {
-            if (self::getPluginLoader()->isLoaded($feedName) ||
-                self::getPluginLoader()->isLoaded($entryName)) {
+            if ($loader->isLoaded($feedName) || $loader->isLoaded($entryName)) {
                 return;
             }
         }
-        try {
-            self::getPluginLoader()->load($feedName);
+        $loader->load($feedName);
+        $loader->load($entryName);
+        if (!$loader->isLoaded($feedName) && !$loader->isLoaded($entryName)) {
+            throw new \Zend\Feed\Exception('Could not load extension: ' . $name
+                . ' using Plugin Loader. Check prefix paths are configured and extension exists.');
+        }
+        if ($loader->isLoaded($feedName)) {
             self::$_extensions['feed'][] = $feedName;
-        } catch (Loader\PluginLoaderException $e) {
         }
-        try {
-            self::getPluginLoader()->load($entryName);
+        if ($loader->isLoaded($entryName)) {
             self::$_extensions['entry'][] = $entryName;
-        } catch (Loader\PluginLoaderException $e) {
-        }
-        if (!self::getPluginLoader()->isLoaded($feedName)
-            && !self::getPluginLoader()->isLoaded($entryName)
-        ) {
-            throw new \Zend\Feed\Exception('Could not load extension: ' . $name
-                . 'using Plugin Loader. Check prefix paths are configured and extension exists.');
         }
     }
 

diff --git a/src/Writer/AbstractFeed.php b/src/Writer/AbstractFeed.php
@@ -22,9 +22,10 @@
 * @namespace
 */
 namespace Zend\Feed\Writer;
-use Zend\Uri;
-use Zend\Date;
-use Zend\Validator;
+
+use Zend\Uri,
+    Zend\Date,
+    Zend\Validator;
 
 /**
 * @uses \Zend\Date\Date
@@ -785,7 +786,9 @@ protected function _loadExtensions()
         $all = Writer::getExtensions();
         $exts = $all['feed'];
         foreach ($exts as $ext) {
-            $className = Writer::getPluginLoader()->getClassName($ext);
+            if (!$className = Writer::getPluginLoader()->getClassName($ext)) {
+                throw new Exception(sprintf('Unable to load extension "%s"; could not resolve to class', $ext));
+            }
             $this->_extensions[$ext] = new $className();
             $this->_extensions[$ext]->setEncoding($this->getEncoding());
         }

diff --git a/src/Writer/Exception.php b/src/Writer/Exception.php
@@ -28,11 +28,11 @@
 *
 * Class to represent exceptions that occur during Feed operations.
 *
-* @uses \Zend\Exception
+* @uses \Exception
 * @category Zend
 * @package Zend_Feed
 * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
 * @license http://framework.zend.com/license/new-bsd New BSD License
 */
-class Exception extends \Zend\Exception
+class Exception extends \Exception
 {}
diff --git a/src/Writer/Exception/InvalidMethodException.php b/src/Writer/Exception/InvalidMethodException.php
@@ -38,5 +38,5 @@
  * @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class InvalidMethodException extends \Zend\Exception
+class InvalidMethodException extends \Exception
 {}
diff --git a/src/Writer/InvalidMethodException.php b/src/Writer/InvalidMethodException.php
@@ -29,11 +29,11 @@
  *
  * Class to represent exceptions that occur during Feed operations.
  *
- * @uses       \Zend\Exception
+ * @uses       \Exception
  * @category   Zend
  * @package    Zend_Feed
  * @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class InvalidMethodException extends \Zend\Exception
+class InvalidMethodException extends \Exception
 {}