Skip to content

Commit 801796a

Browse files
committed
Merge branch '2.8' into 3.2
* 2.8: Using FQ name for PHP_VERSION_ID [Form] Fix \IntlDateFormatter timezone parameter usage to bypass PHP bug #66323 Harden the debugging of Twig filters and functions bumped Symfony version to 2.8.22 updated VERSION for 2.8.21 updated CHANGELOG for 2.8.21 bumped Symfony version to 2.7.29 updated VERSION for 2.7.28 update CONTRIBUTORS for 2.7.28 updated CHANGELOG for 2.7.28
2 parents d96d265 + ce9f1a1 commit 801796a

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Tests/DateFormatter/AbstractIntlDateFormatterTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ public function testFormatWithDateTimeZoneGmt()
435435

436436
public function testFormatWithDateTimeZoneGmtOffset()
437437
{
438-
if (defined('HHVM_VERSION_ID') || PHP_VERSION_ID <= 50509) {
438+
if (defined('HHVM_VERSION_ID') || \PHP_VERSION_ID <= 50509) {
439439
$this->markTestSkipped('DateTimeZone GMT offsets are supported since 5.5.10. See https://github.com/facebook/hhvm/issues/5875 for HHVM.');
440440
}
441441

0 commit comments

Comments
 (0)