[Form] Made InputField instantiable so that simple input fields can b…

…e created on the fly
symfony · Oct 22, 2010 · 96a0bff · 96a0bff
1 parent e9fcacd
commit 96a0bff
Show file tree

Hide file tree

Showing 12 changed files with 79 additions and 24 deletions.
diff --git a/src/Symfony/Component/Form/CheckboxField.php b/src/Symfony/Component/Form/CheckboxField.php
@@ -21,10 +21,10 @@ class CheckboxField extends ToggleField
     /**
      * {@inheritDoc}
      */
-    public function getAttributes()
+    public function __construct($key, array $options = array())
     {
-        return array_merge(parent::getAttributes(), array(
-            'type' => 'checkbox',
-        ));
+        $options['type'] = 'checkbox';
+
+        parent::__construct($key, $options);
     }
 }
diff --git a/src/Symfony/Component/Form/HiddenField.php b/src/Symfony/Component/Form/HiddenField.php
@@ -21,11 +21,11 @@ class HiddenField extends InputField
     /**
      * {@inheritDoc}
      */
-    public function getAttributes()
+    public function __construct($key, array $options = array())
     {
-        return array_merge(parent::getAttributes(), array(
-            'type' => 'hidden',
-        ));
+        $options['type'] = 'hidden';
+
+        parent::__construct($key, $options);
     }
 
     /**

diff --git a/src/Symfony/Component/Form/InputField.php b/src/Symfony/Component/Form/InputField.php
@@ -16,8 +16,18 @@
  *
  * @author Bernhard Schussek <bernhard.schussek@symfony-project.com>
  */
-abstract class InputField extends Field
+class InputField extends Field
 {
+    /**
+     * {@inheritDoc}
+     */
+    protected function configure()
+    {
+        parent::configure();
+
+        $this->addRequiredOption('type');
+    }
+
     /**
      * {@inheritDoc}
      */
@@ -28,6 +38,7 @@ public function getAttributes()
             'name'     => $this->getName(),
             'value'    => $this->getDisplayedData(),
             'disabled' => $this->isDisabled(),
+            'type'     => $this->getOption('type'),
         ));
     }
 }
diff --git a/src/Symfony/Component/Form/IntegerField.php b/src/Symfony/Component/Form/IntegerField.php
@@ -33,12 +33,12 @@ class IntegerField extends NumberField
      */
     protected function configure()
     {
+        parent::configure();
+
         $this->addOption('precision', 0);
 
         // Integer cast rounds towards 0, so do the same when displaying fractions
         $this->addOption('rounding-mode', NumberToLocalizedStringTransformer::ROUND_DOWN);
-
-        parent::configure();
     }
 
     /**

diff --git a/src/Symfony/Component/Form/NumberField.php b/src/Symfony/Component/Form/NumberField.php
@@ -20,11 +20,23 @@
  */
 class NumberField extends InputField
 {
+    /**
+     * {@inheritDoc}
+     */
+    public function __construct($key, array $options = array())
+    {
+        $options['type'] = 'text';
+
+        parent::__construct($key, $options);
+    }
+
     /**
      * {@inheritDoc}
      */
     protected function configure()
     {
+        parent::configure();
+
         // default precision is locale specific (usually around 3)
         $this->addOption('precision');
         $this->addOption('grouping', false);
@@ -36,14 +48,4 @@ protected function configure()
             'rounding-mode' => $this->getOption('rounding-mode'),
         )));
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getAttributes(array $attributes = array())
-    {
-        return array_merge(parent::getAttributes(), array(
-            'type'  => 'text',
-        ));
-    }
 }
diff --git a/src/Symfony/Component/Form/PasswordField.php b/src/Symfony/Component/Form/PasswordField.php
@@ -34,6 +34,7 @@ protected function configure()
     public function getAttributes()
     {
         return array_merge(parent::getAttributes(), array(
+            // override getDisplayedData() instead?
             'value'       => $this->getOption('always_empty') && !$this->isBound() ? '' : $this->getDisplayedData(),
             'type'        => 'password',
         ));

diff --git a/src/Symfony/Component/Form/RadioField.php b/src/Symfony/Component/Form/RadioField.php
@@ -18,13 +18,23 @@
  */
 class RadioField extends ToggleField
 {
+    /**
+     * {@inheritDoc}
+     */
+    public function __construct($key, array $options = array())
+    {
+        $options['type'] = 'radio';
+
+        parent::__construct($key, $options);
+    }
+
     /**
      * {@inheritDoc}
      */
     public function getAttributes()
     {
         return array_merge(parent::getAttributes(), array(
-            'type' => 'radio',
+            // TODO: should getName() be overridden instead?
             'name' => $this->getParent() ? $this->getParent()->getName() : $this->getName(),
         ));
     }

diff --git a/src/Symfony/Component/Form/TextField.php b/src/Symfony/Component/Form/TextField.php
@@ -18,6 +18,16 @@
  */
 class TextField extends InputField
 {
+    /**
+     * {@inheritDoc}
+     */
+    public function __construct($key, array $options = array())
+    {
+        $options['type'] = 'text';
+
+        parent::__construct($key, $options);
+    }
+
     /**
      * {@inheritDoc}
      */
@@ -34,7 +44,6 @@ protected function configure()
     public function getAttributes()
     {
         return array_merge(parent::getAttributes(), array(
-            'type'        => 'text',
             'maxlength'   => $this->getOption('max_length'),
         ));
     }

diff --git a/src/Symfony/Component/Form/ToggleField.php b/src/Symfony/Component/Form/ToggleField.php
@@ -25,6 +25,8 @@ abstract class ToggleField extends InputField
      */
     protected function configure()
     {
+        parent::configure();
+
         $this->addOption('value');
         $this->addOption('label');
 

diff --git a/src/Symfony/Component/Form/UrlField.php b/src/Symfony/Component/Form/UrlField.php
@@ -16,13 +16,15 @@
  *
  * @author Bernhard Schussek <bernhard.schussek@symfony-project.com>
  */
-class UrlField extends InputField
+class UrlField extends TextField
 {
     /**
      * {@inheritDoc}
      */
     protected function configure()
     {
+        parent::configure();
+
         $this->addOption('default_protocol', 'http');
     }
 

diff --git a/tests/Symfony/Tests/Component/Form/Fixtures/TestInputField.php b/tests/Symfony/Tests/Component/Form/Fixtures/TestInputField.php
@@ -6,4 +6,13 @@
 
 class TestInputField extends InputField
 {
+    /**
+     * {@inheritDoc}
+     */
+    public function __construct($key, array $options = array())
+    {
+        $options['type'] = 'text';
+
+        parent::__construct($key, $options);
+    }
 }
diff --git a/tests/Symfony/Tests/Component/Form/Fixtures/TestToggleField.php b/tests/Symfony/Tests/Component/Form/Fixtures/TestToggleField.php
@@ -6,4 +6,13 @@
 
 class TestToggleField extends ToggleField
 {
+    /**
+     * {@inheritDoc}
+     */
+    public function __construct($key, array $options = array())
+    {
+        $options['type'] = 'checkbox';
+
+        parent::__construct($key, $options);
+    }
 }