RetailCRM-Mirror/NelmioApiDocBundle
1
0
Fork 0
mirror of https://github.com/retailcrm/NelmioApiDocBundle.git synced 2025-02-02 15:51:48 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #641 from Soullivaneuh/configure-options

Browse Source 
Fix deprecated FormType::setDefaultOptions usage
This commit is contained in:
William Durand 2015-06-11 13:51:25 +02:00
commit c7909c576e
6 changed files with 63 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Form/Extension/DescriptionFormTypeExtension.php
View File

@ -46,6 +46,9 @@ class DescriptionFormTypeExtension extends AbstractTypeExtension
$this->configureOptions($resolver); $this->configureOptions($resolver);
} }
/**
* {@inheritdoc}
*/
public function configureOptions(OptionsResolver $resolver) public function configureOptions(OptionsResolver $resolver)
{ {
$resolver->setDefaults(array( $resolver->setDefaults(array(

13
Tests/Fixtures/Form/DependencyType.php
View File

@ -13,6 +13,7 @@ namespace Nelmio\ApiDocBundle\Tests\Fixtures\Form;
use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
use Symfony\Component\OptionsResolver\OptionsResolverInterface; use Symfony\Component\OptionsResolver\OptionsResolverInterface;
class DependencyType extends AbstractType class DependencyType extends AbstractType
@ -32,9 +33,19 @@ class DependencyType extends AbstractType
} }
/** /**
* {@inheritdoc} * {@inheritdoc}
*
* @deprecated Remove it when bumping requirements to Symfony 2.7+
*/ */
public function setDefaultOptions(OptionsResolverInterface $resolver) public function setDefaultOptions(OptionsResolverInterface $resolver)
{
$this->configureOptions($resolver);
}
/**
* {@inheritdoc}
*/
public function configureOptions(OptionsResolver $resolver)
{ {
$resolver->setDefaults(array( $resolver->setDefaults(array(
'data_class' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\Test', 'data_class' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\Test',

14
Tests/Fixtures/Form/EntityType.php
View File

@ -14,15 +14,25 @@ namespace Nelmio\ApiDocBundle\Tests\Fixtures\Form;
use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Extension\Core\ChoiceList\SimpleChoiceList; use Symfony\Component\Form\Extension\Core\ChoiceList\SimpleChoiceList;
use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
use Symfony\Component\OptionsResolver\OptionsResolverInterface; use Symfony\Component\OptionsResolver\OptionsResolverInterface;
class EntityType extends AbstractType class EntityType extends AbstractType
{ {
/** /**
* {@inheritdoc} * {@inheritdoc}
*
* @deprecated Remove it when bumping requirements to Symfony 2.7+
*/ */
public function setDefaultOptions(OptionsResolverInterface $resolver) public function setDefaultOptions(OptionsResolverInterface $resolver)
{
$this->configureOptions($resolver);
}
/**
* {@inheritdoc}
*/
public function configureOptions(OptionsResolver $resolver)
{ {
$resolver->setDefaults(array( $resolver->setDefaults(array(
'data_class' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\EntityTest', 'data_class' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\EntityTest',

13
Tests/Fixtures/Form/ImprovedTestType.php
View File

@ -5,6 +5,7 @@ namespace Nelmio\ApiDocBundle\Tests\Fixtures\Form;
use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Extension\Core\ChoiceList\SimpleChoiceList; use Symfony\Component\Form\Extension\Core\ChoiceList\SimpleChoiceList;
use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
use Symfony\Component\OptionsResolver\OptionsResolverInterface; use Symfony\Component\OptionsResolver\OptionsResolverInterface;
class ImprovedTestType extends AbstractType class ImprovedTestType extends AbstractType
@ -31,9 +32,19 @@ class ImprovedTestType extends AbstractType
} }
/** /**
* {@inheritdoc} * {@inheritdoc}
*
* @deprecated Remove it when bumping requirements to Symfony 2.7+
*/ */
public function setDefaultOptions(OptionsResolverInterface $resolver) public function setDefaultOptions(OptionsResolverInterface $resolver)
{
$this->configureOptions($resolver);
}
/**
* {@inheritdoc}
*/
public function configureOptions(OptionsResolver $resolver)
{ {
$resolver->setDefaults(array( $resolver->setDefaults(array(
'data_class' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\ImprovedTest', 'data_class' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\ImprovedTest',

13
Tests/Fixtures/Form/RequireConstructionType.php
View File

@ -13,6 +13,7 @@ namespace Nelmio\ApiDocBundle\Tests\Fixtures\Form;
use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
use Symfony\Component\OptionsResolver\OptionsResolverInterface; use Symfony\Component\OptionsResolver\OptionsResolverInterface;
class RequireConstructionType extends AbstractType class RequireConstructionType extends AbstractType
@ -38,9 +39,19 @@ class RequireConstructionType extends AbstractType
} }
/** /**
* {@inheritdoc} * {@inheritdoc}
*
* @deprecated Remove it when bumping requirements to Symfony 2.7+
*/ */
public function setDefaultOptions(OptionsResolverInterface $resolver) public function setDefaultOptions(OptionsResolverInterface $resolver)
{
$this->configureOptions($resolver);
}
/**
* {@inheritdoc}
*/
public function configureOptions(OptionsResolver $resolver)
{ {
$resolver->setDefaults(array( $resolver->setDefaults(array(
'data_class' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\Test', 'data_class' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\Test',

13
Tests/Fixtures/Form/TestType.php
View File

@ -13,6 +13,7 @@ namespace Nelmio\ApiDocBundle\Tests\Fixtures\Form;
use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
use Symfony\Component\OptionsResolver\OptionsResolverInterface; use Symfony\Component\OptionsResolver\OptionsResolverInterface;
class TestType extends AbstractType class TestType extends AbstractType
@ -31,9 +32,19 @@ class TestType extends AbstractType
} }
/** /**
* {@inheritdoc} * {@inheritdoc}
*
* @deprecated Remove it when bumping requirements to Symfony 2.7+
*/ */
public function setDefaultOptions(OptionsResolverInterface $resolver) public function setDefaultOptions(OptionsResolverInterface $resolver)
{
$this->configureOptions($resolver);
}
/**
* {@inheritdoc}
*/
public function configureOptions(OptionsResolver $resolver)
{ {
$resolver->setDefaults(array( $resolver->setDefaults(array(
'data_class' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\Test', 'data_class' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\Test',