Browse Source

[Form] Added parent calls to all configure() methods of Fields and Transformers

The calls that were on top of the function have also been moved to the bottom for safety (see previous commit)
Jordi Boggiano 14 years ago
parent
commit
0bdb271608

+ 2 - 0
src/Symfony/Bundle/DoctrineBundle/Form/ValueTransformer/CollectionToChoiceTransformer.php

@@ -25,6 +25,8 @@ class CollectionToChoiceTransformer extends BaseValueTransformer
     {
         $this->addRequiredOption('em');
         $this->addRequiredOption('className');
+
+        parent::configure();
     }
 
     /**

+ 2 - 0
src/Symfony/Bundle/DoctrineBundle/Form/ValueTransformer/CollectionToStringTransformer.php

@@ -46,6 +46,8 @@ class CollectionToStringTransformer extends BaseValueTransformer
         $this->addRequiredOption('em');
         $this->addRequiredOption('class_name');
         $this->addRequiredOption('field_name');
+
+        parent::configure();
     }
 
     /**

+ 2 - 0
src/Symfony/Bundle/DoctrineBundle/Form/ValueTransformer/EntityToIDTransformer.php

@@ -27,6 +27,8 @@ class EntityToIDTransformer extends BaseValueTransformer
     {
         $this->addRequiredOption('em');
         $this->addRequiredOption('className');
+
+        parent::configure();
     }
 
     /**

+ 2 - 0
src/Symfony/Component/Form/ChoiceField.php

@@ -67,6 +67,8 @@ class ChoiceField extends HybridField
         } else {
             $this->setFieldMode(self::FIELD);
         }
+
+        parent::configure();
     }
 
     /**

+ 2 - 0
src/Symfony/Component/Form/CollectionField.php

@@ -47,6 +47,8 @@ class CollectionField extends FieldGroup
             $field->setRequired(false);
             $this->add($field);
         }
+
+        parent::configure();
     }
 
     public function setData($collection)

+ 2 - 0
src/Symfony/Component/Form/RepeatedField.php

@@ -50,6 +50,8 @@ class RepeatedField extends FieldGroup
         $field->setKey('second');
         $field->setPropertyPath('second');
         $this->add($field);
+
+        parent::configure();
     }
 
     /**

+ 2 - 2
src/Symfony/Component/Form/UrlField.php

@@ -23,9 +23,9 @@ class UrlField extends TextField
      */
     protected function configure()
     {
-        parent::configure();
-
         $this->addOption('default_protocol', 'http');
+
+        parent::configure();
     }
 
     /**

+ 2 - 2
src/Symfony/Component/Form/ValueTransformer/DateTimeToArrayTransformer.php

@@ -33,12 +33,12 @@ class DateTimeToArrayTransformer extends BaseDateTimeTransformer
      */
     protected function configure()
     {
-        parent::configure();
-
         $this->addOption('input_timezone', 'UTC');
         $this->addOption('output_timezone', 'UTC');
         $this->addOption('pad', false);
         $this->addOption('fields', array('year', 'month', 'day', 'hour', 'minute', 'second'));
+
+        parent::configure();
     }
 
     /**

+ 2 - 2
src/Symfony/Component/Form/ValueTransformer/DateTimeToLocalizedStringTransformer.php

@@ -33,8 +33,6 @@ class DateTimeToLocalizedStringTransformer extends BaseDateTimeTransformer
      */
     protected function configure()
     {
-        parent::configure();
-
         $this->addOption('date_format', self::MEDIUM);
         $this->addOption('time_format', self::SHORT);
         $this->addOption('input_timezone', 'UTC');
@@ -47,6 +45,8 @@ class DateTimeToLocalizedStringTransformer extends BaseDateTimeTransformer
         if (!in_array($this->getOption('time_format'), self::$formats, true)) {
             throw new \InvalidArgumentException(sprintf('The option "time_format" is expected to be one of "%s". Is "%s"', implode('", "', self::$formats), $this->getOption('time_format')));
         }
+
+        parent::configure();
     }
 
     /**

+ 2 - 0
src/Symfony/Component/Form/ValueTransformer/DateTimeToStringTransformer.php

@@ -29,6 +29,8 @@ class DateTimeToStringTransformer extends BaseValueTransformer
         $this->addOption('input_timezone', 'UTC');
         $this->addOption('output_timezone', 'UTC');
         $this->addOption('format', 'Y-m-d H:i:s');
+
+        parent::configure();
     }
 
     /**

+ 2 - 0
src/Symfony/Component/Form/ValueTransformer/DateTimeToTimestampTransformer.php

@@ -28,6 +28,8 @@ class DateTimeToTimestampTransformer extends BaseValueTransformer
     {
         $this->addOption('input_timezone', 'UTC');
         $this->addOption('output_timezone', 'UTC');
+
+        parent::configure();
     }
 
     /**

+ 2 - 0
tests/Symfony/Tests/Component/Form/Fixtures/RequiredOptionsField.php

@@ -10,6 +10,8 @@ class RequiredOptionsField extends Field
     {
         $this->addOption('foo');
         $this->addRequiredOption('bar');
+
+        parent::configure();
     }
 
     public function render(array $attributes = array())

+ 4 - 0
tests/Symfony/Tests/Component/Form/FormTest.php

@@ -20,6 +20,8 @@ class FormTest_PreconfiguredForm extends Form
     protected function configure()
     {
         $this->add(new Field('firstName'));
+
+        parent::configure();
     }
 }
 
@@ -39,6 +41,8 @@ class TestSetDataBeforeConfigureForm extends Form
     protected function configure()
     {
         $this->testCase->assertEquals($this->object, $this->getData());
+
+        parent::configure();
     }
 }