Merge pull request #19 from Elao/sf3-compatibility

Add configureOptions and OptionsResolver (Sf3 compatible)
Elao · Nov 1, 2015 · 04289c8 · 04289c8
2 parents 8488795 + fa3ce43
commit 04289c8
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 3 deletions.
diff --git a/Form/Extension/ButtonTypeExtension.php b/Form/Extension/ButtonTypeExtension.php
@@ -10,6 +10,7 @@
 
 namespace Elao\Bundle\FormTranslationBundle\Form\Extension;
 
+use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
@@ -28,10 +29,18 @@ public function getExtendedType()
     /**
      * {@inheritdoc}
      */
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    public function configureOptions(OptionsResolver $resolver)
     {
         if ($this->autoGenerate) {
             $resolver->setDefault('label', true);
         }
     }
+
+    /**
+     * for Sf < 2.7
+     */
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    {
+        $this->configureOptions($resolver);
+    }
 }
diff --git a/Form/Extension/CollectionTypeExtension.php b/Form/Extension/CollectionTypeExtension.php
@@ -12,6 +12,7 @@
 
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormView;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
@@ -30,14 +31,22 @@ public function getExtendedType()
     /**
      * {@inheritdoc}
      */
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    public function configureOptions(OptionsResolver $resolver)
     {
         if ($this->autoGenerate) {
             $resolver->setDefault('label_add', true);
             $resolver->setDefault('label_delete', true);
         }
     }
 
+    /**
+     * for Sf < 2.7
+     */
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    {
+        $this->configureOptions($resolver);
+    }
+
     /**
      * {@inheritdoc}
      */

diff --git a/Form/Extension/FormTypeExtension.php b/Form/Extension/FormTypeExtension.php
@@ -10,6 +10,7 @@
 
 namespace Elao\Bundle\FormTranslationBundle\Form\Extension;
 
+use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
@@ -28,10 +29,18 @@ public function getExtendedType()
     /**
      * {@inheritdoc}
      */
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    public function configureOptions(OptionsResolver $resolver)
     {
         if ($this->autoGenerate) {
             $resolver->setDefault('label', true);
         }
     }
+
+    /**
+     * for Sf < 2.7
+     */
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    {
+        $this->configureOptions($resolver);
+    }
 }