Skip to content

Commit

Permalink
minor twigphp#3942 Use DateTimeImmutable (fabpot)
Browse files Browse the repository at this point in the history
This PR was merged into the 4.x branch.

Discussion
----------

Use DateTimeImmutable

Commits
-------

b3e8b8a Use DateTimeImmutable
  • Loading branch information
fabpot committed Dec 13, 2023
2 parents 1493fdf + b3e8b8a commit ffa55e8
Showing 1 changed file with 9 additions and 15 deletions.
24 changes: 9 additions & 15 deletions src/Extension/CoreExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -439,15 +439,11 @@ public static function dateFormatFilter(Environment $env, $date, $format = null,
* @param \DateTimeInterface|string $date A date
* @param string $modifier A modifier string
*
* @return \DateTimeInterface
*
* @internal
*/
public static function dateModifyFilter(Environment $env, $date, $modifier)
public static function dateModifyFilter(Environment $env, $date, $modifier): \DateTimeImmutable
{
$date = self::dateConverter($env, $date, false);

return $date->modify($modifier);
return self::dateConverter($env, $date, false)->modify($modifier);
}

/**
Expand Down Expand Up @@ -475,11 +471,9 @@ public static function sprintf($format, ...$values)
* @param \DateTimeInterface|string|null $date A date or null to use the current time
* @param \DateTimeZone|string|false|null $timezone The target timezone, null to use the default, false to leave unchanged
*
* @return \DateTimeInterface
*
* @internal
*/
public static function dateConverter(Environment $env, $date = null, $timezone = null)
public static function dateConverter(Environment $env, $date = null, $timezone = null): \DateTimeImmutable
{
// determine the timezone
if (false !== $timezone) {
Expand All @@ -496,9 +490,9 @@ public static function dateConverter(Environment $env, $date = null, $timezone =
}

if ($date instanceof \DateTimeInterface) {
$date = clone $date;
$date = \DateTimeImmutable::createFromInterface($date);
if (false !== $timezone) {
$date->setTimezone($timezone);
return $date->setTimezone($timezone);
}

return $date;
Expand All @@ -509,18 +503,18 @@ public static function dateConverter(Environment $env, $date = null, $timezone =
$date = 'now';
}

return new \DateTime($date, false !== $timezone ? $timezone : $env->getExtension(self::class)->getTimezone());
return new \DateTimeImmutable($date, false !== $timezone ? $timezone : $env->getExtension(self::class)->getTimezone());
}

$asString = (string) $date;
if (ctype_digit($asString) || (!empty($asString) && '-' === $asString[0] && ctype_digit(substr($asString, 1)))) {
$date = new \DateTime('@'.$date);
$date = new \DateTimeImmutable('@'.$date);
} else {
$date = new \DateTime($date, $env->getExtension(self::class)->getTimezone());
$date = new \DateTimeImmutable($date, $env->getExtension(self::class)->getTimezone());
}

if (false !== $timezone) {
$date->setTimezone($timezone);
return $date->setTimezone($timezone);
}

return $date;
Expand Down

0 comments on commit ffa55e8

Please sign in to comment.