symfony · egeloen · Nov 24, 2012 · Apr 6, 2013 · Apr 6, 2013 · Apr 18, 2013
diff --git a/src/Symfony/Component/Form/ButtonBuilder.php b/src/Symfony/Component/Form/ButtonBuilder.php
@@ -14,6 +14,7 @@
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\Form\Exception\FormException;
 use Symfony\Component\Form\Exception\InvalidArgumentException;
+use Symfony\Component\Form\Exception\InvalidConfigurationException;
 
 /**
  * A builder for {@link Button} instances.
@@ -52,6 +53,11 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface
      */
     private $options;
 
+    /**
+     * @var null|string|array
+     */
+    private $position;
+
     /**
      * Creates a new button builder.
      *
@@ -446,7 +452,7 @@ public function setDataLocked($locked)
      * This method should not be invoked.
      *
      * @param FormFactoryInterface $formFactory
-     * 
+     *
      * @return void
      *
      * @throws \BadMethodCallException
@@ -456,6 +462,20 @@ public function setFormFactory(FormFactoryInterface $formFactory)
         throw new \BadMethodCallException('Buttons do not support form factories.');
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function setPosition($position)
+    {
+        if (is_string($position) && ($position !== 'first') && ($position !== 'last')) {
+            throw new InvalidConfigurationException('If you use position as string, you can only use "first" & "last".');
+        } elseif (is_array($position) && !isset($position['before']) && !isset($position['after'])) {
+            throw new InvalidConfigurationException('If you use position as array, you must at least define the "before" or "after" option.');
+        }
+
+        $this->position = $position;
+    }
+
     /**
      * Builds and returns the button configuration.
      *
@@ -728,6 +748,14 @@ public function getOption($name, $default = null)
         return array_key_exists($name, $this->options) ? $this->options[$name] : $default;
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function getPosition()
+    {
+        return $this->position;
+    }
+
     /**
      * Unsupported method.
      *

diff --git a/src/Symfony/Component/Form/Extension/Core/Type/FormType.php b/src/Symfony/Component/Form/Extension/Core/Type/FormType.php
@@ -53,6 +53,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ->setData(isset($options['data']) ? $options['data'] : null)
             ->setDataLocked(isset($options['data']))
             ->setDataMapper($options['compound'] ? new PropertyPathMapper($this->propertyAccessor) : null)
+            ->setPosition($options['position'])
         ;
 
         if ($options['trim']) {
@@ -167,10 +168,12 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
             'label_attr'         => array(),
             'virtual'            => false,
             'compound'           => true,
+            'position'           => null,
         ));
 
         $resolver->setAllowedTypes(array(
             'label_attr' => 'array',
+            'position'   => array('null', 'string', 'array'),
         ));
     }
 

diff --git a/src/Symfony/Component/Form/FormConfigBuilder.php b/src/Symfony/Component/Form/FormConfigBuilder.php
@@ -12,7 +12,7 @@
 namespace Symfony\Component\Form;
 
 use Symfony\Component\Form\Exception\BadMethodCallException;
-use Symfony\Component\Form\Exception\Exception;
+use Symfony\Component\Form\Exception\InvalidConfigurationException;
 use Symfony\Component\Form\Exception\UnexpectedTypeException;
 use Symfony\Component\PropertyAccess\PropertyPath;
 use Symfony\Component\PropertyAccess\PropertyPathInterface;
@@ -132,6 +132,11 @@ class FormConfigBuilder implements FormConfigBuilderInterface
      */
     private $dataLocked;
 
+    /**
+     * @var null|string|array
+     */
+    private $position;
+
     /**
      * @var FormFactoryInterface
      */
@@ -427,6 +432,14 @@ public function getDataLocked()
         return $this->dataLocked;
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function getPosition()
+    {
+        return $this->position;
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -687,6 +700,26 @@ public function setFormFactory(FormFactoryInterface $formFactory)
         return $this;
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function setPosition($position)
+    {
+        if ($this->locked) {
+            throw new FormException('The config builder cannot be modified anymore.');
+        }
+
+        if (is_string($position) && ($position !== 'first') && ($position !== 'last')) {
+            throw new InvalidConfigurationException('If you use position as string, you can only use "first" & "last".');
+        } elseif (is_array($position) && !isset($position['before']) && !isset($position['after'])) {
+            throw new InvalidConfigurationException('If you use position as array, you must at least define the "before" or "after" option.');
+        }
+
+        $this->position = $position;
+
+        return $this;
+    }
+
     /**
      * {@inheritdoc}
      */

diff --git a/src/Symfony/Component/Form/FormConfigBuilderInterface.php b/src/Symfony/Component/Form/FormConfigBuilderInterface.php
@@ -237,6 +237,40 @@ public function setDataLocked($locked);
      */
     public function setFormFactory(FormFactoryInterface $formFactory);
 
+    /**
+     * Sets the form position.
+     *
+     *  * The position can be `null` to reflect the original forms order.
+     *
+     *  * The position can be `first` to place this form at the first position.
+     *    If many forms are defined as `first`, the original order between these forms is maintained.
+     *    Warning, `first` does not mean "very first" if there are many forms which are defined as `first`
+     *    or if you set up an other form `before` this form.
+     *
+     *  * The position can be `last` to place this form at the last position.
+     *    If many forms are defined as `last`, the original order between these forms is maintained.
+     *    Warning, `last` does not mean "very last" if there are many forms which are defined as `last`
+     *    or if you set up an other form `after` this form.
+     *
+     *  * The position can be `array('before' => 'form_name')` to place this form before the `form_name` form.
+     *    If many forms defines the same `before` form, the original order between these forms is maintained.
+     *    Warning, `before` does not mean "just before" if there are many forms which defined the same `before` form.
+     *
+     *  * The position can be `array('after' => 'form_name')` to place this form after the `form_name` form.
+     *    If many forms defines the same after form, the original order between these forms is maintained.
+     *    Warning, `after` does not mean "just after" if there are many forms which defined the same `after` form.
+     *
+     * You can combine the `after` & `before` options together or with `first` and/or `last` to achieve
+     * more complex use cases.
+     *
+     * @param null|string|array $position The form position.
+     *
+     * @throws InvalidConfigurationException If the position is not valid.
+     *
+     * @return self The configuration object.
+     */
+    public function setPosition($position);
+
     /**
      * Builds and returns the form configuration.
      *

diff --git a/src/Symfony/Component/Form/FormConfigInterface.php b/src/Symfony/Component/Form/FormConfigInterface.php
@@ -215,4 +215,13 @@ public function hasOption($name);
      * @return mixed The option value.
      */
     public function getOption($name, $default = null);
+
+    /**
+     * Gets the form position.
+     *
+     * @see FormConfigBuilderInterface::setPosition
+     *
+     * @return null|string|array The before form name.
+     */
+    public function getPosition();
 }