[zendframework/zendframework#1629] Fixed failing tests due to changes…

… in Zend\Registry - Fixed all Feed, Date, Session, and Translator tests (implicit dependency on Locale meant tests were resetting the Registry) - Currency had some bad behavior due to poor detection of Locale; fixed - Removed obsolete references to Registry in a few classes
zendframework · Jun 27, 2012 · 57f7b59 · 57f7b59
commit 57f7b59
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 36 deletions.
diff --git a/test/Reader/Entry/AtomStandaloneEntryTest.php b/test/Reader/Entry/AtomStandaloneEntryTest.php
@@ -44,10 +44,6 @@ class AtomStandaloneEntryTest extends \PHPUnit_Framework_TestCase
     public function setup()
     {
         Reader\Reader::reset();
-        if (\Zend\Registry::isRegistered('Zend_Locale')) {
-            $registry = \Zend\Registry::getInstance();
-            unset($registry['Zend_Locale']);
-        }
         $this->_feedSamplePath = dirname(__FILE__) . '/_files/AtomStandaloneEntry';
         $this->_options = Date\Date::setOptions();
         foreach($this->_options as $k=>$v) {

diff --git a/test/Reader/Entry/AtomTest.php b/test/Reader/Entry/AtomTest.php
@@ -44,10 +44,6 @@ class AtomTest extends \PHPUnit_Framework_TestCase
     public function setup()
     {
         Reader\Reader::reset();
-        if (\Zend\Registry::isRegistered('Zend_Locale')) {
-            $registry = \Zend\Registry::getInstance();
-            unset($registry['Zend_Locale']);
-        }
         $this->_feedSamplePath = dirname(__FILE__) . '/_files/Atom';
         $this->_options = Date\Date::setOptions();
         foreach($this->_options as $k=>$v) {

diff --git a/test/Reader/Entry/CommonTest.php b/test/Reader/Entry/CommonTest.php
@@ -40,10 +40,6 @@ class CommonTest extends \PHPUnit_Framework_TestCase
     public function setup()
     {
         Reader\Reader::reset();
-        if (\Zend\Registry::isRegistered('Zend_Locale')) {
-            $registry = \Zend\Registry::getInstance();
-            unset($registry['Zend_Locale']);
-        }
         $this->_feedSamplePath = dirname(__FILE__) . '/_files/Common';
     }
 

diff --git a/test/Reader/Entry/RssTest.php b/test/Reader/Entry/RssTest.php
@@ -46,10 +46,6 @@ class RssTest extends \PHPUnit_Framework_TestCase
     public function setup()
     {
         Reader\Reader::reset();
-        if (\Zend\Registry::isRegistered('Zend_Locale')) {
-            $registry = \Zend\Registry::getInstance();
-            unset($registry['Zend_Locale']);
-        }
         $this->_feedSamplePath = dirname(__FILE__) . '/_files/Rss';
         $this->_options = Date\Date::setOptions();
         foreach($this->_options as $k=>$v) {
@@ -1902,15 +1898,13 @@ public function testGetsDateModifiedFromRss20()
     public function testParsesCorrectDateIfMissingOffsetWhenSystemUsesUSLocale()
     {
         $locale = new \Zend\Locale\Locale('en_US');
-        \Zend\Registry::set('Zend_Locale', $locale);
         $feed = Reader\Reader::importString(
             file_get_contents($this->_feedSamplePath.'/datemodified/plain/rss20_en_US.xml')
         );
         $entry = $feed->current();
         $fdate = $entry->getDateModified();
         $edate = new Date\Date;
         $edate->set('2010-01-04T02:14:00-0600', Date\Date::ISO_8601);
-        \Zend\Registry::getInstance()->offsetUnset('Zend_Locale');
         $this->assertTrue($edate->equals($fdate));
     }
 

diff --git a/test/Reader/Feed/AtomSourceTest.php b/test/Reader/Feed/AtomSourceTest.php
@@ -46,10 +46,6 @@ class AtomSourceTest extends \PHPUnit_Framework_TestCase
     public function setup()
     {
         Reader\Reader::reset();
-        if (\Zend\Registry::isRegistered('Zend_Locale')) {
-            $registry = \Zend\Registry::getInstance();
-            unset($registry['Zend_Locale']);
-        }
         $this->_feedSamplePath = dirname(__FILE__) . '/_files/AtomSource';
         $this->_options = Date\Date::setOptions();
         foreach($this->_options as $k=>$v) {

diff --git a/test/Reader/Feed/AtomTest.php b/test/Reader/Feed/AtomTest.php
@@ -46,10 +46,6 @@ class AtomTest extends \PHPUnit_Framework_TestCase
     public function setup()
     {
         Reader\Reader::reset();
-        if (\Zend\Registry::isRegistered('Zend_Locale')) {
-            $registry = \Zend\Registry::getInstance();
-            unset($registry['Zend_Locale']);
-        }
         $this->_feedSamplePath = dirname(__FILE__) . '/_files/Atom';
         $this->_options = Date\Date::setOptions();
         foreach($this->_options as $k=>$v) {

diff --git a/test/Reader/Feed/CommonTest.php b/test/Reader/Feed/CommonTest.php
@@ -39,10 +39,6 @@ class CommonTest extends \PHPUnit_Framework_TestCase
     public function setup()
     {
         Reader\Reader::reset();
-        if (\Zend\Registry::isRegistered('Zend_Locale')) {
-            $registry = \Zend\Registry::getInstance();
-            unset($registry['Zend_Locale']);
-        }
         $this->_feedSamplePath = dirname(__FILE__) . '/_files/Common';
     }
 

diff --git a/test/Reader/Feed/RssTest.php b/test/Reader/Feed/RssTest.php
@@ -46,10 +46,6 @@ class RssTest extends \PHPUnit_Framework_TestCase
     public function setup()
     {
         Reader\Reader::reset();
-        if (\Zend\Registry::isRegistered('Zend_Locale')) {
-            $registry = \Zend\Registry::getInstance();
-            unset($registry['Zend_Locale']);
-        }
         $this->_feedSamplePath = dirname(__FILE__) . '/_files/Rss';
         $this->_options = Date\Date::setOptions();
         foreach($this->_options as $k=>$v) {
@@ -2138,14 +2134,12 @@ public function testGetsDateModifiedFromRss20()
     public function testParsesCorrectDateIfMissingOffsetWhenSystemUsesUSLocale()
     {
         $locale = new \Zend\Locale\Locale('en_US');
-        \Zend\Registry::set('Zend_Locale', $locale);
         $feed = Reader\Reader::importString(
             file_get_contents($this->_feedSamplePath.'/datemodified/plain/rss20_en_US.xml')
         );
         $fdate = $feed->getDateModified();
         $edate = new Date\Date;
         $edate->set('2010-01-04T02:14:00-0600', Date\Date::ISO_8601);
-        \Zend\Registry::getInstance()->offsetUnset('Zend_Locale');
         $this->assertTrue($edate->equals($fdate));
     }