Fix deprecated forms setDefaultOptions method

genemu · Apr 20, 2015 · 6ecace0 · 6ecace0
1 parent 99678a4
commit 6ecace0
Show file tree

Hide file tree

Showing 19 changed files with 245 additions and 14 deletions.
diff --git a/Form/Core/Type/CaptchaType.php b/Form/Core/Type/CaptchaType.php
@@ -15,10 +15,12 @@
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormView;
 use Symfony\Component\Form\FormInterface;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
 
 use Genemu\Bundle\FormBundle\Gd\Type\Captcha;
 use Genemu\Bundle\FormBundle\Form\Core\Validator\CaptchaValidator;
+use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
  * CaptchaType
@@ -72,8 +74,18 @@ public function buildView(FormView $view, FormInterface $form, array $options)
 
     /**
      * {@inheritdoc}
+     *
+     * @todo Remove it when bumping requirements to SF 2.7+
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
+    {
+        $this->configureOptions($resolver);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function configureOptions(OptionsResolver $resolver)
     {
         $defaults = array_merge(
             array('attr' => array('autocomplete' => 'off')),

diff --git a/Form/Core/Type/PlainType.php b/Form/Core/Type/PlainType.php
@@ -6,9 +6,11 @@
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormView;
 use Symfony\Component\OptionsResolver\Options;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
 
 use Symfony\Component\Form\Extension\Core\Type\DateType;
+use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
  * A Form type that just renders the field as a p tag. This is useful for forms where certain field
@@ -20,8 +22,18 @@ class PlainType extends AbstractType
 {
     /**
      * {@inheritdoc}
+     *
+     * @todo Remove it when bumping requirements to SF 2.7+
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
+    {
+        $this->configureOptions($resolver);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults(array(
             'widget'  => 'field',

diff --git a/Form/Core/Type/ReCaptchaType.php b/Form/Core/Type/ReCaptchaType.php
@@ -18,8 +18,10 @@
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\Exception\FormException;
 use Symfony\Component\OptionsResolver\Options;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
+
 /**
  * ReCaptchaType
  *
@@ -79,8 +81,18 @@ public function buildView(FormView $view, FormInterface $form, array $options)
 
     /**
      * {@inheritdoc}
+     *
+     * @todo Remove it when bumping requirements to SF 2.7+
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
+    {
+        $this->configureOptions($resolver);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function configureOptions(OptionsResolver $resolver)
     {
         $configs = array_merge(array(
             'lang' => \Locale::getDefault(),

diff --git a/Form/Core/Type/TinymceType.php b/Form/Core/Type/TinymceType.php
@@ -15,8 +15,10 @@
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormView;
 use Symfony\Component\OptionsResolver\Options;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
+
 /**
  * TinymceType
  *
@@ -46,8 +48,18 @@ public function buildView(FormView $view, FormInterface $form, array $options)
 
     /**
      * {@inheritdoc}
+     *
+     * @todo Remove it when bumping requirements to SF 2.7+
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
+    {
+        $this->configureOptions($resolver);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function configureOptions(OptionsResolver $resolver)
     {
         $configs = array_merge(array(
             'language' => \Locale::getDefault(),

diff --git a/Form/Doctrine/Type/AjaxDocumentType.php b/Form/Doctrine/Type/AjaxDocumentType.php
@@ -15,8 +15,10 @@
 use Doctrine\Common\Persistence\ManagerRegistry;
 use Genemu\Bundle\FormBundle\Form\Doctrine\ChoiceList\AjaxEntityChoiceList;
 use Symfony\Component\OptionsResolver\Options;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
+
 /**
  * AjaxDocumentType
  *
@@ -36,10 +38,20 @@ public function __construct(ManagerRegistry $registry)
         $this->registry = $registry;
     }
 
-        /**
+    /**
      * {@inheritdoc}
+     *
+     * @todo Remove it when bumping requirements to SF 2.7+
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
+    {
+        $this->configureOptions($resolver);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults(array(
             'document_manager' => null,

diff --git a/Form/Doctrine/Type/AjaxEntityType.php b/Form/Doctrine/Type/AjaxEntityType.php
@@ -13,11 +13,13 @@
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\OptionsResolver\Options;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
 
 use Doctrine\Common\Persistence\ManagerRegistry;
 
 use Genemu\Bundle\FormBundle\Form\Doctrine\ChoiceList\AjaxEntityChoiceList;
+use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
  * AjaxEntityType
@@ -40,8 +42,18 @@ public function __construct(ManagerRegistry $registry)
 
     /**
      * {@inheritdoc}
+     *
+     * @todo Remove it when bumping requirements to SF 2.7+
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
+    {
+        $this->configureOptions($resolver);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function configureOptions(OptionsResolver $resolver)
     {
         $registry = $this->registry;
 

diff --git a/Form/JQuery/Type/AutocompleteType.php b/Form/JQuery/Type/AutocompleteType.php
@@ -17,6 +17,8 @@
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormView;
 use Symfony\Component\OptionsResolver\Options;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 use Symfony\Component\PropertyAccess\PropertyPath;
 use Symfony\Component\PropertyAccess\PropertyAccess;
@@ -58,8 +60,18 @@ public function buildView(FormView $view, FormInterface $form, array $options)
 
     /**
      * {@inheritdoc}
+     *
+     * @todo Remove it when bumping requirements to SF 2.7+
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
+    {
+        $this->configureOptions($resolver);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function configureOptions(OptionsResolver $resolver)
     {
         $type = $this->type;
         $registry = $this->registry;

diff --git a/Form/JQuery/Type/AutocompleterType.php b/Form/JQuery/Type/AutocompleterType.php
@@ -16,10 +16,12 @@
 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;
+
 
 use Genemu\Bundle\FormBundle\Form\Core\ChoiceList\AjaxSimpleChoiceList;
 use Genemu\Bundle\FormBundle\Form\Core\DataTransformer\ChoiceToJsonTransformer;
+use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
  * @author Olivier Chauvel <[email protected]>
@@ -81,8 +83,18 @@ public function buildView(FormView $view, FormInterface $form, array $options)
 
     /**
      * {@inheritdoc}
+     *
+     * @todo Remove it when bumping requirements to SF 2.7+
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
+    {
+        $this->configureOptions($resolver);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function configureOptions(OptionsResolver $resolver)
     {
         $widget = $this->widget;
 

diff --git a/Form/JQuery/Type/ChosenType.php b/Form/JQuery/Type/ChosenType.php
@@ -15,8 +15,10 @@
 use Symfony\Component\Form\FormView;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\OptionsResolver\Options;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
+
 /**
  * ChosenType to JQueryLib
  *
@@ -52,8 +54,18 @@ public function buildView(FormView $view, FormInterface $form, array $options)
 
     /**
      * {@inheritdoc}
+     *
+     * @todo Remove it when bumping requirements to SF 2.7+
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
+    {
+        $this->configureOptions($resolver);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function configureOptions(OptionsResolver $resolver)
     {
         $resolver
             ->setDefaults(array(

diff --git a/Form/JQuery/Type/ColorType.php b/Form/JQuery/Type/ColorType.php
@@ -15,8 +15,10 @@
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormView;
 use Symfony\Component\Form\FormInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
+
 /**
  * ColorType
  *
@@ -35,8 +37,18 @@ public function buildView(FormView $view, FormInterface $form, array $options)
 
     /**
      * {@inheritdoc}
+     *
+     * @todo Remove it when bumping requirements to SF 2.7+
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
+    {
+        $this->configureOptions($resolver);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function configureOptions(OptionsResolver $resolver)
     {
         $resolver
             ->setDefaults(array(

diff --git a/Form/JQuery/Type/DateType.php b/Form/JQuery/Type/DateType.php
@@ -15,8 +15,10 @@
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormView;
 use Symfony\Component\OptionsResolver\Options;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
 use Symfony\Component\Form\Extension\Core\Type\DateType as BaseDateType;
+use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
  * DateType
@@ -36,7 +38,7 @@ public function __construct(array $options)
     {
         $this->options = $options;
     }
-    
+
     /**
      * {@inheritdoc}
      */
@@ -75,8 +77,18 @@ public function buildView(FormView $view, FormInterface $form, array $options)
 
     /**
      * {@inheritdoc}
+     *
+     * @todo Remove it when bumping requirements to SF 2.7+
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
+    {
+        $this->configureOptions($resolver);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function configureOptions(OptionsResolver $resolver)
     {
         $configs = $this->options;
 

diff --git a/Form/JQuery/Type/FileType.php b/Form/JQuery/Type/FileType.php
@@ -17,10 +17,12 @@
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\HttpFoundation\File\File;
 use Symfony\Component\OptionsResolver\Options;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
 
 use Genemu\Bundle\FormBundle\Form\Core\EventListener\FileListener;
 use Genemu\Bundle\FormBundle\Form\JQuery\DataTransformer\FileToValueTransformer;
+use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
  * FileType
@@ -74,8 +76,18 @@ public function buildView(FormView $view, FormInterface $form, array $options)
 
     /**
      * {@inheritdoc}
+     *
+     * @todo Remove it when bumping requirements to SF 2.7+
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
+    {
+        $this->configureOptions($resolver);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function configureOptions(OptionsResolver $resolver)
     {
         $configs = $this->options;