[Form] Fixed documentation, and the DateType (default options)

symfony · Apr 11, 2012 · 4ffa08c · 4ffa08c
1 parent 44fcf61
commit 4ffa08c
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 13 deletions.
diff --git a/AbstractType.php b/AbstractType.php
@@ -92,8 +92,6 @@ public function createBuilder($name, FormFactoryInterface $factory, array $optio
     /**
      * Returns the default options for this type.
      *
-     * @param array $options
-     *
      * @return array The default options
      */
     public function getDefaultOptions()
@@ -104,8 +102,6 @@ public function getDefaultOptions()
     /**
      * Returns the allowed option values for each option (if any).
      *
-     * @param array $options
-     *
      * @return array The allowed option values
      */
     public function getAllowedOptionValues()

diff --git a/AbstractTypeExtension.php b/AbstractTypeExtension.php
@@ -61,8 +61,6 @@ public function buildViewBottomUp(FormView $view, FormInterface $form)
     /**
      * Overrides the default options form the extended type.
      *
-     * @param array $options
-     *
      * @return array
      */
     public function getDefaultOptions()
@@ -73,8 +71,6 @@ public function getDefaultOptions()
     /**
      * Returns the allowed option values for each option (if any).
      *
-     * @param array $options
-     *
      * @return array The allowed option values
      */
     public function getAllowedOptionValues()

diff --git a/Extension/Core/Type/DateType.php b/Extension/Core/Type/DateType.php
@@ -44,7 +44,7 @@ public function buildForm(FormBuilder $builder, array $options)
         // If $format is not in the allowed options, it's considered as the pattern of the formatter if it is a string
         if (!in_array($format, $allowedFormatOptionValues, true)) {
             if (is_string($format)) {
-                $defaultOptions = $this->getDefaultOptions($options);
+                $defaultOptions = array_merge($this->getDefaultOptions(), $options);
 
                 $format = $defaultOptions['format'];
                 $pattern = $options['format'];

diff --git a/FormTypeInterface.php b/FormTypeInterface.php
@@ -75,17 +75,13 @@ function createBuilder($name, FormFactoryInterface $factory, array $options);
     /**
      * Returns the default options for this type.
      *
-     * @param array $options
-     *
      * @return array The default options
      */
     function getDefaultOptions();
 
     /**
      * Returns the allowed option values for each option (if any).
      *
-     * @param array $options
-     *
      * @return array The allowed option values
      */
     function getAllowedOptionValues();