From f38931f0b367c411a87830bb7ac7e8856ca4abea Mon Sep 17 00:00:00 2001 From: Thomas Portelange Date: Mon, 8 Apr 2024 17:11:46 +0200 Subject: [PATCH] add expanded values to dates --- src/Forms/DateField.php | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/Forms/DateField.php b/src/Forms/DateField.php index 880fa0827..83a695c4b 100644 --- a/src/Forms/DateField.php +++ b/src/Forms/DateField.php @@ -513,8 +513,8 @@ class DateField extends TextField * Convert frontend date to the internal representation (ISO 8601). * The frontend date is also in ISO 8601 when $html5=true. * - * @param string $date - * @return string The formatted date, or null if not a valid date + * @param ?string $date + * @return ?string The formatted date, or null if not a valid date */ protected function frontendToInternal($date) { @@ -524,6 +524,17 @@ class DateField extends TextField $fromFormatter = $this->getFrontendFormatter(); $toFormatter = $this->getInternalFormatter(); $timestamp = $fromFormatter->parse($date); + + // Retry with expanded value + if ($timestamp === false) { + $zeroFormat = $fromFormatter->format(strtotime(date('Y-01-01 00:00:00'))); + $expectedLength = strlen($zeroFormat); + if (strlen($date) < $expectedLength) { + $expandedValue = $date . substr($zeroFormat, strlen($date)); + $timestamp = $fromFormatter->parse($expandedValue); + } + } + if ($timestamp === false) { return null; }