diff --git a/Form/Type/BootstrapCollectionType.php b/Form/Type/BootstrapCollectionType.php index da33edc..e71215a 100644 --- a/Form/Type/BootstrapCollectionType.php +++ b/Form/Type/BootstrapCollectionType.php @@ -10,7 +10,7 @@ use Symfony\Component\Form\FormView; use Symfony\Component\Form\FormInterface; use Symfony\Component\OptionsResolver\Options; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; +use Symfony\Component\OptionsResolver\OptionsResolver; /** * BootstrapCollectionType @@ -54,7 +54,7 @@ public function buildView(FormView $view, FormInterface $form, array $options) /** * {@inheritDoc} */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $optionsNormalizer = function (Options $options, $value) { // @codeCoverageIgnoreStart @@ -77,7 +77,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver) 'options' => array(), )); - $resolver->setNormalizers(array('options' => $optionsNormalizer)); + $resolver->setNormalizer('options', $optionsNormalizer); } /** diff --git a/Form/Type/FormActionsType.php b/Form/Type/FormActionsType.php index 6e76207..80821ec 100644 --- a/Form/Type/FormActionsType.php +++ b/Form/Type/FormActionsType.php @@ -8,7 +8,7 @@ use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\FormInterface; use Symfony\Component\Form\FormView; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; +use Symfony\Component\OptionsResolver\OptionsResolver; /** * Class FormActionsType @@ -80,7 +80,7 @@ protected function validateButton(FormInterface $field) /** * {@inheritdoc} */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults(array( 'buttons' => array(), diff --git a/Form/Type/FormStaticControlType.php b/Form/Type/FormStaticControlType.php index 2f19a6c..0039b07 100644 --- a/Form/Type/FormStaticControlType.php +++ b/Form/Type/FormStaticControlType.php @@ -6,7 +6,7 @@ namespace Braincrafted\Bundle\BootstrapBundle\Form\Type; use Symfony\Component\Form\AbstractType; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; +use Symfony\Component\OptionsResolver\OptionsResolver; /** * FormStaticControlType @@ -23,7 +23,7 @@ class FormStaticControlType extends AbstractType /** * {@inheritdoc} */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults(array( //'mapped' => false, diff --git a/Tests/Form/Type/BootstrapCollectionTypeTest.php b/Tests/Form/Type/BootstrapCollectionTypeTest.php index a66d929..31d0134 100644 --- a/Tests/Form/Type/BootstrapCollectionTypeTest.php +++ b/Tests/Form/Type/BootstrapCollectionTypeTest.php @@ -50,15 +50,15 @@ public function testBuildView() } /** - * @covers Braincrafted\Bundle\BootstrapBundle\Form\Type\BootstrapCollectionType::setDefaultOptions() + * @covers Braincrafted\Bundle\BootstrapBundle\Form\Type\BootstrapCollectionType::configureOptions() */ - public function testSetDefaultOptions() + public function testConfigureOptions() { - $resolver = m::mock('Symfony\Component\OptionsResolver\OptionsResolverInterface'); + $resolver = m::mock('Symfony\Component\OptionsResolver\OptionsResolver'); $resolver->shouldReceive('setDefaults'); - $resolver->shouldReceive('setNormalizers'); + $resolver->shouldReceive('setNormalizer'); - $this->type->setDefaultOptions($resolver); + $this->type->configureOptions($resolver); } /** diff --git a/Tests/Form/Type/FormActionsTypeTest.php b/Tests/Form/Type/FormActionsTypeTest.php index 9103b8d..68758bf 100644 --- a/Tests/Form/Type/FormActionsTypeTest.php +++ b/Tests/Form/Type/FormActionsTypeTest.php @@ -90,7 +90,7 @@ public function testBuildViewWithBadField() $this->type->buildView($view, $form, $options); } - public function testSetDefaultOptions() + public function testConfigureOptions() { $defaults = array( @@ -99,10 +99,10 @@ public function testSetDefaultOptions() 'mapped' => false, ); - $resolver = m::mock('Symfony\Component\OptionsResolver\OptionsResolverInterface'); + $resolver = m::mock('Symfony\Component\OptionsResolver\OptionsResolver'); $resolver->shouldReceive('setDefaults')->with($defaults)->once(); - $this->type->setDefaultOptions($resolver); + $this->type->configureOptions($resolver); } public function testGetName()