Browse Source

Small patch to fix Zend_Feed_Reader resets when testing

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@16740 44c647ce-9c0f-0410-b52a-842ac1e357ba
padraic 16 năm trước cách đây
mục cha
commit
3c47e9f7b5

+ 15 - 15
library/Zend/Feed/Reader.php

@@ -198,8 +198,8 @@ class Zend_Feed_Reader
 
 
     /**
     /**
      * Set the flag indicating whether or not to use HTTP conditional GET
      * Set the flag indicating whether or not to use HTTP conditional GET
-     * 
-     * @param  bool $bool 
+     *
+     * @param  bool $bool
      * @return void
      * @return void
      */
      */
     public static function useHttpConditionalGet($bool = true)
     public static function useHttpConditionalGet($bool = true)
@@ -546,22 +546,22 @@ class Zend_Feed_Reader
 
 
     /**
     /**
      * Add prefix path for loading Extensions
      * Add prefix path for loading Extensions
-     * 
-     * @param  string $prefix 
-     * @param  string $path 
+     *
+     * @param  string $prefix
+     * @param  string $path
      * @return void
      * @return void
      */
      */
     public static function addPrefixPath($prefix, $path)
     public static function addPrefixPath($prefix, $path)
     {
     {
         $prefix = rtrim($prefix, '_');
         $prefix = rtrim($prefix, '_');
         $path   = rtrim($path, DIRECTORY_SEPARATOR);
         $path   = rtrim($path, DIRECTORY_SEPARATOR);
-        self::$_pluginLoader->addPrefixPath($prefix, $path);
+        self::getPluginLoader()->addPrefixPath($prefix, $path);
     }
     }
 
 
     /**
     /**
      * Add multiple Extension prefix paths at once
      * Add multiple Extension prefix paths at once
-     * 
-     * @param  array $spec 
+     *
+     * @param  array $spec
      * @return void
      * @return void
      */
      */
     public static function addPrefixPaths(array $spec)
     public static function addPrefixPaths(array $spec)
@@ -578,8 +578,8 @@ class Zend_Feed_Reader
 
 
     /**
     /**
      * Register an Extension by name
      * Register an Extension by name
-     * 
-     * @param  string $name 
+     *
+     * @param  string $name
      * @return void
      * @return void
      * @throws Zend_Feed_Exception if unable to resolve Extension class
      * @throws Zend_Feed_Exception if unable to resolve Extension class
      */
      */
@@ -614,8 +614,8 @@ class Zend_Feed_Reader
 
 
     /**
     /**
      * Is a given named Extension registered?
      * Is a given named Extension registered?
-     * 
-     * @param  string $extensionName 
+     *
+     * @param  string $extensionName
      * @return boolean
      * @return boolean
      */
      */
     public static function isRegistered($extensionName)
     public static function isRegistered($extensionName)
@@ -632,7 +632,7 @@ class Zend_Feed_Reader
 
 
     /**
     /**
      * Get a list of extensions
      * Get a list of extensions
-     * 
+     *
      * @return array
      * @return array
      */
      */
     public static function getExtensions()
     public static function getExtensions()
@@ -642,7 +642,7 @@ class Zend_Feed_Reader
 
 
     /**
     /**
      * Reset class state to defaults
      * Reset class state to defaults
-     * 
+     *
      * @return void
      * @return void
      */
      */
     public static function reset()
     public static function reset()
@@ -675,7 +675,7 @@ class Zend_Feed_Reader
 
 
     /**
     /**
      * Register core (default) extensions
      * Register core (default) extensions
-     * 
+     *
      * @return void
      * @return void
      */
      */
     protected static function _registerCoreExtensions()
     protected static function _registerCoreExtensions()

+ 1 - 1
tests/Zend/Feed/ReaderTest.php

@@ -13,7 +13,7 @@ class Zend_Feed_ReaderTest extends PHPUnit_Framework_TestCase
         $this->_feedSamplePath = dirname(__FILE__) . '/Reader/_files';
         $this->_feedSamplePath = dirname(__FILE__) . '/Reader/_files';
     }
     }
 
 
-    public function teadDown()
+    public function tearDown()
     {
     {
         Zend_Feed_Reader::reset();
         Zend_Feed_Reader::reset();
     }
     }