Skip to content

Commit 3492186

Browse files
committed
[Intl] Fixed tests failing on PHP 5.5
1 parent e01c6c2 commit 3492186

File tree

1 file changed

+5
-16
lines changed

1 file changed

+5
-16
lines changed

src/Symfony/Component/Intl/Tests/DateFormatter/AbstractIntlDateFormatterTest.php

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -850,27 +850,16 @@ public function testSetTimeZoneId($timeZoneId, $expectedTimeZoneId)
850850

851851
public function setTimeZoneIdProvider()
852852
{
853-
$data = array(
853+
return array(
854854
array('UTC', 'UTC'),
855855
array('GMT', 'GMT'),
856856
array('GMT-03:00', 'GMT-03:00'),
857857
array('Europe/Zurich', 'Europe/Zurich'),
858+
array('GMT-0300', 'GMT-0300'),
859+
array('Foo/Bar', 'Foo/Bar'),
860+
array('GMT+00:AA', 'GMT+00:AA'),
861+
array('GMT+00AA', 'GMT+00AA'),
858862
);
859-
860-
// When time zone not exists, uses UTC by default
861-
if (version_compare(PHP_VERSION, '5.5.0-dev', '>=')) {
862-
$data[] = array('GMT-0300', 'UTC');
863-
$data[] = array('Foo/Bar', 'UTC');
864-
$data[] = array('GMT+00:AA', 'UTC');
865-
$data[] = array('GMT+00AA', 'UTC');
866-
} else {
867-
$data[] = array('GMT-0300', 'GMT-0300');
868-
$data[] = array('Foo/Bar', 'Foo/Bar');
869-
$data[] = array('GMT+00:AA', 'GMT+00:AA');
870-
$data[] = array('GMT+00AA', 'GMT+00AA');
871-
}
872-
873-
return $data;
874863
}
875864

876865
protected function getDefaultDateFormatter($pattern = null)

0 commit comments

Comments
 (0)