8000 [Form] Fix #11694 - Enforce options value type check in some form types by kix · Pull Request #11696 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[Form] Fix #11694 - Enforce options value type check in some form types #11696

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

Closed
wants to merge 5 commits into from
Closed

[Form] Fix #11694 - Enforce options value type check in some form types #11696

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b312a00
[Form] Fix #11694 - Enforce RepeatedType options value type check
kix Aug 18, 2014
66ab67c
[Form] Fix BirthdayType 'years' option to disallow non-array values
kix Aug 19, 2014
2ef8f26
[Form] Fix DateType 'years', 'months' and 'days' options to only acce…
kix Aug 19, 2014
de1786e
[Form] Fix TimeType 'hours', 'minutes' and 'seconds' options to allow…
kix Aug 19, 2014
d8284a3
[Form] Fix UrlType to allow only null/string values
kix Aug 19, 2014
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
Next Next commit
[Form] Fix #11694 - Enforce RepeatedType options value type check
  • Loading branch information
@kix
kix committed Aug 18, 2014
commit b312a004f3fd14e6e25a64a0d6c8dfacf2dcde99
6 changes: 6 additions & 0 deletions src/Symfony/Component/Form/Extension/Core/Type/RepeatedType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,12 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
'second_name' => 'second',
'error_bubbling' => false,
));

$resolver->setAllowedTypes(array(
'options' => 'array',
'first_options' => 'array',
'second_options' => 'array',
Copy link
Member

Choose a reason for hiding this comment

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

I would add it for options too

));
}

/**
Expand Down
33 changes: 33 additions & 0 deletions src/Symfony/Component/Form/Tests/Extension/Core/Type/RepeatedTypeTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,39 @@ public function testSetRequired()
$this->assertFalse($form['second']->isRequired());
}

/**
* @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
*/
public function testSetInvalidOptions()
{
$this->factory->create('repeated', null, array(
'type' => 'text',
'options' => 'bad value',
));
}

/**
* @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
*/
public function testSetInvalidFirstOptions()
{
$this->factory->create('repeated', null, array(
'type' => 'text',
'first_options' => 'bad value',
));
}

/**
* @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
*/
public function testSetInvalidSecondOptions()
{
$this->factory->create('repeated', null, array(
'type' => 'text',
'second_options' => 'bad value',
));
}

public function testSetErrorBubblingToTrue()
{
$form = $this->factory->create('repeated', null, array(
Expand Down
0