Skip to content

Commit a5ecefd

Browse files
Merge branch '3.2' into 3.3
* 3.2: Fix optional cache warmers are always instantiated whereas they should be lazy-loaded add some \ on PHP_VERSION_ID for 2.8 [PropertyInfo][DoctrineBridge] The bigint Doctrine's type must be converted to string
2 parents 885db86 + 78a0c5d commit a5ecefd

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Tests/InlineTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -575,7 +575,7 @@ public function testParseTimestampAsDateTimeObject($yaml, $year, $month, $day, $
575575
$expected->setTimeZone(new \DateTimeZone('UTC'));
576576
$expected->setDate($year, $month, $day);
577577

578-
if (PHP_VERSION_ID >= 70100) {
578+
if (\PHP_VERSION_ID >= 70100) {
579579
$expected->setTime($hour, $minute, $second, 1000000 * ($second - (int) $second));
580580
} else {
581581
$expected->setTime($hour, $minute, $second);
@@ -604,7 +604,7 @@ public function testParseNestedTimestampListAsDateTimeObject($yaml, $year, $mont
604604
$expected = new \DateTime($yaml);
605605
$expected->setTimeZone(new \DateTimeZone('UTC'));
606606
$expected->setDate($year, $month, $day);
607-
if (PHP_VERSION_ID >= 70100) {
607+
if (\PHP_VERSION_ID >= 70100) {
608608
$expected->setTime($hour, $minute, $second, 1000000 * ($second - (int) $second));
609609
} else {
610610
$expected->setTime($hour, $minute, $second);

0 commit comments

Comments
 (0)