Skip to content
This repository has been archived by the owner on Jan 30, 2020. It is now read-only.

Commit

Permalink
Merge remote-tracking branch 'weierophinney/feature/registry-remove-s…
Browse files Browse the repository at this point in the history 
…ingleton'
  • Loading branch information
@akrabat
akrabat committed Jun 28, 2012
78 parents c4a3687 + 54465f7 + 4ad15e4 + 9aa47da + 619d24d + ddfa8f2 + 8e7172b + e5fc69f + 284a721 + 6d3db4c + b99e8c3 + a52dcef + 1d21066 + cccc24c + 81bd699 + dfb38ed + b796f3d + d49dbc2 + 547433c + 0c9ce04 + a76e26a + 2914396 + 7ca3746 + f1b292d + 406112f + 5a9edd3 + f65c9f6 + c54156c + 5e55e82 + 352e42b + fa459f5 + 3eff137 + 3648ab6 + 4096125 + 0037391 + 9bdfcd9 + 6cd1498 + ecac99d + 199ed75 + b8507f7 + ef400bd + decb6ae + 860b39d + 243eca6 + d56af72 + 1aaf7f9 + 26b27a9 + 40cd50e + 986898b + d2780b7 + 49abb1d + cb5a738 + 21d3bef + 4748875 + 3331086 + bfed36c + b56e9b8 + 765b017 + b2cddce + 1c63803 + dd490e0 + c0425c2 + 128ed7f + 4d88940 + 94b3f1e + 9a0d8cf + 12135ad + 1169a58 + 6cdb5dc + 15950e5 + 7e68fb2 + 4bda4a9 + 537893f + 4cf10f8 + dd5b294 + de5ff9e + f8868a0 + 57f7b59 commit 634cf99
Show file tree
Hide file tree
Showing 8 changed files with 0 additions and 36 deletions.
4 changes: 0 additions & 4 deletions test/Reader/Entry/AtomStandaloneEntryTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 0 additions & 4 deletions test/Reader/Entry/AtomTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 0 additions & 4 deletions test/Reader/Entry/CommonTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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';
}

Expand Down
6 changes: 0 additions & 6 deletions test/Reader/Entry/RssTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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));
}

Expand Down
4 changes: 0 additions & 4 deletions test/Reader/Feed/AtomSourceTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 0 additions & 4 deletions test/Reader/Feed/AtomTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 0 additions & 4 deletions test/Reader/Feed/CommonTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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';
}

Expand Down
6 changes: 0 additions & 6 deletions test/Reader/Feed/RssTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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));
}

Expand Down

0 comments on commit 634cf99

Please sign in to comment.