diff --git a/test/Reader/Entry/AtomStandaloneEntryTest.php b/test/Reader/Entry/AtomStandaloneEntryTest.php index d87304d8..a05e95d3 100644 --- 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 index f190eb37..f7af17c6 100644 --- 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 index f370190c..c621f635 100644 --- 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 index bc2745a4..3457b686 100644 --- 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,7 +1898,6 @@ 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') ); @@ -1910,7 +1905,6 @@ public function testParsesCorrectDateIfMissingOffsetWhenSystemUsesUSLocale() $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 index c90f4111..486fb30b 100644 --- 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 index 0d1b09ac..59247071 100644 --- 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 index e94b3373..f152ac22 100644 --- 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 index d4ef6b96..34735890 100644 --- 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)); }