Skip to content

Fix for #2609 #2614

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
fabpot merged 2 commits into from
Nov 11, 2011
Merged

Fix for #2609 #2614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8351a11
Added check for array fields to be integers in reverseTransform metho…
ondrowan Nov 11, 2011
2582fcb
Added tests for string fix in DateTimeToArrayTransformer (8351a112861…
ondrowan Nov 11, 2011
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
4 changes: 4 additions & 0 deletions src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToArrayTransformer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,10 @@ public function reverseTransform($value)
));
}

if (preg_match( '/^\d*$/', $value['month'] . $value['day'] . $value['year']) === 0) {
throw new TransformationFailedException('This is an invalid date');
}

if (!empty($value['month']) && !empty($value['day']) && !empty($value['year']) && false === checkdate($value['month'], $value['day'], $value['year'])) {
throw new TransformationFailedException('This is an invalid date');
}
Expand Down
48 changes: 48 additions & 0 deletions ...ny/Tests/Component/Form/Extension/Core/DataTransformer/DateTimeToArrayTransformerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,4 +463,52 @@ public function testReverseTransformWithInvalidDay()
'second' => '6',
));
}

/**
* @expectedException Symfony\Component\Form\Exception\TransformationFailedException
*/
public function testReverseTransformWithStringDay()
{
$transformer = new DateTimeToArrayTransformer();
$transformer->reverseTransform(array(
'year' => '2010',
'month' => '2',
'day' => 'bazinga',
'hour' => '4',
'minute' => '5',
'second' => '6',
));
}

/**
* @expectedException Symfony\Component\Form\Exception\TransformationFailedException
*/
public function testReverseTransformWithStringMonth()
{
$transformer = new DateTimeToArrayTransformer();
$transformer->reverseTransform(array(
'year' => '2010',
'month' => 'bazinga',
'day' => '31',
'hour' => '4',
'minute' => '5',
'second' => '6',
));
}

/**
* @expectedException Symfony\Component\Form\Exception\TransformationFailedException
*/
public function testReverseTransformWithStringYear()
{
$transformer = new DateTimeToArrayTransformer();
$transformer->reverseTransform(array(
'year' => 'bazinga',
'month' => '2',
'day' => '31',
'hour' => '4',
'minute' => '5',
'second' => '6',
));
}
}