diff --git a/UPGRADE-2.1.md b/UPGRADE-2.1.md index 544b113ee7..a245e5e90d 100644 --- a/UPGRADE-2.1.md +++ b/UPGRADE-2.1.md @@ -329,7 +329,7 @@ ``` public function getDefaultOptions() { - $return array( + return array( 'empty_data' => function (Options $options, $previousValue) { return $options['multiple'] ? array() : $previousValue; } diff --git a/src/Symfony/Bridge/Propel1/Form/Type/ModelType.php b/src/Symfony/Bridge/Propel1/Form/Type/ModelType.php index c4a6f781c1..de125a070f 100644 --- a/src/Symfony/Bridge/Propel1/Form/Type/ModelType.php +++ b/src/Symfony/Bridge/Propel1/Form/Type/ModelType.php @@ -43,7 +43,7 @@ class ModelType extends AbstractType ); }; - $defaultOptions = array( + return array( 'template' => 'choice', 'multiple' => false, 'expanded' => false,