Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[Form] Fix DateTimeType html5 input format #28372

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nicolas-grekas merged 3 commits into from
Sep 17, 2018
Merged

[Form] Fix DateTimeType html5 input format #28372

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
253d0a6
[Form] Fix DateTimeType html5 input format
franzwilding May 14, 2018
4f06f15
Add stricter checking for valid date time string
mcfedr Sep 15, 2018
e21a1a4
Added relevent links for parsing to the phpdoc
mcfedr Sep 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add stricter checking for valid date time string
  • Loading branch information
@mcfedr
mcfedr committed Sep 15, 2018
commit 4f06f1524d41497b5c07a302c2457410ece9a523
10 changes: 6 additions & 4 deletions ...Component/Form/Extension/Core/DataTransformer/DateTimeToHtml5DateTimeLocalTransformer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,10 @@ public function reverseTransform($dateTimeLocal)
return;
}

if (!preg_match('/^(\d{4})-(\d{2})-(\d{2})[T ]\d{2}:\d{2}(?::\d{2})?$/', $dateTimeLocal, $matches)) {
throw new TransformationFailedException(sprintf('The date "%s" is not a valid date.', $dateTimeLocal));
}

try {
$dateTime = new \DateTime($dateTimeLocal, new \DateTimeZone($this->outputTimezone));
Copy link
Member

@xabbuh xabbuh Sep 15, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should check the format of the submitted date first to avoid issues like #28455 (the approach could IMO be similar to what I propose in #28466).

Copy link
Contributor Author

@mcfedr mcfedr Sep 15, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense, I've added something similar here.

} catch (\Exception $e) {
Expand All @@ -86,10 +90,8 @@ public function reverseTransform($dateTimeLocal)
$dateTime->setTimezone(new \DateTimeZone($this->inputTimezone));
}

if (preg_match('/(\d{4})-(\d{2})-(\d{2})/', $dateTimeLocal, $m)) {
if (!checkdate($m[2], $m[3], $m[1])) {
throw new TransformationFailedException(sprintf('The date "%s-%s-%s" is not a valid date.', $m[1], $m[2], $m[3]));
}
if (!checkdate($matches[2], $matches[3], $matches[1])) {
throw new TransformationFailedException(sprintf('The date "%s-%s-%s" is not a valid date.', $matches[1], $matches[2], $matches[3]));
}

return $dateTime;
Expand Down