deblan/propel-bundle
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

resolve deprecated function usages

Browse source
This commit is contained in:
Gregor Harlan 2015-08-06 19:02:55 +02:00 committed by Gregor Harlan
parent f9a87843f8
commit 002d4d9f2f
5 changed files with 36 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Form/BaseAbstractType.php
View file

@ -11,6 +11,7 @@
namespace Propel\PropelBundle\Form; namespace Propel\PropelBundle\Form;
use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\AbstractType;
use Symfony\Component\OptionsResolver\OptionsResolver;
use Symfony\Component\OptionsResolver\OptionsResolverInterface; use Symfony\Component\OptionsResolver\OptionsResolverInterface;
/** /**
@ -57,11 +58,17 @@ abstract class BaseAbstractType extends AbstractType
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public function setDefaultOptions(OptionsResolverInterface $resolver) public function configureOptions(OptionsResolver $resolver)
{ {
$resolver->setDefaults($this->options); $resolver->setDefaults($this->options);
} }
// BC for SF < 2.7
public function setDefaultOptions(OptionsResolverInterface $resolver)
{
$this->configureOptions($resolver);
}
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */

2
Form/PropelExtension.php
View file

@ -24,7 +24,7 @@ class PropelExtension extends AbstractExtension
protected function loadTypes() protected function loadTypes()
{ {
return array( return array(
new Type\ModelType(PropertyAccess::getPropertyAccessor()), new Type\ModelType(PropertyAccess::createPropertyAccessor()),
new Type\TranslationCollectionType(), new Type\TranslationCollectionType(),
new Type\TranslationType() new Type\TranslationType()
); );

11
Form/Type/ModelType.php
View file

@ -16,6 +16,7 @@ use Propel\PropelBundle\Form\DataTransformer\CollectionToArrayTransformer;
use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\Options; use Symfony\Component\OptionsResolver\Options;
use Symfony\Component\OptionsResolver\OptionsResolver;
use Symfony\Component\OptionsResolver\OptionsResolverInterface; use Symfony\Component\OptionsResolver\OptionsResolverInterface;
use Symfony\Component\PropertyAccess\PropertyAccess; use Symfony\Component\PropertyAccess\PropertyAccess;
use Symfony\Component\PropertyAccess\PropertyAccessorInterface; use Symfony\Component\PropertyAccess\PropertyAccessorInterface;
@ -57,7 +58,7 @@ class ModelType extends AbstractType
public function __construct(PropertyAccessorInterface $propertyAccessor = null) public function __construct(PropertyAccessorInterface $propertyAccessor = null)
{ {
$this->propertyAccessor = $propertyAccessor ?: PropertyAccess::getPropertyAccessor(); $this->propertyAccessor = $propertyAccessor ?: PropertyAccess::createPropertyAccessor();
} }
public function buildForm(FormBuilderInterface $builder, array $options) public function buildForm(FormBuilderInterface $builder, array $options)
@ -67,7 +68,7 @@ class ModelType extends AbstractType
} }
} }
public function setDefaultOptions(OptionsResolverInterface $resolver) public function configureOptions(OptionsResolver $resolver)
{ {
$propertyAccessor = $this->propertyAccessor; $propertyAccessor = $this->propertyAccessor;
@ -100,6 +101,12 @@ class ModelType extends AbstractType
)); ));
} }
// BC for SF < 2.7
public function setDefaultOptions(OptionsResolverInterface $resolver)
{
$this->configureOptions($resolver);
}
public function getParent() public function getParent()
{ {
return 'choice'; return 'choice';

11
Form/Type/TranslationCollectionType.php
View file

@ -14,8 +14,9 @@ namespace Propel\PropelBundle\Form\Type;
use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\AbstractType;
use Symfony\Component\OptionsResolver\Exception\MissingOptionsException; use Symfony\Component\OptionsResolver\Exception\MissingOptionsException;
use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolverInterface; use Symfony\Component\OptionsResolver\OptionsResolver;
use Propel\PropelBundle\Form\EventListener\TranslationCollectionFormListener; use Propel\PropelBundle\Form\EventListener\TranslationCollectionFormListener;
use Symfony\Component\OptionsResolver\OptionsResolverInterface;
/** /**
* form type for i18n-columns in propel * form type for i18n-columns in propel
@ -56,7 +57,7 @@ class TranslationCollectionType extends AbstractType
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public function setDefaultOptions(OptionsResolverInterface $resolver) public function configureOptions(OptionsResolver $resolver)
{ {
$resolver->setRequired(array( $resolver->setRequired(array(
'languages' 'languages'
@ -72,4 +73,10 @@ class TranslationCollectionType extends AbstractType
) )
)); ));
} }
// BC for SF < 2.7
public function setDefaultOptions(OptionsResolverInterface $resolver)
{
$this->configureOptions($resolver);
}
} }

11
Form/Type/TranslationType.php
View file

@ -13,8 +13,9 @@ namespace Propel\PropelBundle\Form\Type;
use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolverInterface; use Symfony\Component\OptionsResolver\OptionsResolver;
use Propel\PropelBundle\Form\EventListener\TranslationFormListener; use Propel\PropelBundle\Form\EventListener\TranslationFormListener;
use Symfony\Component\OptionsResolver\OptionsResolverInterface;
/** /**
* Translation type class * Translation type class
@ -44,11 +45,17 @@ class TranslationType extends AbstractType
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public function setDefaultOptions(OptionsResolverInterface $resolver) public function configureOptions(OptionsResolver $resolver)
{ {
$resolver->setRequired(array( $resolver->setRequired(array(
'data_class', 'data_class',
'columns' 'columns'
)); ));
} }
// BC for SF < 2.7
public function setDefaultOptions(OptionsResolverInterface $resolver)
{
$this->configureOptions($resolver);
}
} }