[Intl] Fix intl tests for PHP < 5.5.10
This commit is contained in:
parent
2f7f587de6
commit
fab0629206
@ -342,7 +342,7 @@ abstract class AbstractIntlDateFormatterTest extends TestCase
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* @dataProvider formatTimezoneProvider
|
* @dataProvider formatTimezoneProvider
|
||||||
* @requires PHP 5.5
|
* @requires PHP 5.5.10
|
||||||
*/
|
*/
|
||||||
public function testFormatTimezone($pattern, $timezone, $expected)
|
public function testFormatTimezone($pattern, $timezone, $expected)
|
||||||
{
|
{
|
||||||
@ -459,15 +459,11 @@ abstract class AbstractIntlDateFormatterTest extends TestCase
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @requires PHP 5.5.10
|
||||||
|
*/
|
||||||
public function testFormatWithDateTimeZoneGmt()
|
public function testFormatWithDateTimeZoneGmt()
|
||||||
{
|
{
|
||||||
if (PHP_VERSION_ID < 50500 && !(extension_loaded('intl') && method_exists('IntlDateFormatter', 'setTimeZone'))) {
|
|
||||||
$this->markTestSkipped('Only in PHP 5.5+ IntlDateFormatter allows to use DateTimeZone objects.');
|
|
||||||
}
|
|
||||||
if (PHP_VERSION_ID < 50510) {
|
|
||||||
$this->markTestSkipped('Before PHP 5.5.10 the GMT timezone used to be converted to UTC.');
|
|
||||||
}
|
|
||||||
|
|
||||||
$formatter = $this->getDateFormatter('en', IntlDateFormatter::MEDIUM, IntlDateFormatter::SHORT, new \DateTimeZone('GMT'), IntlDateFormatter::GREGORIAN, 'zzz');
|
$formatter = $this->getDateFormatter('en', IntlDateFormatter::MEDIUM, IntlDateFormatter::SHORT, new \DateTimeZone('GMT'), IntlDateFormatter::GREGORIAN, 'zzz');
|
||||||
|
|
||||||
$this->assertEquals('GMT', $formatter->format(0));
|
$this->assertEquals('GMT', $formatter->format(0));
|
||||||
|
Reference in New Issue
Block a user