From 349218692e23be9a6de2e800d43cfd2a4b87196e Mon Sep 17 00:00:00 2001 From: Jakub Zalas Date: Fri, 21 Jun 2013 09:19:25 +0100 Subject: [PATCH] [Intl] Fixed tests failing on PHP 5.5 --- .../AbstractIntlDateFormatterTest.php | 21 +++++-------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/src/Symfony/Component/Intl/Tests/DateFormatter/AbstractIntlDateFormatterTest.php b/src/Symfony/Component/Intl/Tests/DateFormatter/AbstractIntlDateFormatterTest.php index 6dde36a704f1..84f6433a57f2 100644 --- a/src/Symfony/Component/Intl/Tests/DateFormatter/AbstractIntlDateFormatterTest.php +++ b/src/Symfony/Component/Intl/Tests/DateFormatter/AbstractIntlDateFormatterTest.php @@ -850,27 +850,16 @@ public function testSetTimeZoneId($timeZoneId, $expectedTimeZoneId) public function setTimeZoneIdProvider() { - $data = array( + return array( array('UTC', 'UTC'), array('GMT', 'GMT'), array('GMT-03:00', 'GMT-03:00'), array('Europe/Zurich', 'Europe/Zurich'), + array('GMT-0300', 'GMT-0300'), + array('Foo/Bar', 'Foo/Bar'), + array('GMT+00:AA', 'GMT+00:AA'), + array('GMT+00AA', 'GMT+00AA'), ); - - // When time zone not exists, uses UTC by default - if (version_compare(PHP_VERSION, '5.5.0-dev', '>=')) { - $data[] = array('GMT-0300', 'UTC'); - $data[] = array('Foo/Bar', 'UTC'); - $data[] = array('GMT+00:AA', 'UTC'); - $data[] = array('GMT+00AA', 'UTC'); - } else { - $data[] = array('GMT-0300', 'GMT-0300'); - $data[] = array('Foo/Bar', 'Foo/Bar'); - $data[] = array('GMT+00:AA', 'GMT+00:AA'); - $data[] = array('GMT+00AA', 'GMT+00AA'); - } - - return $data; } protected function getDefaultDateFormatter($pattern = null)