merged branch bschussek/issue4960 (PR symfony#5010)

Commits ------- eccc5bd [Form] Restored BC in AbstractType::getDefaultOptions() and getAllowedOptionValues() Discussion ---------- [Form] Restored BC in AbstractType::getDefaultOptions() and getAllowedOptionValues() Bug fix: yes Feature addition: no Backwards compatibility break: no Symfony2 tests pass: yes Fixes the following tickets: symfony#4960 Todo: -

Author: fabpot

src/Symfony/Component/Form/AbstractType.php

@@ -52,32 +52,36 @@ public function finishView(FormView $view, FormInterface $form, array $options)
  */
  public function setDefaultOptions(OptionsResolverInterface $resolver)
  {
- $resolver->setDefaults($this->getDefaultOptions());
- $resolver->addAllowedValues($this->getAllowedOptionValues());
+ $resolver->setDefaults($this->getDefaultOptions(array()));
+ $resolver->addAllowedValues($this->getAllowedOptionValues(array()));
  }
 
  /**
  * Returns the default options for this type.
  *
+ * @param array $options Unsupported as of Symfony 2.1.
+ *
  * @return array The default options
  *
  * @deprecated Deprecated since version 2.1, to be removed in 2.3.
  * Use {@link setDefaultOptions()} instead.
  */
- public function getDefaultOptions()
+ public function getDefaultOptions(array $options)
  {
  return array();
  }
 
  /**
  * Returns the allowed option values for each option (if any).
  *
+ * @param array $options Unsupported as of Symfony 2.1.
+ *
  * @return array The allowed option values
  *
  * @deprecated Deprecated since version 2.1, to be removed in 2.3.
  * Use {@link setDefaultOptions()} instead.
  */
- public function getAllowedOptionValues()
+ public function getAllowedOptionValues(array $options)
  {
  return array();
  }

src/Symfony/Component/Form/CHANGELOG.md

@@ -106,8 +106,6 @@ CHANGELOG
  * removed superfluous methods from DataMapperInterface
  * `mapFormToData`
  * `mapDataToForm`
- * [BC BREAK] FormType::getDefaultOptions() and FormType::getAllowedOptionValues()
- don't receive an options array anymore.
  * added `setDefaultOptions` to FormTypeInterface and FormTypeExtensionInterface
  which accepts an OptionsResolverInterface instance
  * deprecated the methods `getDefaultOptions` and `getAllowedOptionValues`