[Form] Restored BC in AbstractType::getDefaultOptions() and getAllowedOptionValues()

webmozart · webmozart · commit eccc5bd0c607 · 2012-07-22T09:36:58.000+02:00
diff --git a/src/Symfony/Component/Form/AbstractType.php b/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();
     }
diff --git a/src/Symfony/Component/Form/CHANGELOG.md b/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`

Original file line number	Diff line number	Diff line change
`@@ -52,32 +52,36 @@ public function finishView(FormView $view, FormInterface $form, array $options)`
`52`	`52`	`*/`
`53`	`53`	`public function setDefaultOptions(OptionsResolverInterface $resolver)`
`54`	`54`	`{`
`55`		`- $resolver->setDefaults($this->getDefaultOptions());`
`56`		`- $resolver->addAllowedValues($this->getAllowedOptionValues());`
	`55`	`+ $resolver->setDefaults($this->getDefaultOptions(array()));`
	`56`	`+ $resolver->addAllowedValues($this->getAllowedOptionValues(array()));`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`/**`
`60`	`60`	`* Returns the default options for this type.`
`61`	`61`	`*`
	`62`	`+ * @param array $options Unsupported as of Symfony 2.1.`
	`63`	`+ *`
`62`	`64`	`* @return array The default options`
`63`	`65`	`*`
`64`	`66`	`* @deprecated Deprecated since version 2.1, to be removed in 2.3.`
`65`	`67`	`* Use {@link setDefaultOptions()} instead.`
`66`	`68`	`*/`
`67`		`- public function getDefaultOptions()`
	`69`	`+ public function getDefaultOptions(array $options)`
`68`	`70`	`{`
`69`	`71`	`return array();`
`70`	`72`	`}`
`71`	`73`
`72`	`74`	`/**`
`73`	`75`	`* Returns the allowed option values for each option (if any).`
`74`	`76`	`*`
	`77`	`+ * @param array $options Unsupported as of Symfony 2.1.`
	`78`	`+ *`
`75`	`79`	`* @return array The allowed option values`
`76`	`80`	`*`
`77`	`81`	`* @deprecated Deprecated since version 2.1, to be removed in 2.3.`
`78`	`82`	`* Use {@link setDefaultOptions()} instead.`
`79`	`83`	`*/`
`80`		`- public function getAllowedOptionValues()`
	`84`	`+ public function getAllowedOptionValues(array $options)`
`81`	`85`	`{`
`82`	`86`	`return array();`
`83`	`87`	`}`