tonyair
/
silverstripe-framework
mirror of https://github.com/silverstripe/silverstripe-framework
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge f38931f0b3 into 9fc9d18c7a

This commit is contained in:
Thomas Portelange 2024-05-05 05:30:33 +12:00 committed by GitHub
parent 9fc9d18c7a f38931f0b3
commit b20ca5e75d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 37 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Forms/DateField.php
View File

@ -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;
}

14
src/Forms/DatetimeField.php
View File

@ -179,8 +179,8 @@ class DatetimeField extends TextField
* Assumes the value is in the defined {@link $timezone} (if one is set),
* and adjusts for server timezone.
*
* @param string $datetime
* @return string The formatted date, or null if not a valid date
* @param ?string $datetime
* @return ?string The formatted date, or null if not a valid date
*/
public function frontendToInternal($datetime)
{
@ -193,6 +193,16 @@ class DatetimeField extends TextField
// Try to parse time with seconds
$timestamp = $fromFormatter->parse($datetime);
// Retry with expanded value
if ($timestamp === false) {
$zeroFormat = $fromFormatter->format(strtotime(date('Y-01-01 00:00:00')));
$expectedLength = strlen($zeroFormat);
if (strlen($datetime) < $expectedLength) {
$expandedValue = $datetime . substr($zeroFormat, strlen($datetime));
$timestamp = $fromFormatter->parse($expandedValue);
}
}
// Try to parse time without seconds, since that's a valid HTML5 submission format
// See https://html.spec.whatwg.org/multipage/infrastructure.html#times
if ($timestamp === false && $this->getHTML5()) {

14
src/Forms/TimeField.php
View File

@ -388,8 +388,8 @@ class TimeField extends TextField
* Convert frontend time to the internal representation (ISO 8601).
* The frontend time is also in ISO 8601 when $html5=true.
*
* @param string $time
* @return string The formatted time, or null if not a valid time
* @param ?string $time
* @return ?string The formatted time, or null if not a valid time
*/
protected function frontendToInternal($time)
{
@ -400,6 +400,16 @@ class TimeField extends TextField
$toFormatter = $this->getInternalFormatter();
$timestamp = $fromFormatter->parse($time);
// Retry with expanded value
if ($timestamp === false) {
$zeroFormat = $fromFormatter->format(strtotime(date('Y-01-01 00:00:00')));
$expectedLength = strlen($zeroFormat);
if (strlen($time) < $expectedLength) {
$expandedValue = $time . substr($zeroFormat, strlen($time));
$timestamp = $fromFormatter->parse($expandedValue);
}
}
// Try to parse time without seconds, since that's a valid HTML5 submission format
// See https://html.spec.whatwg.org/multipage/infrastructure.html#times
if ($timestamp === false && $this->getHTML5()) {