Skip to content

Commit

Permalink
Merge branch '2.8' into 3.2
Browse files Browse the repository at this point in the history
* 2.8:
  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
  • Loading branch information
nicolas-grekas committed Jun 2, 2017
2 parents 4cdb9fe + 4c29dec commit 78a0c5d
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Tests/InlineTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -575,7 +575,7 @@ public function testParseTimestampAsDateTimeObject($yaml, $year, $month, $day, $
$expected->setTimeZone(new \DateTimeZone('UTC'));
$expected->setDate($year, $month, $day);

if (PHP_VERSION_ID >= 70100) {
if (\PHP_VERSION_ID >= 70100) {
$expected->setTime($hour, $minute, $second, 1000000 * ($second - (int) $second));
} else {
$expected->setTime($hour, $minute, $second);
Expand Down Expand Up @@ -604,7 +604,7 @@ public function testParseNestedTimestampListAsDateTimeObject($yaml, $year, $mont
$expected = new \DateTime($yaml);
$expected->setTimeZone(new \DateTimeZone('UTC'));
$expected->setDate($year, $month, $day);
if (PHP_VERSION_ID >= 70100) {
if (\PHP_VERSION_ID >= 70100) {
$expected->setTime($hour, $minute, $second, 1000000 * ($second - (int) $second));
} else {
$expected->setTime($hour, $minute, $second);
Expand Down

0 comments on commit 78a0c5d

Please sign in to comment.