Skip to content

Commit

Permalink
Revert OptionsResolverInterface
Browse files Browse the repository at this point in the history
  • Loading branch information
genemu committed Dec 14, 2014
1 parent 803194d commit 99678a4
Show file tree
Hide file tree
Showing 19 changed files with 38 additions and 38 deletions.
4 changes: 2 additions & 2 deletions Form/Core/Type/CaptchaType.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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')),
Expand Down
4 changes: 2 additions & 2 deletions Form/Core/Type/PlainType.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -21,7 +21,7 @@ class PlainType extends AbstractType
/**
* {@inheritdoc}
*/
public function setDefaultOptions(OptionsResolver $resolver)
public function setDefaultOptions(OptionsResolverInterface $resolver)
{
$resolver->setDefaults(array(
'widget' => 'field',
Expand Down
4 changes: 2 additions & 2 deletions Form/Core/Type/ReCaptchaType.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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(),
Expand Down
4 changes: 2 additions & 2 deletions Form/Core/Type/TinymceType.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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(),
Expand Down
4 changes: 2 additions & 2 deletions Form/Doctrine/Type/AjaxDocumentType.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions Form/Doctrine/Type/AjaxEntityType.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -41,7 +41,7 @@ public function __construct(ManagerRegistry $registry)
/**
* {@inheritdoc}
*/
public function setDefaultOptions(OptionsResolver $resolver)
public function setDefaultOptions(OptionsResolverInterface $resolver)
{
$registry = $this->registry;

Expand Down
4 changes: 2 additions & 2 deletions Form/JQuery/Type/AutocompleteType.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions Form/JQuery/Type/AutocompleterType.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions Form/JQuery/Type/ChosenType.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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(
Expand Down
4 changes: 2 additions & 2 deletions Form/JQuery/Type/ColorType.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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(
Expand Down
4 changes: 2 additions & 2 deletions Form/JQuery/Type/DateType.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions Form/JQuery/Type/FileType.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions Form/JQuery/Type/GeolocationType.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions Form/JQuery/Type/ImageType.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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(
Expand Down
4 changes: 2 additions & 2 deletions Form/JQuery/Type/RatingType.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions Form/JQuery/Type/Select2Type.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Form/JQuery/Type/SliderType.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions Form/JQuery/Type/TokeninputType.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions Form/Model/Type/AjaxModelType.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -27,7 +27,7 @@ class AjaxModelType extends AbstractType
/**
* {@inheritdoc}
*/
public function setDefaultOptions(OptionsResolver $resolver)
public function setDefaultOptions(OptionsResolverInterface $resolver)
{
$resolver->setDefaults(array(
'template' => 'choice',
Expand Down

0 comments on commit 99678a4

Please sign in to comment.