Skip to content

Commit c8b18e2

Browse files
Merge branch '3.3' into 3.4
* 3.3: typo Fixed options stub values display in form profiler [Console] Fix tests Make the simple exception pages match the new style [Console] Fixed different behaviour of key and value user inputs in multiple choice question Adjust PHPUnit class_alias check to also check for namespaced class [Cache] Dont use pipelining with RedisCluster [Yaml] fix colon without space deprecation [Intl] Fix intl tests for PHP < 5.5.10
2 parents fe46f5b + c3058b7 commit c8b18e2

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

Tests/DateFormatter/AbstractIntlDateFormatterTest.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ public function formatWithTimezoneProvider()
318318

319319
/**
320320
* @dataProvider formatTimezoneProvider
321-
* @requires PHP 5.5
321+
* @requires PHP 5.5.10
322322
*/
323323
public function testFormatTimezone($pattern, $timezone, $expected)
324324
{
@@ -423,6 +423,9 @@ public function testFormatWithConstructorTimezone()
423423
);
424424
}
425425

426+
/**
427+
* @requires PHP 5.5.10
428+
*/
426429
public function testFormatWithDateTimeZoneGmt()
427430
{
428431
$formatter = $this->getDateFormatter('en', IntlDateFormatter::MEDIUM, IntlDateFormatter::SHORT, new \DateTimeZone('GMT'), IntlDateFormatter::GREGORIAN, 'zzz');

0 commit comments

Comments
 (0)