This commit is contained in:
Fabien Potencier 2015-06-11 21:09:58 +02:00
parent 58fba34843
commit 7ac7ed85af
4 changed files with 6 additions and 4 deletions

View File

@ -46,8 +46,9 @@ abstract class AbstractType implements FormTypeInterface
public function setDefaultOptions(OptionsResolverInterface $resolver) public function setDefaultOptions(OptionsResolverInterface $resolver)
{ {
if (!$resolver instanceof OptionsResolver) { if (!$resolver instanceof OptionsResolver) {
throw new \InvalidArgumentException(sprintf('Custom resolver %s must extend Symfony\Component\OptionsResolver\OptionsResolver', get_class($resolver))); throw new \InvalidArgumentException(sprintf('Custom resolver "%s" must extend "Symfony\Component\OptionsResolver\OptionsResolver".', get_class($resolver)));
} }
$this->configureOptions($resolver); $this->configureOptions($resolver);
} }

View File

@ -46,8 +46,9 @@ abstract class AbstractTypeExtension implements FormTypeExtensionInterface
public function setDefaultOptions(OptionsResolverInterface $resolver) public function setDefaultOptions(OptionsResolverInterface $resolver)
{ {
if (!$resolver instanceof OptionsResolver) { if (!$resolver instanceof OptionsResolver) {
throw new \InvalidArgumentException(sprintf('Custom resolver %s must extend Symfony\Component\OptionsResolver\OptionsResolver', get_class($resolver))); throw new \InvalidArgumentException(sprintf('Custom resolver "%s" must extend "Symfony\Component\OptionsResolver\OptionsResolver".', get_class($resolver)));
} }
$this->configureOptions($resolver); $this->configureOptions($resolver);
} }

View File

@ -31,7 +31,7 @@ class AbstractExtensionTest extends \PHPUnit_Framework_TestCase
/** /**
* @expectedException \InvalidArgumentException * @expectedException \InvalidArgumentException
* @expectedExceptionMessage Custom resolver Symfony\Component\Form\Tests\Fixtures\CustomOptionsResolver must extend Symfony\Component\OptionsResolver\OptionsResolver * @expectedExceptionMessage Custom resolver "Symfony\Component\Form\Tests\Fixtures\CustomOptionsResolver" must extend "Symfony\Component\OptionsResolver\OptionsResolver".
*/ */
public function testCustomOptionsResolver() public function testCustomOptionsResolver()
{ {

View File

@ -1059,7 +1059,7 @@ class SimpleFormTest extends AbstractFormTest
/** /**
* @expectedException \InvalidArgumentException * @expectedException \InvalidArgumentException
* @expectedExceptionMessage Custom resolver Symfony\Component\Form\Tests\Fixtures\CustomOptionsResolver must extend Symfony\Component\OptionsResolver\OptionsResolver * @expectedExceptionMessage Custom resolver "Symfony\Component\Form\Tests\Fixtures\CustomOptionsResolver" must extend "Symfony\Component\OptionsResolver\OptionsResolver".
*/ */
public function testCustomOptionsResolver() public function testCustomOptionsResolver()
{ {