diff --git a/Form/BaseAbstractType.php b/Form/BaseAbstractType.php index 26aca7a..aab764e 100644 --- a/Form/BaseAbstractType.php +++ b/Form/BaseAbstractType.php @@ -11,6 +11,7 @@ namespace Propel\PropelBundle\Form; use Symfony\Component\Form\AbstractType; +use Symfony\Component\OptionsResolver\OptionsResolver; use Symfony\Component\OptionsResolver\OptionsResolverInterface; /** @@ -57,11 +58,17 @@ abstract class BaseAbstractType extends AbstractType /** * {@inheritdoc} */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults($this->options); } + // BC for SF < 2.7 + public function setDefaultOptions(OptionsResolverInterface $resolver) + { + $this->configureOptions($resolver); + } + /** * {@inheritdoc} */ diff --git a/Form/PropelExtension.php b/Form/PropelExtension.php index 413ff4b..5aac58f 100644 --- a/Form/PropelExtension.php +++ b/Form/PropelExtension.php @@ -24,7 +24,7 @@ class PropelExtension extends AbstractExtension protected function loadTypes() { return array( - new Type\ModelType(PropertyAccess::getPropertyAccessor()), + new Type\ModelType(PropertyAccess::createPropertyAccessor()), new Type\TranslationCollectionType(), new Type\TranslationType() ); diff --git a/Form/Type/ModelType.php b/Form/Type/ModelType.php index 6ae2f8b..9125838 100644 --- a/Form/Type/ModelType.php +++ b/Form/Type/ModelType.php @@ -16,6 +16,7 @@ use Propel\PropelBundle\Form\DataTransformer\CollectionToArrayTransformer; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\OptionsResolver\Options; +use Symfony\Component\OptionsResolver\OptionsResolver; use Symfony\Component\OptionsResolver\OptionsResolverInterface; use Symfony\Component\PropertyAccess\PropertyAccess; use Symfony\Component\PropertyAccess\PropertyAccessorInterface; @@ -57,7 +58,7 @@ class ModelType extends AbstractType public function __construct(PropertyAccessorInterface $propertyAccessor = null) { - $this->propertyAccessor = $propertyAccessor ?: PropertyAccess::getPropertyAccessor(); + $this->propertyAccessor = $propertyAccessor ?: PropertyAccess::createPropertyAccessor(); } 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; @@ -100,6 +101,12 @@ class ModelType extends AbstractType )); } + // BC for SF < 2.7 + public function setDefaultOptions(OptionsResolverInterface $resolver) + { + $this->configureOptions($resolver); + } + public function getParent() { return 'choice'; diff --git a/Form/Type/TranslationCollectionType.php b/Form/Type/TranslationCollectionType.php index 79010d7..ac35f73 100644 --- a/Form/Type/TranslationCollectionType.php +++ b/Form/Type/TranslationCollectionType.php @@ -14,8 +14,9 @@ namespace Propel\PropelBundle\Form\Type; use Symfony\Component\Form\AbstractType; use Symfony\Component\OptionsResolver\Exception\MissingOptionsException; use Symfony\Component\Form\FormBuilderInterface; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; +use Symfony\Component\OptionsResolver\OptionsResolver; use Propel\PropelBundle\Form\EventListener\TranslationCollectionFormListener; +use Symfony\Component\OptionsResolver\OptionsResolverInterface; /** * form type for i18n-columns in propel @@ -56,7 +57,7 @@ class TranslationCollectionType extends AbstractType /** * {@inheritdoc} */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setRequired(array( 'languages' @@ -72,4 +73,10 @@ class TranslationCollectionType extends AbstractType ) )); } + + // BC for SF < 2.7 + public function setDefaultOptions(OptionsResolverInterface $resolver) + { + $this->configureOptions($resolver); + } } diff --git a/Form/Type/TranslationType.php b/Form/Type/TranslationType.php index 68d53f1..1adc17d 100644 --- a/Form/Type/TranslationType.php +++ b/Form/Type/TranslationType.php @@ -13,8 +13,9 @@ namespace Propel\PropelBundle\Form\Type; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\FormBuilderInterface; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; +use Symfony\Component\OptionsResolver\OptionsResolver; use Propel\PropelBundle\Form\EventListener\TranslationFormListener; +use Symfony\Component\OptionsResolver\OptionsResolverInterface; /** * Translation type class @@ -44,11 +45,17 @@ class TranslationType extends AbstractType /** * {@inheritdoc} */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setRequired(array( 'data_class', 'columns' )); } + + // BC for SF < 2.7 + public function setDefaultOptions(OptionsResolverInterface $resolver) + { + $this->configureOptions($resolver); + } }