diff --git a/src/Symfony/Component/VarDumper/Caster/DateCaster.php b/src/Symfony/Component/VarDumper/Caster/DateCaster.php index b96660605f..bca8a902d3 100644 --- a/src/Symfony/Component/VarDumper/Caster/DateCaster.php +++ b/src/Symfony/Component/VarDumper/Caster/DateCaster.php @@ -56,14 +56,9 @@ class DateCaster .($i->y ? '%yy ' : '') .($i->m ? '%mm ' : '') .($i->d ? '%dd ' : '') + .($i->h || $i->i || $i->s || $i->f ? '%H:%I:%S.%F' : '') ; - if (\PHP_VERSION_ID >= 70100 && isset($i->f)) { - $format .= $i->h || $i->i || $i->s || $i->f ? '%H:%I:%S.%F' : ''; - } else { - $format .= $i->h || $i->i || $i->s ? '%H:%I:%S' : ''; - } - $format = '%R ' === $format ? '0s' : $format; return $i->format(rtrim($format)); diff --git a/src/Symfony/Component/VarDumper/Tests/Caster/DateCasterTest.php b/src/Symfony/Component/VarDumper/Tests/Caster/DateCasterTest.php index d5860df5e1..627a47490c 100644 --- a/src/Symfony/Component/VarDumper/Tests/Caster/DateCasterTest.php +++ b/src/Symfony/Component/VarDumper/Tests/Caster/DateCasterTest.php @@ -157,27 +157,24 @@ EODUMP; public function provideIntervals() { - $i = new \DateInterval('PT0S'); - $ms = \PHP_VERSION_ID >= 70100 && isset($i->f) ? '.000000' : ''; - return array( array('PT0S', 0, '0s', '0s'), - array('PT1S', 0, '+ 00:00:01'.$ms, '1s'), - array('PT2M', 0, '+ 00:02:00'.$ms, '120s'), - array('PT3H', 0, '+ 03:00:00'.$ms, '10 800s'), + array('PT1S', 0, '+ 00:00:01.000000', '1s'), + array('PT2M', 0, '+ 00:02:00.000000', '120s'), + array('PT3H', 0, '+ 03:00:00.000000', '10 800s'), array('P4D', 0, '+ 4d', '345 600s'), array('P5M', 0, '+ 5m', null), array('P6Y', 0, '+ 6y', null), - array('P1Y2M3DT4H5M6S', 0, '+ 1y 2m 3d 04:05:06'.$ms, null), + array('P1Y2M3DT4H5M6S', 0, '+ 1y 2m 3d 04:05:06.000000', null), array('PT0S', 1, '0s', '0s'), - array('PT1S', 1, '- 00:00:01'.$ms, '-1s'), - array('PT2M', 1, '- 00:02:00'.$ms, '-120s'), - array('PT3H', 1, '- 03:00:00'.$ms, '-10 800s'), + array('PT1S', 1, '- 00:00:01.000000', '-1s'), + array('PT2M', 1, '- 00:02:00.000000', '-120s'), + array('PT3H', 1, '- 03:00:00.000000', '-10 800s'), array('P4D', 1, '- 4d', '-345 600s'), array('P5M', 1, '- 5m', null), array('P6Y', 1, '- 6y', null), - array('P1Y2M3DT4H5M6S', 1, '- 1y 2m 3d 04:05:06'.$ms, null), + array('P1Y2M3DT4H5M6S', 1, '- 1y 2m 3d 04:05:06.000000', null), ); } }