Merge pull request #375 from assimtech/symfony26

#374 Upgrade to symfony 2.6 compatible form extensions

Author: Florian Eckerstorfer

Form/Extension/ButtonTypeExtension.php

@@ -3,7 +3,7 @@
 namespace Braincrafted\Bundle\BootstrapBundle\Form\Extension;
 
 use Symfony\Component\Form\AbstractTypeExtension;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Form\FormView;
 use Symfony\Component\Form\FormInterface;
 
@@ -29,11 +29,13 @@ public function buildView(FormView $view, FormInterface $form, array $options)
     }
 
     /**
+     * Add the button_class option
+     * Add the as_link option
      * {@inheritdoc}
      */
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    public function configureOptions(OptionsResolver $resolver)
     {
-        $resolver->setOptional(array('button_class', 'as_link'));
+        $resolver->setDefined(array('button_class', 'as_link'));
     }
 
     /**

Form/Extension/StaticControlExtension.php

@@ -3,7 +3,7 @@
 namespace Braincrafted\Bundle\BootstrapBundle\Form\Extension;
 
 use Symfony\Component\Form\AbstractTypeExtension;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Form\FormView;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -29,11 +29,12 @@ public function buildView(FormView $view, FormInterface $form, array $options)
     }
 
     /**
+     * Add the static_control option
      * {@inheritdoc}
      */
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    public function configureOptions(OptionsResolver $resolver)
     {
-        $resolver->setOptional(array('static_control'));
+        $resolver->setDefined(array('static_control'));
     }
 
     /**

Tests/Form/Extension/InputGroupButtonExtensionTest.php

@@ -65,7 +65,7 @@ public function testBuildView()
     }
 
     /**
-     * @covers Braincrafted\Bundle\BootstrapBundle\Form\Extension\InputGroupBtnExtension::buildForm()
+     * @covers Braincrafted\Bundle\BootstrapBundle\Form\Extension\InputGroupButtonExtension::buildForm()
      * @dataProvider provideForform
      */
     public function testBuildForm($options)
@@ -121,7 +121,7 @@ public function provideForForm()
     }
 
     /**
-     * @covers Braincrafted\Bundle\BootstrapBundle\Form\Extension\InputGroupBtnExtension::getExtendedType()
+     * @covers Braincrafted\Bundle\BootstrapBundle\Form\Extension\InputGroupButtonExtension::getExtendedType()
      */
     public function testGetExtendedType()
     {

composer.json

@@ -13,14 +13,14 @@
     ],
     "require":      {
         "php":                      ">=5.3.3",
-        "symfony/framework-bundle": "~2.3",
-        "symfony/twig-bundle":      "~2.3",
-        "symfony/form":             "~2.3",
-        "symfony/console":          "~2.3",
-        "symfony/finder":           "~2.3"
+        "symfony/framework-bundle": "~2.6",
+        "symfony/twig-bundle":      "~2.6",
+        "symfony/form":             "~2.6",
+        "symfony/console":          "~2.6",
+        "symfony/finder":           "~2.6"
     },
     "require-dev": {
-        "symfony/assetic-bundle":       "~2.3",
+        "symfony/assetic-bundle":       "~2.6",
         "knplabs/knp-menu":             "~2.0@alpha",
         "knplabs/knp-menu-bundle":      "~2.0@alpha",
         "knplabs/knp-paginator-bundle": "dev-master",