diff --git a/Form/Core/Type/CaptchaType.php b/Form/Core/Type/CaptchaType.php
index be3500a6..654db58c 100644
--- a/Form/Core/Type/CaptchaType.php
+++ b/Form/Core/Type/CaptchaType.php
@@ -15,7 +15,7 @@
 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;
 
 use Genemu\Bundle\FormBundle\Gd\Type\Captcha;
 use Genemu\Bundle\FormBundle\Form\Core\Validator\CaptchaValidator;
@@ -73,7 +73,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
     /**
      * {@inheritdoc}
      */
-    public function setDefaultOptions(OptionsResolver $resolver)
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
         $defaults = array_merge(
             array('attr' => array('autocomplete' => 'off')),
diff --git a/Form/Core/Type/PlainType.php b/Form/Core/Type/PlainType.php
index 3138f2e1..81c7af5c 100644
--- a/Form/Core/Type/PlainType.php
+++ b/Form/Core/Type/PlainType.php
@@ -6,7 +6,7 @@
 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\Form\Extension\Core\Type\DateType;
 
@@ -21,7 +21,7 @@ class PlainType extends AbstractType
     /**
      * {@inheritdoc}
      */
-    public function setDefaultOptions(OptionsResolver $resolver)
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
         $resolver->setDefaults(array(
             'widget'  => 'field',
diff --git a/Form/Core/Type/ReCaptchaType.php b/Form/Core/Type/ReCaptchaType.php
index 39b4a1dd..e32f298a 100644
--- a/Form/Core/Type/ReCaptchaType.php
+++ b/Form/Core/Type/ReCaptchaType.php
@@ -18,7 +18,7 @@
 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
@@ -80,7 +80,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
     /**
      * {@inheritdoc}
      */
-    public function setDefaultOptions(OptionsResolver $resolver)
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
         $configs = array_merge(array(
             'lang' => \Locale::getDefault(),
diff --git a/Form/Core/Type/TinymceType.php b/Form/Core/Type/TinymceType.php
index 0b3cc543..dfd8cd03 100644
--- a/Form/Core/Type/TinymceType.php
+++ b/Form/Core/Type/TinymceType.php
@@ -15,7 +15,7 @@
 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
@@ -47,7 +47,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
     /**
      * {@inheritdoc}
      */
-    public function setDefaultOptions(OptionsResolver $resolver)
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
         $configs = array_merge(array(
             'language' => \Locale::getDefault(),
diff --git a/Form/Doctrine/Type/AjaxDocumentType.php b/Form/Doctrine/Type/AjaxDocumentType.php
index fd9bff30..c97d7803 100644
--- a/Form/Doctrine/Type/AjaxDocumentType.php
+++ b/Form/Doctrine/Type/AjaxDocumentType.php
@@ -15,7 +15,7 @@
 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
@@ -39,7 +39,7 @@ public function __construct(ManagerRegistry $registry)
         /**
      * {@inheritdoc}
      */
-    public function setDefaultOptions(OptionsResolver $resolver)
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
         $resolver->setDefaults(array(
             'document_manager' => null,
diff --git a/Form/Doctrine/Type/AjaxEntityType.php b/Form/Doctrine/Type/AjaxEntityType.php
index 7f48e9b8..ef49fd89 100644
--- a/Form/Doctrine/Type/AjaxEntityType.php
+++ b/Form/Doctrine/Type/AjaxEntityType.php
@@ -13,7 +13,7 @@
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\OptionsResolver\Options;
-use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 use Doctrine\Common\Persistence\ManagerRegistry;
 
@@ -41,7 +41,7 @@ public function __construct(ManagerRegistry $registry)
     /**
      * {@inheritdoc}
      */
-    public function setDefaultOptions(OptionsResolver $resolver)
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
         $registry = $this->registry;
 
diff --git a/Form/JQuery/Type/AutocompleteType.php b/Form/JQuery/Type/AutocompleteType.php
index 43537719..a9b7731d 100644
--- a/Form/JQuery/Type/AutocompleteType.php
+++ b/Form/JQuery/Type/AutocompleteType.php
@@ -17,7 +17,7 @@
 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;
 
@@ -59,7 +59,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
     /**
      * {@inheritdoc}
      */
-    public function setDefaultOptions(OptionsResolver $resolver)
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
         $type = $this->type;
         $registry = $this->registry;
diff --git a/Form/JQuery/Type/AutocompleterType.php b/Form/JQuery/Type/AutocompleterType.php
index 11b85431..12e7945c 100644
--- a/Form/JQuery/Type/AutocompleterType.php
+++ b/Form/JQuery/Type/AutocompleterType.php
@@ -16,7 +16,7 @@
 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;
 
 use Genemu\Bundle\FormBundle\Form\Core\ChoiceList\AjaxSimpleChoiceList;
 use Genemu\Bundle\FormBundle\Form\Core\DataTransformer\ChoiceToJsonTransformer;
@@ -82,7 +82,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
     /**
      * {@inheritdoc}
      */
-    public function setDefaultOptions(OptionsResolver $resolver)
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
         $widget = $this->widget;
 
diff --git a/Form/JQuery/Type/ChosenType.php b/Form/JQuery/Type/ChosenType.php
index 15abb45f..cfa43da7 100644
--- a/Form/JQuery/Type/ChosenType.php
+++ b/Form/JQuery/Type/ChosenType.php
@@ -15,7 +15,7 @@
 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
@@ -53,7 +53,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
     /**
      * {@inheritdoc}
      */
-    public function setDefaultOptions(OptionsResolver $resolver)
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
         $resolver
             ->setDefaults(array(
diff --git a/Form/JQuery/Type/ColorType.php b/Form/JQuery/Type/ColorType.php
index cd4949bf..236a2bcc 100644
--- a/Form/JQuery/Type/ColorType.php
+++ b/Form/JQuery/Type/ColorType.php
@@ -15,7 +15,7 @@
 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
@@ -36,7 +36,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
     /**
      * {@inheritdoc}
      */
-    public function setDefaultOptions(OptionsResolver $resolver)
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
         $resolver
             ->setDefaults(array(
diff --git a/Form/JQuery/Type/DateType.php b/Form/JQuery/Type/DateType.php
index 248637be..f16dee2b 100644
--- a/Form/JQuery/Type/DateType.php
+++ b/Form/JQuery/Type/DateType.php
@@ -15,7 +15,7 @@
 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\Form\Extension\Core\Type\DateType as BaseDateType;
 
 /**
@@ -76,7 +76,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
     /**
      * {@inheritdoc}
      */
-    public function setDefaultOptions(OptionsResolver $resolver)
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
         $configs = $this->options;
 
diff --git a/Form/JQuery/Type/FileType.php b/Form/JQuery/Type/FileType.php
index 47d393ed..b0771dfc 100644
--- a/Form/JQuery/Type/FileType.php
+++ b/Form/JQuery/Type/FileType.php
@@ -17,7 +17,7 @@
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\HttpFoundation\File\File;
 use Symfony\Component\OptionsResolver\Options;
-use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 use Genemu\Bundle\FormBundle\Form\Core\EventListener\FileListener;
 use Genemu\Bundle\FormBundle\Form\JQuery\DataTransformer\FileToValueTransformer;
@@ -75,7 +75,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
     /**
      * {@inheritdoc}
      */
-    public function setDefaultOptions(OptionsResolver $resolver)
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
         $configs = $this->options;
 
diff --git a/Form/JQuery/Type/GeolocationType.php b/Form/JQuery/Type/GeolocationType.php
index 5fabe346..9e9fa80d 100644
--- a/Form/JQuery/Type/GeolocationType.php
+++ b/Form/JQuery/Type/GeolocationType.php
@@ -15,7 +15,7 @@
 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;
 
 use Genemu\Bundle\FormBundle\Form\Core\EventListener\GeolocationListener;
 
@@ -65,7 +65,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
     /**
      * {@inheritdoc}
      */
-    public function setDefaultOptions(OptionsResolver $resolver)
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
         $resolver->setDefaults(array(
             'map' => false,
diff --git a/Form/JQuery/Type/ImageType.php b/Form/JQuery/Type/ImageType.php
index 8c7340be..3de3bea7 100644
--- a/Form/JQuery/Type/ImageType.php
+++ b/Form/JQuery/Type/ImageType.php
@@ -14,7 +14,7 @@
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormView;
 use Symfony\Component\Form\FormInterface;
-use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 use Genemu\Bundle\FormBundle\Gd\File\Image;
 
@@ -82,7 +82,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
     /**
      * {@inheritdoc}
      */
-    public function setDefaultOptions(OptionsResolver $resolver)
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
         $resolver->setDefaults(array(
             'configs' => array(
diff --git a/Form/JQuery/Type/RatingType.php b/Form/JQuery/Type/RatingType.php
index 045cf25c..01d0dd30 100644
--- a/Form/JQuery/Type/RatingType.php
+++ b/Form/JQuery/Type/RatingType.php
@@ -16,7 +16,7 @@
 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;
 
 /**
  * RatingType
@@ -48,7 +48,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
     /**
      * {@inheritdoc}
      */
-    public function setDefaultOptions(OptionsResolver $resolver)
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
         $resolver->setDefaults(array(
             'number' => 5,
diff --git a/Form/JQuery/Type/Select2Type.php b/Form/JQuery/Type/Select2Type.php
index bf74c392..595a31ce 100644
--- a/Form/JQuery/Type/Select2Type.php
+++ b/Form/JQuery/Type/Select2Type.php
@@ -16,7 +16,7 @@
 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;
 use Symfony\Component\OptionsResolver\Options;
 
 /**
@@ -68,7 +68,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
     /**
      * {@inheritdoc}
      */
-    public function setDefaultOptions(OptionsResolver $resolver)
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
         $defaults = $this->configs;
         $resolver
diff --git a/Form/JQuery/Type/SliderType.php b/Form/JQuery/Type/SliderType.php
index ef61e824..7fc677a4 100644
--- a/Form/JQuery/Type/SliderType.php
+++ b/Form/JQuery/Type/SliderType.php
@@ -14,7 +14,7 @@
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormView;
-use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
  * SliderType
@@ -31,7 +31,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
         $view->vars['configs'] = $options;
     }
 
-    public function setDefaultOptions(OptionsResolver $resolver)
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
         $resolver->setDefaults(array(
             'min' => 0,
diff --git a/Form/JQuery/Type/TokeninputType.php b/Form/JQuery/Type/TokeninputType.php
index a5bb19e5..cf87b9ca 100644
--- a/Form/JQuery/Type/TokeninputType.php
+++ b/Form/JQuery/Type/TokeninputType.php
@@ -16,7 +16,7 @@
 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;
 
 use Genemu\Bundle\FormBundle\Form\Core\ChoiceList\AjaxSimpleChoiceList;
 use Genemu\Bundle\FormBundle\Form\Core\DataTransformer\ChoiceToJsonTransformer;
@@ -90,7 +90,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
     /**
      * {@inheritdoc}
      */
-    public function setDefaultOptions(OptionsResolver $resolver)
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
         $widget = $this->widget;
 
diff --git a/Form/Model/Type/AjaxModelType.php b/Form/Model/Type/AjaxModelType.php
index a46d4d41..bc2fa892 100644
--- a/Form/Model/Type/AjaxModelType.php
+++ b/Form/Model/Type/AjaxModelType.php
@@ -13,7 +13,7 @@
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\OptionsResolver\Options;
-use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 use Genemu\Bundle\FormBundle\Form\Model\ChoiceList\AjaxModelChoiceList;
 
@@ -27,7 +27,7 @@ class AjaxModelType extends AbstractType
     /**
      * {@inheritdoc}
      */
-    public function setDefaultOptions(OptionsResolver $resolver)
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
         $resolver->setDefaults(array(
             'template'          => 'choice',