mirror of
https://github.com/twigphp/Twig.git
synced 2026-09-15 20:06:31 +00:00
Added support DateTimeInterface (PHP 5.5) if available
This commit is contained in:
committed by
Fabien Potencier
parent
09c386b335
commit
ca61facb1a
@@ -485,13 +485,15 @@ function twig_date_converter(Twig_Environment $env, $date = null, $timezone = nu
|
||||
$defaultTimezone = $timezone;
|
||||
}
|
||||
|
||||
if ($date instanceof DateTime) {
|
||||
$date = clone $date;
|
||||
if ($date instanceof DateTime || $date instanceof DateTimeInterface) {
|
||||
$returningDate = new DateTime($date->format('c'));
|
||||
if (false !== $timezone) {
|
||||
$date->setTimezone($defaultTimezone);
|
||||
$returningDate->setTimezone($defaultTimezone);
|
||||
} else {
|
||||
$returningDate->setTimezone($date->getTimezone());
|
||||
}
|
||||
|
||||
return $date;
|
||||
return $returningDate;
|
||||
}
|
||||
|
||||
$asString = (string) $date;
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
--TEST--
|
||||
"date" filter
|
||||
--CONDITION--
|
||||
version_compare(phpversion(), '5.5.0', '>=')
|
||||
--TEMPLATE--
|
||||
{{ date1|date }}
|
||||
{{ date1|date('d/m/Y') }}
|
||||
{{ date1|date('d/m/Y H:i:s', 'Asia/Hong_Kong') }}
|
||||
{{ date1|date('d/m/Y H:i:s', timezone1) }}
|
||||
{{ date1|date('d/m/Y H:i:s') }}
|
||||
|
||||
{{ date2|date('d/m/Y H:i:s P', 'Europe/Paris') }}
|
||||
{{ date2|date('d/m/Y H:i:s P', 'Asia/Hong_Kong') }}
|
||||
{{ date2|date('d/m/Y H:i:s P', false) }}
|
||||
{{ date2|date('e', 'Europe/Paris') }}
|
||||
{{ date2|date('e', false) }}
|
||||
--DATA--
|
||||
date_default_timezone_set('Europe/Paris');
|
||||
return array(
|
||||
'date1' => new DateTimeImmutable('2010-10-04 13:45'),
|
||||
'date2' => new DateTimeImmutable('2010-10-04 13:45', new DateTimeZone('America/New_York')),
|
||||
'timezone1' => new DateTimeZone('America/New_York'),
|
||||
)
|
||||
--EXPECT--
|
||||
October 4, 2010 13:45
|
||||
04/10/2010
|
||||
04/10/2010 19:45:00
|
||||
04/10/2010 07:45:00
|
||||
04/10/2010 13:45:00
|
||||
|
||||
04/10/2010 19:45:00 +02:00
|
||||
05/10/2010 01:45:00 +08:00
|
||||
04/10/2010 13:45:00 -04:00
|
||||
Europe/Paris
|
||||
America/New_York
|
||||
Reference in New Issue
Block a user