Skip to content

Commit 5436ce1

Browse files
committed
Merge branch '3.3' into 3.4
* 3.3: (31 commits) Using FQ name for PHP_VERSION_ID [EventDispatcher] Handle laziness internally instead of relying on ClosureProxyArgument Fix CacheCollectorPass priority [Form] Fix \IntlDateFormatter timezone parameter usage to bypass PHP bug #66323 [Routing] Allow GET requests to be redirected. Fixes #23004 [DI] Deal with inlined non-shared services [Cache] Ignore missing annotations.php [DI] Autowiring exception thrown when inlined service is removed Improving deprecation message when hitting the "deprecated type" lookup, but an alias is available Harden the debugging of Twig filters and functions Fixing a bug where an autowiring exception was thrown even when that service was removed Remove extra arg in call to TraceableAdapter::start() Support unknown compiler log format [Config] Allow empty globs Fix decorating TagAware adapters in dev [Profiler] Fix clicking on links inside toggle [Profiler] Fix text selection on exception pages bumped Symfony version to 3.3.1 updated VERSION for 3.3.0 updated CHANGELOG for 3.3.0 ...
2 parents c8b18e2 + a310b29 commit 5436ce1

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)