diff --git a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/EntityChoiceList.php b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/EntityChoiceList.php
new file mode 100644
index 0000000000..b144618448
--- /dev/null
+++ b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/EntityChoiceList.php
@@ -0,0 +1,275 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\Doctrine\Form\ChoiceList;
+
+use Symfony\Component\Form\Util\PropertyPath;
+use Symfony\Component\Form\Exception\FormException;
+use Symfony\Component\Form\Exception\UnexpectedTypeException;
+use Symfony\Component\Form\ChoiceList\ArrayChoiceList;
+use Doctrine\ORM\EntityManager;
+use Doctrine\ORM\QueryBuilder;
+use Doctrine\ORM\NoResultException;
+
+class EntityChoiceList extends ArrayChoiceList
+{
+    /**
+     * @var Doctrine\ORM\EntityManager
+     */
+    private $em;
+
+    /**
+     * @var Doctrine\ORM\Mapping\ClassMetadata
+     */
+    private $class;
+
+    /**
+     * The entities from which the user can choose
+     *
+     * This array is either indexed by ID (if the ID is a single field)
+     * or by key in the choices array (if the ID consists of multiple fields)
+     *
+     * This property is initialized by initializeChoices(). It should only
+     * be accessed through getEntity() and getEntities().
+     *
+     * @var Collection
+     */
+    private $entities = array();
+
+    /**
+     * Contains the query builder that builds the query for fetching the
+     * entities
+     *
+     * This property should only be accessed through queryBuilder.
+     *
+     * @var Doctrine\ORM\QueryBuilder
+     */
+    private $queryBuilder;
+
+    /**
+     * The fields of which the identifier of the underlying class consists
+     *
+     * This property should only be accessed through identifier.
+     *
+     * @var array
+     */
+    private $identifier = array();
+
+    /**
+     * A cache for \ReflectionProperty instances for the underlying class
+     *
+     * This property should only be accessed through getReflProperty().
+     *
+     * @var array
+     */
+    private $reflProperties = array();
+
+    /**
+     * A cache for the UnitOfWork instance of Doctrine
+     *
+     * @var Doctrine\ORM\UnitOfWork
+     */
+    private $unitOfWork;
+
+    private $propertyPath;
+
+    public function __construct(EntityManager $em, $class, $property = null, $queryBuilder = null, $choices = array())
+    {
+        // If a query builder was passed, it must be a closure or QueryBuilder
+        // instance
+        if (!(null === $queryBuilder || $queryBuilder instanceof QueryBuilder || $queryBuilder instanceof \Closure)) {
+            throw new UnexpectedTypeException($queryBuilder, 'Doctrine\ORM\QueryBuilder or \Closure');
+        }
+
+        if ($queryBuilder instanceof \Closure) {
+            $queryBuilder = $queryBuilder($em->getRepository($class));
+
+            if (!$queryBuilder instanceof QueryBuilder) {
+                throw new UnexpectedTypeException($queryBuilder, 'Doctrine\ORM\QueryBuilder');
+            }
+        }
+
+        $this->em = $em;
+        $this->class = $class;
+        $this->queryBuilder = $queryBuilder;
+        $this->unitOfWork = $em->getUnitOfWork();
+        $this->identifier = $em->getClassMetadata($class)->getIdentifierFieldNames();
+
+        // The propery option defines, which property (path) is used for
+        // displaying entities as strings
+        if ($property) {
+            $this->propertyPath = new PropertyPath($property);
+        }
+
+        parent::__construct($choices);
+    }
+
+    /**
+     * Initializes the choices and returns them
+     *
+     * The choices are generated from the entities. If the entities have a
+     * composite identifier, the choices are indexed using ascending integers.
+     * Otherwise the identifiers are used as indices.
+     *
+     * If the entities were passed in the "choices" option, this method
+     * does not have any significant overhead. Otherwise, if a query builder
+     * was passed in the "query_builder" option, this builder is now used
+     * to construct a query which is executed. In the last case, all entities
+     * for the underlying class are fetched from the repository.
+     *
+     * If the option "property" was passed, the property path in that option
+     * is used as option values. Otherwise this method tries to convert
+     * objects to strings using __toString().
+     *
+     * @return array  An array of choices
+     */
+    protected function load()
+    {
+        parent::load();
+
+        if ($this->choices) {
+            $entities = $this->choices;
+        } else if ($qb = $this->queryBuilder) {
+            $entities = $qb->getQuery()->execute();
+        } else {
+            $entities = $this->em->getRepository($this->class)->findAll();
+        }
+
+        $propertyPath = null;
+        $this->choices = array();
+        $this->entities = array();
+
+        foreach ($entities as $key => $entity) {
+            if ($this->propertyPath) {
+                // If the property option was given, use it
+                $value = $this->propertyPath->getValue($entity);
+            } else {
+                // Otherwise expect a __toString() method in the entity
+                $value = (string)$entity;
+            }
+
+            if (count($this->identifier) > 1) {
+                // When the identifier consists of multiple field, use
+                // naturally ordered keys to refer to the choices
+                $this->choices[$key] = $value;
+                $this->entities[$key] = $entity;
+            } else {
+                // When the identifier is a single field, index choices by
+                // entity ID for performance reasons
+                $id = current($this->getIdentifierValues($entity));
+                $this->choices[$id] = $value;
+                $this->entities[$id] = $entity;
+            }
+        }
+    }
+
+    public function getIdentifier()
+    {
+        return $this->identifier;
+    }
+
+    /**
+     * Returns the according entities for the choices
+     *
+     * If the choices were not initialized, they are initialized now. This
+     * is an expensive operation, except if the entities were passed in the
+     * "choices" option.
+     *
+     * @return array  An array of entities
+     */
+    public function getEntities()
+    {
+        if (!$this->loaded) {
+            $this->load();
+        }
+
+        return $this->entities;
+    }
+
+    /**
+     * Returns the entity for the given key
+     *
+     * If the underlying entities have composite identifiers, the choices
+     * are intialized. The key is expected to be the index in the choices
+     * array in this case.
+     *
+     * If they have single identifiers, they are either fetched from the
+     * internal entity cache (if filled) or loaded from the database.
+     *
+     * @param  string $key  The choice key (for entities with composite
+     *                      identifiers) or entity ID (for entities with single
+     *                      identifiers)
+     * @return object       The matching entity
+     */
+    public function getEntity($key)
+    {
+        if (!$this->loaded) {
+            $this->load();
+        }
+
+        try {
+            if (count($this->identifier) > 1) {
+                // $key is a collection index
+                $entities = $this->getEntities();
+                return isset($entities[$key]) ? $entities[$key] : null;
+            } else if ($this->entities) {
+                return isset($this->entities[$key]) ? $this->entities[$key] : null;
+            } else if ($qb = $this->queryBuilder) {
+                // should we clone the builder?
+                $alias = $qb->getRootAlias();
+                $where = $qb->expr()->eq($alias.'.'.current($this->identifier), $key);
+
+                return $qb->andWhere($where)->getQuery()->getSingleResult();
+            }
+
+            return $this->em->find($this->class, $key);
+        } catch (NoResultException $e) {
+            return null;
+        }
+    }
+
+    /**
+     * Returns the \ReflectionProperty instance for a property of the
+     * underlying class
+     *
+     * @param  string $property     The name of the property
+     * @return \ReflectionProperty  The reflection instsance
+     */
+    private function getReflProperty($property)
+    {
+        if (!isset($this->reflProperties[$property])) {
+            $this->reflProperties[$property] = new \ReflectionProperty($this->class, $property);
+            $this->reflProperties[$property]->setAccessible(true);
+        }
+
+        return $this->reflProperties[$property];
+    }
+
+    /**
+     * Returns the values of the identifier fields of an entity
+     *
+     * Doctrine must know about this entity, that is, the entity must already
+     * be persisted or added to the identity map before. Otherwise an
+     * exception is thrown.
+     *
+     * @param  object $entity  The entity for which to get the identifier
+     * @throws FormException   If the entity does not exist in Doctrine's
+     *                         identity map
+     */
+    public function getIdentifierValues($entity)
+    {
+        if (!$this->unitOfWork->isInIdentityMap($entity)) {
+            throw new FormException('Entities passed to the choice field must be managed');
+        }
+
+        return $this->unitOfWork->getEntityIdentifier($entity);
+    }
+}
\ No newline at end of file
diff --git a/src/Symfony/Bridge/Doctrine/Form/DataTransformer/EntitiesToArrayTransformer.php b/src/Symfony/Bridge/Doctrine/Form/DataTransformer/EntitiesToArrayTransformer.php
new file mode 100644
index 0000000000..d6d3a13f30
--- /dev/null
+++ b/src/Symfony/Bridge/Doctrine/Form/DataTransformer/EntitiesToArrayTransformer.php
@@ -0,0 +1,104 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\Doctrine\Form\DataTransformer;
+
+use Symfony\Bridge\Doctrine\Form\ChoiceList\EntityChoiceList;
+use Symfony\Component\Form\Exception\UnexpectedTypeException;
+use Symfony\Component\Form\DataTransformer\TransformationFailedException;
+use Symfony\Component\Form\DataTransformer\DataTransformerInterface;
+use Doctrine\Common\Collections\Collection;
+use Doctrine\Common\Collections\ArrayCollection;
+
+class EntitiesToArrayTransformer implements DataTransformerInterface
+{
+    private $choiceList;
+
+    public function __construct(EntityChoiceList $choiceList)
+    {
+        $this->choiceList = $choiceList;
+    }
+
+    /**
+     * Transforms entities into choice keys
+     *
+     * @param  Collection|object  A collection of entities, a single entity or
+     *                            NULL
+     * @return mixed              An array of choice keys, a single key or
+     *                            NULL
+     */
+    public function transform($collection)
+    {
+        if (null === $collection) {
+            return array();
+        }
+
+        if (!($collection instanceof Collection)) {
+            throw new UnexpectedTypeException($collection, 'Doctrine\Common\Collection\Collection');
+        }
+
+        $array = array();
+
+        if (count($this->choiceList->getIdentifier()) > 1) {
+            // load all choices
+            $availableEntities = $this->choiceList->getEntities();
+
+            foreach ($collection as $entity) {
+                // identify choices by their collection key
+                $key = array_search($entity, $availableEntities);
+                $array[] = $key;
+            }
+        } else {
+            foreach ($collection as $entity) {
+                $array[] = current($this->choiceList->getIdentifierValues($entity));
+            }
+        }
+
+        return $array;
+    }
+
+    /**
+     * Transforms choice keys into entities
+     *
+     * @param  mixed $keys   An array of keys, a single key or NULL
+     * @return Collection|object  A collection of entities, a single entity
+     *                            or NULL
+     */
+    public function reverseTransform($keys)
+    {
+        $collection = new ArrayCollection();
+
+        if ('' === $keys || null === $keys) {
+            return $collection;
+        }
+
+        if (!is_array($keys)) {
+            throw new UnexpectedTypeException($keys, 'array');
+        }
+
+        $notFound = array();
+
+        // optimize this into a SELECT WHERE IN query
+        foreach ($keys as $key) {
+            if ($entity = $this->choiceList->getEntity($key)) {
+                $collection->add($entity);
+            } else {
+                $notFound[] = $key;
+            }
+        }
+
+        if (count($notFound) > 0) {
+            throw new TransformationFailedException(sprintf('The entities with keys "%s" could not be found', implode('", "', $notFound)));
+        }
+
+        return $collection;
+    }
+}
\ No newline at end of file
diff --git a/src/Symfony/Bridge/Doctrine/Form/DataTransformer/EntityToIdTransformer.php b/src/Symfony/Bridge/Doctrine/Form/DataTransformer/EntityToIdTransformer.php
new file mode 100644
index 0000000000..afc47a77d0
--- /dev/null
+++ b/src/Symfony/Bridge/Doctrine/Form/DataTransformer/EntityToIdTransformer.php
@@ -0,0 +1,79 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\Doctrine\Form\DataTransformer;
+
+use Symfony\Bridge\Doctrine\Form\ChoiceList\EntityChoiceList;
+use Symfony\Component\Form\Exception\UnexpectedTypeException;
+use Symfony\Component\Form\DataTransformer\DataTransformerInterface;
+use Symfony\Component\Form\DataTransformer\TransformationFailedException;
+
+class EntityToIdTransformer implements DataTransformerInterface
+{
+    private $choiceList;
+
+    public function __construct(EntityChoiceList $choiceList)
+    {
+        $this->choiceList = $choiceList;
+    }
+
+    /**
+     * Transforms entities into choice keys
+     *
+     * @param  Collection|object  A collection of entities, a single entity or
+     *                            NULL
+     * @return mixed              An array of choice keys, a single key or
+     *                            NULL
+     */
+    public function transform($entity)
+    {
+        if (null === $entity || '' === $entity) {
+            return '';
+        }
+
+        if (!is_object($entity)) {
+            throw new UnexpectedTypeException($entity, 'object');
+        }
+
+        if (count($this->choiceList->getIdentifier()) > 1) {
+            // load all choices
+            $availableEntities = $this->choiceList->getEntities();
+
+            return array_search($entity, $availableEntities);
+        }
+
+        return current($this->choiceList->getIdentifierValues($entity));
+    }
+
+    /**
+     * Transforms choice keys into entities
+     *
+     * @param  mixed $key   An array of keys, a single key or NULL
+     * @return Collection|object  A collection of entities, a single entity
+     *                            or NULL
+     */
+    public function reverseTransform($key)
+    {
+        if ('' === $key || null === $key) {
+            return null;
+        }
+
+        if (!is_numeric($key)) {
+            throw new UnexpectedTypeException($key, 'numeric');
+        }
+
+        if (!($entity = $this->choiceList->getEntity($key))) {
+            throw new TransformationFailedException('The entity with key "%s" could not be found', $key);
+        }
+
+        return $entity;
+    }
+}
\ No newline at end of file
diff --git a/src/Symfony/Bridge/Doctrine/Form/DoctrineTypeLoader.php b/src/Symfony/Bridge/Doctrine/Form/DoctrineTypeLoader.php
new file mode 100644
index 0000000000..0c0c0d5c1c
--- /dev/null
+++ b/src/Symfony/Bridge/Doctrine/Form/DoctrineTypeLoader.php
@@ -0,0 +1,38 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\Doctrine\Form;
+
+use Symfony\Component\Form\Type\Loader\TypeLoaderInterface;
+use Doctrine\ORM\EntityManager;
+
+class DoctrineTypeLoader implements TypeLoaderInterface
+{
+    private $types;
+
+    public function __construct(EntityManager $em)
+    {
+        $this->types['entity'] = new EntityType($em);
+    }
+
+    public function getType($name)
+    {
+        return $this->types[$name];
+    }
+
+    public function hasType($name)
+    {
+        return isset($this->types[$name]);
+    }
+}
+
+
+
diff --git a/src/Symfony/Bridge/Doctrine/Form/EntityType.php b/src/Symfony/Bridge/Doctrine/Form/EntityType.php
new file mode 100644
index 0000000000..e8d5a02ad1
--- /dev/null
+++ b/src/Symfony/Bridge/Doctrine/Form/EntityType.php
@@ -0,0 +1,82 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\Doctrine\Form;
+
+use Symfony\Component\Form\FormBuilder;
+use Symfony\Component\Form\FormFactoryInterface;
+use Symfony\Bridge\Doctrine\Form\ChoiceList\EntityChoiceList;
+use Symfony\Bridge\Doctrine\Form\EventListener\MergeCollectionListener;
+use Symfony\Bridge\Doctrine\Form\DataTransformer\EntitiesToArrayTransformer;
+use Symfony\Bridge\Doctrine\Form\DataTransformer\EntityToIdTransformer;
+use Symfony\Component\Form\Type\AbstractType;
+use Doctrine\ORM\EntityManager;
+
+class EntityType extends AbstractType
+{
+    private $em;
+
+    public function __construct(EntityManager $em)
+    {
+        $this->em = $em;
+    }
+
+    public function buildForm(FormBuilder $builder, array $options)
+    {
+        if ($options['multiple']) {
+            $builder->addEventSubscriber(new MergeCollectionListener())
+                ->prependClientTransformer(new EntitiesToArrayTransformer($options['choice_list']));
+        } else {
+            $builder->prependClientTransformer(new EntityToIdTransformer($options['choice_list']));
+        }
+    }
+
+    public function getDefaultOptions(array $options)
+    {
+        $defaultOptions = array(
+            'template' => 'choice',
+            'multiple' => false,
+            'expanded' => false,
+            'em' => $this->em,
+            'class' => null,
+            'property' => null,
+            'query_builder' => null,
+            'choices' => array(),
+            'preferred_choices' => array(),
+            'multiple' => false,
+            'expanded' => false,
+        );
+
+        $options = array_replace($defaultOptions, $options);
+
+        if (!isset($options['choice_list'])) {
+            $defaultOptions['choice_list'] = new EntityChoiceList(
+                $options['em'],
+                $options['class'],
+                $options['property'],
+                $options['query_builder'],
+                $options['choices']
+            );
+        }
+
+        return $defaultOptions;
+    }
+
+    public function getParent(array $options)
+    {
+        return 'choice';
+    }
+
+    public function getName()
+    {
+        return 'entity';
+    }
+}
\ No newline at end of file
diff --git a/src/Symfony/Bridge/Doctrine/Form/EventListener/MergeCollectionListener.php b/src/Symfony/Bridge/Doctrine/Form/EventListener/MergeCollectionListener.php
new file mode 100644
index 0000000000..8be4d5e9fc
--- /dev/null
+++ b/src/Symfony/Bridge/Doctrine/Form/EventListener/MergeCollectionListener.php
@@ -0,0 +1,59 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\Doctrine\Form\EventListener;
+
+use Symfony\Component\Form\Events;
+use Symfony\Component\Form\Event\FilterDataEvent;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+/**
+ * Merge changes from the request to a Doctrine\Common\Collections\Collection instance.
+ *
+ * This works with ORM, MongoDB and CouchDB instances of the collection interface.
+ *
+ * @see Doctrine\Common\Collections\Collection
+ * @author Bernhard Schussek <bernhard.schussek@symfony-project.com>
+ */
+class MergeCollectionListener implements EventSubscriberInterface
+{
+    public static function getSubscribedEvents()
+    {
+        return Events::onBindNormData;
+    }
+
+    public function onBindNormData(FilterDataEvent $event)
+    {
+        $collection = $event->getForm()->getData();
+        $data = $event->getData();
+
+        if (!$collection) {
+            $collection = $data;
+        } else if (count($data) === 0) {
+            $collection->clear();
+        } else {
+            // merge $data into $collection
+            foreach ($collection as $entity) {
+                if (!$data->contains($entity)) {
+                    $collection->removeElement($entity);
+                } else {
+                    $data->removeElement($entity);
+                }
+            }
+
+            foreach ($data as $entity) {
+                $collection->add($entity);
+            }
+        }
+
+        $event->setData($collection);
+    }
+}
\ No newline at end of file
diff --git a/src/Symfony/Component/Form/FieldFactory/EntityFieldFactoryGuesser.php b/src/Symfony/Bridge/Doctrine/Form/Type/Guesser/EntityTypeGuesser.php
similarity index 60%
rename from src/Symfony/Component/Form/FieldFactory/EntityFieldFactoryGuesser.php
rename to src/Symfony/Bridge/Doctrine/Form/Type/Guesser/EntityTypeGuesser.php
index 02c0c00f3d..8cc043e861 100644
--- a/src/Symfony/Component/Form/FieldFactory/EntityFieldFactoryGuesser.php
+++ b/src/Symfony/Bridge/Doctrine/Form/Type/Guesser/EntityTypeGuesser.php
@@ -9,16 +9,20 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Form\FieldFactory;
+namespace Symfony\Bridge\Doctrine\Form\Type\Guesser;
 
 use Doctrine\ORM\EntityManager;
+use Symfony\Component\Form\Type\Guesser\Guess;
+use Symfony\Component\Form\Type\Guesser\TypeGuesserInterface;
+use Symfony\Component\Form\Type\Guesser\TypeGuess;
+use Symfony\Component\Form\Type\Guesser\ValueGuess;
 
 /**
  * Guesses form fields from the metadata of Doctrine 2
  *
  * @author Bernhard Schussek <bernhard.schussek@symfony.com>
  */
-class EntityFieldFactoryGuesser implements FieldFactoryGuesserInterface
+class EntityTypeGuesser implements TypeGuesserInterface
 {
     /**
      * The Doctrine 2 entity manager
@@ -49,7 +53,7 @@ class EntityFieldFactoryGuesser implements FieldFactoryGuesserInterface
     /**
      * @inheritDoc
      */
-    public function guessClass($class, $property)
+    public function guessType($class, $property)
     {
         if ($this->isMappedClass($class)) {
             $metadata = $this->em->getClassMetadata($class);
@@ -58,86 +62,86 @@ class EntityFieldFactoryGuesser implements FieldFactoryGuesserInterface
                 $multiple = $metadata->isCollectionValuedAssociation($property);
                 $mapping = $metadata->getAssociationMapping($property);
 
-                return new FieldFactoryClassGuess(
-                    'Symfony\Component\Form\EntityChoiceField',
+                return new TypeGuess(
+                    'entity',
                     array(
                         'em' => $this->em,
                         'class' => $mapping['targetEntity'],
                         'multiple' => $multiple,
                     ),
-                    FieldFactoryGuess::HIGH_CONFIDENCE
+                    Guess::HIGH_CONFIDENCE
                 );
             } else {
                 switch ($metadata->getTypeOfField($property))
                 {
         //            case 'array':
-        //                return new FieldFactoryClassGuess(
-        //                    'Symfony\Component\Form\CollectionField',
+        //                return new TypeGuess(
+        //                    'Collection',
         //                    array(),
-        //                    FieldFactoryGuess::HIGH_CONFIDENCE
+        //                    Guess::HIGH_CONFIDENCE
         //                );
                     case 'boolean':
-                        return new FieldFactoryClassGuess(
-                            'Symfony\Component\Form\CheckboxField',
+                        return new TypeGuess(
+                            'checkbox',
                             array(),
-                            FieldFactoryGuess::HIGH_CONFIDENCE
+                            Guess::HIGH_CONFIDENCE
                         );
                     case 'datetime':
                     case 'vardatetime':
                     case 'datetimetz':
-                        return new FieldFactoryClassGuess(
-                            'Symfony\Component\Form\DateTimeField',
+                        return new TypeGuess(
+                            'datetime',
                             array(),
-                            FieldFactoryGuess::HIGH_CONFIDENCE
+                            Guess::HIGH_CONFIDENCE
                         );
                     case 'date':
-                        return new FieldFactoryClassGuess(
-                            'Symfony\Component\Form\DateField',
+                        return new TypeGuess(
+                            'date',
                             array(),
-                            FieldFactoryGuess::HIGH_CONFIDENCE
+                            Guess::HIGH_CONFIDENCE
                         );
                     case 'decimal':
                     case 'float':
-                        return new FieldFactoryClassGuess(
-                            'Symfony\Component\Form\NumberField',
+                        return new TypeGuess(
+                            'number',
                             array(),
-                            FieldFactoryGuess::MEDIUM_CONFIDENCE
+                            Guess::MEDIUM_CONFIDENCE
                         );
                     case 'integer':
                     case 'bigint':
                     case 'smallint':
-                        return new FieldFactoryClassGuess(
-                            'Symfony\Component\Form\IntegerField',
+                        return new TypeGuess(
+                            'integer',
                             array(),
-                            FieldFactoryGuess::MEDIUM_CONFIDENCE
+                            Guess::MEDIUM_CONFIDENCE
                         );
                     case 'string':
-                        return new FieldFactoryClassGuess(
-                            'Symfony\Component\Form\TextField',
+                        return new TypeGuess(
+                            'text',
                             array(),
-                            FieldFactoryGuess::MEDIUM_CONFIDENCE
+                            Guess::MEDIUM_CONFIDENCE
                         );
                     case 'text':
-                        return new FieldFactoryClassGuess(
-                            'Symfony\Component\Form\TextareaField',
+                        return new TypeGuess(
+                            'textarea',
                             array(),
-                            FieldFactoryGuess::MEDIUM_CONFIDENCE
+                            Guess::MEDIUM_CONFIDENCE
                         );
                     case 'time':
-                        return new FieldFactoryClassGuess(
-                            'Symfony\Component\Form\TimeField',
+                        return new TypeGuess(
+                            'time',
                             array(),
-                            FieldFactoryGuess::HIGH_CONFIDENCE
+                            Guess::HIGH_CONFIDENCE
                         );
     //                case 'object': ???
                 }
             }
         }
 
-        return new FieldFactoryClassGuess(
-            'Symfony\Component\Form\TextField',
+        return new TypeGuess(
+            'text',
             array(),
-            FieldFactoryGuess::LOW_CONFIDENCE
+            Guess::LOW_CONFIDENCE
         );
     }
 
@@ -151,15 +155,15 @@ class EntityFieldFactoryGuesser implements FieldFactoryGuesserInterface
 
             if ($metadata->hasField($property)) {
                 if (!$metadata->isNullable($property)) {
-                    return new FieldFactoryGuess(
+                    return new ValueGuess(
                         true,
-                        FieldFactoryGuess::HIGH_CONFIDENCE
+                        Guess::HIGH_CONFIDENCE
                     );
                 }
 
-                return new FieldFactoryGuess(
+                return new ValueGuess(
                     false,
-                    FieldFactoryGuess::MEDIUM_CONFIDENCE
+                    Guess::MEDIUM_CONFIDENCE
                 );
             }
         }
@@ -178,9 +182,9 @@ class EntityFieldFactoryGuesser implements FieldFactoryGuesserInterface
 
 
                 if (isset($mapping['length'])) {
-                    return new FieldFactoryGuess(
+                    return new ValueGuess(
                         $mapping['length'],
-                        FieldFactoryGuess::HIGH_CONFIDENCE
+                        Guess::HIGH_CONFIDENCE
                     );
                 }
             }
diff --git a/src/Symfony/Bridge/Twig/Extension/FormExtension.php b/src/Symfony/Bridge/Twig/Extension/FormExtension.php
new file mode 100644
index 0000000000..6630805098
--- /dev/null
+++ b/src/Symfony/Bridge/Twig/Extension/FormExtension.php
@@ -0,0 +1,244 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\Twig\Extension;
+
+use Symfony\Bridge\Twig\TokenParser\FormThemeTokenParser;
+use Symfony\Component\Form\FormView;
+use Symfony\Component\Form\Exception\FormException;
+
+/**
+ * FormExtension extends Twig with form capabilities.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ * @author Bernhard Schussek <bernhard.schussek@symfony.com>
+ */
+class FormExtension extends \Twig_Extension
+{
+    protected $resources;
+    protected $templates;
+    protected $environment;
+    protected $themes;
+
+    public function __construct(array $resources = array())
+    {
+        $this->themes = new \SplObjectStorage();
+        $this->resources = $resources;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function initRuntime(\Twig_Environment $environment)
+    {
+        $this->environment = $environment;
+    }
+
+    /**
+     * Sets a theme for a given view.
+     *
+     * @param FormView $view   A FormView instance
+     * @param array           $resources An array of resources
+     */
+    public function setTheme(FormView $view, array $resources)
+    {
+        $this->themes->attach($view, $resources);
+    }
+
+    /**
+     * Returns the token parser instance to add to the existing list.
+     *
+     * @return array An array of Twig_TokenParser instances
+     */
+    public function getTokenParsers()
+    {
+        return array(
+            // {% form_theme form "SomeBungle::widgets.twig" %}
+            new FormThemeTokenParser(),
+        );
+    }
+
+    public function getFunctions()
+    {
+        return array(
+            'form_enctype' => new \Twig_Function_Method($this, 'renderEnctype', array('is_safe' => array('html'))),
+            'form_widget'  => new \Twig_Function_Method($this, 'renderWidget', array('is_safe' => array('html'))),
+            'form_errors'  => new \Twig_Function_Method($this, 'renderErrors', array('is_safe' => array('html'))),
+            'form_label'   => new \Twig_Function_Method($this, 'renderLabel', array('is_safe' => array('html'))),
+            'form_row'     => new \Twig_Function_Method($this, 'renderRow', array('is_safe' => array('html'))),
+            'form_rest'    => new \Twig_Function_Method($this, 'renderRest', array('is_safe' => array('html'))),
+        );
+    }
+
+    /**
+     * Renders the HTML enctype in the form tag, if necessary
+     *
+     * Example usage in Twig templates:
+     *
+     *     <form action="..." method="post" {{ form_enctype(form) }}>
+     *
+     * @param FormView $view  The view for which to render the encoding type
+     */
+    public function renderEnctype(FormView $view)
+    {
+        return $this->render($view, 'enctype');
+    }
+
+    /**
+     * Renders a row for the view.
+     *
+     * @param FormView $view  The view to render as a row
+     */
+    public function renderRow(FormView $view, array $variables = array())
+    {
+        return $this->render($view, 'row', $variables);
+    }
+
+    public function renderRest(FormView $view, array $variables = array())
+    {
+        return $this->render($view, 'rest', $variables);
+    }
+
+    /**
+     * Renders the HTML for a given view
+     *
+     * Example usage in Twig:
+     *
+     *     {{ form_widget(view) }}
+     *
+     * You can pass attributes element during the call:
+     *
+     *     {{ form_widget(view, {'class': 'foo'}) }}
+     *
+     * Some fields also accept additional variables as parameters:
+     *
+     *     {{ form_widget(view, {}, {'separator': '+++++'}) }}
+     *
+     * @param FormView $view    The view to render
+     * @param array           $attributes HTML attributes passed to the template
+     * @param array           $parameters Additional variables passed to the template
+     * @param array|string    $resources  A resource or array of resources
+     */
+    public function renderWidget(FormView $view, array $variables = array(), $resources = null)
+    {
+        if (null !== $resources && !is_array($resources)) {
+            $resources = array($resources);
+        }
+
+        return $this->render($view, 'widget', $variables, $resources);
+    }
+
+    /**
+     * Renders the errors of the given view
+     *
+     * @param FormView $view The view to render the errors for
+     * @param array           $params  Additional variables passed to the template
+     */
+    public function renderErrors(FormView $view)
+    {
+        return $this->render($view, 'errors');
+    }
+
+    /**
+     * Renders the label of the given view
+     *
+     * @param FormView $view The view to render the label for
+     */
+    public function renderLabel(FormView $view, $label = null)
+    {
+        return $this->render($view, 'label', null === $label ? array() : array('label' => $label));
+    }
+
+    protected function render(FormView $view, $section, array $variables = array(), array $resources = null)
+    {
+        $templates = $this->getTemplates($view, $resources);
+        $blocks = $view->get('types');
+        foreach ($blocks as &$block) {
+            $block = $block.'_'.$section;
+
+            if (isset($templates[$block])) {
+                if ('widget' === $section || 'row' === $section) {
+                    $view->setRendered(true);
+                }
+
+                return $templates[$block]->renderBlock($block, array_merge($view->all(), $variables));
+            }
+        }
+
+        throw new FormException(sprintf('Unable to render form as none of the following blocks exist: "%s".', implode('", "', $blocks)));
+    }
+
+    protected function getTemplate(FormView $view, $name, array $resources = null)
+    {
+        $templates = $this->getTemplates($view, $resources);
+
+        return $templates[$name];
+    }
+
+    protected function getTemplates(FormView $view, array $resources = null)
+    {
+        // templates are looked for in the following resources:
+        //   * resources provided directly into the function call
+        //   * resources from the themes (and its parents)
+        //   * default resources
+
+        // defaults
+        $all = $this->resources;
+
+        // themes
+        $parent = $view;
+        do {
+            if (isset($this->themes[$parent])) {
+                $all = array_merge($all, $this->themes[$parent]);
+            }
+        } while ($parent = $parent->getParent());
+
+        // local
+        $all = array_merge($all, null !== $resources ? (array) $resources : array());
+
+        $templates = array();
+        foreach ($all as $resource) {
+            if (!$resource instanceof \Twig_Template) {
+                $resource = $this->environment->loadTemplate($resource);
+            }
+
+            $blocks = array();
+            foreach ($this->getBlockNames($resource) as $name) {
+                $blocks[$name] = $resource;
+            }
+
+            $templates = array_replace($templates, $blocks);
+        }
+
+        return $templates;
+    }
+
+    protected function getBlockNames($resource)
+    {
+        $names = $resource->getBlockNames();
+        $parent = $resource;
+        while (false !== $parent = $parent->getParent(array())) {
+            $names = array_merge($names, $parent->getBlockNames());
+        }
+
+        return array_unique($names);
+    }
+
+    /**
+     * Returns the name of the extension.
+     *
+     * @return string The extension name
+     */
+    public function getName()
+    {
+        return 'form';
+    }
+}
diff --git a/src/Symfony/Bundle/TwigBundle/Node/FormThemeNode.php b/src/Symfony/Bridge/Twig/Node/FormThemeNode.php
similarity index 96%
rename from src/Symfony/Bundle/TwigBundle/Node/FormThemeNode.php
rename to src/Symfony/Bridge/Twig/Node/FormThemeNode.php
index 418d1af1c1..c4ad0205c0 100644
--- a/src/Symfony/Bundle/TwigBundle/Node/FormThemeNode.php
+++ b/src/Symfony/Bridge/Twig/Node/FormThemeNode.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Bundle\TwigBundle\Node;
+namespace Symfony\Bridge\Twig\Node;
 
 /**
  *
diff --git a/src/Symfony/Bundle/TwigBundle/TokenParser/FormThemeTokenParser.php b/src/Symfony/Bridge/Twig/TokenParser/FormThemeTokenParser.php
similarity index 92%
rename from src/Symfony/Bundle/TwigBundle/TokenParser/FormThemeTokenParser.php
rename to src/Symfony/Bridge/Twig/TokenParser/FormThemeTokenParser.php
index f2b80f064b..83da6e37b1 100644
--- a/src/Symfony/Bundle/TwigBundle/TokenParser/FormThemeTokenParser.php
+++ b/src/Symfony/Bridge/Twig/TokenParser/FormThemeTokenParser.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Bundle\TwigBundle\TokenParser;
+namespace Symfony\Bridge\Twig\TokenParser;
 
-use Symfony\Bundle\TwigBundle\Node\FormThemeNode;
+use Symfony\Bridge\Twig\Node\FormThemeNode;
 
 /**
  *
diff --git a/src/Symfony/Bundle/DoctrineBundle/Resources/config/orm.xml b/src/Symfony/Bundle/DoctrineBundle/Resources/config/orm.xml
index a40164b326..3145428c2b 100644
--- a/src/Symfony/Bundle/DoctrineBundle/Resources/config/orm.xml
+++ b/src/Symfony/Bundle/DoctrineBundle/Resources/config/orm.xml
@@ -38,7 +38,7 @@
         <parameter key="doctrine.orm.proxy_cache_warmer.class">Symfony\Bundle\DoctrineBundle\CacheWarmer\ProxyCacheWarmer</parameter>
         
         <!-- form field factory guesser -->
-        <parameter key="form.field_factory.doctrine_guesser.class">Symfony\Component\Form\FieldFactory\EntityFieldFactoryGuesser</parameter>
+        <parameter key="form.guesser.doctrine.class">Symfony\Bridge\Doctrine\Form\Type\Guesser\EntityTypeGuesser</parameter>
     </parameters>
 
     <services>
@@ -55,8 +55,13 @@
             <argument type="service" id="service_container" />
         </service>
         
-        <service id="form.field_factory.doctrine_guesser" class="%form.field_factory.doctrine_guesser.class%" public="false">
-        	<tag name="form.field_factory.guesser" />
+        <service id="form.guesser.doctrine" class="%form.guesser.doctrine.class%" public="false">
+            <tag name="form.guesser" />
+            <argument type="service" id="doctrine.orm.entity_manager" />
+        </service>
+        
+        <service id="form.type.entity" class="Symfony\Bridge\Doctrine\Form\EntityType">
+            <tag name="form.type" alias="entity" />
             <argument type="service" id="doctrine.orm.entity_manager" />
         </service>
     </services>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Debug/TraceableEventDispatcher.php b/src/Symfony/Bundle/FrameworkBundle/Debug/TraceableEventDispatcher.php
index bdea0f0456..9fa355055d 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Debug/TraceableEventDispatcher.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Debug/TraceableEventDispatcher.php
@@ -110,6 +110,7 @@ class TraceableEventDispatcher extends ContainerAwareEventDispatcher implements
     public function getNotCalledListeners()
     {
         $notCalled = array();
+
         foreach (array_keys($this->getListeners()) as $name) {
             foreach ($this->getListeners($name) as $listener) {
                 if (!isset($this->called[$name.'.'.get_class($listener)])) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddFieldFactoryGuessersPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddFormGuessersPass.php
similarity index 57%
rename from src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddFieldFactoryGuessersPass.php
rename to src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddFormGuessersPass.php
index ef88acf730..3795eb13d1 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddFieldFactoryGuessersPass.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddFormGuessersPass.php
@@ -16,23 +16,25 @@ use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\Reference;
 
 /**
- * Adds all services with the tag "form.field_factory_guesser" as argument
- * to the "form.field_factory" service
+ * Adds all services with the tag "form.guesser" as constructor argument of the
+ * "form.factory" service
  *
  * @author Bernhard Schussek <bernhard.schussek@symfony.com>
  */
-class AddFieldFactoryGuessersPass implements CompilerPassInterface
+class AddFormGuessersPass implements CompilerPassInterface
 {
     public function process(ContainerBuilder $container)
     {
-        if (!$container->hasDefinition('form.field_factory')) {
+        if (!$container->hasDefinition('form.factory')) {
             return;
         }
 
-        $guessers = array_map(function($id) {
-            return new Reference($id);
-        }, array_keys($container->findTaggedServiceIds('form.field_factory.guesser')));
+        $guessers = array();
 
-        $container->getDefinition('form.field_factory')->replaceArgument(0, $guessers);
+        foreach ($container->findTaggedServiceIds('form.guesser') as $serviceId => $tag) {
+            $guessers[] = new Reference($serviceId);
+        }
+
+        $container->getDefinition('form.factory')->replaceArgument(1, $guessers);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddFormTypesPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddFormTypesPass.php
new file mode 100644
index 0000000000..43e0a5d8b4
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddFormTypesPass.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler;
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+
+/**
+ * Adds all services with the tag "form.type" as argument
+ * to the "form.type.loader" service
+ *
+ * @author Bernhard Schussek <bernhard.schussek@symfony-project.com>
+ */
+class AddFormTypesPass implements CompilerPassInterface
+{
+    public function process(ContainerBuilder $container)
+    {
+        if (!$container->hasDefinition('form.type.loader')) {
+            return;
+        }
+
+        // Builds an array with service IDs as keys and tag aliases as values
+        $types = array();
+        $tags = $container->findTaggedServiceIds('form.type');
+
+        foreach ($tags as $serviceId => $arguments) {
+            $alias = isset($arguments[0]['alias'])
+                ? $arguments[0]['alias']
+                : $serviceId;
+
+            // Flip, because we want tag aliases (= type identifiers) as keys
+            $types[$alias] = $serviceId;
+        }
+
+        $container->getDefinition('form.type.loader')->replaceArgument(1, $types);
+    }
+}
\ No newline at end of file
diff --git a/src/Symfony/Bundle/FrameworkBundle/Form/ContainerAwareTypeLoader.php b/src/Symfony/Bundle/FrameworkBundle/Form/ContainerAwareTypeLoader.php
new file mode 100644
index 0000000000..03369a6fca
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Form/ContainerAwareTypeLoader.php
@@ -0,0 +1,42 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Form;
+
+use Symfony\Component\Form\Type\Loader\TypeLoaderInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+class ContainerAwareTypeLoader implements TypeLoaderInterface
+{
+    private $container;
+
+    private $serviceIds;
+
+    public function __construct(ContainerInterface $container, array $serviceIds)
+    {
+        $this->container = $container;
+        $this->serviceIds = $serviceIds;
+    }
+
+    public function getType($identifier)
+    {
+        if (!isset($this->serviceIds[$identifier])) {
+            throw new \InvalidArgumentException(sprintf('The field type "%s" is not registered with the service container.', $identifier));
+        }
+
+        return $this->container->get($this->serviceIds[$identifier]);
+    }
+
+    public function hasType($identifier)
+    {
+        return isset($this->serviceIds[$identifier]);
+    }
+}
\ No newline at end of file
diff --git a/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php b/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
index dedd53aed9..593b74f8df 100644
--- a/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
+++ b/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
@@ -12,7 +12,8 @@
 namespace Symfony\Bundle\FrameworkBundle;
 
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AddConstraintValidatorsPass;
-use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AddFieldFactoryGuessersPass;
+use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AddFormTypesPass;
+use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AddFormGuessersPass;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\TemplatingPass;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\RegisterKernelListenersPass;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\RoutingResolverPass;
@@ -77,7 +78,8 @@ class FrameworkBundle extends Bundle
         $container->addCompilerPass(new RegisterKernelListenersPass());
         $container->addCompilerPass(new TemplatingPass());
         $container->addCompilerPass(new AddConstraintValidatorsPass());
-        $container->addCompilerPass(new AddFieldFactoryGuessersPass());
+        $container->addCompilerPass(new AddFormTypesPass());
+        $container->addCompilerPass(new AddFormGuessersPass());
         $container->addCompilerPass(new AddClassesToCachePass());
         $container->addCompilerPass(new AddClassesToAutoloadMapPass());
         $container->addCompilerPass(new TranslatorPass());
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml
index e75157a644..e3d7474d58 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml
@@ -5,47 +5,147 @@
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <parameters>
-        <parameter key="form.field_factory.class">Symfony\Component\Form\FieldFactory\FieldFactory</parameter>
-        <parameter key="form.field_factory.validator_guesser.class">Symfony\Component\Form\FieldFactory\ValidatorFieldFactoryGuesser</parameter>
+        <parameter key="form.factory.class">Symfony\Component\Form\FormFactory</parameter>
+        <parameter key="form.type.loader.class">Symfony\Bundle\FrameworkBundle\Form\ContainerAwareTypeLoader</parameter>
+        <parameter key="form.guesser.validator.class">Symfony\Component\Form\Type\Guesser\ValidatorTypeGuesser</parameter>
         <parameter key="form.csrf_provider.class">Symfony\Component\Form\CsrfProvider\SessionCsrfProvider</parameter>
-        <parameter key="form.context.class">Symfony\Component\Form\FormContext</parameter>
         <parameter key="form.csrf_protection.enabled">true</parameter>
         <parameter key="form.csrf_protection.field_name">_token</parameter>
         <parameter key="form.csrf_protection.secret">secret</parameter>
         <parameter key="form.validation_groups">Default</parameter>
+        <parameter key="file.temporary_storage.class">Symfony\Component\HttpFoundation\File\SessionBasedTemporaryStorage</parameter>
+        <parameter key="file.temporary_storage.secret">abcdef</parameter>
+        <parameter key="file.temporary_storage.nesting_levels">3</parameter>
+        <parameter key="file.temporary_storage.directory"></parameter>
     </parameters>
 
     <services>
 
-        <!-- FieldFactory -->
-        <service id="form.field_factory" class="%form.field_factory.class%">
-            <!-- All services with tag "form.field_factory.guesser" are inserted here by AddFieldFactoryGuessersPass -->
+        <!-- FormFactory -->
+        <service id="form.factory" class="%form.factory.class%">
+            <argument type="service" id="form.type.loader" />
+            <!--
+            All services with tag "form.guesser" are inserted here by
+            AddFormGuessersPass
+            -->
             <argument type="collection" />
         </service>
 
-        <!-- ValidatorFieldFactoryGuesser -->
-        <service id="form.field_factory.validator_guesser" class="%form.field_factory.validator_guesser.class%" public="false">
-            <tag name="form.field_factory.guesser" />
+        <!-- ValidatorTypeGuesser -->
+        <service id="form.guesser.validator" class="%form.guesser.validator.class%" public="false">
+            <tag name="form.guesser" />
             <argument type="service" id="validator.mapping.class_metadata_factory" />
         </service>
-        
+
         <!-- CsrfProvider -->
         <service id="form.csrf_provider" class="%form.csrf_provider.class%">
             <argument type="service" id="session" />
             <argument>%form.csrf_protection.secret%</argument>
         </service>
 
-        <!-- FormContext -->
-        <service id="form.context" class="%form.context.class%">
-            <argument type="collection">
-                <argument key="validator" type="service" id="validator" />
-                <argument key="validation_groups">%form.validation_groups%</argument>
-                <argument key="field_factory" type="service" id="form.field_factory" />
-                <argument key="csrf_protection">%form.csrf_protection.enabled%</argument>
-                <argument key="csrf_field_name">%form.csrf_protection.field_name%</argument>
-                <argument key="csrf_provider" type="service" id="form.csrf_provider" />
-            </argument>
+        <!-- TemporaryStorage - where should we put this? -->
+        <service id="file.temporary_storage" class="%file.temporary_storage.class%">
+            <argument type="service" id="session" />
+            <argument>%file.temporary_storage.secret%</argument>
+            <argument>%file.temporary_storage.nesting_levels%</argument>
+            <argument>%file.temporary_storage.directory%</argument>
         </service>
-        
+
+        <!-- ContainerAwareTypeLoader -->
+        <service id="form.type.loader" class="%form.type.loader.class%">
+            <argument type="service" id="service_container" />
+            <!--
+            All services with tag "form.type" are inserted here by
+            AddFormTypesPass
+            -->
+            <argument type="collection" />
+        </service>
+
+        <!-- FieldTypes -->
+        <service id="form.type.field" class="Symfony\Component\Form\Type\FieldType">
+            <tag name="form.type" alias="field" />
+            <argument type="service" id="validator" />
+        </service>
+        <service id="form.type.form" class="Symfony\Component\Form\Type\FormType">
+            <tag name="form.type" alias="form" />
+        </service>
+        <service id="form.type.birthday" class="Symfony\Component\Form\Type\BirthdayType">
+            <tag name="form.type" alias="birthday" />
+        </service>
+        <service id="form.type.checkbox" class="Symfony\Component\Form\Type\CheckboxType">
+            <tag name="form.type" alias="checkbox" />
+        </service>
+        <service id="form.type.choice" class="Symfony\Component\Form\Type\ChoiceType">
+            <tag name="form.type" alias="choice" />
+        </service>
+        <service id="form.type.collection" class="Symfony\Component\Form\Type\CollectionType">
+            <tag name="form.type" alias="collection" />
+        </service>
+        <service id="form.type.country" class="Symfony\Component\Form\Type\CountryType">
+            <tag name="form.type" alias="country" />
+        </service>
+        <service id="form.type.csrf" class="Symfony\Component\Form\Type\CsrfType">
+            <tag name="form.type" alias="csrf" />
+            <argument type="service" id="form.csrf_provider" />
+        </service>
+        <service id="form.type.date" class="Symfony\Component\Form\Type\DateType">
+            <tag name="form.type" alias="date" />
+        </service>
+        <service id="form.type.datetime" class="Symfony\Component\Form\Type\DateTimeType">
+            <tag name="form.type" alias="datetime" />
+        </service>
+        <service id="form.type.email" class="Symfony\Component\Form\Type\EmailType">
+            <tag name="form.type" alias="email" />
+        </service>
+        <service id="form.type.file" class="Symfony\Component\Form\Type\FileType">
+            <tag name="form.type" alias="file" />
+            <argument type="service" id="file.temporary_storage" />
+        </service>
+        <service id="form.type.hidden" class="Symfony\Component\Form\Type\HiddenType">
+            <tag name="form.type" alias="hidden" />
+        </service>
+        <service id="form.type.integer" class="Symfony\Component\Form\Type\IntegerType">
+            <tag name="form.type" alias="integer" />
+        </service>
+        <service id="form.type.language" class="Symfony\Component\Form\Type\LanguageType">
+            <tag name="form.type" alias="language" />
+        </service>
+        <service id="form.type.locale" class="Symfony\Component\Form\Type\LocaleType">
+            <tag name="form.type" alias="locale" />
+        </service>
+        <service id="form.type.money" class="Symfony\Component\Form\Type\MoneyType">
+            <tag name="form.type" alias="money" />
+        </service>
+        <service id="form.type.number" class="Symfony\Component\Form\Type\NumberType">
+            <tag name="form.type" alias="number" />
+        </service>
+        <service id="form.type.password" class="Symfony\Component\Form\Type\PasswordType">
+            <tag name="form.type" alias="password" />
+        </service>
+        <service id="form.type.percent" class="Symfony\Component\Form\Type\PercentType">
+            <tag name="form.type" alias="percent" />
+        </service>
+        <service id="form.type.radio" class="Symfony\Component\Form\Type\RadioType">
+            <tag name="form.type" alias="radio" />
+        </service>
+        <service id="form.type.repeated" class="Symfony\Component\Form\Type\RepeatedType">
+            <tag name="form.type" alias="repeated" />
+        </service>
+        <service id="form.type.textarea" class="Symfony\Component\Form\Type\TextareaType">
+            <tag name="form.type" alias="textarea" />
+        </service>
+        <service id="form.type.text" class="Symfony\Component\Form\Type\TextType">
+            <tag name="form.type" alias="text" />
+        </service>
+        <service id="form.type.time" class="Symfony\Component\Form\Type\TimeType">
+            <tag name="form.type" alias="time" />
+        </service>
+        <service id="form.type.timezone" class="Symfony\Component\Form\Type\TimezoneType">
+            <tag name="form.type" alias="timezone" />
+        </service>
+        <service id="form.type.url" class="Symfony\Component\Form\Type\UrlType">
+            <tag name="form.type" alias="url" />
+        </service>
+
     </services>
 </container>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/checkbox_field.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/checkbox_field.html.php
deleted file mode 100644
index 720e5d25b3..0000000000
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/checkbox_field.html.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<input type="checkbox"
-    id="<?php echo $field->getId() ?>"
-    name="<?php echo $field->getName() ?>"
-    <?php if ($field->hasValue()): ?>value="<?php echo $field->getValue() ?>"<?php endif ?>
-    <?php if ($field->isDisabled()): ?>disabled="disabled"<?php endif ?>
-    <?php if ($field->isRequired()): ?>required="required"<?php endif ?>
-    <?php if ($field->isChecked()): ?>checked="checked"<?php endif ?>
-    <?php echo $view['form']->attributes($attr) ?>
-/>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/checkbox_widget.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/checkbox_widget.html.php
new file mode 100644
index 0000000000..cc7cdc3d23
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/checkbox_widget.html.php
@@ -0,0 +1,8 @@
+<input type="checkbox"
+    <?php echo $view['form']->attributes() ?>
+    name="<?php echo $view->escape($name) ?>"
+    <?php if ($value): ?>value="<?php echo $view->escape($value) ?>"<?php endif ?>
+    <?php if ($read_only): ?>disabled="disabled"<?php endif ?>
+    <?php if ($required): ?>required="required"<?php endif ?>
+    <?php if ($checked): ?>checked="checked"<?php endif ?>
+/>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_field.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_field.html.php
deleted file mode 100644
index 6413374332..0000000000
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_field.html.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php if ($field->isExpanded()): ?>
-    <?php foreach ($field as $choice => $child): ?>
-        <?php echo $view['form']->render($child) ?>
-        <label for="<?php echo $child->getId() ?>"><?php echo $field->getLabel($choice) ?></label>
-    <?php endforeach ?>
-<?php else: ?>
-    <select
-        id="<?php echo $field->getId() ?>"
-        name="<?php echo $field->getName() ?>"
-        <?php if ($field->isDisabled()): ?> disabled="disabled"<?php endif ?>
-        <?php if ($field->isMultipleChoice()): ?> multiple="multiple"<?php endif ?>
-        <?php echo $view['form']->attributes($attr) ?>
-    >
-        <?php if (count($field->getPreferredChoices()) > 0): ?>
-            <?php foreach ($field->getPreferredChoices() as $choice => $label): ?>
-                <?php if ($field->isChoiceGroup($label)): ?>
-                    <optgroup label="<?php echo $choice ?>">
-                        <?php foreach ($label as $nestedChoice => $nestedLabel): ?>
-                            <option value="<?php echo $nestedChoice ?>"<?php if ($field->isChoiceSelected($nestedChoice)): ?> selected="selected"<?php endif?>>
-                                <?php echo $nestedLabel ?>
-                            </option>
-                        <?php endforeach ?>
-                    </optgroup>
-                <?php else: ?>
-                    <option value="<?php echo $choice ?>"<?php if ($field->isChoiceSelected($choice)): ?> selected="selected"<?php endif?>>
-                        <?php echo $label ?>
-                    </option>
-                <?php endif ?>
-            <?php endforeach ?>
-            <option disabled="disabled"><?php echo isset($separator) ? $separator : '-----------------' ?></option>
-        <?php endif ?>
-        <?php foreach ($field->getOtherChoices() as $choice => $label): ?>
-            <?php if ($field->isChoiceGroup($label)): ?>
-                <optgroup label="<?php echo $choice ?>">
-                    <?php foreach ($label as $nestedChoice => $nestedLabel): ?>
-                        <option value="<?php echo $nestedChoice ?>"<?php if ($field->isChoiceSelected($nestedChoice)): ?> selected="selected"<?php endif?>>
-                            <?php echo $nestedLabel ?>
-                        </option>
-                    <?php endforeach ?>
-                </optgroup>
-            <?php else: ?>
-                <option value="<?php echo $choice ?>"<?php if ($field->isChoiceSelected($choice)): ?> selected="selected"<?php endif?>>
-                    <?php echo $label ?>
-                </option>
-            <?php endif ?>
-        <?php endforeach ?>
-    </select>
-<?php endif ?>
\ No newline at end of file
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget.html.php
new file mode 100644
index 0000000000..f047c2634c
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget.html.php
@@ -0,0 +1,42 @@
+<?php if ($expanded): ?>
+    <div<?php echo $view['form']->attributes() ?>>
+    <?php foreach ($form as $choice => $child): ?>
+        <?php echo $view['form']->widget($child) ?>
+        <?php echo $view['form']->label($child) ?>
+    <?php endforeach ?>
+    </div>
+<?php else: ?>
+    <select
+        <?php echo $view['form']->attributes() ?>
+        name="<?php echo $view->escape($name) ?>"
+        <?php if ($read_only): ?> disabled="disabled"<?php endif ?>
+        <?php if ($multiple): ?> multiple="multiple"<?php endif ?>
+    >
+        <?php if (!$multiple && !$required): ?><option value=""><?php echo $empty_value; ?></option><?php endif; ?>
+        <?php if (count($preferred_choices) > 0): ?>
+            <?php foreach ($preferred_choices as $choice => $label): ?>
+                <?php if ($form->isChoiceGroup($label)): ?>
+                    <optgroup label="<?php echo $view->escape($choice) ?>">
+                        <?php foreach ($label as $nestedChoice => $nestedLabel): ?>
+                            <option value="<?php echo $view->escape($nestedChoice) ?>"<?php if ($form->isChoiceSelected($nestedChoice)): ?> selected="selected"<?php endif?>><?php echo $view->escape($nestedLabel) ?></option>
+                        <?php endforeach ?>
+                    </optgroup>
+                <?php else: ?>
+                    <option value="<?php echo $view->escape($choice) ?>"<?php if ($form->isChoiceSelected($choice)): ?> selected="selected"<?php endif?>><?php echo $view->escape($label) ?></option>
+                <?php endif ?>
+            <?php endforeach ?>
+            <option disabled="disabled"><?php echo $separator ?></option>
+        <?php endif ?>
+        <?php foreach ($choices as $choice => $label): ?>
+            <?php if ($form->isChoiceGroup($label)): ?>
+                <optgroup label="<?php echo $view->escape($choice) ?>">
+                    <?php foreach ($label as $nestedChoice => $nestedLabel): ?>
+                        <option value="<?php echo $view->escape($nestedChoice) ?>"<?php if ($form->isChoiceSelected($nestedChoice)): ?> selected="selected"<?php endif?>><?php echo $view->escape($nestedLabel) ?></option>
+                    <?php endforeach ?>
+                </optgroup>
+            <?php else: ?>
+                <option value="<?php echo $view->escape($choice) ?>"<?php if ($form->isChoiceSelected($choice)): ?> selected="selected"<?php endif?>><?php echo $view->escape($label) ?></option>
+            <?php endif ?>
+        <?php endforeach ?>
+    </select>
+<?php endif ?>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/collection_row.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/collection_row.html.php
new file mode 100644
index 0000000000..28d2c55e94
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/collection_row.html.php
@@ -0,0 +1 @@
+<?php echo $view['form']->render('form', 'widget', $renderer->all()); ?>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/csrf_widget.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/csrf_widget.html.php
new file mode 100644
index 0000000000..8694268b9e
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/csrf_widget.html.php
@@ -0,0 +1,8 @@
+<?php if (!$form->hasParent() || !$form->getParent()->hasParent()): ?>
+<input type="hidden"
+    <?php echo $view['form']->attributes() ?>
+    name="<?php echo $view->escape($name) ?>"
+    value="<?php echo $view->escape($value) ?>"
+    <?php if ($read_only): ?>disabled="disabled"<?php endif ?>
+/>
+<?php endif ?>
\ No newline at end of file
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/date_field.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/date_field.html.php
deleted file mode 100644
index 656932e496..0000000000
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/date_field.html.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php if ($field->isField()): ?>
-    <input type="text"
-        id="<?php echo $field->getId() ?>"
-        name="<?php echo $field->getName() ?>"
-        value="<?php echo $field->getDisplayedData() ?>"
-        <?php if ($field->isDisabled()): ?>disabled="disabled"<?php endif ?>
-        <?php if ($field->isRequired()): ?>required="required"<?php endif ?>
-        <?php echo $view['form']->attributes($attr) ?>
-    />
-<?php else: ?>
-    <?php echo str_replace(array('{{ year }}', '{{ month }}', '{{ day }}'), array(
-        $view['form']->render($field['year']),
-        $view['form']->render($field['month']),
-        $view['form']->render($field['day']),
-    ), $field->getPattern()) ?>
-<?php endif ?>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/date_time_field.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/date_time_field.html.php
deleted file mode 100644
index 9c3d39f44f..0000000000
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/date_time_field.html.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php echo $view['form']->render($field['date']) ?>
-<!-- keep space -->
-<?php echo $view['form']->render($field['time']) ?>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/date_widget.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/date_widget.html.php
new file mode 100644
index 0000000000..a71e9b4059
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/date_widget.html.php
@@ -0,0 +1,18 @@
+<?php if ($widget == 'text'): ?>
+    <input type="text"
+        <?php echo $view['form']->attributes() ?>
+        name="<?php echo $view->escape($name) ?>"
+        value="<?php echo $view->escape($value) ?>"
+        <?php if ($read_only): ?>disabled="disabled"<?php endif ?>
+        <?php if ($required): ?>required="required"<?php endif ?>
+        <?php if ($max_length): ?>maxlength="<?php echo $max_length ?>"<?php endif ?>
+    />
+<?php else: ?>
+    <div<?php echo $view['form']->attributes() ?>>
+        <?php echo str_replace(array('{{ year }}', '{{ month }}', '{{ day }}'), array(
+            $view['form']->widget($form['year']),
+            $view['form']->widget($form['month']),
+            $view['form']->widget($form['day']),
+        ), $date_pattern) ?>
+    </div>
+<?php endif ?>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/datetime_widget.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/datetime_widget.html.php
new file mode 100644
index 0000000000..65f39def44
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/datetime_widget.html.php
@@ -0,0 +1,5 @@
+<div<?php echo $view['form']->attributes() ?>>
+    <?php echo $view['form']->widget($form['date'])
+        . ' '
+        . $view['form']->widget($form['time']) ?>
+</div>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/email_widget.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/email_widget.html.php
new file mode 100644
index 0000000000..edda95dc2c
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/email_widget.html.php
@@ -0,0 +1,8 @@
+<input type="email"
+    <?php echo $view['form']->attributes() ?>
+    name="<?php echo $view->escape($name) ?>"
+    value="<?php echo $view->escape($value) ?>"
+    <?php if ($max_length): ?>maxlength="<?php echo $view->escape($max_length) ?>"<?php endif ?>
+    <?php if ($read_only): ?>disabled="disabled"<?php endif ?>
+    <?php if ($required): ?>required="required"<?php endif ?>
+/>
\ No newline at end of file
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_enctype.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_enctype.html.php
new file mode 100644
index 0000000000..424d425969
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_enctype.html.php
@@ -0,0 +1 @@
+<?php if ($form->get('multipart')): ?>enctype="multipart/form-data"<?php endif ?>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/errors.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_errors.html.php
similarity index 73%
rename from src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/errors.html.php
rename to src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_errors.html.php
index de5d9faed5..777554aa6b 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/errors.html.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_errors.html.php
@@ -1,6 +1,6 @@
-<?php if ($field->hasErrors()): ?>
+<?php if ($errors): ?>
     <ul>
-        <?php foreach ($field->getErrors() as $error): ?>
+        <?php foreach ($errors as $error): ?>
             <li><?php echo $view['translator']->trans(
                 $error->getMessageTemplate(),
                 $error->getMessageParameters(),
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_label.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_label.html.php
new file mode 100644
index 0000000000..bc924a151c
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_label.html.php
@@ -0,0 +1 @@
+<label for="<?php echo $view->escape($id) ?>"><?php echo $view->escape($view['translator']->trans($label)) ?></label>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_rest.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_rest.html.php
new file mode 100644
index 0000000000..dfd328ebf6
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_rest.html.php
@@ -0,0 +1,5 @@
+<?php foreach ($form->getChildren() as $child): ?>
+    <?php if (!$child->isRendered()): ?>
+        <?php echo $view['form']->row($child) ?>
+    <?php endif; ?>
+<?php endforeach; ?>
\ No newline at end of file
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_row.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_row.html.php
index cff22dae26..8840d334e4 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_row.html.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_row.html.php
@@ -1,5 +1,5 @@
 <div>
-    <?php echo $view['form']->label($field) ?>
-    <?php echo $view['form']->errors($field) ?>
-    <?php echo $view['form']->render($field) ?>
+    <?php echo $view['form']->label($form) ?>
+    <?php echo $view['form']->errors($form) ?>
+    <?php echo $view['form']->widget($form) ?>
 </div>
\ No newline at end of file
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_widget.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_widget.html.php
new file mode 100644
index 0000000000..d6f5d9f556
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_widget.html.php
@@ -0,0 +1,7 @@
+<input
+    <?php echo $view['form']->attributes() ?>
+    name="<?php echo $view->escape($name) ?>"
+    value="<?php echo $view->escape($value) ?>"
+    <?php if ($read_only): ?>disabled="disabled"<?php endif ?>
+    <?php if ($required): ?>required="required"<?php endif ?>
+/>
\ No newline at end of file
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/file_field.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/file_field.html.php
deleted file mode 100644
index 1aa8aae32c..0000000000
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/file_field.html.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<input type="file"
-    id="<?php echo $field['file']->getId() ?>"
-    name="<?php echo $field['file']->getName() ?>"
-    <?php if ($field['file']->isDisabled()): ?>disabled="disabled"<?php endif ?>
-    <?php if ($field['file']->isRequired()): ?>required="required"<?php endif ?>
-    <?php echo $view['form']->attributes($attr) ?>
-/>
-
-<?php echo $view['form']->render($field['token']) ?>
-<?php echo $view['form']->render($field['original_name']) ?>
\ No newline at end of file
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/file_widget.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/file_widget.html.php
new file mode 100644
index 0000000000..6b560b4c9b
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/file_widget.html.php
@@ -0,0 +1,11 @@
+<div<?php echo $view['form']->attributes() ?>>
+    <input type="file"
+        id="<?php echo $view->escape($form['file']->get('id')) ?>"
+        name="<?php echo $view->escape($form['file']->get('name')) ?>"
+        <?php if ($form['file']->get('disabled')): ?>disabled="disabled"<?php endif ?>
+        <?php if ($form['file']->get('required')): ?>required="required"<?php endif ?>
+    />
+
+    <?php echo $view['form']->widget($form['token']) ?>
+    <?php echo $view['form']->widget($form['name']) ?>
+</div>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/form.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/form.html.php
deleted file mode 100644
index 33155eb1aa..0000000000
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/form.html.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php echo $view['form']->errors($field) ?>
-
-<div>
-    <?php foreach ($field->getVisibleFields() as $child): ?>
-        <?php echo $view['form']->row($child) ?>
-    <?php endforeach; ?>
-</div>
-
-<?php echo $view['form']->hidden($field) ?>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/form_widget.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/form_widget.html.php
new file mode 100644
index 0000000000..33b035f9d9
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/form_widget.html.php
@@ -0,0 +1,8 @@
+<div<?php echo $view['form']->attributes() ?>>
+    <?php echo $view['form']->errors($form); ?>
+    <?php foreach ($form->getChildren() as $child): ?>
+        <?php echo $view['form']->row($child); ?>
+    <?php endforeach; ?>
+    <?php echo $view['form']->rest($form) ?>
+</div>
+
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/hidden.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/hidden.html.php
deleted file mode 100644
index 6e0aedc783..0000000000
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/hidden.html.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php foreach ($field->getAllHiddenFields() as $child): ?>
-    <?php echo $view['form']->render($child) ?>
-<?php endforeach; ?>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/hidden_field.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/hidden_field.html.php
deleted file mode 100644
index 739d250e75..0000000000
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/hidden_field.html.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<input type="hidden"
-    id="<?php echo $field->getId() ?>"
-    name="<?php echo $field->getName() ?>"
-    value="<?php echo $field->getDisplayedData() ?>"
-    <?php if ($field->isDisabled()): ?>disabled="disabled"<?php endif ?>
-    <?php echo $view['form']->attributes($attr) ?>
-/>
\ No newline at end of file
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/hidden_row.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/hidden_row.html.php
new file mode 100644
index 0000000000..e3201c90ff
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/hidden_row.html.php
@@ -0,0 +1 @@
+<?php echo $view['form']->widget($form) ?>
\ No newline at end of file
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/hidden_widget.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/hidden_widget.html.php
new file mode 100644
index 0000000000..16f5082fc7
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/hidden_widget.html.php
@@ -0,0 +1,6 @@
+<input type="hidden"
+    <?php echo $view['form']->attributes() ?>
+    name="<?php echo $view->escape($name) ?>"
+    value="<?php echo $view->escape($value) ?>"
+    <?php if ($read_only): ?>disabled="disabled"<?php endif ?>
+/>
\ No newline at end of file
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/integer_widget.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/integer_widget.html.php
new file mode 100644
index 0000000000..26d871285e
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/integer_widget.html.php
@@ -0,0 +1,7 @@
+<input type="number"
+    <?php echo $view['form']->attributes() ?>
+    name="<?php echo $view->escape($name) ?>"
+    value="<?php echo $view->escape($value) ?>"
+    <?php if ($read_only): ?>disabled="disabled"<?php endif ?>
+    <?php if ($required): ?>required="required"<?php endif ?>
+/>
\ No newline at end of file
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/label.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/label.html.php
deleted file mode 100644
index 842e4b0777..0000000000
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/label.html.php
+++ /dev/null
@@ -1 +0,0 @@
-<label for="<?php echo $field->getId() ?>"><?php echo $view['translator']->trans($label) ?></label>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/money_field.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/money_field.html.php
deleted file mode 100644
index df05f6fe2f..0000000000
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/money_field.html.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php echo str_replace('{{ widget }}',
-    $view['form']->render($field, array(), array(), 'FrameworkBundle:Form:number_field.html.php'),
-    $field->getPattern()
-) ?>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/money_widget.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/money_widget.html.php
new file mode 100644
index 0000000000..17a4a05a8d
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/money_widget.html.php
@@ -0,0 +1,4 @@
+<?php echo str_replace('{{ widget }}',
+    $view['form']->render('FrameworkBundle:Form:number_widget.html.php'),
+    $money_pattern
+) ?>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/number_field.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/number_field.html.php
deleted file mode 100644
index a203a2f7e8..0000000000
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/number_field.html.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<input type="number"
-    id="<?php echo $field->getId() ?>"
-    name="<?php echo $field->getName() ?>"
-    value="<?php echo $field->getDisplayedData() ?>"
-    <?php if ($field->isDisabled()): ?>disabled="disabled"<?php endif ?>
-    <?php if ($field->isRequired()): ?>required="required"<?php endif ?>
-    <?php echo $view['form']->attributes($attr) ?>
-/>
\ No newline at end of file
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/number_widget.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/number_widget.html.php
new file mode 100644
index 0000000000..a605569d4d
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/number_widget.html.php
@@ -0,0 +1,8 @@
+<input type="text"
+    <?php echo $view['form']->attributes() ?>
+    name="<?php echo $view->escape($name) ?>"
+    value="<?php echo $view->escape($value) ?>"
+    <?php if ($read_only): ?>disabled="disabled"<?php endif ?>
+    <?php if ($required): ?>required="required"<?php endif ?>
+    <?php if ($max_length): ?>maxlength="<?php echo $max_length ?>"<?php endif ?>
+/>
\ No newline at end of file
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/password_field.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/password_field.html.php
deleted file mode 100644
index 0936342ab4..0000000000
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/password_field.html.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<input type="password"
-    id="<?php echo $field->getId() ?>"
-    name="<?php echo $field->getName() ?>"
-    value="<?php echo $field->getDisplayedData() ?>"
-    <?php if ($field->isDisabled()): ?>disabled="disabled"<?php endif ?>
-    <?php if ($field->isRequired()): ?>required="required"<?php endif ?>
-    <?php // FIXME if (!isset($attr['maxlength']) && $field->getMaxLength() > 0) $attr['maxlength'] = $field->getMaxLength() ?>
-    <?php echo $view['form']->attributes($attr) ?>
-/>
\ No newline at end of file
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/password_widget.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/password_widget.html.php
new file mode 100644
index 0000000000..37f1318852
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/password_widget.html.php
@@ -0,0 +1,8 @@
+<input type="password"
+    <?php echo $view['form']->attributes() ?>
+    name="<?php echo $view->escape($name) ?>"
+    value="<?php echo $view->escape($value) ?>"
+    <?php if ($read_only): ?>disabled="disabled"<?php endif ?>
+    <?php if ($required): ?>required="required"<?php endif ?>
+    <?php if ($max_length): ?>maxlength="<?php echo $max_length ?>"<?php endif ?>
+/>
\ No newline at end of file
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/percent_field.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/percent_field.html.php
deleted file mode 100644
index 4fb2b09dea..0000000000
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/percent_field.html.php
+++ /dev/null
@@ -1 +0,0 @@
-<?php echo $view['form']->render($field, array(), array(), 'FrameworkBundle:Form:number_field.html.php') ?> %
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/percent_widget.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/percent_widget.html.php
new file mode 100644
index 0000000000..6d4da4b028
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/percent_widget.html.php
@@ -0,0 +1 @@
+<?php echo $view['form']->render('FrameworkBundle:Form:number_widget.html.php') ?> %
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/radio_field.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/radio_field.html.php
deleted file mode 100644
index fa04934b54..0000000000
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/radio_field.html.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<input type="radio"
-    id="<?php echo $field->getId() ?>"
-    name="<?php echo $field->getName() ?>"
-    <?php if ($field->hasValue()): ?>value="<?php echo $field->getValue() ?>"<?php endif ?>
-    <?php if ($field->isDisabled()): ?>disabled="disabled"<?php endif ?>
-    <?php if ($field->isRequired()): ?>required="required"<?php endif ?>
-    <?php if ($field->isChecked()): ?>checked="checked"<?php endif ?>
-    <?php echo $view['form']->attributes($attr) ?>
-/>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/radio_widget.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/radio_widget.html.php
new file mode 100644
index 0000000000..a697ec25a0
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/radio_widget.html.php
@@ -0,0 +1,8 @@
+<input type="radio"
+    <?php echo $view['form']->attributes() ?>
+    name="<?php echo $view->escape($name) ?>"
+    value="<?php echo $view->escape($value) ?>"
+    <?php if ($read_only): ?>disabled="disabled"<?php endif ?>
+    <?php if ($required): ?>required="required"<?php endif ?>
+    <?php if ($checked): ?>checked="checked"<?php endif ?>
+/>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/repeated_row.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/repeated_row.html.php
new file mode 100644
index 0000000000..76a8b2add9
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/repeated_row.html.php
@@ -0,0 +1,5 @@
+<?php echo $view['form']->errors($form) ?>
+
+<?php foreach ($form->getChildren() as $child): ?>
+    <?php echo $view['form']->row($child); ?>
+<?php endforeach; ?>
\ No newline at end of file
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/text_field.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/text_field.html.php
deleted file mode 100644
index c7d8eda847..0000000000
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/text_field.html.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<input type="text"
-    id="<?php echo $field->getId() ?>"
-    name="<?php echo $field->getName() ?>"
-    value="<?php echo $field->getDisplayedData() ?>"
-    <?php if ($field->isDisabled()): ?>disabled="disabled"<?php endif ?>
-    <?php if ($field->isRequired()): ?>required="required"<?php endif ?>
-    <?php if (!isset($attr['maxlength']) && $field->getMaxLength() > 0) $attr['maxlength'] = $field->getMaxLength() ?>
-    <?php echo $view['form']->attributes($attr) ?>
-/>
\ No newline at end of file
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/text_widget.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/text_widget.html.php
new file mode 100644
index 0000000000..a605569d4d
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/text_widget.html.php
@@ -0,0 +1,8 @@
+<input type="text"
+    <?php echo $view['form']->attributes() ?>
+    name="<?php echo $view->escape($name) ?>"
+    value="<?php echo $view->escape($value) ?>"
+    <?php if ($read_only): ?>disabled="disabled"<?php endif ?>
+    <?php if ($required): ?>required="required"<?php endif ?>
+    <?php if ($max_length): ?>maxlength="<?php echo $max_length ?>"<?php endif ?>
+/>
\ No newline at end of file
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/textarea_field.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/textarea_field.html.php
deleted file mode 100644
index c6a5dedf67..0000000000
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/textarea_field.html.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<textarea
-    id="<?php echo $field->getId() ?>"
-    name="<?php echo $field->getName() ?>"
-    <?php if ($field->isDisabled()): ?>disabled="disabled"<?php endif ?>
-    <?php if ($field->isRequired()): ?>required="required"<?php endif ?>
-    <?php echo $view['form']->attributes($attr) ?>
-><?php
-    echo $view->escape($field->getDisplayedData())
-?></textarea>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/textarea_widget.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/textarea_widget.html.php
new file mode 100644
index 0000000000..3eb9062e94
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/textarea_widget.html.php
@@ -0,0 +1,6 @@
+<textarea
+    <?php echo $view['form']->attributes() ?>
+    name="<?php echo $view->escape($name) ?>"
+    <?php if ($read_only): ?>disabled="disabled"<?php endif ?>
+    <?php if ($required): ?>required="required"<?php endif ?>
+><?php echo $view->escape($value) ?></textarea>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/time_field.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/time_field.html.php
deleted file mode 100644
index 707fa6021b..0000000000
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/time_field.html.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-    // There should be no spaces between the colons and the widgets, that's why
-    // this block is written in a single PHP tag
-    echo $view['form']->render($field['hour'], array('size' => 1));
-    echo ':';
-    echo $view['form']->render($field['minute'], array('size' => 1));
-
-    if ($field->isWithSeconds()) {
-        echo ':';
-        echo $view['form']->render($field['second'], array('size' => 1));
-    }
-?>
\ No newline at end of file
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/time_widget.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/time_widget.html.php
new file mode 100644
index 0000000000..e3e1407720
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/time_widget.html.php
@@ -0,0 +1,14 @@
+<div<?php echo $view['form']->attributes() ?>>
+    <?php
+        // There should be no spaces between the colons and the widgets, that's why
+        // this block is written in a single PHP tag
+        echo $view['form']->widget($form['hour'], array('attr' => array('size' => 1)));
+        echo ':';
+        echo $view['form']->widget($form['minute'], array('attr' => array('size' => 1)));
+
+        if ($with_seconds) {
+            echo ':';
+            echo $view['form']->widget($form['second'], array('attr' => array('size' => 1)));
+        }
+    ?>
+</div>
\ No newline at end of file
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/url_field.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/url_field.html.php
deleted file mode 100644
index 1b2d99589b..0000000000
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/url_field.html.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<input type="url"
-    id="<?php echo $field->getId() ?>"
-    name="<?php echo $field->getName() ?>"
-    value="<?php echo $field->getDisplayedData() ?>"
-    <?php if ($field->isDisabled()): ?>disabled="disabled"<?php endif ?>
-    <?php if ($field->isRequired()): ?>required="required"<?php endif ?>
-    <?php echo $view['form']->attributes($attr) ?>
-/>
\ No newline at end of file
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/url_widget.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/url_widget.html.php
new file mode 100644
index 0000000000..3b3829bc29
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/url_widget.html.php
@@ -0,0 +1,7 @@
+<input type="url"
+    <?php echo $view['form']->attributes() ?>
+    name="<?php echo $view->escape($name) ?>"
+    value="<?php echo $view->escape($value) ?>"
+    <?php if ($read_only): ?>disabled="disabled"<?php endif ?>
+    <?php if ($required): ?>required="required"<?php endif ?>
+/>
\ No newline at end of file
diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php
index 854f0efa8a..fc60b604cb 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php
@@ -12,12 +12,12 @@
 namespace Symfony\Bundle\FrameworkBundle\Templating\Helper;
 
 use Symfony\Component\Templating\Helper\Helper;
-use Symfony\Component\Form\FieldInterface;
-use Symfony\Component\Form\FormInterface;
-use Symfony\Bundle\FrameworkBundle\Templating\EngineInterface;
+use Symfony\Component\Templating\EngineInterface;
+use Symfony\Component\Form\FormView;
+use Symfony\Component\Form\Exception\FormException;
 
 /**
- * Form is a factory that wraps Form instances.
+ *
  *
  * @author Fabien Potencier <fabien@symfony.com>
  * @author Bernhard Schussek <bernhard.schussek@symfony.com>
@@ -28,82 +28,45 @@ class FormHelper extends Helper
 
     protected $engine;
 
+    protected $varStack = array();
+
     public function __construct(EngineInterface $engine)
     {
         $this->engine = $engine;
     }
 
-    public function getName()
+    public function attributes()
     {
-        return 'form';
-    }
+        $html = '';
+        $attr = array();
 
-    public function attributes($attributes)
-    {
-        if ($attributes instanceof \Traversable) {
-            $attributes = iterator_to_array($attributes);
-        }
+        if (count($this->varStack) > 0) {
+            $vars = end($this->varStack);
 
-        return implode('', array_map(array($this, 'attributesCallback'), array_keys($attributes), array_values($attributes)));
-    }
+            if (isset($vars['attr'])) {
+                $attr = $vars['attr'];
+            }
 
-    private function attribute($name, $value)
-    {
-        return sprintf('%s="%s"', $name, true === $value ? $name : $value);
-    }
-
-    /**
-     * Prepares an attribute key and value for HTML representation.
-     *
-     * It removes empty attributes, except for the value one.
-     *
-     * @param  string $name   The attribute name
-     * @param  string $value  The attribute value
-     *
-     * @return string The HTML representation of the HTML key attribute pair.
-     */
-    private function attributesCallback($name, $value)
-    {
-        if (false === $value || null === $value || ('' === $value && 'value' != $name)) {
-            return '';
-        }
-
-        return ' '.$this->attribute($name, $value);
-    }
-
-    /**
-     * Renders the form tag.
-     *
-     * This method only renders the opening form tag.
-     * You need to close it after the form rendering.
-     *
-     * This method takes into account the multipart widgets.
-     *
-     * @param  string $url         The URL for the action
-     * @param  array  $attributes  An array of HTML attributes
-     *
-     * @return string An HTML representation of the opening form tag
-     */
-    public function enctype(/*Form */$form)
-    {
-        return $form->isMultipart() ? ' enctype="multipart/form-data"' : '';
-    }
-
-    public function render(/*FieldInterface */$field, array $attributes = array(), array $parameters = array(), $template = null)
-    {
-        if (null === $template) {
-            $template = $this->lookupTemplate($field);
-
-            if (null === $template) {
-                throw new \RuntimeException(sprintf('Unable to find a template to render the "%s" widget.', $field->getKey()));
+            if (isset($vars['id'])) {
+                $attr['id'] = $vars['id'];
             }
         }
 
-        return trim($this->engine->render($template, array(
-            'field'  => $field,
-            'attr'   => $attributes,
-            'params' => $parameters,
-        )));
+        foreach ($attr as $k => $v) {
+            $html .= ' '.$this->engine->escape($k).'="'.$this->engine->escape($v).'"';
+        }
+
+        return $html;
+    }
+
+    public function enctype(FormView $view)
+    {
+        return $this->renderSection($view, 'enctype');
+    }
+
+    public function widget(FormView $view, array $variables = array())
+    {
+        return trim($this->renderSection($view, 'widget', $variables));
     }
 
     /**
@@ -112,85 +75,89 @@ class FormHelper extends Helper
      * @param  FieldInterface $field
      * @return string
      */
-    public function row(/*FieldInterface*/ $field, $template = null)
+    public function row(FormView $view, array $variables = array())
     {
-        if (null === $template) {
-            $template = 'FrameworkBundle:Form:field_row.html.php';
-        }
-
-        return $this->engine->render($template, array(
-            'field' => $field,
-        ));
+        return $this->renderSection($view, 'row', $variables);
     }
 
-    public function label(/*FieldInterface */$field, $label = false, array $parameters = array(), $template = null)
+    public function label(FormView $view, $label = null)
     {
-        if (null === $template) {
-            $template = 'FrameworkBundle:Form:label.html.php';
-        }
-
-        return $this->engine->render($template, array(
-            'field'  => $field,
-            'params' => $parameters,
-            'label'  => $label ? $label : ucfirst(strtolower(str_replace('_', ' ', $field->getKey())))
-        ));
+        return $this->renderSection($view, 'label', null === $label ? array() : array('label' => $label));
     }
 
-    public function errors(/*FieldInterface */$field, array $parameters = array(), $template = null)
+    public function errors(FormView $view)
     {
-        if (null === $template) {
-            $template = 'FrameworkBundle:Form:errors.html.php';
-        }
-
-        return $this->engine->render($template, array(
-            'field'  => $field,
-            'params' => $parameters,
-        ));
+        return $this->renderSection($view, 'errors');
     }
 
-    public function hidden(/*FormInterface */$form, array $parameters = array(), $template = null)
+    public function rest(FormView $view, array $variables = array())
     {
-        if (null === $template) {
-            $template = 'FrameworkBundle:Form:hidden.html.php';
-        }
-
-        return $this->engine->render($template, array(
-            'field'  => $form,
-            'params' => $parameters,
-        ));
+        return $this->renderSection($view, 'rest', $variables);
     }
 
-    protected function lookupTemplate(/*FieldInterface */$field)
+    protected function renderSection(FormView $view, $section, array $variables = array())
     {
-        $fqClassName = get_class($field);
         $template = null;
+        $blocks = $view->get('types');
 
-        if (isset(self::$cache[$fqClassName])) {
-            return self::$cache[$fqClassName];
-        }
+        foreach ($blocks as &$block) {
+            $block = $block.'_'.$section;
+            $template = $this->lookupTemplate($block);
 
-        // find a template for the given class or one of its parents
-        $currentFqClassName = $fqClassName;
-
-        do {
-            $parts = explode('\\', $currentFqClassName);
-            $className = array_pop($parts);
-
-            $underscoredName = strtolower(preg_replace(array('/([A-Z]+)([A-Z][a-z])/', '/([a-z\d])([A-Z])/'), array('\\1_\\2', '\\1_\\2'), strtr($className, '_', '.')));
-
-            if ($this->engine->exists($guess = 'FrameworkBundle:Form:'.$underscoredName.'.html.php')) {
-                $template = $guess;
+            if ($template) {
+                break;
             }
-
-            $currentFqClassName = get_parent_class($currentFqClassName);
-        } while (null === $template && false !== $currentFqClassName);
-
-        if (null === $template && $field instanceof FormInterface) {
-            $template = 'FrameworkBundle:Form:form.html.php';
         }
 
-        self::$cache[$fqClassName] = $template;
+        if (!$template) {
+            throw new FormException(sprintf('Unable to render form as none of the following blocks exist: "%s".', implode('", "', $blocks)));
+        }
+
+        if ('widget' === $section || 'row' === $section) {
+            $view->setRendered(true);
+        }
+
+        return $this->render($template, array_merge($view->all(), $variables));
+    }
+
+    public function render($template, array $variables = array())
+    {
+        array_push($this->varStack, array_merge(
+            count($this->varStack) > 0 ? end($this->varStack) : array(),
+            $variables
+        ));
+
+        $html = $this->engine->render($template, end($this->varStack));
+
+        array_pop($this->varStack);
+
+        return $html;
+    }
+
+    protected function lookupTemplate($templateName)
+    {
+        if (isset(self::$cache[$templateName])) {
+            return self::$cache[$templateName];
+        }
+
+        $template = $templateName.'.html.php';
+/*
+        if ($this->templateDir) {
+            $template = $this->templateDir.':'.$template;
+        }
+*/
+$template = 'FrameworkBundle:Form:'.$template;
+        if (!$this->engine->exists($template)) {
+            $template = false;
+        }
+
+        self::$cache[$templateName] = $template;
 
         return $template;
     }
+
+    public function getName()
+    {
+        return 'form';
+    }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Fixtures/StubTemplateNameParser.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Fixtures/StubTemplateNameParser.php
new file mode 100644
index 0000000000..6d4a0e1594
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Fixtures/StubTemplateNameParser.php
@@ -0,0 +1,33 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Templating\Helper\Fixtures;
+
+use Symfony\Component\Templating\TemplateNameParserInterface;
+use Symfony\Component\Templating\TemplateReference;
+
+class StubTemplateNameParser implements TemplateNameParserInterface
+{
+    private $root;
+
+    public function __construct($root)
+    {
+        $this->root = $root;
+    }
+
+    public function parse($name)
+    {
+        $parts = explode(':', $name);
+        $name = $parts[count($parts)-1];
+
+        return new TemplateReference($this->root.'/'.$name, 'php');
+    }
+}
\ No newline at end of file
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Fixtures/StubTranslator.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Fixtures/StubTranslator.php
new file mode 100644
index 0000000000..5b29b724e8
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Fixtures/StubTranslator.php
@@ -0,0 +1,35 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Templating\Helper\Fixtures;
+
+use Symfony\Component\Translation\TranslatorInterface;
+
+class StubTranslator implements TranslatorInterface
+{
+    public function trans($id, array $parameters = array(), $domain = null, $locale = null)
+    {
+        return '[trans]'.$id.'[/trans]';
+    }
+
+    public function transChoice($id, $number, array $parameters = array(), $domain = null, $locale = null)
+    {
+        return '[trans]'.$id.'[/trans]';
+    }
+
+    public function setLocale($locale)
+    {
+    }
+
+    public function getLocale()
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperTest.php
new file mode 100644
index 0000000000..3a2ebf56c7
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperTest.php
@@ -0,0 +1,78 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Templating\Helper;
+
+require_once __DIR__.'/Fixtures/StubTemplateNameParser.php';
+require_once __DIR__.'/Fixtures/StubTranslator.php';
+
+use Symfony\Bundle\FrameworkBundle\Templating\Helper\FormHelper;
+use Symfony\Bundle\FrameworkBundle\Templating\Helper\TranslatorHelper;
+use Symfony\Bundle\FrameworkBundle\Tests\Templating\Helper\Fixtures\StubTemplateNameParser;
+use Symfony\Bundle\FrameworkBundle\Tests\Templating\Helper\Fixtures\StubTranslator;
+use Symfony\Component\Form\FormView;
+use Symfony\Component\Templating\PhpEngine;
+use Symfony\Component\Templating\TemplateNameParser;
+use Symfony\Component\Templating\Loader\FilesystemLoader;
+use Symfony\Tests\Component\Form\AbstractDivLayoutTest;
+
+class FormHelperTest extends AbstractDivLayoutTest
+{
+    protected $helper;
+
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $root = realpath(__DIR__.'/../../../Resources/views/Form');
+        $templateNameParser = new StubTemplateNameParser($root);
+        $loader = new FilesystemLoader(array());
+        $engine = new PhpEngine($templateNameParser, $loader);
+
+        $this->helper = new FormHelper($engine);
+
+        $engine->setHelpers(array(
+            $this->helper,
+            new TranslatorHelper(new StubTranslator()),
+        ));
+    }
+
+    protected function renderEnctype(FormView $view)
+    {
+        return (string)$this->helper->enctype($view);
+    }
+
+    protected function renderLabel(FormView $view, $label = null)
+    {
+        return (string)$this->helper->label($view, $label);
+    }
+
+    protected function renderErrors(FormView $view)
+    {
+        return (string)$this->helper->errors($view);
+    }
+
+    protected function renderWidget(FormView $view, array $vars = array())
+    {
+        return (string)$this->helper->widget($view, $vars);
+    }
+
+    protected function renderRow(FormView $view, array $vars = array())
+    {
+        return (string)$this->helper->row($view, $vars);
+    }
+
+    protected function renderRest(FormView $view, array $vars = array())
+    {
+        return (string)$this->helper->rest($view, $vars);
+    }
+
+}
\ No newline at end of file
diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php
index d22d365f36..643a1e9912 100644
--- a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php
+++ b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php
@@ -59,11 +59,11 @@ class Configuration implements ConfigurationInterface
                     ->children()
                         ->arrayNode('resources')
                             ->addDefaultsIfNotSet()
-                            ->defaultValue(array('TwigBundle::form.html.twig'))
+                            ->defaultValue(array('TwigBundle:Form:div_layout.html.twig'))
                             ->validate()
                                 ->always()
                                 ->then(function($v){
-                                    return array_merge(array('TwigBundle::form.html.twig'), $v);
+                                    return array_merge(array('TwigBundle:Form:div_layout.html.twig'), $v);
                                 })
                             ->end()
                             ->prototype('scalar')->end()
diff --git a/src/Symfony/Bundle/TwigBundle/Extension/FormExtension.php b/src/Symfony/Bundle/TwigBundle/Extension/FormExtension.php
deleted file mode 100644
index 11de5dddd8..0000000000
--- a/src/Symfony/Bundle/TwigBundle/Extension/FormExtension.php
+++ /dev/null
@@ -1,300 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Bundle\TwigBundle\Extension;
-
-use Symfony\Component\Form\Form;
-use Symfony\Component\Form\FormInterface;
-use Symfony\Component\Form\FieldInterface;
-use Symfony\Component\Form\CollectionField;
-use Symfony\Component\Form\HybridField;
-use Symfony\Bundle\TwigBundle\TokenParser\FormThemeTokenParser;
-
-/**
- * FormExtension extends Twig with form capabilities.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Bernhard Schussek <bernhard.schussek@symfony.com>
- */
-class FormExtension extends \Twig_Extension
-{
-    protected $resources;
-    protected $templates;
-    protected $environment;
-    protected $themes;
-
-    public function __construct(array $resources = array())
-    {
-        $this->themes = new \SplObjectStorage();
-        $this->resources = $resources;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function initRuntime(\Twig_Environment $environment)
-    {
-        $this->environment = $environment;
-    }
-
-    /**
-     * Sets a theme for a given field.
-     *
-     * @param FieldInterface $field     A FieldInterface instance
-     * @param array          $resources An array of resources
-     */
-    public function setTheme(FieldInterface $field, array $resources)
-    {
-        $this->themes->attach($field, $resources);
-    }
-
-    /**
-     * Returns the token parser instance to add to the existing list.
-     *
-     * @return array An array of Twig_TokenParser instances
-     */
-    public function getTokenParsers()
-    {
-        return array(
-            // {% form_theme form "SomeBungle::widgets.twig" %}
-            new FormThemeTokenParser(),
-        );
-    }
-
-    public function getFunctions()
-    {
-        return array(
-            'form_enctype' => new \Twig_Function_Method($this, 'renderEnctype', array('is_safe' => array('html'))),
-            'form_field'   => new \Twig_Function_Method($this, 'renderField', array('is_safe' => array('html'))),
-            'form_hidden'  => new \Twig_Function_Method($this, 'renderHidden', array('is_safe' => array('html'))),
-            'form_errors'  => new \Twig_Function_Method($this, 'renderErrors', array('is_safe' => array('html'))),
-            'form_label'   => new \Twig_Function_Method($this, 'renderLabel', array('is_safe' => array('html'))),
-            'form_data'    => new \Twig_Function_Method($this, 'renderData', array('is_safe' => array('html'))),
-            'form_row'     => new \Twig_Function_Method($this, 'renderRow', array('is_safe' => array('html'))),
-        );
-    }
-
-    /**
-     * Renders the HTML enctype in the form tag, if necessary
-     *
-     * Example usage in Twig templates:
-     *
-     *     <form action="..." method="post" {{ form_enctype(form) }}>
-     *
-     * @param Form $form   The form for which to render the encoding type
-     */
-    public function renderEnctype(Form $form)
-    {
-        return $form->isMultipart() ? 'enctype="multipart/form-data"' : '';
-    }
-
-    /**
-     * Renders a field row.
-     *
-     * @param FieldInterface $field  The field to render as a row
-     */
-    public function renderRow(FieldInterface $field)
-    {
-        return $this->render($field, 'field_row', array(
-            'child'  => $field,
-        ));
-    }
-
-    /**
-     * Renders the HTML for an individual form field
-     *
-     * Example usage in Twig:
-     *
-     *     {{ form_field(field) }}
-     *
-     * You can pass attributes element during the call:
-     *
-     *     {{ form_field(field, {'class': 'foo'}) }}
-     *
-     * Some fields also accept additional variables as parameters:
-     *
-     *     {{ form_field(field, {}, {'separator': '+++++'}) }}
-     *
-     * @param FieldInterface $field      The field to render
-     * @param array          $attributes HTML attributes passed to the template
-     * @param array          $parameters Additional variables passed to the template
-     * @param array|string   $resources  A resource or array of resources
-     */
-    public function renderField(FieldInterface $field, array $attributes = array(), array $parameters = array(), $resources = null)
-    {
-        if (null !== $resources && !is_array($resources)) {
-            $resources = array($resources);
-        }
-
-        return $this->render($field, 'field', array(
-            'field'  => $field,
-            'attr'   => $attributes,
-            'params' => $parameters,
-        ), $resources);
-    }
-
-    /**
-     * Renders all hidden fields of the given field group
-     *
-     * @param FormInterface $group   The field group
-     * @param array $params                Additional variables passed to the
-     *                                     template
-     */
-    public function renderHidden(FormInterface $group, array $parameters = array())
-    {
-        return $this->render($group, 'hidden', array(
-            'field'  => $group,
-            'params' => $parameters,
-        ));
-    }
-
-    /**
-     * Renders the errors of the given field
-     *
-     * @param FieldInterface $field  The field to render the errors for
-     * @param array $params          Additional variables passed to the template
-     */
-    public function renderErrors(FieldInterface $field, array $parameters = array())
-    {
-        return $this->render($field, 'errors', array(
-            'field'  => $field,
-            'params' => $parameters,
-        ));
-    }
-
-    /**
-     * Renders the label of the given field
-     *
-     * @param FieldInterface $field  The field to render the label for
-     * @param array $params          Additional variables passed to the template
-     */
-    public function renderLabel(FieldInterface $field, $label = null, array $parameters = array())
-    {
-        return $this->render($field, 'label', array(
-            'field'  => $field,
-            'params' => $parameters,
-            'label'  => null !== $label ? $label : ucfirst(strtolower(str_replace('_', ' ', $field->getKey()))),
-        ));
-    }
-
-    /**
-     * Renders the widget data of the given field
-     *
-     * @param FieldInterface $field The field to render the data for
-     */
-    public function renderData(FieldInterface $field)
-    {
-        return $field->getData();
-    }
-
-    protected function render(FieldInterface $field, $name, array $arguments, array $resources = null)
-    {
-        if ('field' === $name) {
-            list($name, $template) = $this->getWidget($field, $resources);
-        } else {
-            $template = $this->getTemplate($field, $name);
-        }
-
-        return $template->renderBlock($name, $arguments);
-    }
-
-    /**
-     * @param FieldInterface $field The field to get the widget for
-     * @param array $resources An array of template resources
-     * @return array
-     */
-    protected function getWidget(FieldInterface $field, array $resources = null)
-    {
-        $class = get_class($field);
-        $templates = $this->getTemplates($field, $resources);
-
-        // find a template for the given class or one of its parents
-        do {
-            $parts = explode('\\', $class);
-            $c = array_pop($parts);
-
-            // convert the base class name (e.g. TextareaField) to underscores (e.g. textarea_field)
-            $underscore = strtolower(preg_replace(array('/([A-Z]+)([A-Z][a-z])/', '/([a-z\d])([A-Z])/'), array('\\1_\\2', '\\1_\\2'), strtr($c, '_', '.')));
-
-            if (isset($templates[$underscore])) {
-                return array($underscore, $templates[$underscore]);
-            }
-        } while (false !== $class = get_parent_class($class));
-
-        throw new \RuntimeException(sprintf('Unable to render the "%s" field.', $field->getKey()));
-    }
-
-    protected function getTemplate(FieldInterface $field, $name, array $resources = null)
-    {
-        $templates = $this->getTemplates($field, $resources);
-
-        return $templates[$name];
-    }
-
-    protected function getTemplates(FieldInterface $field, array $resources = null)
-    {
-        // templates are looked for in the following resources:
-        //   * resources provided directly into the function call
-        //   * resources from the themes (and its parents)
-        //   * default resources
-
-        // defaults
-        $all = $this->resources;
-
-        // themes
-        $parent = $field;
-        do {
-            if (isset($this->themes[$parent])) {
-                $all = array_merge($all, $this->themes[$parent]);
-            }
-        } while ($parent = $parent->getParent());
-
-        // local
-        $all = array_merge($all, null !== $resources ? (array) $resources : array());
-
-        $templates = array();
-        foreach ($all as $resource) {
-            if (!$resource instanceof \Twig_Template) {
-                $resource = $this->environment->loadTemplate($resource);
-            }
-
-            $blocks = array();
-            foreach ($this->getBlockNames($resource) as $name) {
-                $blocks[$name] = $resource;
-            }
-
-            $templates = array_replace($templates, $blocks);
-        }
-
-        return $templates;
-    }
-
-    protected function getBlockNames($resource)
-    {
-        $names = $resource->getBlockNames();
-        $parent = $resource;
-        while (false !== $parent = $parent->getParent(array())) {
-            $names = array_merge($names, $parent->getBlockNames());
-        }
-
-        return array_unique($names);
-    }
-
-    /**
-     * Returns the name of the extension.
-     *
-     * @return string The extension name
-     */
-    public function getName()
-    {
-        return 'form';
-    }
-}
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml b/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
index 01ca99f3e6..ec9c750162 100644
--- a/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
+++ b/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
@@ -52,7 +52,7 @@
             <tag name="twig.extension" />
         </service>
 
-        <service id="twig.extension.form" class="Symfony\Bundle\TwigBundle\Extension\FormExtension" public="false">
+        <service id="twig.extension.form" class="Symfony\Bridge\Twig\Extension\FormExtension" public="false">
             <tag name="twig.extension" />
             <argument>%twig.form.resources%</argument>
         </service>
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/Form/div_layout.html.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/Form/div_layout.html.twig
new file mode 100644
index 0000000000..2d5e7b449b
--- /dev/null
+++ b/src/Symfony/Bundle/TwigBundle/Resources/views/Form/div_layout.html.twig
@@ -0,0 +1,265 @@
+{% block field_rows %}
+{% spaceless %}
+    {{ form_errors(form) }}
+    {% for child in form.children %}
+        {{ form_row(child) }}
+    {% endfor %}
+{% endspaceless %}
+{% endblock field_rows %}
+
+{% block field_enctype %}
+{% spaceless %}
+    {% if multipart %}enctype="multipart/form-data"{% endif %}
+{% endspaceless %}
+{% endblock field_enctype %}
+
+{% block field_errors %}
+{% spaceless %}
+    {% if errors|length > 0 %}
+    <ul>
+        {% for error in errors %}
+            <li>{{ error.messageTemplate|trans(error.messageParameters, 'validators') }}</li>
+        {% endfor %}
+    </ul>
+    {% endif %}
+{% endspaceless %}
+{% endblock field_errors %}
+
+{% block field_rest %}
+{% spaceless %}
+    {% for child in form.children %}
+        {% if not child.rendered %}
+            {{ form_row(child) }}
+        {% endif %}
+    {% endfor %}
+{% endspaceless %}
+{% endblock field_rest %}
+
+{% block field_label %}
+{% spaceless %}
+    <label for="{{ id }}">{{ label|trans }}</label>
+{% endspaceless %}
+{% endblock field_label %}
+
+{% block attributes %}
+{% spaceless %}
+    id="{{ id }}" name="{{ name }}"{% if read_only %} disabled="disabled"{% endif %}{% if required %} required="required"{% endif %}{% if max_length %} maxlength="{{ max_length }}"{% endif %}
+    {% for attrname,attrvalue in attr %}{{attrname}}="{{attrvalue}}" {% endfor %}
+{% endspaceless %}
+{% endblock attributes %}
+
+{% block field_widget %}
+{% spaceless %}
+    {% set type = type|default('text') %}
+    <input type="{{ type }}" {{ block('attributes') }} value="{{ value }}" />
+{% endspaceless %}
+{% endblock field_widget %}
+
+{% block text_widget %}
+{% spaceless %}
+    {% set type = type|default('text') %}
+    {{ block('field_widget') }}
+{% endspaceless %}
+{% endblock text_widget %}
+
+{% block password_widget %}
+{% spaceless %}
+    {% set type = type|default('password') %}
+    {{ block('field_widget') }}
+{% endspaceless %}
+{% endblock password_widget %}
+
+{% block hidden_widget %}
+    {% set type = type|default('hidden') %}
+    {{ block('field_widget') }}
+{% endblock hidden_widget %}
+
+{% block csrf_widget %}
+    {% if not form.hasParent or not form.getParent.hasParent %}
+        {% set type = type|default('hidden') %}
+        {{ block('field_widget') }}
+    {% endif %}
+{% endblock csrf_widget %}
+
+{% block hidden_row %}
+    {{ form_widget(form) }}
+{% endblock hidden_row %}
+
+{% block textarea_widget %}
+{% spaceless %}
+    <textarea {{ block('attributes') }}>{{ value }}</textarea>
+{% endspaceless %}
+{% endblock textarea_widget %}
+
+{% block options %}
+{% spaceless %}
+    {% for choice, label in options %}
+        {% if form.choiceGroup(label) %}
+            <optgroup label="{{ choice }}">
+                {% for nestedChoice, nestedLabel in label %}
+                    <option value="{{ nestedChoice }}"{% if form.choiceSelected(nestedChoice) %} selected="selected"{% endif %}>{{ nestedLabel }}</option>
+                {% endfor %}
+            </optgroup>
+        {% else %}
+            <option value="{{ choice }}"{% if form.choiceSelected(choice) %} selected="selected"{% endif %}>{{ label }}</option>
+        {% endif %}
+    {% endfor %}
+{% endspaceless %}
+{% endblock options %}
+
+{% block choice_widget %}
+{% spaceless %}
+    {% if expanded %}
+        <div {{ block('attributes') }}>
+        {% for choice, child in form %}
+            {{ form_widget(child) }}
+            {{ form_label(child) }}
+        {% endfor %}
+        </div>
+    {% else %}
+    <select {{ block('attributes') }}{% if multiple %} multiple="multiple"{% endif %}>
+        {% if not multiple and not required %}
+            <option value="">{{ empty_value }}</option>
+        {% endif %}
+        {% if preferred_choices|length > 0 %}
+            {% set options = preferred_choices %}
+            {{ block('options') }}
+            <option disabled="disabled">{{ separator }}</option>
+        {% endif %}
+        {% set options = choices %}
+        {{ block('options') }}
+    </select>
+    {% endif %}
+{% endspaceless %}
+{% endblock choice_widget %}
+
+{% block checkbox_widget %}
+{% spaceless %}
+    <input type="checkbox" {{ block('attributes') }}{% if value is defined %} value="{{ value }}"{% endif %}{% if checked %} checked="checked"{% endif %} />
+{% endspaceless %}
+{% endblock checkbox_widget %}
+
+{% block radio_widget %}
+{% spaceless %}
+    <input type="radio" {{ block('attributes') }}{% if value is defined %} value="{{ value }}"{% endif %}{% if checked %} checked="checked"{% endif %} />
+{% endspaceless %}
+{% endblock radio_widget %}
+
+{% block datetime_widget %}
+{% spaceless %}
+    <div {{ block('attributes') }}>
+        {{ form_errors(form.date) }}
+        {{ form_errors(form.time) }}
+        {{ form_widget(form.date) }}
+        {{ form_widget(form.time) }}
+    </div>
+{% endspaceless %}
+{% endblock datetime_widget %}
+
+{% block date_widget %}
+{% spaceless %}
+    {% if widget == 'text' %}
+        {{ block('text_widget') }}
+    {% else %}
+        <div {{ block('attributes') }}>
+            {{ date_pattern|replace({
+                '{{ year }}': form_widget(form.year),
+                '{{ month }}': form_widget(form.month),
+                '{{ day }}': form_widget(form.day),
+            })|raw }}
+        </div>
+    {% endif %}
+{% endspaceless %}
+{% endblock date_widget %}
+
+{% block time_widget %}
+{% spaceless %}
+    <div {{ block('attributes') }}>
+        {{ form_widget(form.hour, { 'attr': { 'size': '1' } }) }}:{{ form_widget(form.minute, { 'attr': { 'size': '1' } }) }}{% if with_seconds %}:{{ form_widget(form.second, { 'attr': { 'size': '1' } }) }}{% endif %}
+    </div>
+{% endspaceless %}
+{% endblock time_widget %}
+
+{% block number_widget %}
+{% spaceless %}
+    {# type="number" doesn't work with floats #}
+    {% set type = type|default('text') %}
+    {{ block('field_widget') }}
+{% endspaceless %}
+{% endblock number_widget %}
+
+{% block integer_widget %}
+{% spaceless %}
+    {% set type = type|default('number') %}
+    {{ block('field_widget') }}
+{% endspaceless %}
+{% endblock integer_widget %}
+
+{% block money_widget %}
+{% spaceless %}
+    {{ money_pattern|replace({ '{{ widget }}': block('field_widget') })|raw }}
+{% endspaceless %}
+{% endblock money_widget %}
+
+{% block url_widget %}
+{% spaceless %}
+    {% set type = type|default('url') %}
+    {{ block('field_widget') }}
+{% endspaceless %}
+{% endblock url_widget %}
+
+{% block percent_widget %}
+{% spaceless %}
+    {% set type = type|default('text') %}
+    {{ block('field_widget') }} %
+{% endspaceless %}
+{% endblock percent_widget %}
+
+{% block file_widget %}
+{% spaceless %}
+    <div {{ block('attributes') }}>
+        {{ form_widget(form.file) }}
+        {{ form_widget(form.token) }}
+        {{ form_widget(form.name) }}
+    </div>
+{% endspaceless %}
+{% endblock file_widget %}
+
+{% block collection_widget %}
+{% spaceless %}
+    {{ block('form_widget') }}
+{% endspaceless %}
+{% endblock collection_widget %}
+
+{% block repeated_row %}
+{% spaceless %}
+    {{ block('field_rows') }}
+{% endspaceless %}
+{% endblock repeated_row %}
+
+
+{% block field_row %}
+{% spaceless %}
+    <div>
+        {{ form_label(form) }}
+        {{ form_errors(form) }}
+        {{ form_widget(form) }}
+    </div>
+{% endspaceless %}
+{% endblock field_row %}
+
+{% block form_widget %}
+{% spaceless %}
+    <div {{ block('attributes') }}>
+        {{ block('field_rows') }}
+        {{ form_rest(form) }}
+    </div>
+{% endspaceless %}
+{% endblock form_widget %}
+
+{% block email_widget %}
+{% spaceless %}
+    {% set type = type|default('email') %}
+    {{ block('field_widget') }}
+{% endspaceless %}
+{% endblock email_widget %}
\ No newline at end of file
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/Form/table_layout.html.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/Form/table_layout.html.twig
new file mode 100644
index 0000000000..3795cd0151
--- /dev/null
+++ b/src/Symfony/Bundle/TwigBundle/Resources/views/Form/table_layout.html.twig
@@ -0,0 +1,52 @@
+{% extends "TwigBundle:Form:div_layout.html.twig" %}
+
+{% block field_row %}
+{% spaceless %}
+    <tr>
+        <td>
+            {{ form_label(form) }}
+        </td>
+        <td>
+            {{ form_errors(form) }}
+            {{ form_widget(form) }}
+        </td>
+    </tr>
+{% endspaceless %}
+{% endblock field_row %}
+
+{% block form_errors %}
+{% spaceless %}
+    {% if errors|length > 0 %}
+    <tr>
+        <td colspan="2">
+            {{ block('field_errors') }}
+        </td>
+    </tr>
+    {% endif %}
+{% endspaceless %}
+{% endblock form_errors %}
+
+{% block hidden_row %}
+{% spaceless %}
+    <tr style="display: none">
+        <td colspan="2">
+            {{ form_widget(form) }}
+        </td>
+    </tr>
+{% endspaceless %}
+{% endblock hidden_row %}
+
+{% block repeated_errors %}
+{% spaceless %}
+    {{ block('form_errors') }}
+{% endspaceless %}
+{% endblock repeated_errors %}
+
+{% block form_widget %}
+{% spaceless %}
+    <table {{ block('attributes') }}>
+        {{ block('field_rows') }}
+        {{ form_rest(form) }}
+    </table>
+{% endspaceless %}
+{% endblock form_widget %}
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/form.html.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/form.html.twig
deleted file mode 100644
index 734799759c..0000000000
--- a/src/Symfony/Bundle/TwigBundle/Resources/views/form.html.twig
+++ /dev/null
@@ -1,203 +0,0 @@
-{% block field_row %}
-{% spaceless %}
-    <div>
-        {# TODO: would be nice to rename this variable to "field" #}
-        {{ form_label(child) }}
-        {{ form_errors(child) }}
-        {{ form_field(child) }}
-    </div>
-{% endspaceless %}
-{% endblock field_row %}
-
-{% block form %}
-{% spaceless %}
-    {{ form_errors(field) }}
-    {% for child in field.visibleFields %}
-        {{ block('field_row') }}
-    {% endfor %}
-    {{ form_hidden(field) }}
-{% endspaceless %}
-{% endblock form %}
-
-{% block errors %}
-{% spaceless %}
-    {% if field.hasErrors %}
-    <ul>
-        {% for error in field.errors %}
-            <li>{% trans error.messageTemplate with error.messageParameters from 'validators' %}</li>
-        {% endfor %}
-    </ul>
-    {% endif %}
-{% endspaceless %}
-{% endblock errors %}
-
-{% block hidden %}
-{% spaceless %}
-    {% for child in field.allHiddenFields %}
-        {{ form_field(child) }}
-    {% endfor %}
-{% endspaceless %}
-{% endblock hidden %}
-
-{% block label %}
-{% spaceless %}
-    <label for="{{ field.id }}">{% trans label %}</label>
-{% endspaceless %}
-{% endblock label %}
-
-{% block attributes %}
-{% spaceless %}
-    {% for key, value in attr %}
-        {{ key }}="{{ value }}"
-    {% endfor %}
-{% endspaceless %}
-{% endblock attributes %}
-
-{% block field_attributes %}
-{% spaceless %}
-    id="{{ field.id }}" name="{{ field.name }}"{% if field.disabled %} disabled="disabled"{% endif %}{% if field.required %} required="required"{% endif %}
-    {{ block('attributes') }}
-{% endspaceless %}
-{% endblock field_attributes %}
-
-{% block text_field %}
-{% spaceless %}
-    {% if attr.type is defined and attr.type != "text" %}
-        <input {{ block('field_attributes') }} value="{{ field.displayedData }}" />
-    {% else %}
-        {% set attr = attr|merge({ 'maxlength': attr.maxlength|default(field.maxlength) }) %}
-        <input type="text" {{ block('field_attributes') }} value="{{ field.displayedData }}" />
-    {% endif %}
-{% endspaceless %}
-{% endblock text_field %}
-
-{% block password_field %}
-{% spaceless %}
-    {% set attr = attr|merge({ 'maxlength': attr.maxlength|default(field.maxlength) }) %}
-    <input type="password" {{ block('field_attributes') }} value="{{ field.displayedData }}" />
-{% endspaceless %}
-{% endblock password_field %}
-
-{% block hidden_field %}
-{% spaceless %}
-    <input type="hidden" id="{{ field.id }}" name="{{ field.name }}"{% if field.disabled %} disabled="disabled"{% endif %} value="{{ field.displayedData }}" />
-{% endspaceless %}
-{% endblock hidden_field %}
-
-{% block textarea_field %}
-{% spaceless %}
-    <textarea {{ block('field_attributes') }}>{{ field.displayedData }}</textarea>
-{% endspaceless %}
-{% endblock textarea_field %}
-
-{% block options %}
-{% spaceless %}
-    {% for choice, label in options %}
-        {% if field.isChoiceGroup(label) %}
-            <optgroup label="{{ choice }}">
-                {% for nestedChoice, nestedLabel in label %}
-                    <option value="{{ nestedChoice }}"{% if field.isChoiceSelected(nestedChoice) %} selected="selected"{% endif %}>{{ nestedLabel }}</option>
-                {% endfor %}
-            </optgroup>
-        {% else %}
-            <option value="{{ choice }}"{% if field.isChoiceSelected(choice) %} selected="selected"{% endif %}>{{ label }}</option>
-        {% endif %}
-    {% endfor %}
-{% endspaceless %}
-{% endblock options %}
-
-{% block choice_field %}
-{% spaceless %}
-    {% if field.isExpanded %}
-        {% for choice, child in field %}
-            {{ form_field(child) }}
-            <label for="{{ child.id }}">{{ field.label(choice) }}</label>
-        {% endfor %}
-    {% else %}
-        <select {{ block('field_attributes') }}{% if field.isMultipleChoice %} multiple="multiple"{% endif %}>
-            {% if field.preferredChoices|length > 0 %}
-                {% set options = field.preferredChoices %}
-                {{ block('options') }}
-                <option disabled="disabled">{{ params.separator|default('-------------------') }}</option>
-            {% endif %}
-            {% set options = field.otherChoices %}
-            {{ block('options') }}
-        </select>
-    {% endif %}
-{% endspaceless %}
-{% endblock choice_field %}
-
-{% block checkbox_field %}
-{% spaceless %}
-    <input type="checkbox" {{ block('field_attributes') }}{% if field.hasValue %} value="{{ field.value }}"{% endif %}{% if field.ischecked %} checked="checked"{% endif %} />
-{% endspaceless %}
-{% endblock checkbox_field %}
-
-{% block radio_field %}
-{% spaceless %}
-    <input type="radio" {{ block('field_attributes') }}{% if field.hasValue %} value="{{ field.value }}"{% endif %}{% if field.ischecked %} checked="checked"{% endif %} />
-{% endspaceless %}
-{% endblock radio_field %}
-
-{% block date_time_field %}
-{% spaceless %}
-    {{ form_errors(field.date) }}
-    {{ form_errors(field.time) }}
-    {{ form_field(field.date) }}
-    {{ form_field(field.time) }}
-{% endspaceless %}
-{% endblock date_time_field %}
-
-{% block date_field %}
-{% spaceless %}
-    {% if field.isField %}
-        {{ block('text_field') }}
-    {% else %}
-        {{ field.pattern|replace({ '{{ year }}': form_field(field.year), '{{ month }}': form_field(field.month), '{{ day }}': form_field(field.day) })|raw }}
-    {% endif %}
-{% endspaceless %}
-{% endblock date_field %}
-
-{% block time_field %}
-{% spaceless %}
-    {% if field.isField %}{% set attr = attr|merge({ 'size': 1 }) %}{% endif %}
-    {{ form_field(field.hour, attr) }}:{{ form_field(field.minute, attr) }}{% if field.isWithSeconds %}:{{ form_field(field.second, attr) }}{% endif %}
-{% endspaceless %}
-{% endblock time_field %}
-
-{% block number_field %}
-{% spaceless %}
-    {% set attr = attr|merge({ 'type': 'number' }) %}
-    {{ block('text_field') }}
-{% endspaceless %}
-{% endblock number_field %}
-
-{% block money_field %}
-{% spaceless %}
-    {{ field.pattern|replace({ '{{ widget }}': block('number_field') })|raw }}
-{% endspaceless %}
-{% endblock money_field %}
-
-{% block url_field %}
-{% spaceless %}
-    {% set attr = attr|merge({ 'type': 'url' }) %}
-    {{ block('text_field') }}
-{% endspaceless %}
-{% endblock url_field %}
-
-{% block percent_field %}
-{% spaceless %}
-    {{ block('text_field') }} %
-{% endspaceless %}
-{% endblock percent_field %}
-
-{% block file_field %}
-{% spaceless %}
-    {% set group = field %}
-    {% set field = group.file %}
-    <input type="file" {{ block('field_attributes') }} />
-    {{ form_field(group.token) }}
-    {{ form_field(group.original_name) }}
-{% endspaceless %}
-{% endblock file_field %}
-
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php
index 922f8efead..ecc7560370 100644
--- a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php
+++ b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php
@@ -35,7 +35,7 @@ class TwigExtensionTest extends TestCase
 
         $this->assertEquals('Twig_Environment', $container->getParameter('twig.class'), '->load() loads the twig.xml file');
         $this->assertFalse($container->getDefinition('twig.cache_warmer')->hasTag('kernel.cache_warmer'), '->load() does not enable cache warming by default');
-        $this->assertContains('TwigBundle::form.html.twig', $container->getParameter('twig.form.resources'), '->load() includes default template for form resources');
+        $this->assertContains('TwigBundle:Form:div_layout.html.twig', $container->getParameter('twig.form.resources'), '->load() includes default template for form resources');
 
         // Twig options
         $options = $container->getParameter('twig.options');
@@ -65,7 +65,7 @@ class TwigExtensionTest extends TestCase
 
         // Form resources
         $resources = $container->getParameter('twig.form.resources');
-        $this->assertContains('TwigBundle::form.html.twig', $resources, '->load() includes default template for form resources');
+        $this->assertContains('TwigBundle:Form:div_layout.html.twig', $resources, '->load() includes default template for form resources');
         $this->assertContains('MyBundle::form.html.twig', $resources, '->load() merges new templates into form resources');
 
         // Globals
diff --git a/src/Symfony/Component/Form/BirthdayField.php b/src/Symfony/Component/Form/BirthdayField.php
deleted file mode 100644
index 4566ed25f5..0000000000
--- a/src/Symfony/Component/Form/BirthdayField.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Form;
-
-/**
- * A field for entering a birthday date
- *
- * This field is a preconfigured DateField with allowed years between the
- * current year and 120 years in the past.
- *
- * @author Bernhard Schussek <bernhard.schussek@symfony.com>
- */
-class BirthdayField extends DateField
-{
-    /**
-     * {@inheritDoc}
-     */
-    protected function configure()
-    {
-        $currentYear = date('Y');
-
-        $this->addOption('years', range($currentYear-120, $currentYear));
-
-        parent::configure();
-    }
-}
diff --git a/src/Symfony/Component/Form/CheckboxField.php b/src/Symfony/Component/Form/CheckboxField.php
deleted file mode 100644
index a811f8522a..0000000000
--- a/src/Symfony/Component/Form/CheckboxField.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Form;
-
-/**
- * A checkbox field for selecting boolean values.
- *
- * @author Bernhard Schussek <bernhard.schussek@symfony.com>
- */
-class CheckboxField extends ToggleField
-{
-    /**
-     * Available options:
-     *
-     *  * value:    The value of the input checkbox. If the checkbox is checked,
-     *              this value will be posted as the value of the field.
-     */
-    protected function configure()
-    {
-        $this->addOption('value', '1');
-
-        parent::configure();
-    }
-}
\ No newline at end of file
diff --git a/src/Symfony/Component/Form/ChoiceField.php b/src/Symfony/Component/Form/ChoiceField.php
deleted file mode 100644
index 87989f3133..0000000000
--- a/src/Symfony/Component/Form/ChoiceField.php
+++ /dev/null
@@ -1,294 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Form;
-
-use Symfony\Component\Form\Exception\InvalidOptionsException;
-
-/**
- * Lets the user select between different choices.
- *
- * Available options:
- *
- *  * choices:              An array of key-value pairs that will represent the choices
- *  * preferred_choices:    An array of choices (by key) that should be displayed
- *                          above all other options in the field
- *  * empty_value:          If set to a non-false value, an "empty" option will
- *                          be added to the top of the countries choices. A
- *                          common value might be "Choose a country". Default: false.
- *
- * The multiple and expanded options control exactly which HTML element
- * that should be used to render this field:
- *
- *  * expanded = false, multiple = false    A drop-down select element
- *  * expanded = false, multiple = true     A multiple select element
- *  * expanded = true, multiple = false     A series of input radio elements
- *  * expanded = true, multiple = true      A series of input checkboxes
- *
- * @author Bernhard Schussek <bernhard.schussek@symfony.com>
- */
-class ChoiceField extends HybridField
-{
-    /**
-     * Stores the preferred choices with the choices as keys
-     * @var array
-     */
-    protected $preferredChoices = array();
-
-    /**
-     * Stores the choices
-     * You should only access this property through getChoices()
-     * @var array
-     */
-    private $choices = array();
-
-    protected function configure()
-    {
-        $this->addRequiredOption('choices');
-        $this->addOption('preferred_choices', array());
-        $this->addOption('multiple', false);
-        $this->addOption('expanded', false);
-        $this->addOption('empty_value', '');
-
-        parent::configure();
-
-        $choices = $this->getOption('choices');
-
-        if (!is_array($choices) && !$choices instanceof \Closure) {
-            throw new InvalidOptionsException('The choices option must be an array or a closure', array('choices'));
-        }
-
-        if (!is_array($this->getOption('preferred_choices'))) {
-            throw new InvalidOptionsException('The preferred_choices option must be an array', array('preferred_choices'));
-        }
-
-        if (count($this->getOption('preferred_choices')) > 0) {
-            $this->preferredChoices = array_flip($this->getOption('preferred_choices'));
-        }
-
-        if ($this->isExpanded()) {
-            $this->setFieldMode(self::FORM);
-
-            $choices = $this->getChoices();
-
-            foreach ($this->preferredChoices as $choice => $_) {
-                $this->add($this->newChoiceField($choice, $choices[$choice]));
-            }
-
-            foreach ($choices as $choice => $value) {
-                if (!isset($this->preferredChoices[$choice])) {
-                    $this->add($this->newChoiceField($choice, $value));
-                }
-            }
-        } else {
-            $this->setFieldMode(self::FIELD);
-        }
-    }
-
-    public function getName()
-    {
-        // TESTME
-        $name = parent::getName();
-
-        // Add "[]" to the name in case a select tag with multiple options is
-        // displayed. Otherwise only one of the selected options is sent in the
-        // POST request.
-        if ($this->isMultipleChoice() && !$this->isExpanded()) {
-            $name .= '[]';
-        }
-
-        return $name;
-    }
-
-    /**
-     * Initializes the choices
-     *
-     * If the choices were given as a closure, the closure is executed now.
-     *
-     * @return array
-     */
-    protected function initializeChoices()
-    {
-        if (!$this->choices) {
-            $this->choices = $this->getInitializedChoices();
-
-            if (!$this->isRequired()) {
-                $this->choices = array('' => $this->getOption('empty_value')) + $this->choices;
-            }
-        }
-    }
-
-    protected function getInitializedChoices()
-    {
-        $choices = $this->getOption('choices');
-
-        if ($choices instanceof \Closure) {
-            $choices = $choices->__invoke();
-        }
-
-        if (!is_array($choices)) {
-            throw new InvalidOptionsException('The "choices" option must be an array or a closure returning an array', array('choices'));
-        }
-
-        return $choices;
-    }
-
-    /**
-     * Returns the choices
-     *
-     * If the choices were given as a closure, the closure is executed on
-     * the first call of this method.
-     *
-     * @return array
-     */
-    protected function getChoices()
-    {
-        $this->initializeChoices();
-
-        return $this->choices;
-    }
-
-    public function getPreferredChoices()
-    {
-        return array_intersect_key($this->getChoices(), $this->preferredChoices);
-    }
-
-    public function getOtherChoices()
-    {
-        return array_diff_key($this->getChoices(), $this->preferredChoices);
-    }
-
-    public function getLabel($choice)
-    {
-        $choices = $this->getChoices();
-
-        return isset($choices[$choice]) ? $choices[$choice] : null;
-    }
-
-    public function isChoiceGroup($choice)
-    {
-        return is_array($choice) || $choice instanceof \Traversable;
-    }
-
-    public function isChoiceSelected($choice)
-    {
-        return in_array((string) $choice, (array) $this->getDisplayedData(), true);
-    }
-
-    public function isMultipleChoice()
-    {
-        return $this->getOption('multiple');
-    }
-
-    public function isExpanded()
-    {
-        return $this->getOption('expanded');
-    }
-
-    /**
-     * Returns a new field of type radio button or checkbox.
-     *
-     * @param string $choice   The key for the option
-     * @param string $label    The label for the option
-     */
-    protected function newChoiceField($choice, $label)
-    {
-        if ($this->isMultipleChoice()) {
-            return new CheckboxField($choice, array(
-                'value' => $choice,
-            ));
-        }
-
-        return new RadioField($choice, array(
-            'value' => $choice,
-        ));
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * Takes care of converting the input from a single radio button
-     * to an array.
-     */
-    public function submit($value)
-    {
-        if (!$this->isMultipleChoice() && $this->isExpanded()) {
-            $value = null === $value ? array() : array($value => true);
-        }
-
-        parent::submit($value);
-    }
-
-    /**
-     * Transforms a single choice or an array of choices to a format appropriate
-     * for the nested checkboxes/radio buttons.
-     *
-     * The result is an array with the options as keys and true/false as values,
-     * depending on whether a given option is selected. If this field is rendered
-     * as select tag, the value is not modified.
-     *
-     * @param  mixed $value  An array if "multiple" is set to true, a scalar
-     *                       value otherwise.
-     * @return mixed         An array if "expanded" or "multiple" is set to true,
-     *                       a scalar value otherwise.
-     */
-    protected function transform($value)
-    {
-        if ($this->isExpanded()) {
-            $value = parent::transform($value);
-            $choices = $this->getChoices();
-
-            foreach ($choices as $choice => $_) {
-                $choices[$choice] = $this->isMultipleChoice()
-                    ? in_array($choice, (array)$value, true)
-                    : ($choice === $value);
-            }
-
-            return $choices;
-        }
-
-        return parent::transform($value);
-    }
-
-    /**
-     * Transforms a checkbox/radio button array to a single choice or an array
-     * of choices.
-     *
-     * The input value is an array with the choices as keys and true/false as
-     * values, depending on whether a given choice is selected. The output
-     * is an array with the selected choices or a single selected choice.
-     *
-     * @param  mixed $value  An array if "expanded" or "multiple" is set to true,
-     *                       a scalar value otherwise.
-     * @return mixed $value  An array if "multiple" is set to true, a scalar
-     *                       value otherwise.
-     */
-    protected function reverseTransform($value)
-    {
-        if ($this->isExpanded()) {
-            $choices = array();
-
-            foreach ($value as $choice => $selected) {
-                if ($selected) {
-                    $choices[] = $choice;
-                }
-            }
-
-            if ($this->isMultipleChoice()) {
-                $value = $choices;
-            } else {
-                $value = count($choices) > 0 ? current($choices) : null;
-            }
-        }
-
-        return parent::reverseTransform($value);
-    }
-}
diff --git a/src/Symfony/Component/Form/ChoiceList/ArrayChoiceList.php b/src/Symfony/Component/Form/ChoiceList/ArrayChoiceList.php
new file mode 100644
index 0000000000..827c148283
--- /dev/null
+++ b/src/Symfony/Component/Form/ChoiceList/ArrayChoiceList.php
@@ -0,0 +1,55 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\ChoiceList;
+
+use Symfony\Component\Form\Exception\UnexpectedTypeException;
+
+class ArrayChoiceList implements ChoiceListInterface
+{
+    protected $choices;
+
+    protected $loaded = false;
+
+    public function __construct($choices)
+    {
+        if (!is_array($choices) && !$choices instanceof \Closure) {
+            throw new UnexpectedTypeException($choices, 'array or \Closure');
+        }
+
+        $this->choices = $choices;
+    }
+
+    public function getChoices()
+    {
+        if (!$this->loaded) {
+            $this->load();
+        }
+
+        return $this->choices;
+    }
+
+    /**
+     * @see Symfony\Component\Form\ChoiceList\ChoiceListInterface::getChoices
+     */
+    protected function load()
+    {
+        $this->loaded = true;
+
+        if ($this->choices instanceof \Closure) {
+            $this->choices = $this->choices->__invoke();
+
+            if (!is_array($this->choices)) {
+                throw new UnexpectedTypeException($this->choices, 'array');
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Symfony/Component/Form/ChoiceList/ChoiceListInterface.php b/src/Symfony/Component/Form/ChoiceList/ChoiceListInterface.php
new file mode 100644
index 0000000000..c817aa3686
--- /dev/null
+++ b/src/Symfony/Component/Form/ChoiceList/ChoiceListInterface.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\ChoiceList;
+
+interface ChoiceListInterface
+{
+    function getChoices();
+}
\ No newline at end of file
diff --git a/src/Symfony/Component/Form/ChoiceList/MonthChoiceList.php b/src/Symfony/Component/Form/ChoiceList/MonthChoiceList.php
new file mode 100644
index 0000000000..1b32775517
--- /dev/null
+++ b/src/Symfony/Component/Form/ChoiceList/MonthChoiceList.php
@@ -0,0 +1,56 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\ChoiceList;
+
+class MonthChoiceList extends PaddedChoiceList
+{
+    private $formatter;
+
+    /**
+     * Generates an array of localized month choices
+     *
+     * @param  array $months  The month numbers to generate
+     * @return array          The localized months respecting the configured
+     *                        locale and date format
+     */
+    public function __construct(\IntlDateFormatter $formatter, array $months)
+    {
+        parent::__construct($months, 2, '0', STR_PAD_LEFT);
+
+        $this->formatter = $formatter;
+    }
+
+    protected function load()
+    {
+        parent::load();
+
+        $pattern = $this->formatter->getPattern();
+        $timezone = $this->formatter->getTimezoneId();
+
+        $this->formatter->setTimezoneId(\DateTimeZone::UTC);
+
+        if (preg_match('/M+/', $pattern, $matches)) {
+            $this->formatter->setPattern($matches[0]);
+
+            foreach ($this->choices as $choice => $value) {
+                // It's important to specify the first day of the month here!
+                $this->choices[$choice] = $this->formatter->format(gmmktime(0, 0, 0, $choice, 1));
+            }
+
+            // I'd like to clone the formatter above, but then we get a
+            // segmentation fault, so let's restore the old state instead
+            $this->formatter->setPattern($pattern);
+        }
+
+        $this->formatter->setTimezoneId($timezone);
+    }
+}
\ No newline at end of file
diff --git a/src/Symfony/Component/Form/ChoiceList/PaddedChoiceList.php b/src/Symfony/Component/Form/ChoiceList/PaddedChoiceList.php
new file mode 100644
index 0000000000..2a8423fb8d
--- /dev/null
+++ b/src/Symfony/Component/Form/ChoiceList/PaddedChoiceList.php
@@ -0,0 +1,53 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\ChoiceList;
+
+class PaddedChoiceList extends ArrayChoiceList
+{
+    private $padLength;
+
+    private $padString;
+
+    private $padType;
+
+    /**
+     * Generates an array of choices for the given values
+     *
+     * If the values are shorter than $padLength characters, they are padded with
+     * zeros on the left side.
+     *
+     * @param  array   $values     The available choices
+     * @param  integer $padLength  The length to pad the choices
+     * @return array               An array with the input values as keys and the
+     *                             padded values as values
+     */
+    public function __construct($values, $padLength, $padString, $padType = STR_PAD_LEFT)
+    {
+        parent::__construct($values);
+
+        $this->padLength = $padLength;
+        $this->padString = $padString;
+        $this->padType = $padType;
+    }
+
+    protected function load()
+    {
+        parent::load();
+
+        $choices = $this->choices;
+        $this->choices = array();
+
+        foreach ($choices as $value) {
+            $this->choices[$value] = str_pad($value, $this->padLength, $this->padString, $this->padType);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Symfony/Component/Form/TimezoneField.php b/src/Symfony/Component/Form/ChoiceList/TimezoneChoiceList.php
similarity index 66%
rename from src/Symfony/Component/Form/TimezoneField.php
rename to src/Symfony/Component/Form/ChoiceList/TimezoneChoiceList.php
index 14ccf0f02d..4bb2c0b357 100644
--- a/src/Symfony/Component/Form/TimezoneField.php
+++ b/src/Symfony/Component/Form/ChoiceList/TimezoneChoiceList.php
@@ -9,14 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Form;
+namespace Symfony\Component\Form\ChoiceList;
 
 /**
- * Represents a field where each timezone is broken down by continent.
+ * Represents a choice list where each timezone is broken down by continent.
  *
  * @author Bernhard Schussek <bernhard.schussek@symfony.com>
  */
-class TimezoneField extends ChoiceField
+class TimezoneChoiceList extends ArrayChoiceList
 {
     /**
      * Stores the available timezone choices
@@ -24,34 +24,13 @@ class TimezoneField extends ChoiceField
      */
     protected static $timezones = array();
 
-    /**
-     * {@inheritDoc}
-     */
-    public function configure()
+    public function __construct()
     {
-        $this->addOption('choices', self::getTimezoneChoices());
-
-        parent::configure();
+        parent::__construct(array());
     }
 
     /**
-     * Preselects the server timezone if the field is empty and required
-     *
-     * {@inheritDoc}
-     */
-    public function getDisplayedData()
-    {
-        $data = parent::getDisplayedData();
-
-        if (null == $data && $this->isRequired()) {
-            $data = date_default_timezone_get();
-        }
-
-        return $data;
-    }
-
-    /**
-     * Returns the timezone choices
+     * Loads the timezone choices
      *
      * The choices are generated from the ICU function
      * \DateTimeZone::listIdentifiers(). They are cached during a single request,
@@ -60,8 +39,10 @@ class TimezoneField extends ChoiceField
      *
      * @return array  The timezone choices
      */
-    protected static function getTimezoneChoices()
+    protected function load()
     {
+        parent::load();
+
         if (count(self::$timezones) == 0) {
             foreach (\DateTimeZone::listIdentifiers() as $timezone) {
                 $parts = explode('/', $timezone);
@@ -85,6 +66,6 @@ class TimezoneField extends ChoiceField
             }
         }
 
-        return self::$timezones;
+        $this->choices = self::$timezones;
     }
 }
diff --git a/src/Symfony/Component/Form/CollectionField.php b/src/Symfony/Component/Form/CollectionField.php
deleted file mode 100644
index 60cceaf115..0000000000
--- a/src/Symfony/Component/Form/CollectionField.php
+++ /dev/null
@@ -1,148 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Form;
-
-use Symfony\Component\Form\FieldInterface;
-use Symfony\Component\Form\Exception\UnexpectedTypeException;
-
-/**
- * A field group that repeats the given field multiple times over a collection
- * specified by the property path if the field.
- *
- * Example usage:
- *
- *     $form->add(new CollectionField(new TextField('emails')));
- *
- * @author Bernhard Schussek <bernhard.schussek@symfony.com>
- */
-class CollectionField extends Form
-{
-    /**
-     * Remembers which fields were removed upon submitting
-     * @var array
-     */
-    protected $removedFields = array();
-
-    /**
-     * The prototype field for the collection rows
-     * @var FieldInterface
-     */
-    protected $prototype;
-
-    public function __construct($key, array $options = array())
-    {
-        // This doesn't work with addOption(), because the value of this option
-        // needs to be accessed before Configurable::__construct() is reached
-        // Setting all options in the constructor of the root field
-        // is conceptually flawed
-        if (isset($options['prototype'])) {
-            $this->prototype = $options['prototype'];
-            unset($options['prototype']);
-        }
-
-        parent::__construct($key, $options);
-    }
-
-    /**
-     * Available options:
-     *
-     *  * modifiable:   If true, elements in the collection can be added
-     *                  and removed by the presence of absence of the
-     *                  corresponding field groups. Field groups could be
-     *                  added or removed via Javascript and reflected in
-     *                  the underlying collection. Default: false.
-     */
-    protected function configure()
-    {
-        $this->addOption('modifiable', false);
-
-        if ($this->getOption('modifiable')) {
-            $field = $this->newField('$$key$$', null);
-            // TESTME
-            $field->setRequired(false);
-            $this->add($field);
-        }
-
-        parent::configure();
-    }
-
-    public function setData($collection)
-    {
-        if (!is_array($collection) && !$collection instanceof \Traversable) {
-            throw new UnexpectedTypeException($collection, 'array or \Traversable');
-        }
-
-        foreach ($this as $name => $field) {
-            if (!$this->getOption('modifiable') || '$$key$$' != $name) {
-                $this->remove($name);
-            }
-        }
-
-        foreach ($collection as $name => $value) {
-            $this->add($this->newField($name, $name));
-        }
-
-        parent::setData($collection);
-    }
-
-    public function submit($data)
-    {
-        $this->removedFields = array();
-
-        if (null === $data) {
-            $data = array();
-        }
-
-        foreach ($this as $name => $field) {
-            if (!isset($data[$name]) && $this->getOption('modifiable') && '$$key$$' != $name) {
-                $this->remove($name);
-                $this->removedFields[] = $name;
-            }
-        }
-
-        foreach ($data as $name => $value) {
-            if (!isset($this[$name]) && $this->getOption('modifiable')) {
-                $this->add($this->newField($name, $name));
-            }
-        }
-
-        parent::submit($data);
-    }
-
-    protected function writeObject(&$objectOrArray)
-    {
-        parent::writeObject($objectOrArray);
-
-        foreach ($this->removedFields as $name) {
-            unset($objectOrArray[$name]);
-        }
-    }
-
-    protected function newField($key, $propertyPath)
-    {
-        if (null !== $propertyPath) {
-            $propertyPath = '['.$propertyPath.']';
-        }
-
-        if ($this->prototype) {
-            $field = clone $this->prototype;
-            $field->setKey($key);
-            $field->setPropertyPath($propertyPath);
-        } else {
-            $field = new TextField($key, array(
-                'property_path' => $propertyPath,
-            ));
-        }
-
-        return $field;
-    }
-}
\ No newline at end of file
diff --git a/src/Symfony/Component/Form/Configurable.php b/src/Symfony/Component/Form/Configurable.php
deleted file mode 100644
index c85ba84d89..0000000000
--- a/src/Symfony/Component/Form/Configurable.php
+++ /dev/null
@@ -1,145 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Form;
-
-use Symfony\Component\Form\Exception\MissingOptionsException;
-use Symfony\Component\Form\Exception\InvalidOptionsException;
-
-/**
- * A class configurable via options
- *
- * Options can be passed to the constructor of this class. After constructions,
- * these options cannot be changed anymore. This way, options remain light
- * weight. There is no need to monitor changes of options.
- *
- * If you want options that can change, you're recommended to implement plain
- * properties with setters and getters.
- *
- * @author Bernhard Schussek <bernhard.schussek@symfony.com>
- */
-abstract class Configurable
-{
-    /**
-     * The options and their values
-     * @var array
-     */
-    private $options = array();
-
-    /**
-     * The names of the valid options
-     * @var array
-     */
-    private $knownOptions = array();
-
-    /**
-     * The names of the required options
-     * @var array
-     */
-    private $requiredOptions = array();
-
-    /**
-     * Reads, validates and stores the given options
-     *
-     * @param array $options
-     */
-    public function __construct(array $options = array())
-    {
-        $this->options = array_merge($this->options, $options);
-
-        $this->configure();
-
-        // check option names
-        if ($diff = array_diff_key($this->options, $this->knownOptions)) {
-            throw new InvalidOptionsException(sprintf('%s does not support the following options: "%s".', get_class($this), implode('", "', array_keys($diff))), array_keys($diff));
-        }
-
-        // check required options
-        if ($diff = array_diff_key($this->requiredOptions, $this->options)) {
-            throw new MissingOptionsException(sprintf('%s requires the following options: \'%s\'.', get_class($this), implode('", "', array_keys($diff))), array_keys($diff));
-        }
-    }
-
-    /**
-     * Configures the valid options
-     *
-     * This method should call addOption() or addRequiredOption() for every
-     * accepted option.
-     */
-    protected function configure()
-    {
-    }
-
-    /**
-     * Returns an option value.
-     *
-     * @param  string $name  The option name
-     *
-     * @return mixed  The option value
-     */
-    public function getOption($name)
-    {
-        return isset($this->options[$name]) ? $this->options[$name] : null;
-    }
-
-    /**
-     * Adds a new option value with a default value.
-     *
-     * @param string $name   The option name
-     * @param mixed  $value  The default value
-     */
-    protected function addOption($name, $value = null, array $allowedValues = array())
-    {
-        $this->knownOptions[$name] = true;
-
-        if (!array_key_exists($name, $this->options)) {
-            $this->options[$name] = $value;
-        }
-
-        if (count($allowedValues) > 0 && !in_array($this->options[$name], $allowedValues)) {
-            throw new InvalidOptionsException(sprintf('The option "%s" is expected to be one of "%s", but is "%s"', $name, implode('", "', $allowedValues), $this->options[$name]), array($name));
-        }
-    }
-
-    /**
-     * Adds a required option.
-     *
-     * @param string $name  The option name
-     */
-    protected function addRequiredOption($name, array $allowedValues = array())
-    {
-        $this->knownOptions[$name] = true;
-        $this->requiredOptions[$name] = true;
-
-        // only test if the option is set, otherwise an error will be thrown
-        // anyway
-        if (isset($this->options[$name]) && count($allowedValues) > 0 && !in_array($this->options[$name], $allowedValues)) {
-            throw new InvalidOptionsException(sprintf('The option "%s" is expected to be one of "%s", but is "%s"', $name, implode('", "', $allowedValues), $this->options[$name]), array($name));
-        }
-    }
-
-    /**
-     * Returns true if the option exists.
-     *
-     * @param  string $name  The option name
-     *
-     * @return Boolean true if the option is set, false otherwise
-     */
-    public function hasOption($name)
-    {
-        return isset($this->options[$name]);
-    }
-
-    public function getOptions()
-    {
-        return $this->options;
-    }
-}
diff --git a/src/Symfony/Component/Form/CountryField.php b/src/Symfony/Component/Form/CountryField.php
deleted file mode 100644
index 04f8b2d17d..0000000000
--- a/src/Symfony/Component/Form/CountryField.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Form;
-
-use Symfony\Component\Locale\Locale;
-
-/**
- * A field for selecting from a list of countries.
- *
- * @see Symfony\Component\Form\ChoiceField
- * @author Bernhard Schussek <bernhard.schussek@symfony.com>
- */
-class CountryField extends ChoiceField
-{
-    protected function configure()
-    {
-        $this->addOption('choices', Locale::getDisplayCountries(\Locale::getDefault()));
-
-        parent::configure();
-    }
-}
\ No newline at end of file
diff --git a/src/Symfony/Component/Form/CsrfProvider/CsrfProviderInterface.php b/src/Symfony/Component/Form/CsrfProvider/CsrfProviderInterface.php
index 303489b5bb..fa7f54f4b1 100644
--- a/src/Symfony/Component/Form/CsrfProvider/CsrfProviderInterface.php
+++ b/src/Symfony/Component/Form/CsrfProvider/CsrfProviderInterface.php
@@ -22,7 +22,7 @@ namespace Symfony\Component\Form\CsrfProvider;
  *
  * If you want to secure a form submission against CSRF attacks, you could
  * use the class name of the form as page ID. This way you make sure that the
- * form can only be submitted to pages that are designed to handle the form,
+ * form can only be bound to pages that are designed to handle the form,
  * that is, that use the same class name to validate the CSRF token with
  * isCsrfTokenValid().
  *
diff --git a/src/Symfony/Component/Form/DataError.php b/src/Symfony/Component/Form/DataError.php
deleted file mode 100644
index 3d5e43d1dc..0000000000
--- a/src/Symfony/Component/Form/DataError.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Form;
-
-/**
- * Wraps errors in the form data
- *
- * @author Bernhard Schussek <bernhard.schussek@symfony.com>
- */
-class DataError extends Error
-{
-}
\ No newline at end of file
diff --git a/src/Symfony/Component/Form/DataMapper/DataMapperInterface.php b/src/Symfony/Component/Form/DataMapper/DataMapperInterface.php
new file mode 100644
index 0000000000..54ce40f6b1
--- /dev/null
+++ b/src/Symfony/Component/Form/DataMapper/DataMapperInterface.php
@@ -0,0 +1,25 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\DataMapper;
+
+use Symfony\Component\Form\FormInterface;
+
+interface DataMapperInterface
+{
+    function mapDataToForms($data, array $forms);
+
+    function mapDataToForm($data, FormInterface $form);
+
+    function mapFormsToData(array $forms, &$data);
+
+    function mapFormToData(FormInterface $form, &$data);
+}
\ No newline at end of file
diff --git a/src/Symfony/Component/Form/DataMapper/PropertyPathMapper.php b/src/Symfony/Component/Form/DataMapper/PropertyPathMapper.php
new file mode 100644
index 0000000000..4b48d605fe
--- /dev/null
+++ b/src/Symfony/Component/Form/DataMapper/PropertyPathMapper.php
@@ -0,0 +1,85 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\DataMapper;
+
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Form\Util\VirtualFormAwareIterator;
+use Symfony\Component\Form\Exception\FormException;
+
+class PropertyPathMapper implements DataMapperInterface
+{
+    /**
+     * Stores the class that the data of this form must be instances of
+     * @var string
+     */
+    private $dataClass;
+
+    public function __construct($dataClass = null)
+    {
+        $this->dataClass = $dataClass;
+    }
+
+    public function mapDataToForms($data, array $forms)
+    {
+        if (!empty($data) && !is_array($data) && !is_object($data)) {
+            throw new \InvalidArgumentException(sprintf('Expected argument of type object or array, %s given', gettype($data)));
+        }
+
+        if (!empty($data)) {
+            if ($this->dataClass && !$data instanceof $this->dataClass) {
+                throw new FormException(sprintf('Form data should be instance of %s', $this->dataClass));
+            }
+
+            $iterator = new VirtualFormAwareIterator($forms);
+            $iterator = new \RecursiveIteratorIterator($iterator);
+
+            foreach ($iterator as $form) {
+                $this->mapDataToForm($data, $form);
+            }
+        }
+    }
+
+    public function mapDataToForm($data, FormInterface $form)
+    {
+        if (!empty($data)) {
+            if ($form->getAttribute('property_path') !== null) {
+                $form->setData($form->getAttribute('property_path')->getValue($data));
+            }
+        }
+    }
+
+    public function mapFormsToData(array $forms, &$data)
+    {
+        $iterator = new VirtualFormAwareIterator($forms);
+        $iterator = new \RecursiveIteratorIterator($iterator);
+
+        foreach ($iterator as $form) {
+            $this->mapFormToData($form, $data);
+        }
+    }
+
+    public function mapFormToData(FormInterface $form, &$data)
+    {
+        if ($form->getAttribute('property_path') !== null && $form->isSynchronized()) {
+            $propertyPath = $form->getAttribute('property_path');
+
+            // If the data is identical to the value in $data, we are
+            // dealing with a reference
+            $isReference = $form->getData() === $propertyPath->getValue($data);
+            $byReference = $form->getAttribute('by_reference');
+
+            if (!(is_object($data) && $isReference && $byReference)) {
+                $propertyPath->setValue($data, $form->getData());
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Symfony/Component/Form/DataTransformer/ArrayToBooleanChoicesTransformer.php b/src/Symfony/Component/Form/DataTransformer/ArrayToBooleanChoicesTransformer.php
new file mode 100644
index 0000000000..620fe3df4d
--- /dev/null
+++ b/src/Symfony/Component/Form/DataTransformer/ArrayToBooleanChoicesTransformer.php
@@ -0,0 +1,87 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\DataTransformer;
+
+use Symfony\Component\Form\ChoiceList\ChoiceListInterface;
+use Symfony\Component\Form\Exception\UnexpectedTypeException;
+
+class ArrayToBooleanChoicesTransformer implements DataTransformerInterface
+{
+    private $choiceList;
+
+    public function __construct(ChoiceListInterface $choiceList)
+    {
+        $this->choiceList = $choiceList;
+    }
+
+    /**
+     * Transforms a single choice or an array of choices to a format appropriate
+     * for the nested checkboxes/radio buttons.
+     *
+     * The result is an array with the options as keys and true/false as values,
+     * depending on whether a given option is selected. If this field is rendered
+     * as select tag, the value is not modified.
+     *
+     * @param  mixed $value  An array if "multiple" is set to true, a scalar
+     *                       value otherwise.
+     * @return mixed         An array if "expanded" or "multiple" is set to true,
+     *                       a scalar value otherwise.
+     */
+    public function transform($array)
+    {
+        if (null === $array) {
+            return array();
+        }
+
+        if (!is_array($array)) {
+            throw new UnexpectedTypeException($array, 'array');
+        }
+
+        $choices = $this->choiceList->getChoices();
+
+        foreach ($choices as $choice => $_) {
+            $choices[$choice] = in_array($choice, $array, true);
+        }
+
+        return $choices;
+    }
+
+    /**
+     * Transforms a checkbox/radio button array to a single choice or an array
+     * of choices.
+     *
+     * The input value is an array with the choices as keys and true/false as
+     * values, depending on whether a given choice is selected. The output
+     * is an array with the selected choices or a single selected choice.
+     *
+     * @param  mixed $value  An array if "expanded" or "multiple" is set to true,
+     *                       a scalar value otherwise.
+     * @return mixed $value  An array if "multiple" is set to true, a scalar
+     *                       value otherwise.
+     */
+    public function reverseTransform($value)
+    {
+        if (!is_array($value)) {
+            throw new UnexpectedTypeException($value, 'array');
+        }
+
+        $choices = array();
+
+        foreach ($value as $choice => $selected) {
+            if ($selected) {
+                $choices[] = $choice;
+            }
+        }
+
+        return $choices;
+    }
+}
\ No newline at end of file
diff --git a/src/Symfony/Component/Form/DataTransformer/ArrayToChoicesTransformer.php b/src/Symfony/Component/Form/DataTransformer/ArrayToChoicesTransformer.php
new file mode 100644
index 0000000000..abe59e46a7
--- /dev/null
+++ b/src/Symfony/Component/Form/DataTransformer/ArrayToChoicesTransformer.php
@@ -0,0 +1,44 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\DataTransformer;
+
+use Symfony\Component\Form\Util\FormUtil;
+use Symfony\Component\Form\Exception\UnexpectedTypeException;
+
+class ArrayToChoicesTransformer implements DataTransformerInterface
+{
+    public function transform($array)
+    {
+        if (null === $array) {
+            return array();
+        }
+
+        if (!is_array($array)) {
+            throw new UnexpectedTypeException($array, 'array');
+        }
+
+        return FormUtil::toArrayKeys($array);
+    }
+
+    public function reverseTransform($array)
+    {
+        if (null === $array) {
+            return array();
+        }
+
+        if (!is_array($array)) {
+            throw new UnexpectedTypeException($array, 'array');
+        }
+
+        return $array;
+    }
+}
\ No newline at end of file
diff --git a/src/Symfony/Component/Form/DataTransformer/ArrayToPartsTransformer.php b/src/Symfony/Component/Form/DataTransformer/ArrayToPartsTransformer.php
new file mode 100644
index 0000000000..5429fb8cb7
--- /dev/null
+++ b/src/Symfony/Component/Form/DataTransformer/ArrayToPartsTransformer.php
@@ -0,0 +1,84 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\DataTransformer;
+
+use Symfony\Component\Form\Exception\UnexpectedTypeException;
+
+/**
+ * @author Bernhard Schussek <bernhard.schussek@symfony-project.com>
+ */
+class ArrayToPartsTransformer implements DataTransformerInterface
+{
+    private $partMapping;
+
+    public function __construct(array $partMapping)
+    {
+        $this->partMapping = $partMapping;
+    }
+
+    public function transform($array)
+    {
+        if (null === $array) {
+            $array = array();
+        }
+
+        if (!is_array($array) ) {
+            throw new UnexpectedTypeException($array, 'array');
+        }
+
+        $result = array();
+
+        foreach ($this->partMapping as $partKey => $originalKeys) {
+            if (empty($array)) {
+                $result[$partKey] = null;
+            } else {
+                $result[$partKey] = array_intersect_key($array, array_flip($originalKeys));
+            }
+        }
+
+        return $result;
+    }
+
+    public function reverseTransform($array)
+    {
+        if (!is_array($array) ) {
+            throw new UnexpectedTypeException($array, 'array');
+        }
+
+        $result = array();
+        $emptyKeys = array();
+
+        foreach ($this->partMapping as $partKey => $originalKeys) {
+            if (!empty($array[$partKey])) {
+                foreach ($originalKeys as $originalKey) {
+                    if (isset($array[$partKey][$originalKey])) {
+                        $result[$originalKey] = $array[$partKey][$originalKey];
+                    }
+                }
+            } else {
+                $emptyKeys[] = $partKey;
+            }
+        }
+
+        if (count($emptyKeys) > 0) {
+            if (count($emptyKeys) === count($this->partMapping)) {
+                // All parts empty
+                return null;
+            }
+
+            throw new TransformationFailedException(sprintf(
+                    'The keys "%s" should not be empty', implode('", "', $emptyKeys)));
+        }
+
+        return $result;
+    }
+}
\ No newline at end of file
diff --git a/src/Symfony/Component/Form/DataTransformer/BaseDateTimeTransformer.php b/src/Symfony/Component/Form/DataTransformer/BaseDateTimeTransformer.php
new file mode 100644
index 0000000000..f9f1452843
--- /dev/null
+++ b/src/Symfony/Component/Form/DataTransformer/BaseDateTimeTransformer.php
@@ -0,0 +1,33 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\DataTransformer;
+
+abstract class BaseDateTimeTransformer implements DataTransformerInterface
+{
+    protected static $formats = array(
+        \IntlDateFormatter::NONE,
+        \IntlDateFormatter::FULL,
+        \IntlDateFormatter::LONG,
+        \IntlDateFormatter::MEDIUM,
+        \IntlDateFormatter::SHORT,
+    );
+
+    protected $inputTimezone;
+
+    protected $outputTimezone;
+
+    public function __construct($inputTimezone = null, $outputTimezone = null)
+    {
+        $this->inputTimezone = $inputTimezone ?: date_default_timezone_get();
+        $this->outputTimezone = $outputTimezone ?: date_default_timezone_get();
+    }
+}
\ No newline at end of file
diff --git a/src/Symfony/Component/Form/ValueTransformer/BooleanToStringTransformer.php b/src/Symfony/Component/Form/DataTransformer/BooleanToStringTransformer.php
similarity index 87%
rename from src/Symfony/Component/Form/ValueTransformer/BooleanToStringTransformer.php
rename to src/Symfony/Component/Form/DataTransformer/BooleanToStringTransformer.php
index 1e0597f6c2..e5fe6975dd 100644
--- a/src/Symfony/Component/Form/ValueTransformer/BooleanToStringTransformer.php
+++ b/src/Symfony/Component/Form/DataTransformer/BooleanToStringTransformer.php
@@ -9,9 +9,8 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Form\ValueTransformer;
+namespace Symfony\Component\Form\DataTransformer;
 
-use Symfony\Component\Form\Configurable;
 use Symfony\Component\Form\Exception\UnexpectedTypeException;
 
 /**
@@ -20,7 +19,7 @@ use Symfony\Component\Form\Exception\UnexpectedTypeException;
  * @author Bernhard Schussek <bernhard.schussek@symfony.com>
  * @author Florian Eckerstorfer <florian@eckerstorfer.org>
  */
-class BooleanToStringTransformer extends Configurable implements ValueTransformerInterface
+class BooleanToStringTransformer implements DataTransformerInterface
 {
     /**
      * Transforms a Boolean into a string.
@@ -49,6 +48,10 @@ class BooleanToStringTransformer extends Configurable implements ValueTransforme
      */
     public function reverseTransform($value)
     {
+        if (null === $value) {
+            return false;
+        }
+
         if (!is_string($value)) {
             throw new UnexpectedTypeException($value, 'string');
         }
diff --git a/src/Symfony/Component/Form/DataTransformer/CallbackTransformer.php b/src/Symfony/Component/Form/DataTransformer/CallbackTransformer.php
new file mode 100644
index 0000000000..905a1084ed
--- /dev/null
+++ b/src/Symfony/Component/Form/DataTransformer/CallbackTransformer.php
@@ -0,0 +1,35 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\DataTransformer;
+
+class CallbackTransformer implements DataTransformerInterface
+{
+    private $transform;
+
+    private $reverseTransform;
+
+    public function __construct(\Closure $transform, \Closure $reverseTransform)
+    {
+        $this->transform = $transform;
+        $this->reverseTransform = $reverseTransform;
+    }
+
+    public function transform($data)
+    {
+        return $this->transform->__invoke($data);
+    }
+
+    public function reverseTransform($data)
+    {
+        return $this->reverseTransform->__invoke($data);
+    }
+}
\ No newline at end of file
diff --git a/src/Symfony/Component/Form/ValueTransformer/ValueTransformerChain.php b/src/Symfony/Component/Form/DataTransformer/DataTransformerChain.php
similarity index 94%
rename from src/Symfony/Component/Form/ValueTransformer/ValueTransformerChain.php
rename to src/Symfony/Component/Form/DataTransformer/DataTransformerChain.php
index 25ee6e378d..74cea43955 100644
--- a/src/Symfony/Component/Form/ValueTransformer/ValueTransformerChain.php
+++ b/src/Symfony/Component/Form/DataTransformer/DataTransformerChain.php
@@ -9,14 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Form\ValueTransformer;
+namespace Symfony\Component\Form\DataTransformer;
 
 /**
  * Passes a value through multiple value transformers
  *
  * @author Bernhard Schussek <bernhard.schussek@symfony.com>
  */
-class ValueTransformerChain implements ValueTransformerInterface
+class DataTransformerChain implements DataTransformerInterface
 {
     /**
      * The value transformers
diff --git a/src/Symfony/Component/Form/ValueTransformer/ValueTransformerInterface.php b/src/Symfony/Component/Form/DataTransformer/DataTransformerInterface.php
similarity index 86%
rename from src/Symfony/Component/Form/ValueTransformer/ValueTransformerInterface.php
rename to src/Symfony/Component/Form/DataTransformer/DataTransformerInterface.php
index 677da2957d..b26d479875 100644
--- a/src/Symfony/Component/Form/ValueTransformer/ValueTransformerInterface.php
+++ b/src/Symfony/Component/Form/DataTransformer/DataTransformerInterface.php
@@ -9,14 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Form\ValueTransformer;
+namespace Symfony\Component\Form\DataTransformer;
 
 /**
  * Transforms a value between different representations.
  *
  * @author     Bernhard Schussek <bernhard.schussek@symfony.com>
  */
-interface ValueTransformerInterface
+interface DataTransformerInterface
 {
     /**
      * Transforms a value from the original representation to a transformed representation.
@@ -24,8 +24,8 @@ interface ValueTransformerInterface
      * This method is called on two occasions inside a form field:
      *
      * 1. When the form field is initialized with the data attached from the datasource (object or array).
-     * 2. When data from a request is bound using {@link Field::submit()} to transform the new input data
-     *    back into the renderable format. For example if you have a date field and submit '2009-10-10' onto
+     * 2. When data from a request is bound using {@link Field::bind()} to transform the new input data
+     *    back into the renderable format. For example if you have a date field and bind '2009-10-10' onto
      *    it you might accept this value because its easily parsed, but the transformer still writes back
      *    "2009/10/10" onto the form field (for further displaying or other purposes).
      *
@@ -42,7 +42,7 @@ interface ValueTransformerInterface
      * @param  mixed $value               The value in the original representation
      * @return mixed                      The value in the transformed representation
      * @throws UnexpectedTypeException    when the argument is no string
-     * @throws ValueTransformerException  when the transformation fails
+     * @throws DataTransformerException  when the transformation fails
      */
     function transform($value);
 
@@ -50,7 +50,7 @@ interface ValueTransformerInterface
      * Transforms a value from the transformed representation to its original
      * representation.
      *
-     * This method is called when {@link Field::submit()} is called to transform the requests tainted data
+     * This method is called when {@link Field::bind()} is called to transform the requests tainted data
      * into an acceptable format for your data processing/model layer.
      *
      * This method must be able to deal with empty values. Usually this will
@@ -67,7 +67,7 @@ interface ValueTransformerInterface
      * @param  mixed $value               The value in the transformed representation
      * @throws UnexpectedTypeException    when the argument is not of the
      *                                    expected type
-     * @throws ValueTransformerException  when the transformation fails
+     * @throws DataTransformerException  when the transformation fails
      */
     function reverseTransform($value);
 }
\ No newline at end of file
diff --git a/src/Symfony/Component/Form/ValueTransformer/DateTimeToArrayTransformer.php b/src/Symfony/Component/Form/DataTransformer/DateTimeToArrayTransformer.php
similarity index 74%
rename from src/Symfony/Component/Form/ValueTransformer/DateTimeToArrayTransformer.php
rename to src/Symfony/Component/Form/DataTransformer/DateTimeToArrayTransformer.php
index 769b672c9e..568da41ef2 100644
--- a/src/Symfony/Component/Form/ValueTransformer/DateTimeToArrayTransformer.php
+++ b/src/Symfony/Component/Form/DataTransformer/DateTimeToArrayTransformer.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Form\ValueTransformer;
+namespace Symfony\Component\Form\DataTransformer;
 
 use Symfony\Component\Form\Exception\UnexpectedTypeException;
 
@@ -27,17 +27,20 @@ use Symfony\Component\Form\Exception\UnexpectedTypeException;
  */
 class DateTimeToArrayTransformer extends BaseDateTimeTransformer
 {
-    /**
-     * {@inheritDoc}
-     */
-    protected function configure()
-    {
-        $this->addOption('input_timezone', date_default_timezone_get());
-        $this->addOption('output_timezone', date_default_timezone_get());
-        $this->addOption('pad', false);
-        $this->addOption('fields', array('year', 'month', 'day', 'hour', 'minute', 'second'));
+    private $pad;
 
-        parent::configure();
+    private $fields;
+
+    public function __construct($inputTimezone = null, $outputTimezone = null, $fields = null, $pad = false)
+    {
+        parent::__construct($inputTimezone, $outputTimezone);
+
+        if (is_null($fields)) {
+            $fields = array('year', 'month', 'day', 'hour', 'minute', 'second');
+        }
+
+        $this->fields = $fields;
+        $this->pad =$pad;
     }
 
     /**
@@ -49,22 +52,22 @@ class DateTimeToArrayTransformer extends BaseDateTimeTransformer
     public function transform($dateTime)
     {
         if (null === $dateTime) {
-            return array(
+            return array_intersect_key(array(
                 'year'    => '',
                 'month'   => '',
                 'day'     => '',
                 'hour'    => '',
                 'minute'  => '',
                 'second'  => '',
-            );
+            ), array_flip($this->fields));
         }
 
         if (!$dateTime instanceof \DateTime) {
             throw new UnexpectedTypeException($dateTime, '\DateTime');
         }
 
-        $inputTimezone = $this->getOption('input_timezone');
-        $outputTimezone = $this->getOption('output_timezone');
+        $inputTimezone = $this->inputTimezone;
+        $outputTimezone = $this->outputTimezone;
 
         if ($inputTimezone != $outputTimezone) {
             $dateTime->setTimezone(new \DateTimeZone($outputTimezone));
@@ -77,9 +80,9 @@ class DateTimeToArrayTransformer extends BaseDateTimeTransformer
             'hour'    => $dateTime->format('H'),
             'minute'  => $dateTime->format('i'),
             'second'  => $dateTime->format('s'),
-        ), array_flip($this->getOption('fields')));
+        ), array_flip($this->fields));
 
-        if (!$this->getOption('pad')) {
+        if (!$this->pad) {
             foreach ($result as &$entry) {
                 // remove leading zeros
                 $entry = (string)(int)$entry;
@@ -101,8 +104,8 @@ class DateTimeToArrayTransformer extends BaseDateTimeTransformer
             return null;
         }
 
-        $inputTimezone = $this->getOption('input_timezone');
-        $outputTimezone = $this->getOption('output_timezone');
+        $inputTimezone = $this->inputTimezone;
+        $outputTimezone = $this->outputTimezone;
 
         if (!is_array($value)) {
             throw new UnexpectedTypeException($value, 'array');
@@ -112,6 +115,19 @@ class DateTimeToArrayTransformer extends BaseDateTimeTransformer
             return null;
         }
 
+        $emptyFields = array();
+
+        foreach ($this->fields as $field) {
+            if (!isset($value[$field])) {
+                $emptyFields[] = $field;
+            }
+        }
+
+        if (count($emptyFields) > 0) {
+            throw new TransformationFailedException(sprintf(
+                    'The fields "%s" should not be empty', implode('", "', $emptyFields)));
+        }
+
         try {
             $dateTime = new \DateTime(sprintf(
                 '%s-%s-%s %s:%s:%s %s',
diff --git a/src/Symfony/Component/Form/ValueTransformer/DateTimeToLocalizedStringTransformer.php b/src/Symfony/Component/Form/DataTransformer/DateTimeToLocalizedStringTransformer.php
similarity index 70%
rename from src/Symfony/Component/Form/ValueTransformer/DateTimeToLocalizedStringTransformer.php
rename to src/Symfony/Component/Form/DataTransformer/DateTimeToLocalizedStringTransformer.php
index eb672da868..23edf00adc 100644
--- a/src/Symfony/Component/Form/ValueTransformer/DateTimeToLocalizedStringTransformer.php
+++ b/src/Symfony/Component/Form/DataTransformer/DateTimeToLocalizedStringTransformer.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Form\ValueTransformer;
+namespace Symfony\Component\Form\DataTransformer;
 
 use Symfony\Component\Form\Exception\UnexpectedTypeException;
 
@@ -27,25 +27,32 @@ use Symfony\Component\Form\Exception\UnexpectedTypeException;
  */
 class DateTimeToLocalizedStringTransformer extends BaseDateTimeTransformer
 {
-    /**
-     * {@inheritDoc}
-     */
-    protected function configure()
+    private $dateFormat;
+
+    private $timeFormat;
+
+    public function __construct($inputTimezone = null, $outputTimezone = null, $dateFormat = null, $timeFormat = null)
     {
-        $this->addOption('date_format', self::MEDIUM);
-        $this->addOption('time_format', self::SHORT);
-        $this->addOption('input_timezone', 'UTC');
-        $this->addOption('output_timezone', 'UTC');
+        parent::__construct($inputTimezone, $outputTimezone);
 
-        if (!in_array($this->getOption('date_format'), self::$formats, true)) {
-            throw new \InvalidArgumentException(sprintf('The option "date_format" is expected to be one of "%s". Is "%s"', implode('", "', self::$formats), $this->getOption('time_format')));
+        if (is_null($dateFormat)) {
+            $dateFormat = \IntlDateFormatter::MEDIUM;
         }
 
-        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')));
+        if (is_null($timeFormat)) {
+            $timeFormat = \IntlDateFormatter::SHORT;
         }
 
-        parent::configure();
+        if (!in_array($dateFormat, self::$formats, true)) {
+            throw new \InvalidArgumentException(sprintf('The value $dateFormat is expected to be one of "%s". Is "%s"', implode('", "', self::$formats), $dateFormat));
+        }
+
+        if (!in_array($timeFormat, self::$formats, true)) {
+            throw new \InvalidArgumentException(sprintf('The value $timeFormat is expected to be one of "%s". Is "%s"', implode('", "', self::$formats), $timeFormat));
+        }
+
+        $this->dateFormat = $dateFormat;
+        $this->timeFormat = $timeFormat;
     }
 
     /**
@@ -64,7 +71,7 @@ class DateTimeToLocalizedStringTransformer extends BaseDateTimeTransformer
             throw new UnexpectedTypeException($dateTime, '\DateTime');
         }
 
-        $inputTimezone = $this->getOption('input_timezone');
+        $inputTimezone = $this->inputTimezone;
 
         // convert time to UTC before passing it to the formatter
         if ('UTC' != $inputTimezone) {
@@ -88,7 +95,7 @@ class DateTimeToLocalizedStringTransformer extends BaseDateTimeTransformer
      */
     public function reverseTransform($value)
     {
-        $inputTimezone = $this->getOption('input_timezone');
+        $inputTimezone = $this->inputTimezone;
 
         if (!is_string($value)) {
             throw new UnexpectedTypeException($value, 'string');
@@ -121,9 +128,9 @@ class DateTimeToLocalizedStringTransformer extends BaseDateTimeTransformer
      */
     protected function getIntlDateFormatter()
     {
-        $dateFormat = $this->getIntlFormatConstant($this->getOption('date_format'));
-        $timeFormat = $this->getIntlFormatConstant($this->getOption('time_format'));
-        $timezone = $this->getOption('output_timezone');
+        $dateFormat = $this->dateFormat;
+        $timeFormat = $this->timeFormat;
+        $timezone = $this->outputTimezone;
 
         return new \IntlDateFormatter(\Locale::getDefault(), $dateFormat, $timeFormat, $timezone);
     }
diff --git a/src/Symfony/Component/Form/ValueTransformer/DateTimeToStringTransformer.php b/src/Symfony/Component/Form/DataTransformer/DateTimeToStringTransformer.php
similarity index 71%
rename from src/Symfony/Component/Form/ValueTransformer/DateTimeToStringTransformer.php
rename to src/Symfony/Component/Form/DataTransformer/DateTimeToStringTransformer.php
index 81e8322dd3..f8cb6ff13f 100644
--- a/src/Symfony/Component/Form/ValueTransformer/DateTimeToStringTransformer.php
+++ b/src/Symfony/Component/Form/DataTransformer/DateTimeToStringTransformer.php
@@ -9,9 +9,8 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Form\ValueTransformer;
+namespace Symfony\Component\Form\DataTransformer;
 
-use Symfony\Component\Form\Configurable;
 use Symfony\Component\Form\Exception\UnexpectedTypeException;
 
 /**
@@ -20,18 +19,15 @@ use Symfony\Component\Form\Exception\UnexpectedTypeException;
  * @author Bernhard Schussek <bernhard.schussek@symfony.com>
  * @author Florian Eckerstorfer <florian@eckerstorfer.org>
  */
-class DateTimeToStringTransformer extends Configurable implements ValueTransformerInterface
+class DateTimeToStringTransformer extends BaseDateTimeTransformer
 {
-    /**
-     * {@inheritDoc}
-     */
-    protected function configure()
-    {
-        $this->addOption('input_timezone', date_default_timezone_get());
-        $this->addOption('output_timezone', date_default_timezone_get());
-        $this->addOption('format', 'Y-m-d H:i:s');
+    private $format;
 
-        parent::configure();
+    public function __construct($inputTimezone = null, $outputTimezone = null, $format = 'Y-m-d H:i:s')
+    {
+        parent::__construct($inputTimezone, $outputTimezone);
+
+        $this->format = $format;
     }
 
     /**
@@ -51,9 +47,9 @@ class DateTimeToStringTransformer extends Configurable implements ValueTransform
             throw new UnexpectedTypeException($value, '\DateTime');
         }
 
-        $value->setTimezone(new \DateTimeZone($this->getOption('output_timezone')));
+        $value->setTimezone(new \DateTimeZone($this->outputTimezone));
 
-        return $value->format($this->getOption('format'));
+        return $value->format($this->format);
     }
 
     /**
@@ -72,8 +68,8 @@ class DateTimeToStringTransformer extends Configurable implements ValueTransform
             throw new UnexpectedTypeException($value, 'string');
         }
 
-        $outputTimezone = $this->getOption('output_timezone');
-        $inputTimezone = $this->getOption('input_timezone');
+        $outputTimezone = $this->outputTimezone;
+        $inputTimezone = $this->inputTimezone;
 
         try {
             $dateTime = new \DateTime("$value $outputTimezone");
diff --git a/src/Symfony/Component/Form/ValueTransformer/DateTimeToTimestampTransformer.php b/src/Symfony/Component/Form/DataTransformer/DateTimeToTimestampTransformer.php
similarity index 73%
rename from src/Symfony/Component/Form/ValueTransformer/DateTimeToTimestampTransformer.php
rename to src/Symfony/Component/Form/DataTransformer/DateTimeToTimestampTransformer.php
index 3f4aa87f88..199e2ed9e2 100644
--- a/src/Symfony/Component/Form/ValueTransformer/DateTimeToTimestampTransformer.php
+++ b/src/Symfony/Component/Form/DataTransformer/DateTimeToTimestampTransformer.php
@@ -9,9 +9,8 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Form\ValueTransformer;
+namespace Symfony\Component\Form\DataTransformer;
 
-use Symfony\Component\Form\Configurable;
 use Symfony\Component\Form\Exception\UnexpectedTypeException;
 
 /**
@@ -20,19 +19,8 @@ use Symfony\Component\Form\Exception\UnexpectedTypeException;
  * @author Bernhard Schussek <bernhard.schussek@symfony.com>
  * @author Florian Eckerstorfer <florian@eckerstorfer.org>
  */
-class DateTimeToTimestampTransformer extends Configurable implements ValueTransformerInterface
+class DateTimeToTimestampTransformer extends BaseDateTimeTransformer
 {
-    /**
-     * {@inheritDoc}
-     */
-    protected function configure()
-    {
-        $this->addOption('input_timezone', date_default_timezone_get());
-        $this->addOption('output_timezone', date_default_timezone_get());
-
-        parent::configure();
-    }
-
     /**
      * Transforms a DateTime object into a timestamp in the configured timezone
      *
@@ -49,7 +37,7 @@ class DateTimeToTimestampTransformer extends Configurable implements ValueTransf
             throw new UnexpectedTypeException($value, '\DateTime');
         }
 
-        $value->setTimezone(new \DateTimeZone($this->getOption('output_timezone')));
+        $value->setTimezone(new \DateTimeZone($this->outputTimezone));
 
         return (int)$value->format('U');
     }
@@ -70,8 +58,8 @@ class DateTimeToTimestampTransformer extends Configurable implements ValueTransf
             throw new UnexpectedTypeException($value, 'numeric');
         }
 
-        $outputTimezone = $this->getOption('output_timezone');
-        $inputTimezone = $this->getOption('input_timezone');
+        $outputTimezone = $this->outputTimezone;
+        $inputTimezone = $this->inputTimezone;
 
         try {
             $dateTime = new \DateTime("@$value $outputTimezone");
diff --git a/src/Symfony/Component/Form/DataTransformer/FileToArrayTransformer.php b/src/Symfony/Component/Form/DataTransformer/FileToArrayTransformer.php
new file mode 100644
index 0000000000..be8217586c
--- /dev/null
+++ b/src/Symfony/Component/Form/DataTransformer/FileToArrayTransformer.php
@@ -0,0 +1,64 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\DataTransformer;
+
+use Symfony\Component\Form\DataTransformer\TransformationFailedException;
+use Symfony\Component\Form\Exception\UnexpectedTypeException;
+use Symfony\Component\HttpFoundation\File\File;
+
+/**
+ * @author Bernhard Schussek <bernhard.schussek@symfony-project.com>
+ */
+class FileToArrayTransformer implements DataTransformerInterface
+{
+    public function transform($file)
+    {
+        if (null === $file || '' === $file) {
+            return array(
+                'file' => '',
+                'token' => '',
+                'name' => '',
+            );
+        }
+
+        if (!$file instanceof File) {
+            throw new UnexpectedTypeException($file, 'Symfony\Component\HttpFoundation\File\File');
+        }
+
+        return array(
+            'file' => $file,
+            'token' => '',
+            'name' => '',
+        );
+    }
+
+    public function reverseTransform($array)
+    {
+        if (null === $array || '' === $array || array() === $array) {
+            return null;
+        }
+
+        if (!is_array($array)) {
+            throw new UnexpectedTypeException($array, 'array');
+        }
+
+        if (!array_key_exists('file', $array)) {
+            throw new TransformationFailedException('The key "file" is missing');
+        }
+
+        if (!empty($array['file']) && !$array['file'] instanceof File) {
+            throw new TransformationFailedException('The key "file" should be empty or instance of File');
+        }
+
+        return $array['file'];
+    }
+}
\ No newline at end of file
diff --git a/src/Symfony/Component/Form/DataTransformer/FileToStringTransformer.php b/src/Symfony/Component/Form/DataTransformer/FileToStringTransformer.php
new file mode 100644
index 0000000000..8c3f01f9c4
--- /dev/null
+++ b/src/Symfony/Component/Form/DataTransformer/FileToStringTransformer.php
@@ -0,0 +1,48 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\DataTransformer;
+
+use Symfony\Component\Form\DataTransformer\TransformationFailedException;
+use Symfony\Component\Form\Exception\UnexpectedTypeException;
+use Symfony\Component\HttpFoundation\File\File;
+
+/**
+ * @author Bernhard Schussek <bernhard.schussek@symfony-project.com>
+ */
+class FileToStringTransformer implements DataTransformerInterface
+{
+    public function transform($file)
+    {
+        if (null === $file || '' === $file) {
+            return '';
+        }
+
+        if (!$file instanceof File) {
+            throw new UnexpectedTypeException($file, 'Symfony\Component\HttpFoundation\File\File');
+        }
+
+        return $file->getPath();
+    }
+
+    public function reverseTransform($path)
+    {
+        if (null === $path || '' === $path) {
+            return null;
+        }
+
+        if (!is_string($path)) {
+            throw new UnexpectedTypeException($path, 'string');
+        }
+
+        return new File($path);
+    }
+}
\ No newline at end of file
diff --git a/src/Symfony/Component/Form/DataTransformer/IntegerToLocalizedStringTransformer.php b/src/Symfony/Component/Form/DataTransformer/IntegerToLocalizedStringTransformer.php
new file mode 100644
index 0000000000..50ed211977
--- /dev/null
+++ b/src/Symfony/Component/Form/DataTransformer/IntegerToLocalizedStringTransformer.php
@@ -0,0 +1,31 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\DataTransformer;
+
+use Symfony\Component\Form\Exception\UnexpectedTypeException;
+
+/**
+ * Transforms between an integer and a localized number with grouping
+ * (each thousand) and comma separators.
+ *
+ * @author Bernhard Schussek <bernhard.schussek@symfony-project.com>
+ */
+class IntegerToLocalizedStringTransformer extends NumberToLocalizedStringTransformer
+{
+    /**
+     * {@inheritDoc}
+     */
+    public function reverseTransform($value)
+    {
+        return (int)parent::reverseTransform($value);
+    }
+}
\ No newline at end of file
diff --git a/src/Symfony/Component/Form/ValueTransformer/MoneyToLocalizedStringTransformer.php b/src/Symfony/Component/Form/DataTransformer/MoneyToLocalizedStringTransformer.php
similarity index 70%
rename from src/Symfony/Component/Form/ValueTransformer/MoneyToLocalizedStringTransformer.php
rename to src/Symfony/Component/Form/DataTransformer/MoneyToLocalizedStringTransformer.php
index 7ca99cec75..5c0f391707 100644
--- a/src/Symfony/Component/Form/ValueTransformer/MoneyToLocalizedStringTransformer.php
+++ b/src/Symfony/Component/Form/DataTransformer/MoneyToLocalizedStringTransformer.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Form\ValueTransformer;
+namespace Symfony\Component\Form\DataTransformer;
 
 use Symfony\Component\Form\Exception\UnexpectedTypeException;
 
@@ -21,16 +21,26 @@ use Symfony\Component\Form\Exception\UnexpectedTypeException;
  */
 class MoneyToLocalizedStringTransformer extends NumberToLocalizedStringTransformer
 {
-    /**
-     * {@inheritDoc}
-     */
-    protected function configure()
-    {
-        $this->addOption('grouping', true);
-        $this->addOption('precision', 2);
-        $this->addOption('divisor', 1);
 
-        parent::configure();
+    private $divisor;
+
+    public function __construct($precision = null, $grouping = null, $roundingMode = null, $divisor = null)
+    {
+        if (is_null($grouping)) {
+            $grouping = true;
+        }
+
+        if (is_null($precision)) {
+            $precision = 2;
+        }
+
+        parent::__construct($precision, $grouping, $roundingMode);
+
+        if (is_null($divisor)) {
+            $divisor = 1;
+        }
+
+        $this->divisor = $divisor;
     }
 
     /**
@@ -46,7 +56,7 @@ class MoneyToLocalizedStringTransformer extends NumberToLocalizedStringTransform
                 throw new UnexpectedTypeException($value, 'numeric');
             }
 
-            $value /= $this->getOption('divisor');
+            $value /= $this->divisor;
         }
 
         return parent::transform($value);
@@ -63,7 +73,7 @@ class MoneyToLocalizedStringTransformer extends NumberToLocalizedStringTransform
         $value = parent::reverseTransform($value);
 
         if (null !== $value) {
-            $value *= $this->getOption('divisor');
+            $value *= $this->divisor;
         }
 
         return $value;
diff --git a/src/Symfony/Component/Form/ValueTransformer/NumberToLocalizedStringTransformer.php b/src/Symfony/Component/Form/DataTransformer/NumberToLocalizedStringTransformer.php
similarity index 79%
rename from src/Symfony/Component/Form/ValueTransformer/NumberToLocalizedStringTransformer.php
rename to src/Symfony/Component/Form/DataTransformer/NumberToLocalizedStringTransformer.php
index 9025f0ef4b..75869c4fe9 100644
--- a/src/Symfony/Component/Form/ValueTransformer/NumberToLocalizedStringTransformer.php
+++ b/src/Symfony/Component/Form/DataTransformer/NumberToLocalizedStringTransformer.php
@@ -9,9 +9,8 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Form\ValueTransformer;
+namespace Symfony\Component\Form\DataTransformer;
 
-use Symfony\Component\Form\Configurable;
 use Symfony\Component\Form\Exception\UnexpectedTypeException;
 
 /**
@@ -21,7 +20,7 @@ use Symfony\Component\Form\Exception\UnexpectedTypeException;
  * @author Bernhard Schussek <bernhard.schussek@symfony.com>
  * @author Florian Eckerstorfer <florian@eckerstorfer.org>
  */
-class NumberToLocalizedStringTransformer extends Configurable implements ValueTransformerInterface
+class NumberToLocalizedStringTransformer implements DataTransformerInterface
 {
     const ROUND_FLOOR    = \NumberFormatter::ROUND_FLOOR;
     const ROUND_DOWN     = \NumberFormatter::ROUND_DOWN;
@@ -31,16 +30,25 @@ class NumberToLocalizedStringTransformer extends Configurable implements ValueTr
     const ROUND_UP       = \NumberFormatter::ROUND_UP;
     const ROUND_CEILING  = \NumberFormatter::ROUND_CEILING;
 
-    /**
-     * {@inheritDoc}
-     */
-    protected function configure()
-    {
-        $this->addOption('precision', null);
-        $this->addOption('grouping', false);
-        $this->addOption('rounding-mode', self::ROUND_HALFUP);
+    protected $precision;
 
-        parent::configure();
+    protected $grouping;
+
+    protected $roundingMode;
+
+    public function __construct($precision = null, $grouping = null, $roundingMode = null)
+    {
+        if (is_null($grouping)) {
+            $grouping = false;
+        }
+
+        if (is_null($roundingMode)) {
+            $roundingMode = self::ROUND_HALFUP;
+        }
+
+        $this->precision = $precision;
+        $this->grouping = $grouping;
+        $this->roundingMode = $roundingMode;
     }
 
     /**
@@ -103,12 +111,12 @@ class NumberToLocalizedStringTransformer extends Configurable implements ValueTr
     {
         $formatter = new \NumberFormatter(\Locale::getDefault(), \NumberFormatter::DECIMAL);
 
-        if ($this->getOption('precision') !== null) {
-            $formatter->setAttribute(\NumberFormatter::FRACTION_DIGITS, $this->getOption('precision'));
-            $formatter->setAttribute(\NumberFormatter::ROUNDING_MODE, $this->getOption('rounding-mode'));
+        if ($this->precision !== null) {
+            $formatter->setAttribute(\NumberFormatter::FRACTION_DIGITS, $this->precision);
+            $formatter->setAttribute(\NumberFormatter::ROUNDING_MODE, $this->roundingMode);
         }
 
-        $formatter->setAttribute(\NumberFormatter::GROUPING_USED, $this->getOption('grouping'));
+        $formatter->setAttribute(\NumberFormatter::GROUPING_USED, $this->grouping);
 
         return $formatter;
     }
diff --git a/src/Symfony/Component/Form/ValueTransformer/PercentToLocalizedStringTransformer.php b/src/Symfony/Component/Form/DataTransformer/PercentToLocalizedStringTransformer.php
similarity index 81%
rename from src/Symfony/Component/Form/ValueTransformer/PercentToLocalizedStringTransformer.php
rename to src/Symfony/Component/Form/DataTransformer/PercentToLocalizedStringTransformer.php
index 36fc9201fb..3bce77eeb4 100644
--- a/src/Symfony/Component/Form/ValueTransformer/PercentToLocalizedStringTransformer.php
+++ b/src/Symfony/Component/Form/DataTransformer/PercentToLocalizedStringTransformer.php
@@ -9,9 +9,8 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Form\ValueTransformer;
+namespace Symfony\Component\Form\DataTransformer;
 
-use Symfony\Component\Form\Configurable;
 use Symfony\Component\Form\Exception\UnexpectedTypeException;
 
 /**
@@ -20,7 +19,7 @@ use Symfony\Component\Form\Exception\UnexpectedTypeException;
  * @author Bernhard Schussek <bernhard.schussek@symfony.com>
  * @author Florian Eckerstorfer <florian@eckerstorfer.org>
  */
-class PercentToLocalizedStringTransformer extends Configurable implements ValueTransformerInterface
+class PercentToLocalizedStringTransformer implements DataTransformerInterface
 {
     const FRACTIONAL = 'fractional';
     const INTEGER = 'integer';
@@ -30,19 +29,26 @@ class PercentToLocalizedStringTransformer extends Configurable implements ValueT
         self::INTEGER,
     );
 
-    /**
-     * {@inheritDoc}
-     */
-    protected function configure()
-    {
-        $this->addOption('type', self::FRACTIONAL);
-        $this->addOption('precision', 0);
+    private $type;
 
-        if (!in_array($this->getOption('type'), self::$types, true)) {
+    private $precision;
+
+    public function __construct($precision = null, $type = null)
+    {
+        if (is_null($precision)) {
+            $precision = 0;
+        }
+
+        if (is_null($type)) {
+            $type = self::FRACTIONAL;
+        }
+
+        if (!in_array($type, self::$types, true)) {
             throw new \InvalidArgumentException(sprintf('The option "type" is expected to be one of "%s"', implode('", "', self::$types)));
         }
 
-        parent::configure();
+        $this->type = $type;
+        $this->precision = $precision;
     }
 
     /**
@@ -61,7 +67,7 @@ class PercentToLocalizedStringTransformer extends Configurable implements ValueT
             throw new UnexpectedTypeException($value, 'numeric');
         }
 
-        if (self::FRACTIONAL == $this->getOption('type')) {
+        if (self::FRACTIONAL == $this->type) {
             $value *= 100;
         }
 
@@ -100,7 +106,7 @@ class PercentToLocalizedStringTransformer extends Configurable implements ValueT
             throw new TransformationFailedException($formatter->getErrorMessage());
         }
 
-        if (self::FRACTIONAL == $this->getOption('type')) {
+        if (self::FRACTIONAL == $this->type) {
             $value /= 100;
         }
 
@@ -116,7 +122,7 @@ class PercentToLocalizedStringTransformer extends Configurable implements ValueT
     {
         $formatter = new \NumberFormatter(\Locale::getDefault(), \NumberFormatter::DECIMAL);
 
-        $formatter->setAttribute(\NumberFormatter::FRACTION_DIGITS, $this->getOption('precision'));
+        $formatter->setAttribute(\NumberFormatter::FRACTION_DIGITS, $this->precision);
 
         return $formatter;
     }
diff --git a/src/Symfony/Component/Form/ValueTransformer/ReversedTransformer.php b/src/Symfony/Component/Form/DataTransformer/ReversedTransformer.php
similarity index 77%
rename from src/Symfony/Component/Form/ValueTransformer/ReversedTransformer.php
rename to src/Symfony/Component/Form/DataTransformer/ReversedTransformer.php
index 2765b80c41..5840dba535 100644
--- a/src/Symfony/Component/Form/ValueTransformer/ReversedTransformer.php
+++ b/src/Symfony/Component/Form/DataTransformer/ReversedTransformer.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Form\ValueTransformer;
+namespace Symfony\Component\Form\DataTransformer;
 
 /**
  * Reverses a transformer
@@ -19,20 +19,20 @@ namespace Symfony\Component\Form\ValueTransformer;
  *
  * @author Bernhard Schussek <bernhard.schussek@symfony.com>
  */
-class ReversedTransformer implements ValueTransformerInterface
+class ReversedTransformer implements DataTransformerInterface
 {
     /**
      * The reversed transformer
-     * @var ValueTransformerInterface
+     * @var DataTransformerInterface
      */
     protected $reversedTransformer;
 
     /**
      * Reverses this transformer
      *
-     * @param ValueTransformerInterface $innerTransformer
+     * @param DataTransformerInterface $innerTransformer
      */
-    public function __construct(ValueTransformerInterface $reversedTransformer)
+    public function __construct(DataTransformerInterface $reversedTransformer)
     {
         $this->reversedTransformer = $reversedTransformer;
     }
diff --git a/src/Symfony/Component/Form/DataTransformer/ScalarToBooleanChoicesTransformer.php b/src/Symfony/Component/Form/DataTransformer/ScalarToBooleanChoicesTransformer.php
new file mode 100644
index 0000000000..3e8eb4a10c
--- /dev/null
+++ b/src/Symfony/Component/Form/DataTransformer/ScalarToBooleanChoicesTransformer.php
@@ -0,0 +1,77 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\DataTransformer;
+
+use Symfony\Component\Form\ChoiceList\ChoiceListInterface;
+use Symfony\Component\Form\Exception\UnexpectedTypeException;
+
+class ScalarToBooleanChoicesTransformer implements DataTransformerInterface
+{
+    private $choiceList;
+
+    public function __construct(ChoiceListInterface $choiceList)
+    {
+        $this->choiceList = $choiceList;
+    }
+
+    /**
+     * Transforms a single choice or an array of choices to a format appropriate
+     * for the nested checkboxes/radio buttons.
+     *
+     * The result is an array with the options as keys and true/false as values,
+     * depending on whether a given option is selected. If this field is rendered
+     * as select tag, the value is not modified.
+     *
+     * @param  mixed $value  An array if "multiple" is set to true, a scalar
+     *                       value otherwise.
+     * @return mixed         An array if "expanded" or "multiple" is set to true,
+     *                       a scalar value otherwise.
+     */
+    public function transform($value)
+    {
+        $choices = $this->choiceList->getChoices();
+
+        foreach ($choices as $choice => $_) {
+            $choices[$choice] = $choice === $value;
+        }
+
+        return $choices;
+    }
+
+    /**
+     * Transforms a checkbox/radio button array to a single choice or an array
+     * of choices.
+     *
+     * The input value is an array with the choices as keys and true/false as
+     * values, depending on whether a given choice is selected. The output
+     * is an array with the selected choices or a single selected choice.
+     *
+     * @param  mixed $value  An array if "expanded" or "multiple" is set to true,
+     *                       a scalar value otherwise.
+     * @return mixed $value  An array if "multiple" is set to true, a scalar
+     *                       value otherwise.
+     */
+    public function reverseTransform($value)
+    {
+        if (!is_array($value)) {
+            throw new UnexpectedTypeException($value, 'array');
+        }
+
+        foreach ($value as $choice => $selected) {
+            if ($selected) {
+                return $choice;
+            }
+        }
+
+        return null;
+    }
+}
\ No newline at end of file
diff --git a/src/Symfony/Component/Form/DataTransformer/ScalarToChoiceTransformer.php b/src/Symfony/Component/Form/DataTransformer/ScalarToChoiceTransformer.php
new file mode 100644
index 0000000000..8bc4cd9ef0
--- /dev/null
+++ b/src/Symfony/Component/Form/DataTransformer/ScalarToChoiceTransformer.php
@@ -0,0 +1,27 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\DataTransformer;
+
+use Symfony\Component\Form\Util\FormUtil;
+
+class ScalarToChoiceTransformer implements DataTransformerInterface
+{
+    public function transform($value)
+    {
+        return FormUtil::toArrayKey($value);
+    }
+
+    public function reverseTransform($value)
+    {
+        return $value;
+    }
+}
\ No newline at end of file
diff --git a/src/Symfony/Component/Form/ValueTransformer/TransformationFailedException.php b/src/Symfony/Component/Form/DataTransformer/TransformationFailedException.php
similarity index 89%
rename from src/Symfony/Component/Form/ValueTransformer/TransformationFailedException.php
rename to src/Symfony/Component/Form/DataTransformer/TransformationFailedException.php
index b3a093e949..463ce041a2 100644
--- a/src/Symfony/Component/Form/ValueTransformer/TransformationFailedException.php
+++ b/src/Symfony/Component/Form/DataTransformer/TransformationFailedException.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Form\ValueTransformer;
+namespace Symfony\Component\Form\DataTransformer;
 
 /**
  * Indicates a value transformation error.
diff --git a/src/Symfony/Component/Form/DataTransformer/ValueToDuplicatesTransformer.php b/src/Symfony/Component/Form/DataTransformer/ValueToDuplicatesTransformer.php
new file mode 100644
index 0000000000..1b76b1acd0
--- /dev/null
+++ b/src/Symfony/Component/Form/DataTransformer/ValueToDuplicatesTransformer.php
@@ -0,0 +1,71 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\DataTransformer;
+
+use Symfony\Component\Form\Exception\UnexpectedTypeException;
+
+/**
+ * @author Bernhard Schussek <bernhard.schussek@symfony-project.com>
+ */
+class ValueToDuplicatesTransformer implements DataTransformerInterface
+{
+    private $keys;
+
+    public function __construct(array $keys)
+    {
+        $this->keys = $keys;
+    }
+
+    public function transform($value)
+    {
+        $result = array();
+
+        foreach ($this->keys as $key) {
+            $result[$key] = $value;
+        }
+
+        return $result;
+    }
+
+    public function reverseTransform($array)
+    {
+        if (!is_array($array) ) {
+            throw new UnexpectedTypeException($array, 'array');
+        }
+
+        $result = current($array);
+        $emptyKeys = array();
+
+        foreach ($this->keys as $key) {
+            if (!empty($array[$key])) {
+                if ($array[$key] !== $result) {
+                    throw new TransformationFailedException(
+                            'All values in the array should be the same');
+                }
+            } else {
+                $emptyKeys[] = $key;
+            }
+        }
+
+        if (count($emptyKeys) > 0) {
+            if (count($emptyKeys) === count($this->keys)) {
+                // All keys empty
+                return null;
+            }
+
+            throw new TransformationFailedException(sprintf(
+                    'The keys "%s" should not be empty', implode('", "', $emptyKeys)));
+        }
+
+        return $result;
+    }
+}
\ No newline at end of file
diff --git a/src/Symfony/Component/Form/DateField.php b/src/Symfony/Component/Form/DateField.php
deleted file mode 100644
index ce35bee693..0000000000
--- a/src/Symfony/Component/Form/DateField.php
+++ /dev/null
@@ -1,324 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Form;
-
-use Symfony\Component\Form\ValueTransformer\ReversedTransformer;
-use Symfony\Component\Form\ValueTransformer\DateTimeToStringTransformer;
-use Symfony\Component\Form\ValueTransformer\DateTimeToTimestampTransformer;
-use Symfony\Component\Form\ValueTransformer\ValueTransformerChain;
-use Symfony\Component\Form\ValueTransformer\DateTimeToLocalizedStringTransformer;
-use Symfony\Component\Form\ValueTransformer\DateTimeToArrayTransformer;
-
-/**
- * Represents a date field.
- *
- * Available options:
- *
- *  * widget:         How to render the field ("input" or "choice"). Default: "choice".
- *  * type:           The type of the date stored on the object. Default: "datetime":
- *                    * datetime:   A DateTime object;
- *                    * string:     A raw string (e.g. 2011-05-01, Y-m-d);
- *                    * timestamp:  A unix timestamp (e.g. 1304208000);
- *                    * raw:        A year, month, day array.
- *  * pattern:        The pattern for the select boxes when "widget" is "choice".
- *                    You can use the placeholders "{{ year }}", "{{ month }}" and "{{ day }}".
- *                    Default: locale dependent.
- *
- *  * years:          An array of years for the year select tag.
- *  * months:         An array of months for the month select tag.
- *  * days:           An array of days for the day select tag.
- *
- *  * format:         The date format type to use for displaying the data. Default: medium.
- *  * data_timezone:  The timezone of the data. Default: server timezone.
- *  * user_timezone:  The timezone of the user entering a new value. Default: server timezone.
- *
- */
-class DateField extends HybridField
-{
-    const FULL = 'full';
-    const LONG = 'long';
-    const MEDIUM = 'medium';
-    const SHORT = 'short';
-
-    const DATETIME = 'datetime';
-    const STRING = 'string';
-    const TIMESTAMP = 'timestamp';
-    const RAW = 'raw';
-
-    const INPUT = 'input';
-    const CHOICE = 'choice';
-
-    protected static $formats = array(
-        self::FULL,
-        self::LONG,
-        self::MEDIUM,
-        self::SHORT,
-    );
-
-    protected static $intlFormats = array(
-        self::FULL => \IntlDateFormatter::FULL,
-        self::LONG => \IntlDateFormatter::LONG,
-        self::MEDIUM => \IntlDateFormatter::MEDIUM,
-        self::SHORT => \IntlDateFormatter::SHORT,
-    );
-
-    protected static $widgets = array(
-        self::INPUT,
-        self::CHOICE,
-    );
-
-    protected static $types = array(
-        self::DATETIME,
-        self::STRING,
-        self::TIMESTAMP,
-        self::RAW,
-    );
-
-    /**
-     * The ICU formatter instance
-     * @var \IntlDateFormatter
-     */
-    protected $formatter;
-
-    /**
-     * {@inheritDoc}
-     */
-    public function __construct($key, array $options = array())
-    {
-        // Override parent option
-        // \DateTime objects are never edited by reference, because
-        // we treat them like value objects
-        $this->addOption('by_reference', false);
-
-        parent::__construct($key, $options);
-    }
-
-    protected function configure()
-    {
-        $this->addOption('widget', self::CHOICE, self::$widgets);
-        $this->addOption('type', self::DATETIME, self::$types);
-        $this->addOption('pattern');
-
-        $this->addOption('years', range(date('Y') - 5, date('Y') + 5));
-        $this->addOption('months', range(1, 12));
-        $this->addOption('days', range(1, 31));
-
-        $this->addOption('format', self::MEDIUM, self::$formats);
-        $this->addOption('data_timezone', date_default_timezone_get());
-        $this->addOption('user_timezone', date_default_timezone_get());
-
-        $this->formatter = new \IntlDateFormatter(
-            \Locale::getDefault(),
-            self::$intlFormats[$this->getOption('format')],
-            \IntlDateFormatter::NONE
-        );
-
-        if ($this->getOption('type') === self::STRING) {
-            $this->setNormalizationTransformer(new ReversedTransformer(
-                new DateTimeToStringTransformer(array(
-                    'input_timezone' => $this->getOption('data_timezone'),
-                    'output_timezone' => $this->getOption('data_timezone'),
-                    'format' => 'Y-m-d',
-                ))
-            ));
-        } else if ($this->getOption('type') === self::TIMESTAMP) {
-            $this->setNormalizationTransformer(new ReversedTransformer(
-                new DateTimeToTimestampTransformer(array(
-                    'output_timezone' => $this->getOption('data_timezone'),
-                    'input_timezone' => $this->getOption('data_timezone'),
-                ))
-            ));
-        } else if ($this->getOption('type') === self::RAW) {
-            $this->setNormalizationTransformer(new ReversedTransformer(
-                new DateTimeToArrayTransformer(array(
-                    'input_timezone' => $this->getOption('data_timezone'),
-                    'output_timezone' => $this->getOption('data_timezone'),
-                    'fields' => array('year', 'month', 'day'),
-                ))
-            ));
-        }
-
-        if ($this->getOption('widget') === self::INPUT) {
-            $this->setValueTransformer(new DateTimeToLocalizedStringTransformer(array(
-                'date_format' => $this->getOption('format'),
-                'time_format' => DateTimeToLocalizedStringTransformer::NONE,
-                'input_timezone' => $this->getOption('data_timezone'),
-                'output_timezone' => $this->getOption('user_timezone'),
-            )));
-
-            $this->setFieldMode(self::FIELD);
-        } else {
-            $this->setValueTransformer(new DateTimeToArrayTransformer(array(
-                'input_timezone' => $this->getOption('data_timezone'),
-                'output_timezone' => $this->getOption('user_timezone'),
-            )));
-
-            $this->setFieldMode(self::FORM);
-
-            $this->addChoiceFields();
-        }
-    }
-
-    /**
-     * Generates an array of choices for the given values
-     *
-     * If the values are shorter than $padLength characters, they are padded with
-     * zeros on the left side.
-     *
-     * @param  array   $values     The available choices
-     * @param  integer $padLength  The length to pad the choices
-     * @return array               An array with the input values as keys and the
-     *                             padded values as values
-     */
-    protected function generatePaddedChoices(array $values, $padLength)
-    {
-        $choices = array();
-
-        foreach ($values as $value) {
-            $choices[$value] = str_pad($value, $padLength, '0', STR_PAD_LEFT);
-        }
-
-        return $choices;
-    }
-
-    /**
-     * Generates an array of localized month choices
-     *
-     * @param  array $months  The month numbers to generate
-     * @return array          The localized months respecting the configured
-     *                        locale and date format
-     */
-    protected function generateMonthChoices(array $months)
-    {
-        $pattern = $this->formatter->getPattern();
-
-        if (preg_match('/M+/', $pattern, $matches)) {
-            $this->formatter->setPattern($matches[0]);
-            $choices = array();
-
-            foreach ($months as $month) {
-                $choices[$month] = $this->formatter->format(gmmktime(0, 0, 0, $month));
-            }
-
-            $this->formatter->setPattern($pattern);
-        } else {
-            $choices = $this->generatePaddedChoices($months, 2);
-        }
-
-        return $choices;
-    }
-
-    public function getPattern()
-    {
-        // set order as specified in the pattern
-        if ($this->getOption('pattern')) {
-            return $this->getOption('pattern');
-        }
-
-        // set right order with respect to locale (e.g.: de_DE=dd.MM.yy; en_US=M/d/yy)
-        // lookup various formats at http://userguide.icu-project.org/formatparse/datetime
-        if (preg_match('/^([yMd]+).+([yMd]+).+([yMd]+)$/', $this->formatter->getPattern())) {
-            return preg_replace(array('/y+/', '/M+/', '/d+/'), array('{{ year }}', '{{ month }}', '{{ day }}'), $this->formatter->getPattern());
-        }
-
-        // default fallback
-        return '{{ year }}-{{ month }}-{{ day }}';
-    }
-
-    /**
-     * Adds (or replaces if already added) the fields used when widget=CHOICE
-     */
-    protected function addChoiceFields()
-    {
-        $this->add(new ChoiceField('year', array(
-            'choices' => $this->generatePaddedChoices($this->getOption('years'), 4),
-        )));
-        $this->add(new ChoiceField('month', array(
-            'choices' => $this->generateMonthChoices($this->getOption('months')),
-        )));
-        $this->add(new ChoiceField('day', array(
-            'choices' => $this->generatePaddedChoices($this->getOption('days'), 2),
-        )));
-    }
-
-    /**
-     * Returns whether the year of the field's data is valid
-     *
-     * The year is valid if it is contained in the list passed to the field's
-     * option "years".
-     *
-     * @return Boolean
-     */
-    public function isYearWithinRange()
-    {
-        $date = $this->getNormalizedData();
-
-        return $this->isEmpty() || ($this->isGroup() && $this->get('year')->isEmpty())
-                || in_array($date->format('Y'), $this->getOption('years'));
-    }
-
-    /**
-     * Returns whether the month of the field's data is valid
-     *
-     * The month is valid if it is contained in the list passed to the field's
-     * option "months".
-     *
-     * @return Boolean
-     */
-    public function isMonthWithinRange()
-    {
-        $date = $this->getNormalizedData();
-
-        return $this->isEmpty() || ($this->isGroup() && $this->get('month')->isEmpty())
-                || in_array($date->format('m'), $this->getOption('months'));
-    }
-
-    /**
-     * Returns whether the day of the field's data is valid
-     *
-     * The day is valid if it is contained in the list passed to the field's
-     * option "days".
-     *
-     * @return Boolean
-     */
-    public function isDayWithinRange()
-    {
-        $date = $this->getNormalizedData();
-
-        return $this->isEmpty() || ($this->isGroup() && $this->get('day')->isEmpty())
-                || in_array($date->format('d'), $this->getOption('days'));
-    }
-
-    /**
-     * Returns whether the field is neither completely filled (a selected
-     * value in each dropdown) nor completely empty
-     *
-     * @return Boolean
-     */
-    public function isPartiallyFilled()
-    {
-        if ($this->isField()) {
-            return false;
-        }
-
-        if ($this->isEmpty()) {
-            return false;
-        }
-
-        if ($this->get('year')->isEmpty() || $this->get('month')->isEmpty()
-                || $this->get('day')->isEmpty()) {
-            return true;
-        }
-
-        return false;
-    }
-}
\ No newline at end of file
diff --git a/src/Symfony/Component/Form/DateTimeField.php b/src/Symfony/Component/Form/DateTimeField.php
deleted file mode 100644
index 978192da9c..0000000000
--- a/src/Symfony/Component/Form/DateTimeField.php
+++ /dev/null
@@ -1,171 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Form;
-
-use Symfony\Component\Form\ValueTransformer\ReversedTransformer;
-use Symfony\Component\Form\ValueTransformer\DateTimeToStringTransformer;
-use Symfony\Component\Form\ValueTransformer\DateTimeToTimestampTransformer;
-use Symfony\Component\Form\ValueTransformer\DateTimeToArrayTransformer;
-use Symfony\Component\Form\ValueTransformer\ValueTransformerChain;
-
-/**
- * A field for editing a date and a time simultaneously.
- *
- * Available options:
- *
- *  * date_widget:    How to render the date field ("input" or "choice"). Default: "choice".
- *  * time_widget:    How to render the time field ("input" or "choice"). Default: "choice".
- *  * type:           The type of the date stored on the object. Default: "datetime":
- *                    * datetime:   A DateTime object;
- *                    * string:     A raw string (e.g. 2011-05-01 12:30:00, Y-m-d H:i:s);
- *                    * timestamp:  A unix timestamp (e.g. 1304208000).
- *  * date_pattern:   The pattern for the select boxes when date "widget" is "choice".
- *                    You can use the placeholders "{{ year }}", "{{ month }}" and "{{ day }}".
- *                    Default: locale dependent.
- *  * with_seconds    Whether or not to create a field for seconds. Default: false.
- *
- *  * years:          An array of years for the year select tag.
- *  * months:         An array of months for the month select tag.
- *  * days:           An array of days for the day select tag.
- *  * hours:          An array of hours for the hour select tag.
- *  * minutes:        An array of minutes for the minute select tag.
- *  * seconds:        An array of seconds for the second select tag.
- *
- *  * date_format:    The date format type to use for displaying the date. Default: medium.
- *  * data_timezone:  The timezone of the data. Default: UTC.
- *  * user_timezone:  The timezone of the user entering a new value. Default: UTC.
- *
- * @author Bernhard Schussek <bernhard.schussek@symfony.com>
- */
-class DateTimeField extends Form
-{
-    const DATETIME = 'datetime';
-    const STRING = 'string';
-    const TIMESTAMP = 'timestamp';
-
-    protected static $types = array(
-        self::DATETIME,
-        self::STRING,
-        self::TIMESTAMP,
-    );
-
-    protected static $dateFormats = array(
-        DateField::FULL,
-        DateField::LONG,
-        DateField::MEDIUM,
-        DateField::SHORT,
-    );
-
-    protected static $dateWidgets = array(
-        DateField::CHOICE,
-        DateField::INPUT,
-    );
-
-    protected static $timeWidgets = array(
-        TimeField::CHOICE,
-        TimeField::INPUT,
-    );
-
-    /**
-     * {@inheritDoc}
-     */
-    public function __construct($key, array $options = array())
-    {
-        // Override parent option
-        // \DateTime objects are never edited by reference, because
-        // we treat them like value objects
-        $this->addOption('by_reference', false);
-
-        parent::__construct($key, $options);
-    }
-
-    protected function configure()
-    {
-        $this->addOption('date_widget', DateField::CHOICE, self::$dateWidgets);
-        $this->addOption('time_widget', TimeField::CHOICE, self::$timeWidgets);
-        $this->addOption('type', self::DATETIME, self::$types);
-        $this->addOption('date_pattern');
-        $this->addOption('with_seconds', false);
-
-        $this->addOption('years', range(date('Y') - 5, date('Y') + 5));
-        $this->addOption('months', range(1, 12));
-        $this->addOption('days', range(1, 31));
-        $this->addOption('hours', range(0, 23));
-        $this->addOption('minutes', range(0, 59));
-        $this->addOption('seconds', range(0, 59));
-
-        $this->addOption('data_timezone', date_default_timezone_get());
-        $this->addOption('user_timezone', date_default_timezone_get());
-        $this->addOption('date_format', DateField::MEDIUM, self::$dateFormats);
-
-        $this->add(new DateField('date', array(
-            'type' => DateField::RAW,
-            'widget' => $this->getOption('date_widget'),
-            'format' => $this->getOption('date_format'),
-            'data_timezone' => $this->getOption('user_timezone'),
-            'user_timezone' => $this->getOption('user_timezone'),
-            'years' => $this->getOption('years'),
-            'months' => $this->getOption('months'),
-            'days' => $this->getOption('days'),
-            'pattern' => $this->getOption('date_pattern'),
-        )));
-        $this->add(new TimeField('time', array(
-            'type' => TimeField::RAW,
-            'widget' => $this->getOption('time_widget'),
-            'data_timezone' => $this->getOption('user_timezone'),
-            'user_timezone' => $this->getOption('user_timezone'),
-            'with_seconds' => $this->getOption('with_seconds'),
-            'hours' => $this->getOption('hours'),
-            'minutes' => $this->getOption('minutes'),
-            'seconds' => $this->getOption('seconds'),
-        )));
-
-        if ($this->getOption('type') == self::STRING) {
-            $this->setNormalizationTransformer(new ReversedTransformer(
-                new DateTimeToStringTransformer(array(
-                    'input_timezone' => $this->getOption('data_timezone'),
-                    'output_timezone' => $this->getOption('data_timezone'),
-                ))
-            ));
-        } else if ($this->getOption('type') == self::TIMESTAMP) {
-            $this->setNormalizationTransformer(new ReversedTransformer(
-                new DateTimeToTimestampTransformer(array(
-                    'input_timezone' => $this->getOption('data_timezone'),
-                    'output_timezone' => $this->getOption('data_timezone'),
-                ))
-            ));
-        }
-
-        $this->setValueTransformer(new DateTimeToArrayTransformer(array(
-            'input_timezone' => $this->getOption('data_timezone'),
-            'output_timezone' => $this->getOption('user_timezone'),
-        )));
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function transform($value)
-    {
-        $value = parent::transform($value);
-
-        return array('date' => $value, 'time' => $value);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function reverseTransform($value)
-    {
-        return parent::reverseTransform(array_merge($value['date'], $value['time']));
-    }
-}
diff --git a/src/Symfony/Component/Form/EntityChoiceField.php b/src/Symfony/Component/Form/EntityChoiceField.php
deleted file mode 100644
index e16c3afc0c..0000000000
--- a/src/Symfony/Component/Form/EntityChoiceField.php
+++ /dev/null
@@ -1,502 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Form;
-
-use Symfony\Component\Form\ValueTransformer\TransformationFailedException;
-use Symfony\Component\Form\Exception\FormException;
-use Symfony\Component\Form\Exception\InvalidOptionsException;
-use Doctrine\Common\Collections\Collection;
-use Doctrine\Common\Collections\ArrayCollection;
-use Doctrine\ORM\QueryBuilder;
-use Doctrine\ORM\NoResultException;
-
-/**
- * A field for selecting one or more from a list of Doctrine 2 entities
- *
- * You at least have to pass the entity manager and the entity class in the
- * options "em" and "class".
- *
- * <code>
- * $form->add(new EntityChoiceField('tags', array(
- *     'em' => $em,
- *     'class' => 'Application\Entity\Tag',
- * )));
- * </code>
- *
- * Additionally to the options in ChoiceField, the following options are
- * available:
- *
- *  * em:             The entity manager. Required.
- *  * class:          The class of the selectable entities. Required.
- *  * property:       The property displayed as value of the choices. If this
- *                    option is not available, the field will try to convert
- *                    objects into strings using __toString().
- *  * query_builder:  The query builder for fetching the selectable entities.
- *                    You can also pass a closure that receives the repository
- *                    as single argument and returns a query builder.
- *
- * The following sample outlines the use of the "query_builder" option
- * with closures.
- *
- * <code>
- * $form->add(new EntityChoiceField('tags', array(
- *     'em' => $em,
- *     'class' => 'Application\Entity\Tag',
- *     'query_builder' => function ($repository) {
- *         return $repository->createQueryBuilder('t')->where('t.enabled = 1');
- *     },
- * )));
- * </code>
- *
- * @author Bernhard Schussek <bernhard.schussek@symfony.com>
- */
-class EntityChoiceField extends ChoiceField
-{
-    /**
-     * The entities from which the user can choose
-     *
-     * This array is either indexed by ID (if the ID is a single field)
-     * or by key in the choices array (if the ID consists of multiple fields)
-     *
-     * This property is initialized by initializeChoices(). It should only
-     * be accessed through getEntity() and getEntities().
-     *
-     * @var Collection
-     */
-    protected $entities = null;
-
-    /**
-     * Contains the query builder that builds the query for fetching the
-     * entities
-     *
-     * This property should only be accessed through getQueryBuilder().
-     *
-     * @var Doctrine\ORM\QueryBuilder
-     */
-    protected $queryBuilder = null;
-
-    /**
-     * The fields of which the identifier of the underlying class consists
-     *
-     * This property should only be accessed through getIdentifierFields().
-     *
-     * @var array
-     */
-    protected $identifier = array();
-
-    /**
-     * A cache for \ReflectionProperty instances for the underlying class
-     *
-     * This property should only be accessed through getReflProperty().
-     *
-     * @var array
-     */
-    protected $reflProperties = array();
-
-    /**
-     * A cache for the UnitOfWork instance of Doctrine
-     *
-     * @var Doctrine\ORM\UnitOfWork
-     */
-    protected $unitOfWork = null;
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function configure()
-    {
-        $this->addRequiredOption('em');
-        $this->addRequiredOption('class');
-        $this->addOption('property');
-        $this->addOption('query_builder');
-
-        // Override option - it is not required for this subclass
-        $this->addOption('choices', array());
-
-        parent::configure();
-
-        // The entities can be passed directly in the "choices" option.
-        // In this case, initializing the entity cache is a cheap operation
-        // so do it now!
-        if (is_array($this->getOption('choices')) && count($this->getOption('choices')) > 0) {
-            $this->initializeChoices();
-        }
-
-        // If a query builder was passed, it must be a closure or QueryBuilder
-        // instance
-        if ($qb = $this->getOption('query_builder')) {
-            if (!($qb instanceof QueryBuilder || $qb instanceof \Closure)) {
-                throw new InvalidOptionsException(
-                    'The option "query_builder" most contain a closure or a QueryBuilder instance',
-                    array('query_builder'));
-            }
-        }
-    }
-
-    /**
-     * Returns the query builder instance for the choices of this field
-     *
-     * @return Doctrine\ORM\QueryBuilder  The query builder
-     * @throws InvalidOptionsException    When the query builder was passed as
-     *                                    closure and that closure does not
-     *                                    return a QueryBuilder instance
-     */
-    protected function getQueryBuilder()
-    {
-        if (!$this->getOption('query_builder')) {
-            return null;
-        }
-
-        if (!$this->queryBuilder) {
-            $qb = $this->getOption('query_builder');
-
-            if ($qb instanceof \Closure) {
-                $class = $this->getOption('class');
-                $em = $this->getOption('em');
-                $qb = $qb($em->getRepository($class));
-
-                if (!$qb instanceof QueryBuilder) {
-                    throw new InvalidOptionsException(
-                        'The closure in the option "query_builder" should return a QueryBuilder instance',
-                        array('query_builder'));
-                }
-            }
-
-            $this->queryBuilder = $qb;
-        }
-
-        return $this->queryBuilder;
-    }
-
-    /**
-     * Returns the unit of work of the entity manager
-     *
-     * This object is cached for faster lookups.
-     *
-     * @return Doctrine\ORM\UnitOfWork  The unit of work
-     */
-    protected function getUnitOfWork()
-    {
-        if (!$this->unitOfWork) {
-            $this->unitOfWork = $this->getOption('em')->getUnitOfWork();
-        }
-
-        return $this->unitOfWork;
-    }
-
-    /**
-     * Initializes the choices and returns them
-     *
-     * The choices are generated from the entities. If the entities have a
-     * composite identifier, the choices are indexed using ascending integers.
-     * Otherwise the identifiers are used as indices.
-     *
-     * If the entities were passed in the "choices" option, this method
-     * does not have any significant overhead. Otherwise, if a query builder
-     * was passed in the "query_builder" option, this builder is now used
-     * to construct a query which is executed. In the last case, all entities
-     * for the underlying class are fetched from the repository.
-     *
-     * If the option "property" was passed, the property path in that option
-     * is used as option values. Otherwise this method tries to convert
-     * objects to strings using __toString().
-     *
-     * @return array  An array of choices
-     */
-    protected function getInitializedChoices()
-    {
-        if ($this->getOption('choices')) {
-            $entities = parent::getInitializedChoices();
-        } else if ($qb = $this->getQueryBuilder()) {
-            $entities = $qb->getQuery()->execute();
-        } else {
-            $class = $this->getOption('class');
-            $em = $this->getOption('em');
-            $entities = $em->getRepository($class)->findAll();
-        }
-
-        $propertyPath = null;
-        $choices = array();
-        $this->entities = array();
-
-        // The propery option defines, which property (path) is used for
-        // displaying entities as strings
-        if ($this->getOption('property')) {
-            $propertyPath = new PropertyPath($this->getOption('property'));
-        }
-
-        foreach ($entities as $key => $entity) {
-            if ($propertyPath) {
-                // If the property option was given, use it
-                $value = $propertyPath->getValue($entity);
-            } else {
-                // Otherwise expect a __toString() method in the entity
-                $value = (string)$entity;
-            }
-
-            if (count($this->getIdentifierFields()) > 1) {
-                // When the identifier consists of multiple field, use
-                // naturally ordered keys to refer to the choices
-                $choices[$key] = $value;
-                $this->entities[$key] = $entity;
-            } else {
-                // When the identifier is a single field, index choices by
-                // entity ID for performance reasons
-                $id = current($this->getIdentifierValues($entity));
-                $choices[$id] = $value;
-                $this->entities[$id] = $entity;
-            }
-        }
-
-        return $choices;
-    }
-
-    /**
-     * Returns the according entities for the choices
-     *
-     * If the choices were not initialized, they are initialized now. This
-     * is an expensive operation, except if the entities were passed in the
-     * "choices" option.
-     *
-     * @return array  An array of entities
-     */
-    protected function getEntities()
-    {
-        if (!$this->entities) {
-            // indirectly initializes the entities property
-            $this->initializeChoices();
-        }
-
-        return $this->entities;
-    }
-
-    /**
-     * Returns the entity for the given key
-     *
-     * If the underlying entities have composite identifiers, the choices
-     * are initialized. The key is expected to be the index in the choices
-     * array in this case.
-     *
-     * If they have single identifiers, they are either fetched from the
-     * internal entity cache (if filled) or loaded from the database.
-     *
-     * @param  string $key  The choice key (for entities with composite
-     *                      identifiers) or entity ID (for entities with single
-     *                      identifiers)
-     * @return object       The matching entity
-     */
-    protected function getEntity($key)
-    {
-        $id = $this->getIdentifierFields();
-
-        if (count($id) > 1) {
-            // $key is a collection index
-            $entities = $this->getEntities();
-            return $entities[$key];
-        } else if ($this->entities) {
-            return $this->entities[$key];
-        } else if ($qb = $this->getQueryBuilder()) {
-            // should we clone the builder?
-            $alias = $qb->getRootAlias();
-            $where = $qb->expr()->eq($alias.'.'.current($id), $key);
-
-            return $qb->andWhere($where)->getQuery()->getSingleResult();
-        }
-
-        return $this->getOption('em')->find($this->getOption('class'), $key);
-    }
-
-    /**
-     * Returns the \ReflectionProperty instance for a property of the
-     * underlying class
-     *
-     * @param  string $property     The name of the property
-     * @return \ReflectionProperty  The reflection instance
-     */
-    protected function getReflProperty($property)
-    {
-        if (!isset($this->reflProperties[$property])) {
-            $this->reflProperties[$property] = new \ReflectionProperty($this->getOption('class'), $property);
-            $this->reflProperties[$property]->setAccessible(true);
-        }
-
-        return $this->reflProperties[$property];
-    }
-
-    /**
-     * Returns the fields included in the identifier of the underlying class
-     *
-     * @return array  An array of field names
-     */
-    protected function getIdentifierFields()
-    {
-        if (!$this->identifier) {
-            $metadata = $this->getOption('em')->getClassMetadata($this->getOption('class'));
-            $this->identifier = $metadata->getIdentifierFieldNames();
-        }
-
-        return $this->identifier;
-    }
-
-    /**
-     * Returns the values of the identifier fields of an entity
-     *
-     * Doctrine must know about this entity, that is, the entity must already
-     * be persisted or added to the identity map before. Otherwise an
-     * exception is thrown.
-     *
-     * @param  object $entity  The entity for which to get the identifier
-     * @throws FormException   If the entity does not exist in Doctrine's
-     *                         identity map
-     */
-    protected function getIdentifierValues($entity)
-    {
-        if (!$this->getUnitOfWork()->isInIdentityMap($entity)) {
-            throw new FormException('Entities passed to the choice field must be managed');
-        }
-
-        return $this->getUnitOfWork()->getEntityIdentifier($entity);
-    }
-
-    /**
-     * Merges the selected and deselected entities into the collection passed
-     * when calling setData()
-     *
-     * @see parent::processData()
-     */
-    protected function processData($data)
-    {
-        // reuse the existing collection to optimize for Doctrine
-        if ($data instanceof Collection) {
-            $currentData = $this->getData();
-
-            if (!$currentData) {
-                $currentData = $data;
-            } else if (count($data) === 0) {
-                $currentData->clear();
-            } else {
-                // merge $data into $currentData
-                foreach ($currentData as $entity) {
-                    if (!$data->contains($entity)) {
-                        $currentData->removeElement($entity);
-                    } else {
-                        $data->removeElement($entity);
-                    }
-                }
-
-                foreach ($data as $entity) {
-                    $currentData->add($entity);
-                }
-            }
-
-            return $currentData;
-        }
-
-        return $data;
-    }
-
-    /**
-     * Transforms choice keys into entities
-     *
-     * @param  mixed $keyOrKeys   An array of keys, a single key or NULL
-     * @return Collection|object  A collection of entities, a single entity
-     *                            or NULL
-     */
-    protected function reverseTransform($keyOrKeys)
-    {
-        $keyOrKeys = parent::reverseTransform($keyOrKeys);
-
-        if (null === $keyOrKeys) {
-            return $this->getOption('multiple') ? new ArrayCollection() : null;
-        }
-
-        $notFound = array();
-
-        if (count($this->getIdentifierFields()) > 1) {
-            $notFound = array_diff((array)$keyOrKeys, array_keys($this->getEntities()));
-        } else if ($this->entities) {
-            $notFound = array_diff((array)$keyOrKeys, array_keys($this->entities));
-        }
-
-        if (0 === count($notFound)) {
-            if (is_array($keyOrKeys)) {
-                $result = new ArrayCollection();
-
-                // optimize this into a SELECT WHERE IN query
-                foreach ($keyOrKeys as $key) {
-                    try {
-                        $result->add($this->getEntity($key));
-                    } catch (NoResultException $e) {
-                        $notFound[] = $key;
-                    }
-                }
-            } else {
-                try {
-                    $result = $this->getEntity($keyOrKeys);
-                } catch (NoResultException $e) {
-                    $notFound[] = $keyOrKeys;
-                }
-            }
-        }
-
-        if (count($notFound) > 0) {
-            throw new TransformationFailedException('The entities with keys "%s" could not be found', implode('", "', $notFound));
-        }
-
-        return $result;
-    }
-
-    /**
-     * Transforms entities into choice keys
-     *
-     * @param  Collection|object  A collection of entities, a single entity or
-     *                            NULL
-     * @return mixed              An array of choice keys, a single key or
-     *                            NULL
-     */
-    protected function transform($collectionOrEntity)
-    {
-        if (null === $collectionOrEntity) {
-            return $this->getOption('multiple') ? array() : '';
-        }
-
-        if (count($this->identifier) > 1) {
-            // load all choices
-            $availableEntities = $this->getEntities();
-
-            if ($collectionOrEntity instanceof Collection) {
-                $result = array();
-
-                foreach ($collectionOrEntity as $entity) {
-                    // identify choices by their collection key
-                    $key = array_search($entity, $availableEntities);
-                    $result[] = $key;
-                }
-            } else {
-                $result = array_search($collectionOrEntity, $availableEntities);
-            }
-        } else {
-            if ($collectionOrEntity instanceof Collection) {
-                $result = array();
-
-                foreach ($collectionOrEntity as $entity) {
-                    $result[] = current($this->getIdentifierValues($entity));
-                }
-            } else {
-                $result = current($this->getIdentifierValues($collectionOrEntity));
-            }
-        }
-
-
-        return parent::transform($result);
-    }
-}
\ No newline at end of file
diff --git a/src/Symfony/Component/Form/Event/DataEvent.php b/src/Symfony/Component/Form/Event/DataEvent.php
new file mode 100644
index 0000000000..d81edc46dd
--- /dev/null
+++ b/src/Symfony/Component/Form/Event/DataEvent.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Symfony\Component\Form\Event;
+
+use Symfony\Component\EventDispatcher\Event;
+use Symfony\Component\Form\FormInterface;
+
+class DataEvent extends Event
+{
+    private $form;
+
+    protected $data;
+
+    public function __construct(FormInterface $form, $data)
+    {
+        $this->form = $form;
+        $this->data = $data;
+    }
+
+    public function getForm()
+    {
+        return $this->form;
+    }
+
+    public function getData()
+    {
+        return $this->data;
+    }
+}
\ No newline at end of file
diff --git a/src/Symfony/Component/Form/Event/FilterDataEvent.php b/src/Symfony/Component/Form/Event/FilterDataEvent.php
new file mode 100644
index 0000000000..1aca86af3e
--- /dev/null
+++ b/src/Symfony/Component/Form/Event/FilterDataEvent.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Symfony\Component\Form\Event;
+
+class FilterDataEvent extends DataEvent
+{
+    public function setData($data)
+    {
+        $this->data = $data;
+    }
+}
\ No newline at end of file
diff --git a/src/Symfony/Component/Form/EventListener/FixFileUploadListener.php b/src/Symfony/Component/Form/EventListener/FixFileUploadListener.php
new file mode 100644
index 0000000000..7c0e6abbb7
--- /dev/null
+++ b/src/Symfony/Component/Form/EventListener/FixFileUploadListener.php
@@ -0,0 +1,85 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\EventListener;
+
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Form\Events;
+use Symfony\Component\Form\Event\FilterDataEvent;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\HttpFoundation\File\File;
+use Symfony\Component\HttpFoundation\File\UploadedFile;
+use Symfony\Component\HttpFoundation\File\TemporaryStorage;
+
+/**
+ * Moves uploaded files to a temporary location
+ *
+ * @author Bernhard Schussek <bernhard.schussek@symfony-project.com>
+ */
+class FixFileUploadListener implements EventSubscriberInterface
+{
+    private $storage;
+
+    public function __construct(TemporaryStorage $storage)
+    {
+        $this->storage = $storage;
+    }
+
+    public static function getSubscribedEvents()
+    {
+        return Events::onBindClientData;
+    }
+
+    public function onBindClientData(FilterDataEvent $event)
+    {
+        $form = $event->getForm();
+
+        // TODO should be disableable
+
+        // TESTME
+        $data = array_merge(array(
+            'file' => '',
+            'token' => '',
+            'name' => '',
+        ), $event->getData());
+
+        // Newly uploaded file
+        if ($data['file'] instanceof UploadedFile && $data['file']->isValid()) {
+            $data['token'] = (string)rand(100000, 999999);
+            $directory = $this->storage->getTempDir($data['token']);
+
+            if (!file_exists($directory)) {
+                // Recursively create directories
+                mkdir($directory, 0777, true);
+            }
+
+            $data['file']->move($directory);
+            $data['name'] = $data['file']->getName();
+        }
+
+        // Existing uploaded file
+        if (!$data['file'] && $data['token'] && $data['name']) {
+            $path = $this->storage->getTempDir($data['token']) . DIRECTORY_SEPARATOR . $data ['name'];
+
+            if (file_exists($path)) {
+                $data['file'] = new File($path);
+            }
+        }
+
+        // Clear other fields if we still don't have a file, but keep
+        // possible existing files of the field
+        if (!$data['file']) {
+            $data = $form->getNormData();
+        }
+
+        $event->setData($data);
+    }
+}
\ No newline at end of file
diff --git a/src/Symfony/Component/Form/EventListener/FixRadioInputListener.php b/src/Symfony/Component/Form/EventListener/FixRadioInputListener.php
new file mode 100644
index 0000000000..1a5f295941
--- /dev/null
+++ b/src/Symfony/Component/Form/EventListener/FixRadioInputListener.php
@@ -0,0 +1,38 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\EventListener;
+
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Form\Events;
+use Symfony\Component\Form\Event\FilterDataEvent;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+/**
+ * Takes care of converting the input from a single radio button
+ * to an array.
+ *
+ * @author Bernhard Schussek <bernhard.schussek@symfony-project.com>
+ */
+class FixRadioInputListener implements EventSubscriberInterface
+{
+    public function onBindClientData(FilterDataEvent $event)
+    {
+        $data = $event->getData();
+
+        $event->setData(count((array)$data) === 0 ? array() : array($data => true));
+    }
+
+    public static function getSubscribedEvents()
+    {
+        return Events::onBindClientData;
+    }
+}
\ No newline at end of file
diff --git a/src/Symfony/Component/Form/EventListener/FixUrlProtocolListener.php b/src/Symfony/Component/Form/EventListener/FixUrlProtocolListener.php
new file mode 100644
index 0000000000..75bcbb70d1
--- /dev/null
+++ b/src/Symfony/Component/Form/EventListener/FixUrlProtocolListener.php
@@ -0,0 +1,46 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\EventListener;
+
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Form\Events;
+use Symfony\Component\Form\Event\FilterDataEvent;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+/**
+ * Adds a protocol to a URL if it doesn't already have one.
+ *
+ * @author Bernhard Schussek <bernhard.schussek@symfony-project.com>
+ */
+class FixUrlProtocolListener implements EventSubscriberInterface
+{
+    private $defaultProtocol;
+
+    public function __construct($defaultProtocol = 'http')
+    {
+        $this->defaultProtocol = $defaultProtocol;
+    }
+
+    public function onBindNormData(FilterDataEvent $event)
+    {
+        $data = $event->getData();
+
+        if ($this->defaultProtocol && $data && !preg_match('~^\w+://~', $data)) {
+            $event->setData($this->defaultProtocol . '://' . $data);
+        }
+    }
+
+    public static function getSubscribedEvents()
+    {
+        return Events::onBindNormData;
+    }
+}
\ No newline at end of file
diff --git a/src/Symfony/Component/Form/EventListener/ResizeFormListener.php b/src/Symfony/Component/Form/EventListener/ResizeFormListener.php
new file mode 100644
index 0000000000..a8e9b65355
--- /dev/null
+++ b/src/Symfony/Component/Form/EventListener/ResizeFormListener.php
@@ -0,0 +1,147 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\EventListener;
+
+use Symfony\Component\Form\Events;
+use Symfony\Component\Form\Event\DataEvent;
+use Symfony\Component\Form\Event\FilterDataEvent;
+use Symfony\Component\Form\FormFactoryInterface;
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Form\Exception\UnexpectedTypeException;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+/**
+ * Resize a collection form element based on the data sent from the client.
+ *
+ * @author Bernhard Schussek <bernhard.schussek@symfony-project.com>
+ */
+class ResizeFormListener implements EventSubscriberInterface
+{
+    /**
+     * @var FormFactoryInterface
+     */
+    private $factory;
+
+    /**
+     * @var string
+     */
+    private $type;
+
+    /**
+     * @var bool
+     */
+    private $resizeOnBind;
+
+    public function __construct(FormFactoryInterface $factory, $type, $resizeOnBind = false)
+    {
+        $this->factory = $factory;
+        $this->type = $type;
+        $this->resizeOnBind = $resizeOnBind;
+    }
+
+    public static function getSubscribedEvents()
+    {
+        return array(
+            Events::preSetData,
+            Events::preBind,
+            Events::onBindNormData,
+        );
+    }
+
+    public function preSetData(DataEvent $event)
+    {
+        $form = $event->getForm();
+        $data = $event->getData();
+
+        if (null === $data) {
+            $data = array();
+        }
+
+        if (!is_array($data) && !$data instanceof \Traversable) {
+            throw new UnexpectedTypeException($data, 'array or \Traversable');
+        }
+
+        // First remove all rows except for the prototype row
+        foreach ($form as $name => $child) {
+            if (!($this->resizeOnBind && '$$name$$' === $name)) {
+                $form->remove($name);
+            }
+        }
+
+        // Then add all rows again in the correct order
+        foreach ($data as $name => $value) {
+            $form->add($this->factory->create($this->type, $name, array(
+                'property_path' => '['.$name.']',
+            )));
+        }
+    }
+
+    public function preBind(DataEvent $event)
+    {
+        if (!$this->resizeOnBind) {
+            return;
+        }
+
+        $form = $event->getForm();
+        $data = $event->getData();
+
+        if (null === $data || '' === $data) {
+            $data = array();
+        }
+
+        if (!is_array($data) && !$data instanceof \Traversable) {
+            throw new UnexpectedTypeException($data, 'array or \Traversable');
+        }
+
+        // Remove all empty rows except for the prototype row
+        foreach ($form as $name => $child) {
+            if (!isset($data[$name]) && '$$name$$' !== $name) {
+                $form->remove($name);
+            }
+        }
+
+        // Add all additional rows
+        foreach ($data as $name => $value) {
+            if (!$form->has($name)) {
+                $form->add($this->factory->create($this->type, $name, array(
+                    'property_path' => '['.$name.']',
+                )));
+            }
+        }
+    }
+
+    public function onBindNormData(FilterDataEvent $event)
+    {
+        if (!$this->resizeOnBind) {
+            return;
+        }
+
+        $form = $event->getForm();
+        $data = $event->getData();
+
+        if (null === $data) {
+            $data = array();
+        }
+
+        if (!is_array($data) && !$data instanceof \Traversable) {
+            throw new UnexpectedTypeException($data, 'array or \Traversable');
+        }
+
+        foreach ($data as $name => $child) {
+            if (!$form->has($name)) {
+                unset($data[$name]);
+            }
+        }
+
+        $event->setData($data);
+    }
+}
\ No newline at end of file
diff --git a/src/Symfony/Component/Form/EventListener/TrimListener.php b/src/Symfony/Component/Form/EventListener/TrimListener.php
new file mode 100644
index 0000000000..d61b3d4cd0
--- /dev/null
+++ b/src/Symfony/Component/Form/EventListener/TrimListener.php
@@ -0,0 +1,38 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\EventListener;
+
+use Symfony\Component\Form\Events;
+use Symfony\Component\Form\Event\FilterDataEvent;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+/**
+ * Trims string data
+ *
+ * @author Bernhard Schussek <bernhard.schussek@symfony-project.com>
+ */
+class TrimListener implements EventSubscriberInterface
+{
+    public function onBindClientData(FilterDataEvent $event)
+    {
+        $data = $event->getData();
+
+        if (is_string($data)) {
+            $event->setData(trim($data));
+        }
+    }
+
+    public static function getSubscribedEvents()
+    {
+        return Events::onBindClientData;
+    }
+}
\ No newline at end of file
diff --git a/src/Symfony/Component/Form/RadioField.php b/src/Symfony/Component/Form/Events.php
similarity index 54%
rename from src/Symfony/Component/Form/RadioField.php
rename to src/Symfony/Component/Form/Events.php
index dd011093d8..db066409d3 100644
--- a/src/Symfony/Component/Form/RadioField.php
+++ b/src/Symfony/Component/Form/Events.php
@@ -12,18 +12,21 @@
 namespace Symfony\Component\Form;
 
 /**
- * A radio field for selecting boolean values.
- *
  * @author Bernhard Schussek <bernhard.schussek@symfony.com>
  */
-class RadioField extends ToggleField
+final class Events
 {
-    /**
-     * {@inheritDoc}
-     */
-    public function getName()
-    {
-        // TESTME
-        return $this->getParent() ? $this->getParent()->getName() : parent::getName();
-    }
+    const preBind = 'preBind';
+
+    const postBind = 'postBind';
+
+    const preSetData = 'preSetData';
+
+    const postSetData = 'postSetData';
+
+    const onBindClientData = 'onBindClientData';
+
+    const onBindNormData = 'onBindNormData';
+
+    const onSetData = 'onSetData';
 }
diff --git a/src/Symfony/Component/Form/Exception/AlreadySubmittedException.php b/src/Symfony/Component/Form/Exception/AlreadyBoundException.php
similarity index 84%
rename from src/Symfony/Component/Form/Exception/AlreadySubmittedException.php
rename to src/Symfony/Component/Form/Exception/AlreadyBoundException.php
index e966089a0b..c08d8cf732 100644
--- a/src/Symfony/Component/Form/Exception/AlreadySubmittedException.php
+++ b/src/Symfony/Component/Form/Exception/AlreadyBoundException.php
@@ -11,6 +11,6 @@
 
 namespace Symfony\Component\Form\Exception;
 
-class AlreadySubmittedException extends FormException
+class AlreadyBoundException extends FormException
 {
 }
diff --git a/src/Symfony/Component/Form/FieldError.php b/src/Symfony/Component/Form/Exception/TypeLoaderException.php
similarity index 59%
rename from src/Symfony/Component/Form/FieldError.php
rename to src/Symfony/Component/Form/Exception/TypeLoaderException.php
index aa64d513bd..c81b0c4191 100644
--- a/src/Symfony/Component/Form/FieldError.php
+++ b/src/Symfony/Component/Form/Exception/TypeLoaderException.php
@@ -9,13 +9,8 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Form;
+namespace Symfony\Component\Form\Exception;
 
-/**
- * Wraps errors in form fields
- *
- * @author Bernhard Schussek <bernhard.schussek@symfony.com>
- */
-class FieldError extends Error
+class TypeLoaderException extends FormException
 {
 }
\ No newline at end of file
diff --git a/src/Symfony/Component/Form/Field.php b/src/Symfony/Component/Form/Field.php
deleted file mode 100644
index 47d64ad9e8..0000000000
--- a/src/Symfony/Component/Form/Field.php
+++ /dev/null
@@ -1,549 +0,0 @@
-<?php
-
-namespace Symfony\Component\Form;
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Symfony\Component\Form\ValueTransformer\ValueTransformerInterface;
-use Symfony\Component\Form\ValueTransformer\TransformationFailedException;
-
-/**
- * Base class for form fields
- *
- * To implement your own form fields, you need to have a thorough understanding
- * of the data flow within a form field. A form field stores its data in three
- * different representations:
- *
- *   (1) the format required by the form's object
- *   (2) a normalized format for internal processing
- *   (3) the format used for display
- *
- * A date field, for example, may store a date as "Y-m-d" string (1) in the
- * object. To facilitate processing in the field, this value is normalized
- * to a DateTime object (2). In the HTML representation of your form, a
- * localized string (3) is presented to and modified by the user.
- *
- * In most cases, format (1) and format (2) will be the same. For example,
- * a checkbox field uses a Boolean value both for internal processing as for
- * storage in the object. In these cases you simply need to set a value
- * transformer to convert between formats (2) and (3). You can do this by
- * calling setValueTransformer() in the configure() method.
- *
- * In some cases though it makes sense to make format (1) configurable. To
- * demonstrate this, let's extend our above date field to store the value
- * either as "Y-m-d" string or as timestamp. Internally we still want to
- * use a DateTime object for processing. To convert the data from string/integer
- * to DateTime you can set a normalization transformer by calling
- * setNormalizationTransformer() in configure(). The normalized data is then
- * converted to the displayed data as described before.
- *
- * @author Bernhard Schussek <bernhard.schussek@symfony.com>
- */
-class Field extends Configurable implements FieldInterface
-{
-    private $errors = array();
-    private $key = '';
-    private $parent = null;
-    private $submitted = false;
-    private $required = null;
-    private $data = null;
-    private $normalizedData = null;
-    private $transformedData = null;
-    private $normalizationTransformer = null;
-    private $valueTransformer = null;
-    private $propertyPath = null;
-    private $transformationSuccessful = true;
-
-    public function __construct($key = null, array $options = array())
-    {
-        $this->addOption('data');
-        $this->addOption('trim', true);
-        $this->addOption('required', true);
-        $this->addOption('disabled', false);
-        $this->addOption('property_path', (string)$key);
-        $this->addOption('value_transformer');
-        $this->addOption('normalization_transformer');
-
-        $this->key = (string)$key;
-
-        if (isset($options['data'])) {
-            // Populate the field with fixed data
-            // Set the property path to NULL so that the data is not
-            // overwritten by the form's data
-            $this->setData($options['data']);
-            $this->setPropertyPath(null);
-        }
-
-        parent::__construct($options);
-
-        if ($this->getOption('value_transformer')) {
-            $this->setValueTransformer($this->getOption('value_transformer'));
-        }
-
-        if ($this->getOption('normalization_transformer')) {
-            $this->setNormalizationTransformer($this->getOption('normalization_transformer'));
-        }
-
-        $this->normalizedData = $this->normalize($this->data);
-        $this->transformedData = $this->transform($this->normalizedData);
-
-        if (!$this->getOption('data')) {
-            $this->setPropertyPath($this->getOption('property_path'));
-        }
-    }
-
-    /**
-     * Clones this field.
-     */
-    public function __clone()
-    {
-        // TODO
-    }
-
-    /**
-     * Returns the data of the field as it is displayed to the user.
-     *
-     * @return string|array  When the field is not submitted, the transformed
-     *                       default data is returned. When the field is submitted,
-     *                       the submitted data is returned.
-     */
-    public function getDisplayedData()
-    {
-        return $this->getTransformedData();
-    }
-
-    /**
-     * Returns the data transformed by the value transformer
-     *
-     * @return string
-     */
-    protected function getTransformedData()
-    {
-        return $this->transformedData;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function setPropertyPath($propertyPath)
-    {
-        $this->propertyPath = null === $propertyPath || '' === $propertyPath ? null : new PropertyPath($propertyPath);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getPropertyPath()
-    {
-        return $this->propertyPath;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function setKey($key)
-    {
-        $this->key = (string)$key;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getKey()
-    {
-        return $this->key;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getName()
-    {
-        return null === $this->parent ? $this->key : $this->parent->getName().'['.$this->key.']';
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getId()
-    {
-        return null === $this->parent ? $this->key : $this->parent->getId().'_'.$this->key;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function setRequired($required)
-    {
-        $this->required = $required;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function isRequired()
-    {
-        if (null === $this->required) {
-            $this->required = $this->getOption('required');
-        }
-
-        if (null === $this->parent || $this->parent->isRequired()) {
-            return $this->required;
-        }
-
-        return false;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function isDisabled()
-    {
-        if (null === $this->parent || !$this->parent->isDisabled()) {
-            return $this->getOption('disabled');
-        }
-        return true;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function isMultipart()
-    {
-        return false;
-    }
-
-    /**
-     * Returns true if the widget is hidden.
-     *
-     * @return Boolean true if the widget is hidden, false otherwise
-     */
-    public function isHidden()
-    {
-        return false;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function setParent(FieldInterface $parent = null)
-    {
-        $this->parent = $parent;
-    }
-
-    /**
-     * Returns the parent field.
-     *
-     * @return FieldInterface  The parent field
-     */
-    public function getParent()
-    {
-        return $this->parent;
-    }
-
-    /**
-     * Returns whether the field has a parent.
-     *
-     * @return Boolean
-     */
-    public function hasParent()
-    {
-        return null !== $this->parent;
-    }
-
-    /**
-     * Returns the root of the form tree
-     *
-     * @return FieldInterface  The root of the tree
-     */
-    public function getRoot()
-    {
-        return $this->parent ? $this->parent->getRoot() : $this;
-    }
-
-    /**
-     * Returns whether the field is the root of the form tree
-     *
-     * @return Boolean
-     */
-    public function isRoot()
-    {
-        return !$this->hasParent();
-    }
-
-    /**
-     * Updates the field with default data
-     *
-     * @see FieldInterface
-     */
-    public function setData($data)
-    {
-        $this->data = $data;
-        $this->normalizedData = $this->normalize($data);
-        $this->transformedData = $this->transform($this->normalizedData);
-    }
-
-    /**
-     * Binds POST data to the field, transforms and validates it.
-     *
-     * @param  string|array $data  The POST data
-     */
-    public function submit($data)
-    {
-        $this->transformedData = (is_array($data) || is_object($data)) ? $data : (string)$data;
-        $this->submitted = true;
-        $this->errors = array();
-
-        if (is_string($this->transformedData) && $this->getOption('trim')) {
-            $this->transformedData = trim($this->transformedData);
-        }
-
-        try {
-            $this->normalizedData = $this->processData($this->reverseTransform($this->transformedData));
-            $this->data = $this->denormalize($this->normalizedData);
-            $this->transformedData = $this->transform($this->normalizedData);
-            $this->transformationSuccessful = true;
-        } catch (TransformationFailedException $e) {
-            $this->transformationSuccessful = false;
-        }
-    }
-
-    /**
-     * Processes the submitted reverse-transformed data.
-     *
-     * This method can be overridden if you want to modify the data entered
-     * by the user. Note that the data is already in reverse transformed format.
-     *
-     * This method will not be called if reverse transformation fails.
-     *
-     * @param  mixed $data
-     * @return mixed
-     */
-    protected function processData($data)
-    {
-        return $data;
-    }
-
-    /**
-     * Returns the data in the format needed for the underlying object.
-     *
-     * @return mixed
-     */
-    public function getData()
-    {
-        return $this->data;
-    }
-
-    /**
-     * Returns the normalized data of the field.
-     *
-     * @return mixed  When the field is not submitted, the default data is returned.
-     *                When the field is submitted, the normalized submitted data is
-     *                returned if the field is valid, null otherwise.
-     */
-    protected function getNormalizedData()
-    {
-        return $this->normalizedData;
-    }
-
-    /**
-     * Adds an error to the field.
-     *
-     * @see FieldInterface
-     */
-    public function addError(Error $error, PropertyPathIterator $pathIterator = null)
-    {
-        $this->errors[] = $error;
-    }
-
-    /**
-     * Returns whether the field is submitted.
-     *
-     * @return Boolean  true if the form is submitted to input values, false otherwise
-     */
-    public function isSubmitted()
-    {
-        return $this->submitted;
-    }
-
-    /**
-     * Returns whether the submitted value could be reverse transformed correctly
-     *
-     * @return Boolean
-     */
-    public function isTransformationSuccessful()
-    {
-        return $this->transformationSuccessful;
-    }
-
-    /**
-     * Returns whether the field is valid.
-     *
-     * @return Boolean
-     */
-    public function isValid()
-    {
-        return $this->isSubmitted() && !$this->hasErrors(); // TESTME
-    }
-
-    /**
-     * Returns whether or not there are errors.
-     *
-     * @return Boolean  true if form is submitted and not valid
-     */
-    public function hasErrors()
-    {
-        // Don't call isValid() here, as its semantics are slightly different
-        // Field groups are not valid if their children are invalid, but
-        // hasErrors() returns only true if a field/field group itself has
-        // errors
-        return count($this->errors) > 0;
-    }
-
-    /**
-     * Returns all errors
-     *
-     * @return array  An array of FieldError instances that occurred during submitting
-     */
-    public function getErrors()
-    {
-        return $this->errors;
-    }
-
-    /**
-     * Sets the ValueTransformer.
-     *
-     * @param ValueTransformerInterface $valueTransformer
-     */
-    protected function setNormalizationTransformer(ValueTransformerInterface $normalizationTransformer)
-    {
-        $this->normalizationTransformer = $normalizationTransformer;
-    }
-
-    /**
-     * Returns the ValueTransformer.
-     *
-     * @return ValueTransformerInterface
-     */
-    protected function getNormalizationTransformer()
-    {
-        return $this->normalizationTransformer;
-    }
-
-    /**
-     * Sets the ValueTransformer.
-     *
-     * @param ValueTransformerInterface $valueTransformer
-     */
-    protected function setValueTransformer(ValueTransformerInterface $valueTransformer)
-    {
-        $this->valueTransformer = $valueTransformer;
-    }
-
-    /**
-     * Returns the ValueTransformer.
-     *
-     * @return ValueTransformerInterface
-     */
-    protected function getValueTransformer()
-    {
-        return $this->valueTransformer;
-    }
-
-    /**
-     * Normalizes the value if a normalization transformer is set
-     *
-     * @param  mixed $value  The value to transform
-     * @return string
-     */
-    protected function normalize($value)
-    {
-        if (null === $this->normalizationTransformer) {
-            return $value;
-        }
-        return $this->normalizationTransformer->transform($value);
-    }
-
-    /**
-     * Reverse transforms a value if a normalization transformer is set.
-     *
-     * @param  string $value  The value to reverse transform
-     * @return mixed
-     */
-    protected function denormalize($value)
-    {
-        if (null === $this->normalizationTransformer) {
-            return $value;
-        }
-        return $this->normalizationTransformer->reverseTransform($value, $this->data);
-    }
-
-    /**
-     * Transforms the value if a value transformer is set.
-     *
-     * @param  mixed $value  The value to transform
-     * @return string
-     */
-    protected function transform($value)
-    {
-        if (null === $this->valueTransformer) {
-            // Scalar values should always be converted to strings to
-            // facilitate differentiation between empty ("") and zero (0).
-            return null === $value || is_scalar($value) ? (string)$value : $value;
-        }
-        return $this->valueTransformer->transform($value);
-    }
-
-    /**
-     * Reverse transforms a value if a value transformer is set.
-     *
-     * @param  string $value  The value to reverse transform
-     * @return mixed
-     */
-    protected function reverseTransform($value)
-    {
-        if (null === $this->valueTransformer) {
-            return '' === $value ? null : $value;
-        }
-        return $this->valueTransformer->reverseTransform($value, $this->data);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function readProperty(&$objectOrArray)
-    {
-        // TODO throw exception if not object or array
-
-        if ($this->propertyPath !== null) {
-            $this->setData($this->propertyPath->getValue($objectOrArray));
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function writeProperty(&$objectOrArray)
-    {
-        // TODO throw exception if not object or array
-
-        if ($this->propertyPath !== null) {
-            $this->propertyPath->setValue($objectOrArray, $this->getData());
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function isEmpty()
-    {
-        return null === $this->data || '' === $this->data;
-    }
-}
diff --git a/src/Symfony/Component/Form/FieldFactory/FieldFactory.php b/src/Symfony/Component/Form/FieldFactory/FieldFactory.php
deleted file mode 100644
index c72db893ef..0000000000
--- a/src/Symfony/Component/Form/FieldFactory/FieldFactory.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Form\FieldFactory;
-
-use Symfony\Component\Form\Exception\UnexpectedTypeException;
-
-/**
- * Default implementation of FieldFactoryInterface
- *
- * @author Bernhard Schussek <bernhard.schussek@symfony.com>
- * @see FieldFactoryInterface
- */
-class FieldFactory implements FieldFactoryInterface
-{
-    /**
-     * A list of guessers for guessing field classes and options
-     * @var array
-     */
-    protected $guessers;
-
-    /**
-     * Constructor
-     *
-     * @param array $guessers  A list of instances implementing
-     *                         FieldFactoryGuesserInterface
-     */
-    public function __construct(array $guessers)
-    {
-        foreach ($guessers as $guesser) {
-            if (!$guesser instanceof FieldFactoryGuesserInterface) {
-                throw new UnexpectedTypeException($guesser, 'FieldFactoryGuesserInterface');
-            }
-        }
-
-        $this->guessers = $guessers;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getInstance($class, $property, array $options = array())
-    {
-        // guess field class and options
-        $classGuess = $this->guess(function ($guesser) use ($class, $property) {
-            return $guesser->guessClass($class, $property);
-        });
-
-        if (!$classGuess) {
-            throw new \RuntimeException(sprintf('No field could be guessed for property "%s" of class %s', $property, $class));
-        }
-
-        // guess maximum length
-        $maxLengthGuess = $this->guess(function ($guesser) use ($class, $property) {
-            return $guesser->guessMaxLength($class, $property);
-        });
-
-        // guess whether field is required
-        $requiredGuess = $this->guess(function ($guesser) use ($class, $property) {
-            return $guesser->guessRequired($class, $property);
-        });
-
-        // construct field
-        $fieldClass = $classGuess->getClass();
-        $textField = 'Symfony\Component\Form\TextField';
-
-        if ($maxLengthGuess && ($fieldClass == $textField || is_subclass_of($fieldClass, $textField))) {
-            $options = array_merge(array('max_length' => $maxLengthGuess->getValue()), $options);
-        }
-
-        if ($requiredGuess) {
-            $options = array_merge(array('required' => $requiredGuess->getValue()), $options);
-        }
-
-        // user options may override guessed options
-        $options = array_merge($classGuess->getOptions(), $options);
-
-        return new $fieldClass($property, $options);
-    }
-
-    /**
-     * Executes a closure for each guesser and returns the best guess from the
-     * return values
-     *
-     * @param  \Closure $closure  The closure to execute. Accepts a guesser as
-     *                            argument and should return a FieldFactoryGuess
-     *                            instance
-     * @return FieldFactoryGuess  The guess with the highest confidence
-     */
-    protected function guess(\Closure $closure)
-    {
-        $guesses = array();
-
-        foreach ($this->guessers as $guesser) {
-            if ($guess = $closure($guesser)) {
-                $guesses[] = $guess;
-            }
-        }
-
-        return FieldFactoryGuess::getBestGuess($guesses);
-    }
-}
\ No newline at end of file
diff --git a/src/Symfony/Component/Form/FieldFactory/FieldFactoryInterface.php b/src/Symfony/Component/Form/FieldFactory/FieldFactoryInterface.php
deleted file mode 100644
index 74c49b5d0a..0000000000
--- a/src/Symfony/Component/Form/FieldFactory/FieldFactoryInterface.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Form\FieldFactory;
-
-/**
- * Automatically creates form fields for properties of a class
- *
- * @author Bernhard Schussek <bernhard.schussek@symfony.com>
- */
-interface FieldFactoryInterface
-{
-    /**
-     * Returns a field for a given property name of a class
-     *
-     * @param  string $class      The fully qualified class name
-     * @param  string $property   The name of the property
-     * @param  array $options     Custom options for creating the field
-     * @return FieldInterface     A field instance
-     */
-    function getInstance($class, $property, array $options = array());
-}
diff --git a/src/Symfony/Component/Form/FieldInterface.php b/src/Symfony/Component/Form/FieldInterface.php
deleted file mode 100644
index 2f472c0a66..0000000000
--- a/src/Symfony/Component/Form/FieldInterface.php
+++ /dev/null
@@ -1,227 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Form;
-
-use Symfony\Component\Translation\TranslatorInterface;
-
-/**
- * A form field that can be embedded in a form.
- *
- * @author     Bernhard Schussek <bernhard.schussek@symfony.com>
- */
-interface FieldInterface
-{
-    /**
-     * Marks a constraint violation in a form field
-     * @var integer
-     */
-    const FIELD_ERROR = 0;
-
-    /**
-     * Marks a constraint violation in the data of a form field
-     * @var integer
-     */
-    const DATA_ERROR = 1;
-
-    /**
-     * Clones this field.
-     */
-    function __clone();
-
-    /**
-     * Sets the parent field.
-     *
-     * @param FieldInterface $parent  The parent field
-     */
-    function setParent(FieldInterface $parent = null);
-
-    /**
-     * Returns the parent field.
-     *
-     * @return FieldInterface  The parent field
-     */
-    function getParent();
-
-    /**
-     * Sets the key by which the field is identified in field groups.
-     *
-     * Once this field is nested in a field group, i.e. after setParent() was
-     * called for the first time, this method should throw an exception.
-     *
-     * @param  string $key             The key of the field
-     * @throws BadMethodCallException  When the field already has a parent
-     */
-    function setKey($key);
-
-    /**
-     * Returns the key by which the field is identified in field groups.
-     *
-     * @return string  The key of the field.
-     */
-    function getKey();
-
-    /**
-     * Returns the name of the field.
-     *
-     * @return string  When the field has no parent, the name is equal to its
-     *                 key. If the field has a parent, the name is composed of
-     *                 the parent's name and the field's key, where the field's
-     *                 key is wrapped in squared brackets
-     *                 (e.g. "parent_name[field_key]")
-     */
-    function getName();
-
-    /**
-     * Returns the ID of the field.
-     *
-     * @return string  The ID of a field is equal to its name, where all
-     *                 sequences of squared brackets are replaced by a single
-     *                 underscore (e.g. if the name is "parent_name[field_key]",
-     *                 the ID is "parent_name_field_key").
-     */
-    function getId();
-
-    /**
-     * Sets the property path
-     *
-     * The property path determines the property or a sequence of properties
-     * that a field updates in the data of the field group.
-     *
-     * @param string $propertyPath
-     */
-    function setPropertyPath($propertyPath);
-
-    /**
-     * Returns the property path of the field
-     *
-     * @return PropertyPath
-     */
-    function getPropertyPath();
-
-    /**
-     * Writes a property value of the object into the field
-     *
-     * The chosen property is determined by the field's property path.
-     *
-     * @param array|object $objectOrArray
-     */
-    function readProperty(&$objectOrArray);
-
-    /**
-     * Writes a the field value into a property of the object
-     *
-     * The chosen property is determined by the field's property path.
-     *
-     * @param array|object $objectOrArray
-     */
-    function writeProperty(&$objectOrArray);
-
-    /**
-     * Returns the data of the field as it is displayed to the user.
-     *
-     * @return string|array  When the field is not bound, the transformed
-     *                       default data is returned. When the field is bound,
-     *                       the bound data is returned.
-     */
-    function getDisplayedData();
-
-    /**
-     * Recursively adds constraint violations to the fields
-     *
-     * Violations in the form fields usually have property paths like:
-     *
-     * <code>
-     * iterator[firstName].data
-     * iterator[firstName].displayedData
-     * iterator[Address].iterator[street].displayedData
-     * ...
-     * </code>
-     *
-     * Violations in the form data usually have property paths like:
-     *
-     * <code>
-     * data.firstName
-     * data.Address.street
-     * ...
-     * </code>
-     *
-     * @param Error $error
-     * @param PropertyPathIterator $pathIterator
-     */
-    function addError(Error $error, PropertyPathIterator $pathIterator = null);
-
-    /**
-     * Returns whether the field is valid.
-     *
-     * @return Boolean
-     */
-    function isValid();
-
-    /**
-     * Returns whether the field requires a multipart form.
-     *
-     * @return Boolean
-     */
-    function isMultipart();
-
-    /**
-     * Returns whether the field is required to be filled out.
-     *
-     * If the field has a parent and the parent is not required, this method
-     * will always return false. Otherwise the value set with setRequired()
-     * is returned.
-     *
-     * @return Boolean
-     */
-    function isRequired();
-
-    /**
-     * Returns whether this field is disabled
-     *
-     * The content of a disabled field is displayed, but not allowed to be
-     * modified. The validation of modified, disabled fields should fail.
-     *
-     * Fields whose parents are disabled are considered disabled regardless of
-     * their own state.
-     *
-     * @return Boolean
-     */
-    function isDisabled();
-
-    /**
-     * Returns whether the field is hidden
-     *
-     * @return Boolean
-     */
-    function isHidden();
-
-    /**
-     * Returns whether the field is empty
-     *
-     * @return boolean
-     */
-    function isEmpty();
-
-    /**
-     * Sets whether this field is required to be filled out when submitted.
-     *
-     * @param Boolean $required
-     */
-    function setRequired($required);
-
-    /**
-     * Writes posted data into the field
-     *
-     * @param mixed $data  The data from the POST request
-     */
-    function submit($data);
-}
diff --git a/src/Symfony/Component/Form/FileField.php b/src/Symfony/Component/Form/FileField.php
deleted file mode 100644
index f101809f37..0000000000
--- a/src/Symfony/Component/Form/FileField.php
+++ /dev/null
@@ -1,209 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Form;
-
-use Symfony\Component\HttpFoundation\File\File;
-use Symfony\Component\Form\Exception\FormException;
-use Symfony\Component\HttpFoundation\File\UploadedFile;
-
-/**
- * A file field to upload files.
- */
-class FileField extends Form
-{
-    /**
-     * Whether the size of the uploaded file exceeds the upload_max_filesize
-     * directive in php.ini
-     * @var Boolean
-     */
-    protected $iniSizeExceeded = false;
-
-    /**
-     * Whether the size of the uploaded file exceeds the MAX_FILE_SIZE
-     * directive specified in the HTML form
-     * @var Boolean
-     */
-    protected $formSizeExceeded = false;
-
-    /**
-     * Whether the file was completely uploaded
-     * @var Boolean
-     */
-    protected $uploadComplete = true;
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function configure()
-    {
-        $this->addRequiredOption('secret');
-        $this->addOption('tmp_dir', sys_get_temp_dir());
-
-        parent::configure();
-
-        $this->add(new Field('file'));
-        $this->add(new HiddenField('token'));
-        $this->add(new HiddenField('original_name'));
-    }
-
-    /**
-     * Moves the file to a temporary location to prevent its deletion when
-     * the PHP process dies
-     *
-     * This way the file can survive if the form does not validate and is
-     * resubmitted.
-     *
-     * @see Symfony\Component\Form\Form::preprocessData()
-     */
-    protected function preprocessData(array $data)
-    {
-        if ($data['file']) {
-            if (!$data['file'] instanceof UploadedFile) {
-                throw new \UnexpectedValueException('Uploaded file is not of type UploadedFile, your form tag is probably missing the enctype="multipart/form-data" attribute.');
-            }
-            switch ($data['file']->getError()) {
-                case UPLOAD_ERR_INI_SIZE:
-                    $this->iniSizeExceeded = true;
-                    break;
-                case UPLOAD_ERR_FORM_SIZE:
-                    $this->formSizeExceeded = true;
-                    break;
-                case UPLOAD_ERR_PARTIAL:
-                    $this->uploadComplete = false;
-                    break;
-                case UPLOAD_ERR_NO_TMP_DIR:
-                    throw new FormException('Could not upload a file because a temporary directory is missing (UPLOAD_ERR_NO_TMP_DIR)');
-                case UPLOAD_ERR_CANT_WRITE:
-                    throw new FormException('Could not write file to disk (UPLOAD_ERR_CANT_WRITE)');
-                case UPLOAD_ERR_EXTENSION:
-                    throw new FormException('A PHP extension stopped the file upload (UPLOAD_ERR_EXTENSION)');
-                case UPLOAD_ERR_OK:
-                default:
-                    $data['original_name'] = $data['file']->getName();
-                    $data['file']->move($this->getTmpDir());
-                    $data['file']->rename($this->getTmpName($data['token']));
-                    $data['file'] = '';
-                    break;
-            }
-        }
-
-        return $data;
-    }
-
-    /**
-     * Turns a file path into an array of field values
-     *
-     * @see Symfony\Component\Form\Field::normalize()
-     */
-    protected function normalize($path)
-    {
-        return array(
-            'file' => '',
-            'token' => rand(100000, 999999),
-            'original_name' => '',
-        );
-    }
-
-    /**
-     * Turns an array of field values into a file path
-     *
-     * @see Symfony\Component\Form\Field::denormalize()
-     */
-    protected function denormalize($data)
-    {
-        $path = $this->getTmpPath($data['token']);
-
-        return file_exists($path) ? $path : $this->getData();
-    }
-
-    /**
-     * Returns the absolute temporary path to the uploaded file
-     *
-     * @param string $token
-     */
-    protected function getTmpPath($token)
-    {
-        return $this->getTmpDir() . DIRECTORY_SEPARATOR . $this->getTmpName($token);
-    }
-
-    /**
-     * Returns the temporary directory where files are stored
-     *
-     * @param string $token
-     */
-    protected function getTmpDir()
-    {
-        return realpath($this->getOption('tmp_dir'));
-    }
-
-    /**
-     * Returns the temporary file name for the given token
-     *
-     * @param string $token
-     */
-    protected function getTmpName($token)
-    {
-        return md5(session_id() . $this->getOption('secret') . $token);
-    }
-
-    /**
-     * Returns the original name of the uploaded file
-     *
-     * @return string
-     */
-    public function getOriginalName()
-    {
-        $data = $this->getNormalizedData();
-
-        return $data['original_name'];
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function isMultipart()
-    {
-        return true;
-    }
-
-    /**
-     * Returns true if the size of the uploaded file exceeds the
-     * upload_max_filesize directive in php.ini
-     *
-     * @return Boolean
-     */
-    public function isIniSizeExceeded()
-    {
-        return $this->iniSizeExceeded;
-    }
-
-    /**
-     * Returns true if the size of the uploaded file exceeds the
-     * MAX_FILE_SIZE directive specified in the HTML form
-     *
-     * @return Boolean
-     */
-    public function isFormSizeExceeded()
-    {
-        return $this->formSizeExceeded;
-    }
-
-    /**
-     * Returns true if the file was completely uploaded
-     *
-     * @return Boolean
-     */
-    public function isUploadComplete()
-    {
-        return $this->uploadComplete;
-    }
-}
diff --git a/src/Symfony/Component/Form/Form.php b/src/Symfony/Component/Form/Form.php
index da5d1de6a1..fd84fb2cca 100644
--- a/src/Symfony/Component/Form/Form.php
+++ b/src/Symfony/Component/Form/Form.php
@@ -13,15 +13,22 @@ namespace Symfony\Component\Form;
 
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\FileBag;
-use Symfony\Component\Validator\ValidatorInterface;
-use Symfony\Component\Validator\ExecutionContext;
+use Symfony\Component\Form\Event\DataEvent;
+use Symfony\Component\Form\Event\FilterDataEvent;
 use Symfony\Component\Form\Exception\FormException;
 use Symfony\Component\Form\Exception\MissingOptionsException;
-use Symfony\Component\Form\Exception\AlreadySubmittedException;
+use Symfony\Component\Form\Exception\AlreadyBoundException;
 use Symfony\Component\Form\Exception\UnexpectedTypeException;
 use Symfony\Component\Form\Exception\DanglingFieldException;
 use Symfony\Component\Form\Exception\FieldDefinitionException;
 use Symfony\Component\Form\CsrfProvider\CsrfProviderInterface;
+use Symfony\Component\Form\DataTransformer\DataTransformerInterface;
+use Symfony\Component\Form\DataTransformer\TransformationFailedException;
+use Symfony\Component\Form\DataMapper\DataMapperInterface;
+use Symfony\Component\Form\Validator\FormValidatorInterface;
+use Symfony\Component\Form\FormView;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 /**
  * Form represents a form.
@@ -35,366 +42,351 @@ use Symfony\Component\Form\CsrfProvider\CsrfProviderInterface;
  * CSRF secret. If the global CSRF secret is also null, then a random one
  * is generated on the fly.
  *
+ * To implement your own form fields, you need to have a thorough understanding
+ * of the data flow within a form field. A form field stores its data in three
+ * different representations:
+ *
+ *   (1) the format required by the form's object
+ *   (2) a normalized format for internal processing
+ *   (3) the format used for display
+ *
+ * A date field, for example, may store a date as "Y-m-d" string (1) in the
+ * object. To facilitate processing in the field, this value is normalized
+ * to a DateTime object (2). In the HTML representation of your form, a
+ * localized string (3) is presented to and modified by the user.
+ *
+ * In most cases, format (1) and format (2) will be the same. For example,
+ * a checkbox field uses a Boolean value both for internal processing as for
+ * storage in the object. In these cases you simply need to set a value
+ * transformer to convert between formats (2) and (3). You can do this by
+ * calling appendClientTransformer() in the configure() method.
+ *
+ * In some cases though it makes sense to make format (1) configurable. To
+ * demonstrate this, let's extend our above date field to store the value
+ * either as "Y-m-d" string or as timestamp. Internally we still want to
+ * use a DateTime object for processing. To convert the data from string/integer
+ * to DateTime you can set a normalization transformer by calling
+ * appendNormTransformer() in configure(). The normalized data is then
+ * converted to the displayed data as described before.
+ *
  * @author Fabien Potencier <fabien@symfony.com>
  * @author Bernhard Schussek <bernhard.schussek@symfony.com>
  */
-class Form extends Field implements \IteratorAggregate, FormInterface
+class Form implements \IteratorAggregate, FormInterface
 {
     /**
-     * Contains all the fields of this group
-     * @var array
-     */
-    protected $fields = array();
-
-    /**
-     * Contains the names of submitted values who don't belong to any fields
-     * @var array
-     */
-    protected $extraFields = array();
-
-    /**
-     * Stores the class that the data of this form must be instances of
+     * The name of this form
      * @var string
      */
-    protected $dataClass;
+    private $name;
 
     /**
-     * Stores the constructor closure for creating new domain object instances
-     * @var \Closure
+     * The parent fo this form
+     * @var FormInterface
      */
-    protected $dataConstructor;
+    private $parent;
 
     /**
-     * The context used when creating the form
-     * @var FormContext
+     * The children of this form
+     * @var array
      */
-    protected $context = null;
+    private $children = array();
 
     /**
-     * Creates a new form with the options stored in the given context
-     *
-     * @param  FormContextInterface $context
-     * @param  string $name
-     * @param  array $options
-     * @return Form
+     * The mapper for mapping data to children and back
+     * @var DataMapper\DataMapperInterface
      */
-    public static function create(FormContextInterface $context, $name = null, array $options = array())
+    private $dataMapper;
+
+    /**
+     * The errors of this form
+     * @var array
+     */
+    private $errors = array();
+
+    /**
+     * Whether added errors should bubble up to the parent
+     * @var Boolean
+     */
+    private $errorBubbling;
+
+    /**
+     * Whether this form is bound
+     * @var Boolean
+     */
+    private $bound = false;
+
+    /**
+     * Whether this form may not be empty
+     * @var Boolean
+     */
+    private $required;
+
+    /**
+     * The form data in application format
+     * @var mixed
+     */
+    private $data;
+
+    /**
+     * The form data in normalized format
+     * @var mixed
+     */
+    private $normData;
+
+    /**
+     * The form data in client format
+     * @var mixed
+     */
+    private $clientData;
+
+    /**
+     * Data used for the client data when no value is bound
+     * @var mixed
+     */
+    private $emptyData = '';
+
+    /**
+     * The names of bound values that don't belong to any children
+     * @var array
+     */
+    private $extraData = array();
+
+    /**
+     * The transformer for transforming from application to normalized format
+     * and back
+     * @var DataTransformer\DataTransformerInterface
+     */
+    private $normTransformers;
+
+    /**
+     * The transformer for transforming from normalized to client format and
+     * back
+     * @var DataTransformer\DataTransformerInterface
+     */
+    private $clientTransformers;
+
+    /**
+     * Whether the data in application, normalized and client format is
+     * synchronized. Data may not be synchronized if transformation errors
+     * occur.
+     * @var Boolean
+     */
+    private $synchronized = true;
+
+    /**
+     * The validators attached to this form
+     * @var array
+     */
+    private $validators;
+
+    /**
+     * Whether this form may only be read, but not bound
+     * @var Boolean
+     */
+    private $readOnly = false;
+
+    /**
+     * The dispatcher for distributing events of this form
+     * @var Symfony\Component\EventDispatcher\EventDispatcherInterface
+     */
+    private $dispatcher;
+
+    /**
+     * Key-value store for arbitrary attributes attached to this form
+     * @var array
+     */
+    private $attributes;
+
+    /**
+     * The FormTypeInterface instances used to create this form
+     * @var array
+     */
+    private $types;
+
+    public function __construct($name, EventDispatcherInterface $dispatcher,
+        array $types = array(), array $clientTransformers = array(),
+        array $normTransformers = array(),
+        DataMapperInterface $dataMapper = null, array $validators = array(),
+        $required = false, $readOnly = false, $errorBubbling = false,
+        $emptyData = null, array $attributes = array())
     {
-        return new static($name, array_merge($context->getOptions(), $options));
-    }
-
-    /**
-     * Constructor.
-     *
-     * @param string $name
-     * @param array $options
-     */
-    public function __construct($name = null, array $options = array())
-    {
-        $this->addOption('data_class');
-        $this->addOption('data_constructor');
-        $this->addOption('csrf_field_name', '_token');
-        $this->addOption('csrf_provider');
-        $this->addOption('field_factory');
-        $this->addOption('validation_groups');
-        $this->addOption('virtual', false);
-        $this->addOption('validator');
-        $this->addOption('context');
-        $this->addOption('by_reference', true);
-
-        if (isset($options['validation_groups'])) {
-            $options['validation_groups'] = (array)$options['validation_groups'];
-        }
-
-        if (isset($options['data_class'])) {
-            $this->dataClass = $options['data_class'];
-        }
-
-        if (isset($options['data_constructor'])) {
-            $this->dataConstructor = $options['data_constructor'];
-        }
-
-        parent::__construct($name, $options);
-
-        // Enable CSRF protection
-        if ($this->getOption('csrf_provider')) {
-            if (!$this->getOption('csrf_provider') instanceof CsrfProviderInterface) {
-                throw new FormException('The object passed to the "csrf_provider" option must implement CsrfProviderInterface');
+        foreach ($clientTransformers as $transformer) {
+            if (!$transformer instanceof DataTransformerInterface) {
+                throw new UnexpectedTypeException($transformer, 'Symfony\Component\Form\DataTransformer\DataTransformerInterface');
             }
-
-            $fieldName = $this->getOption('csrf_field_name');
-            $token = $this->getOption('csrf_provider')->generateCsrfToken(get_class($this));
-
-            $this->add(new HiddenField($fieldName, array('data' => $token)));
         }
+
+        foreach ($normTransformers as $transformer) {
+            if (!$transformer instanceof DataTransformerInterface) {
+                throw new UnexpectedTypeException($transformer, 'Symfony\Component\Form\DataTransformer\DataTransformerInterface');
+            }
+        }
+
+        foreach ($validators as $validator) {
+            if (!$validator instanceof FormValidatorInterface) {
+                throw new UnexpectedTypeException($validator, 'Symfony\Component\Form\Validator\FormValidatorInterface');
+            }
+        }
+
+        $this->name = (string)$name;
+        $this->types = $types;
+        $this->dispatcher = $dispatcher;
+        $this->clientTransformers = $clientTransformers;
+        $this->normTransformers = $normTransformers;
+        $this->validators = $validators;
+        $this->dataMapper = $dataMapper;
+        $this->required = $required;
+        $this->readOnly = $readOnly;
+        $this->attributes = $attributes;
+        $this->errorBubbling = $errorBubbling;
+        $this->emptyData = $emptyData;
+
+        $this->setData(null);
     }
 
-    /**
-     * Clones this group
-     */
     public function __clone()
     {
-        foreach ($this->fields as $name => $field) {
-            $field = clone $field;
-            // this condition is only to "bypass" a PHPUnit bug with mocks
-            if (null !== $field->getParent()) {
-                $field->setParent($this);
-            }
-            $this->fields[$name] = $field;
+        foreach ($this->children as $key => $child) {
+            $this->children[$key] = clone $child;
         }
     }
 
     /**
-     * Adds a new field to this group. A field must have a unique name within
-     * the group. Otherwise the existing field is overwritten.
-     *
-     * If you add a nested group, this group should also be represented in the
-     * object hierarchy. If you want to add a group that operates on the same
-     * hierarchy level, use merge().
-     *
-     * <code>
-     * class Entity
-     * {
-     *   public $location;
-     * }
-     *
-     * class Location
-     * {
-     *   public $longitude;
-     *   public $latitude;
-     * }
-     *
-     * $entity = new Entity();
-     * $entity->location = new Location();
-     *
-     * $form = new Form('entity', $entity, $validator);
-     *
-     * $locationGroup = new Form('location');
-     * $locationGroup->add(new TextField('longitude'));
-     * $locationGroup->add(new TextField('latitude'));
-     *
-     * $form->add($locationGroup);
-     * </code>
-     *
-     * @param FieldInterface|string $field
-     * @return FieldInterface
+     * {@inheritDoc}
      */
-    public function add($field)
+    public function getName()
     {
-        if ($this->isSubmitted()) {
-            throw new AlreadySubmittedException('You cannot add fields after submitting a form');
-        }
+        return $this->name;
+    }
 
-        // if the field is given as string, ask the field factory of the form
-        // to create a field
-        if (!$field instanceof FieldInterface) {
-            if (!is_string($field)) {
-                throw new UnexpectedTypeException($field, 'FieldInterface or string');
-            }
-
-            $factory = $this->getFieldFactory();
-
-            if (!$factory) {
-                throw new FormException('A field factory must be set to automatically create fields');
-            }
-
-            $class = $this->getDataClass();
-
-            if (!$class) {
-                throw new FormException('The data class must be set to automatically create fields');
-            }
-
-            $options = func_num_args() > 1 ? func_get_arg(1) : array();
-            $field = $factory->getInstance($class, $field, $options);
-        }
-
-        if ('' === $field->getKey() || null === $field->getKey()) {
-            throw new FieldDefinitionException('You cannot add anonymous fields');
-        }
-
-        $this->fields[$field->getKey()] = $field;
-
-        $field->setParent($this);
-
-        $data = $this->getTransformedData();
-
-        // if the property "data" is NULL, getTransformedData() returns an empty
-        // string
-        if (!empty($data)) {
-            $field->readProperty($data);
-        }
-
-        return $field;
+    public function getTypes()
+    {
+        return $this->types;
     }
 
     /**
-     * Removes the field with the given key.
-     *
-     * @param string $key
+     * {@inheritDoc}
      */
-    public function remove($key)
+    public function isRequired()
     {
-        $this->fields[$key]->setParent(null);
+        if (null === $this->parent || $this->parent->isRequired()) {
+            return $this->required;
+        }
 
-        unset($this->fields[$key]);
+        return false;
     }
 
     /**
-     * Returns whether a field with the given key exists.
+     * {@inheritDoc}
+     */
+    public function isReadOnly()
+    {
+        if (null === $this->parent || !$this->parent->isReadOnly()) {
+            return $this->readOnly;
+        }
+
+        return true;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setParent(FormInterface $parent = null)
+    {
+        $this->parent = $parent;
+
+        return $this;
+    }
+
+    /**
+     * Returns the parent field.
+     *
+     * @return FormInterface  The parent field
+     */
+    public function getParent()
+    {
+        return $this->parent;
+    }
+
+    /**
+     * Returns whether the field has a parent.
      *
-     * @param  string $key
      * @return Boolean
      */
-    public function has($key)
+    public function hasParent()
     {
-        return isset($this->fields[$key]);
+        return null !== $this->parent;
     }
 
     /**
-     * Returns the field with the given key.
+     * Returns the root of the form tree
      *
-     * @param  string $key
-     * @return FieldInterface
+     * @return FormInterface  The root of the tree
      */
-    public function get($key)
+    public function getRoot()
     {
-        if (isset($this->fields[$key])) {
-            return $this->fields[$key];
+        return $this->parent ? $this->parent->getRoot() : $this;
+    }
+
+    /**
+     * Returns whether the field is the root of the form tree
+     *
+     * @return Boolean
+     */
+    public function isRoot()
+    {
+        return !$this->hasParent();
+    }
+
+    public function hasAttribute($name)
+    {
+        return isset($this->attributes[$name]);
+    }
+
+    public function getAttribute($name)
+    {
+        return $this->attributes[$name];
+    }
+
+    /**
+     * Updates the field with default data
+     *
+     * @see FormInterface
+     */
+    public function setData($appData)
+    {
+        $event = new DataEvent($this, $appData);
+        $this->dispatcher->dispatch(Events::preSetData, $event);
+
+        // Hook to change content of the data
+        $event = new FilterDataEvent($this, $appData);
+        $this->dispatcher->dispatch(Events::onSetData, $event);
+        $appData = $event->getData();
+
+        // Treat data as strings unless a value transformer exists
+        if (!$this->clientTransformers && !$this->normTransformers && is_scalar($appData)) {
+            $appData = (string)$appData;
         }
 
-        throw new \InvalidArgumentException(sprintf('Field "%s" does not exist.', $key));
-    }
+        // Synchronize representations - must not change the content!
+        $normData = $this->appToNorm($appData);
+        $clientData = $this->normToClient($normData);
 
-    /**
-     * Returns all fields in this group
-     *
-     * @return array
-     */
-    public function getFields()
-    {
-        return $this->fields;
-    }
+        $this->data = $appData;
+        $this->normData = $normData;
+        $this->clientData = $clientData;
+        $this->synchronized = true;
 
-    /**
-     * Returns an array of visible fields from the current schema.
-     *
-     * @return array
-     */
-    public function getVisibleFields()
-    {
-        return $this->getFieldsByVisibility(false, false);
-    }
-
-    /**
-     * Returns an array of visible fields from the current schema.
-     *
-     * This variant of the method will recursively get all the
-     * fields from the nested forms or field groups
-     *
-     * @return array
-     */
-    public function getAllVisibleFields()
-    {
-        return $this->getFieldsByVisibility(false, true);
-    }
-
-    /**
-     * Returns an array of hidden fields from the current schema.
-     *
-     * @return array
-     */
-    public function getHiddenFields()
-    {
-        return $this->getFieldsByVisibility(true, false);
-    }
-
-    /**
-     * Returns an array of hidden fields from the current schema.
-     *
-     * This variant of the method will recursively get all the
-     * fields from the nested forms or field groups
-     *
-     * @return array
-     */
-    public function getAllHiddenFields()
-    {
-        return $this->getFieldsByVisibility(true, true);
-    }
-
-    /**
-     * Returns a filtered array of fields from the current schema.
-     *
-     * @param Boolean $hidden Whether to return hidden fields only or visible fields only
-     * @param Boolean $recursive Whether to recur through embedded schemas
-     *
-     * @return array
-     */
-    protected function getFieldsByVisibility($hidden, $recursive)
-    {
-        $fields = array();
-        $hidden = (Boolean)$hidden;
-
-        foreach ($this->fields as $field) {
-            if ($field instanceof Form && $recursive) {
-                $fields = array_merge($fields, $field->getFieldsByVisibility($hidden, $recursive));
-            } else if ($hidden === $field->isHidden()) {
-                $fields[] = $field;
-            }
+        if ($this->dataMapper) {
+            // Update child forms from the data
+            $this->dataMapper->mapDataToForms($clientData, $this->children);
         }
 
-        return $fields;
-    }
+        $event = new DataEvent($this, $appData);
+        $this->dispatcher->dispatch(Events::postSetData, $event);
 
-    /**
-     * Initializes the field group with an object to operate on
-     *
-     * @see FieldInterface
-     */
-    public function setData($data)
-    {
-        if (empty($data)) {
-            if ($this->dataConstructor) {
-                $constructor = $this->dataConstructor;
-                $data = $constructor();
-            } else if ($this->dataClass) {
-                $class = $this->dataClass;
-                $data = new $class();
-            }
-        }
-
-        parent::setData($data);
-
-        // get transformed data and pass its values to child fields
-        $data = $this->getTransformedData();
-
-        if (!empty($data) && !is_array($data) && !is_object($data)) {
-            throw new \InvalidArgumentException(sprintf('Expected argument of type object or array, %s given', gettype($data)));
-        }
-
-        if (!empty($data)) {
-            if ($this->dataClass && !$data instanceof $this->dataClass) {
-                throw new FormException(sprintf('Form data should be instance of %s', $this->dataClass));
-            }
-
-            $this->readObject($data);
-        }
-    }
-
-    /**
-     * Returns the data of the field as it is displayed to the user.
-     *
-     * @see FieldInterface
-     * @return array of field name => value
-     */
-    public function getDisplayedData()
-    {
-        $values = array();
-
-        foreach ($this->fields as $key => $field) {
-            $values[$key] = $field->getDisplayedData();
-        }
-
-        return $values;
+        return $this;
     }
 
     /**
@@ -402,118 +394,237 @@ class Form extends Field implements \IteratorAggregate, FormInterface
      *
      * @param  string|array $data  The POST data
      */
-    public function submit($data)
+    public function bind($clientData)
     {
-        if (null === $data) {
-            $data = array();
+        if ($this->readOnly) {
+            return;
         }
 
-        if (!is_array($data)) {
-            throw new UnexpectedTypeException($data, 'array');
+        if (is_scalar($clientData) || null === $clientData) {
+            $clientData = (string)$clientData;
         }
 
-        // remember for later
-        $submittedData = $data;
+        // Initialize errors in the very beginning so that we don't lose any
+        // errors added during listeners
+        $this->errors = array();
 
-        foreach ($this->fields as $key => $field) {
-            if (!isset($data[$key])) {
-                $data[$key] = null;
+        $event = new DataEvent($this, $clientData);
+        $this->dispatcher->dispatch(Events::preBind, $event);
+
+        $appData = null;
+        $normData = null;
+        $extraData = array();
+        $synchronized = false;
+
+        // Hook to change content of the data bound by the browser
+        $event = new FilterDataEvent($this, $clientData);
+        $this->dispatcher->dispatch(Events::onBindClientData, $event);
+        $clientData = $event->getData();
+
+        if (count($this->children) > 0) {
+            if (null === $clientData || '' === $clientData) {
+                $clientData = array();
+            }
+
+            if (!is_array($clientData)) {
+                throw new UnexpectedTypeException($clientData, 'array');
+            }
+
+            foreach ($this->children as $name => $child) {
+                if (!isset($clientData[$name])) {
+                    $clientData[$name] = null;
+                }
+            }
+
+            foreach ($clientData as $name => $value) {
+                if ($this->has($name)) {
+                    $this->children[$name]->bind($value);
+                } else {
+                    $extraData[$name] = $value;
+                }
+            }
+
+            // If we have a data mapper, use old client data and merge
+            // data from the children into it later
+            if ($this->dataMapper) {
+                $clientData = $this->getClientData();
             }
         }
 
-        $data = $this->preprocessData($data);
+        if (null === $clientData || '' === $clientData) {
+            $clientData = $this->emptyData;
 
-        foreach ($data as $key => $value) {
-            if ($this->has($key)) {
-                $this->fields[$key]->submit($value);
+            if ($clientData instanceof \Closure) {
+                $clientData = $clientData->__invoke($this);
             }
         }
 
-        $data = $this->getTransformedData();
+        // Merge form data from children into existing client data
+        if (count($this->children) > 0 && $this->dataMapper) {
+            $this->dataMapper->mapFormsToData($this->children, $clientData);
+        }
 
-        $this->writeObject($data);
+        try {
+            // Normalize data to unified representation
+            $normData = $this->clientToNorm($clientData);
+            $synchronized = true;
+        } catch (TransformationFailedException $e) {
+        }
 
-        // set and reverse transform the data
-        parent::submit($data);
+        if ($synchronized) {
+            // Hook to change content of the data in the normalized
+            // representation
+            $event = new FilterDataEvent($this, $normData);
+            $this->dispatcher->dispatch(Events::onBindNormData, $event);
+            $normData = $event->getData();
 
-        $this->extraFields = array();
+            // Synchronize representations - must not change the content!
+            $appData = $this->normToApp($normData);
+            $clientData = $this->normToClient($normData);
+        }
 
-        foreach ($submittedData as $key => $value) {
-            if (!$this->has($key)) {
-                $this->extraFields[] = $key;
-            }
+        $this->bound = true;
+        $this->data = $appData;
+        $this->normData = $normData;
+        $this->clientData = $clientData;
+        $this->extraData = $extraData;
+        $this->synchronized = $synchronized;
+
+        $event = new DataEvent($this, $clientData);
+        $this->dispatcher->dispatch(Events::postBind, $event);
+
+        foreach ($this->validators as $validator) {
+            $validator->validate($this);
         }
     }
 
     /**
-     * Updates the child fields from the properties of the given data
+     * Binds a request to the form
      *
-     * This method calls readProperty() on all child fields that have a
-     * property path set. If a child field has no property path set but
-     * implements FormInterface, writeProperty() is called on its
-     * children instead.
+     * If the request was a POST request, the data is bound to the form,
+     * transformed and written into the form data (an object or an array).
+     * You can set the form data by passing it in the second parameter
+     * of this method or by passing it in the "data" option of the form's
+     * constructor.
      *
-     * @param array|object $objectOrArray
+     * @param Request $request    The request to bind to the form
+     * @param array|object $data  The data from which to read default values
+     *                            and where to write bound values
      */
-    protected function readObject(&$objectOrArray)
+    public function bindRequest(Request $request)
     {
-        $iterator = new RecursiveFieldIterator($this);
-        $iterator = new \RecursiveIteratorIterator($iterator);
+        // Store the bound data in case of a post request
+        switch ($request->getMethod()) {
+            case 'POST':
+            case 'PUT':
+                $data = array_replace_recursive(
+                    $request->request->get($this->getName(), array()),
+                    $request->files->get($this->getName(), array())
+                );
+                break;
+            case 'GET':
+                $data = $request->query->get($this->getName(), array());
+                break;
+            default:
+                throw new FormException(sprintf('The request method "%s" is not supported', $request->getMethod()));
+        }
 
-        foreach ($iterator as $field) {
-            $field->readProperty($objectOrArray);
+        $this->bind($data);
+    }
+
+    /**
+     * Returns the data in the format needed for the underlying object.
+     *
+     * @return mixed
+     */
+    public function getData()
+    {
+        return $this->data;
+    }
+
+    /**
+     * Returns the normalized data of the field.
+     *
+     * @return mixed  When the field is not bound, the default data is returned.
+     *                When the field is bound, the normalized bound data is
+     *                returned if the field is valid, null otherwise.
+     */
+    public function getNormData()
+    {
+        return $this->normData;
+    }
+
+    /**
+     * Returns the data transformed by the value transformer
+     *
+     * @return string
+     */
+    public function getClientData()
+    {
+        return $this->clientData;
+    }
+
+    public function getExtraData()
+    {
+        return $this->extraData;
+    }
+
+    /**
+     * Adds an error to the field.
+     *
+     * @see FormInterface
+     */
+    public function addError(FormError $error)
+    {
+        if ($this->parent && $this->errorBubbling) {
+            $this->parent->addError($error);
+        } else {
+            $this->errors[] = $error;
         }
     }
 
     /**
-     * Updates all properties of the given data from the child fields
-     *
-     * This method calls writeProperty() on all child fields that have a property
-     * path set. If a child field has no property path set but implements
-     * FormInterface, writeProperty() is called on its children instead.
-     *
-     * @param array|object $objectOrArray
-     */
-    protected function writeObject(&$objectOrArray)
-    {
-        $iterator = new RecursiveFieldIterator($this);
-        $iterator = new \RecursiveIteratorIterator($iterator);
-
-        foreach ($iterator as $field) {
-            $field->writeProperty($objectOrArray);
-        }
-    }
-
-    /**
-     * Processes the submitted data before it is passed to the individual fields
-     *
-     * The data is in the user format.
-     *
-     * @param  array $data
-     * @return array
-     */
-    protected function preprocessData(array $data)
-    {
-        return $data;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function isVirtual()
-    {
-        return $this->getOption('virtual');
-    }
-
-    /**
-     * Returns whether this form was submitted with extra fields
+     * Returns whether errors bubble up to the parent
      *
      * @return Boolean
      */
-    public function isSubmittedWithExtraFields()
+    public function getErrorBubbling()
     {
-        // TODO: integrate the field names in the error message
-        return count($this->extraFields) > 0;
+        return $this->errorBubbling;
+    }
+
+    /**
+     * Returns whether the field is bound.
+     *
+     * @return Boolean  true if the form is bound to input values, false otherwise
+     */
+    public function isBound()
+    {
+        return $this->bound;
+    }
+
+    /**
+     * Returns whether the data in the different formats is synchronized
+     *
+     * @return Boolean
+     */
+    public function isSynchronized()
+    {
+        return $this->synchronized;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function isEmpty()
+    {
+        foreach ($this->children as $child) {
+            if (!$child->isEmpty()) {
+                return false;
+            }
+        }
+
+        return array() === $this->data || null === $this->data || '' === $this->data;
     }
 
     /**
@@ -523,12 +634,12 @@ class Form extends Field implements \IteratorAggregate, FormInterface
      */
     public function isValid()
     {
-        if (!parent::isValid()) {
+        if (!$this->isBound() || $this->hasErrors()) {
             return false;
         }
 
-        foreach ($this->fields as $field) {
-            if (!$field->isValid()) {
+        foreach ($this->children as $child) {
+            if (!$child->isValid()) {
                 return false;
             }
         }
@@ -537,109 +648,153 @@ class Form extends Field implements \IteratorAggregate, FormInterface
     }
 
     /**
-     * {@inheritDoc}
+     * Returns whether or not there are errors.
+     *
+     * @return Boolean  true if form is bound and not valid
      */
-    public function addError(Error $error, PropertyPathIterator $pathIterator = null)
+    public function hasErrors()
     {
-        if (null !== $pathIterator) {
-            if ($error instanceof FieldError && $pathIterator->hasNext()) {
-                $pathIterator->next();
-
-                if ($pathIterator->isProperty() && $pathIterator->current() === 'fields') {
-                    $pathIterator->next();
-                }
-
-                if ($this->has($pathIterator->current()) && !$this->get($pathIterator->current())->isHidden()) {
-                    $this->get($pathIterator->current())->addError($error, $pathIterator);
-
-                    return;
-                }
-            } else if ($error instanceof DataError) {
-                $iterator = new RecursiveFieldIterator($this);
-                $iterator = new \RecursiveIteratorIterator($iterator);
-
-                foreach ($iterator as $field) {
-                    if (null !== ($fieldPath = $field->getPropertyPath())) {
-                        if ($fieldPath->getElement(0) === $pathIterator->current() && !$field->isHidden()) {
-                            if ($pathIterator->hasNext()) {
-                                $pathIterator->next();
-                            }
-
-                            $field->addError($error, $pathIterator);
-
-                            return;
-                        }
-                    }
-                }
-            }
-        }
-
-        parent::addError($error);
+        // Don't call isValid() here, as its semantics are slightly different
+        // Field groups are not valid if their children are invalid, but
+        // hasErrors() returns only true if a field/field group itself has
+        // errors
+        return count($this->errors) > 0;
     }
 
     /**
-     * Returns whether the field requires a multipart form.
+     * Returns all errors
      *
+     * @return array  An array of FormError instances that occurred during binding
+     */
+    public function getErrors()
+    {
+        return $this->errors;
+    }
+
+    /**
+     * Returns the DataTransformer.
+     *
+     * @return array
+     */
+    public function getNormTransformers()
+    {
+        return $this->normTransformers;
+    }
+
+    /**
+     * Returns the DataTransformer.
+     *
+     * @return array
+     */
+    public function getClientTransformers()
+    {
+        return $this->clientTransformers;
+    }
+
+    /**
+     * Returns all children in this group
+     *
+     * @return array
+     */
+    public function getChildren()
+    {
+        return $this->children;
+    }
+
+    public function hasChildren()
+    {
+        return count($this->children) > 0;
+    }
+
+    public function add(FormInterface $child)
+    {
+        $this->children[$child->getName()] = $child;
+
+        $child->setParent($this);
+
+        if ($this->dataMapper) {
+            $this->dataMapper->mapDataToForm($this->getClientData(), $child);
+        }
+    }
+
+    public function remove($name)
+    {
+        if (isset($this->children[$name])) {
+            $this->children[$name]->setParent(null);
+
+            unset($this->children[$name]);
+        }
+    }
+
+    /**
+     * Returns whether a child with the given name exists.
+     *
+     * @param  string $name
      * @return Boolean
      */
-    public function isMultipart()
+    public function has($name)
     {
-        foreach ($this->fields as $field) {
-            if ($field->isMultipart()) {
-                return true;
-            }
-        }
-
-        return false;
+        return isset($this->children[$name]);
     }
 
     /**
-     * Returns true if the field exists (implements the \ArrayAccess interface).
+     * Returns the child with the given name.
      *
-     * @param string $key The key of the field
+     * @param  string $name
+     * @return FormInterface
+     */
+    public function get($name)
+    {
+        if (isset($this->children[$name])) {
+            return $this->children[$name];
+        }
+
+        throw new \InvalidArgumentException(sprintf('Field "%s" does not exist.', $name));
+    }
+
+    /**
+     * Returns true if the child exists (implements the \ArrayAccess interface).
+     *
+     * @param string $name The name of the child
      *
      * @return Boolean true if the widget exists, false otherwise
      */
-    public function offsetExists($key)
+    public function offsetExists($name)
     {
-        return $this->has($key);
+        return $this->has($name);
     }
 
     /**
-     * Returns the form field associated with the name (implements the \ArrayAccess interface).
+     * Returns the form child associated with the name (implements the \ArrayAccess interface).
      *
-     * @param string $key The offset of the value to get
+     * @param string $name The offset of the value to get
      *
-     * @return Field A form field instance
+     * @return FormInterface  A form instance
      */
-    public function offsetGet($key)
+    public function offsetGet($name)
     {
-        return $this->get($key);
+        return $this->get($name);
     }
 
     /**
-     * Throws an exception saying that values cannot be set (implements the \ArrayAccess interface).
+     * Adds a child to the form (implements the \ArrayAccess interface).
      *
-     * @param string $offset (ignored)
-     * @param string $value (ignored)
-     *
-     * @throws \LogicException
+     * @param string $name Ignored. The name of the child is used.
+     * @param FormInterface $child  The child to be added
      */
-    public function offsetSet($key, $field)
+    public function offsetSet($name, $child)
     {
-        throw new \LogicException('Use the method add() to add fields');
+        $this->add($child);
     }
 
     /**
-     * Throws an exception saying that values cannot be unset (implements the \ArrayAccess interface).
+     * Removes the child with the given name from the form (implements the \ArrayAccess interface).
      *
-     * @param string $key
-     *
-     * @throws \LogicException
+     * @param string $name  The name of the child to be removed
      */
-    public function offsetUnset($key)
+    public function offsetUnset($name)
     {
-        return $this->remove($key);
+        $this->remove($name);
     }
 
     /**
@@ -649,316 +804,118 @@ class Form extends Field implements \IteratorAggregate, FormInterface
      */
     public function getIterator()
     {
-        return new \ArrayIterator($this->fields);
+        return new \ArrayIterator($this->children);
     }
 
     /**
-     * Returns the number of form fields (implements the \Countable interface).
+     * Returns the number of form children (implements the \Countable interface).
      *
-     * @return integer The number of embedded form fields
+     * @return integer The number of embedded form children
      */
     public function count()
     {
-        return count($this->fields);
+        return count($this->children);
     }
 
     /**
-     * Returns a factory for automatically creating fields based on metadata
-     * available for a form's object
+     * Normalizes the value if a normalization transformer is set
      *
-     * @return FieldFactoryInterface  The factory
+     * @param  mixed $value  The value to transform
+     * @return string
      */
-    public function getFieldFactory()
+    private function appToNorm($value)
     {
-        return $this->getOption('field_factory');
-    }
-
-    /**
-     * Returns the validator used by the form
-     *
-     * @return ValidatorInterface  The validator instance
-     */
-    public function getValidator()
-    {
-        return $this->getOption('validator');
-    }
-
-    /**
-     * Returns the validation groups validated by the form
-     *
-     * @return array  A list of validation groups or null
-     */
-    public function getValidationGroups()
-    {
-        $groups = $this->getOption('validation_groups');
-
-        if (!$groups && $this->hasParent()) {
-            $groups = $this->getParent()->getValidationGroups();
+        foreach ($this->normTransformers as $transformer) {
+            $value = $transformer->transform($value);
         }
 
-        return $groups;
+        return $value;
     }
 
-    /**
-     * Returns the name used for the CSRF protection field
-     *
-     * @return string  The field name
-     */
-    public function getCsrfFieldName()
+    public function createView(FormView $parent = null)
     {
-        return $this->getOption('csrf_field_name');
-    }
-
-    /**
-     * Returns the provider used for generating and validating CSRF tokens
-     *
-     * @return CsrfProviderInterface  The provider instance
-     */
-    public function getCsrfProvider()
-    {
-        return $this->getOption('csrf_provider');
-    }
-
-    /**
-     * Binds a request to the form
-     *
-     * If the request was a POST request, the data is submitted to the form,
-     * transformed and written into the form data (an object or an array).
-     * You can set the form data by passing it in the second parameter
-     * of this method or by passing it in the "data" option of the form's
-     * constructor.
-     *
-     * @param Request $request    The request to bind to the form
-     * @param array|object $data  The data from which to read default values
-     *                            and where to write submitted values
-     */
-    public function bind(Request $request, $data = null)
-    {
-        if (!$this->getName()) {
-            throw new FormException('You cannot bind anonymous forms. Please give this form a name');
+        if (null === $parent && $this->parent) {
+            $parent = $this->parent->createView();
         }
 
-        // Store object from which to read the default values and where to
-        // write the submitted values
-        if (null !== $data) {
-            $this->setData($data);
+        $view = new FormView();
+
+        if (null !== $parent) {
+            $view->setParent($parent);
         }
 
-        // Store the submitted data in case of a post request
-        if ('POST' == $request->getMethod()) {
-            $values = $request->request->get($this->getName(), array());
-            $files = $request->files->get($this->getName(), array());
+        $types = (array) $this->types;
+        $childViews = array();
 
-            $this->submit(self::deepArrayUnion($values, $files));
-
-            $this->validate();
+        foreach ($types as $type) {
+            $type->buildView($view, $this);
         }
+
+        foreach ($this->children as $key => $child) {
+            $childViews[$key] = $child->createView($view);
+        }
+
+        $view->setChildren($childViews);
+
+        foreach ($types as $type) {
+            $type->buildViewBottomUp($view, $this);
+        }
+
+        return $view;
     }
 
     /**
-     * Validates the form and its domain object
+     * Reverse transforms a value if a normalization transformer is set.
      *
-     * @throws FormException  If the option "validator" was not set
+     * @param  string $value  The value to reverse transform
+     * @return mixed
      */
-    public function validate()
+    private function normToApp($value)
     {
-        $validator = $this->getOption('validator');
-
-        if (null === $validator) {
-            throw new MissingOptionsException('The option "validator" is required for validating', array('validator'));
+        for ($i = count($this->normTransformers) - 1; $i >= 0; --$i) {
+            $value = $this->normTransformers[$i]->reverseTransform($value);
         }
 
-        // Validate the form in group "Default"
-        // Validation of the data in the custom group is done by validateData(),
-        // which is constrained by the Execute constraint
-        if ($violations = $validator->validate($this)) {
-            foreach ($violations as $violation) {
-                $propertyPath = new PropertyPath($violation->getPropertyPath());
-                $iterator = $propertyPath->getIterator();
-                $template = $violation->getMessageTemplate();
-                $parameters = $violation->getMessageParameters();
-
-                if ($iterator->current() == 'data') {
-                    $iterator->next(); // point at the first data element
-                    $error = new DataError($template, $parameters);
-                } else {
-                    $error = new FieldError($template, $parameters);
-                }
-
-                $this->addError($error, $iterator);
-            }
-        }
+        return $value;
     }
 
     /**
-     * @return true if this form is CSRF protected
-     */
-    public function isCsrfProtected()
-    {
-        return $this->has($this->getOption('csrf_field_name'));
-    }
-
-    /**
-     * Returns whether the CSRF token is valid
+     * Transforms the value if a value transformer is set.
      *
-     * @return Boolean
+     * @param  mixed $value  The value to transform
+     * @return string
      */
-    public function isCsrfTokenValid()
+    private function normToClient($value)
     {
-        if (!$this->isCsrfProtected()) {
-            return true;
-        } else {
-            $token = $this->get($this->getOption('csrf_field_name'))->getDisplayedData();
-
-            return $this->getOption('csrf_provider')->isCsrfTokenValid(get_class($this), $token);
-        }
-    }
-
-    /**
-     * Returns whether the maximum POST size was reached in this request.
-     *
-     * @return Boolean
-     */
-    public function isPostMaxSizeReached()
-    {
-        if ($this->isRoot() && isset($_SERVER['CONTENT_LENGTH'])) {
-            $length = (int) $_SERVER['CONTENT_LENGTH'];
-            $max = trim(ini_get('post_max_size'));
-
-            switch (strtolower(substr($max, -1))) {
-                // The 'G' modifier is available since PHP 5.1.0
-                case 'g':
-                    $max *= 1024;
-                case 'm':
-                    $max *= 1024;
-                case 'k':
-                    $max *= 1024;
-            }
-
-            return $length > $max;
+        if (!$this->clientTransformers) {
+            // Scalar values should always be converted to strings to
+            // facilitate differentiation between empty ("") and zero (0).
+            return null === $value || is_scalar($value) ? (string)$value : $value;
         }
 
-        return false;
-    }
-
-    /**
-     * Sets the class that object bound to this form must be instances of
-     *
-     * @param string  A fully qualified class name
-     */
-    protected function setDataClass($class)
-    {
-        $this->dataClass = $class;
-    }
-
-    /**
-     * Returns the class that object must have that are bound to this form
-     *
-     * @return string  A fully qualified class name
-     */
-    public function getDataClass()
-    {
-        return $this->dataClass;
-    }
-
-    /**
-     * Returns the context used when creating this form
-     *
-     * @return FormContext  The context instance
-     */
-    public function getContext()
-    {
-        return $this->getOption('context');
-    }
-
-    /**
-     * Validates the data of this form
-     *
-     * This method is called automatically during the validation process.
-     *
-     * @param ExecutionContext $context  The current validation context
-     */
-    public function validateData(ExecutionContext $context)
-    {
-        if (is_object($this->getData()) || is_array($this->getData())) {
-            $groups = $this->getValidationGroups();
-            $propertyPath = $context->getPropertyPath();
-            $graphWalker = $context->getGraphWalker();
-
-            if (null === $groups) {
-                $groups = array(null);
-            }
-
-            // The Execute constraint is called on class level, so we need to
-            // set the property manually
-            $context->setCurrentProperty('data');
-
-            // Adjust the property path accordingly
-            if (!empty($propertyPath)) {
-                $propertyPath .= '.';
-            }
-
-            $propertyPath .= 'data';
-
-            foreach ($groups as $group) {
-                $graphWalker->walkReference($this->getData(), $group, $propertyPath, true);
-            }
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function writeProperty(&$objectOrArray)
-    {
-        $isReference = false;
-
-        // If the data is identical to the value in $objectOrArray, we are
-        // dealing with a reference
-        if ($this->getPropertyPath() !== null) {
-            $isReference = $this->getData() === $this->getPropertyPath()->getValue($objectOrArray);
+        foreach ($this->clientTransformers as $transformer) {
+            $value = $transformer->transform($value);
         }
 
-        // Don't write into $objectOrArray if $objectOrArray is an object,
-        // $isReference is true (see above) and the option "by_reference" is
-        // true as well
-        if (!is_object($objectOrArray) || !$isReference || !$this->getOption('by_reference')) {
-            parent::writeProperty($objectOrArray);
-        }
+        return $value;
     }
 
     /**
-     * {@inheritDoc}
+     * Reverse transforms a value if a value transformer is set.
+     *
+     * @param  string $value  The value to reverse transform
+     * @return mixed
      */
-    public function isEmpty()
+    private function clientToNorm($value)
     {
-        foreach ($this->fields as $field) {
-            if (!$field->isEmpty()) {
-                return false;
-            }
+        if (!$this->clientTransformers) {
+            return '' === $value ? null : $value;
         }
 
-        return true;
-    }
-
-    /**
-     * Merges two arrays without reindexing numeric keys.
-     *
-     * @param array $array1 An array to merge
-     * @param array $array2 An array to merge
-     *
-     * @return array The merged array
-     */
-    static protected function deepArrayUnion($array1, $array2)
-    {
-        foreach ($array2 as $key => $value) {
-            if (is_array($value) && isset($array1[$key]) && is_array($array1[$key])) {
-                $array1[$key] = self::deepArrayUnion($array1[$key], $value);
-            } else {
-                $array1[$key] = $value;
-            }
+        for ($i = count($this->clientTransformers) - 1; $i >= 0; --$i) {
+            $value = $this->clientTransformers[$i]->reverseTransform($value);
         }
 
-        return $array1;
+        return $value;
     }
 }
diff --git a/src/Symfony/Component/Form/FormBuilder.php b/src/Symfony/Component/Form/FormBuilder.php
new file mode 100644
index 0000000000..3037d1bb34
--- /dev/null
+++ b/src/Symfony/Component/Form/FormBuilder.php
@@ -0,0 +1,481 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form;
+
+use Symfony\Component\Form\DataMapper\DataMapperInterface;
+use Symfony\Component\Form\DataTransformer\DataTransformerInterface;
+use Symfony\Component\Form\Validator\FormValidatorInterface;
+use Symfony\Component\Form\Exception\FormException;
+use Symfony\Component\Form\Exception\UnexpectedTypeException;
+use Symfony\Component\Form\Type\FormTypeInterface;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+class FormBuilder
+{
+    private $name;
+
+    private $data;
+
+    private $dispatcher;
+
+    private $factory;
+
+    private $readOnly;
+
+    private $required;
+
+    private $clientTransformers = array();
+
+    private $normTransformers = array();
+
+    private $validators = array();
+
+    private $attributes = array();
+
+    private $types = array();
+
+    private $parent;
+
+    private $dataClass;
+
+    private $children = array();
+
+    private $dataMapper;
+
+    private $errorBubbling = false;
+
+    private $emptyData = '';
+
+    public function __construct($name, FormFactoryInterface $factory, EventDispatcherInterface $dispatcher, $dataClass = null)
+    {
+        $this->name = $name;
+        $this->factory = $factory;
+        $this->dispatcher = $dispatcher;
+        $this->dataClass = $dataClass;
+    }
+
+    public function getFormFactory()
+    {
+        return $this->factory;
+    }
+
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    public function setParent(FormBuilder $builder)
+    {
+        $this->parent = $builder;
+
+        return $this;
+    }
+
+    public function getParent()
+    {
+        return $this->parent;
+    }
+
+    public function end()
+    {
+        return $this->parent;
+    }
+
+    public function setData($data)
+    {
+        $this->data = $data;
+
+        return $this;
+    }
+
+    public function getData()
+    {
+        return $this->data;
+    }
+
+    public function setReadOnly($readOnly)
+    {
+        $this->readOnly = $readOnly;
+
+        return $this;
+    }
+
+    public function getReadOnly()
+    {
+        return $this->readOnly;
+    }
+
+    /**
+     * Sets whether this field is required to be filled out when bound.
+     *
+     * @param Boolean $required
+     */
+    public function setRequired($required)
+    {
+        $this->required = $required;
+
+        return $this;
+    }
+
+    public function getRequired()
+    {
+        return $this->required;
+    }
+
+    public function setErrorBubbling($errorBubbling)
+    {
+        $this->errorBubbling = $errorBubbling;
+
+        return $this;
+    }
+
+    public function getErrorBubbling()
+    {
+        return $this->errorBubbling;
+    }
+
+    public function addValidator(FormValidatorInterface $validator)
+    {
+        $this->validators[] = $validator;
+
+        return $this;
+    }
+
+    public function getValidators()
+    {
+        return $this->validators;
+    }
+
+    /**
+     * Adds an event listener for events on this field
+     *
+     * @see Symfony\Component\EventDispatcher\EventDispatcherInterface::addEventListener
+     */
+    public function addEventListener($eventNames, $listener, $priority = 0)
+    {
+        $this->dispatcher->addListener($eventNames, $listener, $priority);
+
+        return $this;
+    }
+
+    /**
+     * Adds an event subscriber for events on this field
+     *
+     * @see Symfony\Component\EventDispatcher\EventDispatcherInterface::addEventSubscriber
+     */
+    public function addEventSubscriber(EventSubscriberInterface $subscriber, $priority = 0)
+    {
+        $this->dispatcher->addSubscriber($subscriber, $priority);
+
+        return $this;
+    }
+
+    /**
+     * Appends a transformer to the normalization transformer chain
+     *
+     * @param DataTransformerInterface $clientTransformer
+     */
+    public function appendNormTransformer(DataTransformerInterface $normTransformer = null)
+    {
+        $this->normTransformers[] = $normTransformer;
+
+        return $this;
+    }
+
+    /**
+     * Prepends a transformer to the client transformer chain
+     *
+     * @param DataTransformerInterface $clientTransformer
+     */
+    public function prependNormTransformer(DataTransformerInterface $normTransformer = null)
+    {
+        array_unshift($this->normTransformers, $normTransformer);
+
+        return $this;
+    }
+
+    public function resetNormTransformers()
+    {
+        $this->normTransformers = array();
+
+        return $this;
+    }
+
+    public function getNormTransformers()
+    {
+        return $this->normTransformers;
+    }
+
+    /**
+     * Appends a transformer to the client transformer chain
+     *
+     * @param DataTransformerInterface $clientTransformer
+     */
+    public function appendClientTransformer(DataTransformerInterface $clientTransformer = null)
+    {
+        $this->clientTransformers[] = $clientTransformer;
+
+        return $this;
+    }
+
+    /**
+     * Prepends a transformer to the client transformer chain
+     *
+     * @param DataTransformerInterface $clientTransformer
+     */
+    public function prependClientTransformer(DataTransformerInterface $clientTransformer = null)
+    {
+        array_unshift($this->clientTransformers, $clientTransformer);
+
+        return $this;
+    }
+
+    public function resetClientTransformers()
+    {
+        $this->clientTransformers = array();
+    }
+
+    public function getClientTransformers()
+    {
+        return $this->clientTransformers;
+    }
+
+    public function setAttribute($name, $value)
+    {
+        $this->attributes[$name] = $value;
+
+        return $this;
+    }
+
+    public function getAttribute($name)
+    {
+        return $this->attributes[$name];
+    }
+
+    public function hasAttribute($name)
+    {
+        return isset($this->attributes[$name]);
+    }
+
+    public function getAttributes()
+    {
+        return $this->attributes;
+    }
+
+    public function setDataMapper(DataMapperInterface $dataMapper)
+    {
+        $this->dataMapper = $dataMapper;
+
+        return $this;
+    }
+
+    public function getDataMapper()
+    {
+        return $this->dataMapper;
+    }
+
+    public function setTypes(array $types)
+    {
+        $this->types = $types;
+
+        return $this;
+    }
+
+    public function getTypes()
+    {
+        return $this->types;
+    }
+
+    public function setEmptyData($emptyData)
+    {
+        $this->emptyData = $emptyData;
+
+        return $this;
+    }
+
+    public function getEmptyData()
+    {
+        return $this->emptyData;
+    }
+
+    /**
+     * Adds a new field to this group. A field must have a unique name within
+     * the group. Otherwise the existing field is overwritten.
+     *
+     * If you add a nested group, this group should also be represented in the
+     * object hierarchy. If you want to add a group that operates on the same
+     * hierarchy level, use merge().
+     *
+     * <code>
+     * class Entity
+     * {
+     *   public $location;
+     * }
+     *
+     * class Location
+     * {
+     *   public $longitude;
+     *   public $latitude;
+     * }
+     *
+     * $entity = new Entity();
+     * $entity->location = new Location();
+     *
+     * $form = new Form('entity', $entity, $validator);
+     *
+     * $locationGroup = new Form('location');
+     * $locationGroup->add(new TextField('longitude'));
+     * $locationGroup->add(new TextField('latitude'));
+     *
+     * $form->add($locationGroup);
+     * </code>
+     *
+     * @param FormInterface|string $form
+     * @return FormInterface
+     */
+    public function add($name, $type = null, array $options = array())
+    {
+        if (!is_string($name)) {
+            throw new UnexpectedTypeException($name, 'string');
+        }
+
+        if (null !== $type && !is_string($type) && !$type instanceof FormTypeInterface) {
+            throw new UnexpectedTypeException($type, 'string or Symfony\Component\Form\Type\FormTypeInterface');
+        }
+
+        $this->children[$name] = array(
+            'type' => $type,
+            'options' => $options,
+        );
+
+        return $this;
+    }
+
+    public function build($name, $type = null, array $options = array())
+    {
+        if (null !== $type) {
+            $builder = $this->getFormFactory()->createBuilder(
+                $type,
+                $name,
+                $options
+            );
+        } else {
+            if (!$this->dataClass) {
+                throw new FormException('The data class must be set to automatically create children');
+            }
+
+            $builder = $this->getFormFactory()->createBuilderForProperty(
+                $this->dataClass,
+                $name,
+                $options
+            );
+        }
+
+        $this->children[$name] = $builder;
+
+        $builder->setParent($this);
+
+        return $builder;
+    }
+
+    public function get($name)
+    {
+        if (!isset($this->children[$name])) {
+            throw new FormException(sprintf('The field "%s" does not exist', $name));
+        }
+
+        $child = $this->children[$name];
+
+        if ($child instanceof FormBuilder) {
+            return $child;
+        }
+
+        return $this->build($name, $child['type'], $child['options']);
+    }
+
+    /**
+     * Removes the field with the given name.
+     *
+     * @param string $name
+     */
+    public function remove($name)
+    {
+        if (isset($this->children[$name])) {
+            // field might still be lazy
+            if ($this->children[$name] instanceof FormInterface) {
+                $this->children[$name]->setParent(null);
+            }
+
+            unset($this->children[$name]);
+        }
+    }
+
+    /**
+     * Returns whether a field with the given name exists.
+     *
+     * @param  string $name
+     * @return Boolean
+     */
+    public function has($name)
+    {
+        return isset($this->children[$name]);
+    }
+
+    protected function buildDispatcher()
+    {
+        return $this->dispatcher;
+    }
+
+    protected function buildChildren()
+    {
+        $children = array();
+
+        foreach ($this->children as $name => $builder) {
+            if (!$builder instanceof FormBuilder) {
+                $builder = $this->build($name, $builder['type'], $builder['options']);
+            }
+
+            $children[$builder->getName()] = $builder->getForm();
+        }
+
+        return $children;
+    }
+
+    public function getForm()
+    {
+        $instance = new Form(
+            $this->getName(),
+            $this->buildDispatcher(),
+            $this->getTypes(),
+            $this->getClientTransformers(),
+            $this->getNormTransformers(),
+            $this->getDataMapper(),
+            $this->getValidators(),
+            $this->getRequired(),
+            $this->getReadOnly(),
+            $this->getErrorBubbling(),
+            $this->getEmptyData(),
+            $this->getAttributes()
+        );
+
+        foreach ($this->buildChildren() as $child) {
+            $instance->add($child);
+        }
+
+        if ($this->getData()) {
+            $instance->setData($this->getData());
+        }
+
+        return $instance;
+    }
+}
\ No newline at end of file
diff --git a/src/Symfony/Component/Form/FormContext.php b/src/Symfony/Component/Form/FormContext.php
deleted file mode 100644
index ca28a07778..0000000000
--- a/src/Symfony/Component/Form/FormContext.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-
-namespace Symfony\Component\Form;
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Symfony\Component\Form\CsrfProvider\DefaultCsrfProvider;
-use Symfony\Component\Form\Exception\FormException;
-use Symfony\Component\Validator\ValidatorInterface;
-
-/**
- * Default implementation of FormContextInterface
- *
- * This class is immutable by design.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Bernhard Schussek <bernhard.schussek@symfony.com>
- */
-class FormContext implements FormContextInterface
-{
-    /**
-     * The options used in new forms
-     * @var array
-     */
-    protected $options = null;
-
-    /**
-     * Builds a context with default values
-     *
-     * By default, CSRF protection is enabled. In this case you have to provide
-     * a CSRF secret in the second parameter of this method. A recommended
-     * value is a generated value with at least 32 characters and mixed
-     * letters, digits and special characters.
-     *
-     * If you don't want to use CSRF protection, you can leave the CSRF secret
-     * empty and set the third parameter to false.
-     *
-     * @param ValidatorInterface $validator  The validator for validating
-     *                                       forms
-     * @param string $csrfSecret             The secret to be used for
-     *                                       generating CSRF tokens
-     * @param boolean $csrfProtection        Whether forms should be CSRF
-     *                                       protected
-     * @throws FormException                 When CSRF protection is enabled,
-     *                                       but no CSRF secret is passed
-     */
-    public static function buildDefault(ValidatorInterface $validator, $csrfSecret = null, $csrfProtection = true)
-    {
-        $options = array(
-            'csrf_protection' => $csrfProtection,
-            'validator' => $validator,
-        );
-
-        if ($csrfProtection) {
-            if (empty($csrfSecret)) {
-                throw new FormException('Please provide a CSRF secret when CSRF protection is enabled');
-            }
-
-            $options['csrf_provider'] = new DefaultCsrfProvider($csrfSecret);
-        }
-
-        return new static($options);
-    }
-
-    /**
-     * Constructor
-     *
-     * Initializes the context with the settings stored in the given
-     * options.
-     *
-     * @param array $options
-     */
-    public function __construct(array $options = array())
-    {
-        if (isset($options['csrf_protection'])) {
-            if (!$options['csrf_protection']) {
-                // don't include a CSRF provider if CSRF protection is disabled
-                unset($options['csrf_provider']);
-            }
-
-            unset($options['csrf_protection']);
-        }
-
-        $options['context'] = $this;
-
-        $this->options = $options;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getOptions()
-    {
-        return $this->options;
-    }
-}
diff --git a/src/Symfony/Component/Form/FormContextInterface.php b/src/Symfony/Component/Form/FormContextInterface.php
deleted file mode 100644
index 5b183a2cb4..0000000000
--- a/src/Symfony/Component/Form/FormContextInterface.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-namespace Symfony\Component\Form;
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Symfony\Component\Form\FieldFactory\FieldFactoryInterface;
-use Symfony\Component\Form\CsrfProvider\CsrfProviderInterface;
-use Symfony\Component\Validator\ValidatorInterface;
-
-/**
- * Stores options for creating new forms
- *
- * @author Bernhard Schussek <bernhard.schussek@symfony.com>
- */
-interface FormContextInterface
-{
-    /**
-     * Returns the options used for creating a new form
-     *
-     * @return array  The form options
-     */
-    public function getOptions();
-}
\ No newline at end of file
diff --git a/src/Symfony/Component/Form/Error.php b/src/Symfony/Component/Form/FormError.php
similarity index 98%
rename from src/Symfony/Component/Form/Error.php
rename to src/Symfony/Component/Form/FormError.php
index 834d9287ac..196c0e5bd2 100644
--- a/src/Symfony/Component/Form/Error.php
+++ b/src/Symfony/Component/Form/FormError.php
@@ -16,7 +16,7 @@ namespace Symfony\Component\Form;
  *
  * @author Bernhard Schussek <bernhard.schussek@symfony.com>
  */
-class Error
+class FormError
 {
     /**
      * The template for the error message
diff --git a/src/Symfony/Component/Form/FormFactory.php b/src/Symfony/Component/Form/FormFactory.php
new file mode 100644
index 0000000000..ed94e2ca16
--- /dev/null
+++ b/src/Symfony/Component/Form/FormFactory.php
@@ -0,0 +1,156 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form;
+
+use Symfony\Component\Form\Type\FormTypeInterface;
+use Symfony\Component\Form\Type\Loader\TypeLoaderInterface;
+use Symfony\Component\Form\Type\Guesser\TypeGuesserInterface;
+use Symfony\Component\Form\Type\Guesser\Guess;
+use Symfony\Component\Form\Exception\FormException;
+use Symfony\Component\Form\Exception\UnexpectedTypeException;
+
+class FormFactory implements FormFactoryInterface
+{
+    private $typeLoader;
+
+    private $guessers = array();
+
+    public function __construct(TypeLoaderInterface $typeLoader, array $guessers = array())
+    {
+        foreach ($guessers as $guesser) {
+            if (!$guesser instanceof TypeGuesserInterface) {
+                throw new UnexpectedTypeException($guesser, 'Symfony\Component\Form\Type\Guesser\TypeGuesserInterface');
+            }
+        }
+        $this->typeLoader = $typeLoader;
+        $this->guessers = $guessers;
+    }
+
+    public function createBuilder($type, $name = null, array $options = array())
+    {
+        // TODO $type can be FQN of a type class
+
+        $builder = null;
+        $types = array();
+        $knownOptions = array();
+        $passedOptions = array_keys($options);
+
+        // TESTME
+        if (null === $name) {
+            $name = is_object($type) ? $type->getName() : $type;
+        }
+
+        while (null !== $type) {
+            // TODO check if type exists
+            if (!$type instanceof FormTypeInterface) {
+                $type = $this->typeLoader->getType($type);
+            }
+
+            array_unshift($types, $type);
+            $defaultOptions = $type->getDefaultOptions($options);
+            $options = array_merge($defaultOptions, $options);
+            $knownOptions = array_merge($knownOptions, array_keys($defaultOptions));
+            $type = $type->getParent($options);
+        }
+
+        $diff = array_diff($passedOptions, $knownOptions);
+
+        if (count($diff) > 0) {
+            throw new FormException(sprintf('The options "%s" do not exist', implode('", "', $diff)));
+        }
+
+        for ($i = 0, $l = count($types); $i < $l && !$builder; ++$i) {
+            $builder = $types[$i]->createBuilder($name, $this, $options);
+        }
+
+        // TODO check if instance exists
+
+        $builder->setTypes($types);
+
+        foreach ($types as $type) {
+            $type->buildForm($builder, $options);
+        }
+
+        return $builder;
+    }
+
+    public function create($type, $name = null, array $options = array())
+    {
+        return $this->createBuilder($type, $name, $options)->getForm();
+    }
+
+    public function createBuilderForProperty($class, $property, array $options = array())
+    {
+        // guess field class and options
+        $typeGuess = $this->guess(function ($guesser) use ($class, $property) {
+            return $guesser->guessType($class, $property);
+        });
+
+        // guess maximum length
+        $maxLengthGuess = $this->guess(function ($guesser) use ($class, $property) {
+            return $guesser->guessMaxLength($class, $property);
+        });
+
+        // guess whether field is required
+        $requiredGuess = $this->guess(function ($guesser) use ($class, $property) {
+            return $guesser->guessRequired($class, $property);
+        });
+
+        // construct field
+        $type = $typeGuess ? $typeGuess->getType() : 'text';
+
+        if ($maxLengthGuess) {
+            $options = array_merge(array('max_length' => $maxLengthGuess->getValue()), $options);
+        }
+
+        if ($requiredGuess) {
+            $options = array_merge(array('required' => $requiredGuess->getValue()), $options);
+        }
+
+        // user options may override guessed options
+        if ($typeGuess) {
+            $options = array_merge($typeGuess->getOptions(), $options);
+        }
+
+        return $this->createBuilder($type, $property, $options);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function createForProperty($class, $property, array $options = array())
+    {
+        return $this->createBuilderForProperty($class, $property, $options)->getForm();
+    }
+
+    /**
+     * Executes a closure for each guesser and returns the best guess from the
+     * return values
+     *
+     * @param  \Closure $closure  The closure to execute. Accepts a guesser as
+     *                            argument and should return a FieldFactoryGuess
+     *                            instance
+     * @return FieldFactoryGuess  The guess with the highest confidence
+     */
+    protected function guess(\Closure $closure)
+    {
+        $guesses = array();
+
+        foreach ($this->guessers as $guesser) {
+            if ($guess = $closure($guesser)) {
+                $guesses[] = $guess;
+            }
+        }
+
+        return Guess::getBestGuess($guesses);
+    }
+}
diff --git a/src/Symfony/Component/Form/FormFactoryInterface.php b/src/Symfony/Component/Form/FormFactoryInterface.php
new file mode 100644
index 0000000000..382157ea8f
--- /dev/null
+++ b/src/Symfony/Component/Form/FormFactoryInterface.php
@@ -0,0 +1,23 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form;
+
+interface FormFactoryInterface
+{
+    function createBuilder($type, $name = null, array $options = array());
+
+    function createBuilderForProperty($class, $property, array $options = array());
+
+    function create($type, $name = null, array $options = array());
+
+    function createForProperty($class, $property, array $options = array());
+}
diff --git a/src/Symfony/Component/Form/FormInterface.php b/src/Symfony/Component/Form/FormInterface.php
index faa354ec97..5c336ce3f4 100644
--- a/src/Symfony/Component/Form/FormInterface.php
+++ b/src/Symfony/Component/Form/FormInterface.php
@@ -12,33 +12,118 @@
 namespace Symfony\Component\Form;
 
 /**
- * A field group bundling multiple form fields
+ * A form group bundling multiple form forms
  *
- * @author     Bernhard Schussek <bernhard.schussek@symfony.com>
+ * @author Bernhard Schussek <bernhard.schussek@symfony.com>
  */
-interface FormInterface extends FieldInterface, \ArrayAccess, \Traversable, \Countable
+interface FormInterface extends \ArrayAccess, \Traversable, \Countable
 {
     /**
-     * Returns whether this field group is virtual
+     * Sets the parent form.
      *
-     * Virtual field groups are skipped when mapping property paths of a form
-     * tree to an object.
-     *
-     * Example:
-     *
-     * <code>
-     * $group = new Form('address');
-     * $group->add(new TextField('street'));
-     * $group->add(new TextField('postal_code'));
-     * $form->add($group);
-     * </code>
-     *
-     * If $group is non-virtual, the fields "street" and "postal_code"
-     * are mapped to the property paths "address.street" and
-     * "address.postal_code". If $group is virtual though, the fields are
-     * mapped directly to "street" and "postal_code".
-     *
-     * @return Boolean  Whether the group is virtual
+     * @param FormInterface $parent  The parent form
      */
-    public function isVirtual();
-}
\ No newline at end of file
+    function setParent(FormInterface $parent = null);
+
+    /**
+     * Returns the parent form.
+     *
+     * @return FormInterface  The parent form
+     */
+    function getParent();
+
+    function add(FormInterface $child);
+
+    function has($name);
+
+    function remove($name);
+
+    function getChildren();
+
+    function hasChildren();
+
+    function hasParent();
+
+    function getErrors();
+
+    function setData($data);
+
+    function getData();
+
+    function getClientData();
+
+    function isBound();
+
+    function getTypes();
+
+    /**
+     * Returns the name by which the form is identified in forms.
+     *
+     * @return string  The name of the form.
+     */
+    function getName();
+
+    /**
+     * Adds an error to this form
+     *
+     * @param FormError $error
+     */
+    function addError(FormError $error);
+
+    /**
+     * Returns whether the form is valid.
+     *
+     * @return Boolean
+     */
+    function isValid();
+
+    /**
+     * Returns whether the form is required to be filled out.
+     *
+     * If the form has a parent and the parent is not required, this method
+     * will always return false. Otherwise the value set with setRequired()
+     * is returned.
+     *
+     * @return Boolean
+     */
+    function isRequired();
+
+    /**
+     * Returns whether this form can be read only
+     *
+     * The content of a read-only form is displayed, but not allowed to be
+     * modified. The validation of modified read-only forms should fail.
+     *
+     * Fields whose parents are read-only are considered read-only regardless of
+     * their own state.
+     *
+     * @return Boolean
+     */
+    function isReadOnly();
+
+    /**
+     * Returns whether the form is empty
+     *
+     * @return boolean
+     */
+    function isEmpty();
+
+    function isSynchronized();
+
+    /**
+     * Writes posted data into the form
+     *
+     * @param mixed $data  The data from the POST request
+     */
+    function bind($data);
+
+    function hasAttribute($name);
+
+    function getAttribute($name);
+
+    function getRoot();
+
+    function isRoot();
+
+    function createView(FormView $parent = null);
+}
diff --git a/src/Symfony/Component/Form/FormView.php b/src/Symfony/Component/Form/FormView.php
new file mode 100644
index 0000000000..0570c84dc3
--- /dev/null
+++ b/src/Symfony/Component/Form/FormView.php
@@ -0,0 +1,191 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form;
+
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Form\Util\FormUtil;
+
+class FormView implements \ArrayAccess, \IteratorAggregate, \Countable
+{
+    private $vars = array(
+        'value' => null,
+        'attr' => array(),
+    );
+
+    private $parent;
+
+    private $children = array();
+
+    /**
+     * Is the form attached to this renderer rendered?
+     *
+     * Rendering happens when either the widget or the row method was called.
+     * Row implicitly includes widget, however certain rendering mechanisms
+     * have to skip widget rendering when a row is rendered.
+     *
+     * @var Boolean
+     */
+    private $rendered = false;
+
+    /**
+     * @param string $name
+     * @param mixed $value
+     */
+    public function set($name, $value)
+    {
+        $this->vars[$name] = $value;
+    }
+
+    /**
+     * @param $name
+     * @return Boolean
+     */
+    public function has($name)
+    {
+        return array_key_exists($name, $this->vars);
+    }
+
+    /**
+     * @param $name
+     * @param $default
+     * @return mixed
+     */
+    public function get($name, $default = null)
+    {
+        if (false === $this->has($name)) {
+            return $default;
+        }
+
+        return $this->vars[$name];
+    }
+
+    /**
+     * @return array
+     */
+    public function all()
+    {
+        return $this->vars;
+    }
+
+    /**
+     * Alias of all so it is possible to do `form.vars.foo`
+     *
+     * @return array
+     */
+    public function getVars()
+    {
+        return $this->all();
+    }
+
+    public function setAttribute($name, $value)
+    {
+        $this->vars['attr'][$name] = $value;
+    }
+
+    public function isRendered()
+    {
+        return $this->rendered;
+    }
+
+    public function setRendered()
+    {
+        $this->rendered = true;
+    }
+
+    public function setParent(self $parent)
+    {
+        $this->parent = $parent;
+    }
+
+    public function getParent()
+    {
+        return $this->parent;
+    }
+
+    public function hasParent()
+    {
+        return null !== $this->parent;
+    }
+
+    public function setChildren(array $children)
+    {
+        $this->children = $children;
+    }
+
+    public function getChildren()
+    {
+        return $this->children;
+    }
+
+    public function hasChildren()
+    {
+        return count($this->children) > 0;
+    }
+
+    public function offsetGet($name)
+    {
+        return $this->children[$name];
+    }
+
+    public function offsetExists($name)
+    {
+        return isset($this->children[$name]);
+    }
+
+    public function offsetSet($name, $value)
+    {
+        throw new \BadMethodCallException('Not supported');
+    }
+
+    public function offsetUnset($name)
+    {
+        throw new \BadMethodCallException('Not supported');
+    }
+
+    public function getIterator()
+    {
+        if (isset($this->children)) {
+            $this->rendered = true;
+
+            return new \ArrayIterator($this->children);
+        }
+
+        return new \ArrayIterator(array());
+    }
+
+    public function isChoiceGroup($choice)
+    {
+        return is_array($choice) || $choice instanceof \Traversable;
+    }
+
+    public function isChoiceSelected($choice)
+    {
+        $choice = FormUtil::toArrayKey($choice);
+
+        // The value should already have been converted by value transformers,
+        // otherwise we had to do the conversion on every call of this method
+        if (is_array($this->vars['value'])) {
+            return false !== array_search($choice, $this->vars['value'], true);
+        }
+
+        return $choice === $this->vars['value'];
+    }
+
+    /**
+     * @see Countable
+     * @return integer
+     */
+    public function count()
+    {
+        return count($this->children);
+    }
+}
diff --git a/src/Symfony/Component/Form/HiddenField.php b/src/Symfony/Component/Form/HiddenField.php
deleted file mode 100644
index 389ffbe944..0000000000
--- a/src/Symfony/Component/Form/HiddenField.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Form;
-
-/**
- * A hidden field
- *
- * @author Bernhard Schussek <bernhard.schussek@symfony.com>
- */
-class HiddenField extends Field
-{
-    /**
-     * {@inheritDoc}
-     */
-    public function isHidden()
-    {
-        return true;
-    }
-}
\ No newline at end of file
diff --git a/src/Symfony/Component/Form/HybridField.php b/src/Symfony/Component/Form/HybridField.php
deleted file mode 100644
index 02249a6e67..0000000000
--- a/src/Symfony/Component/Form/HybridField.php
+++ /dev/null
@@ -1,138 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Form;
-
-use Symfony\Component\Form\Exception\FormException;
-
-/**
- * A field that can dynamically act like a field or like a field group
- *
- * You can use the method setFieldMode() to switch between the modes
- * HybridField::FIELD and HybridField::FORM. This is useful when you want
- * to create a field that, depending on its configuration, can either be
- * a single field or a combination of different fields (e.g. a date field
- * that might be a textbox or several select boxes).
- *
- * @author Bernhard Schussek <bernhard.schussek@symfony.com>
- */
-class HybridField extends Form
-{
-    const FIELD = 0;
-    const FORM = 1;
-
-    protected $mode = self::FIELD;
-
-    /**
-     * Sets the current mode of the field
-     *
-     * Note that you can't switch modes anymore once you have added children to
-     * this field.
-     *
-     * @param integer $mode  One of the constants HybridField::FIELD and
-     *                       HybridField::FORM.
-     */
-    public function setFieldMode($mode)
-    {
-        if (count($this) > 0 && $mode === self::FIELD) {
-            throw new FormException('Switching to mode FIELD is not allowed after adding nested fields');
-        }
-
-        $this->mode = $mode;
-    }
-
-    /**
-     * @return Boolean
-     */
-    public function isField()
-    {
-        return self::FIELD === $this->mode;
-    }
-
-    /**
-     * @return Boolean
-     */
-    public function isGroup()
-    {
-        return self::FORM === $this->mode;
-    }
-
-    /**
-     * @return integer
-     */
-    public function getFieldMode()
-    {
-        return $this->mode;
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * @throws FormException  When the field is in mode HybridField::FIELD adding
-     *                        subfields is not allowed
-     */
-    public function add($field)
-    {
-        if ($this->mode === self::FIELD) {
-            throw new FormException('You cannot add nested fields while in mode FIELD');
-        }
-
-        return parent::add($field);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getDisplayedData()
-    {
-        if ($this->mode === self::FORM) {
-            return parent::getDisplayedData();
-        }
-
-        return Field::getDisplayedData();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function setData($data)
-    {
-        if ($this->mode === self::FORM) {
-            parent::setData($data);
-        } else {
-            Field::setData($data);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function submit($data)
-    {
-        if ($this->mode === self::FORM) {
-            parent::submit($data);
-        } else {
-            Field::submit($data);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function isEmpty()
-    {
-        if ($this->mode === self::FORM) {
-            return parent::isEmpty();
-        }
-
-        return Field::isEmpty();
-    }
-}
\ No newline at end of file
diff --git a/src/Symfony/Component/Form/IntegerField.php b/src/Symfony/Component/Form/IntegerField.php
deleted file mode 100644
index 9de9516d6d..0000000000
--- a/src/Symfony/Component/Form/IntegerField.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Form;
-
-use Symfony\Component\Form\ValueTransformer\NumberToLocalizedStringTransformer;
-
-/*
- * This file is part of the Symfony package.
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * A localized field for entering integers.
- *
- * The rounding-mode option defaults to rounding down. The available values are:
- *  * NumberToLocalizedStringTransformer::ROUND_DOWN
- *  * NumberToLocalizedStringTransformer::ROUND_UP
- *  * NumberToLocalizedStringTransformer::ROUND_FLOOR
- *  * NumberToLocalizedStringTransformer::ROUND_CEILING
- *
- * @see Symfony\Component\Form\NumberField
- * @author Bernhard Schussek <bernhard.schussek@symfony.com>
- */
-class IntegerField extends NumberField
-{
-    /**
-     * {@inheritDoc}
-     */
-    protected function 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();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getData()
-    {
-        return (int)parent::getData();
-    }
-}
\ No newline at end of file
diff --git a/src/Symfony/Component/Form/LanguageField.php b/src/Symfony/Component/Form/LanguageField.php
deleted file mode 100644
index 3aa8570f82..0000000000
--- a/src/Symfony/Component/Form/LanguageField.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Form;
-
-use Symfony\Component\Locale\Locale;
-
-/**
- * A field for selecting from a list of languages.
- *
- * @see Symfony\Component\Form\ChoiceField
- * @author Bernhard Schussek <bernhard.schussek@symfony.com>
- */
-class LanguageField extends ChoiceField
-{
-    /**
-     * @inheritDoc
-     */
-    protected function configure()
-    {
-        $this->addOption('choices', Locale::getDisplayLanguages(\Locale::getDefault()));
-
-        parent::configure();
-    }
-}
\ No newline at end of file
diff --git a/src/Symfony/Component/Form/LocaleField.php b/src/Symfony/Component/Form/LocaleField.php
deleted file mode 100644
index 5dfd08577c..0000000000
--- a/src/Symfony/Component/Form/LocaleField.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Form;
-
-use Symfony\Component\Locale\Locale;
-
-/**
- * A field for selecting from a list of locales.
- *
- * @see Symfony\Component\Form\ChoiceField
- * @author Bernhard Schussek <bernhard.schussek@symfony.com>
- */
-class LocaleField extends ChoiceField
-{
-    /**
-     * @inheritDoc
-     */
-    protected function configure()
-    {
-        $this->addOption('choices', Locale::getDisplayLocales(\Locale::getDefault()));
-
-        parent::configure();
-    }
-}
\ No newline at end of file
diff --git a/src/Symfony/Component/Form/MoneyField.php b/src/Symfony/Component/Form/MoneyField.php
deleted file mode 100644
index 7bd1fb8d1e..0000000000
--- a/src/Symfony/Component/Form/MoneyField.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Form;
-
-use Symfony\Component\Form\ValueTransformer\MoneyToLocalizedStringTransformer;
-
-/**
- * A localized field for entering money values.
- *
- * This field will output the money with the correct comma, period or spacing
- * (e.g. 10,000) as well as the correct currency symbol in the correct location
- * (i.e. before or after the field).
- *
- * Available options:
- *
- *  * currency:     The currency to display the money with. This is the 3-letter
- *                  ISO 4217 currency code.
- *  * divisor:      A number to divide the money by before displaying. Default 1.
- *
- * @see Symfony\Component\Form\NumberField
- * @author Bernhard Schussek <bernhard.schussek@symfony.com>
- */
-class MoneyField extends NumberField
-{
-    /**
-     * Stores patterns for different locales and cultures
-     *
-     * A pattern decides which currency symbol is displayed and where it is in
-     * relation to the number.
-     *
-     * @var array
-     */
-    protected static $patterns = array();
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function configure()
-    {
-        $this->addRequiredOption('currency');
-        $this->addOption('precision', 2);
-        $this->addOption('divisor', 1);
-
-        parent::configure();
-
-        $this->setValueTransformer(new MoneyToLocalizedStringTransformer(array(
-            'precision' => $this->getOption('precision'),
-            'grouping' => $this->getOption('grouping'),
-            'divisor' => $this->getOption('divisor'),
-        )));
-    }
-
-    /**
-     * Returns the pattern for this locale
-     *
-     * The pattern contains the placeholder "{{ widget }}" where the HTML tag should
-     * be inserted
-     */
-    public function getPattern()
-    {
-        if (!$this->getOption('currency')) {
-            return '{{ widget }}';
-        }
-
-        if (!isset(self::$patterns[\Locale::getDefault()])) {
-            self::$patterns[\Locale::getDefault()] = array();
-        }
-
-        if (!isset(self::$patterns[\Locale::getDefault()][$this->getOption('currency')])) {
-            $format = new \NumberFormatter(\Locale::getDefault(), \NumberFormatter::CURRENCY);
-            $pattern = $format->formatCurrency('123', $this->getOption('currency'));
-
-            // the spacings between currency symbol and number are ignored, because
-            // a single space leads to better readability in combination with input
-            // fields
-
-            // the regex also considers non-break spaces (0xC2 or 0xA0 in UTF-8)
-
-            preg_match('/^([^\s\xc2\xa0]*)[\s\xc2\xa0]*123[,.]00[\s\xc2\xa0]*([^\s\xc2\xa0]*)$/', $pattern, $matches);
-
-            if (!empty($matches[1])) {
-                self::$patterns[\Locale::getDefault()] = $matches[1].' {{ widget }}';
-            } else if (!empty($matches[2])) {
-                self::$patterns[\Locale::getDefault()] = '{{ widget }} '.$matches[2];
-            } else {
-                self::$patterns[\Locale::getDefault()] = '{{ widget }}';
-            }
-        }
-
-        return self::$patterns[\Locale::getDefault()];
-    }
-}
diff --git a/src/Symfony/Component/Form/NumberField.php b/src/Symfony/Component/Form/NumberField.php
deleted file mode 100644
index 708c4ee55f..0000000000
--- a/src/Symfony/Component/Form/NumberField.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Form;
-
-use Symfony\Component\Form\ValueTransformer\NumberToLocalizedStringTransformer;
-
-/**
- * A localized field for entering numbers.
- *
- * Available options:
- *
- *  * precision:        The number of digits to allow when rounding. Default
- *                      is locale-specific.
- *  * grouping:
- *  * rounding-mode:    The method to use to round to get to the needed level
- *                      of precision. Options include:
- *                       * NumberToLocalizedStringTransformer::ROUND_FLOOR
- *                       * NumberToLocalizedStringTransformer::ROUND_DOWN
- *                       * NumberToLocalizedStringTransformer::ROUND_HALFDOWN
- *                       * NumberToLocalizedStringTransformer::ROUND_HALFUP (default)
- *                       * NumberToLocalizedStringTransformer::ROUND_UP
- *                       * NumberToLocalizedStringTransformer::ROUND_CEILING
- *
- * @see \NumberFormatter
- * @author Bernhard Schussek <bernhard.schussek@symfony.com>
- */
-class NumberField extends Field
-{
-    /**
-     * {@inheritDoc}
-     */
-    protected function configure()
-    {
-        // default precision is locale specific (usually around 3)
-        $this->addOption('precision');
-        $this->addOption('grouping', false);
-        $this->addOption('rounding-mode', NumberToLocalizedStringTransformer::ROUND_HALFUP);
-
-        parent::configure();
-
-        $this->setValueTransformer(new NumberToLocalizedStringTransformer(array(
-            'precision' => $this->getOption('precision'),
-            'grouping' => $this->getOption('grouping'),
-            'rounding-mode' => $this->getOption('rounding-mode'),
-        )));
-    }
-}
diff --git a/src/Symfony/Component/Form/PasswordField.php b/src/Symfony/Component/Form/PasswordField.php
deleted file mode 100644
index 7e2e373c7f..0000000000
--- a/src/Symfony/Component/Form/PasswordField.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Form;
-
-/**
- * A field for entering a password.
- *
- * Available options:
- *
- *  * always_empty      If true, the field will always render empty. Default: true.
- *
- * @see Symfony\Component\Form\TextField
- * @author Bernhard Schussek <bernhard.schussek@symfony.com>
- */
-class PasswordField extends TextField
-{
-    /**
-     * {@inheritDoc}
-     */
-    protected function configure()
-    {
-        $this->addOption('always_empty', true);
-
-        parent::configure();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getDisplayedData()
-    {
-        return $this->getOption('always_empty') || !$this->isSubmitted()
-                ? ''
-                : parent::getDisplayedData();
-    }
-}
\ No newline at end of file
diff --git a/src/Symfony/Component/Form/PercentField.php b/src/Symfony/Component/Form/PercentField.php
deleted file mode 100644
index a7b11861ff..0000000000
--- a/src/Symfony/Component/Form/PercentField.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Form;
-
-use Symfony\Component\Form\ValueTransformer\PercentToLocalizedStringTransformer;
-
-/**
- * A localized field for entering percentage values.
- *
- * The percentage is always rendered in its large format (e.g. 75, not .75).
- *
- * Available options:
- *
- *  * percent_type:     How the source number is stored on the object
- *                       * self::FRACTIONAL (e.g. stored as .75)
- *                       * self::INTEGER (e.g. stored as 75)
- *
- * By default, the precision option is set to 0, meaning that decimal integer
- * values will be rounded using the method specified in the rounding-mode
- * option.
- *
- * @see Symfony\Component\Form\NumberField
- * @author Bernhard Schussek <bernhard.schussek@symfony.com>
- */
-class PercentField extends NumberField
-{
-    const FRACTIONAL = 'fractional';
-    const INTEGER = 'integer';
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function configure()
-    {
-        $this->addOption('precision', 0);
-        $this->addOption('percent_type', self::FRACTIONAL);
-
-        parent::configure();
-
-        $this->setValueTransformer(new PercentToLocalizedStringTransformer(array(
-            'precision' => $this->getOption('precision'),
-            'type' => $this->getOption('percent_type'),
-        )));
-    }
-}
diff --git a/src/Symfony/Component/Form/RepeatedField.php b/src/Symfony/Component/Form/RepeatedField.php
deleted file mode 100644
index e701ec955c..0000000000
--- a/src/Symfony/Component/Form/RepeatedField.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Form;
-
-/**
- * A field for repeated input of values.
- *
- * Available options:
- *
- *  * first_key:        The key to use for the first field.
- *  * second_key:       The key to use for the second field.
- *
- * @author Bernhard Schussek <bernhard.schussek@symfony.com>
- */
-class RepeatedField extends Form
-{
-    /**
-     * The prototype for the inner fields
-     * @var FieldInterface
-     */
-    protected $prototype;
-
-    /**
-     * Repeats the given field twice to verify the user's input.
-     *
-     * @param FieldInterface $innerField
-     */
-    public function __construct(FieldInterface $innerField, array $options = array())
-    {
-        $this->prototype = $innerField;
-
-        parent::__construct($innerField->getKey(), $options);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function configure()
-    {
-        $this->addOption('first_key', 'first');
-        $this->addOption('second_key', 'second');
-
-        parent::configure();
-
-        $field = clone $this->prototype;
-        $field->setKey($this->getOption('first_key'));
-        $field->setPropertyPath($this->getOption('first_key'));
-        $this->add($field);
-
-        $field = clone $this->prototype;
-        $field->setKey($this->getOption('second_key'));
-        $field->setPropertyPath($this->getOption('second_key'));
-        $this->add($field);
-    }
-
-    /**
-     * Returns whether both entered values are equal
-     *
-     * @return Boolean
-     */
-    public function isFirstEqualToSecond()
-    {
-        return $this->get($this->getOption('first_key'))->getData() === $this->get($this->getOption('second_key'))->getData();
-    }
-
-    /**
-     * Sets the values of both fields to this value
-     *
-     * @param mixed $data
-     */
-    public function setData($data)
-    {
-        parent::setData(array(
-            $this->getOption('first_key') => $data,
-            $this->getOption('second_key') => $data
-        ));
-    }
-
-    /**
-     * Return the value of a child field
-     *
-     * If the value of the first field is set, this value is returned.
-     * Otherwise the value of the second field is returned. This way,
-     * this field will never trigger a NotNull/NotBlank error if any of the
-     * child fields was filled in.
-     *
-     * @return string The field value
-     */
-    public function getData()
-    {
-        // Return whichever data is set. This should not return NULL if any of
-        // the fields is set, otherwise this might trigger a NotNull/NotBlank
-        // error even though some value was set
-        $data1 = $this->get($this->getOption('first_key'))->getData();
-        $data2 = $this->get($this->getOption('second_key'))->getData();
-
-        return $data1 ?: $data2;
-    }
-}
diff --git a/src/Symfony/Component/Form/Resources/config/validation.xml b/src/Symfony/Component/Form/Resources/config/validation.xml
index fb2d6a723a..9b76e2c21d 100644
--- a/src/Symfony/Component/Form/Resources/config/validation.xml
+++ b/src/Symfony/Component/Form/Resources/config/validation.xml
@@ -4,105 +4,15 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://symfony.com/schema/dic/constraint-mapping http://symfony.com/schema/dic/constraint-mapping/constraint-mapping-1.0.xsd">
 
-  <class name="Symfony\Component\Form\Field">
-    <getter property="transformationSuccessful">
-      <constraint name="True">
-        <option name="message">This value is invalid</option>
-      </constraint>
-    </getter>
-  </class>
-
   <class name="Symfony\Component\Form\Form">
-    <constraint name="Callback"><value>validateData</value></constraint>
-    <property name="fields">
+    <constraint name="Callback">
+      <value>
+        <value>Symfony\Component\Form\Validator\DelegatingValidator</value>
+        <value>validateFormData</value>
+      </value>
+    </constraint>
+    <property name="children">
       <constraint name="Valid" />
     </property>
-    <getter property="submittedWithExtraFields">
-      <constraint name="False">
-        <option name="message">This form should not contain extra fields</option>
-      </constraint>
-    </getter>
-    <getter property="postMaxSizeReached">
-      <constraint name="False">
-        <option name="message">The uploaded file was too large. Please try to upload a smaller file</option>
-      </constraint>
-    </getter>
-    <getter property="csrfTokenValid">
-      <constraint name="True">
-        <option name="message">The CSRF token is invalid. Please try to resubmit the form</option>
-      </constraint>
-    </getter>
-  </class>
-
-  <class name="Symfony\Component\Form\RepeatedField">
-    <getter property="firstEqualToSecond">
-      <constraint name="True">
-        <option name="message">The two values should be equal</option>
-      </constraint>
-    </getter>
-  </class>
-
-  <class name="Symfony\Component\Form\DateField">
-    <getter property="partiallyFilled">
-      <constraint name="False">
-        <option name="message">The date is not fully selected</option>
-      </constraint>
-    </getter>
-    <getter property="yearWithinRange">
-      <constraint name="True">
-        <option name="message">The year is invalid</option>
-      </constraint>
-    </getter>
-    <getter property="monthWithinRange">
-      <constraint name="True">
-        <option name="message">The month is invalid</option>
-      </constraint>
-    </getter>
-    <getter property="dayWithinRange">
-      <constraint name="True">
-        <option name="message">The day is invalid</option>
-      </constraint>
-    </getter>
-  </class>
-
-  <class name="Symfony\Component\Form\TimeField">
-    <getter property="partiallyFilled">
-      <constraint name="False">
-        <option name="message">The time is not fully selected</option>
-      </constraint>
-    </getter>
-    <getter property="hourWithinRange">
-      <constraint name="True">
-        <option name="message">The hour is invalid</option>
-      </constraint>
-    </getter>
-    <getter property="minuteWithinRange">
-      <constraint name="True">
-        <option name="message">The minutes are invalid</option>
-      </constraint>
-    </getter>
-    <getter property="secondWithinRange">
-      <constraint name="True">
-        <option name="message">The seconds are invalid</option>
-      </constraint>
-    </getter>
-  </class>
-
-  <class name="Symfony\Component\Form\FileField">
-    <getter property="iniSizeExceeded">
-      <constraint name="False">
-        <option name="message">The file is too large. Please upload a smaller file</option>
-      </constraint>
-    </getter>
-    <getter property="formSizeExceeded">
-      <constraint name="False">
-        <option name="message">The file is too large. Please upload a smaller file</option>
-      </constraint>
-    </getter>
-    <getter property="uploadComplete">
-      <constraint name="True">
-        <option name="message">The file was only partially uploaded. Please try again</option>
-      </constraint>
-    </getter>
   </class>
 </constraint-mapping>
diff --git a/src/Symfony/Component/Form/TextField.php b/src/Symfony/Component/Form/TextField.php
deleted file mode 100644
index c586a23a6d..0000000000
--- a/src/Symfony/Component/Form/TextField.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Form;
-
-/**
- * A text input field.
- *
- * Available options:
- *
- *  * max_length:       The max_length to give the field.
- *
- * @author Bernhard Schussek <bernhard.schussek@symfony.com>
- */
-class TextField extends Field
-{
-    /**
-     * {@inheritDoc}
-     */
-    protected function configure()
-    {
-        $this->addOption('max_length');
-
-        parent::configure();
-    }
-
-    public function getMaxLength()
-    {
-        return $this->getOption('max_length');
-    }
-}
diff --git a/src/Symfony/Component/Form/TimeField.php b/src/Symfony/Component/Form/TimeField.php
deleted file mode 100644
index b1a4927090..0000000000
--- a/src/Symfony/Component/Form/TimeField.php
+++ /dev/null
@@ -1,257 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Form;
-
-use Symfony\Component\Form\ValueTransformer\ReversedTransformer;
-use Symfony\Component\Form\ValueTransformer\DateTimeToArrayTransformer;
-use Symfony\Component\Form\ValueTransformer\DateTimeToStringTransformer;
-use Symfony\Component\Form\ValueTransformer\DateTimeToTimestampTransformer;
-use Symfony\Component\Form\ValueTransformer\ValueTransformerChain;
-
-/**
- * Represents a time field.
- *
- * Available options:
- *
- *  * widget:         How to render the time field ("input" or "choice"). Default: "choice".
- *  * type:           The type of the date stored on the object. Default: "datetime":
- *                    * datetime:   A DateTime object;
- *                    * string:     A raw string (e.g. 2011-05-01 12:30:00, Y-m-d H:i:s);
- *                    * timestamp:  A unix timestamp (e.g. 1304208000).
- *                    * raw:        An hour, minute, second array
- *  * with_seconds    Whether or not to create a field for seconds. Default: false.
- *
- *  * hours:          An array of hours for the hour select tag.
- *  * minutes:        An array of minutes for the minute select tag.
- *  * seconds:        An array of seconds for the second select tag.
- *
- *  * data_timezone:  The timezone of the data. Default: UTC.
- *  * user_timezone:  The timezone of the user entering a new value. Default: UTC.
- */
-class TimeField extends Form
-{
-    const INPUT = 'input';
-    const CHOICE = 'choice';
-
-    const DATETIME = 'datetime';
-    const STRING = 'string';
-    const TIMESTAMP = 'timestamp';
-    const RAW = 'raw';
-
-    protected static $widgets = array(
-        self::INPUT,
-        self::CHOICE,
-    );
-
-    protected static $types = array(
-        self::DATETIME,
-        self::STRING,
-        self::TIMESTAMP,
-        self::RAW,
-    );
-
-    /**
-     * {@inheritDoc}
-     */
-    public function __construct($key, array $options = array())
-    {
-        // Override parent option
-        // \DateTime objects are never edited by reference, because
-        // we treat them like value objects
-        $this->addOption('by_reference', false);
-
-        parent::__construct($key, $options);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function configure()
-    {
-        $this->addOption('widget', self::CHOICE, self::$widgets);
-        $this->addOption('type', self::DATETIME, self::$types);
-        $this->addOption('with_seconds', false);
-
-        $this->addOption('hours', range(0, 23));
-        $this->addOption('minutes', range(0, 59));
-        $this->addOption('seconds', range(0, 59));
-
-        $this->addOption('data_timezone', date_default_timezone_get());
-        $this->addOption('user_timezone', date_default_timezone_get());
-
-        if ($this->getOption('widget') == self::INPUT) {
-            $this->add(new TextField('hour', array('max_length' => 2)));
-            $this->add(new TextField('minute', array('max_length' => 2)));
-
-            if ($this->getOption('with_seconds')) {
-                $this->add(new TextField('second', array('max_length' => 2)));
-            }
-        } else {
-            $this->add(new ChoiceField('hour', array(
-                'choices' => $this->generatePaddedChoices($this->getOption('hours'), 2),
-            )));
-            $this->add(new ChoiceField('minute', array(
-                'choices' => $this->generatePaddedChoices($this->getOption('minutes'), 2),
-            )));
-
-            if ($this->getOption('with_seconds')) {
-                $this->add(new ChoiceField('second', array(
-                    'choices' => $this->generatePaddedChoices($this->getOption('seconds'), 2),
-                )));
-            }
-        }
-
-        $fields = array('hour', 'minute');
-
-        if ($this->getOption('with_seconds')) {
-            $fields[] = 'second';
-        }
-
-        if ($this->getOption('type') == self::STRING) {
-            $this->setNormalizationTransformer(new ReversedTransformer(
-                new DateTimeToStringTransformer(array(
-                    'format' => 'H:i:s',
-                    'input_timezone' => $this->getOption('data_timezone'),
-                    'output_timezone' => $this->getOption('data_timezone'),
-                ))
-            ));
-        } else if ($this->getOption('type') == self::TIMESTAMP) {
-            $this->setNormalizationTransformer(new ReversedTransformer(
-                new DateTimeToTimestampTransformer(array(
-                    'input_timezone' => $this->getOption('data_timezone'),
-                    'output_timezone' => $this->getOption('data_timezone'),
-                ))
-            ));
-        } else if ($this->getOption('type') === self::RAW) {
-            $this->setNormalizationTransformer(new ReversedTransformer(
-                new DateTimeToArrayTransformer(array(
-                    'input_timezone' => $this->getOption('data_timezone'),
-                    'output_timezone' => $this->getOption('data_timezone'),
-                    'fields' => $fields,
-                ))
-            ));
-        }
-
-        $this->setValueTransformer(new DateTimeToArrayTransformer(array(
-            'input_timezone' => $this->getOption('data_timezone'),
-            'output_timezone' => $this->getOption('user_timezone'),
-            // if the field is rendered as choice field, the values should be trimmed
-            // of trailing zeros to render the selected choices correctly
-            'pad' => $this->getOption('widget') == self::INPUT,
-            'fields' => $fields,
-        )));
-    }
-
-    public function isField()
-    {
-        return self::INPUT === $this->getOption('widget');
-    }
-
-    public function isWithSeconds()
-    {
-        return $this->getOption('with_seconds');
-    }
-
-    /**
-     * Generates an array of choices for the given values
-     *
-     * If the values are shorter than $padLength characters, they are padded with
-     * zeros on the left side.
-     *
-     * @param  array   $values     The available choices
-     * @param  integer $padLength  The length to pad the choices
-     * @return array               An array with the input values as keys and the
-     *                             padded values as values
-     */
-    protected function generatePaddedChoices(array $values, $padLength)
-    {
-        $choices = array();
-
-        foreach ($values as $value) {
-            $choices[$value] = str_pad($value, $padLength, '0', STR_PAD_LEFT);
-        }
-
-        return $choices;
-    }
-
-    /**
-     * Returns whether the hour of the field's data is valid
-     *
-     * The hour is valid if it is contained in the list passed to the field's
-     * option "hours".
-     *
-     * @return Boolean
-     */
-    public function isHourWithinRange()
-    {
-        $date = $this->getNormalizedData();
-
-        return $this->isEmpty() || $this->get('hour')->isEmpty()
-                || in_array($date->format('H'), $this->getOption('hours'));
-    }
-
-    /**
-     * Returns whether the minute of the field's data is valid
-     *
-     * The minute is valid if it is contained in the list passed to the field's
-     * option "minutes".
-     *
-     * @return Boolean
-     */
-    public function isMinuteWithinRange()
-    {
-        $date = $this->getNormalizedData();
-
-        return $this->isEmpty() || $this->get('minute')->isEmpty()
-                || in_array($date->format('i'), $this->getOption('minutes'));
-    }
-
-    /**
-     * Returns whether the second of the field's data is valid
-     *
-     * The second is valid if it is contained in the list passed to the field's
-     * option "seconds".
-     *
-     * @return Boolean
-     */
-    public function isSecondWithinRange()
-    {
-        $date = $this->getNormalizedData();
-
-        return $this->isEmpty() || !$this->has('second') || $this->get('second')->isEmpty()
-                || in_array($date->format('s'), $this->getOption('seconds'));
-    }
-
-    /**
-     * Returns whether the field is neither completely filled (a selected
-     * value in each dropdown) nor completely empty
-     *
-     * @return Boolean
-     */
-    public function isPartiallyFilled()
-    {
-        if ($this->isField()) {
-            return false;
-        }
-
-        if ($this->isEmpty()) {
-            return false;
-        }
-
-        if ($this->get('hour')->isEmpty() || $this->get('minute')->isEmpty()
-                || ($this->isWithSeconds() && $this->get('second')->isEmpty())) {
-            return true;
-        }
-
-        return false;
-    }
-}
diff --git a/src/Symfony/Component/Form/ToggleField.php b/src/Symfony/Component/Form/ToggleField.php
deleted file mode 100644
index 6aacc22da7..0000000000
--- a/src/Symfony/Component/Form/ToggleField.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Form;
-
-use Symfony\Component\Form\ValueTransformer\BooleanToStringTransformer;
-
-/**
- * An input field for selecting boolean values.
- *
- * @author Bernhard Schussek <bernhard.schussek@symfony.com>
- */
-abstract class ToggleField extends Field
-{
-    /**
-     * {@inheritDoc}
-     */
-    protected function configure()
-    {
-        $this->addOption('value');
-
-        parent::configure();
-
-        $this->setValueTransformer(new BooleanToStringTransformer());
-    }
-
-    public function isChecked()
-    {
-        return $this->getData();
-    }
-
-    public function getValue()
-    {
-        return $this->getOption('value');
-    }
-
-    public function hasValue()
-    {
-        return $this->getValue() !== null;
-    }
-}
diff --git a/src/Symfony/Component/Form/Type/AbstractType.php b/src/Symfony/Component/Form/Type/AbstractType.php
new file mode 100644
index 0000000000..894414a1d5
--- /dev/null
+++ b/src/Symfony/Component/Form/Type/AbstractType.php
@@ -0,0 +1,54 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\Type;
+
+use Symfony\Component\Form\FormBuilder;
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Form\FormFactoryInterface;
+use Symfony\Component\Form\FormView;
+
+abstract class AbstractType implements FormTypeInterface
+{
+    public function buildForm(FormBuilder $builder, array $options)
+    {
+    }
+
+    public function buildView(FormView $view, FormInterface $form)
+    {
+    }
+
+    public function buildViewBottomUp(FormView $view, FormInterface $form)
+    {
+    }
+
+    public function createBuilder($name, FormFactoryInterface $factory, array $options)
+    {
+        return null;
+    }
+
+    public function getDefaultOptions(array $options)
+    {
+        return array();
+    }
+
+    public function getParent(array $options)
+    {
+        return 'form';
+    }
+
+    public function getName()
+    {
+        preg_match('/\\\\(\w+?)(Form)?(Type)?$/i', get_class($this), $matches);
+
+        return strtolower($matches[1]);
+    }
+}
diff --git a/src/Symfony/Component/Form/Type/BirthdayType.php b/src/Symfony/Component/Form/Type/BirthdayType.php
new file mode 100644
index 0000000000..370996c07a
--- /dev/null
+++ b/src/Symfony/Component/Form/Type/BirthdayType.php
@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\Type;
+
+use Symfony\Component\Form\FormBuilder;
+
+class BirthdayType extends AbstractType
+{
+    public function getDefaultOptions(array $options)
+    {
+        return array(
+            'years' => range(date('Y') - 120, date('Y')),
+        );
+    }
+
+    public function getParent(array $options)
+    {
+        return 'date';
+    }
+
+    public function getName()
+    {
+        return 'birthday';
+    }
+}
\ No newline at end of file
diff --git a/src/Symfony/Component/Form/Type/CheckboxType.php b/src/Symfony/Component/Form/Type/CheckboxType.php
new file mode 100644
index 0000000000..447047d8e6
--- /dev/null
+++ b/src/Symfony/Component/Form/Type/CheckboxType.php
@@ -0,0 +1,49 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\Type;
+
+use Symfony\Component\Form\FormBuilder;
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Form\DataTransformer\BooleanToStringTransformer;
+use Symfony\Component\Form\FormView;
+
+class CheckboxType extends AbstractType
+{
+    public function buildForm(FormBuilder $builder, array $options)
+    {
+        $builder->appendClientTransformer(new BooleanToStringTransformer())
+            ->setAttribute('value', $options['value']);
+    }
+
+    public function buildView(FormView $view, FormInterface $form)
+    {
+        $view->set('value', $form->getAttribute('value'));
+        $view->set('checked', (bool)$form->getData());
+    }
+
+    public function getDefaultOptions(array $options)
+    {
+        return array(
+            'value' => '1',
+        );
+    }
+
+    public function getParent(array $options)
+    {
+        return 'field';
+    }
+
+    public function getName()
+    {
+        return 'checkbox';
+    }
+}
diff --git a/src/Symfony/Component/Form/Type/ChoiceType.php b/src/Symfony/Component/Form/Type/ChoiceType.php
new file mode 100644
index 0000000000..cd91b84a01
--- /dev/null
+++ b/src/Symfony/Component/Form/Type/ChoiceType.php
@@ -0,0 +1,132 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\Type;
+
+use Symfony\Component\Form\FormBuilder;
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Form\Exception\FormException;
+use Symfony\Component\Form\ChoiceList\ArrayChoiceList;
+use Symfony\Component\Form\ChoiceList\ChoiceListInterface;
+use Symfony\Component\Form\EventListener\FixRadioInputListener;
+use Symfony\Component\Form\FormView;
+use Symfony\Component\Form\DataTransformer\ScalarToChoiceTransformer;
+use Symfony\Component\Form\DataTransformer\ScalarToBooleanChoicesTransformer;
+use Symfony\Component\Form\DataTransformer\ArrayToChoicesTransformer;
+use Symfony\Component\Form\DataTransformer\ArrayToBooleanChoicesTransformer;
+
+class ChoiceType extends AbstractType
+{
+    public function buildForm(FormBuilder $builder, array $options)
+    {
+        if (!$options['choices'] && !$options['choice_list']) {
+            throw new FormException('Either the option "choices" or "choice_list" is required');
+        }
+
+        if ($options['choice_list'] && !$options['choice_list'] instanceof ChoiceListInterface) {
+            throw new FormException('The "choice_list" must be an instance of "Symfony\Component\Form\ChoiceList\ChoiceListInterface".');
+        }
+
+        if (!$options['choice_list']) {
+            $options['choice_list'] = new ArrayChoiceList($options['choices']);
+        }
+
+        if ($options['expanded']) {
+            // Load choices already if expanded
+            $options['choices'] = $options['choice_list']->getChoices();
+
+            foreach ($options['choices'] as $choice => $value) {
+                if ($options['multiple']) {
+                    $builder->add((string)$choice, 'checkbox', array(
+                        'value' => $choice,
+                        'label' => $value,
+                        // The user can check 0 or more checkboxes. If required
+                        // is true, he is required to check all of them.
+                        'required' => false,
+                    ));
+                } else {
+                    $builder->add((string)$choice, 'radio', array(
+                        'value' => $choice,
+                        'label' => $value,
+                    ));
+                }
+            }
+        }
+
+        $builder->setAttribute('choice_list', $options['choice_list'])
+            ->setAttribute('preferred_choices', $options['preferred_choices'])
+            ->setAttribute('multiple', $options['multiple'])
+            ->setAttribute('expanded', $options['expanded']);
+
+        if ($options['expanded']) {
+            if ($options['multiple']) {
+                $builder->appendClientTransformer(new ArrayToBooleanChoicesTransformer($options['choice_list']));
+            } else {
+                $builder->appendClientTransformer(new ScalarToBooleanChoicesTransformer($options['choice_list']));
+                $builder->addEventSubscriber(new FixRadioInputListener(), 10);
+            }
+        } else {
+            if ($options['multiple']) {
+                $builder->appendClientTransformer(new ArrayToChoicesTransformer());
+            } else {
+                $builder->appendClientTransformer(new ScalarToChoiceTransformer());
+            }
+        }
+
+    }
+
+    public function buildView(FormView $view, FormInterface $form)
+    {
+        $choices = $form->getAttribute('choice_list')->getChoices();
+        $preferred = array_flip($form->getAttribute('preferred_choices'));
+
+        $view->set('multiple', $form->getAttribute('multiple'));
+        $view->set('expanded', $form->getAttribute('expanded'));
+        $view->set('preferred_choices', array_intersect_key($choices, $preferred));
+        $view->set('choices', array_diff_key($choices, $preferred));
+        $view->set('separator', '-------------------');
+        $view->set('empty_value', '');
+
+        if ($view->get('multiple') && !$view->get('expanded')) {
+            // Add "[]" to the name in case a select tag with multiple options is
+            // displayed. Otherwise only one of the selected options is sent in the
+            // POST request.
+            $view->set('name', $view->get('name').'[]');
+        }
+    }
+
+    public function getDefaultOptions(array $options)
+    {
+        $multiple = isset($options['multiple']) && $options['multiple'];
+        $expanded = isset($options['expanded']) && $options['expanded'];
+
+        return array(
+            'multiple' => false,
+            'expanded' => false,
+            'choice_list' => null,
+            'choices' => array(),
+            'preferred_choices' => array(),
+            'csrf_protection' => false,
+            'empty_data' => $multiple || $expanded ? array() : '',
+            'error_bubbling' => false,
+        );
+    }
+
+    public function getParent(array $options)
+    {
+        return $options['expanded'] ? 'form' : 'field';
+    }
+
+    public function getName()
+    {
+        return 'choice';
+    }
+}
diff --git a/src/Symfony/Component/Form/Type/CollectionType.php b/src/Symfony/Component/Form/Type/CollectionType.php
new file mode 100644
index 0000000000..f283931724
--- /dev/null
+++ b/src/Symfony/Component/Form/Type/CollectionType.php
@@ -0,0 +1,47 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\Type;
+
+use Symfony\Component\Form\FormBuilder;
+use Symfony\Component\Form\EventListener\ResizeFormListener;
+
+class CollectionType extends AbstractType
+{
+    public function buildForm(FormBuilder $builder, array $options)
+    {
+        if ($options['modifiable'] && $options['prototype']) {
+            $builder->add('$$name$$', $options['type'], array(
+                'property_path' => false,
+                'required' => false,
+            ));
+        }
+
+        $listener = new ResizeFormListener($builder->getFormFactory(),
+                $options['type'], $options['modifiable']);
+
+        $builder->addEventSubscriber($listener);
+    }
+
+    public function getDefaultOptions(array $options)
+    {
+        return array(
+            'modifiable' => false,
+            'prototype'  => true,
+            'type' => 'text',
+        );
+    }
+
+    public function getName()
+    {
+        return 'collection';
+    }
+}
\ No newline at end of file
diff --git a/src/Symfony/Component/Form/Type/CountryType.php b/src/Symfony/Component/Form/Type/CountryType.php
new file mode 100644
index 0000000000..66da5223d7
--- /dev/null
+++ b/src/Symfony/Component/Form/Type/CountryType.php
@@ -0,0 +1,35 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\Type;
+
+use Symfony\Component\Form\FormBuilder;
+use Symfony\Component\Locale\Locale;
+
+class CountryType extends AbstractType
+{
+    public function getDefaultOptions(array $options)
+    {
+        return array(
+            'choices' => Locale::getDisplayCountries(\Locale::getDefault()),
+        );
+    }
+
+    public function getParent(array $options)
+    {
+        return 'choice';
+    }
+
+    public function getName()
+    {
+        return 'country';
+    }
+}
\ No newline at end of file
diff --git a/src/Symfony/Component/Form/Type/CsrfType.php b/src/Symfony/Component/Form/Type/CsrfType.php
new file mode 100644
index 0000000000..c833f78f5a
--- /dev/null
+++ b/src/Symfony/Component/Form/Type/CsrfType.php
@@ -0,0 +1,65 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\Type;
+
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Form\FormBuilder;
+use Symfony\Component\Form\FormError;
+use Symfony\Component\Form\CsrfProvider\CsrfProviderInterface;
+use Symfony\Component\Form\Validator\CallbackValidator;
+
+class CsrfType extends AbstractType
+{
+    private $csrfProvider;
+
+    public function __construct(CsrfProviderInterface $csrfProvider)
+    {
+        $this->csrfProvider = $csrfProvider;
+    }
+
+    public function buildForm(FormBuilder $builder, array $options)
+    {
+        $csrfProvider = $options['csrf_provider'];
+        $pageId = $options['page_id'];
+
+        $builder
+            ->setData($csrfProvider->generateCsrfToken($pageId))
+            ->addValidator(new CallbackValidator(
+                function (FormInterface $form) use ($csrfProvider, $pageId) {
+                    if ((!$form->hasParent() || $form->getParent()->isRoot())
+                            && !$csrfProvider->isCsrfTokenValid($pageId, $form->getData())) {
+                        $form->addError(new FormError('The CSRF token is invalid. Please try to resubmit the form'));
+                        $form->setData($csrfProvider->generateCsrfToken($pageId));
+                    }
+                }
+            ));
+    }
+
+    public function getDefaultOptions(array $options)
+    {
+        return array(
+            'csrf_provider' => $this->csrfProvider,
+            'page_id' => null,
+            'property_path' => false,
+        );
+    }
+
+    public function getParent(array $options)
+    {
+        return 'hidden';
+    }
+
+    public function getName()
+    {
+        return 'csrf';
+    }
+}
\ No newline at end of file
diff --git a/src/Symfony/Component/Form/Type/DateTimeType.php b/src/Symfony/Component/Form/Type/DateTimeType.php
new file mode 100644
index 0000000000..2a59dad6be
--- /dev/null
+++ b/src/Symfony/Component/Form/Type/DateTimeType.php
@@ -0,0 +1,119 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\Type;
+
+use Symfony\Component\Form\FormBuilder;
+use Symfony\Component\Form\DataTransformer\ReversedTransformer;
+use Symfony\Component\Form\DataTransformer\DataTransformerChain;
+use Symfony\Component\Form\DataTransformer\DateTimeToArrayTransformer;
+use Symfony\Component\Form\DataTransformer\DateTimeToStringTransformer;
+use Symfony\Component\Form\DataTransformer\DateTimeToTimestampTransformer;
+use Symfony\Component\Form\DataTransformer\ArrayToPartsTransformer;
+
+class DateTimeType extends AbstractType
+{
+    public function buildForm(FormBuilder $builder, array $options)
+    {
+        // Only pass a subset of the options to children
+        $dateOptions = array_intersect_key($options, array_flip(array(
+            'years',
+            'months',
+            'days',
+        )));
+        $timeOptions = array_intersect_key($options, array_flip(array(
+            'hours',
+            'minutes',
+            'seconds',
+            'with_seconds',
+        )));
+
+        if (isset($options['date_pattern'])) {
+            $dateOptions['pattern'] = $options['date_pattern'];
+        }
+        if (isset($options['date_widget'])) {
+            $dateOptions['widget'] = $options['date_widget'];
+        }
+        if (isset($options['date_format'])) {
+            $dateOptions['format'] = $options['date_format'];
+        }
+
+        $dateOptions['input'] = 'array';
+
+        if (isset($options['time_pattern'])) {
+            $timeOptions['pattern'] = $options['time_pattern'];
+        }
+        if (isset($options['time_widget'])) {
+            $timeOptions['widget'] = $options['time_widget'];
+        }
+        if (isset($options['time_format'])) {
+            $timeOptions['format'] = $options['time_format'];
+        }
+
+        $timeOptions['input'] = 'array';
+
+        $parts = array('year', 'month', 'day', 'hour', 'minute');
+        $timeParts = array('hour', 'minute');
+
+        if ($options['with_seconds']) {
+            $parts[] = 'second';
+            $timeParts[] = 'second';
+        }
+
+        $builder->appendClientTransformer(new DataTransformerChain(array(
+                new DateTimeToArrayTransformer($options['data_timezone'], $options['user_timezone'], $parts),
+                new ArrayToPartsTransformer(array(
+                    'date' => array('year', 'month', 'day'),
+                    'time' => $timeParts,
+                )),
+            )))
+            ->add('date', 'date', $dateOptions)
+            ->add('time', 'time', $timeOptions);
+
+        if ($options['input'] === 'string') {
+            $builder->appendNormTransformer(new ReversedTransformer(
+                new DateTimeToStringTransformer($options['data_timezone'], $options['data_timezone'], 'Y-m-d H:i:s')
+            ));
+        } else if ($options['input'] === 'timestamp') {
+            $builder->appendNormTransformer(new ReversedTransformer(
+                new DateTimeToTimestampTransformer($options['data_timezone'], $options['data_timezone'])
+            ));
+        } else if ($options['input'] === 'array') {
+            $builder->appendNormTransformer(new ReversedTransformer(
+                new DateTimeToArrayTransformer($options['data_timezone'], $options['data_timezone'], $parts)
+            ));
+        }
+    }
+
+    public function getDefaultOptions(array $options)
+    {
+        return array(
+            'input' => 'datetime',
+            'with_seconds' => false,
+            'data_timezone' => null,
+            'user_timezone' => null,
+            // Don't modify \DateTime classes by reference, we treat
+            // them like immutable value objects
+            'by_reference' => false,
+            'date_pattern' => null,
+            'date_widget' => null,
+            'date_format' => null,
+            'time_pattern' => null,
+            'time_widget' => null,
+            'time_format' => null,
+        );
+    }
+
+    public function getName()
+    {
+        return 'datetime';
+    }
+}
\ No newline at end of file
diff --git a/src/Symfony/Component/Form/Type/DateType.php b/src/Symfony/Component/Form/Type/DateType.php
new file mode 100644
index 0000000000..fa3117ab04
--- /dev/null
+++ b/src/Symfony/Component/Form/Type/DateType.php
@@ -0,0 +1,130 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\Type;
+
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Form\FormBuilder;
+use Symfony\Component\Form\ChoiceList\PaddedChoiceList;
+use Symfony\Component\Form\ChoiceList\MonthChoiceList;
+use Symfony\Component\Form\FormView;
+use Symfony\Component\Form\DataTransformer\DateTimeToLocalizedStringTransformer;
+use Symfony\Component\Form\DataTransformer\DateTimeToArrayTransformer;
+use Symfony\Component\Form\DataTransformer\DateTimeToStringTransformer;
+use Symfony\Component\Form\DataTransformer\DateTimeToTimestampTransformer;
+use Symfony\Component\Form\DataTransformer\ReversedTransformer;
+
+class DateType extends AbstractType
+{
+    public function buildForm(FormBuilder $builder, array $options)
+    {
+        $formatter = new \IntlDateFormatter(
+            \Locale::getDefault(),
+            $options['format'],
+            \IntlDateFormatter::NONE,
+            \DateTimeZone::UTC
+        );
+
+        if ($options['widget'] === 'text') {
+            $builder->appendClientTransformer(new DateTimeToLocalizedStringTransformer($options['data_timezone'], $options['user_timezone'], $options['format'], \IntlDateFormatter::NONE));
+        } else {
+            // Only pass a subset of the options to children
+            $yearOptions = array(
+                'choice_list' => new PaddedChoiceList(
+                    $options['years'], 4, '0', STR_PAD_LEFT
+                ),
+            );
+            $monthOptions = array(
+                'choice_list' => new MonthChoiceList(
+                    $formatter, $options['months']
+                ),
+            );
+            $dayOptions = array(
+                'choice_list' => new PaddedChoiceList(
+                    $options['days'], 2, '0', STR_PAD_LEFT
+                ),
+            );
+
+            $builder->add('year', 'choice', $yearOptions)
+                ->add('month', 'choice', $monthOptions)
+                ->add('day', 'choice', $dayOptions)
+                ->appendClientTransformer(new DateTimeToArrayTransformer($options['data_timezone'], $options['user_timezone'], array('year', 'month', 'day')));
+        }
+
+        if ($options['input'] === 'string') {
+            $builder->appendNormTransformer(new ReversedTransformer(
+                new DateTimeToStringTransformer($options['data_timezone'], $options['data_timezone'], 'Y-m-d')
+            ));
+        } else if ($options['input'] === 'timestamp') {
+            $builder->appendNormTransformer(new ReversedTransformer(
+                new DateTimeToTimestampTransformer($options['data_timezone'], $options['data_timezone'])
+            ));
+        } else if ($options['input'] === 'array') {
+            $builder->appendNormTransformer(new ReversedTransformer(
+                new DateTimeToArrayTransformer($options['data_timezone'], $options['data_timezone'], array('year', 'month', 'day'))
+            ));
+        }
+
+        $builder
+            ->setAttribute('formatter', $formatter)
+            ->setAttribute('widget', $options['widget']);
+    }
+
+    public function buildViewBottomUp(FormView $view, FormInterface $form)
+    {
+        $view->set('widget', $form->getAttribute('widget'));
+
+        if ($view->hasChildren()) {
+
+            $pattern = $form->getAttribute('formatter')->getPattern();
+
+            // set right order with respect to locale (e.g.: de_DE=dd.MM.yy; en_US=M/d/yy)
+            // lookup various formats at http://userguide.icu-project.org/formatparse/datetime
+            if (preg_match('/^([yMd]+).+([yMd]+).+([yMd]+)$/', $pattern)) {
+                $pattern = preg_replace(array('/y+/', '/M+/', '/d+/'), array('{{ year }}', '{{ month }}', '{{ day }}'), $pattern);
+            } else {
+                // default fallback
+                $pattern = '{{ year }}-{{ month }}-{{ day }}';
+            }
+
+            $view->set('date_pattern', $pattern);
+        }
+    }
+
+    public function getDefaultOptions(array $options)
+    {
+        return array(
+            'years' => range(date('Y') - 5, date('Y') + 5),
+            'months' => range(1, 12),
+            'days' => range(1, 31),
+            'widget' => 'choice',
+            'input' => 'datetime',
+            'pattern' => null,
+            'format' => \IntlDateFormatter::MEDIUM,
+            'data_timezone' => null,
+            'user_timezone' => null,
+            'csrf_protection' => false,
+            // Don't modify \DateTime classes by reference, we treat
+            // them like immutable value objects
+            'by_reference' => false,
+        );
+    }
+
+    public function getParent(array $options)
+    {
+        return $options['widget'] === 'text' ? 'field' : 'form';
+    }
+
+    public function getName()
+    {
+        return 'date';
+    }
+}
diff --git a/src/Symfony/Component/Form/Type/EmailType.php b/src/Symfony/Component/Form/Type/EmailType.php
new file mode 100644
index 0000000000..4b48dcf8af
--- /dev/null
+++ b/src/Symfony/Component/Form/Type/EmailType.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\Type;
+
+use Symfony\Component\Form\FormBuilder;
+use Symfony\Component\Form\FormInterface;
+
+class EmailType extends AbstractType
+{
+    public function getParent(array $options)
+    {
+        return 'field';
+    }
+
+    public function getName()
+    {
+        return 'email';
+    }
+}
\ No newline at end of file
diff --git a/src/Symfony/Component/Form/Type/FieldType.php b/src/Symfony/Component/Form/Type/FieldType.php
new file mode 100644
index 0000000000..805d8e1111
--- /dev/null
+++ b/src/Symfony/Component/Form/Type/FieldType.php
@@ -0,0 +1,151 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\Type;
+
+use Symfony\Component\Form\Util\PropertyPath;
+use Symfony\Component\Form\FormBuilder;
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Form\FormFactoryInterface;
+use Symfony\Component\Form\FormView;
+use Symfony\Component\Form\EventListener\TrimListener;
+use Symfony\Component\Form\Validator\DefaultValidator;
+use Symfony\Component\Form\Validator\DelegatingValidator;
+use Symfony\Component\EventDispatcher\EventDispatcher;
+use Symfony\Component\Validator\ValidatorInterface;
+
+class FieldType extends AbstractType
+{
+    private $validator;
+
+    public function __construct(ValidatorInterface $validator)
+    {
+        $this->validator = $validator;
+    }
+
+    public function buildForm(FormBuilder $builder, array $options)
+    {
+        if (null === $options['property_path']) {
+            $options['property_path'] = $builder->getName();
+        }
+
+        if (false === $options['property_path'] || '' === $options['property_path']) {
+            $options['property_path'] = null;
+        } else {
+            $options['property_path'] = new PropertyPath($options['property_path']);
+        }
+
+        $options['validation_groups'] = empty($options['validation_groups'])
+            ? null
+            : (array)$options['validation_groups'];
+
+        $builder->setRequired($options['required'])
+            ->setReadOnly($options['read_only'])
+            ->setErrorBubbling($options['error_bubbling'])
+            ->setEmptyData($options['empty_data'])
+            ->setAttribute('by_reference', $options['by_reference'])
+            ->setAttribute('property_path', $options['property_path'])
+            ->setAttribute('validation_groups', $options['validation_groups'])
+            ->setAttribute('error_mapping', $options['error_mapping'])
+            ->setAttribute('max_length', $options['max_length'])
+            ->setAttribute('label', $options['label'] ?: $this->humanize($builder->getName()))
+            ->setAttribute('validation_constraint', $options['validation_constraint'])
+            ->setData($options['data'])
+            ->addValidator(new DefaultValidator())
+            ->addValidator(new DelegatingValidator($this->validator));
+
+        if ($options['trim']) {
+            $builder->addEventSubscriber(new TrimListener());
+        }
+    }
+
+    public function buildView(FormView $view, FormInterface $form)
+    {
+        if ($view->hasParent()) {
+            $parentId = $view->getParent()->get('id');
+            $parentName = $view->getParent()->get('name');
+            $id = sprintf('%s_%s', $parentId, $form->getName());
+            $name = sprintf('%s[%s]', $parentName, $form->getName());
+        } else {
+            $id = $form->getName();
+            $name = $form->getName();
+        }
+
+        $view->set('form', $view);
+        $view->set('id', $id);
+        $view->set('name', $name);
+        $view->set('errors', $form->getErrors());
+        $view->set('value', $form->getClientData());
+        $view->set('read_only', $form->isReadOnly());
+        $view->set('required', $form->isRequired());
+        $view->set('max_length', $form->getAttribute('max_length'));
+        $view->set('size', null);
+        $view->set('label', $form->getAttribute('label'));
+        $view->set('multipart', false);
+        $view->set('attr', array());
+
+        $types = array();
+        foreach (array_reverse((array) $form->getTypes()) as $type) {
+            $types[] = $type->getName();
+        }
+        $view->set('types', $types);
+    }
+
+    public function getDefaultOptions(array $options)
+    {
+        $defaultOptions = array(
+            'data' => null,
+            'data_class' => null,
+            'trim' => true,
+            'required' => true,
+            'read_only' => false,
+            'max_length' => null,
+            'property_path' => null,
+            'by_reference' => true,
+            'validation_groups' => null,
+            'error_bubbling' => false,
+            'error_mapping' => array(),
+            'label' => null,
+            'validation_constraint' => null,
+        );
+
+        if (!empty($options['data_class'])) {
+            $class = $options['data_class'];
+            $defaultOptions['empty_data'] = function () use ($class) {
+                return new $class();
+            };
+        } else {
+            $defaultOptions['empty_data'] = '';
+        }
+
+        return $defaultOptions;
+    }
+
+    public function createBuilder($name, FormFactoryInterface $factory, array $options)
+    {
+        return new FormBuilder($name, $factory, new EventDispatcher(), $options['data_class']);
+    }
+
+    public function getParent(array $options)
+    {
+        return null;
+    }
+
+    public function getName()
+    {
+        return 'field';
+    }
+
+    private function humanize($text)
+    {
+        return ucfirst(strtolower(str_replace('_', ' ', $text)));
+    }
+}
diff --git a/src/Symfony/Component/Form/Type/FileType.php b/src/Symfony/Component/Form/Type/FileType.php
new file mode 100644
index 0000000000..ae9739b8bb
--- /dev/null
+++ b/src/Symfony/Component/Form/Type/FileType.php
@@ -0,0 +1,69 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\Type;
+
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Form\FormBuilder;
+use Symfony\Component\Form\FormFactoryInterface;
+use Symfony\Component\Form\EventListener\FixFileUploadListener;
+use Symfony\Component\Form\DataTransformer\DataTransformerChain;
+use Symfony\Component\Form\DataTransformer\ReversedTransformer;
+use Symfony\Component\Form\DataTransformer\FileToStringTransformer;
+use Symfony\Component\Form\DataTransformer\FileToArrayTransformer;
+use Symfony\Component\Form\FormView;
+use Symfony\Component\HttpFoundation\File\TemporaryStorage;
+
+class FileType extends AbstractType
+{
+    private $storage;
+
+    public function __construct(TemporaryStorage $storage)
+    {
+        $this->storage = $storage;
+    }
+
+    public function buildForm(FormBuilder $builder, array $options)
+    {
+        if ($options['type'] === 'string') {
+            $builder->appendNormTransformer(new DataTransformerChain(array(
+                new ReversedTransformer(new FileToStringTransformer()),
+                new FileToArrayTransformer(),
+            )));
+        } else {
+            $builder->appendNormTransformer(new FileToArrayTransformer());
+        }
+
+        $builder->addEventSubscriber(new FixFileUploadListener($this->storage), 10)
+            ->add('file', 'field')
+            ->add('token', 'hidden')
+            ->add('name', 'hidden');
+    }
+
+    public function buildViewBottomUp(FormView $view, FormInterface $form)
+    {
+        $view->set('multipart', true);
+        $view['file']->set('type', 'file');
+    }
+
+    public function getDefaultOptions(array $options)
+    {
+        return array(
+            'type' => 'string',
+            'csrf_protection' => false,
+        );
+    }
+
+    public function getName()
+    {
+        return 'file';
+    }
+}
diff --git a/src/Symfony/Component/Form/Type/FormType.php b/src/Symfony/Component/Form/Type/FormType.php
new file mode 100644
index 0000000000..bc39671cdc
--- /dev/null
+++ b/src/Symfony/Component/Form/Type/FormType.php
@@ -0,0 +1,82 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\Type;
+
+use Symfony\Component\Form\FormBuilder;
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Form\FormView;
+use Symfony\Component\Form\CsrfProvider\CsrfProviderInterface;
+use Symfony\Component\Form\DataMapper\PropertyPathMapper;
+use Symfony\Component\EventDispatcher\EventDispatcher;
+
+class FormType extends AbstractType
+{
+    public function buildForm(FormBuilder $builder, array $options)
+    {
+        $builder->setAttribute('virtual', $options['virtual'])
+            ->setDataMapper(new PropertyPathMapper($options['data_class']));
+
+        if ($options['csrf_protection']) {
+            $csrfOptions = array('page_id' => $options['csrf_page_id']);
+
+            if ($options['csrf_provider']) {
+                $csrfOptions['csrf_provider'] = $options['csrf_provider'];
+            }
+
+            $builder->add($options['csrf_field_name'], 'csrf', $csrfOptions);
+        }
+    }
+
+    public function buildViewBottomUp(FormView $view, FormInterface $form)
+    {
+        $multipart = false;
+
+        foreach ($view as $child) {
+            if ($child->get('multipart')) {
+                $multipart = true;
+                break;
+            }
+        }
+
+        $view->set('multipart', $multipart);
+    }
+
+    public function getDefaultOptions(array $options)
+    {
+        $defaultOptions = array(
+            'csrf_protection' => true,
+            'csrf_field_name' => '_token',
+            'csrf_provider' => null,
+            'csrf_page_id' => get_class($this),
+            'virtual' => false,
+            // Errors in forms bubble by default, so that form errors will
+            // end up as global errors in the root form
+            'error_bubbling' => true,
+        );
+
+        if (empty($options['data_class'])) {
+            $defaultOptions['empty_data'] = array();
+        }
+
+        return $defaultOptions;
+    }
+
+    public function getParent(array $options)
+    {
+        return 'field';
+    }
+
+    public function getName()
+    {
+        return 'form';
+    }
+}
diff --git a/src/Symfony/Component/Form/Type/FormTypeInterface.php b/src/Symfony/Component/Form/Type/FormTypeInterface.php
new file mode 100644
index 0000000000..33bc17b4dc
--- /dev/null
+++ b/src/Symfony/Component/Form/Type/FormTypeInterface.php
@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\Type;
+
+use Symfony\Component\Form\FormBuilder;
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Form\FormFactoryInterface;
+use Symfony\Component\Form\FormView;
+
+interface FormTypeInterface
+{
+    function buildForm(FormBuilder $builder, array $options);
+
+    function buildView(FormView $view, FormInterface $form);
+
+    function buildViewBottomUp(FormView $view, FormInterface $form);
+
+    function createBuilder($name, FormFactoryInterface $factory, array $options);
+
+    function getDefaultOptions(array $options);
+
+    function getParent(array $options);
+
+    function getName();
+}
\ No newline at end of file
diff --git a/src/Symfony/Component/Form/FieldFactory/FieldFactoryGuess.php b/src/Symfony/Component/Form/Type/Guesser/Guess.php
similarity index 71%
rename from src/Symfony/Component/Form/FieldFactory/FieldFactoryGuess.php
rename to src/Symfony/Component/Form/Type/Guesser/Guess.php
index 3da428a62c..c17ad7fede 100644
--- a/src/Symfony/Component/Form/FieldFactory/FieldFactoryGuess.php
+++ b/src/Symfony/Component/Form/Type/Guesser/Guess.php
@@ -9,19 +9,18 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Form\FieldFactory;
+namespace Symfony\Component\Form\Type\Guesser;
 
 /**
- * Contains a value guessed by a FieldFactoryGuesserInterface instance
+ * Base class for guesses made by TypeGuesserInterface implementation
  *
- * Each instance also contains a confidence value about the correctness of
- * the guessed value. Thus an instance with confidence HIGH_CONFIDENCE is
- * more likely to contain a correct value than an instance with confidence
- * LOW_CONFIDENCE.
+ * Each instance contains a confidence value about the correctness of the guess.
+ * Thus an instance with confidence HIGH_CONFIDENCE is more likely to be
+ * correct than an instance with confidence LOW_CONFIDENCE.
  *
  * @author Bernhard Schussek <bernhard.schussek@symfony.com>
  */
-class FieldFactoryGuess
+abstract class Guess
 {
     /**
      * Marks an instance with a value that is very likely to be correct
@@ -45,18 +44,12 @@ class FieldFactoryGuess
      * The list of allowed confidence values
      * @var array
      */
-    protected static $confidences = array(
+    private static $confidences = array(
         self::HIGH_CONFIDENCE,
         self::MEDIUM_CONFIDENCE,
         self::LOW_CONFIDENCE,
     );
 
-    /**
-     * The guessed value
-     * @var mixed
-     */
-    protected $value;
-
     /**
      * The confidence about the correctness of the value
      *
@@ -64,7 +57,7 @@ class FieldFactoryGuess
      *
      * @var integer
      */
-    protected $confidence;
+    private $confidence;
 
     /**
      * Returns the guess most likely to be correct from a list of guesses
@@ -73,7 +66,7 @@ class FieldFactoryGuess
      * returned guess is any of them.
      *
      * @param  array $guesses     A list of guesses
-     * @return FieldFactoryGuess  The guess with the highest confidence
+     * @return Guess  The guess with the highest confidence
      */
     static public function getBestGuess(array $guesses)
     {
@@ -87,29 +80,17 @@ class FieldFactoryGuess
     /**
      * Constructor
      *
-     * @param mixed $value          The guessed value
      * @param integer $confidence   The confidence
      */
-    public function __construct($value, $confidence)
+    public function __construct($confidence)
     {
         if (!in_array($confidence, self::$confidences)) {
             throw new \UnexpectedValueException(sprintf('The confidence should be one of "%s"', implode('", "', self::$confidences)));
         }
 
-        $this->value = $value;
         $this->confidence = $confidence;
     }
 
-    /**
-     * Returns the guessed value
-     *
-     * @return mixed
-     */
-    public function getValue()
-    {
-        return $this->value;
-    }
-
     /**
      * Returns the confidence that the guessed value is correct
      *
diff --git a/src/Symfony/Component/Form/FieldFactory/FieldFactoryClassGuess.php b/src/Symfony/Component/Form/Type/Guesser/TypeGuess.php
similarity index 69%
rename from src/Symfony/Component/Form/FieldFactory/FieldFactoryClassGuess.php
rename to src/Symfony/Component/Form/Type/Guesser/TypeGuess.php
index 732f01b96a..732c8ce6f1 100644
--- a/src/Symfony/Component/Form/FieldFactory/FieldFactoryClassGuess.php
+++ b/src/Symfony/Component/Form/Type/Guesser/TypeGuess.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Form\FieldFactory;
+namespace Symfony\Component\Form\Type\Guesser;
 
 /**
  * Contains a guessed class name and a list of options for creating an instance
@@ -17,42 +17,49 @@ namespace Symfony\Component\Form\FieldFactory;
  *
  * @author Bernhard Schussek <bernhard.schussek@symfony.com>
  */
-class FieldFactoryClassGuess extends FieldFactoryGuess
+class TypeGuess extends Guess
 {
+    /**
+     * The guessed field type
+     * @var string
+     */
+    private $type;
+
     /**
      * The guessed options for creating an instance of the guessed class
      * @var array
      */
-    protected $options;
+    private $options;
 
     /**
      * Constructor
      *
-     * @param string $class         The guessed class name
+     * @param string $type    The guessed field type
      * @param array  $options       The options for creating instances of the
      *                              guessed class
      * @param integer $confidence   The confidence that the guessed class name
      *                              is correct
      */
-    public function __construct($class, array $options, $confidence)
+    public function __construct($type, array $options, $confidence)
     {
-        parent::__construct($class, $confidence);
+        parent::__construct($confidence);
 
+        $this->type = $type;
         $this->options = $options;
     }
 
     /**
-     * Returns the guessed class name
+     * Returns the guessed field type
      *
      * @return string
      */
-    public function getClass()
+    public function getType()
     {
-        return $this->getValue();
+        return $this->type;
     }
 
     /**
-     * Returns the guessed options for creating instances of the guessed class
+     * Returns the guessed options for creating instances of the guessed type
      *
      * @return array
      */
diff --git a/src/Symfony/Component/Form/FieldFactory/FieldFactoryGuesserInterface.php b/src/Symfony/Component/Form/Type/Guesser/TypeGuesserInterface.php
similarity index 76%
rename from src/Symfony/Component/Form/FieldFactory/FieldFactoryGuesserInterface.php
rename to src/Symfony/Component/Form/Type/Guesser/TypeGuesserInterface.php
index 7f7ef69cfe..389a32e515 100644
--- a/src/Symfony/Component/Form/FieldFactory/FieldFactoryGuesserInterface.php
+++ b/src/Symfony/Component/Form/Type/Guesser/TypeGuesserInterface.php
@@ -9,30 +9,30 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Form\FieldFactory;
+namespace Symfony\Component\Form\Type\Guesser;
 
 /**
  * Guesses field classes and options for the properties of a class
  *
  * @author Bernhard Schussek <bernhard.schussek@symfony.com>
  */
-interface FieldFactoryGuesserInterface
+interface TypeGuesserInterface
 {
     /**
      * Returns a field guess for a property name of a class
      *
      * @param  string $class           The fully qualified class name
      * @param  string $property        The name of the property to guess for
-     * @return FieldFactoryClassGuess  A guess for the field's class and options
+     * @return TypeGuess  A guess for the field's type and options
      */
-    function guessClass($class, $property);
+    function guessType($class, $property);
 
     /**
      * Returns a guess whether a property of a class is required
      *
      * @param  string $class      The fully qualified class name
      * @param  string $property   The name of the property to guess for
-     * @return FieldFactoryGuess  A guess for the field's required setting
+     * @return Guess  A guess for the field's required setting
      */
     function guessRequired($class, $property);
 
@@ -41,7 +41,7 @@ interface FieldFactoryGuesserInterface
      *
      * @param  string $class      The fully qualified class name
      * @param  string $property   The name of the property to guess for
-     * @return FieldFactoryGuess  A guess for the field's maximum length
+     * @return Guess  A guess for the field's maximum length
      */
     function guessMaxLength($class, $property);
 }
diff --git a/src/Symfony/Component/Form/FieldFactory/ValidatorFieldFactoryGuesser.php b/src/Symfony/Component/Form/Type/Guesser/ValidatorTypeGuesser.php
similarity index 57%
rename from src/Symfony/Component/Form/FieldFactory/ValidatorFieldFactoryGuesser.php
rename to src/Symfony/Component/Form/Type/Guesser/ValidatorTypeGuesser.php
index bd098b6d89..58116003bb 100644
--- a/src/Symfony/Component/Form/FieldFactory/ValidatorFieldFactoryGuesser.php
+++ b/src/Symfony/Component/Form/Type/Guesser/ValidatorTypeGuesser.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Form\FieldFactory;
+namespace Symfony\Component\Form\Type\Guesser;
 
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\Mapping\ClassMetadataFactoryInterface;
@@ -19,7 +19,7 @@ use Symfony\Component\Validator\Mapping\ClassMetadataFactoryInterface;
  *
  * @author Bernhard Schussek <bernhard.schussek@symfony.com>
  */
-class ValidatorFieldFactoryGuesser implements FieldFactoryGuesserInterface
+class ValidatorTypeGuesser implements TypeGuesserInterface
 {
     /**
      * Constructor
@@ -34,12 +34,12 @@ class ValidatorFieldFactoryGuesser implements FieldFactoryGuesserInterface
     /**
      * @inheritDoc
      */
-    public function guessClass($class, $property)
+    public function guessType($class, $property)
     {
         $guesser = $this;
 
         return $this->guess($class, $property, function (Constraint $constraint) use ($guesser) {
-            return $guesser->guessClassForConstraint($constraint);
+            return $guesser->guessTypeForConstraint($constraint);
         });
     }
 
@@ -75,7 +75,7 @@ class ValidatorFieldFactoryGuesser implements FieldFactoryGuesserInterface
      * @param string $property    The property for which to find constraints
      * @param \Closure $guessForConstraint   The closure that returns a guess
      *                            for a given constraint
-     * @return FieldFactoryGuess  The guessed value with the highest confidence
+     * @return Guess  The guessed value with the highest confidence
      */
     protected function guess($class, $property, \Closure $guessForConstraint)
     {
@@ -96,165 +96,159 @@ class ValidatorFieldFactoryGuesser implements FieldFactoryGuesserInterface
             }
         }
 
-        return FieldFactoryGuess::getBestGuess($guesses);
+        return Guess::getBestGuess($guesses);
     }
 
     /**
      * Guesses a field class name for a given constraint
      *
      * @param  Constraint $constraint  The constraint to guess for
-     * @return FieldFactoryClassGuess  The guessed field class and options
+     * @return TypeGuess  The guessed field class and options
      */
-    public function guessClassForConstraint(Constraint $constraint)
+    public function guessTypeForConstraint(Constraint $constraint)
     {
         switch (get_class($constraint)) {
             case 'Symfony\Component\Validator\Constraints\Type':
                 switch ($constraint->type) {
                     case 'boolean':
                     case 'bool':
-                        return new FieldFactoryClassGuess(
-                            'Symfony\Component\Form\CheckboxField',
+                        return new TypeGuess(
+                            'checkbox',
                             array(),
-                            FieldFactoryGuess::MEDIUM_CONFIDENCE
+                            Guess::MEDIUM_CONFIDENCE
                         );
                     case 'double':
                     case 'float':
                     case 'numeric':
                     case 'real':
-                        return new FieldFactoryClassGuess(
-                            'Symfony\Component\Form\NumberField',
+                        return new TypeGuess(
+                            'number',
                             array(),
-                            FieldFactoryGuess::MEDIUM_CONFIDENCE
+                            Guess::MEDIUM_CONFIDENCE
                         );
                     case 'integer':
                     case 'int':
                     case 'long':
-                        return new FieldFactoryClassGuess(
-                            'Symfony\Component\Form\IntegerField',
+                        return new TypeGuess(
+                            'integer',
                             array(),
-                            FieldFactoryGuess::MEDIUM_CONFIDENCE
+                            Guess::MEDIUM_CONFIDENCE
                         );
                     case 'string':
-                        return new FieldFactoryClassGuess(
-                            'Symfony\Component\Form\TextField',
+                        return new TypeGuess(
+                            'text',
                             array(),
-                            FieldFactoryGuess::LOW_CONFIDENCE
+                            Guess::LOW_CONFIDENCE
                         );
                     case '\DateTime':
-                        return new FieldFactoryClassGuess(
-                            'Symfony\Component\Form\DateField',
+                        return new TypeGuess(
+                            'date',
                             array(),
-                            FieldFactoryGuess::MEDIUM_CONFIDENCE
+                            Guess::MEDIUM_CONFIDENCE
                         );
                 }
                 break;
             case 'Symfony\Component\Validator\Constraints\Choice':
-                return new FieldFactoryClassGuess(
-                    'Symfony\Component\Form\ChoiceField',
+                return new TypeGuess(
+                    'choice',
                     array('choices' => $constraint->choices),
-                    FieldFactoryGuess::HIGH_CONFIDENCE
+                    Guess::HIGH_CONFIDENCE
                 );
             case 'Symfony\Component\Validator\Constraints\Country':
-                return new FieldFactoryClassGuess(
-                    'Symfony\Component\Form\CountryField',
+                return new TypeGuess(
+                    'country',
                     array(),
-                    FieldFactoryGuess::HIGH_CONFIDENCE
+                    Guess::HIGH_CONFIDENCE
                 );
             case 'Symfony\Component\Validator\Constraints\Date':
-                return new FieldFactoryClassGuess(
-                    'Symfony\Component\Form\DateField',
+                return new TypeGuess(
+                    'date',
                     array('type' => 'string'),
-                    FieldFactoryGuess::HIGH_CONFIDENCE
+                    Guess::HIGH_CONFIDENCE
                 );
             case 'Symfony\Component\Validator\Constraints\DateTime':
-                return new FieldFactoryClassGuess(
-                    'Symfony\Component\Form\DateTimeField',
+                return new TypeGuess(
+                    'datetime',
                     array('type' => 'string'),
-                    FieldFactoryGuess::HIGH_CONFIDENCE
+                    Guess::HIGH_CONFIDENCE
                 );
             case 'Symfony\Component\Validator\Constraints\Email':
-                return new FieldFactoryClassGuess(
-                    'Symfony\Component\Form\TextField',
+                return new TypeGuess(
+                    'text',
                     array(),
-                    FieldFactoryGuess::HIGH_CONFIDENCE
+                    Guess::HIGH_CONFIDENCE
                 );
             case 'Symfony\Component\Validator\Constraints\File':
-                return new FieldFactoryClassGuess(
-                    'Symfony\Component\Form\FileField',
+                return new TypeGuess(
+                    'file',
                     array(),
-                    FieldFactoryGuess::HIGH_CONFIDENCE
+                    Guess::HIGH_CONFIDENCE
                 );
             case 'Symfony\Component\Validator\Constraints\Image':
-                return new FieldFactoryClassGuess(
-                    'Symfony\Component\Form\FileField',
+                return new TypeGuess(
+                    'file',
                     array(),
-                    FieldFactoryGuess::HIGH_CONFIDENCE
+                    Guess::HIGH_CONFIDENCE
                 );
             case 'Symfony\Component\Validator\Constraints\Ip':
-                return new FieldFactoryClassGuess(
-                    'Symfony\Component\Form\TextField',
+                return new TypeGuess(
+                    'text',
                     array(),
-                    FieldFactoryGuess::MEDIUM_CONFIDENCE
+                    Guess::MEDIUM_CONFIDENCE
                 );
             case 'Symfony\Component\Validator\Constraints\Language':
-                return new FieldFactoryClassGuess(
-                    'Symfony\Component\Form\LanguageField',
+                return new TypeGuess(
+                    'language',
                     array(),
-                    FieldFactoryGuess::HIGH_CONFIDENCE
+                    Guess::HIGH_CONFIDENCE
                 );
             case 'Symfony\Component\Validator\Constraints\Locale':
-                return new FieldFactoryClassGuess(
-                    'Symfony\Component\Form\LocaleField',
+                return new TypeGuess(
+                    'locale',
                     array(),
-                    FieldFactoryGuess::HIGH_CONFIDENCE
+                    Guess::HIGH_CONFIDENCE
                 );
             case 'Symfony\Component\Validator\Constraints\Max':
-                return new FieldFactoryClassGuess(
-                    'Symfony\Component\Form\NumberField',
+                return new TypeGuess(
+                    'number',
                     array(),
-                    FieldFactoryGuess::LOW_CONFIDENCE
+                    Guess::LOW_CONFIDENCE
                 );
             case 'Symfony\Component\Validator\Constraints\MaxLength':
-                return new FieldFactoryClassGuess(
-                    'Symfony\Component\Form\TextField',
+                return new TypeGuess(
+                    'text',
                     array(),
-                    FieldFactoryGuess::LOW_CONFIDENCE
+                    Guess::LOW_CONFIDENCE
                 );
             case 'Symfony\Component\Validator\Constraints\Min':
-                return new FieldFactoryClassGuess(
-                    'Symfony\Component\Form\NumberField',
+                return new TypeGuess(
+                    'number',
                     array(),
-                    FieldFactoryGuess::LOW_CONFIDENCE
+                    Guess::LOW_CONFIDENCE
                 );
             case 'Symfony\Component\Validator\Constraints\MinLength':
-                return new FieldFactoryClassGuess(
-                    'Symfony\Component\Form\TextField',
+                return new TypeGuess(
+                    'text',
                     array(),
-                    FieldFactoryGuess::LOW_CONFIDENCE
+                    Guess::LOW_CONFIDENCE
                 );
             case 'Symfony\Component\Validator\Constraints\Regex':
-                return new FieldFactoryClassGuess(
-                    'Symfony\Component\Form\TextField',
+                return new TypeGuess(
+                    'text',
                     array(),
-                    FieldFactoryGuess::LOW_CONFIDENCE
+                    Guess::LOW_CONFIDENCE
                 );
             case 'Symfony\Component\Validator\Constraints\Time':
-                return new FieldFactoryClassGuess(
-                    'Symfony\Component\Form\TimeField',
+                return new TypeGuess(
+                    'time',
                     array('type' => 'string'),
-                    FieldFactoryGuess::HIGH_CONFIDENCE
+                    Guess::HIGH_CONFIDENCE
                 );
             case 'Symfony\Component\Validator\Constraints\Url':
-                return new FieldFactoryClassGuess(
-                    'Symfony\Component\Form\UrlField',
+                return new TypeGuess(
+                    'url',
                     array(),
-                    FieldFactoryGuess::HIGH_CONFIDENCE
-                );
-            default:
-                return new FieldFactoryClassGuess(
-                    'Symfony\Component\Form\TextField',
-                    array(),
-                    FieldFactoryGuess::LOW_CONFIDENCE
+                    Guess::HIGH_CONFIDENCE
                 );
         }
     }
@@ -263,25 +257,25 @@ class ValidatorFieldFactoryGuesser implements FieldFactoryGuesserInterface
      * Guesses whether a field is required based on the given constraint
      *
      * @param  Constraint $constraint  The constraint to guess for
-     * @return FieldFactoryGuess       The guess whether the field is required
+     * @return Guess       The guess whether the field is required
      */
     public function guessRequiredForConstraint(Constraint $constraint)
     {
         switch (get_class($constraint)) {
             case 'Symfony\Component\Validator\Constraints\NotNull':
-                return new FieldFactoryGuess(
+                return new ValueGuess(
                     true,
-                    FieldFactoryGuess::HIGH_CONFIDENCE
+                    Guess::HIGH_CONFIDENCE
                 );
             case 'Symfony\Component\Validator\Constraints\NotBlank':
-                return new FieldFactoryGuess(
+                return new ValueGuess(
                     true,
-                    FieldFactoryGuess::HIGH_CONFIDENCE
+                    Guess::HIGH_CONFIDENCE
                 );
             default:
-                return new FieldFactoryGuess(
+                return new ValueGuess(
                     false,
-                    FieldFactoryGuess::LOW_CONFIDENCE
+                    Guess::LOW_CONFIDENCE
                 );
         }
     }
@@ -290,20 +284,20 @@ class ValidatorFieldFactoryGuesser implements FieldFactoryGuesserInterface
      * Guesses a field's maximum length based on the given constraint
      *
      * @param  Constraint $constraint  The constraint to guess for
-     * @return FieldFactoryGuess       The guess for the maximum length
+     * @return Guess       The guess for the maximum length
      */
     public function guessMaxLengthForConstraint(Constraint $constraint)
     {
         switch (get_class($constraint)) {
             case 'Symfony\Component\Validator\Constraints\MaxLength':
-                return new FieldFactoryGuess(
+                return new ValueGuess(
                     $constraint->limit,
-                    FieldFactoryGuess::HIGH_CONFIDENCE
+                    Guess::HIGH_CONFIDENCE
                 );
             case 'Symfony\Component\Validator\Constraints\Max':
-                return new FieldFactoryGuess(
+                return new ValueGuess(
                     strlen((string)$constraint->limit),
-                    FieldFactoryGuess::HIGH_CONFIDENCE
+                    Guess::HIGH_CONFIDENCE
                 );
         }
     }
diff --git a/src/Symfony/Component/Form/Type/Guesser/ValueGuess.php b/src/Symfony/Component/Form/Type/Guesser/ValueGuess.php
new file mode 100644
index 0000000000..f9c3cfeacf
--- /dev/null
+++ b/src/Symfony/Component/Form/Type/Guesser/ValueGuess.php
@@ -0,0 +1,50 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\Type\Guesser;
+
+/**
+ * Contains a guessed value
+ *
+ * @author Bernhard Schussek <bernhard.schussek@symfony.com>
+ */
+class ValueGuess extends Guess
+{
+    /**
+     * The guessed value
+     * @var array
+     */
+    private $value;
+
+    /**
+     * Constructor
+     *
+     * @param string $value         The guessed value
+     * @param integer $confidence   The confidence that the guessed class name
+     *                              is correct
+     */
+    public function __construct($value, $confidence)
+    {
+        parent::__construct($confidence);
+
+        $this->value = $value;
+    }
+
+    /**
+     * Returns the guessed value
+     *
+     * @return mixed
+     */
+    public function getValue()
+    {
+        return $this->value;
+    }
+}
\ No newline at end of file
diff --git a/src/Symfony/Component/Form/Type/HiddenType.php b/src/Symfony/Component/Form/Type/HiddenType.php
new file mode 100644
index 0000000000..0207795189
--- /dev/null
+++ b/src/Symfony/Component/Form/Type/HiddenType.php
@@ -0,0 +1,35 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\Type;
+
+use Symfony\Component\Form\FormBuilder;
+
+class HiddenType extends AbstractType
+{
+    public function getDefaultOptions(array $options)
+    {
+        return array(
+            // Pass errors to the parent
+            'error_bubbling' => true,
+        );
+    }
+
+    public function getParent(array $options)
+    {
+        return 'field';
+    }
+
+    public function getName()
+    {
+        return 'hidden';
+    }
+}
\ No newline at end of file
diff --git a/src/Symfony/Component/Form/Type/IntegerType.php b/src/Symfony/Component/Form/Type/IntegerType.php
new file mode 100644
index 0000000000..9fcc10b3bd
--- /dev/null
+++ b/src/Symfony/Component/Form/Type/IntegerType.php
@@ -0,0 +1,44 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\Type;
+
+use Symfony\Component\Form\FormBuilder;
+use Symfony\Component\Form\DataTransformer\IntegerToLocalizedStringTransformer;
+
+class IntegerType extends AbstractType
+{
+    public function buildForm(FormBuilder $builder, array $options)
+    {
+        $builder->appendClientTransformer(new IntegerToLocalizedStringTransformer($options['precision'], $options['grouping'], $options['rounding_mode']));
+    }
+
+    public function getDefaultOptions(array $options)
+    {
+        return array(
+            // default precision is locale specific (usually around 3)
+            'precision' => null,
+            'grouping' => false,
+            // Integer cast rounds towards 0, so do the same when displaying fractions
+            'rounding_mode' => IntegerToLocalizedStringTransformer::ROUND_DOWN,
+        );
+    }
+
+    public function getParent(array $options)
+    {
+        return 'field';
+    }
+
+    public function getName()
+    {
+        return 'integer';
+    }
+}
\ No newline at end of file
diff --git a/src/Symfony/Component/Form/Type/LanguageType.php b/src/Symfony/Component/Form/Type/LanguageType.php
new file mode 100644
index 0000000000..5a0c60dbad
--- /dev/null
+++ b/src/Symfony/Component/Form/Type/LanguageType.php
@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\Type;
+
+use Symfony\Component\Locale\Locale;
+
+class LanguageType extends AbstractType
+{
+    public function getDefaultOptions(array $options)
+    {
+        return array(
+            'choices' => Locale::getDisplayLanguages(\Locale::getDefault()),
+        );
+    }
+
+    public function getParent(array $options)
+    {
+        return 'choice';
+    }
+
+    public function getName()
+    {
+        return 'language';
+    }
+}
\ No newline at end of file
diff --git a/src/Symfony/Component/Form/Type/Loader/ArrayTypeLoader.php b/src/Symfony/Component/Form/Type/Loader/ArrayTypeLoader.php
new file mode 100644
index 0000000000..f8ba99a8b9
--- /dev/null
+++ b/src/Symfony/Component/Form/Type/Loader/ArrayTypeLoader.php
@@ -0,0 +1,41 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\Type\Loader;
+
+use Symfony\Component\Form\FormFactoryInterface;
+use Symfony\Component\Form\Type;
+use Symfony\Component\Form\Type\FormTypeInterface;
+
+class ArrayTypeLoader implements TypeLoaderInterface
+{
+    /**
+     * @var array
+     */
+    private $types;
+
+    public function __construct(array $types)
+    {
+        foreach ($types as $type) {
+            $this->types[$type->getName()] = $type;
+        }
+    }
+
+    public function getType($name)
+    {
+        return $this->types[$name];
+    }
+
+    public function hasType($name)
+    {
+        return isset($this->types[$name]);
+    }
+}
\ No newline at end of file
diff --git a/src/Symfony/Component/Form/Type/Loader/DefaultTypeLoader.php b/src/Symfony/Component/Form/Type/Loader/DefaultTypeLoader.php
new file mode 100644
index 0000000000..3eefa694ea
--- /dev/null
+++ b/src/Symfony/Component/Form/Type/Loader/DefaultTypeLoader.php
@@ -0,0 +1,64 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\Type\Loader;
+
+use Symfony\Component\Form\Type;
+use Symfony\Component\Form\CsrfProvider\CsrfProviderInterface;
+use Symfony\Component\Validator\ValidatorInterface;
+use Symfony\Component\HttpFoundation\File\TemporaryStorage;
+
+class DefaultTypeLoader extends ArrayTypeLoader
+{
+    public function __construct(
+            ValidatorInterface $validator = null,
+            CsrfProviderInterface $csrfProvider = null, TemporaryStorage $storage = null)
+    {
+        $types = array(
+            new Type\FieldType($validator),
+            new Type\FormType(),
+            new Type\BirthdayType(),
+            new Type\CheckboxType(),
+            new Type\ChoiceType(),
+            new Type\CollectionType(),
+            new Type\CountryType(),
+            new Type\DateType(),
+            new Type\DateTimeType(),
+            new Type\EmailType(),
+            new Type\HiddenType(),
+            new Type\IntegerType(),
+            new Type\LanguageType(),
+            new Type\LocaleType(),
+            new Type\MoneyType(),
+            new Type\NumberType(),
+            new Type\PasswordType(),
+            new Type\PercentType(),
+            new Type\RadioType(),
+            new Type\RepeatedType(),
+            new Type\TextareaType(),
+            new Type\TextType(),
+            new Type\TimeType(),
+            new Type\TimezoneType(),
+            new Type\UrlType(),
+        );
+
+        if ($csrfProvider) {
+            // TODO Move to a Symfony\Bridge\FormSecurity
+            $types[] = new Type\CsrfType($csrfProvider);
+        }
+
+        if ($storage) {
+            $types[] = new Type\FileType($storage);
+        }
+
+        parent::__construct($types);
+    }
+}
diff --git a/src/Symfony/Component/Form/Type/Loader/TypeLoaderChain.php b/src/Symfony/Component/Form/Type/Loader/TypeLoaderChain.php
new file mode 100644
index 0000000000..d668039856
--- /dev/null
+++ b/src/Symfony/Component/Form/Type/Loader/TypeLoaderChain.php
@@ -0,0 +1,44 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\Type\Loader;
+
+class TypeLoaderChain implements TypeLoaderInterface
+{
+    private $loaders = array();
+
+    public function addLoader(TypeLoaderInterface $loader)
+    {
+        $this->loaders[] = $loader;
+    }
+
+    public function getType($name)
+    {
+        foreach ($this->loaders as $loader) {
+            if ($loader->hasType($name)) {
+                return $loader->getType($name);
+            }
+        }
+
+        // TODO exception
+    }
+
+    public function hasType($name)
+    {
+        foreach ($this->loaders as $loader) {
+            if ($loader->hasType($name)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+}
\ No newline at end of file
diff --git a/src/Symfony/Component/Form/Type/Loader/TypeLoaderInterface.php b/src/Symfony/Component/Form/Type/Loader/TypeLoaderInterface.php
new file mode 100644
index 0000000000..fdc359385a
--- /dev/null
+++ b/src/Symfony/Component/Form/Type/Loader/TypeLoaderInterface.php
@@ -0,0 +1,19 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\Type\Loader;
+
+interface TypeLoaderInterface
+{
+    function getType($name);
+
+    function hasType($name);
+}
\ No newline at end of file
diff --git a/src/Symfony/Component/Form/Type/LocaleType.php b/src/Symfony/Component/Form/Type/LocaleType.php
new file mode 100644
index 0000000000..05c6aa7794
--- /dev/null
+++ b/src/Symfony/Component/Form/Type/LocaleType.php
@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\Type;
+
+use Symfony\Component\Locale\Locale;
+
+class LocaleType extends AbstractType
+{
+    public function getDefaultOptions(array $options)
+    {
+        return array(
+            'choices' => Locale::getDisplayLocales(\Locale::getDefault()),
+        );
+    }
+
+    public function getParent(array $options)
+    {
+        return 'choice';
+    }
+
+    public function getName()
+    {
+        return 'locale';
+    }
+}
\ No newline at end of file
diff --git a/src/Symfony/Component/Form/Type/MoneyType.php b/src/Symfony/Component/Form/Type/MoneyType.php
new file mode 100644
index 0000000000..18d9fc9da3
--- /dev/null
+++ b/src/Symfony/Component/Form/Type/MoneyType.php
@@ -0,0 +1,93 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\Type;
+
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Form\FormBuilder;
+use Symfony\Component\Form\DataTransformer\MoneyToLocalizedStringTransformer;
+use Symfony\Component\Form\FormView;
+
+class MoneyType extends AbstractType
+{
+    private static $patterns = array();
+
+    public function buildForm(FormBuilder $builder, array $options)
+    {
+        $builder->appendClientTransformer(new MoneyToLocalizedStringTransformer($options['precision'], $options['grouping'], null, $options['divisor']))
+            ->setAttribute('currency', $options['currency']);
+    }
+
+    public function buildView(FormView $view, FormInterface $form)
+    {
+        $view->set('money_pattern', self::getPattern($form->getAttribute('currency')));
+    }
+
+    public function getDefaultOptions(array $options)
+    {
+        return array(
+            'precision' => 2,
+            'grouping' => false,
+            'divisor' => 1,
+            'currency' => 'EUR',
+        );
+    }
+
+    public function getParent(array $options)
+    {
+        return 'field';
+    }
+
+    public function getName()
+    {
+        return 'money';
+    }
+
+    /**
+     * Returns the pattern for this locale
+     *
+     * The pattern contains the placeholder "{{ widget }}" where the HTML tag should
+     * be inserted
+     */
+    private static function getPattern($currency)
+    {
+        if (!$currency) {
+            return '{{ widget }}';
+        }
+
+        if (!isset(self::$patterns[\Locale::getDefault()])) {
+            self::$patterns[\Locale::getDefault()] = array();
+        }
+
+        if (!isset(self::$patterns[\Locale::getDefault()][$currency])) {
+            $format = new \NumberFormatter(\Locale::getDefault(), \NumberFormatter::CURRENCY);
+            $pattern = $format->formatCurrency('123', $currency);
+
+            // the spacings between currency symbol and number are ignored, because
+            // a single space leads to better readability in combination with input
+            // fields
+
+            // the regex also considers non-break spaces (0xC2 or 0xA0 in UTF-8)
+
+            preg_match('/^([^\s\xc2\xa0]*)[\s\xc2\xa0]*123[,.]00[\s\xc2\xa0]*([^\s\xc2\xa0]*)$/', $pattern, $matches);
+
+            if (!empty($matches[1])) {
+                self::$patterns[\Locale::getDefault()] = $matches[1].' {{ widget }}';
+            } else if (!empty($matches[2])) {
+                self::$patterns[\Locale::getDefault()] = '{{ widget }} '.$matches[2];
+            } else {
+                self::$patterns[\Locale::getDefault()] = '{{ widget }}';
+            }
+        }
+
+        return self::$patterns[\Locale::getDefault()];
+    }
+}
diff --git a/src/Symfony/Component/Form/Type/NumberType.php b/src/Symfony/Component/Form/Type/NumberType.php
new file mode 100644
index 0000000000..b14a18b63b
--- /dev/null
+++ b/src/Symfony/Component/Form/Type/NumberType.php
@@ -0,0 +1,43 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\Type;
+
+use Symfony\Component\Form\FormBuilder;
+use Symfony\Component\Form\DataTransformer\NumberToLocalizedStringTransformer;
+
+class NumberType extends AbstractType
+{
+    public function buildForm(FormBuilder $builder, array $options)
+    {
+        $builder->appendClientTransformer(new NumberToLocalizedStringTransformer($options['precision'], $options['grouping'], $options['rounding_mode']));
+    }
+
+    public function getDefaultOptions(array $options)
+    {
+        return array(
+            // default precision is locale specific (usually around 3)
+            'precision' => null,
+            'grouping' => false,
+            'rounding_mode' => NumberToLocalizedStringTransformer::ROUND_HALFUP,
+        );
+    }
+
+    public function getParent(array $options)
+    {
+        return 'field';
+    }
+
+    public function getName()
+    {
+        return 'number';
+    }
+}
\ No newline at end of file
diff --git a/src/Symfony/Component/Form/Type/PasswordType.php b/src/Symfony/Component/Form/Type/PasswordType.php
new file mode 100644
index 0000000000..f108667f8d
--- /dev/null
+++ b/src/Symfony/Component/Form/Type/PasswordType.php
@@ -0,0 +1,48 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\Type;
+
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Form\FormBuilder;
+use Symfony\Component\Form\FormView;
+
+class PasswordType extends AbstractType
+{
+    public function buildForm(FormBuilder $builder, array $options)
+    {
+        $builder->setAttribute('always_empty', $options['always_empty']);
+    }
+
+    public function buildView(FormView $view, FormInterface $form)
+    {
+        if ($form->getAttribute('always_empty') || !$form->isBound()) {
+            $view->set('value', '');
+        }
+    }
+
+    public function getDefaultOptions(array $options)
+    {
+        return array(
+            'always_empty' => true,
+        );
+    }
+
+    public function getParent(array $options)
+    {
+        return 'text';
+    }
+
+    public function getName()
+    {
+        return 'password';
+    }
+}
diff --git a/src/Symfony/Component/Form/Type/PercentType.php b/src/Symfony/Component/Form/Type/PercentType.php
new file mode 100644
index 0000000000..313c6bf501
--- /dev/null
+++ b/src/Symfony/Component/Form/Type/PercentType.php
@@ -0,0 +1,41 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\Type;
+
+use Symfony\Component\Form\FormBuilder;
+use Symfony\Component\Form\DataTransformer\PercentToLocalizedStringTransformer;
+
+class PercentType extends AbstractType
+{
+    public function buildForm(FormBuilder $builder, array $options)
+    {
+        $builder->appendClientTransformer(new PercentToLocalizedStringTransformer($options['precision'], $options['type']));
+    }
+
+    public function getDefaultOptions(array $options)
+    {
+        return array(
+            'precision' => 0,
+            'type' => 'fractional',
+        );
+    }
+
+    public function getParent(array $options)
+    {
+        return 'field';
+    }
+
+    public function getName()
+    {
+        return 'percent';
+    }
+}
\ No newline at end of file
diff --git a/src/Symfony/Component/Form/Type/RadioType.php b/src/Symfony/Component/Form/Type/RadioType.php
new file mode 100644
index 0000000000..9e62f0348f
--- /dev/null
+++ b/src/Symfony/Component/Form/Type/RadioType.php
@@ -0,0 +1,53 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\Type;
+
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Form\FormBuilder;
+use Symfony\Component\Form\DataTransformer\BooleanToStringTransformer;
+use Symfony\Component\Form\FormView;
+
+class RadioType extends AbstractType
+{
+    public function buildForm(FormBuilder $builder, array $options)
+    {
+        $builder->appendClientTransformer(new BooleanToStringTransformer())
+            ->setAttribute('value', $options['value']);
+    }
+
+    public function buildView(FormView $view, FormInterface $form)
+    {
+        $view->set('value', $form->getAttribute('value'));
+        $view->set('checked', (bool)$form->getData());
+
+        if ($view->hasParent()) {
+            $view->set('name', $view->getParent()->get('name'));
+        }
+    }
+
+    public function getDefaultOptions(array $options)
+    {
+        return array(
+            'value' => null,
+        );
+    }
+
+    public function getParent(array $options)
+    {
+        return 'field';
+    }
+
+    public function getName()
+    {
+        return 'radio';
+    }
+}
diff --git a/src/Symfony/Component/Form/Type/RepeatedType.php b/src/Symfony/Component/Form/Type/RepeatedType.php
new file mode 100644
index 0000000000..3af77112a7
--- /dev/null
+++ b/src/Symfony/Component/Form/Type/RepeatedType.php
@@ -0,0 +1,45 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\Type;
+
+use Symfony\Component\Form\FormBuilder;
+use Symfony\Component\Form\DataTransformer\ValueToDuplicatesTransformer;
+
+class RepeatedType extends AbstractType
+{
+    public function buildForm(FormBuilder $builder, array $options)
+    {
+        $builder->appendClientTransformer(new ValueToDuplicatesTransformer(array(
+                $options['first_name'],
+                $options['second_name'],
+            )))
+            ->add($options['first_name'], $options['type'], $options['options'])
+            ->add($options['second_name'], $options['type'], $options['options']);
+    }
+
+    public function getDefaultOptions(array $options)
+    {
+        return array(
+            'type' => 'text',
+            'options' => array(),
+            'first_name' => 'first',
+            'second_name' => 'second',
+            'csrf_protection' => false,
+            'error_bubbling' => false,
+        );
+    }
+
+    public function getName()
+    {
+        return 'repeated';
+    }
+}
\ No newline at end of file
diff --git a/src/Symfony/Component/Form/Type/TextType.php b/src/Symfony/Component/Form/Type/TextType.php
new file mode 100644
index 0000000000..a7401fced6
--- /dev/null
+++ b/src/Symfony/Component/Form/Type/TextType.php
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\Type;
+
+use Symfony\Component\Form\FormBuilder;
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Form\FormView;
+
+class TextType extends AbstractType
+{
+    public function getParent(array $options)
+    {
+        return 'field';
+    }
+
+    public function getName()
+    {
+        return 'text';
+    }
+}
diff --git a/src/Symfony/Component/Form/Type/TextareaType.php b/src/Symfony/Component/Form/Type/TextareaType.php
new file mode 100644
index 0000000000..6968bb3a9b
--- /dev/null
+++ b/src/Symfony/Component/Form/Type/TextareaType.php
@@ -0,0 +1,27 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\Type;
+
+use Symfony\Component\Form\FormBuilder;
+
+class TextareaType extends AbstractType
+{
+    public function getParent(array $options)
+    {
+        return 'field';
+    }
+
+    public function getName()
+    {
+        return 'textarea';
+    }
+}
\ No newline at end of file
diff --git a/src/Symfony/Component/Form/Type/TimeType.php b/src/Symfony/Component/Form/Type/TimeType.php
new file mode 100644
index 0000000000..9a5ff26a4a
--- /dev/null
+++ b/src/Symfony/Component/Form/Type/TimeType.php
@@ -0,0 +1,103 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\Type;
+
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Form\FormBuilder;
+use Symfony\Component\Form\ChoiceList\PaddedChoiceList;
+use Symfony\Component\Form\DataTransformer\ReversedTransformer;
+use Symfony\Component\Form\DataTransformer\DateTimeToStringTransformer;
+use Symfony\Component\Form\DataTransformer\DateTimeToTimestampTransformer;
+use Symfony\Component\Form\DataTransformer\DateTimeToArrayTransformer;
+use Symfony\Component\Form\FormView;
+
+class TimeType extends AbstractType
+{
+    public function buildForm(FormBuilder $builder, array $options)
+    {
+        $hourOptions = $minuteOptions = $secondOptions = array();
+        $child = $options['widget'] === 'text' ? 'text' : 'choice';
+        $parts = array('hour', 'minute');
+
+        if ($options['widget'] === 'choice') {
+            $hourOptions['choice_list'] =  new PaddedChoiceList(
+                $options['hours'], 2, '0', STR_PAD_LEFT
+            );
+            $minuteOptions['choice_list'] = new PaddedChoiceList(
+                $options['minutes'], 2, '0', STR_PAD_LEFT
+            );
+
+            if ($options['with_seconds']) {
+                $secondOptions['choice_list'] = new PaddedChoiceList(
+                    $options['seconds'], 2, '0', STR_PAD_LEFT
+                );
+            }
+        }
+
+        $builder->add('hour', $options['widget'], $hourOptions)
+            ->add('minute', $options['widget'], $minuteOptions);
+
+        if ($options['with_seconds']) {
+            $parts[] = 'second';
+            $builder->add('second', $options['widget'], $secondOptions);
+        }
+
+        if ($options['input'] === 'string') {
+            $builder->appendNormTransformer(new ReversedTransformer(
+                new DateTimeToStringTransformer($options['data_timezone'], $options['data_timezone'], 'H:i:s')
+            ));
+        } else if ($options['input'] === 'timestamp') {
+            $builder->appendNormTransformer(new ReversedTransformer(
+                new DateTimeToTimestampTransformer($options['data_timezone'], $options['data_timezone'])
+            ));
+        } else if ($options['input'] === 'array') {
+            $builder->appendNormTransformer(new ReversedTransformer(
+                new DateTimeToArrayTransformer($options['data_timezone'], $options['data_timezone'], $parts)
+            ));
+        }
+
+        $builder
+            ->appendClientTransformer(new DateTimeToArrayTransformer($options['data_timezone'], $options['user_timezone'], $parts, $options['widget'] === 'text'))
+            ->setAttribute('widget', $options['widget'])
+            ->setAttribute('with_seconds', $options['with_seconds']);
+    }
+
+    public function buildView(FormView $view, FormInterface $form)
+    {
+        $view->set('widget', $form->getAttribute('widget'));
+        $view->set('with_seconds', $form->getAttribute('with_seconds'));
+    }
+
+    public function getDefaultOptions(array $options)
+    {
+        return array(
+            'hours' => range(0, 23),
+            'minutes' => range(0, 59),
+            'seconds' => range(0, 59),
+            'widget' => 'choice',
+            'input' => 'datetime',
+            'with_seconds' => false,
+            'pattern' => null,
+            'data_timezone' => null,
+            'user_timezone' => null,
+            'csrf_protection' => false,
+            // Don't modify \DateTime classes by reference, we treat
+            // them like immutable value objects
+            'by_reference' => false,
+        );
+    }
+
+    public function getName()
+    {
+        return 'time';
+    }
+}
diff --git a/src/Symfony/Component/Form/Type/TimezoneType.php b/src/Symfony/Component/Form/Type/TimezoneType.php
new file mode 100644
index 0000000000..5e0649ba44
--- /dev/null
+++ b/src/Symfony/Component/Form/Type/TimezoneType.php
@@ -0,0 +1,35 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\Type;
+
+use Symfony\Component\Form\FormBuilder;
+use Symfony\Component\Form\ChoiceList\TimezoneChoiceList;
+
+class TimezoneType extends AbstractType
+{
+    public function getDefaultOptions(array $options)
+    {
+        return array(
+            'choice_list' => new TimezoneChoiceList(),
+        );
+    }
+
+    public function getParent(array $options)
+    {
+        return 'choice';
+    }
+
+    public function getName()
+    {
+        return 'timezone';
+    }
+}
\ No newline at end of file
diff --git a/src/Symfony/Component/Form/Type/UrlType.php b/src/Symfony/Component/Form/Type/UrlType.php
new file mode 100644
index 0000000000..26231a4754
--- /dev/null
+++ b/src/Symfony/Component/Form/Type/UrlType.php
@@ -0,0 +1,40 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\Type;
+
+use Symfony\Component\Form\FormBuilder;
+use Symfony\Component\Form\EventListener\FixUrlProtocolListener;
+
+class UrlType extends AbstractType
+{
+    public function buildForm(FormBuilder $builder, array $options)
+    {
+        $builder->addEventSubscriber(new FixUrlProtocolListener($options['default_protocol']));
+    }
+
+    public function getDefaultOptions(array $options)
+    {
+        return array(
+            'default_protocol' => 'http',
+        );
+    }
+
+    public function getParent(array $options)
+    {
+        return 'text';
+    }
+
+    public function getName()
+    {
+        return 'url';
+    }
+}
\ No newline at end of file
diff --git a/src/Symfony/Component/Form/UrlField.php b/src/Symfony/Component/Form/UrlField.php
deleted file mode 100644
index 9e93b4b8f5..0000000000
--- a/src/Symfony/Component/Form/UrlField.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Form;
-
-/**
- * Field for entering URLs.
- *
- * Available options:
- *
- *  * default_protocol:     If specified, {default_protocol}:// (e.g. http://)
- *                          will be prepended onto any input string that
- *                          doesn't begin with the protocol.
- *
- * @author Bernhard Schussek <bernhard.schussek@symfony.com>
- */
-class UrlField extends TextField
-{
-    /**
-     * {@inheritDoc}
-     */
-    protected function configure()
-    {
-        $this->addOption('default_protocol', 'http');
-
-        parent::configure();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function processData($data)
-    {
-        $protocol = $this->getOption('default_protocol');
-
-        if ($protocol && $data && !preg_match('~^\w+://~', $data)) {
-            $data = $protocol . '://' . $data;
-        }
-
-        return $data;
-    }
-}
diff --git a/src/Symfony/Component/Form/Util/FormUtil.php b/src/Symfony/Component/Form/Util/FormUtil.php
new file mode 100644
index 0000000000..620bdfb9a8
--- /dev/null
+++ b/src/Symfony/Component/Form/Util/FormUtil.php
@@ -0,0 +1,33 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\Util;
+
+abstract class FormUtil
+{
+    public static function toArrayKey($value)
+    {
+        if ((string)(int)$value === (string)$value) {
+            return (int)$value;
+        }
+
+        if (is_bool($value)) {
+            return (int)$value;
+        }
+
+        return (string)$value;
+    }
+
+    public static function toArrayKeys(array $array)
+    {
+        return array_map(array(__CLASS__, 'toArrayKey'), $array);
+    }
+}
\ No newline at end of file
diff --git a/src/Symfony/Component/Form/PropertyPath.php b/src/Symfony/Component/Form/Util/PropertyPath.php
similarity index 96%
rename from src/Symfony/Component/Form/PropertyPath.php
rename to src/Symfony/Component/Form/Util/PropertyPath.php
index d0eba381bc..bab7c67327 100644
--- a/src/Symfony/Component/Form/PropertyPath.php
+++ b/src/Symfony/Component/Form/Util/PropertyPath.php
@@ -9,11 +9,12 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Form;
+namespace Symfony\Component\Form\Util;
 
 use Symfony\Component\Form\Exception\InvalidPropertyPathException;
 use Symfony\Component\Form\Exception\InvalidPropertyException;
 use Symfony\Component\Form\Exception\PropertyAccessDeniedException;
+use Symfony\Component\Form\Exception\UnexpectedTypeException;
 
 /**
  * Allows easy traversing of a property path
@@ -58,12 +59,12 @@ class PropertyPath implements \IteratorAggregate
             throw new InvalidPropertyPathException('The property path must not be empty');
         }
 
-        $this->string = $propertyPath;
+        $this->string = (string)$propertyPath;
         $position = 0;
         $remaining = $propertyPath;
 
         // first element is evaluated differently - no leading dot for properties
-        $pattern = '/^((\w+)|\[([^\]]+)\])(.*)/';
+        $pattern = '/^(([^\.\[]+)|\[([^\]]+)\])(.*)/';
 
         while (preg_match($pattern, $remaining, $matches)) {
             if ($matches[2] !== '') {
@@ -228,6 +229,10 @@ class PropertyPath implements \IteratorAggregate
      */
     protected function readPropertyPath(&$objectOrArray, $currentIndex)
     {
+        if (!is_object($objectOrArray) && !is_array($objectOrArray)) {
+            throw new UnexpectedTypeException($objectOrArray, 'object or array');
+        }
+
         $property = $this->elements[$currentIndex];
 
         if (is_object($objectOrArray)) {
@@ -261,6 +266,10 @@ class PropertyPath implements \IteratorAggregate
      */
     protected function writePropertyPath(&$objectOrArray, $currentIndex, $value)
     {
+        if (!is_object($objectOrArray) && !is_array($objectOrArray)) {
+            throw new UnexpectedTypeException($objectOrArray, 'object or array');
+        }
+
         $property = $this->elements[$currentIndex];
 
         if ($currentIndex + 1 < $this->length) {
diff --git a/src/Symfony/Component/Form/PropertyPathIterator.php b/src/Symfony/Component/Form/Util/PropertyPathIterator.php
similarity index 97%
rename from src/Symfony/Component/Form/PropertyPathIterator.php
rename to src/Symfony/Component/Form/Util/PropertyPathIterator.php
index d92677757b..e7fba675f7 100644
--- a/src/Symfony/Component/Form/PropertyPathIterator.php
+++ b/src/Symfony/Component/Form/Util/PropertyPathIterator.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Form;
+namespace Symfony\Component\Form\Util;
 
 /**
  * Traverses a property path and provides additional methods to find out
diff --git a/src/Symfony/Component/Form/RecursiveFieldIterator.php b/src/Symfony/Component/Form/Util/VirtualFormAwareIterator.php
similarity index 60%
rename from src/Symfony/Component/Form/RecursiveFieldIterator.php
rename to src/Symfony/Component/Form/Util/VirtualFormAwareIterator.php
index 29dc9427bd..fe43d1984b 100644
--- a/src/Symfony/Component/Form/RecursiveFieldIterator.php
+++ b/src/Symfony/Component/Form/Util/VirtualFormAwareIterator.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Form;
+namespace Symfony\Component\Form\Util;
 
 /**
  * Iterator that traverses fields of a field group
@@ -19,21 +19,16 @@ namespace Symfony\Component\Form;
  *
  * @author Bernhard Schussek <bernhard.schussek@symfony.com>
  */
-class RecursiveFieldIterator extends \IteratorIterator implements \RecursiveIterator
+class VirtualFormAwareIterator extends \ArrayIterator implements \RecursiveIterator
 {
-    public function __construct(FormInterface $group)
-    {
-        parent::__construct($group);
-    }
-
     public function getChildren()
     {
-        return new self($this->current());
+        return new self($this->current()->getChildren());
     }
 
     public function hasChildren()
     {
-        return $this->current() instanceof FormInterface
-                && $this->current()->isVirtual();
+        return $this->current()->hasAttribute('virtual')
+                && $this->current()->getAttribute('virtual');
     }
 }
diff --git a/src/Symfony/Component/Form/Validator/CallbackValidator.php b/src/Symfony/Component/Form/Validator/CallbackValidator.php
new file mode 100644
index 0000000000..57efac9794
--- /dev/null
+++ b/src/Symfony/Component/Form/Validator/CallbackValidator.php
@@ -0,0 +1,31 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\Validator;
+
+use Symfony\Component\Form\FormInterface;
+
+class CallbackValidator implements FormValidatorInterface
+{
+    private $callback;
+
+    public function __construct($callback)
+    {
+        // TODO validate callback
+
+        $this->callback = $callback;
+    }
+
+    public function validate(FormInterface $form)
+    {
+        return call_user_func($this->callback, $form);
+    }
+}
\ No newline at end of file
diff --git a/src/Symfony/Component/Form/Validator/DefaultValidator.php b/src/Symfony/Component/Form/Validator/DefaultValidator.php
new file mode 100644
index 0000000000..73db046771
--- /dev/null
+++ b/src/Symfony/Component/Form/Validator/DefaultValidator.php
@@ -0,0 +1,48 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\Validator;
+
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Form\FormError;
+
+class DefaultValidator implements FormValidatorInterface
+{
+    public function validate(FormInterface $form)
+    {
+        if (!$form->isSynchronized()) {
+            $form->addError(new FormError('The value is invalid'));
+        }
+
+        if (count($form->getExtraData()) > 0) {
+            $form->addError(new FormError('This form should not contain extra fields'));
+        }
+
+        if ($form->isRoot() && isset($_SERVER['CONTENT_LENGTH'])) {
+            $length = (int) $_SERVER['CONTENT_LENGTH'];
+            $max = trim(ini_get('post_max_size'));
+
+            switch (strtolower(substr($max, -1))) {
+                // The 'G' modifier is available since PHP 5.1.0
+                case 'g':
+                    $max *= 1024;
+                case 'm':
+                    $max *= 1024;
+                case 'k':
+                    $max *= 1024;
+            }
+
+            if ($length > $max) {
+                $form->addError(new FormError('The uploaded file was too large. Please try to upload a smaller file'));
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Symfony/Component/Form/Validator/DelegatingValidator.php b/src/Symfony/Component/Form/Validator/DelegatingValidator.php
new file mode 100644
index 0000000000..7cc3e3921a
--- /dev/null
+++ b/src/Symfony/Component/Form/Validator/DelegatingValidator.php
@@ -0,0 +1,239 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\Validator;
+
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Form\FormError;
+use Symfony\Component\Form\Util\VirtualFormAwareIterator;
+use Symfony\Component\Form\Exception\FormException;
+use Symfony\Component\Validator\ValidatorInterface;
+use Symfony\Component\Validator\ExecutionContext;
+
+class DelegatingValidator implements FormValidatorInterface
+{
+    private $validator;
+
+    public function __construct(ValidatorInterface $validator)
+    {
+        $this->validator = $validator;
+    }
+
+    /**
+     * Validates the form and its domain object
+     */
+    public function validate(FormInterface $form)
+    {
+        if ($form->isRoot()) {
+            $mapping = array();
+            $forms = array();
+
+            $this->buildFormPathMapping($form, $mapping);
+            $this->buildDataPathMapping($form, $mapping);
+            $this->buildNamePathMapping($form, $forms);
+            $this->resolveMappingPlaceholders($mapping, $forms);
+
+            // Validate the form in group "Default"
+            // Validation of the data in the custom group is done by validateData(),
+            // which is constrained by the Execute constraint
+            if ($form->hasAttribute('validation_constraint')) {
+                $violations = $this->validator->validateValue(
+                    $form->getData(),
+                    $form->getAttribute('validation_constraint'),
+                    self::getFormValidationGroups($form)
+                );
+            } else {
+                $violations = $this->validator->validate($form);
+            }
+
+            if ($violations) {
+                foreach ($violations as $violation) {
+                    $propertyPath = $violation->getPropertyPath();
+                    $template = $violation->getMessageTemplate();
+                    $parameters = $violation->getMessageParameters();
+                    $error = new FormError($template, $parameters);
+
+                    foreach ($mapping as $mappedPath => $child) {
+                        if (preg_match($mappedPath, $propertyPath)) {
+                            $child->addError($error);
+                            continue 2;
+                        }
+                    }
+
+                    $form->addError($error);
+                }
+            }
+        }
+    }
+
+    private function buildFormPathMapping(FormInterface $form, array &$mapping, $formPath = '', $namePath = '')
+    {
+        if ($formPath) {
+            $formPath .= '.';
+        }
+
+        if ($namePath) {
+            $namePath .= '.';
+        }
+
+        foreach ($form->getAttribute('error_mapping') as $nestedDataPath => $nestedNamePath)
+        {
+            $mapping['/^'.preg_quote($formPath . 'data.' . $nestedDataPath).'(?!\w)/'] = $namePath . $nestedNamePath;
+        }
+
+        $iterator = new VirtualFormAwareIterator($form->getChildren());
+        $iterator = new \RecursiveIteratorIterator($iterator);
+
+        foreach ($iterator as $child) {
+            $path = (string)$child->getAttribute('property_path');
+            $parts = explode('.', $path, 2);
+
+            $nestedNamePath = $namePath . $child->getName();
+            $nestedFormPath = $formPath . 'children[' . $parts[0] . ']';
+
+            if (isset($parts[1])) {
+                $nestedFormPath .= '.data.' . $parts[1];
+            }
+
+            $nestedDataPath = $formPath . 'data.' . $path;
+
+            if ($child->hasChildren()) {
+                $this->buildFormPathMapping($child, $mapping, $nestedFormPath, $nestedNamePath);
+                $this->buildDataPathMapping($child, $mapping, $nestedDataPath, $nestedNamePath);
+            }
+
+            $mapping['/^'.preg_quote($nestedFormPath, '/').'(?!\w)/'] = $child;
+            $mapping['/^'.preg_quote($nestedDataPath, '/').'(?!\w)/'] = $child;
+        }
+    }
+
+    private function buildDataPathMapping(FormInterface $form, array &$mapping, $dataPath = 'data', $namePath = '')
+    {
+        if ($namePath) {
+            $namePath .= '.';
+        }
+
+        foreach ($form->getAttribute('error_mapping') as $nestedDataPath => $nestedNamePath)
+        {
+            $mapping['/^'.preg_quote($dataPath . '.' . $nestedDataPath).'(?!\w)/'] = $namePath . $nestedNamePath;
+        }
+
+        $iterator = new VirtualFormAwareIterator($form->getChildren());
+        $iterator = new \RecursiveIteratorIterator($iterator);
+
+        foreach ($iterator as $child) {
+            $path = (string)$child->getAttribute('property_path');
+
+            $nestedNamePath = $namePath . $child->getName();
+            $nestedDataPath = $dataPath . '.' . $path;
+
+            if ($child->hasChildren()) {
+                $this->buildDataPathMapping($child, $mapping, $nestedDataPath, $nestedNamePath);
+            } else {
+                $mapping['/^'.preg_quote($nestedDataPath, '/').'(?!\w)/'] = $child;
+            }
+        }
+    }
+
+    private function buildNamePathMapping(FormInterface $form, array &$forms, $namePath = '')
+    {
+        if ($namePath) {
+            $namePath .= '.';
+        }
+
+        $iterator = new VirtualFormAwareIterator($form->getChildren());
+        $iterator = new \RecursiveIteratorIterator($iterator);
+
+        foreach ($iterator as $child) {
+            $path = (string)$child->getAttribute('property_path');
+
+            $nestedNamePath = $namePath . $child->getName();
+            $forms[$nestedNamePath] = $child;
+
+            if ($child->hasChildren()) {
+                $this->buildNamePathMapping($child, $forms, $nestedNamePath);
+            }
+
+        }
+    }
+
+    private function resolveMappingPlaceholders(array &$mapping, array $forms)
+    {
+        foreach ($mapping as $pattern => $form) {
+            if (is_string($form)) {
+                if (!isset($forms[$form])) {
+                    throw new FormException(sprintf('The child form with path "%s" does not exist', $form));
+                }
+
+                $mapping[$pattern] = $forms[$form];
+            }
+        }
+    }
+
+    /**
+     * Validates the data of a form
+     *
+     * This method is called automatically during the validation process.
+     *
+     * @param FormInterface $form        The validated form
+     * @param ExecutionContext $context  The current validation context
+     */
+    public static function validateFormData(FormInterface $form, ExecutionContext $context)
+    {
+        if (is_object($form->getData()) || is_array($form->getData())) {
+            $propertyPath = $context->getPropertyPath();
+            $graphWalker = $context->getGraphWalker();
+
+            // The Execute constraint is called on class level, so we need to
+            // set the property manually
+            $context->setCurrentProperty('data');
+
+            // Adjust the property path accordingly
+            if (!empty($propertyPath)) {
+                $propertyPath .= '.';
+            }
+
+            $propertyPath .= 'data';
+
+            foreach (self::getFormValidationGroups($form) as $group) {
+                $graphWalker->walkReference($form->getData(), $group, $propertyPath, true);
+            }
+        }
+    }
+
+    static protected function getFormValidationGroups(FormInterface $form)
+    {
+        $groups = null;
+
+        if ($form->hasAttribute('validation_groups')) {
+            $groups = $form->getAttribute('validation_groups');
+        }
+
+        $currentForm = $form;
+        while (!$groups && $currentForm->hasParent()) {
+            $currentForm = $currentForm->getParent();
+
+            if ($currentForm->hasAttribute('validation_groups')) {
+                $groups = $currentForm->getAttribute('validation_groups');
+            }
+        }
+
+        if (null === $groups) {
+            $groups = array('Default');
+        }
+
+        if (!is_array($groups)) {
+            $groups = array($groups);
+        }
+
+        return $groups;
+    }
+}
diff --git a/src/Symfony/Component/Form/Validator/FormValidatorInterface.php b/src/Symfony/Component/Form/Validator/FormValidatorInterface.php
new file mode 100644
index 0000000000..ab7ad6dc18
--- /dev/null
+++ b/src/Symfony/Component/Form/Validator/FormValidatorInterface.php
@@ -0,0 +1,19 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\Validator;
+
+use Symfony\Component\Form\FormInterface;
+
+interface FormValidatorInterface
+{
+    function validate(FormInterface $form);
+}
\ No newline at end of file
diff --git a/src/Symfony/Component/Form/ValueTransformer/BaseDateTimeTransformer.php b/src/Symfony/Component/Form/ValueTransformer/BaseDateTimeTransformer.php
deleted file mode 100644
index bc475f3394..0000000000
--- a/src/Symfony/Component/Form/ValueTransformer/BaseDateTimeTransformer.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Form\ValueTransformer;
-
-use Symfony\Component\Form\Configurable;
-
-abstract class BaseDateTimeTransformer extends Configurable implements ValueTransformerInterface
-{
-    const NONE   = 'none';
-    const FULL   = 'full';
-    const LONG   = 'long';
-    const MEDIUM = 'medium';
-    const SHORT  = 'short';
-
-    protected static $formats = array(
-        self::NONE,
-        self::FULL,
-        self::LONG,
-        self::MEDIUM,
-        self::SHORT,
-    );
-
-    /**
-     * Returns the appropriate IntLDateFormatter constant for the given format
-     *
-     * @param  string $format  One of "short", "medium", "long" and "full"
-     * @return integer
-     */
-    protected function getIntlFormatConstant($format)
-    {
-        switch ($format) {
-            case self::FULL:
-                return \IntlDateFormatter::FULL;
-            case self::LONG:
-                return \IntlDateFormatter::LONG;
-            case self::SHORT:
-                return \IntldateFormatter::SHORT;
-            case self::MEDIUM:
-                return \IntlDateFormatter::MEDIUM;
-            case self::NONE:
-            default:
-                return \IntlDateFormatter::NONE;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Symfony/Component/HttpFoundation/File/Exception/UnexpectedTypeException.php b/src/Symfony/Component/HttpFoundation/File/Exception/UnexpectedTypeException.php
new file mode 100644
index 0000000000..3e2f8267a6
--- /dev/null
+++ b/src/Symfony/Component/HttpFoundation/File/Exception/UnexpectedTypeException.php
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpFoundation\File\Exception;
+
+class UnexpectedTypeException extends FileException
+{
+    public function __construct($value, $expectedType)
+    {
+        parent::__construct(sprintf('Expected argument of type %s, %s given', $expectedType, is_object($value) ? get_class($value) : gettype($value)));
+    }
+}
\ No newline at end of file
diff --git a/src/Symfony/Component/Form/TextareaField.php b/src/Symfony/Component/HttpFoundation/File/Exception/UploadException.php
similarity index 67%
rename from src/Symfony/Component/Form/TextareaField.php
rename to src/Symfony/Component/HttpFoundation/File/Exception/UploadException.php
index 9ac0ea4002..694e864d1c 100644
--- a/src/Symfony/Component/Form/TextareaField.php
+++ b/src/Symfony/Component/HttpFoundation/File/Exception/UploadException.php
@@ -9,13 +9,13 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Form;
+namespace Symfony\Component\HttpFoundation\File\Exception;
 
 /**
- * A textarea field
+ * Thrown when an error occurred during file upload
  *
  * @author Bernhard Schussek <bernhard.schussek@symfony.com>
  */
-class TextareaField extends Field
+class UploadException extends FileException
 {
 }
diff --git a/src/Symfony/Component/HttpFoundation/File/SessionBasedTemporaryStorage.php b/src/Symfony/Component/HttpFoundation/File/SessionBasedTemporaryStorage.php
new file mode 100644
index 0000000000..a796c2f656
--- /dev/null
+++ b/src/Symfony/Component/HttpFoundation/File/SessionBasedTemporaryStorage.php
@@ -0,0 +1,36 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpFoundation\File;
+
+use Symfony\Component\HttpFoundation\Session;
+use Symfony\Component\HttpFoundation\File\Exception\FileException;
+use Symfony\Component\HttpFoundation\File\Exception\UnexpectedTypeException;
+
+/**
+ * @author Bernhard Schussek <bernhard.schussek@symfony-project.com>
+ */
+class SessionBasedTemporaryStorage extends TemporaryStorage
+{
+    public function __construct(Session $session, $secret, $nestingLevels = 3, $directory = null)
+    {
+        parent::__construct($secret, $nestingLevels, $directory);
+
+        $this->session = $session;
+    }
+
+    protected function generateHashInfo($token)
+    {
+        $this->session->start();
+
+        return $this->session->getId() . parent::generateHashInfo($token);
+    }
+}
\ No newline at end of file
diff --git a/src/Symfony/Component/HttpFoundation/File/TemporaryStorage.php b/src/Symfony/Component/HttpFoundation/File/TemporaryStorage.php
new file mode 100644
index 0000000000..b40f00b08f
--- /dev/null
+++ b/src/Symfony/Component/HttpFoundation/File/TemporaryStorage.php
@@ -0,0 +1,70 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpFoundation\File;
+
+use Symfony\Component\HttpFoundation\File\Exception\FileException;
+use Symfony\Component\HttpFoundation\File\Exception\UnexpectedTypeException;
+
+/**
+ * @author Bernhard Schussek <bernhard.schussek@symfony-project.com>
+ */
+class TemporaryStorage
+{
+    private $directory;
+
+    private $secret;
+
+    private $nestingLevels;
+
+    public function __construct($secret, $nestingLevels = 3, $directory = null)
+    {
+        if (empty($directory)) {
+            $directory = sys_get_temp_dir();
+        }
+
+        $this->directory = realpath($directory);
+        $this->secret = $secret;
+        $this->nestingLevels = $nestingLevels;
+    }
+
+    protected function generateHashInfo($token)
+    {
+        return $this->secret . $token;
+    }
+
+    protected function generateHash($token)
+    {
+        return md5($this->generateHashInfo($token));
+    }
+
+    public function getTempDir($token)
+    {
+        if (!is_string($token)) {
+            throw new UnexpectedTypeException($token, 'string');
+        }
+
+        $hash = $this->generateHash($token);
+
+        if (strlen($hash) < $this->nestingLevels) {
+            throw new FileException(sprintf(
+                    'For %s nesting levels the hash must have at least %s characters', $this->nestingLevels, $this->nestingLevels));
+        }
+
+        $directory = $this->directory;
+
+        for ($i = 0; $i < ($this->nestingLevels - 1); ++$i) {
+            $directory .= DIRECTORY_SEPARATOR . $hash{$i};
+        }
+
+        return $directory . DIRECTORY_SEPARATOR . substr($hash, $i);
+    }
+}
\ No newline at end of file
diff --git a/src/Symfony/Component/HttpFoundation/File/UploadedFile.php b/src/Symfony/Component/HttpFoundation/File/UploadedFile.php
index dedc9e26c7..3a3414f2c0 100644
--- a/src/Symfony/Component/HttpFoundation/File/UploadedFile.php
+++ b/src/Symfony/Component/HttpFoundation/File/UploadedFile.php
@@ -127,6 +127,48 @@ class UploadedFile extends File
         return $this->error;
     }
 
+    /**
+     * Returns whether the file was uploaded succesfully.
+     *
+     * @return Boolean  True if no error occurred during uploading
+     */
+    public function isValid()
+    {
+        return $this->error === UPLOAD_ERR_OK;
+    }
+
+    /**
+     * Returns true if the size of the uploaded file exceeds the
+     * upload_max_filesize directive in php.ini
+     *
+     * @return Boolean
+     */
+    protected function isIniSizeExceeded()
+    {
+        return $this->error === UPLOAD_ERR_INI_SIZE;
+    }
+
+    /**
+     * Returns true if the size of the uploaded file exceeds the
+     * MAX_FILE_SIZE directive specified in the HTML form
+     *
+     * @return Boolean
+     */
+    protected function isFormSizeExceeded()
+    {
+        return $this->error === UPLOAD_ERR_FORM_SIZE;
+    }
+
+    /**
+     * Returns true if the file was completely uploaded
+     *
+     * @return Boolean
+     */
+    protected function isUploadComplete()
+    {
+        return $this->error !== UPLOAD_ERR_PARTIAL;
+    }
+
     /**
      * @inheritDoc
      */
diff --git a/tests/Symfony/Tests/Component/Form/Fixtures/CompositeIdentEntity.php b/tests/Symfony/Tests/Bridge/Doctrine/Fixtures/CompositeIdentEntity.php
similarity index 86%
rename from tests/Symfony/Tests/Component/Form/Fixtures/CompositeIdentEntity.php
rename to tests/Symfony/Tests/Bridge/Doctrine/Fixtures/CompositeIdentEntity.php
index 483b7bed39..2d04235ed7 100644
--- a/tests/Symfony/Tests/Component/Form/Fixtures/CompositeIdentEntity.php
+++ b/tests/Symfony/Tests/Bridge/Doctrine/Fixtures/CompositeIdentEntity.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Tests\Component\Form\Fixtures;
+namespace Symfony\Tests\Bridge\Doctrine\Form\Fixtures;
 
 /** @Entity */
 class CompositeIdentEntity
diff --git a/tests/Symfony/Tests/Component/Form/Fixtures/SingleIdentEntity.php b/tests/Symfony/Tests/Bridge/Doctrine/Fixtures/SingleIdentEntity.php
similarity index 82%
rename from tests/Symfony/Tests/Component/Form/Fixtures/SingleIdentEntity.php
rename to tests/Symfony/Tests/Bridge/Doctrine/Fixtures/SingleIdentEntity.php
index 4eeda42782..8f5e9a57ca 100644
--- a/tests/Symfony/Tests/Component/Form/Fixtures/SingleIdentEntity.php
+++ b/tests/Symfony/Tests/Bridge/Doctrine/Fixtures/SingleIdentEntity.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Tests\Component\Form\Fixtures;
+namespace Symfony\Tests\Bridge\Doctrine\Form\Fixtures;
 
 /** @Entity */
 class SingleIdentEntity
diff --git a/tests/Symfony/Tests/Bridge/Doctrine/Form/ChoiceList/EntityChoiceListTest.php b/tests/Symfony/Tests/Bridge/Doctrine/Form/ChoiceList/EntityChoiceListTest.php
new file mode 100644
index 0000000000..b17d916e7e
--- /dev/null
+++ b/tests/Symfony/Tests/Bridge/Doctrine/Form/ChoiceList/EntityChoiceListTest.php
@@ -0,0 +1,60 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Tests\Bridge\Doctrine\Form\ChoiceList;
+
+require_once __DIR__.'/../DoctrineOrmTestCase.php';
+require_once __DIR__.'/../../Fixtures/SingleIdentEntity.php';
+
+use Symfony\Tests\Bridge\Doctrine\Form\DoctrineOrmTestCase;
+use Symfony\Tests\Bridge\Doctrine\Form\Fixtures\SingleIdentEntity;
+use Symfony\Bridge\Doctrine\Form\ChoiceList\EntityChoiceList;
+
+class EntityChoiceListTest extends DoctrineOrmTestCase
+{
+    const SINGLE_IDENT_CLASS = 'Symfony\Tests\Bridge\Doctrine\Form\Fixtures\SingleIdentEntity';
+
+    const COMPOSITE_IDENT_CLASS = 'Symfony\Tests\Bridge\Doctrine\Form\Fixtures\CompositeIdentEntity';
+
+    private $em;
+
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->em = $this->createTestEntityManager();
+    }
+
+    /**
+     * @expectedException Symfony\Component\Form\Exception\FormException
+     */
+    public function testChoicesMustBeManaged()
+    {
+        $entity1 = new SingleIdentEntity(1, 'Foo');
+        $entity2 = new SingleIdentEntity(2, 'Bar');
+
+        // no persist here!
+
+        $choiceList = new EntityChoiceList(
+            $this->em,
+            self::SINGLE_IDENT_CLASS,
+            'name',
+            null,
+            array(
+                $entity1,
+                $entity2,
+            )
+        );
+
+        // triggers loading -> exception
+        $choiceList->getChoices();
+    }
+}
\ No newline at end of file
diff --git a/tests/Symfony/Tests/Component/Form/DoctrineOrmTestCase.php b/tests/Symfony/Tests/Bridge/Doctrine/Form/DoctrineOrmTestCase.php
similarity index 76%
rename from tests/Symfony/Tests/Component/Form/DoctrineOrmTestCase.php
rename to tests/Symfony/Tests/Bridge/Doctrine/Form/DoctrineOrmTestCase.php
index 2cba83c518..35bc63a80f 100644
--- a/tests/Symfony/Tests/Component/Form/DoctrineOrmTestCase.php
+++ b/tests/Symfony/Tests/Bridge/Doctrine/Form/DoctrineOrmTestCase.php
@@ -9,18 +9,16 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Tests\Component\Form;
+namespace Symfony\Tests\Bridge\Doctrine\Form;
 
 use Doctrine\ORM\EntityManager;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
-use Symfony\Bundle\DoctrineBundle\DependencyInjection\DoctrineExtension;
-use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
 
-class DoctrineOrmTestCase extends \PHPUnit_Framework_TestCase
+abstract class DoctrineOrmTestCase extends \Symfony\Tests\Component\Form\Type\TestCase
 {
     protected function setUp()
     {
+        parent::setUp();
+
         if (!class_exists('Doctrine\\Common\\Version')) {
             $this->markTestSkipped('Doctrine is not available.');
         }
diff --git a/tests/Symfony/Tests/Component/Form/EntityChoiceFieldTest.php b/tests/Symfony/Tests/Bridge/Doctrine/Form/EntityTypeTest.php
similarity index 64%
rename from tests/Symfony/Tests/Component/Form/EntityChoiceFieldTest.php
rename to tests/Symfony/Tests/Bridge/Doctrine/Form/EntityTypeTest.php
index b6e64bd47b..bb1663af46 100644
--- a/tests/Symfony/Tests/Component/Form/EntityChoiceFieldTest.php
+++ b/tests/Symfony/Tests/Bridge/Doctrine/Form/EntityTypeTest.php
@@ -9,36 +9,34 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Tests\Component\Form;
+namespace Symfony\Tests\Bridge\Doctrine\Form;
 
 require_once __DIR__.'/DoctrineOrmTestCase.php';
-require_once __DIR__.'/Fixtures/SingleIdentEntity.php';
-require_once __DIR__.'/Fixtures/CompositeIdentEntity.php';
+require_once __DIR__.'/../Fixtures/SingleIdentEntity.php';
+require_once __DIR__.'/../Fixtures/CompositeIdentEntity.php';
 
-use Symfony\Component\Form\EntityChoiceField;
 use Symfony\Component\Form\Exception\UnexpectedTypeException;
-use Symfony\Tests\Component\Form\Fixtures\SingleIdentEntity;
-use Symfony\Tests\Component\Form\Fixtures\CompositeIdentEntity;
+use Symfony\Tests\Bridge\Doctrine\Form\Fixtures\SingleIdentEntity;
+use Symfony\Tests\Bridge\Doctrine\Form\Fixtures\CompositeIdentEntity;
+use Symfony\Bridge\Doctrine\Form\DoctrineTypeLoader;
 use Doctrine\ORM\Tools\SchemaTool;
+use Doctrine\ORM\EntityManager;
 use Doctrine\Common\Collections\ArrayCollection;
 
-class EntityChoiceFieldTest extends DoctrineOrmTestCase
+class EntityTypeTest extends DoctrineOrmTestCase
 {
-    const SINGLE_IDENT_CLASS = 'Symfony\Tests\Component\Form\Fixtures\SingleIdentEntity';
+    const SINGLE_IDENT_CLASS = 'Symfony\Tests\Bridge\Doctrine\Form\Fixtures\SingleIdentEntity';
 
-    const COMPOSITE_IDENT_CLASS = 'Symfony\Tests\Component\Form\Fixtures\CompositeIdentEntity';
+    const COMPOSITE_IDENT_CLASS = 'Symfony\Tests\Bridge\Doctrine\Form\Fixtures\CompositeIdentEntity';
 
-    /**
-     * @var EntityManager
-     */
     private $em;
 
     protected function setUp()
     {
-        parent::setUp();
-
         $this->em = $this->createTestEntityManager();
 
+        parent::setUp();
+
         $schemaTool = new SchemaTool($this->em);
         $classes = array(
             $this->em->getClassMetadata(self::SINGLE_IDENT_CLASS),
@@ -56,6 +54,14 @@ class EntityChoiceFieldTest extends DoctrineOrmTestCase
         }
     }
 
+    protected function getTypeLoaders()
+    {
+        $loaders = parent::getTypeLoaders();
+        $loaders[] = new DoctrineTypeLoader($this->em);
+
+        return $loaders;
+    }
+
     protected function persist(array $entities)
     {
         foreach ($entities as $entity) {
@@ -67,23 +73,6 @@ class EntityChoiceFieldTest extends DoctrineOrmTestCase
         // be managed!
     }
 
-    public function testNonRequiredContainsEmptyField()
-    {
-        $entity1 = new SingleIdentEntity(1, 'Foo');
-        $entity2 = new SingleIdentEntity(2, 'Bar');
-
-        $this->persist(array($entity1, $entity2));
-
-        $field = new EntityChoiceField('name', array(
-            'em' => $this->em,
-            'class' => self::SINGLE_IDENT_CLASS,
-            'required' => false,
-            'property' => 'name'
-        ));
-
-        $this->assertEquals(array('' => '', 1 => 'Foo', 2 => 'Bar'), $field->getOtherChoices());
-    }
-
 //    public function testSetDataToUninitializedEntityWithNonRequired()
 //    {
 //        $entity1 = new SingleIdentEntity(1, 'Foo');
@@ -91,23 +80,23 @@ class EntityChoiceFieldTest extends DoctrineOrmTestCase
 //
 //        $this->persist(array($entity1, $entity2));
 //
-//        $field = new EntityChoiceField('name', array(
+//        $field = $this->factory->create('entity', 'name', array(
 //            'em' => $this->em,
 //            'class' => self::SINGLE_IDENT_CLASS,
 //            'required' => false,
 //            'property' => 'name'
 //        ));
 //
-//        $this->assertEquals(array('' => '', 1 => 'Foo', 2 => 'Bar'), $field->getOtherChoices());
+//        $this->assertEquals(array('' => '', 1 => 'Foo', 2 => 'Bar'), $field->getRenderer()->getVar('choices'));
 //
 //    }
 
     /**
-     * @expectedException Symfony\Component\Form\Exception\InvalidOptionsException
+     * @expectedException Symfony\Component\Form\Exception\UnexpectedTypeException
      */
     public function testConfigureQueryBuilderWithNonQueryBuilderAndNonClosure()
     {
-        $field = new EntityChoiceField('name', array(
+        $field = $this->factory->create('entity', 'name', array(
             'em' => $this->em,
             'class' => self::SINGLE_IDENT_CLASS,
             'query_builder' => new \stdClass(),
@@ -115,11 +104,11 @@ class EntityChoiceFieldTest extends DoctrineOrmTestCase
     }
 
     /**
-     * @expectedException Symfony\Component\Form\Exception\InvalidOptionsException
+     * @expectedException Symfony\Component\Form\Exception\UnexpectedTypeException
      */
     public function testConfigureQueryBuilderWithClosureReturningNonQueryBuilder()
     {
-        $field = new EntityChoiceField('name', array(
+        $field = $this->factory->create('entity', 'name', array(
             'em' => $this->em,
             'class' => self::SINGLE_IDENT_CLASS,
             'query_builder' => function () {
@@ -127,31 +116,12 @@ class EntityChoiceFieldTest extends DoctrineOrmTestCase
             },
         ));
 
-        $field->submit('2');
+        $field->bind('2');
     }
 
-    /**
-     * @expectedException Symfony\Component\Form\Exception\FormException
-     */
-    public function testChoicesMustBeManaged()
+    public function testSetDataSingleNull()
     {
-        $entity1 = new SingleIdentEntity(1, 'Foo');
-        $entity2 = new SingleIdentEntity(2, 'Bar');
-
-        // no persist here!
-
-        $field = new EntityChoiceField('name', array(
-            'multiple' => false,
-            'em' => $this->em,
-            'class' => self::SINGLE_IDENT_CLASS,
-            'choices' => array($entity1, $entity2),
-            'property' => 'name',
-        ));
-    }
-
-    public function testSetDataSingle_null()
-    {
-        $field = new EntityChoiceField('name', array(
+        $field = $this->factory->create('entity', 'name', array(
             'multiple' => false,
             'em' => $this->em,
             'class' => self::SINGLE_IDENT_CLASS,
@@ -159,56 +129,86 @@ class EntityChoiceFieldTest extends DoctrineOrmTestCase
         $field->setData(null);
 
         $this->assertEquals(null, $field->getData());
-        $this->assertEquals('', $field->getDisplayedData());
+        $this->assertEquals('', $field->getClientData());
     }
 
-    public function testSetDataMultiple_null()
+    public function testSetDataMultipleExpandedNull()
     {
-        $field = new EntityChoiceField('name', array(
+        $field = $this->factory->create('entity', 'name', array(
             'multiple' => true,
+            'expanded' => true,
             'em' => $this->em,
             'class' => self::SINGLE_IDENT_CLASS,
         ));
         $field->setData(null);
 
         $this->assertEquals(null, $field->getData());
-        $this->assertEquals(array(), $field->getDisplayedData());
+        $this->assertEquals(array(), $field->getClientData());
     }
 
-    public function testSubmitSingle_null()
+    public function testSetDataMultipleNonExpandedNull()
     {
-        $field = new EntityChoiceField('name', array(
-            'multiple' => false,
+        $field = $this->factory->create('entity', 'name', array(
+            'multiple' => true,
+            'expanded' => false,
             'em' => $this->em,
             'class' => self::SINGLE_IDENT_CLASS,
         ));
-        $field->submit(null);
+        $field->setData(null);
 
         $this->assertEquals(null, $field->getData());
-        $this->assertEquals('', $field->getDisplayedData());
+        $this->assertEquals(array(), $field->getClientData());
     }
 
-    public function testSubmitMultiple_null()
+    public function testSubmitSingleExpandedNull()
     {
-        $field = new EntityChoiceField('name', array(
+        $field = $this->factory->create('entity', 'name', array(
+            'multiple' => false,
+            'expanded' => true,
+            'em' => $this->em,
+            'class' => self::SINGLE_IDENT_CLASS,
+        ));
+        $field->bind(null);
+
+        $this->assertEquals(null, $field->getData());
+        $this->assertEquals(array(), $field->getClientData());
+    }
+
+    public function testSubmitSingleNonExpandedNull()
+    {
+        $field = $this->factory->create('entity', 'name', array(
+            'multiple' => false,
+            'expanded' => false,
+            'em' => $this->em,
+            'class' => self::SINGLE_IDENT_CLASS,
+        ));
+        $field->bind(null);
+
+        $this->assertEquals(null, $field->getData());
+        $this->assertEquals('', $field->getClientData());
+    }
+
+    public function testSubmitMultipleNull()
+    {
+        $field = $this->factory->create('entity', 'name', array(
             'multiple' => true,
             'em' => $this->em,
             'class' => self::SINGLE_IDENT_CLASS,
         ));
-        $field->submit(null);
+        $field->bind(null);
 
         $this->assertEquals(new ArrayCollection(), $field->getData());
-        $this->assertEquals(array(), $field->getDisplayedData());
+        $this->assertEquals(array(), $field->getClientData());
     }
 
-    public function testSubmitSingleNonExpanded_singleIdentifier()
+    public function testSubmitSingleNonExpandedSingleIdentifier()
     {
         $entity1 = new SingleIdentEntity(1, 'Foo');
         $entity2 = new SingleIdentEntity(2, 'Bar');
 
         $this->persist(array($entity1, $entity2));
 
-        $field = new EntityChoiceField('name', array(
+        $field = $this->factory->create('entity', 'name', array(
             'multiple' => false,
             'expanded' => false,
             'em' => $this->em,
@@ -216,21 +216,21 @@ class EntityChoiceFieldTest extends DoctrineOrmTestCase
             'property' => 'name',
         ));
 
-        $field->submit('2');
+        $field->bind('2');
 
-        $this->assertTrue($field->isTransformationSuccessful());
+        $this->assertTrue($field->isSynchronized());
         $this->assertEquals($entity2, $field->getData());
-        $this->assertEquals(2, $field->getDisplayedData());
+        $this->assertEquals(2, $field->getClientData());
     }
 
-    public function testSubmitSingleNonExpanded_compositeIdentifier()
+    public function testSubmitSingleNonExpandedCompositeIdentifier()
     {
         $entity1 = new CompositeIdentEntity(10, 20, 'Foo');
         $entity2 = new CompositeIdentEntity(30, 40, 'Bar');
 
         $this->persist(array($entity1, $entity2));
 
-        $field = new EntityChoiceField('name', array(
+        $field = $this->factory->create('entity', 'name', array(
             'multiple' => false,
             'expanded' => false,
             'em' => $this->em,
@@ -239,14 +239,14 @@ class EntityChoiceFieldTest extends DoctrineOrmTestCase
         ));
 
         // the collection key is used here
-        $field->submit('1');
+        $field->bind('1');
 
-        $this->assertTrue($field->isTransformationSuccessful());
+        $this->assertTrue($field->isSynchronized());
         $this->assertEquals($entity2, $field->getData());
-        $this->assertEquals(1, $field->getDisplayedData());
+        $this->assertEquals(1, $field->getClientData());
     }
 
-    public function testSubmitMultipleNonExpanded_singleIdentifier()
+    public function testSubmitMultipleNonExpandedSingleIdentifier()
     {
         $entity1 = new SingleIdentEntity(1, 'Foo');
         $entity2 = new SingleIdentEntity(2, 'Bar');
@@ -254,7 +254,7 @@ class EntityChoiceFieldTest extends DoctrineOrmTestCase
 
         $this->persist(array($entity1, $entity2, $entity3));
 
-        $field = new EntityChoiceField('name', array(
+        $field = $this->factory->create('entity', 'name', array(
             'multiple' => true,
             'expanded' => false,
             'em' => $this->em,
@@ -262,16 +262,16 @@ class EntityChoiceFieldTest extends DoctrineOrmTestCase
             'property' => 'name',
         ));
 
-        $field->submit(array('1', '3'));
+        $field->bind(array('1', '3'));
 
         $expected = new ArrayCollection(array($entity1, $entity3));
 
-        $this->assertTrue($field->isTransformationSuccessful());
+        $this->assertTrue($field->isSynchronized());
         $this->assertEquals($expected, $field->getData());
-        $this->assertEquals(array(1, 3), $field->getDisplayedData());
+        $this->assertEquals(array(1, 3), $field->getClientData());
     }
 
-    public function testSubmitMultipleNonExpanded_singleIdentifier_existingData()
+    public function testSubmitMultipleNonExpandedSingleIdentifier_existingData()
     {
         $entity1 = new SingleIdentEntity(1, 'Foo');
         $entity2 = new SingleIdentEntity(2, 'Bar');
@@ -279,7 +279,7 @@ class EntityChoiceFieldTest extends DoctrineOrmTestCase
 
         $this->persist(array($entity1, $entity2, $entity3));
 
-        $field = new EntityChoiceField('name', array(
+        $field = $this->factory->create('entity', 'name', array(
             'multiple' => true,
             'expanded' => false,
             'em' => $this->em,
@@ -290,19 +290,19 @@ class EntityChoiceFieldTest extends DoctrineOrmTestCase
         $existing = new ArrayCollection(array($entity2));
 
         $field->setData($existing);
-        $field->submit(array('1', '3'));
+        $field->bind(array('1', '3'));
 
         // entry with index 0 was removed
         $expected = new ArrayCollection(array(1 => $entity1, 2 => $entity3));
 
-        $this->assertTrue($field->isTransformationSuccessful());
+        $this->assertTrue($field->isSynchronized());
         $this->assertEquals($expected, $field->getData());
         // same object still, useful if it is a PersistentCollection
         $this->assertSame($existing, $field->getData());
-        $this->assertEquals(array(1, 3), $field->getDisplayedData());
+        $this->assertEquals(array(1, 3), $field->getClientData());
     }
 
-    public function testSubmitMultipleNonExpanded_compositeIdentifier()
+    public function testSubmitMultipleNonExpandedCompositeIdentifier()
     {
         $entity1 = new CompositeIdentEntity(10, 20, 'Foo');
         $entity2 = new CompositeIdentEntity(30, 40, 'Bar');
@@ -310,7 +310,7 @@ class EntityChoiceFieldTest extends DoctrineOrmTestCase
 
         $this->persist(array($entity1, $entity2, $entity3));
 
-        $field = new EntityChoiceField('name', array(
+        $field = $this->factory->create('entity', 'name', array(
             'multiple' => true,
             'expanded' => false,
             'em' => $this->em,
@@ -319,16 +319,16 @@ class EntityChoiceFieldTest extends DoctrineOrmTestCase
         ));
 
         // because of the composite key collection keys are used
-        $field->submit(array('0', '2'));
+        $field->bind(array('0', '2'));
 
         $expected = new ArrayCollection(array($entity1, $entity3));
 
-        $this->assertTrue($field->isTransformationSuccessful());
+        $this->assertTrue($field->isSynchronized());
         $this->assertEquals($expected, $field->getData());
-        $this->assertEquals(array(0, 2), $field->getDisplayedData());
+        $this->assertEquals(array(0, 2), $field->getClientData());
     }
 
-    public function testSubmitMultipleNonExpanded_compositeIdentifier_existingData()
+    public function testSubmitMultipleNonExpandedCompositeIdentifier_existingData()
     {
         $entity1 = new CompositeIdentEntity(10, 20, 'Foo');
         $entity2 = new CompositeIdentEntity(30, 40, 'Bar');
@@ -336,7 +336,7 @@ class EntityChoiceFieldTest extends DoctrineOrmTestCase
 
         $this->persist(array($entity1, $entity2, $entity3));
 
-        $field = new EntityChoiceField('name', array(
+        $field = $this->factory->create('entity', 'name', array(
             'multiple' => true,
             'expanded' => false,
             'em' => $this->em,
@@ -344,19 +344,19 @@ class EntityChoiceFieldTest extends DoctrineOrmTestCase
             'property' => 'name',
         ));
 
-        $existing = new ArrayCollection(array($entity2));
+        $existing = new ArrayCollection(array(0 => $entity2));
 
         $field->setData($existing);
-        $field->submit(array('0', '2'));
+        $field->bind(array('0', '2'));
 
         // entry with index 0 was removed
         $expected = new ArrayCollection(array(1 => $entity1, 2 => $entity3));
 
-        $this->assertTrue($field->isTransformationSuccessful());
+        $this->assertTrue($field->isSynchronized());
         $this->assertEquals($expected, $field->getData());
         // same object still, useful if it is a PersistentCollection
         $this->assertSame($existing, $field->getData());
-        $this->assertEquals(array(0, 2), $field->getDisplayedData());
+        $this->assertEquals(array(0, 2), $field->getClientData());
     }
 
     public function testSubmitSingleExpanded()
@@ -366,7 +366,7 @@ class EntityChoiceFieldTest extends DoctrineOrmTestCase
 
         $this->persist(array($entity1, $entity2));
 
-        $field = new EntityChoiceField('name', array(
+        $field = $this->factory->create('entity', 'name', array(
             'multiple' => false,
             'expanded' => true,
             'em' => $this->em,
@@ -374,15 +374,14 @@ class EntityChoiceFieldTest extends DoctrineOrmTestCase
             'property' => 'name',
         ));
 
-        $field->submit('2');
+        $field->bind('2');
 
-        $this->assertTrue($field->isTransformationSuccessful());
+        $this->assertTrue($field->isSynchronized());
         $this->assertEquals($entity2, $field->getData());
         $this->assertSame(false, $field['1']->getData());
         $this->assertSame(true, $field['2']->getData());
-        $this->assertSame('', $field['1']->getDisplayedData());
-        $this->assertSame('1', $field['2']->getDisplayedData());
-        $this->assertSame(array('1' => '', '2' => '1'), $field->getDisplayedData());
+        $this->assertSame('', $field['1']->getClientData());
+        $this->assertSame('1', $field['2']->getClientData());
     }
 
     public function testSubmitMultipleExpanded()
@@ -393,7 +392,7 @@ class EntityChoiceFieldTest extends DoctrineOrmTestCase
 
         $this->persist(array($entity1, $entity2, $entity3));
 
-        $field = new EntityChoiceField('name', array(
+        $field = $this->factory->create('entity', 'name', array(
             'multiple' => true,
             'expanded' => true,
             'em' => $this->em,
@@ -401,30 +400,31 @@ class EntityChoiceFieldTest extends DoctrineOrmTestCase
             'property' => 'name',
         ));
 
-        $field->submit(array('1' => '1', '3' => '3'));
+        $field->bind(array('1' => '1', '3' => '3'));
 
         $expected = new ArrayCollection(array($entity1, $entity3));
 
-        $this->assertTrue($field->isTransformationSuccessful());
+        $this->assertTrue($field->isSynchronized());
         $this->assertEquals($expected, $field->getData());
         $this->assertSame(true, $field['1']->getData());
         $this->assertSame(false, $field['2']->getData());
         $this->assertSame(true, $field['3']->getData());
-        $this->assertSame('1', $field['1']->getDisplayedData());
-        $this->assertSame('', $field['2']->getDisplayedData());
-        $this->assertSame('1', $field['3']->getDisplayedData());
-        $this->assertSame(array('1' => '1', '2' => '', '3' => '1'), $field->getDisplayedData());
+        $this->assertSame('1', $field['1']->getClientData());
+        $this->assertSame('', $field['2']->getClientData());
+        $this->assertSame('1', $field['3']->getClientData());
     }
 
     public function testOverrideChoices()
     {
+        $this->markTestSkipped('Fix me');
+
         $entity1 = new SingleIdentEntity(1, 'Foo');
         $entity2 = new SingleIdentEntity(2, 'Bar');
         $entity3 = new SingleIdentEntity(3, 'Baz');
 
         $this->persist(array($entity1, $entity2, $entity3));
 
-        $field = new EntityChoiceField('name', array(
+        $field = $this->factory->create('entity', 'name', array(
             'em' => $this->em,
             'class' => self::SINGLE_IDENT_CLASS,
             // not all persisted entities should be displayed
@@ -432,15 +432,15 @@ class EntityChoiceFieldTest extends DoctrineOrmTestCase
             'property' => 'name',
         ));
 
-        $field->submit('2');
+        $field->bind('2');
 
-        $this->assertEquals(array(1 => 'Foo', 2 => 'Bar'), $field->getOtherChoices());
-        $this->assertTrue($field->isTransformationSuccessful());
+        $this->assertEquals(array(1 => 'Foo', 2 => 'Bar'), $field->getRenderer()->getVar('choices'));
+        $this->assertTrue($field->isSynchronized());
         $this->assertEquals($entity2, $field->getData());
-        $this->assertEquals(2, $field->getDisplayedData());
+        $this->assertEquals(2, $field->getClientData());
     }
 
-    public function testDisallowChoicesThatAreNotIncluded_choices_singleIdentifier()
+    public function testDisallowChoicesThatAreNotIncluded_choicesSingleIdentifier()
     {
         $entity1 = new SingleIdentEntity(1, 'Foo');
         $entity2 = new SingleIdentEntity(2, 'Bar');
@@ -448,20 +448,20 @@ class EntityChoiceFieldTest extends DoctrineOrmTestCase
 
         $this->persist(array($entity1, $entity2, $entity3));
 
-        $field = new EntityChoiceField('name', array(
+        $field = $this->factory->create('entity', 'name', array(
             'em' => $this->em,
             'class' => self::SINGLE_IDENT_CLASS,
             'choices' => array($entity1, $entity2),
             'property' => 'name',
         ));
 
-        $field->submit('3');
+        $field->bind('3');
 
-        $this->assertFalse($field->isTransformationSuccessful());
+        $this->assertFalse($field->isSynchronized());
         $this->assertNull($field->getData());
     }
 
-    public function testDisallowChoicesThatAreNotIncluded_choices_compositeIdentifier()
+    public function testDisallowChoicesThatAreNotIncluded_choicesCompositeIdentifier()
     {
         $entity1 = new CompositeIdentEntity(10, 20, 'Foo');
         $entity2 = new CompositeIdentEntity(30, 40, 'Bar');
@@ -469,20 +469,20 @@ class EntityChoiceFieldTest extends DoctrineOrmTestCase
 
         $this->persist(array($entity1, $entity2, $entity3));
 
-        $field = new EntityChoiceField('name', array(
+        $field = $this->factory->create('entity', 'name', array(
             'em' => $this->em,
             'class' => self::COMPOSITE_IDENT_CLASS,
             'choices' => array($entity1, $entity2),
             'property' => 'name',
         ));
 
-        $field->submit('2');
+        $field->bind('2');
 
-        $this->assertFalse($field->isTransformationSuccessful());
+        $this->assertFalse($field->isSynchronized());
         $this->assertNull($field->getData());
     }
 
-    public function testDisallowChoicesThatAreNotIncluded_queryBuilder_singleIdentifier()
+    public function testDisallowChoicesThatAreNotIncludedQueryBuilderSingleIdentifier()
     {
         $entity1 = new SingleIdentEntity(1, 'Foo');
         $entity2 = new SingleIdentEntity(2, 'Bar');
@@ -492,7 +492,7 @@ class EntityChoiceFieldTest extends DoctrineOrmTestCase
 
         $repository = $this->em->getRepository(self::SINGLE_IDENT_CLASS);
 
-        $field = new EntityChoiceField('name', array(
+        $field = $this->factory->create('entity', 'name', array(
             'em' => $this->em,
             'class' => self::SINGLE_IDENT_CLASS,
             'query_builder' => $repository->createQueryBuilder('e')
@@ -500,13 +500,13 @@ class EntityChoiceFieldTest extends DoctrineOrmTestCase
             'property' => 'name',
         ));
 
-        $field->submit('3');
+        $field->bind('3');
 
-        $this->assertFalse($field->isTransformationSuccessful());
+        $this->assertFalse($field->isSynchronized());
         $this->assertNull($field->getData());
     }
 
-    public function testDisallowChoicesThatAreNotIncluded_queryBuilderAsClosure_singleIdentifier()
+    public function testDisallowChoicesThatAreNotIncludedQueryBuilderAsClosureSingleIdentifier()
     {
         $entity1 = new SingleIdentEntity(1, 'Foo');
         $entity2 = new SingleIdentEntity(2, 'Bar');
@@ -514,7 +514,7 @@ class EntityChoiceFieldTest extends DoctrineOrmTestCase
 
         $this->persist(array($entity1, $entity2, $entity3));
 
-        $field = new EntityChoiceField('name', array(
+        $field = $this->factory->create('entity', 'name', array(
             'em' => $this->em,
             'class' => self::SINGLE_IDENT_CLASS,
             'query_builder' => function ($repository) {
@@ -524,13 +524,13 @@ class EntityChoiceFieldTest extends DoctrineOrmTestCase
             'property' => 'name',
         ));
 
-        $field->submit('3');
+        $field->bind('3');
 
-        $this->assertFalse($field->isTransformationSuccessful());
+        $this->assertFalse($field->isSynchronized());
         $this->assertNull($field->getData());
     }
 
-    public function testDisallowChoicesThatAreNotIncluded_queryBuilderAsClosure_compositeIdentifier()
+    public function testDisallowChoicesThatAreNotIncludedQueryBuilderAsClosureCompositeIdentifier()
     {
         $entity1 = new CompositeIdentEntity(10, 20, 'Foo');
         $entity2 = new CompositeIdentEntity(30, 40, 'Bar');
@@ -538,7 +538,7 @@ class EntityChoiceFieldTest extends DoctrineOrmTestCase
 
         $this->persist(array($entity1, $entity2, $entity3));
 
-        $field = new EntityChoiceField('name', array(
+        $field = $this->factory->create('entity', 'name', array(
             'em' => $this->em,
             'class' => self::COMPOSITE_IDENT_CLASS,
             'query_builder' => function ($repository) {
@@ -548,9 +548,9 @@ class EntityChoiceFieldTest extends DoctrineOrmTestCase
             'property' => 'name',
         ));
 
-        $field->submit('2');
+        $field->bind('2');
 
-        $this->assertFalse($field->isTransformationSuccessful());
+        $this->assertFalse($field->isSynchronized());
         $this->assertNull($field->getData());
     }
 }
\ No newline at end of file
diff --git a/tests/Symfony/Tests/Bridge/Twig/Extension/Fixtures/StubFilesystemLoader.php b/tests/Symfony/Tests/Bridge/Twig/Extension/Fixtures/StubFilesystemLoader.php
new file mode 100644
index 0000000000..5b82316f1a
--- /dev/null
+++ b/tests/Symfony/Tests/Bridge/Twig/Extension/Fixtures/StubFilesystemLoader.php
@@ -0,0 +1,23 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Tests\Bridge\Twig\Extension\Fixtures;
+
+class StubFilesystemLoader extends \Twig_Loader_Filesystem
+{
+    protected function findTemplate($name)
+    {
+        // strip away bundle name
+        $parts = explode(':', $name);
+
+        return parent::findTemplate(end($parts));
+    }
+}
\ No newline at end of file
diff --git a/tests/Symfony/Tests/Bridge/Twig/Extension/Fixtures/StubTranslator.php b/tests/Symfony/Tests/Bridge/Twig/Extension/Fixtures/StubTranslator.php
new file mode 100644
index 0000000000..b34c946734
--- /dev/null
+++ b/tests/Symfony/Tests/Bridge/Twig/Extension/Fixtures/StubTranslator.php
@@ -0,0 +1,35 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Tests\Bridge\Twig\Extension\Fixtures;
+
+use Symfony\Component\Translation\TranslatorInterface;
+
+class StubTranslator implements TranslatorInterface
+{
+    public function trans($id, array $parameters = array(), $domain = null, $locale = null)
+    {
+        return '[trans]'.$id.'[/trans]';
+    }
+
+    public function transChoice($id, $number, array $parameters = array(), $domain = null, $locale = null)
+    {
+        return '[trans]'.$id.'[/trans]';
+    }
+
+    public function setLocale($locale)
+    {
+    }
+
+    public function getLocale()
+    {
+    }
+}
\ No newline at end of file
diff --git a/tests/Symfony/Tests/Bridge/Twig/Extension/FormExtensionDivLayoutTest.php b/tests/Symfony/Tests/Bridge/Twig/Extension/FormExtensionDivLayoutTest.php
new file mode 100644
index 0000000000..054c870aee
--- /dev/null
+++ b/tests/Symfony/Tests/Bridge/Twig/Extension/FormExtensionDivLayoutTest.php
@@ -0,0 +1,72 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Tests\Bridge\Twig\Extension;
+
+require_once __DIR__.'/Fixtures/StubTranslator.php';
+require_once __DIR__.'/Fixtures/StubFilesystemLoader.php';
+
+use Symfony\Component\Form\FormView;
+use Symfony\Bridge\Twig\Extension\FormExtension;
+use Symfony\Bridge\Twig\Extension\TranslationExtension;
+use Symfony\Tests\Component\Form\AbstractDivLayoutTest;
+use Symfony\Tests\Bridge\Twig\Extension\Fixtures\StubTranslator;
+use Symfony\Tests\Bridge\Twig\Extension\Fixtures\StubFilesystemLoader;
+
+class FormExtensionDivLayoutTest extends AbstractDivLayoutTest
+{
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $loader = new StubFilesystemLoader(array(
+            __DIR__.'/../../../../../../src/Symfony/Bundle/TwigBundle/Resources/views/Form',
+        ));
+
+        $this->extension = new FormExtension(array('div_layout.html.twig'));
+
+        $environment = new \Twig_Environment($loader);
+        $environment->addExtension($this->extension);
+        $environment->addExtension(new TranslationExtension(new StubTranslator()));
+
+        $this->extension->initRuntime($environment);
+    }
+
+    protected function renderEnctype(FormView $view)
+    {
+        return (string)$this->extension->renderEnctype($view);
+    }
+
+    protected function renderLabel(FormView $view, $label = null)
+    {
+        return (string)$this->extension->renderLabel($view, $label);
+    }
+
+    protected function renderErrors(FormView $view)
+    {
+        return (string)$this->extension->renderErrors($view);
+    }
+
+    protected function renderWidget(FormView $view, array $vars = array())
+    {
+        return (string)$this->extension->renderWidget($view, $vars);
+    }
+
+    protected function renderRow(FormView $view, array $vars = array())
+    {
+        return (string)$this->extension->renderRow($view, $vars);
+    }
+
+    protected function renderRest(FormView $view, array $vars = array())
+    {
+        return (string)$this->extension->renderRest($view, $vars);
+    }
+}
diff --git a/tests/Symfony/Tests/Bridge/Twig/Extension/FormExtensionTableLayoutTest.php b/tests/Symfony/Tests/Bridge/Twig/Extension/FormExtensionTableLayoutTest.php
new file mode 100644
index 0000000000..f75882a443
--- /dev/null
+++ b/tests/Symfony/Tests/Bridge/Twig/Extension/FormExtensionTableLayoutTest.php
@@ -0,0 +1,72 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Tests\Bridge\Twig\Extension;
+
+require_once __DIR__.'/Fixtures/StubTranslator.php';
+require_once __DIR__.'/Fixtures/StubFilesystemLoader.php';
+
+use Symfony\Component\Form\FormView;
+use Symfony\Bridge\Twig\Extension\FormExtension;
+use Symfony\Bridge\Twig\Extension\TranslationExtension;
+use Symfony\Tests\Component\Form\AbstractTableLayoutTest;
+use Symfony\Tests\Bridge\Twig\Extension\Fixtures\StubTranslator;
+use Symfony\Tests\Bridge\Twig\Extension\Fixtures\StubFilesystemLoader;
+
+class FormExtensionTableLayoutTest extends AbstractTableLayoutTest
+{
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $loader = new StubFilesystemLoader(array(
+            __DIR__.'/../../../../../../src/Symfony/Bundle/TwigBundle/Resources/views/Form',
+        ));
+
+        $this->extension = new FormExtension(array('table_layout.html.twig'));
+
+        $environment = new \Twig_Environment($loader);
+        $environment->addExtension($this->extension);
+        $environment->addExtension(new TranslationExtension(new StubTranslator()));
+
+        $this->extension->initRuntime($environment);
+    }
+
+    protected function renderEnctype(FormView $view)
+    {
+        return (string)$this->extension->renderEnctype($view);
+    }
+
+    protected function renderLabel(FormView $view, $label = null)
+    {
+        return (string)$this->extension->renderLabel($view, $label);
+    }
+
+    protected function renderErrors(FormView $view)
+    {
+        return (string)$this->extension->renderErrors($view);
+    }
+
+    protected function renderWidget(FormView $view, array $vars = array())
+    {
+        return (string)$this->extension->renderWidget($view, $vars);
+    }
+
+    protected function renderRow(FormView $view, array $vars = array())
+    {
+        return (string)$this->extension->renderRow($view, $vars);
+    }
+
+    protected function renderRest(FormView $view, array $vars = array())
+    {
+        return (string)$this->extension->renderRest($view, $vars);
+    }
+}
diff --git a/tests/Symfony/Tests/Component/Form/AbstractDivLayoutTest.php b/tests/Symfony/Tests/Component/Form/AbstractDivLayoutTest.php
new file mode 100644
index 0000000000..84ef3bde94
--- /dev/null
+++ b/tests/Symfony/Tests/Component/Form/AbstractDivLayoutTest.php
@@ -0,0 +1,174 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Tests\Component\Form;
+
+use Symfony\Component\Form\FormError;
+
+abstract class AbstractDivLayoutTest extends AbstractLayoutTest
+{
+    public function testRow()
+    {
+        $form = $this->factory->create('text', 'name');
+        $form->addError(new FormError('Error!'));
+        $view = $form->createView();
+        $html = $this->renderRow($view);
+
+        $this->assertMatchesXpath($html,
+'/div
+    [
+        ./label[@for="name"]
+        /following-sibling::ul
+            [./li[.="[trans]Error![/trans]"]]
+            [count(./li)=1]
+        /following-sibling::input[@id="name"]
+    ]
+'
+        );
+    }
+
+    public function testRepeatedRow()
+    {
+        $form = $this->factory->create('repeated', 'name');
+        $form->addError(new FormError('Error!'));
+        $view = $form->createView();
+        $html = $this->renderRow($view);
+
+        $this->assertMatchesXpath($html,
+'/ul
+    [./li[.="[trans]Error![/trans]"]]
+    [count(./li)=1]
+/following-sibling::div
+    [
+        ./label[@for="name_first"]
+        /following-sibling::input[@id="name_first"]
+    ]
+/following-sibling::div
+    [
+        ./label[@for="name_second"]
+        /following-sibling::input[@id="name_second"]
+    ]
+'
+        );
+    }
+
+    public function testRest()
+    {
+        $view = $this->factory->createBuilder('form', 'name')
+            ->add('field1', 'text')
+            ->add('field2', 'repeated')
+            ->add('field3', 'text')
+            ->add('field4', 'text')
+            ->getForm()
+            ->createView();
+
+        // Render field2 row -> does not implicitely call renderWidget because
+        // it is a repeated field!
+        $this->renderRow($view['field2']);
+
+        // Render field3 widget
+        $this->renderWidget($view['field3']);
+
+        // Rest should only contain field1 and field4
+        $html = $this->renderRest($view);
+
+        $this->assertMatchesXpath($html,
+'/input
+    [@type="hidden"]
+    [@id="name__token"]
+/following-sibling::div
+    [
+        ./label[@for="name_field1"]
+        /following-sibling::input[@type="text"][@id="name_field1"]
+    ]
+/following-sibling::div
+    [
+        ./label[@for="name_field4"]
+        /following-sibling::input[@type="text"][@id="name_field4"]
+    ]
+    [count(../div)=2]
+    [count(..//label)=2]
+    [count(..//input)=3]
+'
+        );
+    }
+
+    public function testCollection()
+    {
+        $form = $this->factory->create('collection', 'name', array(
+            'type' => 'text',
+            'data' => array('a', 'b'),
+        ));
+
+        $this->assertWidgetMatchesXpath($form->createView(), array(),
+'/div
+    [
+        ./div[./input[@type="text"][@value="a"]]
+        /following-sibling::div[./input[@type="text"][@value="b"]]
+    ]
+    [count(./div[./input])=2]
+'
+        );
+    }
+
+    public function testForm()
+    {
+        $form = $this->factory->createBuilder('form', 'name')
+            ->add('firstName', 'text')
+            ->add('lastName', 'text')
+            ->getForm();
+
+        $this->assertWidgetMatchesXpath($form->createView(), array(),
+'/div
+    [
+        ./input[@type="hidden"][@id="name__token"]
+        /following-sibling::div
+            [
+                ./label[@for="name_firstName"]
+                /following-sibling::input[@type="text"][@id="name_firstName"]
+            ]
+        /following-sibling::div
+            [
+                ./label[@for="name_lastName"]
+                /following-sibling::input[@type="text"][@id="name_lastName"]
+            ]
+    ]
+    [count(.//input)=3]
+'
+        );
+    }
+
+    public function testRepeated()
+    {
+        $form = $this->factory->create('repeated', 'name', array(
+            'type' => 'text',
+            'data' => 'foobar',
+        ));
+
+        $this->assertWidgetMatchesXpath($form->createView(), array(),
+'/div
+    [
+        ./div
+            [
+                ./label[@for="name_first"]
+                /following-sibling::input[@type="text"][@id="name_first"]
+            ]
+        /following-sibling::div
+            [
+                ./label[@for="name_second"]
+                /following-sibling::input[@type="text"][@id="name_second"]
+            ]
+    ]
+    [count(.//input)=2]
+'
+        );
+    }
+}
diff --git a/tests/Symfony/Tests/Component/Form/AbstractLayoutTest.php b/tests/Symfony/Tests/Component/Form/AbstractLayoutTest.php
new file mode 100644
index 0000000000..781ecdcd20
--- /dev/null
+++ b/tests/Symfony/Tests/Component/Form/AbstractLayoutTest.php
@@ -0,0 +1,1015 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Tests\Component\Form;
+
+use Symfony\Component\Form\FormError;
+use Symfony\Component\Form\FormView;
+use Symfony\Component\Form\FormFactory;
+use Symfony\Component\Form\CsrfProvider\DefaultCsrfProvider;
+use Symfony\Component\Form\Type\Loader\DefaultTypeLoader;
+use Symfony\Component\EventDispatcher\EventDispatcher;
+
+abstract class AbstractLayoutTest extends \PHPUnit_Framework_TestCase
+{
+    protected $csrfProvider;
+
+    protected $factory;
+
+    protected function setUp()
+    {
+        \Locale::setDefault('en');
+
+        $dispatcher = new EventDispatcher();
+        $validator = $this->getMock('Symfony\Component\Validator\ValidatorInterface');
+        $this->csrfProvider = $this->getMock('Symfony\Component\Form\CsrfProvider\CsrfProviderInterface');
+        $storage = new \Symfony\Component\HttpFoundation\File\TemporaryStorage('foo', 1, \sys_get_temp_dir());
+        $loader = new DefaultTypeLoader($validator, $this->csrfProvider , $storage);
+
+        $this->factory = new FormFactory($loader);
+    }
+
+    protected function assertXpathNodeValue(\DomElement $element, $expression, $nodeValue)
+    {
+        $xpath = new \DOMXPath($element->ownerDocument);
+        $nodeList = $xpath->evaluate($expression);
+        $this->assertEquals(1, $nodeList->length);
+        $this->assertEquals($nodeValue, $nodeList->item(0)->nodeValue);
+    }
+
+    protected function assertMatchesXpath($html, $expression, $count = 1)
+    {
+        $dom = new \DomDocument('UTF-8');
+        try {
+            // Wrap in <root> node so we can load HTML with multiple tags at
+            // the top level
+            $dom->loadXml('<root>'.$html.'</root>');
+        } catch (\Exception $e) {
+            return $this->fail(sprintf(
+                "Failed loading HTML:\n\n%s\n\nError: %s",
+                $html,
+                $e->getMessage()
+            ));
+        }
+        $xpath = new \DOMXPath($dom);
+        $nodeList = $xpath->evaluate('/root'.$expression);
+
+        if ($nodeList->length != $count) {
+            $dom->formatOutput = true;
+            $this->fail(sprintf(
+                "Failed asserting that \n\n%s\n\nmatches exactly %s. Matches %s in \n\n%s",
+                $expression,
+                $count == 1 ? 'once' : $count . ' times',
+                $nodeList->length == 1 ? 'once' : $nodeList->length . ' times',
+                // strip away <root> and </root>
+                substr($dom->saveHTML(), 6, -8)
+            ));
+        }
+    }
+
+    protected function assertWidgetMatchesXpath(FormView $view, array $vars, $xpath)
+    {
+        // include ampersands everywhere to validate escaping
+        $html = $this->renderWidget($view, array_merge(array(
+            'id' => 'my&id',
+            'attr' => array('class' => 'my&class'),
+        ), $vars));
+
+        $xpath = trim($xpath).'
+    [@id="my&id"]
+    [@class="my&class"]';
+
+        $this->assertMatchesXpath($html, $xpath);
+    }
+
+    abstract protected function renderEnctype(FormView $view);
+
+    abstract protected function renderLabel(FormView $view, $label = null);
+
+    abstract protected function renderErrors(FormView $view);
+
+    abstract protected function renderWidget(FormView $view, array $vars = array());
+
+    abstract protected function renderRow(FormView $view, array $vars = array());
+
+    abstract protected function renderRest(FormView $view, array $vars = array());
+
+    public function testEnctype()
+    {
+        $form = $this->factory->createBuilder('form', 'na&me', array('property_path' => 'name'))
+            ->add('file', 'file')
+            ->getForm();
+
+        $this->assertEquals('enctype="multipart/form-data"', $this->renderEnctype($form->createView()));
+    }
+
+    public function testNoEnctype()
+    {
+        $form = $this->factory->createBuilder('form', 'na&me', array('property_path' => 'name'))
+            ->add('text', 'text')
+            ->getForm();
+
+        $this->assertEquals('', $this->renderEnctype($form->createView()));
+    }
+
+    public function testLabel()
+    {
+        $form = $this->factory->create('text', 'na&me', array('property_path' => 'name'));
+        $html = $this->renderLabel($form->createView());
+
+        $this->assertMatchesXpath($html,
+'/label
+    [@for="na&me"]
+    [.="[trans]Na&me[/trans]"]
+'
+        );
+    }
+
+    public function testLabelWithCustomTextPassedAsOption()
+    {
+        $form = $this->factory->create('text', 'na&me', array(
+            'property_path' => 'name',
+            'label' => 'Custom label',
+        ));
+        $html = $this->renderLabel($form->createView());
+
+        $this->assertMatchesXpath($html,
+'/label
+    [@for="na&me"]
+    [.="[trans]Custom label[/trans]"]
+'
+        );
+    }
+
+    public function testLabelWithCustomTextPassedDirectly()
+    {
+        $form = $this->factory->create('text', 'na&me', array('property_path' => 'name'));
+        $html = $this->renderLabel($form->createView(), 'Custom label');
+
+        $this->assertMatchesXpath($html,
+'/label
+    [@for="na&me"]
+    [.="[trans]Custom label[/trans]"]
+'
+        );
+    }
+
+    public function testErrors()
+    {
+        $form = $this->factory->create('text', 'na&me', array('property_path' => 'name'));
+        $form->addError(new FormError('Error 1'));
+        $form->addError(new FormError('Error 2'));
+        $view = $form->createView();
+        $html = $this->renderErrors($view);
+
+        $this->assertMatchesXpath($html,
+'/ul
+    [
+        ./li[.="[trans]Error 1[/trans]"]
+        /following-sibling::li[.="[trans]Error 2[/trans]"]
+    ]
+    [count(./li)=2]
+'
+        );
+    }
+
+    public function testCheckedCheckbox()
+    {
+        $form = $this->factory->create('checkbox', 'na&me', array(
+            'property_path' => 'name',
+            'data' => true,
+        ));
+
+        $this->assertWidgetMatchesXpath($form->createView(), array(),
+'/input
+    [@type="checkbox"]
+    [@name="na&me"]
+    [@checked="checked"]
+    [@value="1"]
+'
+        );
+    }
+
+    public function testCheckedCheckboxWithValue()
+    {
+        $form = $this->factory->create('checkbox', 'na&me', array(
+            'property_path' => 'name',
+            'value' => 'foo&bar',
+            'data' => true,
+        ));
+
+        $this->assertWidgetMatchesXpath($form->createView(), array(),
+'/input
+    [@type="checkbox"]
+    [@name="na&me"]
+    [@checked="checked"]
+    [@value="foo&bar"]
+'
+        );
+    }
+
+    public function testUncheckedCheckbox()
+    {
+        $form = $this->factory->create('checkbox', 'na&me', array(
+            'property_path' => 'name',
+            'data' => false,
+        ));
+
+        $this->assertWidgetMatchesXpath($form->createView(), array(),
+'/input
+    [@type="checkbox"]
+    [@name="na&me"]
+    [not(@checked)]
+'
+        );
+    }
+
+    public function testSingleChoice()
+    {
+        $form = $this->factory->create('choice', 'na&me', array(
+            'property_path' => 'name',
+            'choices' => array('&a' => 'Choice&A', '&b' => 'Choice&B'),
+            'data' => '&a',
+            'multiple' => false,
+            'expanded' => false,
+        ));
+
+        $this->assertWidgetMatchesXpath($form->createView(), array(),
+'/select
+    [@name="na&me"]
+    [
+        ./option[@value="&a"][@selected="selected"][.="Choice&A"]
+        /following-sibling::option[@value="&b"][not(@selected)][.="Choice&B"]
+    ]
+    [count(./option)=2]
+'
+        );
+    }
+
+    public function testSingleChoiceWithPreferred()
+    {
+        $form = $this->factory->create('choice', 'na&me', array(
+            'property_path' => 'name',
+            'choices' => array('&a' => 'Choice&A', '&b' => 'Choice&B'),
+            'preferred_choices' => array('&b'),
+            'data' => '&a',
+            'multiple' => false,
+            'expanded' => false,
+        ));
+
+        $this->assertWidgetMatchesXpath($form->createView(), array('separator' => '-- sep --'),
+'/select
+    [@name="na&me"]
+    [
+        ./option[@value="&b"][not(@selected)][.="Choice&B"]
+        /following-sibling::option[@disabled="disabled"][not(@selected)][.="-- sep --"]
+        /following-sibling::option[@value="&a"][@selected="selected"][.="Choice&A"]
+    ]
+    [count(./option)=3]
+'
+        );
+    }
+
+    public function testSingleChoiceNonRequired()
+    {
+        $form = $this->factory->create('choice', 'na&me', array(
+            'property_path' => 'name',
+            'choices' => array('&a' => 'Choice&A', '&b' => 'Choice&B'),
+            'required' => false,
+            'data' => '&a',
+            'multiple' => false,
+            'expanded' => false,
+        ));
+
+        $this->assertWidgetMatchesXpath($form->createView(), array(),
+'/select
+    [@name="na&me"]
+    [
+        ./option[@value=""][.=""]
+        /following-sibling::option[@value="&a"][@selected="selected"][.="Choice&A"]
+        /following-sibling::option[@value="&b"][not(@selected)][.="Choice&B"]
+    ]
+    [count(./option)=3]
+'
+        );
+    }
+
+    public function testSingleChoiceGrouped()
+    {
+        $form = $this->factory->create('choice', 'na&me', array(
+            'property_path' => 'name',
+            'choices' => array(
+                'Group&1' => array('&a' => 'Choice&A', '&b' => 'Choice&B'),
+                'Group&2' => array('&c' => 'Choice&C'),
+            ),
+            'data' => '&a',
+            'multiple' => false,
+            'expanded' => false,
+        ));
+
+        $this->assertWidgetMatchesXpath($form->createView(), array(),
+'/select
+    [@name="na&me"]
+    [./optgroup[@label="Group&1"]
+        [
+            ./option[@value="&a"][@selected="selected"][.="Choice&A"]
+            /following-sibling::option[@value="&b"][not(@selected)][.="Choice&B"]
+        ]
+        [count(./option)=2]
+    ]
+    [./optgroup[@label="Group&2"]
+        [./option[@value="&c"][not(@selected)][.="Choice&C"]]
+        [count(./option)=1]
+    ]
+    [count(./optgroup)=2]
+'
+        );
+    }
+
+    public function testMultipleChoice()
+    {
+        $form = $this->factory->create('choice', 'na&me', array(
+            'property_path' => 'name',
+            'choices' => array('&a' => 'Choice&A', '&b' => 'Choice&B'),
+            'data' => array('&a'),
+            'multiple' => true,
+            'expanded' => false,
+        ));
+
+        $this->assertWidgetMatchesXpath($form->createView(), array(),
+'/select
+    [@name="na&me[]"]
+    [@multiple="multiple"]
+    [
+        ./option[@value="&a"][@selected="selected"][.="Choice&A"]
+        /following-sibling::option[@value="&b"][not(@selected)][.="Choice&B"]
+    ]
+    [count(./option)=2]
+'
+        );
+    }
+
+    public function testMultipleChoiceNonRequired()
+    {
+        $form = $this->factory->create('choice', 'na&me', array(
+            'property_path' => 'name',
+            'choices' => array('&a' => 'Choice&A', '&b' => 'Choice&B'),
+            'data' => array('&a'),
+            'required' => false,
+            'multiple' => true,
+            'expanded' => false,
+        ));
+
+        $this->assertWidgetMatchesXpath($form->createView(), array(),
+'/select
+    [@name="na&me[]"]
+    [@multiple="multiple"]
+    [
+        ./option[@value="&a"][@selected="selected"][.="Choice&A"]
+        /following-sibling::option[@value="&b"][not(@selected)][.="Choice&B"]
+    ]
+    [count(./option)=2]
+'
+        );
+    }
+
+    public function testSingleChoiceExpanded()
+    {
+        $form = $this->factory->create('choice', 'na&me', array(
+            'property_path' => 'name',
+            'choices' => array('&a' => 'Choice&A', '&b' => 'Choice&B'),
+            'data' => '&a',
+            'multiple' => false,
+            'expanded' => true,
+        ));
+
+        $this->assertWidgetMatchesXpath($form->createView(), array(),
+'/div
+    [
+        ./input[@type="radio"][@name="na&me"][@id="na&me_&a"][@checked]
+        /following-sibling::label[@for="na&me_&a"][.="[trans]Choice&A[/trans]"]
+        /following-sibling::input[@type="radio"][@name="na&me"][@id="na&me_&b"][not(@checked)]
+        /following-sibling::label[@for="na&me_&b"][.="[trans]Choice&B[/trans]"]
+    ]
+    [count(./input)=2]
+'
+        );
+    }
+
+    public function testMultipleChoiceExpanded()
+    {
+        $form = $this->factory->create('choice', 'na&me', array(
+            'property_path' => 'name',
+            'choices' => array('&a' => 'Choice&A', '&b' => 'Choice&B', '&c' => 'Choice&C'),
+            'data' => array('&a', '&c'),
+            'multiple' => true,
+            'expanded' => true,
+            'required' => true,
+        ));
+
+        $this->assertWidgetMatchesXpath($form->createView(), array(),
+'/div
+    [
+        ./input[@type="checkbox"][@name="na&me[&a]"][@id="na&me_&a"][@checked][not(@required)]
+        /following-sibling::label[@for="na&me_&a"][.="[trans]Choice&A[/trans]"]
+        /following-sibling::input[@type="checkbox"][@name="na&me[&b]"][@id="na&me_&b"][not(@checked)][not(@required)]
+        /following-sibling::label[@for="na&me_&b"][.="[trans]Choice&B[/trans]"]
+        /following-sibling::input[@type="checkbox"][@name="na&me[&c]"][@id="na&me_&c"][@checked][not(@required)]
+        /following-sibling::label[@for="na&me_&c"][.="[trans]Choice&C[/trans]"]
+    ]
+    [count(./input)=3]
+'
+        );
+    }
+
+    public function testCountry()
+    {
+        $form = $this->factory->create('country', 'na&me', array(
+            'property_path' => 'name',
+            'data' => 'AT',
+        ));
+
+        $this->assertWidgetMatchesXpath($form->createView(), array(),
+'/select
+    [@name="na&me"]
+    [./option[@value="AT"][@selected="selected"][.="Austria"]]
+    [count(./option)>200]
+'
+        );
+    }
+
+    public function testCsrf()
+    {
+        $this->csrfProvider->expects($this->any())
+            ->method('generateCsrfToken')
+            ->will($this->returnValue('foo&bar'));
+
+        $form = $this->factory->create('csrf', 'na&me', array('property_path' => 'name'));
+
+        $this->assertWidgetMatchesXpath($form->createView(), array(),
+'/input
+    [@type="hidden"]
+    [@value="foo&bar"]
+'
+        );
+    }
+
+    public function testCsrfWithNonRootParent()
+    {
+        $form = $this->factory->create('csrf', 'na&me', array('property_path' => 'name'));
+        $form->setParent($this->factory->create('form'));
+        $form->getParent()->setParent($this->factory->create('form'));
+
+        $html = $this->renderWidget($form->createView());
+
+        $this->assertEquals('', trim($html));
+    }
+
+    public function testDateTime()
+    {
+        $form = $this->factory->create('datetime', 'na&me', array(
+            'property_path' => 'name',
+            'data' => '2011-02-03 04:05:06',
+            'input' => 'string',
+            'with_seconds' => false,
+        ));
+
+        $this->assertWidgetMatchesXpath($form->createView(), array(),
+'/div
+    [
+        ./div
+            [@id="na&me_date"]
+            [
+                ./select
+                    [@id="na&me_date_month"]
+                    [./option[@value="2"][@selected="selected"]]
+                /following-sibling::select
+                    [@id="na&me_date_day"]
+                    [./option[@value="3"][@selected="selected"]]
+                /following-sibling::select
+                    [@id="na&me_date_year"]
+                    [./option[@value="2011"][@selected="selected"]]
+            ]
+        /following-sibling::div
+            [@id="na&me_time"]
+            [
+                ./select
+                    [@id="na&me_time_hour"]
+                    [./option[@value="4"][@selected="selected"]]
+                /following-sibling::select
+                    [@id="na&me_time_minute"]
+                    [./option[@value="5"][@selected="selected"]]
+            ]
+    ]
+    [count(.//select)=5]
+'
+        );
+    }
+
+    public function testDateTimeWithSeconds()
+    {
+        $form = $this->factory->create('datetime', 'na&me', array(
+            'property_path' => 'name',
+            'data' => '2011-02-03 04:05:06',
+            'input' => 'string',
+            'with_seconds' => true,
+        ));
+
+        $this->assertWidgetMatchesXpath($form->createView(), array(),
+'/div
+    [
+        ./div
+            [@id="na&me_date"]
+            [
+                ./select
+                    [@id="na&me_date_month"]
+                    [./option[@value="2"][@selected="selected"]]
+                /following-sibling::select
+                    [@id="na&me_date_day"]
+                    [./option[@value="3"][@selected="selected"]]
+                /following-sibling::select
+                    [@id="na&me_date_year"]
+                    [./option[@value="2011"][@selected="selected"]]
+            ]
+        /following-sibling::div
+            [@id="na&me_time"]
+            [
+                ./select
+                    [@id="na&me_time_hour"]
+                    [./option[@value="4"][@selected="selected"]]
+                /following-sibling::select
+                    [@id="na&me_time_minute"]
+                    [./option[@value="5"][@selected="selected"]]
+                /following-sibling::select
+                    [@id="na&me_time_second"]
+                    [./option[@value="6"][@selected="selected"]]
+            ]
+    ]
+    [count(.//select)=6]
+'
+        );
+    }
+
+    public function testDateChoice()
+    {
+        $form = $this->factory->create('date', 'na&me', array(
+            'property_path' => 'name',
+            'data' => '2011-02-03',
+            'input' => 'string',
+            'widget' => 'choice',
+        ));
+
+        $this->assertWidgetMatchesXpath($form->createView(), array(),
+'/div
+    [
+        ./select
+            [@id="na&me_month"]
+            [./option[@value="2"][@selected="selected"]]
+        /following-sibling::select
+            [@id="na&me_day"]
+            [./option[@value="3"][@selected="selected"]]
+        /following-sibling::select
+            [@id="na&me_year"]
+            [./option[@value="2011"][@selected="selected"]]
+    ]
+    [count(./select)=3]
+'
+        );
+    }
+
+    public function testDateText()
+    {
+        $form = $this->factory->create('date', 'na&me', array(
+            'property_path' => 'name',
+            'data' => '2011-02-03',
+            'input' => 'string',
+            'widget' => 'text',
+        ));
+
+        $this->assertWidgetMatchesXpath($form->createView(), array(),
+'/input
+    [@type="text"]
+    [@name="na&me"]
+    [@value="Feb 3, 2011"]
+'
+        );
+    }
+
+    public function testEmail()
+    {
+        $form = $this->factory->create('email', 'na&me', array(
+            'property_path' => 'name',
+            'data' => 'foo&bar',
+        ));
+
+        $this->assertWidgetMatchesXpath($form->createView(), array(),
+'/input
+    [@type="email"]
+    [@name="na&me"]
+    [@value="foo&bar"]
+    [not(@maxlength)]
+'
+        );
+    }
+
+    public function testEmailWithMaxLength()
+    {
+        $form = $this->factory->create('email', 'na&me', array(
+            'property_path' => 'name',
+            'data' => 'foo&bar',
+            'max_length' => 123,
+        ));
+
+        $this->assertWidgetMatchesXpath($form->createView(), array(),
+'/input
+    [@type="email"]
+    [@name="na&me"]
+    [@value="foo&bar"]
+    [@maxlength="123"]
+'
+        );
+    }
+
+    public function testFile()
+    {
+        $form = $this->factory->create('file', 'na&me', array('property_path' => 'name'));
+
+        $this->assertWidgetMatchesXpath($form->createView(), array(),
+'/div
+    [
+        ./input[@type="file"][@id="na&me_file"]
+        /following-sibling::input[@type="hidden"][@id="na&me_token"]
+        /following-sibling::input[@type="hidden"][@id="na&me_name"]
+    ]
+    [count(./input)=3]
+'
+        );
+    }
+
+    public function testHidden()
+    {
+        $form = $this->factory->create('hidden', 'na&me', array(
+            'property_path' => 'name',
+            'data' => 'foo&bar',
+        ));
+
+        $this->assertWidgetMatchesXpath($form->createView(), array(),
+'/input
+    [@type="hidden"]
+    [@name="na&me"]
+    [@value="foo&bar"]
+'
+        );
+    }
+
+    public function testInteger()
+    {
+        $form = $this->factory->create('integer', 'na&me', array(
+            'property_path' => 'name',
+            'data' => '123',
+        ));
+
+        $this->assertWidgetMatchesXpath($form->createView(), array(),
+'/input
+    [@type="number"]
+    [@name="na&me"]
+    [@value="123"]
+'
+        );
+    }
+
+    public function testLanguage()
+    {
+        $form = $this->factory->create('language', 'na&me', array(
+            'property_path' => 'name',
+            'data' => 'de',
+        ));
+
+        $this->assertWidgetMatchesXpath($form->createView(), array(),
+'/select
+    [@name="na&me"]
+    [./option[@value="de"][@selected="selected"][.="German"]]
+    [count(./option)>200]
+'
+        );
+    }
+
+    public function testLocale()
+    {
+        $form = $this->factory->create('locale', 'na&me', array(
+            'property_path' => 'name',
+            'data' => 'de_AT',
+        ));
+
+        $this->assertWidgetMatchesXpath($form->createView(), array(),
+'/select
+    [@name="na&me"]
+    [./option[@value="de_AT"][@selected="selected"][.="German (Austria)"]]
+    [count(./option)>200]
+'
+        );
+    }
+
+    public function testMoney()
+    {
+        $form = $this->factory->create('money', 'na&me', array(
+            'property_path' => 'name',
+            'data' => 1234.56,
+            'currency' => 'EUR',
+        ));
+
+        $this->assertWidgetMatchesXpath($form->createView(), array(),
+'/input
+    [@type="text"]
+    [@name="na&me"]
+    [@value="1234.56"]
+    [contains(.., "€")]
+'
+        );
+    }
+
+    public function testNumber()
+    {
+        $form = $this->factory->create('number', 'na&me', array(
+            'property_path' => 'name',
+            'data' => 1234.56,
+        ));
+
+        $this->assertWidgetMatchesXpath($form->createView(), array(),
+'/input
+    [@type="text"]
+    [@name="na&me"]
+    [@value="1234.56"]
+'
+        );
+    }
+
+    public function testPassword()
+    {
+        $form = $this->factory->create('password', 'na&me', array(
+            'property_path' => 'name',
+            'data' => 'foo&bar',
+        ));
+
+        $this->assertWidgetMatchesXpath($form->createView(), array(),
+'/input
+    [@type="password"]
+    [@name="na&me"]
+    [@value=""]
+'
+        );
+    }
+
+    public function testPasswordBoundNotAlwaysEmpty()
+    {
+        $form = $this->factory->create('password', 'na&me', array(
+            'property_path' => 'name',
+            'always_empty' => false,
+        ));
+        $form->bind('foo&bar');
+
+        $this->assertWidgetMatchesXpath($form->createView(), array(),
+'/input
+    [@type="password"]
+    [@name="na&me"]
+    [@value="foo&bar"]
+'
+        );
+    }
+
+    public function testPasswordWithMaxLength()
+    {
+        $form = $this->factory->create('password', 'na&me', array(
+            'property_path' => 'name',
+            'data' => 'foo&bar',
+            'max_length' => 123,
+        ));
+
+        $this->assertWidgetMatchesXpath($form->createView(), array(),
+'/input
+    [@type="password"]
+    [@name="na&me"]
+    [@value=""]
+    [@maxlength="123"]
+'
+        );
+    }
+
+    public function testPercent()
+    {
+        $form = $this->factory->create('percent', 'na&me', array(
+            'property_path' => 'name',
+            'data' => 0.1,
+        ));
+
+        $this->assertWidgetMatchesXpath($form->createView(), array(),
+'/input
+    [@type="text"]
+    [@name="na&me"]
+    [@value="10"]
+    [contains(.., "%")]
+'
+        );
+    }
+
+    public function testCheckedRadio()
+    {
+        $form = $this->factory->create('radio', 'na&me', array(
+            'property_path' => 'name',
+            'data' => true,
+        ));
+
+        $this->assertWidgetMatchesXpath($form->createView(), array(),
+'/input
+    [@type="radio"]
+    [@name="na&me"]
+    [@checked="checked"]
+    [@value=""]
+'
+        );
+    }
+
+    public function testCheckedRadioWithValue()
+    {
+        $form = $this->factory->create('radio', 'na&me', array(
+            'property_path' => 'name',
+            'data' => true,
+            'value' => 'foo&bar',
+        ));
+
+        $this->assertWidgetMatchesXpath($form->createView(), array(),
+'/input
+    [@type="radio"]
+    [@name="na&me"]
+    [@checked="checked"]
+    [@value="foo&bar"]
+'
+        );
+    }
+
+    public function testUncheckedRadio()
+    {
+        $form = $this->factory->create('radio', 'na&me', array(
+            'property_path' => 'name',
+            'data' => false,
+        ));
+
+        $this->assertWidgetMatchesXpath($form->createView(), array(),
+'/input
+    [@type="radio"]
+    [@name="na&me"]
+    [not(@checked)]
+'
+        );
+    }
+
+    public function testTextarea()
+    {
+        $form = $this->factory->create('textarea', 'na&me', array(
+            'property_path' => 'name',
+            'data' => 'foo&bar',
+        ));
+
+        $this->assertWidgetMatchesXpath($form->createView(), array(),
+'/textarea
+    [@name="na&me"]
+    [.="foo&bar"]
+'
+        );
+    }
+
+    public function testText()
+    {
+        $form = $this->factory->create('text', 'na&me', array(
+            'property_path' => 'name',
+            'data' => 'foo&bar',
+        ));
+
+        $this->assertWidgetMatchesXpath($form->createView(), array(),
+'/input
+    [@type="text"]
+    [@name="na&me"]
+    [@value="foo&bar"]
+    [not(@maxlength)]
+'
+        );
+    }
+
+    public function testTextWithMaxLength()
+    {
+        $form = $this->factory->create('text', 'na&me', array(
+            'property_path' => 'name',
+            'data' => 'foo&bar',
+            'max_length' => 123,
+        ));
+
+        $this->assertWidgetMatchesXpath($form->createView(), array(),
+'/input
+    [@type="text"]
+    [@name="na&me"]
+    [@value="foo&bar"]
+    [@maxlength="123"]
+'
+        );
+    }
+
+    public function testTime()
+    {
+        $form = $this->factory->create('time', 'na&me', array(
+            'property_path' => 'name',
+            'data' => '04:05:06',
+            'input' => 'string',
+            'with_seconds' => false,
+        ));
+
+        $this->assertWidgetMatchesXpath($form->createView(), array(),
+'/div
+    [
+        ./select
+            [@id="na&me_hour"]
+            [@size="1"]
+            [./option[@value="4"][@selected="selected"]]
+        /following-sibling::select
+            [@id="na&me_minute"]
+            [@size="1"]
+            [./option[@value="5"][@selected="selected"]]
+    ]
+    [count(./select)=2]
+'
+        );
+    }
+
+    public function testTimeWithSeconds()
+    {
+        $form = $this->factory->create('time', 'na&me', array(
+            'property_path' => 'name',
+            'data' => '04:05:06',
+            'input' => 'string',
+            'with_seconds' => true,
+        ));
+
+        $this->assertWidgetMatchesXpath($form->createView(), array(),
+'/div
+    [
+        ./select
+            [@id="na&me_hour"]
+            [@size="1"]
+            [./option[@value="4"][@selected="selected"]]
+        /following-sibling::select
+            [@id="na&me_minute"]
+            [@size="1"]
+            [./option[@value="5"][@selected="selected"]]
+        /following-sibling::select
+            [@id="na&me_second"]
+            [@size="1"]
+            [./option[@value="6"][@selected="selected"]]
+    ]
+    [count(./select)=3]
+'
+        );
+    }
+
+    public function testTimezone()
+    {
+        $form = $this->factory->create('timezone', 'na&me', array(
+            'property_path' => 'name',
+            'data' => 'Europe/Vienna',
+        ));
+
+        $this->assertWidgetMatchesXpath($form->createView(), array(),
+'/select
+    [@name="na&me"]
+    [./optgroup
+        [@label="Europe"]
+        [./option[@value="Europe/Vienna"][@selected="selected"][.="Vienna"]]
+    ]
+    [count(./optgroup)>10]
+    [count(.//option)>200]
+'
+        );
+    }
+
+    public function testUrl()
+    {
+        $form = $this->factory->create('url', 'na&me', array(
+            'property_path' => 'name',
+            'data' => 'http://www.google.com?foo1=bar1&foo2=bar2',
+        ));
+
+        $this->assertWidgetMatchesXpath($form->createView(), array(),
+'/input
+    [@type="url"]
+    [@name="na&me"]
+    [@value="http://www.google.com?foo1=bar1&foo2=bar2"]
+'
+        );
+    }
+}
diff --git a/tests/Symfony/Tests/Component/Form/AbstractTableLayoutTest.php b/tests/Symfony/Tests/Component/Form/AbstractTableLayoutTest.php
new file mode 100644
index 0000000000..5e31763ce0
--- /dev/null
+++ b/tests/Symfony/Tests/Component/Form/AbstractTableLayoutTest.php
@@ -0,0 +1,228 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Tests\Component\Form;
+
+use Symfony\Component\Form\FormError;
+
+abstract class AbstractTableLayoutTest extends AbstractLayoutTest
+{
+    public function testRow()
+    {
+        $form = $this->factory->create('text', 'name');
+        $form->addError(new FormError('Error!'));
+        $view = $form->createView();
+        $html = $this->renderRow($view);
+
+        $this->assertMatchesXpath($html,
+'/tr
+    [
+        ./td
+            [./label[@for="name"]]
+        /following-sibling::td
+            [
+                ./ul
+                    [./li[.="[trans]Error![/trans]"]]
+                    [count(./li)=1]
+                /following-sibling::input[@id="name"]
+            ]
+    ]
+'
+        );
+    }
+
+    public function testRepeatedRow()
+    {
+        $form = $this->factory->create('repeated', 'name');
+        $html = $this->renderRow($form->createView());
+
+        $this->assertMatchesXpath($html,
+'/tr
+    [
+        ./td
+            [./label[@for="name_first"]]
+        /following-sibling::td
+            [./input[@id="name_first"]]
+    ]
+/following-sibling::tr
+    [
+        ./td
+            [./label[@for="name_second"]]
+        /following-sibling::td
+            [./input[@id="name_second"]]
+    ]
+    [count(../tr)=2]
+'
+        );
+    }
+
+    public function testRepeatedRowWithErrors()
+    {
+        $form = $this->factory->create('repeated', 'name');
+        $form->addError(new FormError('Error!'));
+        $view = $form->createView();
+        $html = $this->renderRow($view);
+
+        $this->assertMatchesXpath($html,
+'/tr
+    [./td[@colspan="2"]/ul
+        [./li[.="[trans]Error![/trans]"]]
+    ]
+/following-sibling::tr
+    [
+        ./td
+            [./label[@for="name_first"]]
+        /following-sibling::td
+            [./input[@id="name_first"]]
+    ]
+/following-sibling::tr
+    [
+        ./td
+            [./label[@for="name_second"]]
+        /following-sibling::td
+            [./input[@id="name_second"]]
+    ]
+    [count(../tr)=3]
+'
+        );
+    }
+
+    public function testRest()
+    {
+        $view = $this->factory->createBuilder('form', 'name')
+            ->add('field1', 'text')
+            ->add('field2', 'repeated')
+            ->add('field3', 'text')
+            ->add('field4', 'text')
+            ->getForm()
+            ->createView();
+
+        // Render field2 row -> does not implicitely call renderWidget because
+        // it is a repeated field!
+        $this->renderRow($view['field2']);
+
+        // Render field3 widget
+        $this->renderWidget($view['field3']);
+
+        // Rest should only contain field1 and field4
+        $html = $this->renderRest($view);
+
+        $this->assertMatchesXpath($html,
+'/tr[@style="display: none"]
+    [./td[@colspan="2"]/input
+        [@type="hidden"]
+        [@id="name__token"]
+    ]
+/following-sibling::tr
+    [
+        ./td
+            [./label[@for="name_field1"]]
+        /following-sibling::td
+            [./input[@id="name_field1"]]
+    ]
+/following-sibling::tr
+    [
+        ./td
+            [./label[@for="name_field4"]]
+        /following-sibling::td
+            [./input[@id="name_field4"]]
+    ]
+    [count(../tr)=3]
+    [count(..//label)=2]
+    [count(..//input)=3]
+'
+        );
+    }
+
+    public function testCollection()
+    {
+        $form = $this->factory->create('collection', 'name', array(
+            'type' => 'text',
+            'data' => array('a', 'b'),
+        ));
+
+        $this->assertWidgetMatchesXpath($form->createView(), array(),
+'/table
+    [
+        ./tr[./td/input[@type="text"][@value="a"]]
+        /following-sibling::tr[./td/input[@type="text"][@value="b"]]
+    ]
+    [count(./tr[./td/input])=2]
+'
+        );
+    }
+
+    public function testForm()
+    {
+        $view = $this->factory->createBuilder('form', 'name')
+            ->add('firstName', 'text')
+            ->add('lastName', 'text')
+            ->getForm()
+            ->createView();
+
+        $this->assertWidgetMatchesXpath($view, array(),
+'/table
+    [
+        ./tr[@style="display: none"]
+            [./td[@colspan="2"]/input
+                [@type="hidden"]
+                [@id="name__token"]
+            ]
+        /following-sibling::tr
+            [
+                ./td
+                    [./label[@for="name_firstName"]]
+                /following-sibling::td
+                    [./input[@id="name_firstName"]]
+            ]
+        /following-sibling::tr
+            [
+                ./td
+                    [./label[@for="name_lastName"]]
+                /following-sibling::td
+                    [./input[@id="name_lastName"]]
+            ]
+    ]
+    [count(.//input)=3]
+'
+        );
+    }
+
+    public function testRepeated()
+    {
+        $form = $this->factory->create('repeated', 'name', array(
+            'type' => 'text',
+            'data' => 'foobar',
+        ));
+
+        $this->assertWidgetMatchesXpath($form->createView(), array(),
+'/table
+    [
+        ./tr
+            [
+                ./td
+                    [./label[@for="name_first"]]
+                /following-sibling::td
+                    [./input[@id="name_first"]]
+            ]
+        /following-sibling::tr
+            [
+                ./td
+                    [./label[@for="name_second"]]
+                /following-sibling::td
+                    [./input[@id="name_second"]]
+            ]
+    ]
+    [count(.//input)=2]
+'
+        );
+    }
+}
diff --git a/tests/Symfony/Tests/Component/Form/ChoiceFieldTest.php b/tests/Symfony/Tests/Component/Form/ChoiceFieldTest.php
deleted file mode 100644
index bb7afe79f0..0000000000
--- a/tests/Symfony/Tests/Component/Form/ChoiceFieldTest.php
+++ /dev/null
@@ -1,337 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Tests\Component\Form;
-
-use Symfony\Component\Form\ChoiceField;
-use Symfony\Component\Form\Exception\UnexpectedTypeException;
-
-class ChoiceFieldTest extends \PHPUnit_Framework_TestCase
-{
-    protected $choices = array(
-        'a' => 'Bernhard',
-        'b' => 'Fabien',
-        'c' => 'Kris',
-        'd' => 'Jon',
-        'e' => 'Roman',
-    );
-
-    protected $preferredChoices = array('d', 'e');
-
-    protected $groupedChoices = array(
-        'Symfony' => array(
-            'a' => 'Bernhard',
-            'b' => 'Fabien',
-            'c' => 'Kris',
-        ),
-        'Doctrine' => array(
-            'd' => 'Jon',
-            'e' => 'Roman',
-        )
-    );
-
-    protected $numericChoices = array(
-        0 => 'Bernhard',
-        1 => 'Fabien',
-        2 => 'Kris',
-        3 => 'Jon',
-        4 => 'Roman',
-    );
-
-    public function testIsChoiceSelectedDifferentiatesBetweenZeroAndEmpty_integerZero()
-    {
-        $field = new ChoiceField('name', array(
-            'choices' => array(
-                0 => 'Foo',
-                '' => 'Bar',
-            )
-        ));
-
-        $field->submit(0);
-
-        $this->assertTrue($field->isChoiceSelected(0));
-        $this->assertTrue($field->isChoiceSelected('0'));
-        $this->assertFalse($field->isChoiceSelected(''));
-
-        $field->submit('0');
-
-        $this->assertTrue($field->isChoiceSelected(0));
-        $this->assertTrue($field->isChoiceSelected('0'));
-        $this->assertFalse($field->isChoiceSelected(''));
-
-        $field->submit('');
-
-        $this->assertFalse($field->isChoiceSelected(0));
-        $this->assertFalse($field->isChoiceSelected('0'));
-        $this->assertTrue($field->isChoiceSelected(''));
-    }
-
-    public function testIsChoiceSelectedDifferentiatesBetweenZeroAndEmpty_stringZero()
-    {
-        $field = new ChoiceField('name', array(
-            'choices' => array(
-                '0' => 'Foo',
-                '' => 'Bar',
-            )
-        ));
-
-        $field->submit(0);
-
-        $this->assertTrue($field->isChoiceSelected(0));
-        $this->assertTrue($field->isChoiceSelected('0'));
-        $this->assertFalse($field->isChoiceSelected(''));
-
-        $field->submit('0');
-
-        $this->assertTrue($field->isChoiceSelected(0));
-        $this->assertTrue($field->isChoiceSelected('0'));
-        $this->assertFalse($field->isChoiceSelected(''));
-
-        $field->submit('');
-
-        $this->assertFalse($field->isChoiceSelected(0));
-        $this->assertFalse($field->isChoiceSelected('0'));
-        $this->assertTrue($field->isChoiceSelected(''));
-    }
-
-    /**
-     * @expectedException Symfony\Component\Form\Exception\InvalidOptionsException
-     */
-    public function testConfigureChoicesWithNonArray()
-    {
-        $field = new ChoiceField('name', array(
-            'choices' => new \ArrayObject(),
-        ));
-    }
-
-    /**
-     * @expectedException Symfony\Component\Form\Exception\InvalidOptionsException
-     */
-    public function testConfigurePreferredChoicesWithNonArray()
-    {
-        $field = new ChoiceField('name', array(
-            'choices' => $this->choices,
-            'preferred_choices' => new \ArrayObject(),
-        ));
-    }
-
-    public function getChoicesVariants()
-    {
-        $choices = $this->choices;
-
-        return array(
-            array($choices),
-            array(function () use ($choices) { return $choices; }),
-        );
-    }
-
-    public function getNumericChoicesVariants()
-    {
-        $choices = $this->numericChoices;
-
-        return array(
-            array($choices),
-            array(function () use ($choices) { return $choices; }),
-        );
-    }
-
-    /**
-     * @expectedException Symfony\Component\Form\Exception\InvalidOptionsException
-     */
-    public function testClosureShouldReturnArray()
-    {
-        $field = new ChoiceField('name', array(
-            'choices' => function () { return 'foobar'; },
-        ));
-
-        // trigger closure
-        $field->getOtherChoices();
-    }
-
-    public function testNonRequiredContainsEmptyField()
-    {
-        $field = new ChoiceField('name', array(
-            'multiple' => false,
-            'expanded' => false,
-            'choices' => $this->choices,
-            'required' => false,
-        ));
-
-        $this->assertEquals(array('' => '') + $this->choices, $field->getOtherChoices());
-    }
-
-    public function testRequiredContainsNoEmptyField()
-    {
-        $field = new ChoiceField('name', array(
-            'multiple' => false,
-            'expanded' => false,
-            'choices' => $this->choices,
-            'required' => true,
-        ));
-
-        $this->assertEquals($this->choices, $field->getOtherChoices());
-    }
-
-    public function testEmptyValueConfiguresLabelOfEmptyField()
-    {
-        $field = new ChoiceField('name', array(
-            'multiple' => false,
-            'expanded' => false,
-            'choices' => $this->choices,
-            'required' => false,
-            'empty_value' => 'Foobar',
-        ));
-
-        $this->assertEquals(array('' => 'Foobar') + $this->choices, $field->getOtherChoices());
-    }
-
-    /**
-     * @dataProvider getChoicesVariants
-     */
-    public function testSubmitSingleNonExpanded($choices)
-    {
-        $field = new ChoiceField('name', array(
-            'multiple' => false,
-            'expanded' => false,
-            'choices' => $choices,
-        ));
-
-        $field->submit('b');
-
-        $this->assertEquals('b', $field->getData());
-        $this->assertEquals('b', $field->getDisplayedData());
-    }
-
-    /**
-     * @dataProvider getChoicesVariants
-     */
-    public function testSubmitMultipleNonExpanded($choices)
-    {
-        $field = new ChoiceField('name', array(
-            'multiple' => true,
-            'expanded' => false,
-            'choices' => $choices,
-        ));
-
-        $field->submit(array('a', 'b'));
-
-        $this->assertEquals(array('a', 'b'), $field->getData());
-        $this->assertEquals(array('a', 'b'), $field->getDisplayedData());
-    }
-
-    /**
-     * @dataProvider getChoicesVariants
-     */
-    public function testSubmitSingleExpanded($choices)
-    {
-        $field = new ChoiceField('name', array(
-            'multiple' => false,
-            'expanded' => true,
-            'choices' => $choices,
-        ));
-
-        $field->submit('b');
-
-        $this->assertSame('b', $field->getData());
-        $this->assertSame(false, $field['a']->getData());
-        $this->assertSame(true, $field['b']->getData());
-        $this->assertSame(false, $field['c']->getData());
-        $this->assertSame(false, $field['d']->getData());
-        $this->assertSame(false, $field['e']->getData());
-        $this->assertSame('', $field['a']->getDisplayedData());
-        $this->assertSame('1', $field['b']->getDisplayedData());
-        $this->assertSame('', $field['c']->getDisplayedData());
-        $this->assertSame('', $field['d']->getDisplayedData());
-        $this->assertSame('', $field['e']->getDisplayedData());
-        $this->assertSame(array('a' => '', 'b' => '1', 'c' => '', 'd' => '', 'e' => ''), $field->getDisplayedData());
-    }
-
-    /**
-     * @dataProvider getNumericChoicesVariants
-     */
-    public function testSubmitSingleExpandedNumericChoices($choices)
-    {
-        $field = new ChoiceField('name', array(
-            'multiple' => false,
-            'expanded' => true,
-            'choices' => $choices,
-        ));
-
-        $field->submit('1');
-
-        $this->assertSame(1, $field->getData());
-        $this->assertSame(false, $field[0]->getData());
-        $this->assertSame(true, $field[1]->getData());
-        $this->assertSame(false, $field[2]->getData());
-        $this->assertSame(false, $field[3]->getData());
-        $this->assertSame(false, $field[4]->getData());
-        $this->assertSame('', $field[0]->getDisplayedData());
-        $this->assertSame('1', $field[1]->getDisplayedData());
-        $this->assertSame('', $field[2]->getDisplayedData());
-        $this->assertSame('', $field[3]->getDisplayedData());
-        $this->assertSame('', $field[4]->getDisplayedData());
-        $this->assertSame(array(0 => '', 1 => '1', 2 => '', 3 => '', 4 => ''), $field->getDisplayedData());
-    }
-
-    /**
-     * @dataProvider getChoicesVariants
-     */
-    public function testSubmitMultipleExpanded($choices)
-    {
-        $field = new ChoiceField('name', array(
-            'multiple' => true,
-            'expanded' => true,
-            'choices' => $choices,
-        ));
-
-        $field->submit(array('a' => 'a', 'b' => 'b'));
-
-        $this->assertSame(array('a', 'b'), $field->getData());
-        $this->assertSame(true, $field['a']->getData());
-        $this->assertSame(true, $field['b']->getData());
-        $this->assertSame(false, $field['c']->getData());
-        $this->assertSame(false, $field['d']->getData());
-        $this->assertSame(false, $field['e']->getData());
-        $this->assertSame('1', $field['a']->getDisplayedData());
-        $this->assertSame('1', $field['b']->getDisplayedData());
-        $this->assertSame('', $field['c']->getDisplayedData());
-        $this->assertSame('', $field['d']->getDisplayedData());
-        $this->assertSame('', $field['e']->getDisplayedData());
-        $this->assertSame(array('a' => '1', 'b' => '1', 'c' => '', 'd' => '', 'e' => ''), $field->getDisplayedData());
-    }
-
-    /**
-     * @dataProvider getNumericChoicesVariants
-     */
-    public function testSubmitMultipleExpandedNumericChoices($choices)
-    {
-        $field = new ChoiceField('name', array(
-            'multiple' => true,
-            'expanded' => true,
-            'choices' => $choices,
-        ));
-
-        $field->submit(array(1 => 1, 2 => 2));
-
-        $this->assertSame(array(1, 2), $field->getData());
-        $this->assertSame(false, $field[0]->getData());
-        $this->assertSame(true, $field[1]->getData());
-        $this->assertSame(true, $field[2]->getData());
-        $this->assertSame(false, $field[3]->getData());
-        $this->assertSame(false, $field[4]->getData());
-        $this->assertSame('', $field[0]->getDisplayedData());
-        $this->assertSame('1', $field[1]->getDisplayedData());
-        $this->assertSame('1', $field[2]->getDisplayedData());
-        $this->assertSame('', $field[3]->getDisplayedData());
-        $this->assertSame('', $field[4]->getDisplayedData());
-        $this->assertSame(array(0 => '', 1 => '1', 2 => '1', 3 => '', 4 => ''), $field->getDisplayedData());
-    }
-}
\ No newline at end of file
diff --git a/tests/Symfony/Tests/Component/Form/ChoiceList/ArrayChoiceListTest.php b/tests/Symfony/Tests/Component/Form/ChoiceList/ArrayChoiceListTest.php
new file mode 100644
index 0000000000..1c2e9f5a80
--- /dev/null
+++ b/tests/Symfony/Tests/Component/Form/ChoiceList/ArrayChoiceListTest.php
@@ -0,0 +1,53 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Tests\Component\Form\ChoiceList;
+
+use Symfony\Component\Form\ChoiceList\ArrayChoiceList;
+
+class ArrayChoiceListTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @expectedException Symfony\Component\Form\Exception\UnexpectedTypeException
+     */
+    public function testConstructorExpectsArrayOrClosure()
+    {
+        new ArrayChoiceList('foobar');
+    }
+
+    public function testGetChoices()
+    {
+        $choices = array('a' => 'A', 'b' => 'B');
+        $list = new ArrayChoiceList($choices);
+
+        $this->assertSame($choices, $list->getChoices());
+    }
+
+    public function testGetChoicesFromClosure()
+    {
+        $choices = array('a' => 'A', 'b' => 'B');
+        $closure = function () use ($choices) { return $choices; };
+        $list = new ArrayChoiceList($closure);
+
+        $this->assertSame($choices, $list->getChoices());
+    }
+
+    /**
+     * @expectedException Symfony\Component\Form\Exception\UnexpectedTypeException
+     */
+    public function testClosureShouldReturnArray()
+    {
+        $closure = function () { return 'foobar'; };
+        $list = new ArrayChoiceList($closure);
+
+        $list->getChoices();
+    }
+}
diff --git a/tests/Symfony/Tests/Component/Form/ChoiceList/MonthChoiceListTest.php b/tests/Symfony/Tests/Component/Form/ChoiceList/MonthChoiceListTest.php
new file mode 100644
index 0000000000..7772e406bf
--- /dev/null
+++ b/tests/Symfony/Tests/Component/Form/ChoiceList/MonthChoiceListTest.php
@@ -0,0 +1,90 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Tests\Component\Form\ChoiceList;
+
+use Symfony\Component\Form\ChoiceList\MonthChoiceList;
+
+class MonthChoiceListTest extends \PHPUnit_Framework_TestCase
+{
+    private $formatter;
+
+    protected function setUp()
+    {
+        if (!extension_loaded('intl')) {
+            $this->markTestSkipped('The "intl" extension is not available');
+        }
+
+        \Locale::setDefault('en');
+
+        // I would prefer to mock the formatter, but this leads to weird bugs
+        // with the current version of PHPUnit
+        $this->formatter = new \IntlDateFormatter(
+            \Locale::getDefault(),
+            \IntlDateFormatter::SHORT,
+            \IntlDateFormatter::NONE,
+            \DateTimeZone::UTC
+        );
+    }
+
+    public function testNumericMonthsIfPatternContainsNoMonth()
+    {
+        $this->formatter->setPattern('yy');
+
+        $months = array(1, 4);
+        $list = new MonthChoiceList($this->formatter, $months);
+
+        $names = array(1 => '01', 4 => '04');
+        $this->assertSame($names, $list->getChoices());
+    }
+
+    public function testFormattedMonthsShort()
+    {
+        $this->formatter->setPattern('dd.MMM.yy');
+
+        $months = array(1, 4);
+        $list = new MonthChoiceList($this->formatter, $months);
+
+        $names = array(1 => 'Jan', 4 => 'Apr');
+        $this->assertSame($names, $list->getChoices());
+    }
+
+    public function testFormattedMonthsLong()
+    {
+        $this->formatter->setPattern('dd.MMMM.yy');
+
+        $months = array(1, 4);
+        $list = new MonthChoiceList($this->formatter, $months);
+
+        $names = array(1 => 'January', 4 => 'April');
+        $this->assertSame($names, $list->getChoices());
+    }
+
+    public function testFormattedMonthsLongWithDifferentTimezone()
+    {
+        $this->formatter = new \IntlDateFormatter(
+            \Locale::getDefault(),
+            \IntlDateFormatter::SHORT,
+            \IntlDateFormatter::NONE,
+            'PST'
+        );
+
+        $this->formatter->setPattern('dd.MMMM.yy');
+
+        $months = array(1, 4);
+        $list = new MonthChoiceList($this->formatter, $months);
+
+        $names = array(1 => 'January', 4 => 'April');
+        // uses UTC internally
+        $this->assertSame($names, $list->getChoices());
+        $this->assertSame('PST', $this->formatter->getTimezoneId());
+    }
+}
diff --git a/tests/Symfony/Tests/Component/Form/CollectionFieldTest.php b/tests/Symfony/Tests/Component/Form/CollectionFieldTest.php
deleted file mode 100644
index 546a3e6b67..0000000000
--- a/tests/Symfony/Tests/Component/Form/CollectionFieldTest.php
+++ /dev/null
@@ -1,163 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Tests\Component\Form;
-
-require_once __DIR__ . '/Fixtures/TestField.php';
-
-use Symfony\Component\Form\CollectionField;
-use Symfony\Component\Form\Form;
-use Symfony\Tests\Component\Form\Fixtures\TestField;
-
-class CollectionFieldTest extends \PHPUnit_Framework_TestCase
-{
-    public function testContainsNoFieldsByDefault()
-    {
-        $field = new CollectionField('emails', array(
-            'prototype' => new TestField(),
-        ));
-        $this->assertEquals(0, count($field));
-    }
-
-    public function testSetDataAdjustsSize()
-    {
-        $field = new CollectionField('emails', array(
-            'prototype' => new TestField(),
-        ));
-        $field->setData(array('foo@foo.com', 'foo@bar.com'));
-
-        $this->assertTrue($field[0] instanceof TestField);
-        $this->assertTrue($field[1] instanceof TestField);
-        $this->assertEquals(2, count($field));
-        $this->assertEquals('foo@foo.com', $field[0]->getData());
-        $this->assertEquals('foo@bar.com', $field[1]->getData());
-
-        $field->setData(array('foo@baz.com'));
-        $this->assertTrue($field[0] instanceof TestField);
-        $this->assertFalse(isset($field[1]));
-        $this->assertEquals(1, count($field));
-        $this->assertEquals('foo@baz.com', $field[0]->getData());
-    }
-
-    public function testSetDataAdjustsSizeIfModifiable()
-    {
-        $field = new CollectionField('emails', array(
-            'prototype' => new TestField(),
-            'modifiable' => true,
-        ));
-        $field->setData(array('foo@foo.com', 'foo@bar.com'));
-
-        $this->assertTrue($field[0] instanceof TestField);
-        $this->assertTrue($field[1] instanceof TestField);
-        $this->assertTrue($field['$$key$$'] instanceof TestField);
-        $this->assertEquals(3, count($field));
-
-        $field->setData(array('foo@baz.com'));
-        $this->assertTrue($field[0] instanceof TestField);
-        $this->assertFalse(isset($field[1]));
-        $this->assertTrue($field['$$key$$'] instanceof TestField);
-        $this->assertEquals(2, count($field));
-    }
-
-    public function testThrowsExceptionIfObjectIsNotTraversable()
-    {
-        $field = new CollectionField('emails', array(
-            'prototype' => new TestField(),
-        ));
-        $this->setExpectedException('Symfony\Component\Form\Exception\UnexpectedTypeException');
-        $field->setData(new \stdClass());
-    }
-
-    public function testModifiableCollectionsContainExtraField()
-    {
-        $field = new CollectionField('emails', array(
-            'prototype' => new TestField(),
-            'modifiable' => true,
-        ));
-        $field->setData(array('foo@bar.com'));
-
-        $this->assertTrue($field['0'] instanceof TestField);
-        $this->assertTrue($field['$$key$$'] instanceof TestField);
-        $this->assertEquals(2, count($field));
-    }
-
-    public function testNotResizedIfSubmittedWithMissingData()
-    {
-        $field = new CollectionField('emails', array(
-            'prototype' => new TestField(),
-        ));
-        $field->setData(array('foo@foo.com', 'bar@bar.com'));
-        $field->submit(array('foo@bar.com'));
-
-        $this->assertTrue($field->has('0'));
-        $this->assertTrue($field->has('1'));
-        $this->assertEquals('foo@bar.com', $field[0]->getData());
-        $this->assertEquals(null, $field[1]->getData());
-    }
-
-    public function testResizedIfSubmittedWithMissingDataAndModifiable()
-    {
-        $field = new CollectionField('emails', array(
-            'prototype' => new TestField(),
-            'modifiable' => true,
-        ));
-        $field->setData(array('foo@foo.com', 'bar@bar.com'));
-        $field->submit(array('foo@bar.com'));
-
-        $this->assertTrue($field->has('0'));
-        $this->assertFalse($field->has('1'));
-        $this->assertEquals('foo@bar.com', $field[0]->getData());
-    }
-
-    public function testNotResizedIfSubmittedWithExtraData()
-    {
-        $field = new CollectionField('emails', array(
-            'prototype' => new TestField(),
-        ));
-        $field->setData(array('foo@bar.com'));
-        $field->submit(array('foo@foo.com', 'bar@bar.com'));
-
-        $this->assertTrue($field->has('0'));
-        $this->assertFalse($field->has('1'));
-        $this->assertEquals('foo@foo.com', $field[0]->getData());
-    }
-
-    public function testResizedUpIfSubmittedWithExtraDataAndModifiable()
-    {
-        $field = new CollectionField('emails', array(
-            'prototype' => new TestField(),
-            'modifiable' => true,
-        ));
-        $field->setData(array('foo@bar.com'));
-        $field->submit(array('foo@foo.com', 'bar@bar.com'));
-
-        $this->assertTrue($field->has('0'));
-        $this->assertTrue($field->has('1'));
-        $this->assertEquals('foo@foo.com', $field[0]->getData());
-        $this->assertEquals('bar@bar.com', $field[1]->getData());
-        $this->assertEquals(array('foo@foo.com', 'bar@bar.com'), $field->getData());
-    }
-
-    public function testResizedDownIfSubmittedWithLessDataAndModifiable()
-    {
-        $field = new CollectionField('emails', array(
-            'prototype' => new TestField(),
-            'modifiable' => true,
-        ));
-        $field->setData(array('foo@bar.com', 'bar@bar.com'));
-        $field->submit(array('foo@foo.com'));
-
-        $this->assertTrue($field->has('0'));
-        $this->assertFalse($field->has('1'));
-        $this->assertEquals('foo@foo.com', $field[0]->getData());
-        $this->assertEquals(array('foo@foo.com'), $field->getData());
-    }
-}
diff --git a/tests/Symfony/Tests/Component/Form/DataMapper/PropertyPathMapperTest.php b/tests/Symfony/Tests/Component/Form/DataMapper/PropertyPathMapperTest.php
new file mode 100644
index 0000000000..85a4430802
--- /dev/null
+++ b/tests/Symfony/Tests/Component/Form/DataMapper/PropertyPathMapperTest.php
@@ -0,0 +1,85 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Tests\Component\Form\DataMapper;
+
+use Symfony\Component\Form\FormBuilder;
+use Symfony\Component\Form\Util\PropertyPath;
+use Symfony\Component\Form\DataMapper\PropertyPathMapper;
+
+class PropertyPathMapperTest extends \PHPUnit_Framework_TestCase
+{
+    private $mapper;
+
+    private $propertyPath;
+
+    protected function setUp()
+    {
+        $this->mapper = new PropertyPathMapper();
+        $this->propertyPath = $this->getMockBuilder('Symfony\Component\Form\Util\PropertyPath')
+            ->disableOriginalConstructor()
+            ->getMock();
+    }
+
+    private function getForm(PropertyPath $propertyPath = null)
+    {
+        $form = $this->getMock('Symfony\Tests\Component\Form\FormInterface');
+
+        $form->expects($this->any())
+            ->method('getAttribute')
+            ->with('property_path')
+            ->will($this->returnValue($propertyPath));
+
+        return $form;
+    }
+
+    public function testMapDataToForm()
+    {
+        $data = new \stdClass();
+
+        $this->propertyPath->expects($this->once())
+            ->method('getValue')
+            ->with($data)
+            ->will($this->returnValue('foobar'));
+
+        $form = $this->getForm($this->propertyPath);
+
+        $form->expects($this->once())
+            ->method('setData')
+            ->with('foobar');
+
+        $this->mapper->mapDataToForm($data, $form);
+    }
+
+    public function testMapDataToFormIgnoresEmptyPropertyPath()
+    {
+        $data = new \stdClass();
+
+        $form = $this->getForm(null);
+
+        $form->expects($this->never())
+            ->method('setData');
+
+        $this->mapper->mapDataToForm($data, $form);
+    }
+
+    public function testMapDataToFormIgnoresEmptyData()
+    {
+        $form = $this->getForm($this->propertyPath);
+
+        $form->expects($this->never())
+            ->method('setData');
+
+        $form->getAttribute('property_path'); // <- weird PHPUnit bug if I don't do this
+
+        $this->mapper->mapDataToForm(null, $form);
+    }
+}
\ No newline at end of file
diff --git a/tests/Symfony/Tests/Component/Form/DataTransformer/ArrayToChoicesTransformerTest.php b/tests/Symfony/Tests/Component/Form/DataTransformer/ArrayToChoicesTransformerTest.php
new file mode 100644
index 0000000000..42bfd5ef98
--- /dev/null
+++ b/tests/Symfony/Tests/Component/Form/DataTransformer/ArrayToChoicesTransformerTest.php
@@ -0,0 +1,67 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Tests\Component\Form\DataTransformer;
+
+use Symfony\Component\Form\DataTransformer\ArrayToChoicesTransformer;
+
+class ArrayToChoicesTransformerTest extends \PHPUnit_Framework_TestCase
+{
+    protected $transformer;
+
+    protected function setUp()
+    {
+        $this->transformer = new ArrayToChoicesTransformer();
+    }
+
+    public function testTransform()
+    {
+        $in = array(0, false, '');
+        $out = array(0, 0, '');
+
+        $this->assertSame($out, $this->transformer->transform($in));
+    }
+
+    public function testTransformNull()
+    {
+        $this->assertSame(array(), $this->transformer->transform(null));
+    }
+
+    /**
+     * @expectedException Symfony\Component\Form\Exception\UnexpectedTypeException
+     */
+    public function testTransformExpectsArray()
+    {
+        $this->transformer->transform('foobar');
+    }
+
+    public function testReverseTransform()
+    {
+        // values are expected to be valid choices and stay the same
+        $in = array(0, 0, '');
+        $out = array(0, 0, '');
+
+        $this->assertSame($out, $this->transformer->transform($in));
+    }
+
+    public function testReverseTransformNull()
+    {
+        $this->assertSame(array(), $this->transformer->reverseTransform(null));
+    }
+
+    /**
+     * @expectedException Symfony\Component\Form\Exception\UnexpectedTypeException
+     */
+    public function testReverseTransformExpectsArray()
+    {
+        $this->transformer->reverseTransform('foobar');
+    }
+}
diff --git a/tests/Symfony/Tests/Component/Form/DataTransformer/ArrayToPartsTransformerTest.php b/tests/Symfony/Tests/Component/Form/DataTransformer/ArrayToPartsTransformerTest.php
new file mode 100644
index 0000000000..8f4593ecb3
--- /dev/null
+++ b/tests/Symfony/Tests/Component/Form/DataTransformer/ArrayToPartsTransformerTest.php
@@ -0,0 +1,144 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Tests\Component\Form\DataTransformer;
+
+use Symfony\Component\Form\DataTransformer\ArrayToPartsTransformer;
+
+class ArrayToPartsTransformerTest extends \PHPUnit_Framework_TestCase
+{
+    private $transformer;
+
+    protected function setUp()
+    {
+        $this->transformer = new ArrayToPartsTransformer(array(
+            'first' => array('a', 'b', 'c'),
+            'second' => array('d', 'e', 'f'),
+        ));
+    }
+
+    public function testTransform()
+    {
+        $input = array(
+            'a' => '1',
+            'b' => '2',
+            'c' => '3',
+            'd' => '4',
+            'e' => '5',
+            'f' => '6',
+        );
+
+        $output = array(
+            'first' => array(
+                'a' => '1',
+                'b' => '2',
+                'c' => '3',
+            ),
+            'second' => array(
+                'd' => '4',
+                'e' => '5',
+                'f' => '6',
+            ),
+        );
+
+        $this->assertSame($output, $this->transformer->transform($input));
+    }
+
+    public function testTransform_empty()
+    {
+        $output = array(
+            'first' => null,
+            'second' => null,
+        );
+
+        $this->assertSame($output, $this->transformer->transform(null));
+    }
+
+    /**
+     * @expectedException Symfony\Component\Form\Exception\UnexpectedTypeException
+     */
+    public function testTransformRequiresArray()
+    {
+        $this->transformer->transform('12345');
+    }
+
+    public function testReverseTransform()
+    {
+        $input = array(
+            'first' => array(
+                'a' => '1',
+                'b' => '2',
+                'c' => '3',
+            ),
+            'second' => array(
+                'd' => '4',
+                'e' => '5',
+                'f' => '6',
+            ),
+        );
+
+        $output = array(
+            'a' => '1',
+            'b' => '2',
+            'c' => '3',
+            'd' => '4',
+            'e' => '5',
+            'f' => '6',
+        );
+
+        $this->assertSame($output, $this->transformer->reverseTransform($input));
+    }
+
+    public function testReverseTransform_completelyEmpty()
+    {
+        $input = array(
+            'first' => '',
+            'second' => '',
+        );
+
+        $this->assertNull($this->transformer->reverseTransform($input));
+    }
+
+    public function testReverseTransform_completelyNull()
+    {
+        $input = array(
+            'first' => null,
+            'second' => null,
+        );
+
+        $this->assertNull($this->transformer->reverseTransform($input));
+    }
+
+    /**
+     * @expectedException Symfony\Component\Form\DataTransformer\TransformationFailedException
+     */
+    public function testReverseTransform_partiallyNull()
+    {
+        $input = array(
+            'first' => array(
+                'a' => '1',
+                'b' => '2',
+                'c' => '3',
+            ),
+            'second' => null,
+        );
+
+        $this->transformer->reverseTransform($input);
+    }
+
+    /**
+     * @expectedException Symfony\Component\Form\Exception\UnexpectedTypeException
+     */
+    public function testReverseTransformRequiresArray()
+    {
+        $this->transformer->reverseTransform('12345');
+    }
+}
diff --git a/tests/Symfony/Tests/Component/Form/ValueTransformer/BooleanToStringTransformerTest.php b/tests/Symfony/Tests/Component/Form/DataTransformer/BooleanToStringTransformerTest.php
similarity index 81%
rename from tests/Symfony/Tests/Component/Form/ValueTransformer/BooleanToStringTransformerTest.php
rename to tests/Symfony/Tests/Component/Form/DataTransformer/BooleanToStringTransformerTest.php
index 977a729e1b..cc15d0f26d 100644
--- a/tests/Symfony/Tests/Component/Form/ValueTransformer/BooleanToStringTransformerTest.php
+++ b/tests/Symfony/Tests/Component/Form/DataTransformer/BooleanToStringTransformerTest.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Tests\Component\Form\ValueTransformer;
+namespace Symfony\Tests\Component\Form\DataTransformer;
 
-use Symfony\Component\Form\ValueTransformer\BooleanToStringTransformer;
+use Symfony\Component\Form\DataTransformer\BooleanToStringTransformer;
 
 class BooleanToStringTransformerTest extends \PHPUnit_Framework_TestCase
 {
@@ -40,13 +40,14 @@ class BooleanToStringTransformerTest extends \PHPUnit_Framework_TestCase
     {
         $this->setExpectedException('Symfony\Component\Form\Exception\UnexpectedTypeException');
 
-        $this->transformer->reverseTransform(1, null);
+        $this->transformer->reverseTransform(1);
     }
 
     public function testReverseTransform()
     {
-        $this->assertEquals(true, $this->transformer->reverseTransform('1', null));
-        $this->assertEquals(true, $this->transformer->reverseTransform('0', null));
-        $this->assertEquals(false, $this->transformer->reverseTransform('', null));
+        $this->assertEquals(true, $this->transformer->reverseTransform('1'));
+        $this->assertEquals(true, $this->transformer->reverseTransform('0'));
+        $this->assertEquals(false, $this->transformer->reverseTransform(''));
+        $this->assertEquals(false, $this->transformer->reverseTransform(null));
     }
 }
diff --git a/tests/Symfony/Tests/Component/Form/ValueTransformer/ValueTransformerChainTest.php b/tests/Symfony/Tests/Component/Form/DataTransformer/DataTransformerChainTest.php
similarity index 64%
rename from tests/Symfony/Tests/Component/Form/ValueTransformer/ValueTransformerChainTest.php
rename to tests/Symfony/Tests/Component/Form/DataTransformer/DataTransformerChainTest.php
index fb860f58d5..0814293a18 100644
--- a/tests/Symfony/Tests/Component/Form/ValueTransformer/ValueTransformerChainTest.php
+++ b/tests/Symfony/Tests/Component/Form/DataTransformer/DataTransformerChainTest.php
@@ -9,44 +9,44 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Tests\Component\Form\ValueTransformer;
+namespace Symfony\Tests\Component\Form\DataTransformer;
 
-use Symfony\Component\Form\ValueTransformer\ValueTransformerChain;
+use Symfony\Component\Form\DataTransformer\DataTransformerChain;
 
-class ValueTransformerChainTest extends \PHPUnit_Framework_TestCase
+class DataTransformerChainTest extends \PHPUnit_Framework_TestCase
 {
     public function testTransform()
     {
-        $transformer1 = $this->getMock('Symfony\Component\Form\ValueTransformer\ValueTransformerInterface');
+        $transformer1 = $this->getMock('Symfony\Component\Form\DataTransformer\DataTransformerInterface');
         $transformer1->expects($this->once())
                                  ->method('transform')
                                  ->with($this->identicalTo('foo'))
                                  ->will($this->returnValue('bar'));
-        $transformer2 = $this->getMock('Symfony\Component\Form\ValueTransformer\ValueTransformerInterface');
+        $transformer2 = $this->getMock('Symfony\Component\Form\DataTransformer\DataTransformerInterface');
         $transformer2->expects($this->once())
                                  ->method('transform')
                                  ->with($this->identicalTo('bar'))
                                  ->will($this->returnValue('baz'));
 
-        $chain = new ValueTransformerChain(array($transformer1, $transformer2));
+        $chain = new DataTransformerChain(array($transformer1, $transformer2));
 
         $this->assertEquals('baz', $chain->transform('foo'));
     }
 
     public function testReverseTransform()
     {
-        $transformer2 = $this->getMock('Symfony\Component\Form\ValueTransformer\ValueTransformerInterface');
+        $transformer2 = $this->getMock('Symfony\Component\Form\DataTransformer\DataTransformerInterface');
         $transformer2->expects($this->once())
                                  ->method('reverseTransform')
                                  ->with($this->identicalTo('foo'))
                                  ->will($this->returnValue('bar'));
-        $transformer1 = $this->getMock('Symfony\Component\Form\ValueTransformer\ValueTransformerInterface');
+        $transformer1 = $this->getMock('Symfony\Component\Form\DataTransformer\DataTransformerInterface');
         $transformer1->expects($this->once())
                                  ->method('reverseTransform')
                                  ->with($this->identicalTo('bar'))
                                  ->will($this->returnValue('baz'));
 
-        $chain = new ValueTransformerChain(array($transformer1, $transformer2));
+        $chain = new DataTransformerChain(array($transformer1, $transformer2));
 
         $this->assertEquals('baz', $chain->reverseTransform('foo', null));
     }
diff --git a/tests/Symfony/Tests/Component/Form/DateTimeTestCase.php b/tests/Symfony/Tests/Component/Form/DataTransformer/DateTimeTestCase.php
similarity index 81%
rename from tests/Symfony/Tests/Component/Form/DateTimeTestCase.php
rename to tests/Symfony/Tests/Component/Form/DataTransformer/DateTimeTestCase.php
index aa47d99276..9579e36c67 100644
--- a/tests/Symfony/Tests/Component/Form/DateTimeTestCase.php
+++ b/tests/Symfony/Tests/Component/Form/DataTransformer/DateTimeTestCase.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Tests\Component\Form;
+namespace Symfony\Tests\Component\Form\DataTransformer;
 
-require_once __DIR__ . '/LocalizedTestCase.php';
+require_once __DIR__.'/LocalizedTestCase.php';
 
 class DateTimeTestCase extends LocalizedTestCase
 {
diff --git a/tests/Symfony/Tests/Component/Form/ValueTransformer/DateTimeToArrayTransformerTest.php b/tests/Symfony/Tests/Component/Form/DataTransformer/DateTimeToArrayTransformerTest.php
similarity index 58%
rename from tests/Symfony/Tests/Component/Form/ValueTransformer/DateTimeToArrayTransformerTest.php
rename to tests/Symfony/Tests/Component/Form/DataTransformer/DateTimeToArrayTransformerTest.php
index 159bab044d..5323da88bc 100644
--- a/tests/Symfony/Tests/Component/Form/ValueTransformer/DateTimeToArrayTransformerTest.php
+++ b/tests/Symfony/Tests/Component/Form/DataTransformer/DateTimeToArrayTransformerTest.php
@@ -9,21 +9,17 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Tests\Component\Form\ValueTransformer;
+namespace Symfony\Tests\Component\Form\DataTransformer;
 
-require_once __DIR__ . '/../DateTimeTestCase.php';
+require_once __DIR__ . '/DateTimeTestCase.php';
 
-use Symfony\Component\Form\ValueTransformer\DateTimeToArrayTransformer;
-use Symfony\Tests\Component\Form\DateTimeTestCase;
+use Symfony\Component\Form\DataTransformer\DateTimeToArrayTransformer;
 
 class DateTimeToArrayTransformerTest extends DateTimeTestCase
 {
     public function testTransform()
     {
-        $transformer = new DateTimeToArrayTransformer(array(
-            'input_timezone' => 'UTC',
-            'output_timezone' => 'UTC',
-        ));
+        $transformer = new DateTimeToArrayTransformer('UTC', 'UTC');
 
         $input = new \DateTime('2010-02-03 04:05:06 UTC');
 
@@ -55,13 +51,22 @@ class DateTimeToArrayTransformerTest extends DateTimeTestCase
         $this->assertSame($output, $transformer->transform(null));
     }
 
+    public function testTransform_empty_withFields()
+    {
+        $transformer = new DateTimeToArrayTransformer(null, null, array('year', 'minute', 'second'));
+
+        $output = array(
+            'year' => '',
+            'minute' => '',
+            'second' => '',
+        );
+
+        $this->assertSame($output, $transformer->transform(null));
+    }
+
     public function testTransform_withFields()
     {
-        $transformer = new DateTimeToArrayTransformer(array(
-            'input_timezone' => 'UTC',
-            'output_timezone' => 'UTC',
-            'fields' => array('year', 'month', 'minute', 'second'),
-        ));
+        $transformer = new DateTimeToArrayTransformer('UTC', 'UTC', array('year', 'month', 'minute', 'second'));
 
         $input = new \DateTime('2010-02-03 04:05:06 UTC');
 
@@ -77,11 +82,7 @@ class DateTimeToArrayTransformerTest extends DateTimeTestCase
 
     public function testTransform_withPadding()
     {
-        $transformer = new DateTimeToArrayTransformer(array(
-            'input_timezone' => 'UTC',
-            'output_timezone' => 'UTC',
-            'pad' => true,
-        ));
+        $transformer = new DateTimeToArrayTransformer('UTC', 'UTC', null, true);
 
         $input = new \DateTime('2010-02-03 04:05:06 UTC');
 
@@ -99,10 +100,7 @@ class DateTimeToArrayTransformerTest extends DateTimeTestCase
 
     public function testTransform_differentTimezones()
     {
-        $transformer = new DateTimeToArrayTransformer(array(
-            'input_timezone' => 'America/New_York',
-            'output_timezone' => 'Asia/Hong_Kong',
-        ));
+        $transformer = new DateTimeToArrayTransformer('America/New_York', 'Asia/Hong_Kong');
 
         $input = new \DateTime('2010-02-03 04:05:06 America/New_York');
 
@@ -131,10 +129,7 @@ class DateTimeToArrayTransformerTest extends DateTimeTestCase
 
     public function testReverseTransform()
     {
-        $transformer = new DateTimeToArrayTransformer(array(
-            'input_timezone' => 'UTC',
-            'output_timezone' => 'UTC',
-        ));
+        $transformer = new DateTimeToArrayTransformer('UTC', 'UTC');
 
         $input = array(
             'year' => '2010',
@@ -150,7 +145,25 @@ class DateTimeToArrayTransformerTest extends DateTimeTestCase
         $this->assertDateTimeEquals($output, $transformer->reverseTransform($input, null));
     }
 
-    public function testReverseTransform_empty()
+    public function testReverseTransformWithSomeZero()
+    {
+        $transformer = new DateTimeToArrayTransformer('UTC', 'UTC');
+
+        $input = array(
+            'year' => '2010',
+            'month' => '2',
+            'day' => '3',
+            'hour' => '4',
+            'minute' => '0',
+            'second' => '0',
+        );
+
+        $output = new \DateTime('2010-02-03 04:00:00 UTC');
+
+        $this->assertDateTimeEquals($output, $transformer->reverseTransform($input, null));
+    }
+
+    public function testReverseTransform_completelyEmpty()
     {
         $transformer = new DateTimeToArrayTransformer();
 
@@ -166,6 +179,109 @@ class DateTimeToArrayTransformerTest extends DateTimeTestCase
         $this->assertSame(null, $transformer->reverseTransform($input, null));
     }
 
+    public function testReverseTransform_completelyEmpty_subsetOfFields()
+    {
+        $transformer = new DateTimeToArrayTransformer(null, null, array('year', 'month', 'day'));
+
+        $input = array(
+            'year' => '',
+            'month' => '',
+            'day' => '',
+        );
+
+        $this->assertSame(null, $transformer->reverseTransform($input, null));
+    }
+
+    /**
+     * @expectedException Symfony\Component\Form\DataTransformer\TransformationFailedException
+     */
+    public function testReverseTransform_partiallyEmpty_year()
+    {
+        $transformer = new DateTimeToArrayTransformer();
+        $transformer->reverseTransform(array(
+            'month' => '2',
+            'day' => '3',
+            'hour' => '4',
+            'minute' => '5',
+            'second' => '6',
+        ));
+    }
+
+    /**
+     * @expectedException Symfony\Component\Form\DataTransformer\TransformationFailedException
+     */
+    public function testReverseTransform_partiallyEmpty_month()
+    {
+        $transformer = new DateTimeToArrayTransformer();
+        $transformer->reverseTransform(array(
+            'year' => '2010',
+            'day' => '3',
+            'hour' => '4',
+            'minute' => '5',
+            'second' => '6',
+        ));
+    }
+
+    /**
+     * @expectedException Symfony\Component\Form\DataTransformer\TransformationFailedException
+     */
+    public function testReverseTransform_partiallyEmpty_day()
+    {
+        $transformer = new DateTimeToArrayTransformer();
+        $transformer->reverseTransform(array(
+            'year' => '2010',
+            'month' => '2',
+            'hour' => '4',
+            'minute' => '5',
+            'second' => '6',
+        ));
+    }
+
+    /**
+     * @expectedException Symfony\Component\Form\DataTransformer\TransformationFailedException
+     */
+    public function testReverseTransform_partiallyEmpty_hour()
+    {
+        $transformer = new DateTimeToArrayTransformer();
+        $transformer->reverseTransform(array(
+            'year' => '2010',
+            'month' => '2',
+            'day' => '3',
+            'minute' => '5',
+            'second' => '6',
+        ));
+    }
+
+    /**
+     * @expectedException Symfony\Component\Form\DataTransformer\TransformationFailedException
+     */
+    public function testReverseTransform_partiallyEmpty_minute()
+    {
+        $transformer = new DateTimeToArrayTransformer();
+        $transformer->reverseTransform(array(
+            'year' => '2010',
+            'month' => '2',
+            'day' => '3',
+            'hour' => '4',
+            'second' => '6',
+        ));
+    }
+
+    /**
+     * @expectedException Symfony\Component\Form\DataTransformer\TransformationFailedException
+     */
+    public function testReverseTransform_partiallyEmpty_second()
+    {
+        $transformer = new DateTimeToArrayTransformer();
+        $transformer->reverseTransform(array(
+            'year' => '2010',
+            'month' => '2',
+            'day' => '3',
+            'hour' => '4',
+            'minute' => '5',
+        ));
+    }
+
     public function testReverseTransform_null()
     {
         $transformer = new DateTimeToArrayTransformer();
@@ -175,10 +291,7 @@ class DateTimeToArrayTransformerTest extends DateTimeTestCase
 
     public function testReverseTransform_differentTimezones()
     {
-        $transformer = new DateTimeToArrayTransformer(array(
-            'input_timezone' => 'America/New_York',
-            'output_timezone' => 'Asia/Hong_Kong',
-        ));
+        $transformer = new DateTimeToArrayTransformer('America/New_York', 'Asia/Hong_Kong');
 
         $input = array(
             'year' => '2010',
@@ -197,10 +310,7 @@ class DateTimeToArrayTransformerTest extends DateTimeTestCase
 
     public function testReverseTransformToDifferentTimezone()
     {
-        $transformer = new DateTimeToArrayTransformer(array(
-            'input_timezone' => 'Asia/Hong_Kong',
-            'output_timezone' => 'UTC',
-        ));
+        $transformer = new DateTimeToArrayTransformer('Asia/Hong_Kong', 'UTC');
 
         $input = array(
             'year' => '2010',
@@ -227,7 +337,7 @@ class DateTimeToArrayTransformerTest extends DateTimeTestCase
     }
 
     /**
-     * @expectedException Symfony\Component\Form\ValueTransformer\TransformationFailedException
+     * @expectedException Symfony\Component\Form\DataTransformer\TransformationFailedException
      */
     public function testReverseTransformWithNegativeYear()
     {
@@ -243,7 +353,7 @@ class DateTimeToArrayTransformerTest extends DateTimeTestCase
     }
 
     /**
-     * @expectedException Symfony\Component\Form\ValueTransformer\TransformationFailedException
+     * @expectedException Symfony\Component\Form\DataTransformer\TransformationFailedException
      */
     public function testReverseTransformWithNegativeMonth()
     {
@@ -259,7 +369,7 @@ class DateTimeToArrayTransformerTest extends DateTimeTestCase
     }
 
     /**
-     * @expectedException Symfony\Component\Form\ValueTransformer\TransformationFailedException
+     * @expectedException Symfony\Component\Form\DataTransformer\TransformationFailedException
      */
     public function testReverseTransformWithNegativeDay()
     {
@@ -275,7 +385,7 @@ class DateTimeToArrayTransformerTest extends DateTimeTestCase
     }
 
     /**
-     * @expectedException Symfony\Component\Form\ValueTransformer\TransformationFailedException
+     * @expectedException Symfony\Component\Form\DataTransformer\TransformationFailedException
      */
     public function testReverseTransformWithNegativeHour()
     {
@@ -291,7 +401,7 @@ class DateTimeToArrayTransformerTest extends DateTimeTestCase
     }
 
     /**
-     * @expectedException Symfony\Component\Form\ValueTransformer\TransformationFailedException
+     * @expectedException Symfony\Component\Form\DataTransformer\TransformationFailedException
      */
     public function testReverseTransformWithNegativeMinute()
     {
@@ -307,7 +417,7 @@ class DateTimeToArrayTransformerTest extends DateTimeTestCase
     }
 
     /**
-     * @expectedException Symfony\Component\Form\ValueTransformer\TransformationFailedException
+     * @expectedException Symfony\Component\Form\DataTransformer\TransformationFailedException
      */
     public function testReverseTransformWithNegativeSecond()
     {
diff --git a/tests/Symfony/Tests/Component/Form/ValueTransformer/DateTimeToLocalizedStringTransformerTest.php b/tests/Symfony/Tests/Component/Form/DataTransformer/DateTimeToLocalizedStringTransformerTest.php
similarity index 70%
rename from tests/Symfony/Tests/Component/Form/ValueTransformer/DateTimeToLocalizedStringTransformerTest.php
rename to tests/Symfony/Tests/Component/Form/DataTransformer/DateTimeToLocalizedStringTransformerTest.php
index c773ba31fc..d41be74bce 100644
--- a/tests/Symfony/Tests/Component/Form/ValueTransformer/DateTimeToLocalizedStringTransformerTest.php
+++ b/tests/Symfony/Tests/Component/Form/DataTransformer/DateTimeToLocalizedStringTransformerTest.php
@@ -9,12 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Tests\Component\Form\ValueTransformer;
+namespace Symfony\Tests\Component\Form\DataTransformer;
 
-require_once __DIR__ . '/../DateTimeTestCase.php';
+require_once __DIR__ . '/DateTimeTestCase.php';
 
-use Symfony\Component\Form\ValueTransformer\DateTimeToLocalizedStringTransformer;
-use Symfony\Tests\Component\Form\DateTimeTestCase;
+use Symfony\Component\Form\DataTransformer\DateTimeToLocalizedStringTransformer;
 
 class DateTimeToLocalizedStringTransformerTest extends DateTimeTestCase
 {
@@ -43,87 +42,55 @@ class DateTimeToLocalizedStringTransformerTest extends DateTimeTestCase
 
     public function testTransformShortDate()
     {
-        $transformer = new DateTimeToLocalizedStringTransformer(array(
-            'input_timezone' => 'UTC',
-            'output_timezone' => 'UTC',
-            'date_format' => 'short',
-        ));
+        $transformer = new DateTimeToLocalizedStringTransformer('UTC', 'UTC', \IntlDateFormatter::SHORT);
         $this->assertEquals('03.02.10 04:05', $transformer->transform($this->dateTime));
     }
 
     public function testTransformMediumDate()
     {
-        $transformer = new DateTimeToLocalizedStringTransformer(array(
-            'input_timezone' => 'UTC',
-            'output_timezone' => 'UTC',
-            'date_format' => 'medium',
-        ));
+        $transformer = new DateTimeToLocalizedStringTransformer('UTC', 'UTC', \IntlDateFormatter::MEDIUM);
 
         $this->assertEquals('03.02.2010 04:05', $transformer->transform($this->dateTime));
     }
 
     public function testTransformLongDate()
     {
-        $transformer = new DateTimeToLocalizedStringTransformer(array(
-            'input_timezone' => 'UTC',
-            'output_timezone' => 'UTC',
-            'date_format' => 'long',
-        ));
+        $transformer = new DateTimeToLocalizedStringTransformer('UTC', 'UTC', \IntlDateFormatter::LONG);
 
         $this->assertEquals('03. Februar 2010 04:05', $transformer->transform($this->dateTime));
     }
 
     public function testTransformFullDate()
     {
-        $transformer = new DateTimeToLocalizedStringTransformer(array(
-            'input_timezone' => 'UTC',
-            'output_timezone' => 'UTC',
-            'date_format' => 'full',
-        ));
+        $transformer = new DateTimeToLocalizedStringTransformer('UTC', 'UTC', \IntlDateFormatter::FULL);
 
         $this->assertEquals('Mittwoch, 03. Februar 2010 04:05', $transformer->transform($this->dateTime));
     }
 
     public function testTransformShortTime()
     {
-        $transformer = new DateTimeToLocalizedStringTransformer(array(
-            'input_timezone' => 'UTC',
-            'output_timezone' => 'UTC',
-            'time_format' => 'short',
-        ));
+        $transformer = new DateTimeToLocalizedStringTransformer('UTC', 'UTC', null, \IntlDateFormatter::SHORT);
 
         $this->assertEquals('03.02.2010 04:05', $transformer->transform($this->dateTime));
     }
 
     public function testTransformMediumTime()
     {
-        $transformer = new DateTimeToLocalizedStringTransformer(array(
-            'input_timezone' => 'UTC',
-            'output_timezone' => 'UTC',
-            'time_format' => 'medium',
-        ));
+        $transformer = new DateTimeToLocalizedStringTransformer('UTC', 'UTC', null, \IntlDateFormatter::MEDIUM);
 
         $this->assertEquals('03.02.2010 04:05:06', $transformer->transform($this->dateTime));
     }
 
     public function testTransformLongTime()
     {
-        $transformer = new DateTimeToLocalizedStringTransformer(array(
-            'input_timezone' => 'UTC',
-            'output_timezone' => 'UTC',
-            'time_format' => 'long',
-        ));
+        $transformer = new DateTimeToLocalizedStringTransformer('UTC', 'UTC', null, \IntlDateFormatter::LONG);
 
         $this->assertEquals('03.02.2010 04:05:06 GMT+00:00', $transformer->transform($this->dateTime));
     }
 
     public function testTransformFullTime()
     {
-        $transformer = new DateTimeToLocalizedStringTransformer(array(
-            'input_timezone' => 'UTC',
-            'output_timezone' => 'UTC',
-            'time_format' => 'full',
-        ));
+        $transformer = new DateTimeToLocalizedStringTransformer('UTC', 'UTC', null, \IntlDateFormatter::FULL);
 
         $this->assertEquals('03.02.2010 04:05:06 GMT+00:00', $transformer->transform($this->dateTime));
     }
@@ -132,10 +99,7 @@ class DateTimeToLocalizedStringTransformerTest extends DateTimeTestCase
     {
         \Locale::setDefault('en_US');
 
-        $transformer = new DateTimeToLocalizedStringTransformer(array(
-            'input_timezone' => 'UTC',
-            'output_timezone' => 'UTC',
-        ));
+        $transformer = new DateTimeToLocalizedStringTransformer('UTC', 'UTC');
 
         $this->assertEquals('Feb 3, 2010 4:05 AM', $transformer->transform($this->dateTime));
     }
@@ -149,11 +113,7 @@ class DateTimeToLocalizedStringTransformerTest extends DateTimeTestCase
 
     public function testTransform_differentTimezones()
     {
-        $transformer = new DateTimeToLocalizedStringTransformer(array(
-            'input_timezone' => 'America/New_York',
-            'output_timezone' => 'Asia/Hong_Kong',
-        ));
-
+        $transformer = new DateTimeToLocalizedStringTransformer('America/New_York', 'Asia/Hong_Kong');
 
         $input = new \DateTime('2010-02-03 04:05:06 America/New_York');
 
@@ -178,95 +138,63 @@ class DateTimeToLocalizedStringTransformerTest extends DateTimeTestCase
 
         // HOW TO REPRODUCE?
 
-        //$this->setExpectedException('Symfony\Component\Form\ValueTransformer\Transdate_formationFailedException');
+        //$this->setExpectedException('Symfony\Component\Form\DataTransformer\Transdate_formationFailedException');
 
         //$transformer->transform(1.5);
     }
 
     public function testReverseTransformShortDate()
     {
-        $transformer = new DateTimeToLocalizedStringTransformer(array(
-            'input_timezone' => 'UTC',
-            'output_timezone' => 'UTC',
-            'date_format' => 'short',
-        ));
+        $transformer = new DateTimeToLocalizedStringTransformer('UTC', 'UTC', \IntlDateFormatter::SHORT);
 
         $this->assertDateTimeEquals($this->dateTimeWithoutSeconds, $transformer->reverseTransform('03.02.10 04:05', null));
     }
 
     public function testReverseTransformMediumDate()
     {
-        $transformer = new DateTimeToLocalizedStringTransformer(array(
-            'input_timezone' => 'UTC',
-            'output_timezone' => 'UTC',
-            'date_format' => 'medium',
-        ));
+        $transformer = new DateTimeToLocalizedStringTransformer('UTC', 'UTC', \IntlDateFormatter::MEDIUM);
 
         $this->assertDateTimeEquals($this->dateTimeWithoutSeconds, $transformer->reverseTransform('03.02.2010 04:05', null));
     }
 
     public function testReverseTransformLongDate()
     {
-        $transformer = new DateTimeToLocalizedStringTransformer(array(
-            'input_timezone' => 'UTC',
-            'output_timezone' => 'UTC',
-            'date_format' => 'long',
-        ));
+        $transformer = new DateTimeToLocalizedStringTransformer('UTC', 'UTC', \IntlDateFormatter::LONG);
 
         $this->assertDateTimeEquals($this->dateTimeWithoutSeconds, $transformer->reverseTransform('03. Februar 2010 04:05', null));
     }
 
     public function testReverseTransformFullDate()
     {
-        $transformer = new DateTimeToLocalizedStringTransformer(array(
-            'input_timezone' => 'UTC',
-            'output_timezone' => 'UTC',
-            'date_format' => 'full',
-        ));
+        $transformer = new DateTimeToLocalizedStringTransformer('UTC', 'UTC', \IntlDateFormatter::FULL);
 
         $this->assertDateTimeEquals($this->dateTimeWithoutSeconds, $transformer->reverseTransform('Mittwoch, 03. Februar 2010 04:05', null));
     }
 
     public function testReverseTransformShortTime()
     {
-        $transformer = new DateTimeToLocalizedStringTransformer(array(
-            'input_timezone' => 'UTC',
-            'output_timezone' => 'UTC',
-            'time_format' => 'short',
-        ));
+        $transformer = new DateTimeToLocalizedStringTransformer('UTC', 'UTC', null, \IntlDateFormatter::SHORT);
 
         $this->assertDateTimeEquals($this->dateTimeWithoutSeconds, $transformer->reverseTransform('03.02.2010 04:05', null));
     }
 
     public function testReverseTransformMediumTime()
     {
-        $transformer = new DateTimeToLocalizedStringTransformer(array(
-            'input_timezone' => 'UTC',
-            'output_timezone' => 'UTC',
-            'time_format' => 'medium',
-        ));
+        $transformer = new DateTimeToLocalizedStringTransformer('UTC', 'UTC', null, \IntlDateFormatter::MEDIUM);
 
         $this->assertDateTimeEquals($this->dateTime, $transformer->reverseTransform('03.02.2010 04:05:06', null));
     }
 
     public function testReverseTransformLongTime()
     {
-        $transformer = new DateTimeToLocalizedStringTransformer(array(
-            'input_timezone' => 'UTC',
-            'output_timezone' => 'UTC',
-            'time_format' => 'long',
-        ));
+        $transformer = new DateTimeToLocalizedStringTransformer('UTC', 'UTC', null, \IntlDateFormatter::LONG);
 
         $this->assertDateTimeEquals($this->dateTime, $transformer->reverseTransform('03.02.2010 04:05:06 GMT+00:00', null));
     }
 
     public function testReverseTransformFullTime()
     {
-        $transformer = new DateTimeToLocalizedStringTransformer(array(
-            'input_timezone' => 'UTC',
-            'output_timezone' => 'UTC',
-            'time_format' => 'full',
-        ));
+        $transformer = new DateTimeToLocalizedStringTransformer('UTC', 'UTC', null, \IntlDateFormatter::FULL);
 
         $this->assertDateTimeEquals($this->dateTime, $transformer->reverseTransform('03.02.2010 04:05:06 GMT+00:00', null));
     }
@@ -275,21 +203,14 @@ class DateTimeToLocalizedStringTransformerTest extends DateTimeTestCase
     {
         \Locale::setDefault('en_US');
 
-        $transformer = new DateTimeToLocalizedStringTransformer(array(
-            'input_timezone' => 'UTC',
-            'output_timezone' => 'UTC',
-        ));
+        $transformer = new DateTimeToLocalizedStringTransformer('UTC', 'UTC');
 
         $this->assertDateTimeEquals($this->dateTimeWithoutSeconds, $transformer->reverseTransform('Feb 3, 2010 04:05 AM', null));
     }
 
     public function testReverseTransform_differentTimezones()
     {
-        $transformer = new DateTimeToLocalizedStringTransformer(array(
-            'input_timezone' => 'America/New_York',
-            'output_timezone' => 'Asia/Hong_Kong',
-        ));
-
+        $transformer = new DateTimeToLocalizedStringTransformer('America/New_York', 'Asia/Hong_Kong');
 
         $dateTime = new \DateTime('2010-02-03 04:05:00 Asia/Hong_Kong');
         $dateTime->setTimezone(new \DateTimeZone('America/New_York'));
@@ -317,7 +238,7 @@ class DateTimeToLocalizedStringTransformerTest extends DateTimeTestCase
     {
         $transformer = new DateTimeToLocalizedStringTransformer();
 
-        $this->setExpectedException('Symfony\Component\Form\ValueTransformer\TransformationFailedException');
+        $this->setExpectedException('Symfony\Component\Form\DataTransformer\TransformationFailedException');
 
         $transformer->reverseTransform('12345', null);
     }
@@ -326,13 +247,13 @@ class DateTimeToLocalizedStringTransformerTest extends DateTimeTestCase
     {
         $this->setExpectedException('\InvalidArgumentException');
 
-        new DateTimeToLocalizedStringTransformer(array('date_format' => 'foobar'));
+        new DateTimeToLocalizedStringTransformer(null, null, 'foobar');
     }
 
     public function testValidateTimeFormatOption()
     {
         $this->setExpectedException('\InvalidArgumentException');
 
-        new DateTimeToLocalizedStringTransformer(array('time_format' => 'foobar'));
+        new DateTimeToLocalizedStringTransformer(null, null, null, 'foobar');
     }
 }
diff --git a/tests/Symfony/Tests/Component/Form/ValueTransformer/DateTimeToStringTransformerTest.php b/tests/Symfony/Tests/Component/Form/DataTransformer/DateTimeToStringTransformerTest.php
similarity index 75%
rename from tests/Symfony/Tests/Component/Form/ValueTransformer/DateTimeToStringTransformerTest.php
rename to tests/Symfony/Tests/Component/Form/DataTransformer/DateTimeToStringTransformerTest.php
index 8b2ccffabe..426e03e9b9 100644
--- a/tests/Symfony/Tests/Component/Form/ValueTransformer/DateTimeToStringTransformerTest.php
+++ b/tests/Symfony/Tests/Component/Form/DataTransformer/DateTimeToStringTransformerTest.php
@@ -9,21 +9,17 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Tests\Component\Form\ValueTransformer;
+namespace Symfony\Tests\Component\Form\DataTransformer;
 
-require_once __DIR__ . '/../DateTimeTestCase.php';
+require_once __DIR__ . '/DateTimeTestCase.php';
 
-use Symfony\Component\Form\ValueTransformer\DateTimeToStringTransformer;
-use Symfony\Tests\Component\Form\DateTimeTestCase;
+use Symfony\Component\Form\DataTransformer\DateTimeToStringTransformer;
 
 class DateTimeToStringTransformerTest extends DateTimeTestCase
 {
     public function testTransform()
     {
-        $transformer = new DateTimeToStringTransformer(array(
-            'input_timezone' => 'UTC',
-            'output_timezone' => 'UTC',
-        ));
+        $transformer = new DateTimeToStringTransformer('UTC', 'UTC', 'Y-m-d H:i:s');
 
         $input = new \DateTime('2010-02-03 04:05:06 UTC');
         $output = clone $input;
@@ -42,10 +38,7 @@ class DateTimeToStringTransformerTest extends DateTimeTestCase
 
     public function testTransform_differentTimezones()
     {
-        $transformer = new DateTimeToStringTransformer(array(
-            'input_timezone' => 'Asia/Hong_Kong',
-            'output_timezone' => 'America/New_York',
-        ));
+        $transformer = new DateTimeToStringTransformer('Asia/Hong_Kong', 'America/New_York', 'Y-m-d H:i:s');
 
         $input = new \DateTime('2010-02-03 04:05:06 America/New_York');
         $output = $input->format('Y-m-d H:i:s');
@@ -65,10 +58,7 @@ class DateTimeToStringTransformerTest extends DateTimeTestCase
 
     public function testReverseTransform()
     {
-        $reverseTransformer = new DateTimeToStringTransformer(array(
-            'input_timezone' => 'UTC',
-            'output_timezone' => 'UTC',
-        ));
+        $reverseTransformer = new DateTimeToStringTransformer('UTC', 'UTC', 'Y-m-d H:i:s');
 
         $output = new \DateTime('2010-02-03 04:05:06 UTC');
         $input = $output->format('Y-m-d H:i:s');
@@ -85,10 +75,7 @@ class DateTimeToStringTransformerTest extends DateTimeTestCase
 
     public function testReverseTransform_differentTimezones()
     {
-        $reverseTransformer = new DateTimeToStringTransformer(array(
-            'input_timezone' => 'America/New_York',
-            'output_timezone' => 'Asia/Hong_Kong',
-        ));
+        $reverseTransformer = new DateTimeToStringTransformer('America/New_York', 'Asia/Hong_Kong', 'Y-m-d H:i:s');
 
         $output = new \DateTime('2010-02-03 04:05:06 Asia/Hong_Kong');
         $input = $output->format('Y-m-d H:i:s');
diff --git a/tests/Symfony/Tests/Component/Form/ValueTransformer/DateTimeToTimestampTransformerTest.php b/tests/Symfony/Tests/Component/Form/DataTransformer/DateTimeToTimestampTransformerTest.php
similarity index 75%
rename from tests/Symfony/Tests/Component/Form/ValueTransformer/DateTimeToTimestampTransformerTest.php
rename to tests/Symfony/Tests/Component/Form/DataTransformer/DateTimeToTimestampTransformerTest.php
index 45f2ad59f4..bb6da34167 100644
--- a/tests/Symfony/Tests/Component/Form/ValueTransformer/DateTimeToTimestampTransformerTest.php
+++ b/tests/Symfony/Tests/Component/Form/DataTransformer/DateTimeToTimestampTransformerTest.php
@@ -9,21 +9,17 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Tests\Component\Form\ValueTransformer;
+namespace Symfony\Tests\Component\Form\DataTransformer;
 
-require_once __DIR__ . '/../DateTimeTestCase.php';
+require_once __DIR__ . '/DateTimeTestCase.php';
 
-use Symfony\Component\Form\ValueTransformer\DateTimeToTimestampTransformer;
-use Symfony\Tests\Component\Form\DateTimeTestCase;
+use Symfony\Component\Form\DataTransformer\DateTimeToTimestampTransformer;
 
 class DateTimeToTimestampTransformerTest extends DateTimeTestCase
 {
     public function testTransform()
     {
-        $transformer = new DateTimeToTimestampTransformer(array(
-            'input_timezone' => 'UTC',
-            'output_timezone' => 'UTC',
-        ));
+        $transformer = new DateTimeToTimestampTransformer('UTC', 'UTC');
 
         $input = new \DateTime('2010-02-03 04:05:06 UTC');
         $output = $input->format('U');
@@ -40,10 +36,7 @@ class DateTimeToTimestampTransformerTest extends DateTimeTestCase
 
     public function testTransform_differentTimezones()
     {
-        $transformer = new DateTimeToTimestampTransformer(array(
-            'input_timezone' => 'Asia/Hong_Kong',
-            'output_timezone' => 'America/New_York',
-        ));
+        $transformer = new DateTimeToTimestampTransformer('Asia/Hong_Kong', 'America/New_York');
 
         $input = new \DateTime('2010-02-03 04:05:06 America/New_York');
         $output = $input->format('U');
@@ -54,10 +47,7 @@ class DateTimeToTimestampTransformerTest extends DateTimeTestCase
 
     public function testTransformFromDifferentTimezone()
     {
-        $transformer = new DateTimeToTimestampTransformer(array(
-            'input_timezone' => 'UTC',
-            'output_timezone' => 'Asia/Hong_Kong',
-        ));
+        $transformer = new DateTimeToTimestampTransformer('Asia/Hong_Kong', 'UTC');
 
         $input = new \DateTime('2010-02-03 04:05:06 Asia/Hong_Kong');
 
@@ -79,10 +69,7 @@ class DateTimeToTimestampTransformerTest extends DateTimeTestCase
 
     public function testReverseTransform()
     {
-        $reverseTransformer = new DateTimeToTimestampTransformer(array(
-            'input_timezone' => 'UTC',
-            'output_timezone' => 'UTC',
-        ));
+        $reverseTransformer = new DateTimeToTimestampTransformer('UTC', 'UTC');
 
         $output = new \DateTime('2010-02-03 04:05:06 UTC');
         $input = $output->format('U');
@@ -99,10 +86,7 @@ class DateTimeToTimestampTransformerTest extends DateTimeTestCase
 
     public function testReverseTransform_differentTimezones()
     {
-        $reverseTransformer = new DateTimeToTimestampTransformer(array(
-            'input_timezone' => 'Asia/Hong_Kong',
-            'output_timezone' => 'America/New_York',
-        ));
+        $reverseTransformer = new DateTimeToTimestampTransformer('Asia/Hong_Kong', 'America/New_York');
 
         $output = new \DateTime('2010-02-03 04:05:06 America/New_York');
         $input = $output->format('U');
diff --git a/tests/Symfony/Tests/Component/Form/LocalizedTestCase.php b/tests/Symfony/Tests/Component/Form/DataTransformer/LocalizedTestCase.php
similarity index 85%
rename from tests/Symfony/Tests/Component/Form/LocalizedTestCase.php
rename to tests/Symfony/Tests/Component/Form/DataTransformer/LocalizedTestCase.php
index 06bc56e39e..96ba9b0a11 100644
--- a/tests/Symfony/Tests/Component/Form/LocalizedTestCase.php
+++ b/tests/Symfony/Tests/Component/Form/DataTransformer/LocalizedTestCase.php
@@ -9,12 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Tests\Component\Form;
+namespace Symfony\Tests\Component\Form\DataTransformer;
 
 class LocalizedTestCase extends \PHPUnit_Framework_TestCase
 {
     protected function setUp()
     {
+        parent::setUp();
+
         if (!extension_loaded('intl')) {
             $this->markTestSkipped('The "intl" extension is not available');
         }
diff --git a/tests/Symfony/Tests/Component/Form/ValueTransformer/MoneyToLocalizedStringTransformerTest.php b/tests/Symfony/Tests/Component/Form/DataTransformer/MoneyToLocalizedStringTransformerTest.php
similarity index 68%
rename from tests/Symfony/Tests/Component/Form/ValueTransformer/MoneyToLocalizedStringTransformerTest.php
rename to tests/Symfony/Tests/Component/Form/DataTransformer/MoneyToLocalizedStringTransformerTest.php
index a0135a1651..2328988630 100644
--- a/tests/Symfony/Tests/Component/Form/ValueTransformer/MoneyToLocalizedStringTransformerTest.php
+++ b/tests/Symfony/Tests/Component/Form/DataTransformer/MoneyToLocalizedStringTransformerTest.php
@@ -9,12 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Tests\Component\Form\ValueTransformer;
+namespace Symfony\Tests\Component\Form\DataTransformer;
 
-require_once __DIR__ . '/../LocalizedTestCase.php';
+require_once __DIR__ . '/LocalizedTestCase.php';
 
-use Symfony\Component\Form\ValueTransformer\MoneyToLocalizedStringTransformer;
-use Symfony\Tests\Component\Form\LocalizedTestCase;
+use Symfony\Component\Form\DataTransformer\MoneyToLocalizedStringTransformer;
 
 
 class MoneyToLocalizedStringTransformerTest extends LocalizedTestCase
@@ -28,18 +27,14 @@ class MoneyToLocalizedStringTransformerTest extends LocalizedTestCase
 
     public function testTransform()
     {
-        $transformer = new MoneyToLocalizedStringTransformer(array(
-            'divisor' => 100,
-        ));
+        $transformer = new MoneyToLocalizedStringTransformer(null, null, null, 100);
 
         $this->assertEquals('1,23', $transformer->transform(123));
     }
 
     public function testTransformExpectsNumeric()
     {
-        $transformer = new MoneyToLocalizedStringTransformer(array(
-            'divisor' => 100,
-        ));
+        $transformer = new MoneyToLocalizedStringTransformer(null, null, null, 100);
 
         $this->setExpectedException('Symfony\Component\Form\Exception\UnexpectedTypeException');
 
@@ -55,18 +50,14 @@ class MoneyToLocalizedStringTransformerTest extends LocalizedTestCase
 
     public function testReverseTransform()
     {
-        $transformer = new MoneyToLocalizedStringTransformer(array(
-            'divisor' => 100,
-        ));
+        $transformer = new MoneyToLocalizedStringTransformer(null, null, null, 100);
 
         $this->assertEquals(123, $transformer->reverseTransform('1,23', null));
     }
 
     public function testReverseTransformExpectsString()
     {
-        $transformer = new MoneyToLocalizedStringTransformer(array(
-            'divisor' => 100,
-        ));
+        $transformer = new MoneyToLocalizedStringTransformer(null, null, null, 100);
 
         $this->setExpectedException('Symfony\Component\Form\Exception\UnexpectedTypeException');
 
diff --git a/tests/Symfony/Tests/Component/Form/ValueTransformer/NumberToLocalizedStringTransformerTest.php b/tests/Symfony/Tests/Component/Form/DataTransformer/NumberToLocalizedStringTransformerTest.php
similarity index 68%
rename from tests/Symfony/Tests/Component/Form/ValueTransformer/NumberToLocalizedStringTransformerTest.php
rename to tests/Symfony/Tests/Component/Form/DataTransformer/NumberToLocalizedStringTransformerTest.php
index 980fa6e54e..55e2dd5d1e 100644
--- a/tests/Symfony/Tests/Component/Form/ValueTransformer/NumberToLocalizedStringTransformerTest.php
+++ b/tests/Symfony/Tests/Component/Form/DataTransformer/NumberToLocalizedStringTransformerTest.php
@@ -9,12 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Tests\Component\Form\ValueTransformer;
+namespace Symfony\Tests\Component\Form\DataTransformer;
 
-require_once __DIR__ . '/../LocalizedTestCase.php';
+require_once __DIR__ . '/LocalizedTestCase.php';
 
-use Symfony\Component\Form\ValueTransformer\NumberToLocalizedStringTransformer;
-use Symfony\Tests\Component\Form\LocalizedTestCase;
+use Symfony\Component\Form\DataTransformer\NumberToLocalizedStringTransformer;
 
 class NumberToLocalizedStringTransformerTest extends LocalizedTestCase
 {
@@ -44,9 +43,7 @@ class NumberToLocalizedStringTransformerTest extends LocalizedTestCase
 
     public function testTransformWithGrouping()
     {
-        $transformer = new NumberToLocalizedStringTransformer(array(
-            'grouping' => true,
-        ));
+        $transformer = new NumberToLocalizedStringTransformer(null, true);
 
         $this->assertEquals('1.234,5', $transformer->transform(1234.5));
         $this->assertEquals('12.345,912', $transformer->transform(12345.9123));
@@ -54,9 +51,7 @@ class NumberToLocalizedStringTransformerTest extends LocalizedTestCase
 
     public function testTransformWithPrecision()
     {
-        $transformer = new NumberToLocalizedStringTransformer(array(
-            'precision' => 2,
-        ));
+        $transformer = new NumberToLocalizedStringTransformer(2);
 
         $this->assertEquals('1234,50', $transformer->transform(1234.5));
         $this->assertEquals('678,92', $transformer->transform(678.916));
@@ -64,15 +59,10 @@ class NumberToLocalizedStringTransformerTest extends LocalizedTestCase
 
     public function testTransformWithRoundingMode()
     {
-        $transformer = new NumberToLocalizedStringTransformer(array(
-            'rounding-mode' => NumberToLocalizedStringTransformer::ROUND_DOWN,
-        ));
+        $transformer = new NumberToLocalizedStringTransformer(null, null, NumberToLocalizedStringTransformer::ROUND_DOWN);
         $this->assertEquals('1234,547', $transformer->transform(1234.547), '->transform() only applies rounding mode if precision set');
 
-        $transformer = new NumberToLocalizedStringTransformer(array(
-            'rounding-mode' => NumberToLocalizedStringTransformer::ROUND_DOWN,
-            'precision' => 2,
-        ));
+        $transformer = new NumberToLocalizedStringTransformer(2, null, NumberToLocalizedStringTransformer::ROUND_DOWN);
         $this->assertEquals('1234,54', $transformer->transform(1234.547), '->transform() rounding-mode works');
 
     }
@@ -81,46 +71,56 @@ class NumberToLocalizedStringTransformerTest extends LocalizedTestCase
     {
         $transformer = new NumberToLocalizedStringTransformer();
 
-        $this->assertEquals(1, $transformer->reverseTransform('1', null));
-        $this->assertEquals(1.5, $transformer->reverseTransform('1,5', null));
-        $this->assertEquals(1234.5, $transformer->reverseTransform('1234,5', null));
-        $this->assertEquals(12345.912, $transformer->reverseTransform('12345,912', null));
+        $this->assertEquals(1, $transformer->reverseTransform('1'));
+        $this->assertEquals(1.5, $transformer->reverseTransform('1,5'));
+        $this->assertEquals(1234.5, $transformer->reverseTransform('1234,5'));
+        $this->assertEquals(12345.912, $transformer->reverseTransform('12345,912'));
     }
 
     public function testReverseTransform_empty()
     {
         $transformer = new NumberToLocalizedStringTransformer();
 
-        $this->assertSame(null, $transformer->reverseTransform('', null));
+        $this->assertSame(null, $transformer->reverseTransform(''));
     }
 
     public function testReverseTransformWithGrouping()
     {
-        $transformer = new NumberToLocalizedStringTransformer(array(
-            'grouping' => true,
-        ));
+        $transformer = new NumberToLocalizedStringTransformer(null, true);
 
-        $this->assertEquals(1234.5, $transformer->reverseTransform('1.234,5', null));
-        $this->assertEquals(12345.912, $transformer->reverseTransform('12.345,912', null));
-        $this->assertEquals(1234.5, $transformer->reverseTransform('1234,5', null));
-        $this->assertEquals(12345.912, $transformer->reverseTransform('12345,912', null));
+        $this->assertEquals(1234.5, $transformer->reverseTransform('1.234,5'));
+        $this->assertEquals(12345.912, $transformer->reverseTransform('12.345,912'));
+        $this->assertEquals(1234.5, $transformer->reverseTransform('1234,5'));
+        $this->assertEquals(12345.912, $transformer->reverseTransform('12345,912'));
     }
 
+    /**
+     * @expectedException Symfony\Component\Form\Exception\UnexpectedTypeException
+     */
     public function testTransformExpectsNumeric()
     {
         $transformer = new NumberToLocalizedStringTransformer();
 
-        $this->setExpectedException('Symfony\Component\Form\Exception\UnexpectedTypeException');
-
         $transformer->transform('foo');
     }
 
+    /**
+     * @expectedException Symfony\Component\Form\Exception\UnexpectedTypeException
+     */
     public function testReverseTransformExpectsString()
     {
         $transformer = new NumberToLocalizedStringTransformer();
 
-        $this->setExpectedException('Symfony\Component\Form\Exception\UnexpectedTypeException');
+        $transformer->reverseTransform(1);
+    }
 
-        $transformer->reverseTransform(1, null);
+    /**
+     * @expectedException Symfony\Component\Form\DataTransformer\TransformationFailedException
+     */
+    public function testReverseTransformExpectsValidNumber()
+    {
+        $transformer = new NumberToLocalizedStringTransformer();
+
+        $transformer->reverseTransform('foo');
     }
 }
diff --git a/tests/Symfony/Tests/Component/Form/ValueTransformer/PercentToLocalizedStringTransformerTest.php b/tests/Symfony/Tests/Component/Form/DataTransformer/PercentToLocalizedStringTransformerTest.php
similarity index 81%
rename from tests/Symfony/Tests/Component/Form/ValueTransformer/PercentToLocalizedStringTransformerTest.php
rename to tests/Symfony/Tests/Component/Form/DataTransformer/PercentToLocalizedStringTransformerTest.php
index a959ecb6cc..fdabe587af 100644
--- a/tests/Symfony/Tests/Component/Form/ValueTransformer/PercentToLocalizedStringTransformerTest.php
+++ b/tests/Symfony/Tests/Component/Form/DataTransformer/PercentToLocalizedStringTransformerTest.php
@@ -9,12 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Tests\Component\Form\ValueTransformer;
+namespace Symfony\Tests\Component\Form\DataTransformer;
 
-require_once __DIR__ . '/../LocalizedTestCase.php';
+require_once __DIR__ . '/LocalizedTestCase.php';
 
-use Symfony\Component\Form\ValueTransformer\PercentToLocalizedStringTransformer;
-use Symfony\Tests\Component\Form\LocalizedTestCase;
+use Symfony\Component\Form\DataTransformer\PercentToLocalizedStringTransformer;
 
 class PercentToLocalizedStringTransformerTest extends LocalizedTestCase
 {
@@ -44,9 +43,7 @@ class PercentToLocalizedStringTransformerTest extends LocalizedTestCase
 
     public function testTransformWithInteger()
     {
-        $transformer = new PercentToLocalizedStringTransformer(array(
-            'type' => 'integer',
-        ));
+        $transformer = new PercentToLocalizedStringTransformer(null, 'integer');
 
         $this->assertEquals('0', $transformer->transform(0.1));
         $this->assertEquals('1', $transformer->transform(1));
@@ -56,9 +53,7 @@ class PercentToLocalizedStringTransformerTest extends LocalizedTestCase
 
     public function testTransformWithPrecision()
     {
-        $transformer = new PercentToLocalizedStringTransformer(array(
-            'precision' => 2,
-        ));
+        $transformer = new PercentToLocalizedStringTransformer(2);
 
         $this->assertEquals('12,34', $transformer->transform(0.1234));
     }
@@ -82,9 +77,7 @@ class PercentToLocalizedStringTransformerTest extends LocalizedTestCase
 
     public function testReverseTransformWithInteger()
     {
-        $transformer = new PercentToLocalizedStringTransformer(array(
-            'type' => 'integer',
-        ));
+        $transformer = new PercentToLocalizedStringTransformer(null, 'integer');
 
         $this->assertEquals(10, $transformer->reverseTransform('10', null));
         $this->assertEquals(15, $transformer->reverseTransform('15', null));
@@ -94,9 +87,7 @@ class PercentToLocalizedStringTransformerTest extends LocalizedTestCase
 
     public function testReverseTransformWithPrecision()
     {
-        $transformer = new PercentToLocalizedStringTransformer(array(
-            'precision' => 2,
-        ));
+        $transformer = new PercentToLocalizedStringTransformer(2);
 
         $this->assertEquals(0.1234, $transformer->reverseTransform('12,34', null));
     }
diff --git a/tests/Symfony/Tests/Component/Form/DataTransformer/ScalarToChoiceTransformerTest.php b/tests/Symfony/Tests/Component/Form/DataTransformer/ScalarToChoiceTransformerTest.php
new file mode 100644
index 0000000000..eebd718671
--- /dev/null
+++ b/tests/Symfony/Tests/Component/Form/DataTransformer/ScalarToChoiceTransformerTest.php
@@ -0,0 +1,60 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Tests\Component\Form\DataTransformer;
+
+use Symfony\Component\Form\DataTransformer\ScalarToChoiceTransformer;
+
+class ScalarToChoiceTransformerTest extends \PHPUnit_Framework_TestCase
+{
+    protected $transformer;
+
+    protected function setUp()
+    {
+        $this->transformer = new ScalarToChoiceTransformer();
+    }
+
+    public function transformProvider()
+    {
+        return array(
+            // more extensive test set can be found in FormUtilTest
+            array(0, 0),
+            array(false, 0),
+            array('', ''),
+        );
+    }
+
+    /**
+     * @dataProvider transformProvider
+     */
+    public function testTransform($in, $out)
+    {
+        $this->assertSame($out, $this->transformer->transform($in));
+    }
+
+    public function reverseTransformProvider()
+    {
+        return array(
+            // values are expected to be valid choice keys already and stay
+            // the same
+            array(0, 0),
+            array('', ''),
+        );
+    }
+
+    /**
+     * @dataProvider reverseTransformProvider
+     */
+    public function testReverseTransform($in, $out)
+    {
+        $this->assertSame($out, $this->transformer->transform($in));
+    }
+}
diff --git a/tests/Symfony/Tests/Component/Form/DataTransformer/ValueToDuplicatesTransformerTest.php b/tests/Symfony/Tests/Component/Form/DataTransformer/ValueToDuplicatesTransformerTest.php
new file mode 100644
index 0000000000..3195b5d0ad
--- /dev/null
+++ b/tests/Symfony/Tests/Component/Form/DataTransformer/ValueToDuplicatesTransformerTest.php
@@ -0,0 +1,115 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Tests\Component\Form\DataTransformer;
+
+use Symfony\Component\Form\DataTransformer\ValueToDuplicatesTransformer;
+
+class ValueToDuplicatesTransformerTest extends \PHPUnit_Framework_TestCase
+{
+    private $transformer;
+
+    protected function setUp()
+    {
+        $this->transformer = new ValueToDuplicatesTransformer(array('a', 'b', 'c'));
+    }
+
+    public function testTransform()
+    {
+        $output = array(
+            'a' => 'Foo',
+            'b' => 'Foo',
+            'c' => 'Foo',
+        );
+
+        $this->assertSame($output, $this->transformer->transform('Foo'));
+    }
+
+    public function testTransform_empty()
+    {
+        $output = array(
+            'a' => null,
+            'b' => null,
+            'c' => null,
+        );
+
+        $this->assertSame($output, $this->transformer->transform(null));
+    }
+
+    public function testReverseTransform()
+    {
+        $input = array(
+            'a' => 'Foo',
+            'b' => 'Foo',
+            'c' => 'Foo',
+        );
+
+        $this->assertSame('Foo', $this->transformer->reverseTransform($input));
+    }
+
+    public function testReverseTransform_completelyEmpty()
+    {
+        $input = array(
+            'a' => '',
+            'b' => '',
+            'c' => '',
+        );
+
+        $this->assertNull($this->transformer->reverseTransform($input));
+    }
+
+    public function testReverseTransform_completelyNull()
+    {
+        $input = array(
+            'a' => null,
+            'b' => null,
+            'c' => null,
+        );
+
+        $this->assertNull($this->transformer->reverseTransform($input));
+    }
+
+    /**
+     * @expectedException Symfony\Component\Form\DataTransformer\TransformationFailedException
+     */
+    public function testReverseTransform_partiallyNull()
+    {
+        $input = array(
+            'a' => 'Foo',
+            'b' => 'Foo',
+            'c' => null,
+        );
+
+        $this->transformer->reverseTransform($input);
+    }
+
+    /**
+     * @expectedException Symfony\Component\Form\DataTransformer\TransformationFailedException
+     */
+    public function testReverseTransform_differences()
+    {
+        $input = array(
+            'a' => 'Foo',
+            'b' => 'Bar',
+            'c' => 'Foo',
+        );
+
+        $this->transformer->reverseTransform($input);
+    }
+
+    /**
+     * @expectedException Symfony\Component\Form\Exception\UnexpectedTypeException
+     */
+    public function testReverseTransformRequiresArray()
+    {
+        $this->transformer->reverseTransform('12345');
+    }
+}
diff --git a/tests/Symfony/Tests/Component/Form/DateFieldTest.php b/tests/Symfony/Tests/Component/Form/DateFieldTest.php
deleted file mode 100644
index 267f05067a..0000000000
--- a/tests/Symfony/Tests/Component/Form/DateFieldTest.php
+++ /dev/null
@@ -1,395 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Tests\Component\Form;
-
-require_once __DIR__ . '/DateTimeTestCase.php';
-
-use Symfony\Component\Form\DateField;
-use Symfony\Component\Form\FormContext;
-
-class DateFieldTest extends DateTimeTestCase
-{
-    protected function setUp()
-    {
-        \Locale::setDefault('de_AT');
-    }
-
-    public function testSubmit_fromInput_dateTime()
-    {
-        $field = new DateField('name', array(
-            'data_timezone' => 'UTC',
-            'user_timezone' => 'UTC',
-            'widget' => 'input',
-            'type' => DateField::DATETIME,
-        ));
-
-        $field->submit('2.6.2010');
-
-        $this->assertDateTimeEquals(new \DateTime('2010-06-02 UTC'), $field->getData());
-        $this->assertEquals('02.06.2010', $field->getDisplayedData());
-    }
-
-    public function testSubmit_fromInput_string()
-    {
-        $field = new DateField('name', array(
-            'data_timezone' => 'UTC',
-            'user_timezone' => 'UTC',
-            'widget' => 'input',
-            'type' => DateField::STRING,
-        ));
-
-        $field->submit('2.6.2010');
-
-        $this->assertEquals('2010-06-02', $field->getData());
-        $this->assertEquals('02.06.2010', $field->getDisplayedData());
-    }
-
-    public function testSubmit_fromInput_timestamp()
-    {
-        $field = new DateField('name', array(
-            'data_timezone' => 'UTC',
-            'user_timezone' => 'UTC',
-            'widget' => 'input',
-            'type' => DateField::TIMESTAMP,
-        ));
-
-        $field->submit('2.6.2010');
-
-        $dateTime = new \DateTime('2010-06-02 UTC');
-
-        $this->assertEquals($dateTime->format('U'), $field->getData());
-        $this->assertEquals('02.06.2010', $field->getDisplayedData());
-    }
-
-    public function testSubmit_fromInput_raw()
-    {
-        $field = new DateField('name', array(
-            'data_timezone' => 'UTC',
-            'user_timezone' => 'UTC',
-            'widget' => 'input',
-            'type' => DateField::RAW,
-        ));
-
-        $field->submit('2.6.2010');
-
-        $output = array(
-            'day' => '2',
-            'month' => '6',
-            'year' => '2010',
-        );
-
-        $this->assertEquals($output, $field->getData());
-        $this->assertEquals('02.06.2010', $field->getDisplayedData());
-    }
-
-    public function testSubmit_fromChoice()
-    {
-        $field = new DateField('name', array(
-            'data_timezone' => 'UTC',
-            'user_timezone' => 'UTC',
-            'widget' => DateField::CHOICE,
-        ));
-
-        $input = array(
-            'day' => '2',
-            'month' => '6',
-            'year' => '2010',
-        );
-
-        $field->submit($input);
-
-        $dateTime = new \DateTime('2010-06-02 UTC');
-
-        $this->assertDateTimeEquals($dateTime, $field->getData());
-        $this->assertEquals($input, $field->getDisplayedData());
-    }
-
-    public function testSubmit_fromChoice_empty()
-    {
-        $field = new DateField('name', array(
-            'data_timezone' => 'UTC',
-            'user_timezone' => 'UTC',
-            'widget' => DateField::CHOICE,
-            'required' => false,
-        ));
-
-        $input = array(
-            'day' => '',
-            'month' => '',
-            'year' => '',
-        );
-
-        $field->submit($input);
-
-        $this->assertSame(null, $field->getData());
-        $this->assertEquals($input, $field->getDisplayedData());
-    }
-
-    public function testSetData_differentTimezones()
-    {
-        $field = new DateField('name', array(
-            'data_timezone' => 'America/New_York',
-            'user_timezone' => 'Pacific/Tahiti',
-            // don't do this test with DateTime, because it leads to wrong results!
-            'type' => DateField::STRING,
-            'widget' => 'input',
-        ));
-
-        $field->setData('2010-06-02');
-
-        $this->assertEquals('01.06.2010', $field->getDisplayedData());
-    }
-
-    public function testIsYearWithinRange_returnsTrueIfWithin()
-    {
-        $field = new DateField('name', array(
-            'data_timezone' => 'UTC',
-            'user_timezone' => 'UTC',
-            'widget' => 'input',
-            'years' => array(2010, 2011),
-        ));
-
-        $field->submit('2.6.2010');
-
-        $this->assertTrue($field->isYearWithinRange());
-    }
-
-    public function testIsYearWithinRange_returnsTrueIfEmpty()
-    {
-        $field = new DateField('name', array(
-            'data_timezone' => 'UTC',
-            'user_timezone' => 'UTC',
-            'widget' => 'input',
-            'years' => array(2010, 2011),
-        ));
-
-        $field->submit('');
-
-        $this->assertTrue($field->isYearWithinRange());
-    }
-
-    public function testIsYearWithinRange_returnsTrueIfEmpty_choice()
-    {
-        $field = new DateField('name', array(
-            'data_timezone' => 'UTC',
-            'user_timezone' => 'UTC',
-            'widget' => 'choice',
-            'years' => array(2010, 2011),
-        ));
-
-        $field->submit(array(
-            'day' => '1',
-            'month' => '2',
-            'year' => '',
-        ));
-
-        $this->assertTrue($field->isYearWithinRange());
-    }
-
-    public function testIsYearWithinRange_returnsFalseIfNotContained()
-    {
-        $field = new DateField('name', array(
-            'data_timezone' => 'UTC',
-            'user_timezone' => 'UTC',
-            'widget' => 'input',
-            'years' => array(2010, 2012),
-        ));
-
-        $field->submit('2.6.2011');
-
-        $this->assertFalse($field->isYearWithinRange());
-    }
-
-    public function testIsMonthWithinRange_returnsTrueIfWithin()
-    {
-        $field = new DateField('name', array(
-            'data_timezone' => 'UTC',
-            'user_timezone' => 'UTC',
-            'widget' => 'input',
-            'months' => array(6, 7),
-        ));
-
-        $field->submit('2.6.2010');
-
-        $this->assertTrue($field->isMonthWithinRange());
-    }
-
-    public function testIsMonthWithinRange_returnsTrueIfEmpty()
-    {
-        $field = new DateField('name', array(
-            'data_timezone' => 'UTC',
-            'user_timezone' => 'UTC',
-            'widget' => 'input',
-            'months' => array(6, 7),
-        ));
-
-        $field->submit('');
-
-        $this->assertTrue($field->isMonthWithinRange());
-    }
-
-    public function testIsMonthWithinRange_returnsTrueIfEmpty_choice()
-    {
-        $field = new DateField('name', array(
-            'data_timezone' => 'UTC',
-            'user_timezone' => 'UTC',
-            'widget' => 'choice',
-            'months' => array(6, 7),
-        ));
-
-        $field->submit(array(
-            'day' => '1',
-            'month' => '',
-            'year' => '2011',
-        ));
-
-        $this->assertTrue($field->isMonthWithinRange());
-    }
-
-    public function testIsMonthWithinRange_returnsFalseIfNotContained()
-    {
-        $field = new DateField('name', array(
-            'data_timezone' => 'UTC',
-            'user_timezone' => 'UTC',
-            'widget' => 'input',
-            'months' => array(6, 8),
-        ));
-
-        $field->submit('2.7.2010');
-
-        $this->assertFalse($field->isMonthWithinRange());
-    }
-
-    public function testIsDayWithinRange_returnsTrueIfWithin()
-    {
-        $field = new DateField('name', array(
-            'data_timezone' => 'UTC',
-            'user_timezone' => 'UTC',
-            'widget' => 'input',
-            'days' => array(6, 7),
-        ));
-
-        $field->submit('6.6.2010');
-
-        $this->assertTrue($field->isDayWithinRange());
-    }
-
-    public function testIsDayWithinRange_returnsTrueIfEmpty()
-    {
-        $field = new DateField('name', array(
-            'data_timezone' => 'UTC',
-            'user_timezone' => 'UTC',
-            'widget' => 'input',
-            'days' => array(6, 7),
-        ));
-
-        $field->submit('');
-
-        $this->assertTrue($field->isDayWithinRange());
-    }
-
-    public function testIsDayWithinRange_returnsTrueIfEmpty_choice()
-    {
-        $field = new DateField('name', array(
-            'data_timezone' => 'UTC',
-            'user_timezone' => 'UTC',
-            'widget' => 'choice',
-            'days' => array(6, 7),
-        ));
-
-        $field->submit(array(
-            'day' => '',
-            'month' => '1',
-            'year' => '2011',
-        ));
-
-        $this->assertTrue($field->isDayWithinRange());
-    }
-
-    public function testIsDayWithinRange_returnsFalseIfNotContained()
-    {
-        $field = new DateField('name', array(
-            'data_timezone' => 'UTC',
-            'user_timezone' => 'UTC',
-            'widget' => 'input',
-            'days' => array(6, 8),
-        ));
-
-        $field->submit('7.6.2010');
-
-        $this->assertFalse($field->isDayWithinRange());
-    }
-
-    public function testIsPartiallyFilled_returnsFalseIfInput()
-    {
-        $field = new DateField('name', array(
-            'data_timezone' => 'UTC',
-            'user_timezone' => 'UTC',
-            'widget' => 'input',
-        ));
-
-        $field->submit('7.6.2010');
-
-        $this->assertFalse($field->isPartiallyFilled());
-    }
-
-    public function testIsPartiallyFilled_returnsFalseIfChoiceAndCompletelyEmpty()
-    {
-        $field = new DateField('name', array(
-            'data_timezone' => 'UTC',
-            'user_timezone' => 'UTC',
-            'widget' => 'choice',
-        ));
-
-        $field->submit(array(
-            'day' => '',
-            'month' => '',
-            'year' => '',
-        ));
-
-        $this->assertFalse($field->isPartiallyFilled());
-    }
-
-    public function testIsPartiallyFilled_returnsFalseIfChoiceAndCompletelyFilled()
-    {
-        $field = new DateField('name', array(
-            'data_timezone' => 'UTC',
-            'user_timezone' => 'UTC',
-            'widget' => 'choice',
-        ));
-
-        $field->submit(array(
-            'day' => '2',
-            'month' => '6',
-            'year' => '2010',
-        ));
-
-        $this->assertFalse($field->isPartiallyFilled());
-    }
-
-    public function testIsPartiallyFilled_returnsTrueIfChoiceAndDayEmpty()
-    {
-        $field = new DateField('name', array(
-            'data_timezone' => 'UTC',
-            'user_timezone' => 'UTC',
-            'widget' => 'choice',
-        ));
-
-        $field->submit(array(
-            'day' => '',
-            'month' => '6',
-            'year' => '2010',
-        ));
-
-        $this->assertTrue($field->isPartiallyFilled());
-    }
-}
\ No newline at end of file
diff --git a/tests/Symfony/Tests/Component/Form/EventListener/FixUrlProtocolListenerTest.php b/tests/Symfony/Tests/Component/Form/EventListener/FixUrlProtocolListenerTest.php
new file mode 100644
index 0000000000..55291c2c71
--- /dev/null
+++ b/tests/Symfony/Tests/Component/Form/EventListener/FixUrlProtocolListenerTest.php
@@ -0,0 +1,54 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Tests\Component\Form\EventListener;
+
+use Symfony\Component\Form\Event\FilterDataEvent;
+use Symfony\Component\Form\EventListener\FixUrlProtocolListener;
+
+class FixUrlProtocolListenerTest extends \PHPUnit_Framework_TestCase
+{
+    public function testFixHttpUrl()
+    {
+        $data = "www.symfony.com";
+        $form = $this->getMock('Symfony\Tests\Component\Form\FormInterface');
+        $event = new FilterDataEvent($form, $data);
+
+        $filter = new FixUrlProtocolListener('http');
+        $filter->onBindNormData($event);
+
+        $this->assertEquals('http://www.symfony.com', $event->getData());
+    }
+
+    public function testSkipKnownUrl()
+    {
+        $data = "http://www.symfony.com";
+        $form = $this->getMock('Symfony\Tests\Component\Form\FormInterface');
+        $event = new FilterDataEvent($form, $data);
+
+        $filter = new FixUrlProtocolListener('http');
+        $filter->onBindNormData($event);
+
+        $this->assertEquals('http://www.symfony.com', $event->getData());
+    }
+
+    public function testSkipOtherProtocol()
+    {
+        $data = "ftp://www.symfony.com";
+        $form = $this->getMock('Symfony\Tests\Component\Form\FormInterface');
+        $event = new FilterDataEvent($form, $data);
+
+        $filter = new FixUrlProtocolListener('http');
+        $filter->onBindNormData($event);
+
+        $this->assertEquals('ftp://www.symfony.com', $event->getData());
+    }
+}
\ No newline at end of file
diff --git a/tests/Symfony/Tests/Component/Form/EventListener/ResizeFormListenerTest.php b/tests/Symfony/Tests/Component/Form/EventListener/ResizeFormListenerTest.php
new file mode 100644
index 0000000000..4eaa655b82
--- /dev/null
+++ b/tests/Symfony/Tests/Component/Form/EventListener/ResizeFormListenerTest.php
@@ -0,0 +1,245 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Tests\Component\Form\EventListener;
+
+use Symfony\Component\Form\Event\DataEvent;
+use Symfony\Component\Form\Event\FilterDataEvent;
+use Symfony\Component\Form\EventListener\ResizeFormListener;
+use Symfony\Component\Form\FormBuilder;
+
+class ResizeFormListenerTest extends \PHPUnit_Framework_TestCase
+{
+    private $factory;
+    private $form;
+
+    public function setUp()
+    {
+        $this->dispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
+        $this->factory = $this->getMock('Symfony\Component\Form\FormFactoryInterface');
+        $this->form = $this->getForm();
+    }
+
+    protected function getBuilder($name = 'name')
+    {
+        return new FormBuilder($name, $this->factory, $this->dispatcher);
+    }
+
+    protected function getForm($name = 'name')
+    {
+        return $this->getBuilder($name)->getForm();
+    }
+
+    protected function getMockForm()
+    {
+        return $this->getMock('Symfony\Tests\Component\Form\FormInterface');
+    }
+
+    public function testPreSetDataResizesForm()
+    {
+        $this->form->add($this->getForm('0'));
+        $this->form->add($this->getForm('1'));
+
+        $this->factory->expects($this->at(0))
+            ->method('create')
+            ->with('text', 1, array('property_path' => '[1]'))
+            ->will($this->returnValue($this->getForm('1')));
+        $this->factory->expects($this->at(1))
+            ->method('create')
+            ->with('text', 2, array('property_path' => '[2]'))
+            ->will($this->returnValue($this->getForm('2')));
+
+        $data = array(1 => 'string', 2 => 'string');
+        $event = new DataEvent($this->form, $data);
+        $listener = new ResizeFormListener($this->factory, 'text', false);
+        $listener->preSetData($event);
+
+        $this->assertFalse($this->form->has('0'));
+        $this->assertTrue($this->form->has('1'));
+        $this->assertTrue($this->form->has('2'));
+    }
+
+    public function testPreSetDataRemovesPrototypeRowIfNotResizeOnBind()
+    {
+        $this->form->add($this->getForm('$$name$$'));
+
+        $data = array();
+        $event = new DataEvent($this->form, $data);
+        $listener = new ResizeFormListener($this->factory, 'text', false);
+        $listener->preSetData($event);
+
+        $this->assertFalse($this->form->has('$$name$$'));
+    }
+
+    public function testPreSetDataDoesNotRemovePrototypeRowIfResizeOnBind()
+    {
+        $this->form->add($this->getForm('$$name$$'));
+
+        $data = array();
+        $event = new DataEvent($this->form, $data);
+        $listener = new ResizeFormListener($this->factory, 'text', true);
+        $listener->preSetData($event);
+
+        $this->assertTrue($this->form->has('$$name$$'));
+    }
+
+    /**
+     * @expectedException Symfony\Component\Form\Exception\UnexpectedTypeException
+     */
+    public function testPreSetDataRequiresArrayOrTraversable()
+    {
+        $data = 'no array or traversable';
+        $event = new DataEvent($this->form, $data);
+        $listener = new ResizeFormListener($this->factory, 'text', false);
+        $listener->preSetData($event);
+    }
+
+    public function testPreSetDataDealsWithNullData()
+    {
+        $this->factory->expects($this->never())->method('create');
+
+        $data = null;
+        $event = new DataEvent($this->form, $data);
+        $listener = new ResizeFormListener($this->factory, 'text', false);
+        $listener->preSetData($event);
+    }
+
+    public function testPreBindResizesFormIfResizable()
+    {
+        $this->form->add($this->getForm('0'));
+        $this->form->add($this->getForm('1'));
+
+        $this->factory->expects($this->once())
+            ->method('create')
+            ->with('text', 2, array('property_path' => '[2]'))
+            ->will($this->returnValue($this->getForm('2')));
+
+        $data = array(0 => 'string', 2 => 'string');
+        $event = new DataEvent($this->form, $data);
+        $listener = new ResizeFormListener($this->factory, 'text', true);
+        $listener->preBind($event);
+
+        $this->assertTrue($this->form->has('0'));
+        $this->assertFalse($this->form->has('1'));
+        $this->assertTrue($this->form->has('2'));
+    }
+
+    // fix for https://github.com/symfony/symfony/pull/493
+    public function testPreBindRemovesZeroKeys()
+    {
+        $this->form->add($this->getForm('0'));
+
+        $data = array();
+        $event = new DataEvent($this->form, $data);
+        $listener = new ResizeFormListener($this->factory, 'text', true);
+        $listener->preBind($event);
+
+        $this->assertFalse($this->form->has('0'));
+    }
+
+    public function testPreBindDoesNothingIfNotResizable()
+    {
+        $this->form->add($this->getForm('0'));
+        $this->form->add($this->getForm('1'));
+
+        $data = array(0 => 'string', 2 => 'string');
+        $event = new DataEvent($this->form, $data);
+        $listener = new ResizeFormListener($this->factory, 'text', false);
+        $listener->preBind($event);
+
+        $this->assertTrue($this->form->has('0'));
+        $this->assertTrue($this->form->has('1'));
+        $this->assertFalse($this->form->has('2'));
+    }
+
+    /**
+     * @expectedException Symfony\Component\Form\Exception\UnexpectedTypeException
+     */
+    public function testPreBindRequiresArrayOrTraversable()
+    {
+        $data = 'no array or traversable';
+        $event = new DataEvent($this->form, $data);
+        $listener = new ResizeFormListener($this->factory, 'text', true);
+        $listener->preBind($event);
+    }
+
+    public function testPreBindDealsWithNullData()
+    {
+        $this->form->add($this->getForm('1'));
+
+        $data = null;
+        $event = new DataEvent($this->form, $data);
+        $listener = new ResizeFormListener($this->factory, 'text', true);
+        $listener->preBind($event);
+
+        $this->assertFalse($this->form->has('1'));
+    }
+
+    // fixes https://github.com/symfony/symfony/pull/40
+    public function testPreBindDealsWithEmptyData()
+    {
+        $this->form->add($this->getForm('1'));
+
+        $data = '';
+        $event = new DataEvent($this->form, $data);
+        $listener = new ResizeFormListener($this->factory, 'text', true);
+        $listener->preBind($event);
+
+        $this->assertFalse($this->form->has('1'));
+    }
+
+    public function testOnBindNormDataRemovesEntriesMissingInTheFormIfResizable()
+    {
+        $this->form->add($this->getForm('1'));
+
+        $data = array(0 => 'first', 1 => 'second', 2 => 'third');
+        $event = new FilterDataEvent($this->form, $data);
+        $listener = new ResizeFormListener($this->factory, 'text', true);
+        $listener->onBindNormData($event);
+
+        $this->assertEquals(array(1 => 'second'), $event->getData());
+    }
+
+    public function testOnBindNormDataDoesNothingIfNotResizable()
+    {
+        $this->form->add($this->getForm('1'));
+
+        $data = array(0 => 'first', 1 => 'second', 2 => 'third');
+        $event = new FilterDataEvent($this->form, $data);
+        $listener = new ResizeFormListener($this->factory, 'text', false);
+        $listener->onBindNormData($event);
+
+        $this->assertEquals($data, $event->getData());
+    }
+
+    /**
+     * @expectedException Symfony\Component\Form\Exception\UnexpectedTypeException
+     */
+    public function testOnBindNormDataRequiresArrayOrTraversable()
+    {
+        $data = 'no array or traversable';
+        $event = new FilterDataEvent($this->form, $data);
+        $listener = new ResizeFormListener($this->factory, 'text', true);
+        $listener->onBindNormData($event);
+    }
+
+    public function testOnBindNormDataDealsWithNullData()
+    {
+        $this->form->add($this->getForm('1'));
+
+        $data = null;
+        $event = new FilterDataEvent($this->form, $data);
+        $listener = new ResizeFormListener($this->factory, 'text', true);
+        $listener->onBindNormData($event);
+
+        $this->assertEquals(array(), $event->getData());
+    }
+}
\ No newline at end of file
diff --git a/tests/Symfony/Tests/Component/Form/EventListener/TrimListenerTest.php b/tests/Symfony/Tests/Component/Form/EventListener/TrimListenerTest.php
new file mode 100644
index 0000000000..1048b58c66
--- /dev/null
+++ b/tests/Symfony/Tests/Component/Form/EventListener/TrimListenerTest.php
@@ -0,0 +1,42 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Tests\Component\Form\EventListener;
+
+use Symfony\Component\Form\Event\FilterDataEvent;
+use Symfony\Component\Form\EventListener\TrimListener;
+
+class TrimListenerTest extends \PHPUnit_Framework_TestCase
+{
+    public function testTrim()
+    {
+        $data = " Foo! ";
+        $form = $this->getMock('Symfony\Tests\Component\Form\FormInterface');
+        $event = new FilterDataEvent($form, $data);
+
+        $filter = new TrimListener();
+        $filter->onBindClientData($event);
+
+        $this->assertEquals('Foo!', $event->getData());
+    }
+
+    public function testTrimSkipNonStrings()
+    {
+        $data = 1234;
+        $form = $this->getMock('Symfony\Tests\Component\Form\FormInterface');
+        $event = new FilterDataEvent($form, $data);
+
+        $filter = new TrimListener();
+        $filter->onBindClientData($event);
+
+        $this->assertSame(1234, $event->getData());
+    }
+}
\ No newline at end of file
diff --git a/tests/Symfony/Tests/Component/Form/FieldFactory/FieldFactoryGuessTest.php b/tests/Symfony/Tests/Component/Form/FieldFactory/FieldFactoryGuessTest.php
deleted file mode 100644
index 5d7e31edda..0000000000
--- a/tests/Symfony/Tests/Component/Form/FieldFactory/FieldFactoryGuessTest.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Tests\Component\Form\FieldFactory;
-
-use Symfony\Component\Form\FieldFactory\FieldFactoryGuess;
-
-class FieldFactoryGuessTest extends \PHPUnit_Framework_TestCase
-{
-    public function testGetBestGuessReturnsGuessWithHighestConfidence()
-    {
-        $guess1 = new FieldFactoryGuess('foo', FieldFactoryGuess::MEDIUM_CONFIDENCE);
-        $guess2 = new FieldFactoryGuess('bar', FieldFactoryGuess::LOW_CONFIDENCE);
-        $guess3 = new FieldFactoryGuess('baz', FieldFactoryGuess::HIGH_CONFIDENCE);
-
-        $this->assertEquals($guess3, FieldFactoryGuess::getBestGuess(array($guess1, $guess2, $guess3)));
-    }
-
-    /**
-     * @expectedException \UnexpectedValueException
-     */
-    public function testGuessExpectsValidConfidence()
-    {
-        new FieldFactoryGuess('foo', 5);
-    }
-}
\ No newline at end of file
diff --git a/tests/Symfony/Tests/Component/Form/FieldFactory/FieldFactoryTest.php b/tests/Symfony/Tests/Component/Form/FieldFactory/FieldFactoryTest.php
deleted file mode 100644
index fce4432f73..0000000000
--- a/tests/Symfony/Tests/Component/Form/FieldFactory/FieldFactoryTest.php
+++ /dev/null
@@ -1,185 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Tests\Component\Form\FieldFactory;
-
-use Symfony\Component\Form\FieldFactory\FieldFactory;
-use Symfony\Component\Form\FieldFactory\FieldFactoryGuess;
-use Symfony\Component\Form\FieldFactory\FieldFactoryClassGuess;
-
-class FieldFactoryTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * @expectedException Symfony\Component\Form\Exception\UnexpectedTypeException
-     */
-    public function testConstructThrowsExceptionIfNoGuesser()
-    {
-        new FieldFactory(array(new \stdClass()));
-    }
-
-    public function testGetInstanceCreatesClassWithHighestConfidence()
-    {
-        $guesser1 = $this->getMock('Symfony\Component\Form\FieldFactory\FieldFactoryGuesserInterface');
-        $guesser1->expects($this->once())
-                ->method('guessClass')
-                ->with($this->equalTo('Application\Author'), $this->equalTo('firstName'))
-                ->will($this->returnValue(new FieldFactoryClassGuess(
-                    'Symfony\Component\Form\TextField',
-                    array('max_length' => 10),
-                    FieldFactoryGuess::MEDIUM_CONFIDENCE
-                )));
-
-        $guesser2 = $this->getMock('Symfony\Component\Form\FieldFactory\FieldFactoryGuesserInterface');
-        $guesser2->expects($this->once())
-                ->method('guessClass')
-                ->with($this->equalTo('Application\Author'), $this->equalTo('firstName'))
-                ->will($this->returnValue(new FieldFactoryClassGuess(
-                    'Symfony\Component\Form\PasswordField',
-                    array('max_length' => 7),
-                    FieldFactoryGuess::HIGH_CONFIDENCE
-                )));
-
-        $factory = new FieldFactory(array($guesser1, $guesser2));
-        $field = $factory->getInstance('Application\Author', 'firstName');
-
-        $this->assertEquals('Symfony\Component\Form\PasswordField', get_class($field));
-        $this->assertEquals(7, $field->getMaxLength());
-    }
-
-    public function testGetInstanceThrowsExceptionIfNoClassIsFound()
-    {
-        $guesser = $this->getMock('Symfony\Component\Form\FieldFactory\FieldFactoryGuesserInterface');
-        $guesser->expects($this->once())
-                ->method('guessClass')
-                ->with($this->equalTo('Application\Author'), $this->equalTo('firstName'))
-                ->will($this->returnValue(null));
-
-        $factory = new FieldFactory(array($guesser));
-
-        $this->setExpectedException('\RuntimeException');
-
-        $field = $factory->getInstance('Application\Author', 'firstName');
-    }
-
-    public function testOptionsCanBeOverridden()
-    {
-        $guesser = $this->getMock('Symfony\Component\Form\FieldFactory\FieldFactoryGuesserInterface');
-        $guesser->expects($this->once())
-                ->method('guessClass')
-                ->with($this->equalTo('Application\Author'), $this->equalTo('firstName'))
-                ->will($this->returnValue(new FieldFactoryClassGuess(
-                    'Symfony\Component\Form\TextField',
-                    array('max_length' => 10),
-                    FieldFactoryGuess::MEDIUM_CONFIDENCE
-                )));
-
-        $factory = new FieldFactory(array($guesser));
-        $field = $factory->getInstance('Application\Author', 'firstName', array('max_length' => 11));
-
-        $this->assertEquals('Symfony\Component\Form\TextField', get_class($field));
-        $this->assertEquals(11, $field->getMaxLength());
-    }
-
-    public function testGetInstanceUsesMaxLengthIfFoundAndTextField()
-    {
-        $guesser1 = $this->getMock('Symfony\Component\Form\FieldFactory\FieldFactoryGuesserInterface');
-        $guesser1->expects($this->once())
-                ->method('guessClass')
-                ->with($this->equalTo('Application\Author'), $this->equalTo('firstName'))
-                ->will($this->returnValue(new FieldFactoryClassGuess(
-                    'Symfony\Component\Form\TextField',
-                    array('max_length' => 10),
-                    FieldFactoryGuess::MEDIUM_CONFIDENCE
-                )));
-        $guesser1->expects($this->once())
-                ->method('guessMaxLength')
-                ->with($this->equalTo('Application\Author'), $this->equalTo('firstName'))
-                ->will($this->returnValue(new FieldFactoryGuess(
-                    15,
-                    FieldFactoryGuess::MEDIUM_CONFIDENCE
-                )));
-
-        $guesser2 = $this->getMock('Symfony\Component\Form\FieldFactory\FieldFactoryGuesserInterface');
-        $guesser2->expects($this->once())
-                ->method('guessMaxLength')
-                ->with($this->equalTo('Application\Author'), $this->equalTo('firstName'))
-                ->will($this->returnValue(new FieldFactoryGuess(
-                    20,
-                    FieldFactoryGuess::HIGH_CONFIDENCE
-                )));
-
-        $factory = new FieldFactory(array($guesser1, $guesser2));
-        $field = $factory->getInstance('Application\Author', 'firstName');
-
-        $this->assertEquals('Symfony\Component\Form\TextField', get_class($field));
-        $this->assertEquals(20, $field->getMaxLength());
-    }
-
-    public function testGetInstanceUsesMaxLengthIfFoundAndSubclassOfTextField()
-    {
-        $guesser = $this->getMock('Symfony\Component\Form\FieldFactory\FieldFactoryGuesserInterface');
-        $guesser->expects($this->once())
-                ->method('guessClass')
-                ->with($this->equalTo('Application\Author'), $this->equalTo('firstName'))
-                ->will($this->returnValue(new FieldFactoryClassGuess(
-                    'Symfony\Component\Form\PasswordField',
-                    array('max_length' => 10),
-                    FieldFactoryGuess::MEDIUM_CONFIDENCE
-                )));
-        $guesser->expects($this->once())
-                ->method('guessMaxLength')
-                ->with($this->equalTo('Application\Author'), $this->equalTo('firstName'))
-                ->will($this->returnValue(new FieldFactoryGuess(
-                    15,
-                    FieldFactoryGuess::MEDIUM_CONFIDENCE
-                )));
-
-        $factory = new FieldFactory(array($guesser));
-        $field = $factory->getInstance('Application\Author', 'firstName');
-
-        $this->assertEquals('Symfony\Component\Form\PasswordField', get_class($field));
-        $this->assertEquals(15, $field->getMaxLength());
-    }
-
-    public function testGetInstanceUsesRequiredSettingWithHighestConfidence()
-    {
-        $guesser1 = $this->getMock('Symfony\Component\Form\FieldFactory\FieldFactoryGuesserInterface');
-        $guesser1->expects($this->once())
-                ->method('guessClass')
-                ->with($this->equalTo('Application\Author'), $this->equalTo('firstName'))
-                ->will($this->returnValue(new FieldFactoryClassGuess(
-                    'Symfony\Component\Form\TextField',
-                    array(),
-                    FieldFactoryGuess::MEDIUM_CONFIDENCE
-                )));
-        $guesser1->expects($this->once())
-                ->method('guessRequired')
-                ->with($this->equalTo('Application\Author'), $this->equalTo('firstName'))
-                ->will($this->returnValue(new FieldFactoryGuess(
-                    true,
-                    FieldFactoryGuess::MEDIUM_CONFIDENCE
-                )));
-
-        $guesser2 = $this->getMock('Symfony\Component\Form\FieldFactory\FieldFactoryGuesserInterface');
-        $guesser2->expects($this->once())
-                ->method('guessRequired')
-                ->with($this->equalTo('Application\Author'), $this->equalTo('firstName'))
-                ->will($this->returnValue(new FieldFactoryGuess(
-                    false,
-                    FieldFactoryGuess::HIGH_CONFIDENCE
-                )));
-
-        $factory = new FieldFactory(array($guesser1, $guesser2));
-        $field = $factory->getInstance('Application\Author', 'firstName');
-
-        $this->assertFalse($field->isRequired());
-    }
-}
\ No newline at end of file
diff --git a/tests/Symfony/Tests/Component/Form/FieldTest.php b/tests/Symfony/Tests/Component/Form/FieldTest.php
deleted file mode 100644
index 772e4f1625..0000000000
--- a/tests/Symfony/Tests/Component/Form/FieldTest.php
+++ /dev/null
@@ -1,588 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Tests\Component\Form;
-
-require_once __DIR__ . '/Fixtures/Author.php';
-require_once __DIR__ . '/Fixtures/TestField.php';
-require_once __DIR__ . '/Fixtures/InvalidField.php';
-require_once __DIR__ . '/Fixtures/RequiredOptionsField.php';
-
-use Symfony\Component\Form\ValueTransformer\ValueTransformerInterface;
-use Symfony\Component\Form\PropertyPath;
-use Symfony\Component\Form\FieldError;
-use Symfony\Component\Form\Form;
-use Symfony\Component\Form\ValueTransformer\TransformationFailedException;
-use Symfony\Tests\Component\Form\Fixtures\Author;
-use Symfony\Tests\Component\Form\Fixtures\TestField;
-use Symfony\Tests\Component\Form\Fixtures\InvalidField;
-use Symfony\Tests\Component\Form\Fixtures\RequiredOptionsField;
-
-class FieldTest extends \PHPUnit_Framework_TestCase
-{
-    protected $field;
-
-    protected function setUp()
-    {
-        $this->field = new TestField('title');
-    }
-
-    public function testGetPropertyPath_defaultPath()
-    {
-        $field = new TestField('title');
-
-        $this->assertEquals(new PropertyPath('title'), $field->getPropertyPath());
-    }
-
-    public function testGetPropertyPath_pathIsZero()
-    {
-        $field = new TestField('title', array('property_path' => '0'));
-
-        $this->assertEquals(new PropertyPath('0'), $field->getPropertyPath());
-    }
-
-    public function testGetPropertyPath_pathIsEmpty()
-    {
-        $field = new TestField('title', array('property_path' => ''));
-
-        $this->assertEquals(null, $field->getPropertyPath());
-    }
-
-    public function testGetPropertyPath_pathIsNull()
-    {
-        $field = new TestField('title', array('property_path' => null));
-
-        $this->assertEquals(null, $field->getPropertyPath());
-    }
-
-    public function testPassRequiredAsOption()
-    {
-        $field = new TestField('title', array('required' => false));
-
-        $this->assertFalse($field->isRequired());
-
-        $field = new TestField('title', array('required' => true));
-
-        $this->assertTrue($field->isRequired());
-    }
-
-    public function testPassDisabledAsOption()
-    {
-        $field = new TestField('title', array('disabled' => false));
-
-        $this->assertFalse($field->isDisabled());
-
-        $field = new TestField('title', array('disabled' => true));
-
-        $this->assertTrue($field->isDisabled());
-    }
-
-    public function testFieldIsDisabledIfParentIsDisabled()
-    {
-        $field = new TestField('title', array('disabled' => false));
-        $field->setParent(new TestField('title', array('disabled' => true)));
-
-        $this->assertTrue($field->isDisabled());
-    }
-
-    public function testFieldWithNoErrorsIsValid()
-    {
-        $this->field->submit('data');
-
-        $this->assertTrue($this->field->isValid());
-    }
-
-    public function testFieldWithErrorsIsInvalid()
-    {
-        $this->field->submit('data');
-        $this->field->addError(new FieldError('Some error'));
-
-        $this->assertFalse($this->field->isValid());
-    }
-
-    public function testSubmitResetsErrors()
-    {
-        $this->field->addError(new FieldError('Some error'));
-        $this->field->submit('data');
-
-        $this->assertTrue($this->field->isValid());
-    }
-
-    public function testUnsubmittedFieldIsInvalid()
-    {
-        $this->assertFalse($this->field->isValid());
-    }
-
-    public function testGetNameReturnsKey()
-    {
-        $this->assertEquals('title', $this->field->getName());
-    }
-
-    public function testGetNameIncludesParent()
-    {
-        $this->field->setParent($this->createMockGroupWithName('news[article]'));
-
-        $this->assertEquals('news[article][title]', $this->field->getName());
-    }
-
-    public function testGetIdReturnsKey()
-    {
-        $this->assertEquals('title', $this->field->getId());
-    }
-
-    public function testGetIdIncludesParent()
-    {
-        $this->field->setParent($this->createMockGroupWithId('news_article'));
-
-        $this->assertEquals('news_article_title', $this->field->getId());
-    }
-
-    public function testIsRequiredReturnsOwnValueIfNoParent()
-    {
-        $this->field->setRequired(true);
-        $this->assertTrue($this->field->isRequired());
-
-        $this->field->setRequired(false);
-        $this->assertFalse($this->field->isRequired());
-    }
-
-    public function testIsRequiredReturnsOwnValueIfParentIsRequired()
-    {
-        $group = $this->createMockGroup();
-        $group->expects($this->any())
-                    ->method('isRequired')
-                    ->will($this->returnValue(true));
-
-        $this->field->setParent($group);
-
-        $this->field->setRequired(true);
-        $this->assertTrue($this->field->isRequired());
-
-        $this->field->setRequired(false);
-        $this->assertFalse($this->field->isRequired());
-    }
-
-    public function testIsRequiredReturnsFalseIfParentIsNotRequired()
-    {
-        $group = $this->createMockGroup();
-        $group->expects($this->any())
-                    ->method('isRequired')
-                    ->will($this->returnValue(false));
-
-        $this->field->setParent($group);
-        $this->field->setRequired(true);
-
-        $this->assertFalse($this->field->isRequired());
-    }
-
-    public function testExceptionIfUnknownOption()
-    {
-        $this->setExpectedException('Symfony\Component\Form\Exception\InvalidOptionsException');
-
-        new RequiredOptionsField('name', array('bar' => 'baz', 'moo' => 'maa'));
-    }
-
-    public function testExceptionIfMissingOption()
-    {
-        $this->setExpectedException('Symfony\Component\Form\Exception\MissingOptionsException');
-
-        new RequiredOptionsField('name');
-    }
-
-    public function testIsSubmitted()
-    {
-        $this->assertFalse($this->field->isSubmitted());
-        $this->field->submit('symfony');
-        $this->assertTrue($this->field->isSubmitted());
-    }
-
-    public function testDefaultValuesAreTransformedCorrectly()
-    {
-        $field = new TestField('name');
-
-        $this->assertEquals(null, $this->field->getData());
-        $this->assertEquals('', $this->field->getDisplayedData());
-    }
-
-    public function testValuesAreTransformedCorrectlyIfNull_noValueTransformer()
-    {
-        $this->field->setData(null);
-
-        $this->assertSame(null, $this->field->getData());
-        $this->assertSame('', $this->field->getDisplayedData());
-    }
-
-    public function testValuesAreTransformedCorrectlyIfNotNull_noValueTransformer()
-    {
-        $this->field->setData(123);
-
-        $this->assertSame(123, $this->field->getData());
-        $this->assertSame('123', $this->field->getDisplayedData());
-    }
-
-    public function testSubmittedValuesAreTransformedCorrectly()
-    {
-        $valueTransformer = $this->createMockTransformer();
-        $normTransformer = $this->createMockTransformer();
-
-        $field = $this->getMock(
-            'Symfony\Tests\Component\Form\Fixtures\TestField',
-            array('processData'), // only mock processData()
-            array('title', array(
-                'value_transformer' => $valueTransformer,
-                'normalization_transformer' => $normTransformer,
-            ))
-        );
-
-        // 1a. The value is converted to a string and passed to the value transformer
-        $valueTransformer->expects($this->once())
-                                ->method('reverseTransform')
-                                ->with($this->identicalTo('0'))
-                                ->will($this->returnValue('reverse[0]'));
-
-        // 2. The output of the reverse transformation is passed to processData()
-        //    The processed data is accessible through getNormalizedData()
-        $field->expects($this->once())
-                    ->method('processData')
-                    ->with($this->equalTo('reverse[0]'))
-                    ->will($this->returnValue('processed[reverse[0]]'));
-
-        // 3. The processed data is denormalized and then accessible through
-        //    getData()
-        $normTransformer->expects($this->once())
-                                ->method('reverseTransform')
-                                ->with($this->identicalTo('processed[reverse[0]]'))
-                                ->will($this->returnValue('denorm[processed[reverse[0]]]'));
-
-        // 4. The processed data is transformed again and then accessible
-        //    through getDisplayedData()
-        $valueTransformer->expects($this->once())
-                                ->method('transform')
-                                ->with($this->equalTo('processed[reverse[0]]'))
-                                ->will($this->returnValue('transform[processed[reverse[0]]]'));
-
-        $field->submit(0);
-
-        $this->assertEquals('denorm[processed[reverse[0]]]', $field->getData());
-        $this->assertEquals('processed[reverse[0]]', $field->getNormalizedData());
-        $this->assertEquals('transform[processed[reverse[0]]]', $field->getDisplayedData());
-    }
-
-    public function testSubmittedValuesAreTransformedCorrectlyIfEmpty_processDataReturnsValue()
-    {
-        $transformer = $this->createMockTransformer();
-
-        $field = $this->getMock(
-            'Symfony\Tests\Component\Form\Fixtures\TestField',
-            array('processData'), // only mock processData()
-            array('title', array(
-                'value_transformer' => $transformer,
-            ))
-        );
-
-        // 1. Empty values are converted to NULL by convention
-        $transformer->expects($this->once())
-                                ->method('reverseTransform')
-                                ->with($this->identicalTo(''))
-                                ->will($this->returnValue(null));
-
-        // 2. NULL is passed to processData()
-        $field->expects($this->once())
-                    ->method('processData')
-                    ->with($this->identicalTo(null))
-                    ->will($this->returnValue('processed'));
-
-        // 3. The processed data is transformed (for displayed data)
-        $transformer->expects($this->once())
-                                ->method('transform')
-                                ->with($this->equalTo('processed'))
-                                ->will($this->returnValue('transform[processed]'));
-
-        $field->submit('');
-
-        $this->assertSame('processed', $field->getData());
-        $this->assertEquals('transform[processed]', $field->getDisplayedData());
-    }
-
-    public function testSubmittedValuesAreTransformedCorrectlyIfEmpty_processDataReturnsNull()
-    {
-        $transformer = $this->createMockTransformer();
-
-        $field = new TestField('title', array(
-            'value_transformer' => $transformer,
-        ));
-
-        // 1. Empty values are converted to NULL by convention
-        $transformer->expects($this->once())
-                                ->method('reverseTransform')
-                                ->with($this->identicalTo(''))
-                                ->will($this->returnValue(null));
-
-        // 2. The processed data is NULL and therefore transformed to an empty
-        //    string by convention
-        $transformer->expects($this->once())
-                                ->method('transform')
-                                ->with($this->identicalTo(null))
-                                ->will($this->returnValue(''));
-
-        $field->submit('');
-
-        $this->assertSame(null, $field->getData());
-        $this->assertEquals('', $field->getDisplayedData());
-    }
-
-    public function testSubmittedValuesAreTransformedCorrectlyIfEmpty_processDataReturnsNull_noValueTransformer()
-    {
-        $this->field->submit('');
-
-        $this->assertSame(null, $this->field->getData());
-        $this->assertEquals('', $this->field->getDisplayedData());
-    }
-
-    public function testValuesAreTransformedCorrectly()
-    {
-        // The value is first passed to the normalization transformer...
-        $normTransformer = $this->createMockTransformer();
-        $normTransformer->expects($this->exactly(2))
-                                ->method('transform')
-                                // Impossible to test with PHPUnit because called twice
-                                // ->with($this->identicalTo(0))
-                                ->will($this->returnValue('norm[0]'));
-
-        // ...and then to the value transformer
-        $valueTransformer = $this->createMockTransformer();
-        $valueTransformer->expects($this->exactly(2))
-                                ->method('transform')
-                                // Impossible to test with PHPUnit because called twice
-                                // ->with($this->identicalTo('norm[0]'))
-                                ->will($this->returnValue('transform[norm[0]]'));
-
-        $field = new TestField('title', array(
-            'value_transformer' => $valueTransformer,
-            'normalization_transformer' => $normTransformer,
-        ));
-
-        $field->setData(0);
-
-        $this->assertEquals(0, $field->getData());
-        $this->assertEquals('norm[0]', $field->getNormalizedData());
-        $this->assertEquals('transform[norm[0]]', $field->getDisplayedData());
-    }
-
-    public function testSubmittedValuesAreTrimmedBeforeTransforming()
-    {
-        // The value is passed to the value transformer
-        $transformer = $this->createMockTransformer();
-        $transformer->expects($this->once())
-                                ->method('reverseTransform')
-                                ->with($this->identicalTo('a'))
-                                ->will($this->returnValue('reverse[a]'));
-
-        $transformer->expects($this->exactly(2))
-                                ->method('transform')
-                                // Impossible to test with PHPUnit because called twice
-                                // ->with($this->identicalTo('reverse[a]'))
-                                ->will($this->returnValue('a'));
-
-        $field = new TestField('title', array(
-            'value_transformer' => $transformer,
-        ));
-
-        $field->submit(' a ');
-
-        $this->assertEquals('a', $field->getDisplayedData());
-        $this->assertEquals('reverse[a]', $field->getData());
-    }
-
-    public function testSubmittedValuesAreNotTrimmedBeforeTransformingIfDisabled()
-    {
-        // The value is passed to the value transformer
-        $transformer = $this->createMockTransformer();
-        $transformer->expects($this->once())
-                                ->method('reverseTransform')
-                                ->with($this->identicalTo(' a '))
-                                ->will($this->returnValue('reverse[ a ]'));
-
-        $transformer->expects($this->exactly(2))
-                                ->method('transform')
-                                // Impossible to test with PHPUnit because called twice
-                                // ->with($this->identicalTo('reverse[ a ]'))
-                                ->will($this->returnValue(' a '));
-
-        $field = new TestField('title', array(
-            'trim' => false,
-            'value_transformer' => $transformer,
-        ));
-
-        $field->submit(' a ');
-
-        $this->assertEquals(' a ', $field->getDisplayedData());
-        $this->assertEquals('reverse[ a ]', $field->getData());
-    }
-
-    /*
-     * This is important so that submit() can work even if setData() was not called
-     * before
-     */
-    public function testWritePropertyTreatsEmptyValuesAsArrays()
-    {
-        $array = null;
-
-        $field = new TestField('firstName');
-        $field->submit('Bernhard');
-        $field->writeProperty($array);
-
-        $this->assertEquals(array('firstName' => 'Bernhard'), $array);
-    }
-
-    public function testWritePropertyDoesNotWritePropertyIfPropertyPathIsEmpty()
-    {
-        $object = new Author();
-
-        $field = new TestField('firstName', array('property_path' => null));
-        $field->submit('Bernhard');
-        $field->writeProperty($object);
-
-        $this->assertEquals(null, $object->firstName);
-    }
-
-    public function testIsTransformationSuccessfulReturnsTrueIfReverseTransformSucceeded()
-    {
-        $field = new TestField('title', array(
-            'trim' => false,
-        ));
-
-        $field->submit('a');
-
-        $this->assertEquals('a', $field->getDisplayedData());
-        $this->assertTrue($field->isTransformationSuccessful());
-    }
-
-    public function testIsTransformationSuccessfulReturnsFalseIfReverseTransformThrowsException()
-    {
-        // The value is passed to the value transformer
-        $transformer = $this->createMockTransformer();
-        $transformer->expects($this->once())
-                ->method('reverseTransform')
-                ->will($this->throwException(new TransformationFailedException()));
-
-        $field = new TestField('title', array(
-            'trim' => false,
-            'value_transformer' => $transformer,
-        ));
-
-        $field->submit('a');
-
-        $this->assertEquals('a', $field->getDisplayedData());
-        $this->assertFalse($field->isTransformationSuccessful());
-    }
-
-    public function testGetRootReturnsRootOfParentIfSet()
-    {
-        $parent = $this->createMockGroup();
-        $parent->expects($this->any())
-                ->method('getRoot')
-                ->will($this->returnValue('ROOT'));
-
-        $this->field->setParent($parent);
-
-        $this->assertEquals('ROOT', $this->field->getRoot());
-    }
-
-    public function testFieldsInitializedWithDataAreNotUpdatedWhenAddedToForms()
-    {
-        $author = new Author();
-        $author->firstName = 'Bernhard';
-
-        $field = new TestField('firstName', array(
-            'data' => 'foobar',
-        ));
-
-        $form = new Form('author', array(
-            'data' => $author,
-        ));
-        $form->add($field);
-
-        $this->assertEquals('foobar', $field->getData());
-    }
-
-    public function testGetRootReturnsFieldIfNoParent()
-    {
-        $this->assertEquals($this->field, $this->field->getRoot());
-    }
-
-    public function testIsEmptyReturnsTrueIfNull()
-    {
-        $this->field->setData(null);
-
-        $this->assertTrue($this->field->isEmpty());
-    }
-
-    public function testIsEmptyReturnsTrueIfEmptyString()
-    {
-        $this->field->setData('');
-
-        $this->assertTrue($this->field->isEmpty());
-    }
-
-    public function testIsEmptyReturnsFalseIfZero()
-    {
-        $this->field->setData(0);
-
-        $this->assertFalse($this->field->isEmpty());
-    }
-
-    protected function createMockTransformer()
-    {
-        return $this->getMock('Symfony\Component\Form\ValueTransformer\ValueTransformerInterface', array(), array(), '', false, false);
-    }
-
-    protected function createMockTransformerTransformingTo($value)
-    {
-        $transformer = $this->createMockTransformer();
-        $transformer->expects($this->any())
-                                ->method('reverseTransform')
-                                ->will($this->returnValue($value));
-
-        return $transformer;
-    }
-
-    protected function createMockGroup()
-    {
-        return $this->getMock(
-            'Symfony\Component\Form\Form',
-            array(),
-            array(),
-            '',
-            false // don't call constructor
-        );
-    }
-
-    protected function createMockGroupWithName($name)
-    {
-        $group = $this->createMockGroup();
-        $group->expects($this->any())
-                                ->method('getName')
-                                ->will($this->returnValue($name));
-
-        return $group;
-    }
-
-    protected function createMockGroupWithId($id)
-    {
-        $group = $this->createMockGroup();
-        $group->expects($this->any())
-                                ->method('getId')
-                                ->will($this->returnValue($id));
-
-        return $group;
-    }
-}
diff --git a/tests/Symfony/Tests/Component/Form/FileFieldTest.php b/tests/Symfony/Tests/Component/Form/FileFieldTest.php
deleted file mode 100644
index b6a44bbc98..0000000000
--- a/tests/Symfony/Tests/Component/Form/FileFieldTest.php
+++ /dev/null
@@ -1,245 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Tests\Component\Form;
-
-use Symfony\Component\Form\FileField;
-use Symfony\Component\HttpFoundation\File\File;
-
-class FileFieldTest extends \PHPUnit_Framework_TestCase
-{
-    public static $tmpFiles = array();
-
-    protected static $tmpDir;
-
-    protected $field;
-
-    public static function setUpBeforeClass()
-    {
-        self::$tmpDir = sys_get_temp_dir();
-
-        // we need a session ID
-        @session_start();
-    }
-
-    protected function setUp()
-    {
-        $this->field = new FileField('file', array(
-            'secret' => '$secret$',
-            'tmp_dir' => self::$tmpDir,
-        ));
-    }
-
-    protected function tearDown()
-    {
-        foreach (self::$tmpFiles as $key => $file) {
-            @unlink($file);
-            unset(self::$tmpFiles[$key]);
-        }
-    }
-
-    public function createTmpFile($path)
-    {
-        self::$tmpFiles[] = $path;
-        file_put_contents($path, 'foobar');
-    }
-
-    public function testSubmitUploadsNewFiles()
-    {
-        $tmpDir = realpath(self::$tmpDir);
-        $tmpName = md5(session_id() . '$secret$' . '12345');
-        $tmpPath = $tmpDir . DIRECTORY_SEPARATOR . $tmpName;
-        $that = $this;
-
-        $file = $this->getMock('Symfony\Component\HttpFoundation\File\UploadedFile', array(), array(), '', false);
-        $file->expects($this->once())
-             ->method('move')
-             ->with($this->equalTo($tmpDir));
-        $file->expects($this->once())
-             ->method('rename')
-             ->with($this->equalTo($tmpName))
-             ->will($this->returnCallback(function ($directory) use ($that, $tmpPath) {
-                $that->createTmpFile($tmpPath);
-             }));
-        $file->expects($this->any())
-             ->method('getName')
-             ->will($this->returnValue('original_name.jpg'));
-
-        $this->field->submit(array(
-            'file' => $file,
-            'token' => '12345',
-            'original_name' => '',
-        ));
-
-        $this->assertTrue(file_exists($tmpPath));
-        $this->assertEquals(array(
-            'file' => '',
-            'token' => '12345',
-            'original_name' => 'original_name.jpg',
-        ), $this->field->getDisplayedData());
-        $this->assertEquals($tmpPath, $this->field->getData());
-        $this->assertFalse($this->field->isIniSizeExceeded());
-        $this->assertFalse($this->field->isFormSizeExceeded());
-        $this->assertTrue($this->field->isUploadComplete());
-    }
-
-    public function testSubmitKeepsUploadedFilesOnErrors()
-    {
-        $tmpPath = self::$tmpDir . '/' . md5(session_id() . '$secret$' . '12345');
-        $this->createTmpFile($tmpPath);
-
-        $this->field->submit(array(
-            'file' => '',
-            'token' => '12345',
-            'original_name' => 'original_name.jpg',
-        ));
-
-        $this->assertTrue(file_exists($tmpPath));
-        $this->assertEquals(array(
-            'file' => '',
-            'token' => '12345',
-            'original_name' => 'original_name.jpg',
-        ), $this->field->getDisplayedData());
-        $this->assertEquals(realpath($tmpPath), realpath($this->field->getData()));
-    }
-
-    /**
-     * @expectedException UnexpectedValueException
-     */
-    public function testSubmitFailsOnMissingMultipart()
-    {
-        $this->field->submit(array(
-            'file' => 'foo.jpg',
-            'token' => '12345',
-            'original_name' => 'original_name.jpg',
-        ));
-    }
-
-    public function testSubmitKeepsOldFileIfNotOverwritten()
-    {
-        $oldPath = tempnam(sys_get_temp_dir(), 'FileFieldTest');
-        $this->createTmpFile($oldPath);
-
-        $this->field->setData($oldPath);
-
-        $this->assertEquals($oldPath, $this->field->getData());
-
-        $this->field->submit(array(
-            'file' => '',
-            'token' => '12345',
-            'original_name' => '',
-        ));
-
-        $this->assertTrue(file_exists($oldPath));
-        $this->assertEquals(array(
-            'file' => '',
-            'token' => '12345',
-            'original_name' => '',
-        ), $this->field->getDisplayedData());
-        $this->assertEquals($oldPath, $this->field->getData());
-    }
-
-    public function testSubmitHandlesUploadErrIniSize()
-    {
-        $file = $this->getMock('Symfony\Component\HttpFoundation\File\UploadedFile', array(), array(), '', false);
-        $file->expects($this->any())
-             ->method('getError')
-             ->will($this->returnValue(UPLOAD_ERR_INI_SIZE));
-
-        $this->field->submit(array(
-            'file' => $file,
-            'token' => '12345',
-            'original_name' => ''
-        ));
-
-        $this->assertTrue($this->field->isIniSizeExceeded());
-    }
-
-    public function testSubmitHandlesUploadErrFormSize()
-    {
-        $file = $this->getMock('Symfony\Component\HttpFoundation\File\UploadedFile', array(), array(), '', false);
-        $file->expects($this->any())
-             ->method('getError')
-             ->will($this->returnValue(UPLOAD_ERR_FORM_SIZE));
-
-        $this->field->submit(array(
-            'file' => $file,
-            'token' => '12345',
-            'original_name' => ''
-        ));
-
-        $this->assertTrue($this->field->isFormSizeExceeded());
-    }
-
-    public function testSubmitHandlesUploadErrPartial()
-    {
-        $file = $this->getMock('Symfony\Component\HttpFoundation\File\UploadedFile', array(), array(), '', false);
-        $file->expects($this->any())
-             ->method('getError')
-             ->will($this->returnValue(UPLOAD_ERR_PARTIAL));
-
-        $this->field->submit(array(
-            'file' => $file,
-            'token' => '12345',
-            'original_name' => ''
-        ));
-
-        $this->assertFalse($this->field->isUploadComplete());
-    }
-
-    public function testSubmitThrowsExceptionOnUploadErrNoTmpDir()
-    {
-        $file = $this->getMock('Symfony\Component\HttpFoundation\File\UploadedFile', array(), array(), '', false);
-        $file->expects($this->any())
-             ->method('getError')
-             ->will($this->returnValue(UPLOAD_ERR_NO_TMP_DIR));
-
-        $this->setExpectedException('Symfony\Component\Form\Exception\FormException');
-
-        $this->field->submit(array(
-            'file' => $file,
-            'token' => '12345',
-            'original_name' => ''
-        ));
-    }
-
-    public function testSubmitThrowsExceptionOnUploadErrCantWrite()
-    {
-        $file = $this->getMock('Symfony\Component\HttpFoundation\File\UploadedFile', array(), array(), '', false);
-        $file->expects($this->any())
-             ->method('getError')
-             ->will($this->returnValue(UPLOAD_ERR_CANT_WRITE));
-
-        $this->setExpectedException('Symfony\Component\Form\Exception\FormException');
-
-        $this->field->submit(array(
-            'file' => $file,
-            'token' => '12345',
-            'original_name' => ''
-        ));
-    }
-
-    public function testSubmitThrowsExceptionOnUploadErrExtension()
-    {
-        $file = $this->getMock('Symfony\Component\HttpFoundation\File\UploadedFile', array(), array(), '', false);
-        $file->expects($this->any())
-             ->method('getError')
-             ->will($this->returnValue(UPLOAD_ERR_EXTENSION));
-
-        $this->setExpectedException('Symfony\Component\Form\Exception\FormException');
-
-        $this->field->submit(array(
-            'file' => $file,
-            'token' => '12345',
-            'original_name' => ''
-        ));
-    }
-}
\ No newline at end of file
diff --git a/tests/Symfony/Tests/Component/Form/Fixtures/FixedDataTransformer.php b/tests/Symfony/Tests/Component/Form/Fixtures/FixedDataTransformer.php
new file mode 100644
index 0000000000..9d156ddd99
--- /dev/null
+++ b/tests/Symfony/Tests/Component/Form/Fixtures/FixedDataTransformer.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Symfony\Tests\Component\Form\Fixtures;
+
+use Symfony\Component\Form\DataTransformer\DataTransformerInterface;
+
+class FixedDataTransformer implements DataTransformerInterface
+{
+    private $mapping;
+
+    public function __construct(array $mapping)
+    {
+        $this->mapping = $mapping;
+    }
+
+    public function transform($value)
+    {
+        if (!array_key_exists($value, $this->mapping)) {
+            throw new \RuntimeException(sprintf('No mapping for value "%s"', $value));
+        }
+
+        return $this->mapping[$value];
+    }
+
+    public function reverseTransform($value)
+    {
+        $result = array_search($value, $this->mapping, true);
+
+        if ($result === false) {
+            throw new \RuntimeException(sprintf('No reverse mapping for value "%s"', $value));
+        }
+
+        return $result;
+    }
+}
\ No newline at end of file
diff --git a/tests/Symfony/Tests/Component/Form/Fixtures/FixedFilterListener.php b/tests/Symfony/Tests/Component/Form/Fixtures/FixedFilterListener.php
new file mode 100644
index 0000000000..7032d9e90a
--- /dev/null
+++ b/tests/Symfony/Tests/Component/Form/Fixtures/FixedFilterListener.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace Symfony\Tests\Component\Form\Fixtures;
+
+use Symfony\Component\Form\Events;
+use Symfony\Component\Form\Event\FilterDataEvent;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+class FixedFilterListener implements EventSubscriberInterface
+{
+    private $mapping;
+
+    public function __construct(array $mapping)
+    {
+        $this->mapping = array_merge(array(
+            'onBindClientData' => array(),
+            'onBindNormData' => array(),
+            'onSetData' => array(),
+        ), $mapping);
+    }
+
+    public function onBindClientData(FilterDataEvent $event)
+    {
+        $data = $event->getData();
+
+        if (isset($this->mapping['onBindClientData'][$data])) {
+            $event->setData($this->mapping['onBindClientData'][$data]);
+        }
+    }
+
+    public function onBindNormData(FilterDataEvent $event)
+    {
+        $data = $event->getData();
+
+        if (isset($this->mapping['onBindNormData'][$data])) {
+            $event->setData($this->mapping['onBindNormData'][$data]);
+        }
+    }
+
+    public function onSetData(FilterDataEvent $event)
+    {
+        $data = $event->getData();
+
+        if (isset($this->mapping['onSetData'][$data])) {
+            $event->setData($this->mapping['onSetData'][$data]);
+        }
+    }
+
+    public static function getSubscribedEvents()
+    {
+        return array(
+            Events::onBindClientData,
+            Events::onBindNormData,
+            Events::onSetData,
+        );
+    }
+}
\ No newline at end of file
diff --git a/tests/Symfony/Tests/Component/Form/Fixtures/InvalidField.php b/tests/Symfony/Tests/Component/Form/Fixtures/InvalidField.php
deleted file mode 100644
index f762bf1d27..0000000000
--- a/tests/Symfony/Tests/Component/Form/Fixtures/InvalidField.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-namespace Symfony\Tests\Component\Form\Fixtures;
-
-use Symfony\Component\Form\Field;
-
-class InvalidField extends Field
-{
-    public function isValid()
-    {
-        return false;
-    }
-
-    public function render(array $attributes = array())
-    {
-    }
-}
\ No newline at end of file
diff --git a/tests/Symfony/Tests/Component/Form/Fixtures/RequiredOptionsField.php b/tests/Symfony/Tests/Component/Form/Fixtures/RequiredOptionsField.php
deleted file mode 100644
index 9c85da5219..0000000000
--- a/tests/Symfony/Tests/Component/Form/Fixtures/RequiredOptionsField.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace Symfony\Tests\Component\Form\Fixtures;
-
-use Symfony\Component\Form\Field;
-
-class RequiredOptionsField extends Field
-{
-    protected function configure()
-    {
-        $this->addOption('foo');
-        $this->addRequiredOption('bar');
-
-        parent::configure();
-    }
-
-    public function render(array $attributes = array())
-    {
-    }
-}
\ No newline at end of file
diff --git a/tests/Symfony/Tests/Component/Form/Fixtures/TestField.php b/tests/Symfony/Tests/Component/Form/Fixtures/TestField.php
deleted file mode 100644
index 94d6f8b129..0000000000
--- a/tests/Symfony/Tests/Component/Form/Fixtures/TestField.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-namespace Symfony\Tests\Component\Form\Fixtures;
-
-use Symfony\Component\Form\Field;
-use Symfony\Component\Form\ValueTransformer\ValueTransformerInterface;
-
-class TestField extends Field
-{
-    public function render(array $attributes = array())
-    {
-    }
-
-    /**
-     * Expose method for testing purposes
-     */
-    public function getNormalizedData()
-    {
-        return parent::getNormalizedData();
-    }
-}
\ No newline at end of file
diff --git a/tests/Symfony/Tests/Component/Form/Fixtures/TestForm.php b/tests/Symfony/Tests/Component/Form/Fixtures/TestForm.php
deleted file mode 100644
index 553f84949e..0000000000
--- a/tests/Symfony/Tests/Component/Form/Fixtures/TestForm.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-namespace Symfony\Tests\Component\Form\Fixtures;
-
-use Symfony\Component\Form\Form;
-use Symfony\Component\Form\ValueTransformer\ValueTransformerInterface;
-
-class TestForm extends Form
-{
-    /**
-     * Expose method for testing purposes
-     */
-    public function setNormalizationTransformer(ValueTransformerInterface $normalizationTransformer)
-    {
-        parent::setNormalizationTransformer($normalizationTransformer);
-    }
-
-    /**
-     * Expose method for testing purposes
-     */
-    public function setValueTransformer(ValueTransformerInterface $valueTransformer)
-    {
-        parent::setValueTransformer($valueTransformer);
-    }
-
-    /**
-     * Expose method for testing purposes
-     */
-    public function getNormalizedData()
-    {
-        return parent::getNormalizedData();
-    }
-}
\ No newline at end of file
diff --git a/tests/Symfony/Tests/Component/Form/Fixtures/TestInputField.php b/tests/Symfony/Tests/Component/Form/Fixtures/TestInputField.php
deleted file mode 100644
index 89eacceb53..0000000000
--- a/tests/Symfony/Tests/Component/Form/Fixtures/TestInputField.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace Symfony\Tests\Component\Form\Fixtures;
-
-use Symfony\Component\Form\InputField;
-
-class TestInputField extends InputField
-{
-    /**
-     * {@inheritDoc}
-     */
-    public function __construct($key, array $options = array())
-    {
-        $options['type'] = 'text';
-
-        parent::__construct($key, $options);
-    }
-}
\ No newline at end of file
diff --git a/tests/Symfony/Tests/Component/Form/Fixtures/TestToggleField.php b/tests/Symfony/Tests/Component/Form/Fixtures/TestToggleField.php
deleted file mode 100644
index d045e09f79..0000000000
--- a/tests/Symfony/Tests/Component/Form/Fixtures/TestToggleField.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace Symfony\Tests\Component\Form\Fixtures;
-
-use Symfony\Component\Form\ToggleField;
-
-class TestToggleField extends ToggleField
-{
-    /**
-     * {@inheritDoc}
-     */
-    public function __construct($key, array $options = array())
-    {
-        $options['type'] = 'checkbox';
-
-        parent::__construct($key, $options);
-    }
-}
\ No newline at end of file
diff --git a/tests/Symfony/Tests/Component/Form/FormBuilderTest.php b/tests/Symfony/Tests/Component/Form/FormBuilderTest.php
new file mode 100644
index 0000000000..a30cb791f6
--- /dev/null
+++ b/tests/Symfony/Tests/Component/Form/FormBuilderTest.php
@@ -0,0 +1,150 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Tests\Component\Form;
+
+use Symfony\Component\Form\FormFactory;
+use Symfony\Component\Form\FormBuilder;
+use Symfony\Component\Form\Type\Guesser\Guess;
+use Symfony\Component\Form\Type\Guesser\ValueGuess;
+use Symfony\Component\Form\Type\Guesser\TypeGuess;
+
+class FormBuilderTest extends \PHPUnit_Framework_TestCase
+{
+    private $dispatcher;
+
+    private $factory;
+
+    private $builder;
+
+    public function setUp()
+    {
+        $this->dispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
+        $this->factory = $this->getMock('Symfony\Component\Form\FormFactoryInterface');
+        $this->builder = new FormBuilder('name', $this->factory, $this->dispatcher);
+    }
+
+    /**
+     * Changing the name is not allowed, otherwise the name and property path
+     * are not synchronized anymore
+     *
+     * @see FieldType::buildForm
+     */
+    public function testNoSetName()
+    {
+        $this->assertFalse(method_exists($this->builder, 'setName'));
+    }
+
+    public function testAddNameNoString()
+    {
+        $this->setExpectedException('Symfony\Component\Form\Exception\UnexpectedTypeException');
+        $this->builder->add(1234);
+    }
+
+    public function testAddTypeNoString()
+    {
+        $this->setExpectedException('Symfony\Component\Form\Exception\UnexpectedTypeException');
+        $this->builder->add('foo', 1234);
+    }
+
+    public function testAddWithGuessFluent()
+    {
+        $this->builder = new FormBuilder('name', $this->factory, $this->dispatcher, 'stdClass');
+        $builder = $this->builder->add('foo');
+        $this->assertSame($builder, $this->builder);
+    }
+
+    public function testAddIsFluent()
+    {
+        $builder = $this->builder->add('foo', 'text', array('bar' => 'baz'));
+        $this->assertSame($builder, $this->builder);
+    }
+
+    public function testAdd()
+    {
+        $this->assertFalse($this->builder->has('foo'));
+        $this->builder->add('foo', 'text');
+        $this->assertTrue($this->builder->has('foo'));
+    }
+
+    public function testAddFormType()
+    {
+        $this->assertFalse($this->builder->has('foo'));
+        $this->builder->add('foo', $this->getMock('Symfony\Component\Form\Type\FormTypeInterface'));
+        $this->assertTrue($this->builder->has('foo'));
+    }
+
+    public function testRemove()
+    {
+        $this->builder->add('foo', 'text');
+        $this->builder->remove('foo');
+        $this->assertFalse($this->builder->has('foo'));
+    }
+
+    public function testRemoveUnknown()
+    {
+        $this->builder->remove('foo');
+        $this->assertFalse($this->builder->has('foo'));
+    }
+
+    public function testBuildNoTypeNoDataClass()
+    {
+        $this->setExpectedException('Symfony\Component\Form\Exception\FormException', 'The data class must be set to automatically create children');
+        $this->builder->build('foo');
+    }
+
+    public function testGetUnknown()
+    {
+        $this->setExpectedException('Symfony\Component\Form\Exception\FormException', 'The field "foo" does not exist');
+        $this->builder->get('foo');
+    }
+
+    public function testGetTyped()
+    {
+        $expectedType = 'text';
+        $expectedName = 'foo';
+        $expectedOptions = array('bar' => 'baz');
+
+        $this->factory->expects($this->once())
+                ->method('createBuilder')
+                ->with($this->equalTo($expectedType), $this->equalTo($expectedName), $this->equalTo($expectedOptions))
+                ->will($this->returnValue($this->getFormBuilder()));
+
+        $this->builder->add($expectedName, $expectedType, $expectedOptions);
+        $builder = $this->builder->get($expectedName);
+
+        $this->assertNotSame($builder, $this->builder);
+    }
+
+    public function testGetGuessed()
+    {
+        $expectedName = 'foo';
+        $expectedOptions = array('bar' => 'baz');
+
+        $this->factory->expects($this->once())
+                ->method('createBuilderForProperty')
+                ->with($this->equalTo('stdClass'), $this->equalTo($expectedName), $this->equalTo($expectedOptions))
+                ->will($this->returnValue($this->getFormBuilder()));
+
+        $this->builder = new FormBuilder('name', $this->factory, $this->dispatcher, 'stdClass');
+        $this->builder->add($expectedName, null, $expectedOptions);
+        $builder = $this->builder->get($expectedName);
+
+        $this->assertNotSame($builder, $this->builder);
+    }
+
+    private function getFormBuilder()
+    {
+        return $this->getMockBuilder('Symfony\Component\Form\FormBuilder')
+            ->disableOriginalConstructor()
+            ->getMock();
+    }
+}
\ No newline at end of file
diff --git a/tests/Symfony/Tests/Component/Form/FormContextTest.php b/tests/Symfony/Tests/Component/Form/FormContextTest.php
deleted file mode 100644
index 9b75b5d024..0000000000
--- a/tests/Symfony/Tests/Component/Form/FormContextTest.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Tests\Component\Form;
-
-require_once __DIR__ . '/Fixtures/Author.php';
-require_once __DIR__ . '/Fixtures/TestField.php';
-
-use Symfony\Component\Form\FormContext;
-use Symfony\Component\Form\CsrfProvider\DefaultCsrfProvider;
-
-class FormContextTest extends \PHPUnit_Framework_TestCase
-{
-    protected $validator;
-
-    protected function setUp()
-    {
-        $this->validator = $this->getMock('Symfony\Component\Validator\ValidatorInterface');
-    }
-
-    public function testBuildDefaultWithCsrfProtection()
-    {
-        $context = FormContext::buildDefault($this->validator, 'secret');
-
-        $expected = array(
-            'validator' => $this->validator,
-            'csrf_provider' => new DefaultCsrfProvider('secret'),
-            'context' => $context,
-        );
-
-        $this->assertEquals($expected, $context->getOptions());
-    }
-
-    public function testBuildDefaultWithoutCsrfProtection()
-    {
-        $context = FormContext::buildDefault($this->validator, null, false);
-
-        $expected = array(
-            'validator' => $this->validator,
-            'context' => $context,
-        );
-
-        $this->assertEquals($expected, $context->getOptions());
-    }
-
-    /**
-     * @expectedException Symfony\Component\Form\Exception\FormException
-     */
-    public function testBuildDefaultWithoutCsrfSecretThrowsException()
-    {
-        FormContext::buildDefault($this->validator, null, true);
-    }
-}
diff --git a/tests/Symfony/Tests/Component/Form/FormFactoryTest.php b/tests/Symfony/Tests/Component/Form/FormFactoryTest.php
new file mode 100644
index 0000000000..c5ee015d6f
--- /dev/null
+++ b/tests/Symfony/Tests/Component/Form/FormFactoryTest.php
@@ -0,0 +1,190 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Tests\Component\Form;
+
+use Symfony\Component\Form\FormFactory;
+use Symfony\Component\Form\Type\Guesser\Guess;
+use Symfony\Component\Form\Type\Guesser\ValueGuess;
+use Symfony\Component\Form\Type\Guesser\TypeGuess;
+
+class FormFactoryTest extends \PHPUnit_Framework_TestCase
+{
+    private $typeLoader;
+
+    private $factory;
+
+    protected function setUp()
+    {
+        $this->typeLoader = $this->getMock('Symfony\Component\Form\Type\Loader\TypeLoaderInterface');
+        $this->factory = new FormFactory($this->typeLoader);
+    }
+
+    public function testCreateBuilderForPropertyCreatesFieldWithHighestConfidence()
+    {
+        $guesser1 = $this->getMock('Symfony\Component\Form\Type\Guesser\TypeGuesserInterface');
+        $guesser1->expects($this->once())
+            ->method('guessType')
+            ->with('Application\Author', 'firstName')
+            ->will($this->returnValue(new TypeGuess(
+                'text',
+                array('max_length' => 10),
+                Guess::MEDIUM_CONFIDENCE
+            )));
+
+        $guesser2 = $this->getMock('Symfony\Component\Form\Type\Guesser\TypeGuesserInterface');
+        $guesser2->expects($this->once())
+            ->method('guessType')
+            ->with('Application\Author', 'firstName')
+            ->will($this->returnValue(new TypeGuess(
+                'password',
+                array('max_length' => 7),
+                Guess::HIGH_CONFIDENCE
+            )));
+
+        $factory = $this->createMockFactory(array('createBuilder'), array($guesser1, $guesser2));
+
+        $factory->expects($this->once())
+            ->method('createBuilder')
+            ->with('password', 'firstName', array('max_length' => 7))
+            ->will($this->returnValue('builderInstance'));
+
+        $builder = $factory->createBuilderForProperty('Application\Author', 'firstName');
+
+        $this->assertEquals('builderInstance', $builder);
+    }
+
+    public function testCreateBuilderCreatesTextFieldIfNoGuess()
+    {
+        $guesser = $this->getMock('Symfony\Component\Form\Type\Guesser\TypeGuesserInterface');
+        $guesser->expects($this->once())
+                ->method('guessType')
+                ->with('Application\Author', 'firstName')
+                ->will($this->returnValue(null));
+
+        $factory = $this->createMockFactory(array('createBuilder'), array($guesser));
+
+        $factory->expects($this->once())
+            ->method('createBuilder')
+            ->with('text', 'firstName')
+            ->will($this->returnValue('builderInstance'));
+
+        $builder = $factory->createBuilderForProperty('Application\Author', 'firstName');
+
+        $this->assertEquals('builderInstance', $builder);
+    }
+
+    public function testOptionsCanBeOverridden()
+    {
+        $guesser = $this->getMock('Symfony\Component\Form\Type\Guesser\TypeGuesserInterface');
+        $guesser->expects($this->once())
+                ->method('guessType')
+                ->with('Application\Author', 'firstName')
+                ->will($this->returnValue(new TypeGuess(
+                    'text',
+                    array('max_length' => 10),
+                    Guess::MEDIUM_CONFIDENCE
+                )));
+
+        $factory = $this->createMockFactory(array('createBuilder'), array($guesser));
+
+        $factory->expects($this->once())
+            ->method('createBuilder')
+            ->with('text', 'firstName', array('max_length' => 11))
+            ->will($this->returnValue('builderInstance'));
+
+        $builder = $factory->createBuilderForProperty(
+            'Application\Author',
+            'firstName',
+            array('max_length' => 11)
+        );
+
+        $this->assertEquals('builderInstance', $builder);
+    }
+
+    public function testCreateBuilderUsesMaxLengthIfFound()
+    {
+        $guesser1 = $this->getMock('Symfony\Component\Form\Type\Guesser\TypeGuesserInterface');
+        $guesser1->expects($this->once())
+                ->method('guessMaxLength')
+                ->with('Application\Author', 'firstName')
+                ->will($this->returnValue(new ValueGuess(
+                    15,
+                    Guess::MEDIUM_CONFIDENCE
+                )));
+
+        $guesser2 = $this->getMock('Symfony\Component\Form\Type\Guesser\TypeGuesserInterface');
+        $guesser2->expects($this->once())
+                ->method('guessMaxLength')
+                ->with('Application\Author', 'firstName')
+                ->will($this->returnValue(new ValueGuess(
+                    20,
+                    Guess::HIGH_CONFIDENCE
+                )));
+
+        $factory = $this->createMockFactory(array('createBuilder'), array($guesser1, $guesser2));
+
+        $factory->expects($this->once())
+            ->method('createBuilder')
+            ->with('text', 'firstName', array('max_length' => 20))
+            ->will($this->returnValue('builderInstance'));
+
+        $builder = $factory->createBuilderForProperty(
+            'Application\Author',
+            'firstName'
+        );
+
+        $this->assertEquals('builderInstance', $builder);
+    }
+
+    public function testCreateBuilderUsesRequiredSettingWithHighestConfidence()
+    {
+        $guesser1 = $this->getMock('Symfony\Component\Form\Type\Guesser\TypeGuesserInterface');
+        $guesser1->expects($this->once())
+                ->method('guessRequired')
+                ->with('Application\Author', 'firstName')
+                ->will($this->returnValue(new ValueGuess(
+                    true,
+                    Guess::MEDIUM_CONFIDENCE
+                )));
+
+        $guesser2 = $this->getMock('Symfony\Component\Form\Type\Guesser\TypeGuesserInterface');
+        $guesser2->expects($this->once())
+                ->method('guessRequired')
+                ->with('Application\Author', 'firstName')
+                ->will($this->returnValue(new ValueGuess(
+                    false,
+                    Guess::HIGH_CONFIDENCE
+                )));
+
+        $factory = $this->createMockFactory(array('createBuilder'), array($guesser1, $guesser2));
+
+        $factory->expects($this->once())
+            ->method('createBuilder')
+            ->with('text', 'firstName', array('required' => false))
+            ->will($this->returnValue('builderInstance'));
+
+        $builder = $factory->createBuilderForProperty(
+            'Application\Author',
+            'firstName'
+        );
+
+        $this->assertEquals('builderInstance', $builder);
+    }
+
+    private function createMockFactory(array $methods = array(), array $guessers = array())
+    {
+        return $this->getMockBuilder('Symfony\Component\Form\FormFactory')
+            ->setMethods($methods)
+            ->setConstructorArgs(array($this->typeLoader, $guessers))
+            ->getMock();
+    }
+}
diff --git a/tests/Symfony/Tests/Component/Form/FormInterface.php b/tests/Symfony/Tests/Component/Form/FormInterface.php
new file mode 100644
index 0000000000..84280afadb
--- /dev/null
+++ b/tests/Symfony/Tests/Component/Form/FormInterface.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Symfony\Tests\Component\Form;
+
+interface FormInterface extends \Iterator, \Symfony\Component\Form\FormInterface
+{
+}
\ No newline at end of file
diff --git a/tests/Symfony/Tests/Component/Form/FormTest.php b/tests/Symfony/Tests/Component/Form/FormTest.php
index 68e0cb45af..7796f6057a 100644
--- a/tests/Symfony/Tests/Component/Form/FormTest.php
+++ b/tests/Symfony/Tests/Component/Form/FormTest.php
@@ -11,327 +11,789 @@
 
 namespace Symfony\Tests\Component\Form;
 
-require_once __DIR__ . '/Fixtures/Author.php';
-require_once __DIR__ . '/Fixtures/TestField.php';
-require_once __DIR__ . '/Fixtures/TestForm.php';
+require_once __DIR__.'/Fixtures/FixedDataTransformer.php';
+require_once __DIR__.'/Fixtures/FixedFilterListener.php';
 
 use Symfony\Component\Form\Form;
-use Symfony\Component\Form\FormContext;
-use Symfony\Component\Form\Field;
-use Symfony\Component\Form\FieldError;
-use Symfony\Component\Form\DataError;
-use Symfony\Component\Form\HiddenField;
-use Symfony\Component\Form\PropertyPath;
+use Symfony\Component\Form\FormView;
+use Symfony\Component\Form\FormBuilder;
+use Symfony\Component\Form\FormError;
+use Symfony\Component\Form\DataTransformer\TransformationFailedException;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
-use Symfony\Component\Validator\ConstraintViolation;
-use Symfony\Component\Validator\ConstraintViolationList;
-use Symfony\Component\Validator\ExecutionContext;
-use Symfony\Tests\Component\Form\Fixtures\Author;
-use Symfony\Tests\Component\Form\Fixtures\TestField;
-use Symfony\Tests\Component\Form\Fixtures\TestForm;
-
-class FormTest_PreconfiguredForm extends Form
-{
-    protected function configure()
-    {
-        $this->add(new Field('firstName'));
-
-        parent::configure();
-    }
-}
-
-// behaves like a form with a value transformer that transforms into
-// a specific format
-class FormTest_FormThatReturns extends Form
-{
-    protected $returnValue;
-
-    public function setReturnValue($returnValue)
-    {
-        $this->returnValue = $returnValue;
-    }
-
-    public function setData($data)
-    {
-    }
-
-    public function getData()
-    {
-        return $this->returnValue;
-    }
-}
-
-class FormTest_AuthorWithoutRefSetter
-{
-    protected $reference;
-
-    protected $referenceCopy;
-
-    public function __construct($reference)
-    {
-        $this->reference = $reference;
-        $this->referenceCopy = $reference;
-    }
-
-    // The returned object should be modified by reference without having
-    // to provide a setReference() method
-    public function getReference()
-    {
-        return $this->reference;
-    }
-
-    // The returned object is a copy, so setReferenceCopy() must be used
-    // to update it
-    public function getReferenceCopy()
-    {
-        return is_object($this->referenceCopy) ? clone $this->referenceCopy : $this->referenceCopy;
-    }
-
-    public function setReferenceCopy($reference)
-    {
-        $this->referenceCopy = $reference;
-    }
-}
-
-class TestSetDataBeforeConfigureForm extends Form
-{
-    protected $testCase;
-    protected $object;
-
-    public function __construct($testCase, $name, $object, $validator)
-    {
-        $this->testCase = $testCase;
-        $this->object = $object;
-
-        parent::__construct($name, $object, $validator);
-    }
-
-    protected function configure()
-    {
-        $this->testCase->assertEquals($this->object, $this->getData());
-
-        parent::configure();
-    }
-}
+use Symfony\Component\EventDispatcher\EventDispatcher;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Tests\Component\Form\Fixtures\FixedDataTransformer;
+use Symfony\Tests\Component\Form\Fixtures\FixedFilterListener;
 
 class FormTest extends \PHPUnit_Framework_TestCase
 {
-    protected $validator;
-    protected $form;
+    private $dispatcher;
 
-    public static function setUpBeforeClass()
-    {
-        @session_start();
-    }
+    private $factory;
+
+    private $builder;
+
+    private $form;
 
     protected function setUp()
     {
-        $this->validator = $this->createMockValidator();
-        $this->form = new Form('author', array('validator' => $this->validator));
-    }
-
-    public function testNoCsrfProtectionByDefault()
-    {
-        $form = new Form('author');
-
-        $this->assertFalse($form->isCsrfProtected());
-    }
-
-    public function testCsrfProtectionCanBeEnabled()
-    {
-        $form = new Form('author', array(
-            'csrf_provider' => $this->createMockCsrfProvider(),
-        ));
-
-        $this->assertTrue($form->isCsrfProtected());
-    }
-
-    public function testCsrfFieldNameCanBeSet()
-    {
-        $form = new Form('author', array(
-            'csrf_provider' => $this->createMockCsrfProvider(),
-            'csrf_field_name' => 'foobar',
-        ));
-
-        $this->assertEquals('foobar', $form->getCsrfFieldName());
-    }
-
-    public function testCsrfProtectedFormsHaveExtraField()
-    {
-        $provider = $this->createMockCsrfProvider();
-        $provider->expects($this->once())
-                ->method('generateCsrfToken')
-                ->with($this->equalTo('Symfony\Component\Form\Form'))
-                ->will($this->returnValue('ABCDEF'));
-
-        $form = new Form('author', array(
-            'csrf_provider' => $provider,
-        ));
-
-        $this->assertTrue($form->has($this->form->getCsrfFieldName()));
-
-        $field = $form->get($form->getCsrfFieldName());
-
-        $this->assertTrue($field instanceof HiddenField);
-        $this->assertEquals('ABCDEF', $field->getDisplayedData());
-    }
-
-    public function testIsCsrfTokenValidPassesIfCsrfProtectionIsDisabled()
-    {
-        $this->form->submit(array());
-
-        $this->assertTrue($this->form->isCsrfTokenValid());
-    }
-
-    public function testIsCsrfTokenValidPasses()
-    {
-        $provider = $this->createMockCsrfProvider();
-        $provider->expects($this->once())
-                ->method('isCsrfTokenValid')
-                ->with($this->equalTo('Symfony\Component\Form\Form'), $this->equalTo('ABCDEF'))
-                ->will($this->returnValue(true));
-
-        $form = new Form('author', array(
-            'csrf_provider' => $provider,
-            'validator' => $this->validator,
-        ));
-
-        $field = $form->getCsrfFieldName();
-
-        $form->submit(array($field => 'ABCDEF'));
-
-        $this->assertTrue($form->isCsrfTokenValid());
-    }
-
-    public function testIsCsrfTokenValidFails()
-    {
-        $provider = $this->createMockCsrfProvider();
-        $provider->expects($this->once())
-                ->method('isCsrfTokenValid')
-                ->with($this->equalTo('Symfony\Component\Form\Form'), $this->equalTo('ABCDEF'))
-                ->will($this->returnValue(false));
-
-        $form = new Form('author', array(
-            'csrf_provider' => $provider,
-            'validator' => $this->validator,
-        ));
-
-        $field = $form->getCsrfFieldName();
-
-        $form->submit(array($field => 'ABCDEF'));
-
-        $this->assertFalse($form->isCsrfTokenValid());
-    }
-
-    public function testGetValidator()
-    {
-        $this->assertSame($this->validator, $this->form->getValidator());
-    }
-
-    public function testValidationGroupNullByDefault()
-    {
-        $this->assertNull($this->form->getValidationGroups());
-    }
-
-    public function testValidationGroupsCanBeSetToString()
-    {
-        $form = new Form('author', array(
-            'validation_groups' => 'group',
-        ));
-
-        $this->assertEquals(array('group'), $form->getValidationGroups());
-    }
-
-    public function testValidationGroupsCanBeSetToArray()
-    {
-        $form = new Form('author', array(
-            'validation_groups' => array('group1', 'group2'),
-        ));
-
-        $this->assertEquals(array('group1', 'group2'), $form->getValidationGroups());
-    }
-
-    public function testValidationGroupsAreInheritedFromParentIfEmpty()
-    {
-        $parentForm = new Form('parent', array(
-            'validation_groups' => 'group',
-        ));
-        $childForm = new Form('child');
-        $parentForm->add($childForm);
-
-        $this->assertEquals(array('group'), $childForm->getValidationGroups());
-    }
-
-    public function testValidationGroupsAreNotInheritedFromParentIfSet()
-    {
-        $parentForm = new Form('parent', array(
-            'validation_groups' => 'group1',
-        ));
-        $childForm = new Form('child', array(
-            'validation_groups' => 'group2',
-        ));
-        $parentForm->add($childForm);
-
-        $this->assertEquals(array('group2'), $childForm->getValidationGroups());
+        $this->dispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
+        $this->factory = $this->getMock('Symfony\Component\Form\FormFactoryInterface');
+        $this->form = $this->getBuilder()->getForm();
     }
 
     /**
-     * @expectedException Symfony\Component\Form\Exception\FormException
+     * @expectedException Symfony\Component\Form\Exception\UnexpectedTypeException
      */
-    public function testBindThrowsExceptionIfAnonymous()
+    public function testConstructExpectsValidValidators()
     {
-        $form = new Form(null, array('validator' => $this->createMockValidator()));
+        $validators = array(new \stdClass());
 
-        $form->bind($this->createPostRequest());
+        new Form('name', $this->dispatcher, array(), array(), array(), null, $validators);
     }
 
-    public function testBindValidatesData()
+    public function testDataIsInitializedEmpty()
     {
-        $form = new Form('author', array(
-            'validation_groups' => 'group',
-            'validator' => $this->validator,
+        $norm = new FixedDataTransformer(array(
+            '' => 'foo',
         ));
-        $form->add(new TestField('firstName'));
-
-        $this->validator->expects($this->once())
-            ->method('validate')
-            ->with($this->equalTo($form));
-
-        // concrete request is irrelevant
-        $form->bind($this->createPostRequest());
-    }
-
-    public function testBindDoesNotValidateArrays()
-    {
-        $form = new Form('author', array(
-            'validator' => $this->validator,
+        $client = new FixedDataTransformer(array(
+            'foo' => 'bar',
         ));
-        $form->add(new TestField('firstName'));
 
-        // only the form is validated
-        $this->validator->expects($this->once())
-            ->method('validate')
-            ->with($this->equalTo($form));
+        $form = new Form('name', $this->dispatcher, array(), array($client), array($norm));
 
-        // concrete request is irrelevant
-        // data is an array
-        $form->bind($this->createPostRequest(), array());
+        $this->assertNull($form->getData());
+        $this->assertSame('foo', $form->getNormData());
+        $this->assertSame('bar', $form->getClientData());
     }
 
-    public function testBindThrowsExceptionIfNoValidatorIsSet()
+    public function testErrorsBubbleUpIfEnabled()
     {
-        $field = $this->createMockField('firstName');
-        $form = new Form('author');
-        $form->add($field);
+        $error = new FormError('Error!');
+        $parent = $this->form;
+        $form = $this->getBuilder()->setErrorBubbling(true)->getForm();
 
-        $this->setExpectedException('Symfony\Component\Form\Exception\MissingOptionsException');
+        $form->setParent($parent);
+        $form->addError($error);
 
-        // data is irrelevant
-        $form->bind($this->createPostRequest());
+        $this->assertEquals(array(), $form->getErrors());
+        $this->assertEquals(array($error), $parent->getErrors());
     }
 
-    public function testBindReadsRequestData()
+    public function testErrorsDontBubbleUpIfDisabled()
+    {
+        $error = new FormError('Error!');
+        $parent = $this->form;
+        $form = $this->getBuilder()->setErrorBubbling(false)->getForm();
+
+        $form->setParent($parent);
+        $form->addError($error);
+
+        $this->assertEquals(array($error), $form->getErrors());
+        $this->assertEquals(array(), $parent->getErrors());
+    }
+
+    public function testValidIfAllChildrenAreValid()
+    {
+        $this->form->add($this->getValidForm('firstName'));
+        $this->form->add($this->getValidForm('lastName'));
+
+        $this->form->bind(array(
+            'firstName' => 'Bernhard',
+            'lastName' => 'Schussek',
+        ));
+
+        $this->assertTrue($this->form->isValid());
+    }
+
+    public function testInvalidIfChildrenIsInvalid()
+    {
+        $this->form->add($this->getValidForm('firstName'));
+        $this->form->add($this->getInvalidForm('lastName'));
+
+        $this->form->bind(array(
+            'firstName' => 'Bernhard',
+            'lastName' => 'Schussek',
+        ));
+
+        $this->assertFalse($this->form->isValid());
+    }
+
+    public function testBind()
+    {
+        $child = $this->getMockForm('firstName');
+
+        $this->form->add($child);
+
+        $child->expects($this->once())
+            ->method('bind')
+            ->with($this->equalTo('Bernhard'));
+
+        $this->form->bind(array('firstName' => 'Bernhard'));
+
+        $this->assertEquals(array('firstName' => 'Bernhard'), $this->form->getData());
+    }
+
+    public function testBindForwardsNullIfValueIsMissing()
+    {
+        $child = $this->getMockForm('firstName');
+
+        $this->form->add($child);
+
+        $child->expects($this->once())
+            ->method('bind')
+            ->with($this->equalTo(null));
+
+        $this->form->bind(array());
+    }
+
+    public function testBindIsIgnoredIfReadOnly()
+    {
+        $form = $this->getBuilder()
+            ->setReadOnly(true)
+            ->setData('initial')
+            ->getForm();
+
+        $form->bind('new');
+
+        $this->assertEquals('initial', $form->getData());
+    }
+
+    public function testNeverRequiredIfParentNotRequired()
+    {
+        $parent = $this->getBuilder()->setRequired(false)->getForm();
+        $child = $this->getBuilder()->setRequired(true)->getForm();
+
+        $child->setParent($parent);
+
+        $this->assertFalse($child->isRequired());
+    }
+
+    public function testRequired()
+    {
+        $parent = $this->getBuilder()->setRequired(true)->getForm();
+        $child = $this->getBuilder()->setRequired(true)->getForm();
+
+        $child->setParent($parent);
+
+        $this->assertTrue($child->isRequired());
+    }
+
+    public function testNotRequired()
+    {
+        $parent = $this->getBuilder()->setRequired(true)->getForm();
+        $child = $this->getBuilder()->setRequired(false)->getForm();
+
+        $child->setParent($parent);
+
+        $this->assertFalse($child->isRequired());
+    }
+
+    public function testAlwaysReadOnlyIfParentReadOnly()
+    {
+        $parent = $this->getBuilder()->setReadOnly(true)->getForm();
+        $child = $this->getBuilder()->setReadOnly(false)->getForm();
+
+        $child->setParent($parent);
+
+        $this->assertTrue($child->isReadOnly());
+    }
+
+    public function testReadOnly()
+    {
+        $parent = $this->getBuilder()->setReadOnly(false)->getForm();
+        $child = $this->getBuilder()->setReadOnly(true)->getForm();
+
+        $child->setParent($parent);
+
+        $this->assertTrue($child->isReadOnly());
+    }
+
+    public function testNotReadOnly()
+    {
+        $parent = $this->getBuilder()->setReadOnly(false)->getForm();
+        $child = $this->getBuilder()->setReadOnly(false)->getForm();
+
+        $child->setParent($parent);
+
+        $this->assertFalse($child->isReadOnly());
+    }
+
+    public function testCloneChildren()
+    {
+        $child = $this->getBuilder('child')->getForm();
+        $this->form->add($child);
+
+        $clone = clone $this->form;
+
+        $this->assertNotSame($this->form, $clone);
+        $this->assertNotSame($child, $clone['child']);
+    }
+
+    public function testGetRootReturnsRootOfParent()
+    {
+        $parent = $this->getMockForm();
+        $parent->expects($this->once())
+            ->method('getRoot')
+            ->will($this->returnValue('ROOT'));
+
+        $this->form->setParent($parent);
+
+        $this->assertEquals('ROOT', $this->form->getRoot());
+    }
+
+    public function testGetRootReturnsSelfIfNoParent()
+    {
+        $this->assertSame($this->form, $this->form->getRoot());
+    }
+
+    public function testEmptyIfEmptyArray()
+    {
+        $this->form->setData(array());
+
+        $this->assertTrue($this->form->isEmpty());
+    }
+
+    public function testEmptyIfNull()
+    {
+        $this->form->setData(null);
+
+        $this->assertTrue($this->form->isEmpty());
+    }
+
+    public function testEmptyIfEmptyString()
+    {
+        $this->form->setData('');
+
+        $this->assertTrue($this->form->isEmpty());
+    }
+
+    public function testNotEmptyIfText()
+    {
+        $this->form->setData('foobar');
+
+        $this->assertFalse($this->form->isEmpty());
+    }
+
+    public function testNotEmptyIfChildNotEmpty()
+    {
+        $child = $this->getMockForm();
+        $child->expects($this->once())
+            ->method('isEmpty')
+            ->will($this->returnValue(false));
+
+        $this->form->setData(null);
+        $this->form->add($child);
+
+        $this->assertFalse($this->form->isEmpty());
+    }
+
+    public function testValidIfBound()
+    {
+        $this->form->bind('foobar');
+
+        $this->assertTrue($this->form->isValid());
+    }
+
+    public function testNotValidIfNotBound()
+    {
+        $this->assertFalse($this->form->isValid());
+    }
+
+    public function testNotValidIfErrors()
+    {
+        $this->form->bind('foobar');
+        $this->form->addError(new FormError('Error!'));
+
+        $this->assertFalse($this->form->isValid());
+    }
+
+    public function testNotValidIfChildNotValid()
+    {
+        $child = $this->getMockForm();
+        $child->expects($this->once())
+            ->method('isValid')
+            ->will($this->returnValue(false));
+
+        $this->form->bind('foobar');
+        $this->form->add($child);
+
+        $this->assertFalse($this->form->isValid());
+    }
+
+    public function testHasErrors()
+    {
+        $this->form->addError(new FormError('Error!'));
+
+        $this->assertTrue($this->form->hasErrors());
+    }
+
+    public function testHasNoErrors()
+    {
+        $this->assertFalse($this->form->hasErrors());
+    }
+
+    public function testHasChildren()
+    {
+        $this->form->add($this->getBuilder()->getForm());
+
+        $this->assertTrue($this->form->hasChildren());
+    }
+
+    public function testHasNoChildren()
+    {
+        $this->assertFalse($this->form->hasChildren());
+    }
+
+    public function testAdd()
+    {
+        $child = $this->getBuilder('foo')->getForm();
+        $this->form->add($child);
+
+        $this->assertSame($this->form, $child->getParent());
+        $this->assertSame(array('foo' => $child), $this->form->getChildren());
+    }
+
+    public function testRemove()
+    {
+        $child = $this->getBuilder('foo')->getForm();
+        $this->form->add($child);
+        $this->form->remove('foo');
+
+        $this->assertNull($child->getParent());
+        $this->assertFalse($this->form->hasChildren());
+    }
+
+    public function testRemoveIgnoresUnknownName()
+    {
+        $this->form->remove('notexisting');
+    }
+
+    public function testArrayAccess()
+    {
+        $child = $this->getBuilder('foo')->getForm();
+
+        $this->form[] = $child;
+
+        $this->assertTrue(isset($this->form['foo']));
+        $this->assertSame($child, $this->form['foo']);
+
+        unset($this->form['foo']);
+
+        $this->assertFalse(isset($this->form['foo']));
+    }
+
+    public function testCountable()
+    {
+        $this->form->add($this->getBuilder('foo')->getForm());
+        $this->form->add($this->getBuilder('bar')->getForm());
+
+        $this->assertEquals(2, count($this->form));
+    }
+
+    public function testIterator()
+    {
+        $this->form->add($this->getBuilder('foo')->getForm());
+        $this->form->add($this->getBuilder('bar')->getForm());
+
+        $this->assertSame($this->form->getChildren(), iterator_to_array($this->form));
+    }
+
+    public function testBound()
+    {
+        $this->form->bind('foobar');
+
+        $this->assertTrue($this->form->isBound());
+    }
+
+    public function testNotBound()
+    {
+        $this->assertFalse($this->form->isBound());
+    }
+
+    public function testSetDataExecutesTransformationChain()
+    {
+        // use real event dispatcher now
+        $form = $this->getBuilder('name', new EventDispatcher())
+            ->addEventSubscriber(new FixedFilterListener(array(
+                'onSetData' => array(
+                    'app' => 'filtered',
+                ),
+            )))
+            ->appendNormTransformer(new FixedDataTransformer(array(
+                '' => '',
+                'filtered' => 'norm',
+            )))
+            ->appendClientTransformer(new FixedDataTransformer(array(
+                '' => '',
+                'norm' => 'client',
+            )))
+            ->getForm();
+
+        $form->setData('app');
+
+        $this->assertEquals('filtered', $form->getData());
+        $this->assertEquals('norm', $form->getNormData());
+        $this->assertEquals('client', $form->getClientData());
+    }
+
+    public function testSetDataExecutesClientTransformersInOrder()
+    {
+        $form = $this->getBuilder()
+            ->appendClientTransformer(new FixedDataTransformer(array(
+                '' => '',
+                'first' => 'second',
+            )))
+            ->appendClientTransformer(new FixedDataTransformer(array(
+                '' => '',
+                'second' => 'third',
+            )))
+            ->getForm();
+
+        $form->setData('first');
+
+        $this->assertEquals('third', $form->getClientData());
+    }
+
+    public function testSetDataExecutesNormTransformersInOrder()
+    {
+        $form = $this->getBuilder()
+            ->appendNormTransformer(new FixedDataTransformer(array(
+                '' => '',
+                'first' => 'second',
+            )))
+            ->appendNormTransformer(new FixedDataTransformer(array(
+                '' => '',
+                'second' => 'third',
+            )))
+            ->getForm();
+
+        $form->setData('first');
+
+        $this->assertEquals('third', $form->getNormData());
+    }
+
+    /*
+     * When there is no data transformer, the data must have the same format
+     * in all three representations
+     */
+    public function testSetDataConvertsScalarToStringIfNoTransformer()
+    {
+        $form = $this->getBuilder()->getForm();
+
+        $form->setData(1);
+
+        $this->assertSame('1', $form->getData());
+        $this->assertSame('1', $form->getNormData());
+        $this->assertSame('1', $form->getClientData());
+    }
+
+    /*
+     * Data in client format should, if possible, always be a string to
+     * facilitate differentiation between '0' and ''
+     */
+    public function testSetDataConvertsScalarToStringIfOnlyNormTransformer()
+    {
+        $form = $this->getBuilder()
+            ->appendNormTransformer(new FixedDataTransformer(array(
+                '' => '',
+                1 => 23,
+            )))
+            ->getForm();
+
+        $form->setData(1);
+
+        $this->assertSame(1, $form->getData());
+        $this->assertSame(23, $form->getNormData());
+        $this->assertSame('23', $form->getClientData());
+    }
+
+    /*
+     * NULL remains NULL in app and norm format to remove the need to treat
+     * empty values and NULL explicitely in the application
+     */
+    public function testSetDataConvertsNullToStringIfNoTransformer()
+    {
+        $form = $this->getBuilder()->getForm();
+
+        $form->setData(null);
+
+        $this->assertNull($form->getData());
+        $this->assertNull($form->getNormData());
+        $this->assertSame('', $form->getClientData());
+    }
+
+    public function testBindConvertsEmptyToNullIfNoTransformer()
+    {
+        $form = $this->getBuilder()->getForm();
+
+        $form->bind('');
+
+        $this->assertNull($form->getData());
+        $this->assertNull($form->getNormData());
+        $this->assertSame('', $form->getClientData());
+    }
+
+    public function testBindExecutesTransformationChain()
+    {
+        // use real event dispatcher now
+        $form = $this->getBuilder('name', new EventDispatcher())
+            ->addEventSubscriber(new FixedFilterListener(array(
+                'onBindClientData' => array(
+                    'client' => 'filteredclient',
+                ),
+                'onBindNormData' => array(
+                    'norm' => 'filterednorm',
+                ),
+            )))
+            ->appendClientTransformer(new FixedDataTransformer(array(
+                '' => '',
+                // direction is reversed!
+                'norm' => 'filteredclient',
+                'filterednorm' => 'cleanedclient'
+            )))
+            ->appendNormTransformer(new FixedDataTransformer(array(
+                '' => '',
+                // direction is reversed!
+                'app' => 'filterednorm',
+            )))
+            ->getForm();
+
+        $form->setData('app');
+
+        $this->assertEquals('app', $form->getData());
+        $this->assertEquals('filterednorm', $form->getNormData());
+        $this->assertEquals('cleanedclient', $form->getClientData());
+    }
+
+    public function testBindExecutesClientTransformersInReverseOrder()
+    {
+        $form = $this->getBuilder()
+            ->appendClientTransformer(new FixedDataTransformer(array(
+                '' => '',
+                'third' => 'second',
+            )))
+            ->appendClientTransformer(new FixedDataTransformer(array(
+                '' => '',
+                'second' => 'first',
+            )))
+            ->getForm();
+
+        $form->bind('first');
+
+        $this->assertEquals('third', $form->getNormData());
+    }
+
+    public function testBindExecutesNormTransformersInReverseOrder()
+    {
+        $form = $this->getBuilder()
+            ->appendNormTransformer(new FixedDataTransformer(array(
+                '' => '',
+                'third' => 'second',
+            )))
+            ->appendNormTransformer(new FixedDataTransformer(array(
+                '' => '',
+                'second' => 'first',
+            )))
+            ->getForm();
+
+        $form->bind('first');
+
+        $this->assertEquals('third', $form->getData());
+    }
+
+    public function testSynchronizedByDefault()
+    {
+        $this->assertTrue($this->form->isSynchronized());
+    }
+
+    public function testSynchronizedAfterBinding()
+    {
+        $this->form->bind('foobar');
+
+        $this->assertTrue($this->form->isSynchronized());
+    }
+
+    public function testNotSynchronizedIfTransformationFailed()
+    {
+        $transformer = $this->getDataTransformer();
+        $transformer->expects($this->once())
+            ->method('reverseTransform')
+            ->will($this->throwException(new TransformationFailedException()));
+
+        $form = $this->getBuilder()
+            ->appendClientTransformer($transformer)
+            ->getForm();
+
+        $form->bind('foobar');
+
+        $this->assertFalse($form->isSynchronized());
+    }
+
+    public function testEmptyDataCreatedBeforeTransforming()
+    {
+        $form = $this->getBuilder()
+            ->setEmptyData('foo')
+            ->appendClientTransformer(new FixedDataTransformer(array(
+                '' => '',
+                // direction is reversed!
+                'bar' => 'foo',
+            )))
+            ->getForm();
+
+        $form->bind('');
+
+        $this->assertEquals('bar', $form->getData());
+    }
+
+    public function testEmptyDataFromClosure()
+    {
+        $test = $this;
+        $form = $this->getBuilder()
+            ->setEmptyData(function ($form) use ($test) {
+                // the form instance is passed to the closure to allow use
+                // of form data when creating the empty value
+                $test->assertInstanceOf('Symfony\Component\Form\FormInterface', $form);
+
+                return 'foo';
+            })
+            ->appendClientTransformer(new FixedDataTransformer(array(
+                '' => '',
+                // direction is reversed!
+                'bar' => 'foo',
+            )))
+            ->getForm();
+
+        $form->bind('');
+
+        $this->assertEquals('bar', $form->getData());
+    }
+
+    public function testAddMapsClientDataToForm()
+    {
+        $mapper = $this->getDataMapper();
+        $form = $this->getBuilder()
+            ->setDataMapper($mapper)
+            ->appendClientTransformer(new FixedDataTransformer(array(
+                '' => '',
+                'foo' => 'bar',
+            )))
+            ->setData('foo')
+            ->getForm();
+
+        $child = $this->getBuilder()->getForm();
+        $mapper->expects($this->once())
+            ->method('mapDataToForm')
+            ->with('bar', $child);
+
+        $form->add($child);
+    }
+
+    public function testSetDataMapsClientDataToChildren()
+    {
+        $mapper = $this->getDataMapper();
+        $form = $this->getBuilder()
+            ->setDataMapper($mapper)
+            ->appendClientTransformer(new FixedDataTransformer(array(
+                '' => '',
+                'foo' => 'bar',
+            )))
+            ->getForm();
+
+        $form->add($child1 = $this->getBuilder('firstName')->getForm());
+        $form->add($child2 = $this->getBuilder('lastName')->getForm());
+
+        $mapper->expects($this->once())
+            ->method('mapDataToForms')
+            ->with('bar', array('firstName' => $child1, 'lastName' => $child2));
+
+        $form->setData('foo');
+    }
+
+    public function testBindMapsBoundChildrenOntoExistingClientData()
+    {
+        $test = $this;
+        $mapper = $this->getDataMapper();
+        $form = $this->getBuilder()
+            ->setDataMapper($mapper)
+            ->appendClientTransformer(new FixedDataTransformer(array(
+                '' => '',
+                'foo' => 'bar',
+            )))
+            ->setData('foo')
+            ->getForm();
+
+        $form->add($child1 = $this->getBuilder('firstName')->getForm());
+        $form->add($child2 = $this->getBuilder('lastName')->getForm());
+
+        $mapper->expects($this->once())
+            ->method('mapFormsToData')
+            ->with(array('firstName' => $child1, 'lastName' => $child2), 'bar')
+            ->will($this->returnCallback(function ($children, $bar) use ($test) {
+                $test->assertEquals('Bernhard', $children['firstName']->getData());
+                $test->assertEquals('Schussek', $children['lastName']->getData());
+            }));
+
+        $form->bind(array(
+            'firstName' => 'Bernhard',
+            'lastName' => 'Schussek',
+        ));
+    }
+
+    public function testBindMapsBoundChildrenOntoEmptyData()
+    {
+        $test = $this;
+        $mapper = $this->getDataMapper();
+        $object = new \stdClass();
+        $form = $this->getBuilder()
+            ->setDataMapper($mapper)
+            ->setEmptyData($object)
+            ->setData(null)
+            ->getForm();
+
+        $form->add($child = $this->getBuilder('name')->getForm());
+
+        $mapper->expects($this->once())
+            ->method('mapFormsToData')
+            ->with(array('name' => $child), $object);
+
+        $form->bind(array(
+            'name' => 'Bernhard',
+        ));
+    }
+
+    public function testBindValidatesAfterTransformation()
+    {
+        $test = $this;
+        $validator = $this->getFormValidator();
+        $form = $this->getBuilder()
+            ->addValidator($validator)
+            ->getForm();
+
+        $validator->expects($this->once())
+            ->method('validate')
+            ->with($form)
+            ->will($this->returnCallback(function ($form) use ($test) {
+                $test->assertEquals('foobar', $form->getData());
+            }));
+
+        $form->bind('foobar');
+    }
+
+    public function requestMethodProvider()
+    {
+        return array(
+            array('POST'),
+            array('PUT'),
+        );
+    }
+
+    /**
+     * @dataProvider requestMethodProvider
+     */
+    public function testBindPostOrPutRequest($method)
     {
         $path = tempnam(sys_get_temp_dir(), 'sf2');
         touch($path);
@@ -342,1164 +804,178 @@ class FormTest extends \PHPUnit_Framework_TestCase
                 'image' => array('filename' => 'foobar.png'),
             ),
         );
+
         $files = array(
             'author' => array(
-                'error' => array('image' => array('file' => UPLOAD_ERR_OK)),
-                'name' => array('image' => array('file' => 'upload.png')),
-                'size' => array('image' => array('file' => 123)),
-                'tmp_name' => array('image' => array('file' => $path)),
-                'type' => array('image' => array('file' => 'image/png')),
+                'error' => array('image' => UPLOAD_ERR_OK),
+                'name' => array('image' => 'upload.png'),
+                'size' => array('image' => 123),
+                'tmp_name' => array('image' => $path),
+                'type' => array('image' => 'image/png'),
             ),
         );
 
-        $form = new Form('author', array('validator' => $this->validator));
-        $form->add(new TestField('name'));
-        $imageForm = new Form('image');
-        $imageForm->add(new TestField('file'));
-        $imageForm->add(new TestField('filename'));
-        $form->add($imageForm);
+        $request = new Request(array(), $values, array(), array(), $files, array(
+            'REQUEST_METHOD' => $method,
+        ));
 
-        $form->bind($this->createPostRequest($values, $files));
+        $form = $this->getBuilder('author')->getForm();
+        $form->add($this->getBuilder('name')->getForm());
+        $form->add($this->getBuilder('image')->getForm());
+
+        $form->bindRequest($request);
 
         $file = new UploadedFile($path, 'upload.png', 'image/png', 123, UPLOAD_ERR_OK);
 
         $this->assertEquals('Bernhard', $form['name']->getData());
-        $this->assertEquals('foobar.png', $form['image']['filename']->getData());
-        $this->assertEquals($file, $form['image']['file']->getData());
+        $this->assertEquals($file, $form['image']->getData());
+
+        unlink($path);
     }
 
-    public function testBindAcceptsObject()
+    public function testBindGetRequest()
     {
-        $object = new \stdClass();
-        $form = new Form('author', array('validator' => $this->validator));
-
-        $form->bind(new Request(), $object);
-
-        $this->assertSame($object, $form->getData());
-    }
-
-    public function testReadPropertyIsIgnoredIfPropertyPathIsNull()
-    {
-        $author = new Author();
-        $author->child = new Author();
-        $standaloneChild = new Author();
-
-        $form = new Form('child');
-        $form->setData($standaloneChild);
-        $form->setPropertyPath(null);
-        $form->readProperty($author);
-
-        // should not be $author->child!!
-        $this->assertSame($standaloneChild, $form->getData());
-    }
-
-    public function testWritePropertyIsIgnoredIfPropertyPathIsNull()
-    {
-        $author = new Author();
-        $author->child = $child = new Author();
-        $standaloneChild = new Author();
-
-        $form = new Form('child');
-        $form->setData($standaloneChild);
-        $form->setPropertyPath(null);
-        $form->writeProperty($author);
-
-        // $author->child was not modified
-        $this->assertSame($child, $author->child);
-    }
-
-    public function testSupportsArrayAccess()
-    {
-        $form = new Form('author');
-        $form->add($this->createMockField('firstName'));
-        $this->assertEquals($form->get('firstName'), $form['firstName']);
-        $this->assertTrue(isset($form['firstName']));
-    }
-
-    public function testSupportsUnset()
-    {
-        $form = new Form('author');
-        $form->add($this->createMockField('firstName'));
-        unset($form['firstName']);
-        $this->assertFalse(isset($form['firstName']));
-    }
-
-    public function testDoesNotSupportAddingFields()
-    {
-        $form = new Form('author');
-        $this->setExpectedException('LogicException');
-        $form[] = $this->createMockField('lastName');
-    }
-
-    public function testSupportsCountable()
-    {
-        $form = new Form('group');
-        $form->add($this->createMockField('firstName'));
-        $form->add($this->createMockField('lastName'));
-        $this->assertEquals(2, count($form));
-
-        $form->add($this->createMockField('australian'));
-        $this->assertEquals(3, count($form));
-    }
-
-    public function testSupportsIterable()
-    {
-        $form = new Form('group');
-        $form->add($field1 = $this->createMockField('field1'));
-        $form->add($field2 = $this->createMockField('field2'));
-        $form->add($field3 = $this->createMockField('field3'));
-
-        $expected = array(
-            'field1' => $field1,
-            'field2' => $field2,
-            'field3' => $field3,
+        $values = array(
+            'author' => array(
+                'firstName' => 'Bernhard',
+                'lastName' => 'Schussek',
+            ),
         );
 
-        $this->assertEquals($expected, iterator_to_array($form));
-    }
-
-    public function testIsSubmitted()
-    {
-        $form = new Form('author', array('validator' => $this->validator));
-        $this->assertFalse($form->isSubmitted());
-        $form->submit(array('firstName' => 'Bernhard'));
-        $this->assertTrue($form->isSubmitted());
-    }
-
-    public function testValidIfAllFieldsAreValid()
-    {
-        $form = new Form('author', array('validator' => $this->validator));
-        $form->add($this->createValidMockField('firstName'));
-        $form->add($this->createValidMockField('lastName'));
-
-        $form->submit(array('firstName' => 'Bernhard', 'lastName' => 'Potencier'));
-
-        $this->assertTrue($form->isValid());
-    }
-
-    public function testInvalidIfFieldIsInvalid()
-    {
-        $form = new Form('author', array('validator' => $this->validator));
-        $form->add($this->createInvalidMockField('firstName'));
-        $form->add($this->createValidMockField('lastName'));
-
-        $form->submit(array('firstName' => 'Bernhard', 'lastName' => 'Potencier'));
-
-        $this->assertFalse($form->isValid());
-    }
-
-    public function testInvalidIfSubmittedWithExtraFields()
-    {
-        $form = new Form('author', array('validator' => $this->validator));
-        $form->add($this->createValidMockField('firstName'));
-        $form->add($this->createValidMockField('lastName'));
-
-        $form->submit(array('foo' => 'bar', 'firstName' => 'Bernhard', 'lastName' => 'Potencier'));
-
-        $this->assertTrue($form->isSubmittedWithExtraFields());
-    }
-
-    public function testHasNoErrorsIfOnlyFieldHasErrors()
-    {
-        $form = new Form('author', array('validator' => $this->validator));
-        $form->add($this->createInvalidMockField('firstName'));
-
-        $form->submit(array('firstName' => 'Bernhard'));
-
-        $this->assertFalse($form->hasErrors());
-    }
-
-    public function testSubmitForwardsPreprocessedData()
-    {
-        $field = $this->createMockField('firstName');
-
-        $form = $this->getMock(
-            'Symfony\Component\Form\Form',
-            array('preprocessData'), // only mock preprocessData()
-            array('author', array('validator' => $this->validator))
-        );
-
-        // The data array is prepared directly after binding
-        $form->expects($this->once())
-              ->method('preprocessData')
-              ->with($this->equalTo(array('firstName' => 'Bernhard')))
-              ->will($this->returnValue(array('firstName' => 'preprocessed[Bernhard]')));
-        $form->add($field);
-
-        // The preprocessed data is then forwarded to the fields
-        $field->expects($this->once())
-                    ->method('submit')
-                    ->with($this->equalTo('preprocessed[Bernhard]'));
-
-        $form->submit(array('firstName' => 'Bernhard'));
-    }
-
-    public function testSubmitForwardsNullIfValueIsMissing()
-    {
-        $field = $this->createMockField('firstName');
-        $field->expects($this->once())
-                    ->method('submit')
-                    ->with($this->equalTo(null));
-
-        $form = new Form('author', array('validator' => $this->validator));
-        $form->add($field);
-
-        $form->submit(array());
-    }
-
-    public function testAddErrorMapsFieldValidationErrorsOntoFields()
-    {
-        $error = new FieldError('Message');
-
-        $field = $this->createMockField('firstName');
-        $field->expects($this->once())
-                    ->method('addError')
-                    ->with($this->equalTo($error));
-
-        $form = new Form('author');
-        $form->add($field);
-
-        $path = new PropertyPath('fields[firstName].data');
-
-        $form->addError(new FieldError('Message'), $path->getIterator());
-    }
-
-    public function testAddErrorMapsFieldValidationErrorsOntoFieldsWithinNestedForms()
-    {
-        $error = new FieldError('Message');
-
-        $field = $this->createMockField('firstName');
-        $field->expects($this->once())
-                    ->method('addError')
-                    ->with($this->equalTo($error));
-
-        $form = new Form('author');
-        $innerGroup = new Form('names');
-        $innerGroup->add($field);
-        $form->add($innerGroup);
-
-        $path = new PropertyPath('fields[names].fields[firstName].data');
-
-        $form->addError(new FieldError('Message'), $path->getIterator());
-    }
-
-    public function testAddErrorKeepsFieldValidationErrorsIfFieldNotFound()
-    {
-        $field = $this->createMockField('foo');
-        $field->expects($this->never())
-                    ->method('addError');
-
-        $form = new Form('author');
-        $form->add($field);
-
-        $path = new PropertyPath('fields[bar].data');
-
-        $form->addError(new FieldError('Message'), $path->getIterator());
-
-        $this->assertEquals(array(new FieldError('Message')), $form->getErrors());
-    }
-
-    public function testAddErrorKeepsFieldValidationErrorsIfFieldIsHidden()
-    {
-        $field = $this->createMockField('firstName');
-        $field->expects($this->any())
-                    ->method('isHidden')
-                    ->will($this->returnValue(true));
-        $field->expects($this->never())
-                    ->method('addError');
-
-        $form = new Form('author');
-        $form->add($field);
-
-        $path = new PropertyPath('fields[firstName].data');
-
-        $form->addError(new FieldError('Message'), $path->getIterator());
-
-        $this->assertEquals(array(new FieldError('Message')), $form->getErrors());
-    }
-
-    public function testAddErrorMapsDataValidationErrorsOntoFields()
-    {
-        $error = new DataError('Message');
-
-        // path is expected to point at "firstName"
-        $expectedPath = new PropertyPath('firstName');
-        $expectedPathIterator = $expectedPath->getIterator();
-
-        $field = $this->createMockField('firstName');
-        $field->expects($this->any())
-                    ->method('getPropertyPath')
-                    ->will($this->returnValue(new PropertyPath('firstName')));
-        $field->expects($this->once())
-                    ->method('addError')
-                    ->with($this->equalTo($error), $this->equalTo($expectedPathIterator));
-
-        $form = new Form('author');
-        $form->add($field);
-
-        $path = new PropertyPath('firstName');
-
-        $form->addError($error, $path->getIterator());
-    }
-
-    public function testAddErrorKeepsDataValidationErrorsIfFieldNotFound()
-    {
-        $field = $this->createMockField('foo');
-        $field->expects($this->any())
-                    ->method('getPropertyPath')
-                    ->will($this->returnValue(new PropertyPath('foo')));
-        $field->expects($this->never())
-                    ->method('addError');
-
-        $form = new Form('author');
-        $form->add($field);
-
-        $path = new PropertyPath('bar');
-
-        $form->addError(new DataError('Message'), $path->getIterator());
-    }
-
-    public function testAddErrorKeepsDataValidationErrorsIfFieldIsHidden()
-    {
-        $field = $this->createMockField('firstName');
-        $field->expects($this->any())
-                    ->method('isHidden')
-                    ->will($this->returnValue(true));
-        $field->expects($this->any())
-                    ->method('getPropertyPath')
-                    ->will($this->returnValue(new PropertyPath('firstName')));
-        $field->expects($this->never())
-                    ->method('addError');
-
-        $form = new Form('author');
-        $form->add($field);
-
-        $path = new PropertyPath('firstName');
-
-        $form->addError(new DataError('Message'), $path->getIterator());
-    }
-
-    public function testAddErrorMapsDataValidationErrorsOntoNestedFields()
-    {
-        $error = new DataError('Message');
-
-        // path is expected to point at "street"
-        $expectedPath = new PropertyPath('address.street');
-        $expectedPathIterator = $expectedPath->getIterator();
-        $expectedPathIterator->next();
-
-        $field = $this->createMockField('address');
-        $field->expects($this->any())
-                    ->method('getPropertyPath')
-                    ->will($this->returnValue(new PropertyPath('address')));
-        $field->expects($this->once())
-                    ->method('addError')
-                    ->with($this->equalTo($error), $this->equalTo($expectedPathIterator));
-
-        $form = new Form('author');
-        $form->add($field);
-
-        $path = new PropertyPath('address.street');
-
-        $form->addError($error, $path->getIterator());
-    }
-
-    public function testAddErrorMapsErrorsOntoFieldsInVirtualGroups()
-    {
-        $error = new DataError('Message');
-
-        // path is expected to point at "address"
-        $expectedPath = new PropertyPath('address');
-        $expectedPathIterator = $expectedPath->getIterator();
-
-        $field = $this->createMockField('address');
-        $field->expects($this->any())
-                    ->method('getPropertyPath')
-                    ->will($this->returnValue(new PropertyPath('address')));
-        $field->expects($this->once())
-                    ->method('addError')
-                    ->with($this->equalTo($error), $this->equalTo($expectedPathIterator));
-
-        $form = new Form('author');
-        $nestedForm = new Form('nested', array('virtual' => true));
-        $nestedForm->add($field);
-        $form->add($nestedForm);
-
-        $path = new PropertyPath('address');
-
-        $form->addError($error, $path->getIterator());
-    }
-
-    public function testAddThrowsExceptionIfAlreadySubmitted()
-    {
-        $form = new Form('author', array('validator' => $this->validator));
-        $form->add($this->createMockField('firstName'));
-        $form->submit(array());
-
-        $this->setExpectedException('Symfony\Component\Form\Exception\AlreadySubmittedException');
-        $form->add($this->createMockField('lastName'));
-    }
-
-    public function testAddSetsFieldParent()
-    {
-        $form = new Form('author');
-
-        $field = $this->createMockField('firstName');
-        $field->expects($this->once())
-                    ->method('setParent')
-                    ->with($this->equalTo($form));
-
-        $form->add($field);
-    }
-
-    public function testRemoveUnsetsFieldParent()
-    {
-        $form = new Form('author');
-
-        $field = $this->createMockField('firstName');
-        $field->expects($this->exactly(2))
-                    ->method('setParent');
-                    // PHPUnit fails to compare subsequent method calls with different arguments
-
-        $form->add($field);
-        $form->remove('firstName');
-    }
-
-    public function testAddUpdatesFieldFromTransformedData()
-    {
-        $originalAuthor = new Author();
-        $transformedAuthor = new Author();
-        // the authors should differ to make sure the test works
-        $transformedAuthor->firstName = 'Foo';
-
-        $form = new TestForm('author');
-
-        $transformer = $this->createMockTransformer();
-        $transformer->expects($this->once())
-                                ->method('transform')
-                                ->with($this->equalTo($originalAuthor))
-                                ->will($this->returnValue($transformedAuthor));
-
-        $form->setValueTransformer($transformer);
-        $form->setData($originalAuthor);
-
-        $field = $this->createMockField('firstName');
-        $field->expects($this->any())
-                    ->method('getPropertyPath')
-                    ->will($this->returnValue(new PropertyPath('firstName')));
-        $field->expects($this->once())
-                    ->method('readProperty')
-                    ->with($this->equalTo($transformedAuthor));
-
-        $form->add($field);
-    }
-
-    public function testAddDoesNotUpdateFieldIfTransformedDataIsEmpty()
-    {
-        $originalAuthor = new Author();
-
-        $form = new TestForm('author');
-
-        $transformer = $this->createMockTransformer();
-        $transformer->expects($this->once())
-                                ->method('transform')
-                                ->with($this->equalTo($originalAuthor))
-                                ->will($this->returnValue(''));
-
-        $form->setValueTransformer($transformer);
-        $form->setData($originalAuthor);
-
-        $field = $this->createMockField('firstName');
-        $field->expects($this->never())
-                    ->method('readProperty');
-
-        $form->add($field);
-    }
-
-    /**
-     * @expectedException Symfony\Component\Form\Exception\UnexpectedTypeException
-     */
-    public function testAddThrowsExceptionIfNoFieldOrString()
-    {
-        $form = new Form('author');
-
-        $form->add(1234);
-    }
-
-    /**
-     * @expectedException Symfony\Component\Form\Exception\FieldDefinitionException
-     */
-    public function testAddThrowsExceptionIfAnonymousField()
-    {
-        $form = new Form('author');
-
-        $field = $this->createMockField('');
-
-        $form->add($field);
-    }
-
-    /**
-     * @expectedException Symfony\Component\Form\Exception\FormException
-     */
-    public function testAddThrowsExceptionIfStringButNoFieldFactory()
-    {
-        $form = new Form('author', array('data_class' => 'Application\Entity'));
-
-        $form->add('firstName');
-    }
-
-    /**
-     * @expectedException Symfony\Component\Form\Exception\FormException
-     */
-    public function testAddThrowsExceptionIfStringButNoClass()
-    {
-        $form = new Form('author', array('field_factory' => new \stdClass()));
-
-        $form->add('firstName');
-    }
-
-    public function testAddUsesFieldFromFactoryIfStringIsGiven()
-    {
-        $author = new \stdClass();
-        $field = $this->createMockField('firstName');
-
-        $factory = $this->getMock('Symfony\Component\Form\FieldFactory\FieldFactoryInterface');
-        $factory->expects($this->once())
-                ->method('getInstance')
-                ->with($this->equalTo('stdClass'), $this->equalTo('firstName'), $this->equalTo(array('foo' => 'bar')))
-                ->will($this->returnValue($field));
-
-        $form = new Form('author', array(
-            'data' => $author,
-            'data_class' => 'stdClass',
-            'field_factory' => $factory,
+        $request = new Request($values, array(), array(), array(), array(), array(
+            'REQUEST_METHOD' => 'GET',
         ));
 
-        $form->add('firstName', array('foo' => 'bar'));
+        $form = $this->getBuilder('author')->getForm();
+        $form->add($this->getBuilder('firstName')->getForm());
+        $form->add($this->getBuilder('lastName')->getForm());
 
-        $this->assertSame($field, $form['firstName']);
+        $form->bindRequest($request);
+
+        $this->assertEquals('Bernhard', $form['firstName']->getData());
+        $this->assertEquals('Schussek', $form['lastName']->getData());
     }
 
-    public function testSetDataUpdatesAllFieldsFromTransformedData()
+    public function testBindResetsErrors()
     {
-        $originalAuthor = new Author();
-        $transformedAuthor = new Author();
-        // the authors should differ to make sure the test works
-        $transformedAuthor->firstName = 'Foo';
+        $form = $this->getBuilder()->getForm();
+        $form->addError(new FormError('Error!'));
+        $form->bind('foobar');
 
-        $form = new TestForm('author');
-
-        $transformer = $this->createMockTransformer();
-        $transformer->expects($this->once())
-                                ->method('transform')
-                                ->with($this->equalTo($originalAuthor))
-                                ->will($this->returnValue($transformedAuthor));
-
-        $form->setValueTransformer($transformer);
-
-        $field = $this->createMockField('firstName');
-        $field->expects($this->once())
-                    ->method('readProperty')
-                    ->with($this->equalTo($transformedAuthor));
-
-        $form->add($field);
-
-        $field = $this->createMockField('lastName');
-        $field->expects($this->once())
-                    ->method('readProperty')
-                    ->with($this->equalTo($transformedAuthor));
-
-        $form->add($field);
-
-        $form->setData($originalAuthor);
+        $this->assertSame(array(), $form->getErrors());
     }
 
-    /**
-     * The use case for this test are groups whose fields should be mapped
-     * directly onto properties of the form's object.
-     *
-     * Example:
-     *
-     * <code>
-     * $dateRangeField = new Form('dateRange');
-     * $dateRangeField->add(new DateField('startDate'));
-     * $dateRangeField->add(new DateField('endDate'));
-     * $form->add($dateRangeField);
-     * </code>
-     *
-     * If $dateRangeField is not virtual, the property "dateRange" must be
-     * present on the form's object. In this property, an object or array
-     * with the properties "startDate" and "endDate" is expected.
-     *
-     * If $dateRangeField is virtual though, it's children are mapped directly
-     * onto the properties "startDate" and "endDate" of the form's object.
-     */
-    public function testSetDataSkipsVirtualForms()
+    public function testCreateView()
     {
-        $author = new Author();
-        $author->firstName = 'Foo';
-
-        $form = new Form('author');
-        $nestedForm = new Form('personal_data', array(
-            'virtual' => true,
-        ));
-
-        // both fields are in the nested group but receive the object of the
-        // top-level group because the nested group is virtual
-        $field = $this->createMockField('firstName');
-        $field->expects($this->once())
-                    ->method('readProperty')
-                    ->with($this->equalTo($author));
-
-        $nestedForm->add($field);
-
-        $field = $this->createMockField('lastName');
-        $field->expects($this->once())
-                    ->method('readProperty')
-                    ->with($this->equalTo($author));
-
-        $nestedForm->add($field);
-
-        $form->add($nestedForm);
-        $form->setData($author);
-    }
-
-    public function testSetDataThrowsAnExceptionIfArgumentIsNotObjectOrArray()
-    {
-        $form = new Form('author');
-
-        $this->setExpectedException('InvalidArgumentException');
-
-        $form->setData('foobar');
-    }
-
-    /**
-     * @expectedException Symfony\Component\Form\Exception\FormException
-     */
-    public function testSetDataMatchesAgainstDataClass_fails()
-    {
-        $form = new Form('author', array(
-            'data_class' => 'Symfony\Tests\Component\Form\Fixtures\Author',
-        ));
-
-        $form->setData(new \stdClass());
-    }
-
-    public function testSetDataMatchesAgainstDataClass_succeeds()
-    {
-        $form = new Form('author', array(
-            'data_class' => 'Symfony\Tests\Component\Form\Fixtures\Author',
-        ));
-
-        $form->setData(new Author());
-    }
-
-    public function testSetDataToNull()
-    {
-        $form = new Form('author');
-        $form->setData(null);
-
-        $this->assertNull($form->getData());
-    }
-
-    public function testSetDataToNullCreatesObjectIfClassAvailable()
-    {
-        $form = new Form('author', array(
-            'data_class' => 'Symfony\Tests\Component\Form\Fixtures\Author',
-        ));
-        $form->setData(null);
-
-        $this->assertEquals(new Author(), $form->getData());
-    }
-
-    public function testSetDataToNullUsesDataConstructorOption()
-    {
-        $author = new Author();
-        $form = new Form('author', array(
-            'data_constructor' => function () use ($author) {
-                return $author;
-            }
-        ));
-        $form->setData(null);
-
-        $this->assertSame($author, $form->getData());
-    }
-
-    public function testSubmitUpdatesTransformedDataFromAllFields()
-    {
-        $originalAuthor = new Author();
-        $transformedAuthor = new Author();
-        // the authors should differ to make sure the test works
-        $transformedAuthor->firstName = 'Foo';
-
-        $form = new TestForm('author', array('validator' => $this->validator));
-
-        $transformer = $this->createMockTransformer();
-        $transformer->expects($this->exactly(2))
-                                ->method('transform')
-                                // the method is first called with NULL, then
-                                // with $originalAuthor -> not testable by PHPUnit
-                                // ->with($this->equalTo(null))
-                                // ->with($this->equalTo($originalAuthor))
-                                ->will($this->returnValue($transformedAuthor));
-
-        $form->setValueTransformer($transformer);
-        $form->setData($originalAuthor);
-
-        $field = $this->createMockField('firstName');
-        $field->expects($this->once())
-                    ->method('writeProperty')
-                    ->with($this->equalTo($transformedAuthor));
-
-        $form->add($field);
-
-        $field = $this->createMockField('lastName');
-        $field->expects($this->once())
-                    ->method('writeProperty')
-                    ->with($this->equalTo($transformedAuthor));
-
-        $form->add($field);
-
-        $form->submit(array()); // irrelevant
-    }
-
-    public function testGetDataReturnsObject()
-    {
-        $form = new Form('author');
-        $object = new \stdClass();
-        $form->setData($object);
-        $this->assertEquals($object, $form->getData());
-    }
-
-    public function testGetDisplayedDataForwardsCall()
-    {
-        $field = $this->createValidMockField('firstName');
-        $field->expects($this->atLeastOnce())
-                    ->method('getDisplayedData')
-                    ->will($this->returnValue('Bernhard'));
-
-        $form = new Form('author');
-        $form->add($field);
-
-        $this->assertEquals(array('firstName' => 'Bernhard'), $form->getDisplayedData());
-    }
-
-    public function testIsMultipartIfAnyFieldIsMultipart()
-    {
-        $form = new Form('author');
-        $form->add($this->createMultipartMockField('firstName'));
-        $form->add($this->createNonMultipartMockField('lastName'));
-
-        $this->assertTrue($form->isMultipart());
-    }
-
-    public function testIsNotMultipartIfNoFieldIsMultipart()
-    {
-        $form = new Form('author');
-        $form->add($this->createNonMultipartMockField('firstName'));
-        $form->add($this->createNonMultipartMockField('lastName'));
-
-        $this->assertFalse($form->isMultipart());
-    }
-
-    public function testSupportsClone()
-    {
-        $form = new Form('author');
-        $form->add($this->createMockField('firstName'));
-
-        $clone = clone $form;
-
-        $this->assertNotSame($clone['firstName'], $form['firstName']);
-    }
-
-    public function testSubmitWithoutPriorSetData()
-    {
-        return; // TODO
-        $field = $this->createMockField('firstName');
-        $field->expects($this->any())
-                    ->method('getData')
-                    ->will($this->returnValue('Bernhard'));
-
-        $form = new Form('author');
-        $form->add($field);
-
-        $form->submit(array('firstName' => 'Bernhard'));
-
-        $this->assertEquals(array('firstName' => 'Bernhard'), $form->getData());
-    }
-
-    public function testGetHiddenFieldsReturnsOnlyHiddenFields()
-    {
-        $form = $this->getGroupWithBothVisibleAndHiddenField();
-
-        $hiddenFields = $form->getHiddenFields(true, false);
-
-        $this->assertSame(array($form['hiddenField']), $hiddenFields);
-    }
-
-    public function testGetVisibleFieldsReturnsOnlyVisibleFields()
-    {
-        $form = $this->getGroupWithBothVisibleAndHiddenField();
-
-        $visibleFields = $form->getVisibleFields(true, false);
-
-        $this->assertSame(array($form['visibleField']), $visibleFields);
-    }
-
-    public function testValidateData()
-    {
-        $graphWalker = $this->createMockGraphWalker();
-        $metadataFactory = $this->createMockMetadataFactory();
-        $context = new ExecutionContext('Root', $graphWalker, $metadataFactory);
-        $object = $this->getMock('\stdClass');
-        $form = new Form('author', array('validation_groups' => array(
-            'group1',
-            'group2',
-        )));
-
-        $graphWalker->expects($this->exactly(2))
-                ->method('walkReference')
-                ->with($object,
-                    // should test for groups - PHPUnit limitation
-                    $this->anything(),
-                    'data',
-                    true);
-
-        $form->setData($object);
-        $form->validateData($context);
-    }
-
-    public function testValidateDataAppendsPropertyPath()
-    {
-        $graphWalker = $this->createMockGraphWalker();
-        $metadataFactory = $this->createMockMetadataFactory();
-        $context = new ExecutionContext('Root', $graphWalker, $metadataFactory);
-        $context->setPropertyPath('path');
-        $object = $this->getMock('\stdClass');
-        $form = new Form('author');
-
-        $graphWalker->expects($this->once())
-                ->method('walkReference')
-                ->with($object,
-                    null,
-                    'path.data',
-                    true);
-
-        $form->setData($object);
-        $form->validateData($context);
-    }
-
-    public function testValidateDataSetsCurrentPropertyToData()
-    {
-        $graphWalker = $this->createMockGraphWalker();
-        $metadataFactory = $this->createMockMetadataFactory();
-        $context = new ExecutionContext('Root', $graphWalker, $metadataFactory);
-        $object = $this->getMock('\stdClass');
-        $form = new Form('author');
         $test = $this;
+        $type1 = $this->getMock('Symfony\Component\Form\Type\FormTypeInterface');
+        $type2 = $this->getMock('Symfony\Component\Form\Type\FormTypeInterface');
+        $calls = array();
 
-        $graphWalker->expects($this->once())
-                ->method('walkReference')
-                ->will($this->returnCallback(function () use ($context, $test) {
-                    $test->assertEquals('data', $context->getCurrentProperty());
-                }));
+        $type1->expects($this->once())
+            ->method('buildView')
+            ->will($this->returnCallback(function (FormView $view, Form $form) use ($test, &$calls) {
+                $calls[] = 'type1::buildView';
+                $test->assertTrue($view->hasParent());
+                $test->assertFalse($view->hasChildren());
+            }));
 
-        $form->setData($object);
-        $form->validateData($context);
+        $type2->expects($this->once())
+            ->method('buildView')
+            ->will($this->returnCallback(function (FormView $view, Form $form) use ($test, &$calls) {
+                $calls[] = 'type2::buildView';
+                $test->assertTrue($view->hasParent());
+                $test->assertFalse($view->hasChildren());
+            }));
+
+        $type1->expects($this->once())
+            ->method('buildViewBottomUp')
+            ->will($this->returnCallback(function (FormView $view, Form $form) use ($test, &$calls) {
+                $calls[] = 'type1::buildViewBottomUp';
+                $test->assertTrue($view->hasChildren());
+            }));
+
+        $type2->expects($this->once())
+            ->method('buildViewBottomUp')
+            ->will($this->returnCallback(function (FormView $view, Form $form) use ($test, &$calls) {
+                $calls[] = 'type2::buildViewBottomUp';
+                $test->assertTrue($view->hasChildren());
+            }));
+
+        $form = $this->getBuilder()->setTypes(array($type1, $type2))->getForm();
+        $form->setParent($this->getBuilder()->getForm());
+        $form->add($this->getBuilder()->getForm());
+
+        $form->createView();
+
+        $this->assertEquals(array(
+            0 => 'type1::buildView',
+            1 => 'type2::buildView',
+            2 => 'type1::buildViewBottomUp',
+            3 => 'type2::buildViewBottomUp',
+        ), $calls);
     }
 
-    public function testValidateDataDoesNotWalkScalars()
+    public function testCreateViewAcceptsParent()
     {
-        $graphWalker = $this->createMockGraphWalker();
-        $metadataFactory = $this->createMockMetadataFactory();
-        $context = new ExecutionContext('Root', $graphWalker, $metadataFactory);
-        $valueTransformer = $this->createMockTransformer();
-        $form = new Form('author', array('value_transformer' => $valueTransformer));
+        $parent = new FormView();
 
-        $graphWalker->expects($this->never())
-                ->method('walkReference');
+        $form = $this->getBuilder()->getForm();
+        $view = $form->createView($parent);
 
-        $valueTransformer->expects($this->atLeastOnce())
-                ->method('reverseTransform')
-                ->will($this->returnValue('foobar'));
-
-        $form->submit(array('foo' => 'bar')); // reverse transformed to "foobar"
-        $form->validateData($context);
+        $this->assertSame($parent, $view->getParent());
     }
 
-    public function testSubformDoesntCallSetters()
+    protected function getBuilder($name = 'name', EventDispatcherInterface $dispatcher = null)
     {
-        $author = new FormTest_AuthorWithoutRefSetter(new Author());
-
-        $form = new Form('author', array('validator' => $this->createMockValidator()));
-        $form->setData($author);
-        $refForm = new Form('reference');
-        $refForm->add(new TestField('firstName'));
-        $form->add($refForm);
-
-        $form->bind($this->createPostRequest(array(
-            'author' => array(
-                // reference has a getter, but not setter
-                'reference' => array(
-                    'firstName' => 'Foo',
-                )
-            )
-        )));
-
-        $this->assertEquals('Foo', $author->getReference()->firstName);
+        return new FormBuilder($name, $this->factory, $dispatcher ?: $this->dispatcher);
     }
 
-    public function testSubformCallsSettersIfTheObjectChanged()
+    protected function getMockForm($name = 'name')
     {
-        // no reference
-        $author = new FormTest_AuthorWithoutRefSetter(null);
-        $newReference = new Author();
-
-        $form = new Form('author', array('validator' => $this->createMockValidator()));
-        $form->setData($author);
-        $refForm = new Form('referenceCopy');
-        $refForm->add(new TestField('firstName'));
-        $form->add($refForm);
-
-        $refForm->setData($newReference); // new author object
-
-        $form->bind($this->createPostRequest(array(
-            'author' => array(
-                // referenceCopy has a getter that returns a copy
-                'referenceCopy' => array(
-                    'firstName' => 'Foo',
-                )
-            )
-        )));
-
-        $this->assertEquals('Foo', $author->getReferenceCopy()->firstName);
-    }
-
-    public function testSubformCallsSettersIfByReferenceIsFalse()
-    {
-        $author = new FormTest_AuthorWithoutRefSetter(new Author());
-
-        $form = new Form('author', array('validator' => $this->createMockValidator()));
-        $form->setData($author);
-        $refForm = new Form('referenceCopy', array('by_reference' => false));
-        $refForm->add(new TestField('firstName'));
-        $form->add($refForm);
-
-        $form->bind($this->createPostRequest(array(
-            'author' => array(
-                // referenceCopy has a getter that returns a copy
-                'referenceCopy' => array(
-                    'firstName' => 'Foo',
-                )
-            )
-        )));
-
-        // firstName can only be updated if setReferenceCopy() was called
-        $this->assertEquals('Foo', $author->getReferenceCopy()->firstName);
-    }
-
-    public function testSubformCallsSettersIfReferenceIsScalar()
-    {
-        $author = new FormTest_AuthorWithoutRefSetter('scalar');
-
-        $form = new Form('author', array('validator' => $this->createMockValidator()));
-        $form->setData($author);
-        $refForm = new FormTest_FormThatReturns('referenceCopy');
-        $refForm->setReturnValue('foobar');
-        $form->add($refForm);
-
-        $form->bind($this->createPostRequest(array(
-            'author' => array(
-                'referenceCopy' => array(), // doesn't matter actually
-            )
-        )));
-
-        // firstName can only be updated if setReferenceCopy() was called
-        $this->assertEquals('foobar', $author->getReferenceCopy());
-    }
-
-    public function testSubformAlwaysInsertsIntoArrays()
-    {
-        $ref1 = new Author();
-        $ref2 = new Author();
-        $author = array('referenceCopy' => $ref1);
-
-        $form = new Form('author', array('validator' => $this->createMockValidator()));
-        $form->setData($author);
-        $refForm = new FormTest_FormThatReturns('referenceCopy');
-        $refForm->setReturnValue($ref2);
-        $form->add($refForm);
-
-        $form->bind($this->createPostRequest(array(
-            'author' => array(
-                'referenceCopy' => array(), // doesn't matter actually
-            )
-        )));
-
-        // the new reference was inserted into the array
-        $author = $form->getData();
-        $this->assertSame($ref2, $author['referenceCopy']);
-    }
-
-    public function testIsEmptyReturnsTrueIfAllFieldsAreEmpty()
-    {
-        $form = new Form();
-        $field1 = new TestField('foo');
-        $field1->setData('');
-        $field2 = new TestField('bar');
-        $field2->setData(null);
-        $form->add($field1);
-        $form->add($field2);
-
-        $this->assertTrue($form->isEmpty());
-    }
-
-    public function testIsEmptyReturnsFalseIfAnyFieldIsFilled()
-    {
-        $form = new Form();
-        $field1 = new TestField('foo');
-        $field1->setData('baz');
-        $field2 = new TestField('bar');
-        $field2->setData(null);
-        $form->add($field1);
-        $form->add($field2);
-
-        $this->assertFalse($form->isEmpty());
-    }
-
-    /**
-     * Create a group containing two fields, "visibleField" and "hiddenField"
-     *
-     * @return Form
-     */
-    protected function getGroupWithBothVisibleAndHiddenField()
-    {
-        $form = new Form('testGroup');
-
-        // add a visible field
-        $visibleField = $this->createMockField('visibleField');
-        $visibleField->expects($this->once())
-                    ->method('isHidden')
-                    ->will($this->returnValue(false));
-        $form->add($visibleField);
-
-        // add a hidden field
-        $hiddenField = $this->createMockField('hiddenField');
-        $hiddenField->expects($this->once())
-                    ->method('isHidden')
-                    ->will($this->returnValue(true));
-        $form->add($hiddenField);
-
-        return $form;
-    }
-
-    protected function createMockField($key)
-    {
-        $field = $this->getMock(
-            'Symfony\Component\Form\FieldInterface',
-            array(),
-            array(),
-            '',
-            false, // don't use constructor
-            false  // don't call parent::__clone
-        );
-
-        $field->expects($this->any())
-                    ->method('getKey')
-                    ->will($this->returnValue($key));
-
-        return $field;
-    }
-
-    protected function createMockForm()
-    {
-        $form = $this->getMock(
-            'Symfony\Component\Form\Form',
-            array(),
-            array(),
-            '',
-            false, // don't use constructor
-            false  // don't call parent::__clone)
-        );
+        $form = $this->getMock('Symfony\Tests\Component\Form\FormInterface');
 
         $form->expects($this->any())
-                ->method('getRoot')
-                ->will($this->returnValue($form));
+            ->method('getName')
+            ->will($this->returnValue($name));
 
         return $form;
     }
 
-    protected function createInvalidMockField($key)
+    protected function getValidForm($name)
     {
-        $field = $this->createMockField($key);
-        $field->expects($this->any())
-                    ->method('isValid')
-                    ->will($this->returnValue(false));
+        $form = $this->getMockForm($name);
 
-        return $field;
+        $form->expects($this->any())
+            ->method('isValid')
+            ->will($this->returnValue(true));
+
+        return $form;
     }
 
-    protected function createValidMockField($key)
+    protected function getInvalidForm($name)
     {
-        $field = $this->createMockField($key);
-        $field->expects($this->any())
-                    ->method('isValid')
-                    ->will($this->returnValue(true));
+        $form = $this->getMockForm($name);
 
-        return $field;
+        $form->expects($this->any())
+            ->method('isValid')
+            ->will($this->returnValue(false));
+
+        return $form;
     }
 
-    protected function createNonMultipartMockField($key)
+    protected function getDataMapper()
     {
-        $field = $this->createMockField($key);
-        $field->expects($this->any())
-                    ->method('isMultipart')
-                    ->will($this->returnValue(false));
-
-        return $field;
+        return $this->getMock('Symfony\Component\Form\DataMapper\DataMapperInterface');
     }
 
-    protected function createMultipartMockField($key)
+    protected function getDataTransformer()
     {
-        $field = $this->createMockField($key);
-        $field->expects($this->any())
-                    ->method('isMultipart')
-                    ->will($this->returnValue(true));
-
-        return $field;
+        return $this->getMock('Symfony\Component\Form\DataTransformer\DataTransformerInterface');
     }
 
-    protected function createMockTransformer()
+    protected function getFormValidator()
     {
-        return $this->getMock('Symfony\Component\Form\ValueTransformer\ValueTransformerInterface', array(), array(), '', false, false);
+        return $this->getMock('Symfony\Component\Form\Validator\FormValidatorInterface');
     }
-
-    protected function createMockValidator()
-    {
-        return $this->getMock('Symfony\Component\Validator\ValidatorInterface');
-    }
-
-    protected function createMockCsrfProvider()
-    {
-        return $this->getMock('Symfony\Component\Form\CsrfProvider\CsrfProviderInterface');
-    }
-
-    protected function createMockGraphWalker()
-    {
-        return $this->getMockBuilder('Symfony\Component\Validator\GraphWalker')
-                ->disableOriginalConstructor()
-                ->getMock();
-    }
-
-    protected function createMockMetadataFactory()
-    {
-        return $this->getMock('Symfony\Component\Validator\Mapping\ClassMetadataFactoryInterface');
-    }
-
-    protected function createPostRequest(array $values = array(), array $files = array())
-    {
-        $server = array('REQUEST_METHOD' => 'POST');
-
-        return new Request(array(), $values, array(), array(), $files, $server);
-    }
-}
+}
\ No newline at end of file
diff --git a/tests/Symfony/Tests/Component/Form/HiddenFieldTest.php b/tests/Symfony/Tests/Component/Form/HiddenFieldTest.php
deleted file mode 100644
index 84ca0f55a2..0000000000
--- a/tests/Symfony/Tests/Component/Form/HiddenFieldTest.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Tests\Component\Form;
-
-use Symfony\Component\Form\HiddenField;
-
-class HiddenFieldTest extends \PHPUnit_Framework_TestCase
-{
-    protected $field;
-
-    protected function setUp()
-    {
-        $this->field = new HiddenField('name');
-    }
-
-    public function testIsHidden()
-    {
-        $this->assertTrue($this->field->isHidden());
-    }
-}
\ No newline at end of file
diff --git a/tests/Symfony/Tests/Component/Form/PasswordFieldTest.php b/tests/Symfony/Tests/Component/Form/PasswordFieldTest.php
deleted file mode 100644
index d81b7c408e..0000000000
--- a/tests/Symfony/Tests/Component/Form/PasswordFieldTest.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Tests\Component\Form;
-
-use Symfony\Component\Form\PasswordField;
-
-class PasswordFieldTest extends \PHPUnit_Framework_TestCase
-{
-    public function testGetDisplayedData()
-    {
-        $field = new PasswordField('name');
-        $field->setData('before');
-
-        $this->assertSame('', $field->getDisplayedData());
-
-        $field->submit('after');
-
-        $this->assertSame('', $field->getDisplayedData());
-    }
-
-    public function testGetDisplayedDataWithAlwaysEmptyDisabled()
-    {
-        $field = new PasswordField('name', array('always_empty' => false));
-        $field->setData('before');
-
-        $this->assertSame('', $field->getDisplayedData());
-
-        $field->submit('after');
-
-        $this->assertSame('after', $field->getDisplayedData());
-    }
-}
\ No newline at end of file
diff --git a/tests/Symfony/Tests/Component/Form/PropertyPathTest.php b/tests/Symfony/Tests/Component/Form/PropertyPathTest.php
index fde34e1a94..2f2a58e22f 100644
--- a/tests/Symfony/Tests/Component/Form/PropertyPathTest.php
+++ b/tests/Symfony/Tests/Component/Form/PropertyPathTest.php
@@ -14,7 +14,7 @@ namespace Symfony\Tests\Component\Form;
 require_once __DIR__ . '/Fixtures/Author.php';
 require_once __DIR__ . '/Fixtures/Magician.php';
 
-use Symfony\Component\Form\PropertyPath;
+use Symfony\Component\Form\Util\PropertyPath;
 use Symfony\Tests\Component\Form\Fixtures\Author;
 use Symfony\Tests\Component\Form\Fixtures\Magician;
 
@@ -48,6 +48,15 @@ class PropertyPathTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals('Bernhard', $path->getValue($array));
     }
 
+    public function testGetValueReadsElementWithSpecialCharsExceptDOt()
+    {
+        $array = array('#!@$' => 'Bernhard');
+
+        $path = new PropertyPath('#!@$');
+
+        $this->assertEquals('Bernhard', $path->getValue($array));
+    }
+
     public function testGetValueReadsNestedIndexWithSpecialChars()
     {
         $array = array('root' => array('#!@$.' => 'Bernhard'));
@@ -192,6 +201,33 @@ class PropertyPathTest extends \PHPUnit_Framework_TestCase
         $path->getValue(new Author());
     }
 
+    public function testGetValueThrowsExceptionIfNotObjectOrArray()
+    {
+        $path = new PropertyPath('foobar');
+
+        $this->setExpectedException('Symfony\Component\Form\Exception\UnexpectedTypeException');
+
+        $path->getValue('baz');
+    }
+
+    public function testGetValueThrowsExceptionIfNull()
+    {
+        $path = new PropertyPath('foobar');
+
+        $this->setExpectedException('Symfony\Component\Form\Exception\UnexpectedTypeException');
+
+        $path->getValue(null);
+    }
+
+    public function testGetValueThrowsExceptionIfEmpty()
+    {
+        $path = new PropertyPath('foobar');
+
+        $this->setExpectedException('Symfony\Component\Form\Exception\UnexpectedTypeException');
+
+        $path->getValue('');
+    }
+
     public function testSetValueUpdatesArrays()
     {
         $array = array();
@@ -292,6 +328,36 @@ class PropertyPathTest extends \PHPUnit_Framework_TestCase
         $path->setValue(new Author(), 'foobar');
     }
 
+    public function testSetValueThrowsExceptionIfNotObjectOrArray()
+    {
+        $path = new PropertyPath('foobar');
+        $value = 'baz';
+
+        $this->setExpectedException('Symfony\Component\Form\Exception\UnexpectedTypeException');
+
+        $path->setValue($value, 'bam');
+    }
+
+    public function testSetValueThrowsExceptionIfNull()
+    {
+        $path = new PropertyPath('foobar');
+        $value = null;
+
+        $this->setExpectedException('Symfony\Component\Form\Exception\UnexpectedTypeException');
+
+        $path->setValue($value, 'bam');
+    }
+
+    public function testSetValueThrowsExceptionIfEmpty()
+    {
+        $path = new PropertyPath('foobar');
+        $value = '';
+
+        $this->setExpectedException('Symfony\Component\Form\Exception\UnexpectedTypeException');
+
+        $path->setValue($value, 'bam');
+    }
+
     public function testToString()
     {
         $path = new PropertyPath('reference.traversable[index].property');
@@ -317,7 +383,7 @@ class PropertyPathTest extends \PHPUnit_Framework_TestCase
     {
         $this->setExpectedException('Symfony\Component\Form\Exception\InvalidPropertyPathException');
 
-        new PropertyPath('property.$field');
+        new PropertyPath('property.$form');
     }
 
     public function testInvalidPropertyPath_empty()
diff --git a/tests/Symfony/Tests/Component/Form/RepeatedFieldTest.php b/tests/Symfony/Tests/Component/Form/RepeatedFieldTest.php
deleted file mode 100644
index 374f2a4b41..0000000000
--- a/tests/Symfony/Tests/Component/Form/RepeatedFieldTest.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Tests\Component\Form;
-
-require_once __DIR__ . '/Fixtures/TestField.php';
-
-use Symfony\Component\Form\RepeatedField;
-use Symfony\Tests\Component\Form\Fixtures\TestField;
-
-class RepeatedFieldTest extends \PHPUnit_Framework_TestCase
-{
-    protected $field;
-
-    protected function setUp()
-    {
-        $this->field = new RepeatedField(new TestField('name'));
-    }
-
-    public function testSetData()
-    {
-        $this->field->setData('foobar');
-
-        $this->assertEquals('foobar', $this->field['first']->getData());
-        $this->assertEquals('foobar', $this->field['second']->getData());
-    }
-
-    public function testSubmitUnequal()
-    {
-        $input = array('first' => 'foo', 'second' => 'bar');
-
-        $this->field->submit($input);
-
-        $this->assertEquals('foo', $this->field['first']->getDisplayedData());
-        $this->assertEquals('bar', $this->field['second']->getDisplayedData());
-        $this->assertFalse($this->field->isFirstEqualToSecond());
-        $this->assertEquals($input, $this->field->getDisplayedData());
-        $this->assertEquals('foo', $this->field->getData());
-    }
-
-    public function testSubmitEqual()
-    {
-        $input = array('first' => 'foo', 'second' => 'foo');
-
-        $this->field->submit($input);
-
-        $this->assertEquals('foo', $this->field['first']->getDisplayedData());
-        $this->assertEquals('foo', $this->field['second']->getDisplayedData());
-        $this->assertTrue($this->field->isFirstEqualToSecond());
-        $this->assertEquals($input, $this->field->getDisplayedData());
-        $this->assertEquals('foo', $this->field->getData());
-    }
-
-    public function testGetDataReturnsSecondValueIfFirstIsEmpty()
-    {
-        $input = array('first' => '', 'second' => 'bar');
-
-        $this->field->submit($input);
-
-        $this->assertEquals('bar', $this->field->getData());
-    }
-}
\ No newline at end of file
diff --git a/tests/Symfony/Tests/Component/Form/TimeFieldTest.php b/tests/Symfony/Tests/Component/Form/TimeFieldTest.php
deleted file mode 100644
index e6427cfcdb..0000000000
--- a/tests/Symfony/Tests/Component/Form/TimeFieldTest.php
+++ /dev/null
@@ -1,365 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Tests\Component\Form;
-
-require_once __DIR__ . '/DateTimeTestCase.php';
-
-use Symfony\Component\Form\TimeField;
-
-class TimeFieldTest extends DateTimeTestCase
-{
-    public function testSubmit_dateTime()
-    {
-        $field = new TimeField('name', array(
-            'data_timezone' => 'UTC',
-            'user_timezone' => 'UTC',
-            'type' => TimeField::DATETIME,
-        ));
-
-        $input = array(
-            'hour' => '3',
-            'minute' => '4',
-        );
-
-        $field->submit($input);
-
-        $dateTime = new \DateTime('1970-01-01 03:04:00 UTC');
-
-        $this->assertEquals($dateTime, $field->getData());
-        $this->assertEquals($input, $field->getDisplayedData());
-    }
-
-    public function testSubmit_string()
-    {
-        $field = new TimeField('name', array(
-            'data_timezone' => 'UTC',
-            'user_timezone' => 'UTC',
-            'type' => TimeField::STRING,
-        ));
-
-        $input = array(
-            'hour' => '3',
-            'minute' => '4',
-        );
-
-        $field->submit($input);
-
-        $this->assertEquals('03:04:00', $field->getData());
-        $this->assertEquals($input, $field->getDisplayedData());
-    }
-
-    public function testSubmit_timestamp()
-    {
-        $field = new TimeField('name', array(
-            'data_timezone' => 'UTC',
-            'user_timezone' => 'UTC',
-            'type' => TimeField::TIMESTAMP,
-        ));
-
-        $input = array(
-            'hour' => '3',
-            'minute' => '4',
-        );
-
-        $field->submit($input);
-
-        $dateTime = new \DateTime('1970-01-01 03:04:00 UTC');
-
-        $this->assertEquals($dateTime->format('U'), $field->getData());
-        $this->assertEquals($input, $field->getDisplayedData());
-    }
-
-    public function testSubmit_raw()
-    {
-        $field = new TimeField('name', array(
-            'data_timezone' => 'UTC',
-            'user_timezone' => 'UTC',
-            'type' => TimeField::RAW,
-        ));
-
-        $input = array(
-            'hour' => '3',
-            'minute' => '4',
-        );
-
-        $data = array(
-            'hour' => '3',
-            'minute' => '4',
-        );
-
-        $field->submit($input);
-
-        $this->assertEquals($data, $field->getData());
-        $this->assertEquals($input, $field->getDisplayedData());
-    }
-
-    public function testSetData_withSeconds()
-    {
-        $field = new TimeField('name', array(
-            'data_timezone' => 'UTC',
-            'user_timezone' => 'UTC',
-            'type' => TimeField::DATETIME,
-            'with_seconds' => true,
-        ));
-
-        $field->setData(new \DateTime('03:04:05 UTC'));
-
-        $this->assertEquals(array('hour' => 3, 'minute' => 4, 'second' => 5), $field->getDisplayedData());
-    }
-
-    public function testSetData_differentTimezones()
-    {
-        $field = new TimeField('name', array(
-            'data_timezone' => 'America/New_York',
-            'user_timezone' => 'Pacific/Tahiti',
-            // don't do this test with DateTime, because it leads to wrong results!
-            'type' => TimeField::STRING,
-            'with_seconds' => true,
-        ));
-
-        $dateTime = new \DateTime('03:04:05 America/New_York');
-
-        $field->setData($dateTime->format('H:i:s'));
-
-        $dateTime = clone $dateTime;
-        $dateTime->setTimezone(new \DateTimeZone('Pacific/Tahiti'));
-
-        $displayedData = array(
-            'hour' => (int)$dateTime->format('H'),
-            'minute' => (int)$dateTime->format('i'),
-            'second' => (int)$dateTime->format('s')
-        );
-
-        $this->assertEquals($displayedData, $field->getDisplayedData());
-    }
-
-    public function testIsHourWithinRange_returnsTrueIfWithin()
-    {
-        $field = new TimeField('name', array(
-            'hours' => array(6, 7),
-        ));
-
-        $field->submit(array('hour' => '06', 'minute' => '12'));
-
-        $this->assertTrue($field->isHourWithinRange());
-    }
-
-    public function testIsHourWithinRange_returnsTrueIfEmpty()
-    {
-        $field = new TimeField('name', array(
-            'hours' => array(6, 7),
-        ));
-
-        $field->submit(array('hour' => '', 'minute' => '06'));
-
-        $this->assertTrue($field->isHourWithinRange());
-    }
-
-    public function testIsHourWithinRange_returnsFalseIfNotContained()
-    {
-        $field = new TimeField('name', array(
-            'hours' => array(6, 7),
-        ));
-
-        $field->submit(array('hour' => '08', 'minute' => '12'));
-
-        $this->assertFalse($field->isHourWithinRange());
-    }
-
-    public function testIsMinuteWithinRange_returnsTrueIfWithin()
-    {
-        $field = new TimeField('name', array(
-            'minutes' => array(6, 7),
-        ));
-
-        $field->submit(array('hour' => '06', 'minute' => '06'));
-
-        $this->assertTrue($field->isMinuteWithinRange());
-    }
-
-    public function testIsMinuteWithinRange_returnsTrueIfEmpty()
-    {
-        $field = new TimeField('name', array(
-            'minutes' => array(6, 7),
-        ));
-
-        $field->submit(array('hour' => '06', 'minute' => ''));
-
-        $this->assertTrue($field->isMinuteWithinRange());
-    }
-
-    public function testIsMinuteWithinRange_returnsFalseIfNotContained()
-    {
-        $field = new TimeField('name', array(
-            'minutes' => array(6, 7),
-        ));
-
-        $field->submit(array('hour' => '06', 'minute' => '08'));
-
-        $this->assertFalse($field->isMinuteWithinRange());
-    }
-
-    public function testIsSecondWithinRange_returnsTrueIfWithin()
-    {
-        $field = new TimeField('name', array(
-            'seconds' => array(6, 7),
-            'with_seconds' => true,
-        ));
-
-        $field->submit(array('hour' => '04', 'minute' => '05', 'second' => '06'));
-
-        $this->assertTrue($field->isSecondWithinRange());
-    }
-
-    public function testIsSecondWithinRange_returnsTrueIfEmpty()
-    {
-        $field = new TimeField('name', array(
-            'seconds' => array(6, 7),
-            'with_seconds' => true,
-        ));
-
-        $field->submit(array('hour' => '06', 'minute' => '06', 'second' => ''));
-
-        $this->assertTrue($field->isSecondWithinRange());
-    }
-
-    public function testIsSecondWithinRange_returnsTrueIfNotWithSeconds()
-    {
-        $field = new TimeField('name', array(
-            'seconds' => array(6, 7),
-        ));
-
-        $field->submit(array('hour' => '06', 'minute' => '06'));
-
-        $this->assertTrue($field->isSecondWithinRange());
-    }
-
-    public function testIsSecondWithinRange_returnsFalseIfNotContained()
-    {
-        $field = new TimeField('name', array(
-            'seconds' => array(6, 7),
-            'with_seconds' => true,
-        ));
-
-        $field->submit(array('hour' => '04', 'minute' => '05', 'second' => '08'));
-
-        $this->assertFalse($field->isSecondWithinRange());
-    }
-
-    public function testIsPartiallyFilled_returnsFalseIfCompletelyEmpty()
-    {
-        $field = new TimeField('name', array(
-            'widget' => 'choice',
-        ));
-
-        $field->submit(array(
-            'hour' => '',
-            'minute' => '',
-        ));
-
-        $this->assertFalse($field->isPartiallyFilled());
-    }
-
-    public function testIsPartiallyFilled_returnsFalseIfCompletelyEmpty_withSeconds()
-    {
-        $field = new TimeField('name', array(
-            'widget' => 'choice',
-            'with_seconds' => true,
-        ));
-
-        $field->submit(array(
-            'hour' => '',
-            'minute' => '',
-            'second' => '',
-        ));
-
-        $this->assertFalse($field->isPartiallyFilled());
-    }
-
-    public function testIsPartiallyFilled_returnsFalseIfCompletelyFilled()
-    {
-        $field = new TimeField('name', array(
-            'widget' => 'choice',
-        ));
-
-        $field->submit(array(
-            'hour' => '0',
-            'minute' => '0',
-        ));
-
-        $this->assertFalse($field->isPartiallyFilled());
-    }
-
-    public function testIsPartiallyFilled_returnsFalseIfCompletelyFilled_withSeconds()
-    {
-        $field = new TimeField('name', array(
-            'widget' => 'choice',
-            'with_seconds' => true,
-        ));
-
-        $field->submit(array(
-            'hour' => '0',
-            'minute' => '0',
-            'second' => '0',
-        ));
-
-        $this->assertFalse($field->isPartiallyFilled());
-    }
-
-    public function testIsPartiallyFilled_returnsTrueIfChoiceAndHourEmpty()
-    {
-        $field = new TimeField('name', array(
-            'widget' => 'choice',
-            'with_seconds' => true,
-        ));
-
-        $field->submit(array(
-            'hour' => '',
-            'minute' => '0',
-            'second' => '0',
-        ));
-
-        $this->assertTrue($field->isPartiallyFilled());
-    }
-
-    public function testIsPartiallyFilled_returnsTrueIfChoiceAndMinuteEmpty()
-    {
-        $field = new TimeField('name', array(
-            'widget' => 'choice',
-            'with_seconds' => true,
-        ));
-
-        $field->submit(array(
-            'hour' => '0',
-            'minute' => '',
-            'second' => '0',
-        ));
-
-        $this->assertTrue($field->isPartiallyFilled());
-    }
-
-    public function testIsPartiallyFilled_returnsTrueIfChoiceAndSecondsEmpty()
-    {
-        $field = new TimeField('name', array(
-            'widget' => 'choice',
-            'with_seconds' => true,
-        ));
-
-        $field->submit(array(
-            'hour' => '0',
-            'minute' => '0',
-            'second' => '',
-        ));
-
-        $this->assertTrue($field->isPartiallyFilled());
-    }
-}
\ No newline at end of file
diff --git a/tests/Symfony/Tests/Component/Form/Type/AbstractTypeTest.php b/tests/Symfony/Tests/Component/Form/Type/AbstractTypeTest.php
new file mode 100644
index 0000000000..2c40bf9e7d
--- /dev/null
+++ b/tests/Symfony/Tests/Component/Form/Type/AbstractTypeTest.php
@@ -0,0 +1,53 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Tests\Component\Form\Type;
+
+use Symfony\Component\Form\Type\AbstractType;
+
+class AbstractTypeTest extends TestCase
+{
+    public function testGetNameWithNoSuffix()
+    {
+        $type = new MyTest();
+
+        $this->assertEquals('mytest', $type->getName());
+    }
+
+    public function testGetNameWithTypeSuffix()
+    {
+        $type = new MyTestType();
+
+        $this->assertEquals('mytest', $type->getName());
+    }
+
+    public function testGetNameWithFormSuffix()
+    {
+        $type = new MyTestForm();
+
+        $this->assertEquals('mytest', $type->getName());
+    }
+
+    public function testGetNameWithFormTypeSuffix()
+    {
+        $type = new MyTestFormType();
+
+        $this->assertEquals('mytest', $type->getName());
+    }
+}
+
+class MyTest extends AbstractType {}
+
+class MyTestType extends AbstractType {}
+
+class MyTestForm extends AbstractType {}
+
+class MyTestFormType extends AbstractType {}
\ No newline at end of file
diff --git a/tests/Symfony/Tests/Component/Form/Type/CheckboxTypeTest.php b/tests/Symfony/Tests/Component/Form/Type/CheckboxTypeTest.php
new file mode 100644
index 0000000000..5cb86d88fc
--- /dev/null
+++ b/tests/Symfony/Tests/Component/Form/Type/CheckboxTypeTest.php
@@ -0,0 +1,43 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Tests\Component\Form\Type;
+
+require_once __DIR__.'/TestCase.php';
+
+class CheckboxTypeTest extends TestCase
+{
+    public function testPassValueToView()
+    {
+        $form = $this->factory->create('checkbox', 'name', array('value' => 'foobar'));
+        $view = $form->createView();
+
+        $this->assertEquals('foobar', $view->get('value'));
+    }
+
+    public function testCheckedIfDataTrue()
+    {
+        $form = $this->factory->create('checkbox');
+        $form->setData(true);
+        $view = $form->createView();
+
+        $this->assertTrue($view->get('checked'));
+    }
+
+    public function testNotCheckedIfDataFalse()
+    {
+        $form = $this->factory->create('checkbox');
+        $form->setData(false);
+        $view = $form->createView();
+
+        $this->assertFalse($view->get('checked'));
+    }
+}
diff --git a/tests/Symfony/Tests/Component/Form/Type/ChoiceTypeTest.php b/tests/Symfony/Tests/Component/Form/Type/ChoiceTypeTest.php
new file mode 100644
index 0000000000..2ac32f81c7
--- /dev/null
+++ b/tests/Symfony/Tests/Component/Form/Type/ChoiceTypeTest.php
@@ -0,0 +1,328 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Tests\Component\Form\Type;
+
+require_once __DIR__.'/TestCase.php';
+
+use Symfony\Component\Form\ChoiceField;
+use Symfony\Component\Form\Exception\UnexpectedTypeException;
+
+class ChoiceTypeTest extends TestCase
+{
+    private $choices = array(
+        'a' => 'Bernhard',
+        'b' => 'Fabien',
+        'c' => 'Kris',
+        'd' => 'Jon',
+        'e' => 'Roman',
+    );
+
+    private $numericChoices = array(
+        0 => 'Bernhard',
+        1 => 'Fabien',
+        2 => 'Kris',
+        3 => 'Jon',
+        4 => 'Roman',
+    );
+
+    protected $groupedChoices = array(
+        'Symfony' => array(
+            'a' => 'Bernhard',
+            'b' => 'Fabien',
+            'c' => 'Kris',
+        ),
+        'Doctrine' => array(
+            'd' => 'Jon',
+            'e' => 'Roman',
+        )
+    );
+
+    /**
+     * @expectedException Symfony\Component\Form\Exception\UnexpectedTypeException
+     */
+    public function testChoicesOptionExpectsArray()
+    {
+        $form = $this->factory->create('choice', 'name', array(
+            'choices' => new \ArrayObject(),
+        ));
+    }
+
+    /**
+     * @expectedException Symfony\Component\Form\Exception\FormException
+     */
+    public function testChoiceListOptionExpectsChoiceListInterface()
+    {
+        $form = $this->factory->create('choice', 'name', array(
+            'choice_list' => array('foo' => 'foo'),
+        ));
+    }
+
+    public function testExpandedCheckboxesAreNeverRequired()
+    {
+        $form = $this->factory->create('choice', 'name', array(
+            'multiple' => true,
+            'expanded' => true,
+            'required' => true,
+            'choices' => $this->choices,
+        ));
+
+        foreach ($form as $child) {
+            $this->assertFalse($child->isRequired());
+        }
+    }
+
+    public function testExpandedRadiosAreRequiredIfChoiceFieldIsRequired()
+    {
+        $form = $this->factory->create('choice', 'name', array(
+            'multiple' => false,
+            'expanded' => true,
+            'required' => true,
+            'choices' => $this->choices,
+        ));
+
+        foreach ($form as $child) {
+            $this->assertTrue($child->isRequired());
+        }
+    }
+
+    public function testExpandedRadiosAreNotRequiredIfChoiceFieldIsNotRequired()
+    {
+        $form = $this->factory->create('choice', 'name', array(
+            'multiple' => false,
+            'expanded' => true,
+            'required' => false,
+            'choices' => $this->choices,
+        ));
+
+        foreach ($form as $child) {
+            $this->assertFalse($child->isRequired());
+        }
+    }
+
+    public function testBindSingleNonExpanded()
+    {
+        $form = $this->factory->create('choice', 'name', array(
+            'multiple' => false,
+            'expanded' => false,
+            'choices' => $this->choices,
+        ));
+
+        $form->bind('b');
+
+        $this->assertEquals('b', $form->getData());
+        $this->assertEquals('b', $form->getClientData());
+    }
+
+    public function testBindMultipleNonExpanded()
+    {
+        $form = $this->factory->create('choice', 'name', array(
+            'multiple' => true,
+            'expanded' => false,
+            'choices' => $this->choices,
+        ));
+
+        $form->bind(array('a', 'b'));
+
+        $this->assertEquals(array('a', 'b'), $form->getData());
+        $this->assertEquals(array('a', 'b'), $form->getClientData());
+    }
+
+    public function testBindSingleExpanded()
+    {
+        $form = $this->factory->create('choice', 'name', array(
+            'multiple' => false,
+            'expanded' => true,
+            'choices' => $this->choices,
+        ));
+
+        $form->bind('b');
+
+        $this->assertSame('b', $form->getData());
+        $this->assertSame(false, $form['a']->getData());
+        $this->assertSame(true, $form['b']->getData());
+        $this->assertSame(false, $form['c']->getData());
+        $this->assertSame(false, $form['d']->getData());
+        $this->assertSame(false, $form['e']->getData());
+        $this->assertSame('', $form['a']->getClientData());
+        $this->assertSame('1', $form['b']->getClientData());
+        $this->assertSame('', $form['c']->getClientData());
+        $this->assertSame('', $form['d']->getClientData());
+        $this->assertSame('', $form['e']->getClientData());
+    }
+
+    public function testBindSingleExpandedNumericChoices()
+    {
+        $form = $this->factory->create('choice', 'name', array(
+            'multiple' => false,
+            'expanded' => true,
+            'choices' => $this->numericChoices,
+        ));
+
+        $form->bind('1');
+
+        $this->assertSame(1, $form->getData());
+        $this->assertSame(false, $form[0]->getData());
+        $this->assertSame(true, $form[1]->getData());
+        $this->assertSame(false, $form[2]->getData());
+        $this->assertSame(false, $form[3]->getData());
+        $this->assertSame(false, $form[4]->getData());
+        $this->assertSame('', $form[0]->getClientData());
+        $this->assertSame('1', $form[1]->getClientData());
+        $this->assertSame('', $form[2]->getClientData());
+        $this->assertSame('', $form[3]->getClientData());
+        $this->assertSame('', $form[4]->getClientData());
+    }
+
+    public function testBindMultipleExpanded()
+    {
+        $form = $this->factory->create('choice', 'name', array(
+            'multiple' => true,
+            'expanded' => true,
+            'choices' => $this->choices,
+        ));
+
+        $form->bind(array('a' => 'a', 'b' => 'b'));
+
+        $this->assertSame(array('a', 'b'), $form->getData());
+        $this->assertSame(true, $form['a']->getData());
+        $this->assertSame(true, $form['b']->getData());
+        $this->assertSame(false, $form['c']->getData());
+        $this->assertSame(false, $form['d']->getData());
+        $this->assertSame(false, $form['e']->getData());
+        $this->assertSame('1', $form['a']->getClientData());
+        $this->assertSame('1', $form['b']->getClientData());
+        $this->assertSame('', $form['c']->getClientData());
+        $this->assertSame('', $form['d']->getClientData());
+        $this->assertSame('', $form['e']->getClientData());
+    }
+
+    public function testBindMultipleExpandedNumericChoices()
+    {
+        $form = $this->factory->create('choice', 'name', array(
+            'multiple' => true,
+            'expanded' => true,
+            'choices' => $this->numericChoices,
+        ));
+
+        $form->bind(array(1 => 1, 2 => 2));
+
+        $this->assertSame(array(1, 2), $form->getData());
+        $this->assertSame(false, $form[0]->getData());
+        $this->assertSame(true, $form[1]->getData());
+        $this->assertSame(true, $form[2]->getData());
+        $this->assertSame(false, $form[3]->getData());
+        $this->assertSame(false, $form[4]->getData());
+        $this->assertSame('', $form[0]->getClientData());
+        $this->assertSame('1', $form[1]->getClientData());
+        $this->assertSame('1', $form[2]->getClientData());
+        $this->assertSame('', $form[3]->getClientData());
+        $this->assertSame('', $form[4]->getClientData());
+    }
+
+    /*
+     * We need this functionality to create choice fields for boolean types,
+     * e.g. false => 'No', true => 'Yes'
+     */
+    public function testSetDataSingleNonExpandedAcceptsBoolean()
+    {
+        $form = $this->factory->create('choice', 'name', array(
+            'multiple' => false,
+            'expanded' => false,
+            'choices' => $this->numericChoices,
+        ));
+
+        $form->setData(false);
+
+        $this->assertEquals(false, $form->getData());
+        $this->assertEquals('0', $form->getClientData());
+    }
+
+    public function testSetDataMultipleNonExpandedAcceptsBoolean()
+    {
+        $form = $this->factory->create('choice', 'name', array(
+            'multiple' => true,
+            'expanded' => false,
+            'choices' => $this->numericChoices,
+        ));
+
+        $form->setData(array(false, true));
+
+        $this->assertEquals(array(false, true), $form->getData());
+        $this->assertEquals(array('0', '1'), $form->getClientData());
+    }
+
+    /**
+     * @expectedException Symfony\Component\Form\Exception\FormException
+     */
+    public function testRequiresChoicesOrChoiceListOption()
+    {
+        $this->factory->create('choice', 'name');
+    }
+
+    public function testPassMultipleToView()
+    {
+        $form = $this->factory->create('choice', 'name', array(
+            'multiple' => true,
+            'choices' => $this->choices,
+        ));
+        $view = $form->createView();
+
+        $this->assertTrue($view->get('multiple'));
+    }
+
+    public function testPassExpandedToView()
+    {
+        $form = $this->factory->create('choice', 'name', array(
+            'expanded' => true,
+            'choices' => $this->choices,
+        ));
+        $view = $form->createView();
+
+        $this->assertTrue($view->get('expanded'));
+    }
+
+    public function testPassChoicesToView()
+    {
+        $choices = array('a' => 'A', 'b' => 'B', 'c' => 'C', 'd' => 'D');
+        $form = $this->factory->create('choice', 'name', array(
+            'choices' => $choices,
+        ));
+        $view = $form->createView();
+
+        $this->assertSame($choices, $view->get('choices'));
+    }
+
+    public function testPassPreferredChoicesToView()
+    {
+        $choices = array('a' => 'A', 'b' => 'B', 'c' => 'C', 'd' => 'D');
+        $form = $this->factory->create('choice', 'name', array(
+            'choices' => $choices,
+            'preferred_choices' => array('b', 'd'),
+        ));
+        $view = $form->createView();
+
+        $this->assertSame(array('a' => 'A', 'c' => 'C'), $view->get('choices'));
+        $this->assertSame(array('b' => 'B', 'd' => 'D'), $view->get('preferred_choices'));
+    }
+
+    public function testAdjustNameForMultipleNonExpanded()
+    {
+        $form = $this->factory->create('choice', 'name', array(
+            'multiple' => true,
+            'expanded' => false,
+            'choices' => $this->choices,
+        ));
+        $view = $form->createView();
+
+        $this->assertSame('name[]', $view->get('name'));
+    }
+}
diff --git a/tests/Symfony/Tests/Component/Form/Type/CollectionTypeTest.php b/tests/Symfony/Tests/Component/Form/Type/CollectionTypeTest.php
new file mode 100644
index 0000000000..41bc8cdd49
--- /dev/null
+++ b/tests/Symfony/Tests/Component/Form/Type/CollectionTypeTest.php
@@ -0,0 +1,178 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Tests\Component\Form\Type;
+
+require_once __DIR__.'/TestCase.php';
+
+use Symfony\Component\Form\CollectionForm;
+use Symfony\Component\Form\Form;
+
+class CollectionFormTest extends TestCase
+{
+    public function testContainsOnlyCsrfTokenByDefault()
+    {
+        $form = $this->factory->create('collection', 'emails', array(
+            'type' => 'field',
+            'csrf_field_name' => 'abc',
+        ));
+
+        $this->assertTrue($form->has('abc'));
+        $this->assertEquals(1, count($form));
+    }
+
+    public function testSetDataAdjustsSize()
+    {
+        $form = $this->factory->create('collection', 'emails', array(
+            'type' => 'field',
+        ));
+        $form->setData(array('foo@foo.com', 'foo@bar.com'));
+
+        $this->assertTrue($form[0] instanceof Form);
+        $this->assertTrue($form[1] instanceof Form);
+        $this->assertEquals(2, count($form));
+        $this->assertEquals('foo@foo.com', $form[0]->getData());
+        $this->assertEquals('foo@bar.com', $form[1]->getData());
+
+        $form->setData(array('foo@baz.com'));
+        $this->assertTrue($form[0] instanceof Form);
+        $this->assertFalse(isset($form[1]));
+        $this->assertEquals(1, count($form));
+        $this->assertEquals('foo@baz.com', $form[0]->getData());
+    }
+
+    public function testSetDataAdjustsSizeIfModifiable()
+    {
+        $form = $this->factory->create('collection', 'emails', array(
+            'type' => 'field',
+            'modifiable' => true,
+            'prototype' => true,
+        ));
+        $form->setData(array('foo@foo.com', 'foo@bar.com'));
+
+        $this->assertTrue($form[0] instanceof Form);
+        $this->assertTrue($form[1] instanceof Form);
+        $this->assertTrue($form['$$name$$'] instanceof Form);
+        $this->assertEquals(3, count($form));
+
+        $form->setData(array('foo@baz.com'));
+        $this->assertTrue($form[0] instanceof Form);
+        $this->assertFalse(isset($form[1]));
+        $this->assertTrue($form['$$name$$'] instanceof Form);
+        $this->assertEquals(2, count($form));
+    }
+
+    public function testThrowsExceptionIfObjectIsNotTraversable()
+    {
+        $form = $this->factory->create('collection', 'emails', array(
+            'type' => 'field',
+        ));
+        $this->setExpectedException('Symfony\Component\Form\Exception\UnexpectedTypeException');
+        $form->setData(new \stdClass());
+    }
+
+    public function testModifiableCollectionsContainExtraForm()
+    {
+        $form = $this->factory->create('collection', 'emails', array(
+            'type' => 'field',
+            'modifiable' => true,
+            'prototype' => true,
+        ));
+        $form->setData(array('foo@bar.com'));
+
+        $this->assertTrue($form['0'] instanceof Form);
+        $this->assertTrue($form['$$name$$'] instanceof Form);
+        $this->assertEquals(2, count($form));
+    }
+
+    public function testNotResizedIfBoundWithMissingData()
+    {
+        $form = $this->factory->create('collection', 'emails', array(
+            'type' => 'field',
+        ));
+        $form->setData(array('foo@foo.com', 'bar@bar.com'));
+        $form->bind(array('foo@bar.com'));
+
+        $this->assertTrue($form->has('0'));
+        $this->assertTrue($form->has('1'));
+        $this->assertEquals('foo@bar.com', $form[0]->getData());
+        $this->assertEquals(null, $form[1]->getData());
+    }
+
+    public function testResizedIfBoundWithMissingDataAndModifiable()
+    {
+        $form = $this->factory->create('collection', 'emails', array(
+            'type' => 'field',
+            'modifiable' => true,
+        ));
+        $form->setData(array('foo@foo.com', 'bar@bar.com'));
+        $form->bind(array('foo@bar.com'));
+
+        $this->assertTrue($form->has('0'));
+        $this->assertFalse($form->has('1'));
+        $this->assertEquals('foo@bar.com', $form[0]->getData());
+    }
+
+    public function testNotResizedIfBoundWithExtraData()
+    {
+        $form = $this->factory->create('collection', 'emails', array(
+            'type' => 'field',
+        ));
+        $form->setData(array('foo@bar.com'));
+        $form->bind(array('foo@foo.com', 'bar@bar.com'));
+
+        $this->assertTrue($form->has('0'));
+        $this->assertFalse($form->has('1'));
+        $this->assertEquals('foo@foo.com', $form[0]->getData());
+    }
+
+    public function testResizedUpIfBoundWithExtraDataAndModifiable()
+    {
+        $form = $this->factory->create('collection', 'emails', array(
+            'type' => 'field',
+            'modifiable' => true,
+        ));
+        $form->setData(array('foo@bar.com'));
+        $form->bind(array('foo@foo.com', 'bar@bar.com'));
+
+        $this->assertTrue($form->has('0'));
+        $this->assertTrue($form->has('1'));
+        $this->assertEquals('foo@foo.com', $form[0]->getData());
+        $this->assertEquals('bar@bar.com', $form[1]->getData());
+        $this->assertEquals(array('foo@foo.com', 'bar@bar.com'), $form->getData());
+    }
+
+    public function testModifableButNoPrototype()
+    {
+        $form = $this->factory->create('collection', 'emails', array(
+            'type' => 'field',
+            'modifiable' => true,
+            'prototype' => false,
+        ));
+
+        $this->assertFalse($form->has('$$name$$'));
+    }
+
+    public function testResizedDownIfBoundWithLessDataAndModifiable()
+    {
+        $form = $this->factory->create('collection', 'emails', array(
+            'type' => 'field',
+            'modifiable' => true,
+        ));
+        $form->setData(array('foo@bar.com', 'bar@bar.com'));
+        $form->bind(array('foo@foo.com'));
+
+        $this->assertTrue($form->has('0'));
+        $this->assertFalse($form->has('1'));
+        $this->assertEquals('foo@foo.com', $form[0]->getData());
+        $this->assertEquals(array('foo@foo.com'), $form->getData());
+    }
+}
diff --git a/tests/Symfony/Tests/Component/Form/CountryFieldTest.php b/tests/Symfony/Tests/Component/Form/Type/CountryTypeTest.php
similarity index 71%
rename from tests/Symfony/Tests/Component/Form/CountryFieldTest.php
rename to tests/Symfony/Tests/Component/Form/Type/CountryTypeTest.php
index e7be514a31..2bd67d76cf 100644
--- a/tests/Symfony/Tests/Component/Form/CountryFieldTest.php
+++ b/tests/Symfony/Tests/Component/Form/Type/CountryTypeTest.php
@@ -9,19 +9,22 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Tests\Component\Form;
+namespace Symfony\Tests\Component\Form\Type;
 
 use Symfony\Component\Form\CountryField;
-use Symfony\Component\Form\FormContext;
+use Symfony\Component\Form\FormView;
 
-class CountryFieldTest extends \PHPUnit_Framework_TestCase
+require_once __DIR__.'/TestCase.php';
+
+class CountryTypeTest extends TestCase
 {
     public function testCountriesAreSelectable()
     {
         \Locale::setDefault('de_AT');
 
-        $field = new CountryField('country');
-        $choices = $field->getOtherChoices();
+        $form = $this->factory->create('country');
+        $view = $form->createView();
+        $choices = $view->get('choices');
 
         $this->assertArrayHasKey('DE', $choices);
         $this->assertEquals('Deutschland', $choices['DE']);
@@ -37,9 +40,10 @@ class CountryFieldTest extends \PHPUnit_Framework_TestCase
 
     public function testUnknownCountryIsNotIncluded()
     {
-        $field = new CountryField('country');
-        $choices = $field->getOtherChoices();
+        $form = $this->factory->create('country', 'country');
+        $view = $form->createView();
+        $choices = $view->get('choices');
 
         $this->assertArrayNotHasKey('ZZ', $choices);
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Symfony/Tests/Component/Form/Type/CsrfTypeTest.php b/tests/Symfony/Tests/Component/Form/Type/CsrfTypeTest.php
new file mode 100644
index 0000000000..e19e23d8a1
--- /dev/null
+++ b/tests/Symfony/Tests/Component/Form/Type/CsrfTypeTest.php
@@ -0,0 +1,107 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Tests\Component\Form\Type;
+
+require_once __DIR__.'/TestCase.php';
+
+class CsrfTypeTest extends TestCase
+{
+    protected $provider;
+
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->provider = $this->getMock('Symfony\Component\Form\CsrfProvider\CsrfProviderInterface');
+    }
+
+    protected function getNonRootForm()
+    {
+        $form = $this->getMock('Symfony\Tests\Component\Form\FormInterface');
+        $form->expects($this->any())
+            ->method('isRoot')
+            ->will($this->returnValue(false));
+
+        return $form;
+    }
+
+    public function testGenerateCsrfToken()
+    {
+        $this->provider->expects($this->once())
+            ->method('generateCsrfToken')
+            ->with('%PAGE_ID%')
+            ->will($this->returnValue('token'));
+
+        $form = $this->factory->create('csrf', 'name', array(
+            'csrf_provider' => $this->provider,
+            'page_id' => '%PAGE_ID%'
+        ));
+
+        $this->assertEquals('token', $form->getData());
+    }
+
+    public function testValidateTokenOnBind()
+    {
+        $this->provider->expects($this->once())
+            ->method('isCsrfTokenValid')
+            ->with('%PAGE_ID%', 'token')
+            ->will($this->returnValue(true));
+
+        $form = $this->factory->create('csrf', 'name', array(
+            'csrf_provider' => $this->provider,
+            'page_id' => '%PAGE_ID%'
+        ));
+        $form->bind('token');
+
+        $this->assertEquals('token', $form->getData());
+    }
+
+    public function testDontValidateTokenIfParentIsNotRoot()
+    {
+        $this->provider->expects($this->never())
+            ->method('isCsrfTokenValid');
+
+        $form = $this->factory->create('csrf', 'name', array(
+            'csrf_provider' => $this->provider,
+            'page_id' => '%PAGE_ID%'
+        ));
+        $form->setParent($this->getNonRootForm());
+        $form->bind('token');
+    }
+
+    public function testCsrfTokenIsRegeneratedIfValidationFails()
+    {
+        $this->provider->expects($this->at(0))
+            ->method('generateCsrfToken')
+            ->with('%PAGE_ID%')
+            ->will($this->returnValue('token1'));
+        $this->provider->expects($this->at(1))
+            ->method('isCsrfTokenValid')
+            ->with('%PAGE_ID%', 'invalid')
+            ->will($this->returnValue(false));
+
+        // The token is regenerated to avoid stalled tokens, for example when
+        // the session ID changed
+        $this->provider->expects($this->at(2))
+            ->method('generateCsrfToken')
+            ->with('%PAGE_ID%')
+            ->will($this->returnValue('token2'));
+
+        $form = $this->factory->create('csrf', 'name', array(
+            'csrf_provider' => $this->provider,
+            'page_id' => '%PAGE_ID%'
+        ));
+        $form->bind('invalid');
+
+        $this->assertEquals('token2', $form->getData());
+    }
+}
diff --git a/tests/Symfony/Tests/Component/Form/DateTimeFieldTest.php b/tests/Symfony/Tests/Component/Form/Type/DateTimeTypeTest.php
similarity index 67%
rename from tests/Symfony/Tests/Component/Form/DateTimeFieldTest.php
rename to tests/Symfony/Tests/Component/Form/Type/DateTimeTypeTest.php
index 5d1b23054f..f77cb444f2 100644
--- a/tests/Symfony/Tests/Component/Form/DateTimeFieldTest.php
+++ b/tests/Symfony/Tests/Component/Form/Type/DateTimeTypeTest.php
@@ -9,27 +9,27 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Tests\Component\Form;
+namespace Symfony\Tests\Component\Form\Type;
 
-require_once __DIR__ . '/DateTimeTestCase.php';
+require_once __DIR__ . '/LocalizedTestCase.php';
 
 use Symfony\Component\Form\DateTimeField;
 use Symfony\Component\Form\DateField;
 use Symfony\Component\Form\TimeField;
 
-class DateTimeFieldTest extends DateTimeTestCase
+class DateTimeTypeTest extends LocalizedTestCase
 {
     public function testSubmit_dateTime()
     {
-        $field = new DateTimeField('name', array(
+        $form = $this->factory->create('datetime', 'name', array(
             'data_timezone' => 'UTC',
             'user_timezone' => 'UTC',
-            'date_widget' => DateField::CHOICE,
-            'time_widget' => TimeField::CHOICE,
-            'type' => DateTimeField::DATETIME,
+            'date_widget' => 'choice',
+            'time_widget' => 'choice',
+            'input' => 'datetime',
         ));
 
-        $field->submit(array(
+        $form->bind(array(
             'date' => array(
                 'day' => '2',
                 'month' => '6',
@@ -43,20 +43,20 @@ class DateTimeFieldTest extends DateTimeTestCase
 
         $dateTime = new \DateTime('2010-06-02 03:04:00 UTC');
 
-        $this->assertDateTimeEquals($dateTime, $field->getData());
+        $this->assertDateTimeEquals($dateTime, $form->getData());
     }
 
     public function testSubmit_string()
     {
-        $field = new DateTimeField('name', array(
+        $form = $this->factory->create('datetime', 'name', array(
             'data_timezone' => 'UTC',
             'user_timezone' => 'UTC',
-            'type' => DateTimeField::STRING,
-            'date_widget' => DateField::CHOICE,
-            'time_widget' => TimeField::CHOICE,
+            'input' => 'string',
+            'date_widget' => 'choice',
+            'time_widget' => 'choice',
         ));
 
-        $field->submit(array(
+        $form->bind(array(
             'date' => array(
                 'day' => '2',
                 'month' => '6',
@@ -68,20 +68,20 @@ class DateTimeFieldTest extends DateTimeTestCase
             ),
         ));
 
-        $this->assertEquals('2010-06-02 03:04:00', $field->getData());
+        $this->assertEquals('2010-06-02 03:04:00', $form->getData());
     }
 
     public function testSubmit_timestamp()
     {
-        $field = new DateTimeField('name', array(
+        $form = $this->factory->create('datetime', 'name', array(
             'data_timezone' => 'UTC',
             'user_timezone' => 'UTC',
-            'type' => DateTimeField::TIMESTAMP,
-            'date_widget' => DateField::CHOICE,
-            'time_widget' => TimeField::CHOICE,
+            'input' => 'timestamp',
+            'date_widget' => 'choice',
+            'time_widget' => 'choice',
         ));
 
-        $field->submit(array(
+        $form->bind(array(
             'date' => array(
                 'day' => '2',
                 'month' => '6',
@@ -95,21 +95,21 @@ class DateTimeFieldTest extends DateTimeTestCase
 
         $dateTime = new \DateTime('2010-06-02 03:04:00 UTC');
 
-        $this->assertEquals($dateTime->format('U'), $field->getData());
+        $this->assertEquals($dateTime->format('U'), $form->getData());
     }
 
     public function testSubmit_withSeconds()
     {
-        $field = new DateTimeField('name', array(
+        $form = $this->factory->create('datetime', 'name', array(
             'data_timezone' => 'UTC',
             'user_timezone' => 'UTC',
-            'date_widget' => DateField::CHOICE,
-            'time_widget' => TimeField::CHOICE,
-            'type' => DateTimeField::DATETIME,
+            'date_widget' => 'choice',
+            'time_widget' => 'choice',
+            'input' => 'datetime',
             'with_seconds' => true,
         ));
 
-        $field->setData(new \DateTime('2010-06-02 03:04:05 UTC'));
+        $form->setData(new \DateTime('2010-06-02 03:04:05 UTC'));
 
         $input = array(
             'date' => array(
@@ -124,26 +124,26 @@ class DateTimeFieldTest extends DateTimeTestCase
             ),
         );
 
-        $field->submit($input);
+        $form->bind($input);
 
-        $this->assertDateTimeEquals(new \DateTime('2010-06-02 03:04:05 UTC'), $field->getData());
+        $this->assertDateTimeEquals(new \DateTime('2010-06-02 03:04:05 UTC'), $form->getData());
     }
 
     public function testSubmit_differentTimezones()
     {
-        $field = new DateTimeField('name', array(
+        $form = $this->factory->create('datetime', 'name', array(
             'data_timezone' => 'America/New_York',
             'user_timezone' => 'Pacific/Tahiti',
-            'date_widget' => DateField::CHOICE,
-            'time_widget' => TimeField::CHOICE,
+            'date_widget' => 'choice',
+            'time_widget' => 'choice',
             // don't do this test with DateTime, because it leads to wrong results!
-            'type' => DateTimeField::STRING,
+            'input' => 'string',
             'with_seconds' => true,
         ));
 
         $dateTime = new \DateTime('2010-06-02 03:04:05 Pacific/Tahiti');
 
-        $field->submit(array(
+        $form->bind(array(
             'date' => array(
                 'day' => (int)$dateTime->format('d'),
                 'month' => (int)$dateTime->format('m'),
@@ -158,6 +158,6 @@ class DateTimeFieldTest extends DateTimeTestCase
 
         $dateTime->setTimezone(new \DateTimeZone('America/New_York'));
 
-        $this->assertEquals($dateTime->format('Y-m-d H:i:s'), $field->getData());
+        $this->assertEquals($dateTime->format('Y-m-d H:i:s'), $form->getData());
     }
 }
\ No newline at end of file
diff --git a/tests/Symfony/Tests/Component/Form/Type/DateTypeTest.php b/tests/Symfony/Tests/Component/Form/Type/DateTypeTest.php
new file mode 100644
index 0000000000..010a4d0140
--- /dev/null
+++ b/tests/Symfony/Tests/Component/Form/Type/DateTypeTest.php
@@ -0,0 +1,459 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Tests\Component\Form\Type;
+
+require_once __DIR__ . '/LocalizedTestCase.php';
+
+use Symfony\Component\Form\DateField;
+use Symfony\Component\Form\FormView;
+
+class DateTypeTest extends LocalizedTestCase
+{
+    protected function setUp()
+    {
+        parent::setUp();
+
+        \Locale::setDefault('de_AT');
+    }
+
+    public function testSubmitFromInputDateTime()
+    {
+        $form = $this->factory->create('date', 'name', array(
+            'data_timezone' => 'UTC',
+            'user_timezone' => 'UTC',
+            'widget' => 'text',
+            'input' => 'datetime',
+        ));
+
+        $form->bind('2.6.2010');
+
+        $this->assertDateTimeEquals(new \DateTime('2010-06-02 UTC'), $form->getData());
+        $this->assertEquals('02.06.2010', $form->getClientData());
+    }
+
+    public function testSubmitFromInputString()
+    {
+        $form = $this->factory->create('date', 'name', array(
+            'data_timezone' => 'UTC',
+            'user_timezone' => 'UTC',
+            'widget' => 'text',
+            'input' => 'string',
+        ));
+
+        $form->bind('2.6.2010');
+
+        $this->assertEquals('2010-06-02', $form->getData());
+        $this->assertEquals('02.06.2010', $form->getClientData());
+    }
+
+    public function testSubmitFromInputTimestamp()
+    {
+        $form = $this->factory->create('date', 'name', array(
+            'data_timezone' => 'UTC',
+            'user_timezone' => 'UTC',
+            'widget' => 'text',
+            'input' => 'timestamp',
+        ));
+
+        $form->bind('2.6.2010');
+
+        $dateTime = new \DateTime('2010-06-02 UTC');
+
+        $this->assertEquals($dateTime->format('U'), $form->getData());
+        $this->assertEquals('02.06.2010', $form->getClientData());
+    }
+
+    public function testSubmitFromInputRaw()
+    {
+        $form = $this->factory->create('date', 'name', array(
+            'data_timezone' => 'UTC',
+            'user_timezone' => 'UTC',
+            'widget' => 'text',
+            'input' => 'array',
+        ));
+
+        $form->bind('2.6.2010');
+
+        $output = array(
+            'day' => '2',
+            'month' => '6',
+            'year' => '2010',
+        );
+
+        $this->assertEquals($output, $form->getData());
+        $this->assertEquals('02.06.2010', $form->getClientData());
+    }
+
+    public function testSubmitFromChoice()
+    {
+        $form = $this->factory->create('date', 'name', array(
+            'data_timezone' => 'UTC',
+            'user_timezone' => 'UTC',
+            'widget' => 'choice',
+        ));
+
+        $text = array(
+            'day' => '2',
+            'month' => '6',
+            'year' => '2010',
+        );
+
+        $form->bind($text);
+
+        $dateTime = new \DateTime('2010-06-02 UTC');
+
+        $this->assertDateTimeEquals($dateTime, $form->getData());
+        $this->assertEquals($text, $form->getClientData());
+    }
+
+    public function testSubmitFromChoiceEmpty()
+    {
+        $form = $this->factory->create('date', 'name', array(
+            'data_timezone' => 'UTC',
+            'user_timezone' => 'UTC',
+            'widget' => 'choice',
+            'required' => false,
+        ));
+
+        $text = array(
+            'day' => '',
+            'month' => '',
+            'year' => '',
+        );
+
+        $form->bind($text);
+
+        $this->assertSame(null, $form->getData());
+        $this->assertEquals($text, $form->getClientData());
+    }
+
+    public function testSetData_differentTimezones()
+    {
+        $form = $this->factory->create('date', 'name', array(
+            'data_timezone' => 'America/New_York',
+            'user_timezone' => 'Pacific/Tahiti',
+            // don't do this test with DateTime, because it leads to wrong results!
+            'input' => 'string',
+            'widget' => 'text',
+        ));
+
+        $form->setData('2010-06-02');
+
+        $this->assertEquals('01.06.2010', $form->getClientData());
+    }
+
+    public function testIsYearWithinRangeReturnsTrueIfWithin()
+    {
+        $this->markTestSkipped('Needs to be reimplemented using validators');
+
+        $form = $this->factory->create('date', 'name', array(
+            'data_timezone' => 'UTC',
+            'user_timezone' => 'UTC',
+            'widget' => 'text',
+            'years' => array(2010, 2011),
+        ));
+
+        $form->bind('2.6.2010');
+
+        $this->assertTrue($form->isYearWithinRange());
+    }
+
+    public function testIsYearWithinRangeReturnsTrueIfEmpty()
+    {
+        $this->markTestSkipped('Needs to be reimplemented using validators');
+
+        $form = $this->factory->create('date', 'name', array(
+            'data_timezone' => 'UTC',
+            'user_timezone' => 'UTC',
+            'widget' => 'text',
+            'years' => array(2010, 2011),
+        ));
+
+        $form->bind('');
+
+        $this->assertTrue($form->isYearWithinRange());
+    }
+
+    public function testIsYearWithinRangeReturnsTrueIfEmptyChoice()
+    {
+        $this->markTestSkipped('Needs to be reimplemented using validators');
+
+        $form = $this->factory->create('date', 'name', array(
+            'data_timezone' => 'UTC',
+            'user_timezone' => 'UTC',
+            'widget' => 'choice',
+            'years' => array(2010, 2011),
+        ));
+
+        $form->bind(array(
+            'day' => '1',
+            'month' => '2',
+            'year' => '',
+        ));
+
+        $this->assertTrue($form->isYearWithinRange());
+    }
+
+    public function testIsYearWithinRangeReturnsFalseIfNotContained()
+    {
+        $this->markTestSkipped('Needs to be reimplemented using validators');
+
+        $form = $this->factory->create('date', 'name', array(
+            'data_timezone' => 'UTC',
+            'user_timezone' => 'UTC',
+            'widget' => 'text',
+            'years' => array(2010, 2012),
+        ));
+
+        $form->bind('2.6.2011');
+
+        $this->assertFalse($form->isYearWithinRange());
+    }
+
+    public function testIsMonthWithinRangeReturnsTrueIfWithin()
+    {
+        $this->markTestSkipped('Needs to be reimplemented using validators');
+
+        $form = $this->factory->create('date', 'name', array(
+            'data_timezone' => 'UTC',
+            'user_timezone' => 'UTC',
+            'widget' => 'text',
+            'months' => array(6, 7),
+        ));
+
+        $form->bind('2.6.2010');
+
+        $this->assertTrue($form->isMonthWithinRange());
+    }
+
+    public function testIsMonthWithinRangeReturnsTrueIfEmpty()
+    {
+        $this->markTestSkipped('Needs to be reimplemented using validators');
+
+        $form = $this->factory->create('date', 'name', array(
+            'data_timezone' => 'UTC',
+            'user_timezone' => 'UTC',
+            'widget' => 'text',
+            'months' => array(6, 7),
+        ));
+
+        $form->bind('');
+
+        $this->assertTrue($form->isMonthWithinRange());
+    }
+
+    public function testIsMonthWithinRangeReturnsTrueIfEmptyChoice()
+    {
+        $this->markTestSkipped('Needs to be reimplemented using validators');
+
+        $form = $this->factory->create('date', 'name', array(
+            'data_timezone' => 'UTC',
+            'user_timezone' => 'UTC',
+            'widget' => 'choice',
+            'months' => array(6, 7),
+        ));
+
+        $form->bind(array(
+            'day' => '1',
+            'month' => '',
+            'year' => '2011',
+        ));
+
+        $this->assertTrue($form->isMonthWithinRange());
+    }
+
+    public function testIsMonthWithinRangeReturnsFalseIfNotContained()
+    {
+        $this->markTestSkipped('Needs to be reimplemented using validators');
+
+        $form = $this->factory->create('date', 'name', array(
+            'data_timezone' => 'UTC',
+            'user_timezone' => 'UTC',
+            'widget' => 'text',
+            'months' => array(6, 8),
+        ));
+
+        $form->bind('2.7.2010');
+
+        $this->assertFalse($form->isMonthWithinRange());
+    }
+
+    public function testIsDayWithinRangeReturnsTrueIfWithin()
+    {
+        $this->markTestSkipped('Needs to be reimplemented using validators');
+
+        $form = $this->factory->create('date', 'name', array(
+            'data_timezone' => 'UTC',
+            'user_timezone' => 'UTC',
+            'widget' => 'text',
+            'days' => array(6, 7),
+        ));
+
+        $form->bind('6.6.2010');
+
+        $this->assertTrue($form->isDayWithinRange());
+    }
+
+    public function testIsDayWithinRangeReturnsTrueIfEmpty()
+    {
+        $this->markTestSkipped('Needs to be reimplemented using validators');
+
+        $form = $this->factory->create('date', 'name', array(
+            'data_timezone' => 'UTC',
+            'user_timezone' => 'UTC',
+            'widget' => 'text',
+            'days' => array(6, 7),
+        ));
+
+        $form->bind('');
+
+        $this->assertTrue($form->isDayWithinRange());
+    }
+
+    public function testIsDayWithinRangeReturnsTrueIfEmptyChoice()
+    {
+        $this->markTestSkipped('Needs to be reimplemented using validators');
+
+        $form = $this->factory->create('date', 'name', array(
+            'data_timezone' => 'UTC',
+            'user_timezone' => 'UTC',
+            'widget' => 'choice',
+            'days' => array(6, 7),
+        ));
+
+        $form->bind(array(
+            'day' => '',
+            'month' => '1',
+            'year' => '2011',
+        ));
+
+        $this->assertTrue($form->isDayWithinRange());
+    }
+
+    public function testIsDayWithinRangeReturnsFalseIfNotContained()
+    {
+        $this->markTestSkipped('Needs to be reimplemented using validators');
+
+        $this->markTestSkipped('Needs to be reimplemented using validators');
+
+        $form = $this->factory->create('date', 'name', array(
+            'data_timezone' => 'UTC',
+            'user_timezone' => 'UTC',
+            'widget' => 'text',
+            'days' => array(6, 8),
+        ));
+
+        $form->bind('7.6.2010');
+
+        $this->assertFalse($form->isDayWithinRange());
+    }
+
+    public function testIsPartiallyFilledReturnsFalseIfInput()
+    {
+        $this->markTestSkipped('Needs to be reimplemented using validators');
+
+        $form = $this->factory->create('date', 'name', array(
+            'data_timezone' => 'UTC',
+            'user_timezone' => 'UTC',
+            'widget' => 'text',
+        ));
+
+        $form->bind('7.6.2010');
+
+        $this->assertFalse($form->isPartiallyFilled());
+    }
+
+    public function testIsPartiallyFilledReturnsFalseIfChoiceAndCompletelyEmpty()
+    {
+        $this->markTestSkipped('Needs to be reimplemented using validators');
+
+        $form = $this->factory->create('date', 'name', array(
+            'data_timezone' => 'UTC',
+            'user_timezone' => 'UTC',
+            'widget' => 'choice',
+        ));
+
+        $form->bind(array(
+            'day' => '',
+            'month' => '',
+            'year' => '',
+        ));
+
+        $this->assertFalse($form->isPartiallyFilled());
+    }
+
+    public function testIsPartiallyFilledReturnsFalseIfChoiceAndCompletelyFilled()
+    {
+        $this->markTestSkipped('Needs to be reimplemented using validators');
+
+        $form = $this->factory->create('date', 'name', array(
+            'data_timezone' => 'UTC',
+            'user_timezone' => 'UTC',
+            'widget' => 'choice',
+        ));
+
+        $form->bind(array(
+            'day' => '2',
+            'month' => '6',
+            'year' => '2010',
+        ));
+
+        $this->assertFalse($form->isPartiallyFilled());
+    }
+
+    public function testIsPartiallyFilledReturnsTrueIfChoiceAndDayEmpty()
+    {
+        $this->markTestSkipped('Needs to be reimplemented using validators');
+
+        $form = $this->factory->create('date', 'name', array(
+            'data_timezone' => 'UTC',
+            'user_timezone' => 'UTC',
+            'widget' => 'choice',
+        ));
+
+        $form->bind(array(
+            'day' => '',
+            'month' => '6',
+            'year' => '2010',
+        ));
+
+        $this->assertTrue($form->isPartiallyFilled());
+    }
+
+    public function testPassDatePatternToView()
+    {
+        $form = $this->factory->create('date');
+        $view = $form->createView();
+
+        $this->assertSame('{{ day }}.{{ month }}.{{ year }}', $view->get('date_pattern'));
+    }
+
+    public function testDontPassDatePatternIfText()
+    {
+        $form = $this->factory->create('date', 'name', array(
+            'widget' => 'text',
+        ));
+        $view = $form->createView();
+
+        $this->assertNull($view->get('date_pattern'));
+    }
+
+    public function testPassWidgetToView()
+    {
+        $form = $this->factory->create('date', 'name', array(
+            'widget' => 'text',
+        ));
+        $view = $form->createView();
+
+        $this->assertSame('text', $view->get('widget'));
+    }
+}
diff --git a/tests/Symfony/Tests/Component/Form/Type/FieldTypeTest.php b/tests/Symfony/Tests/Component/Form/Type/FieldTypeTest.php
new file mode 100644
index 0000000000..6dad5247ae
--- /dev/null
+++ b/tests/Symfony/Tests/Component/Form/Type/FieldTypeTest.php
@@ -0,0 +1,195 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Tests\Component\Form\Type;
+
+require_once __DIR__ . '/TestCase.php';
+require_once __DIR__ . '/../Fixtures/Author.php';
+require_once __DIR__ . '/../Fixtures/FixedDataTransformer.php';
+require_once __DIR__ . '/../Fixtures/FixedFilterListener.php';
+
+use Symfony\Component\Form\DataTransformer\DataTransformerInterface;
+use Symfony\Component\Form\Util\PropertyPath;
+use Symfony\Component\Form\FormError;
+use Symfony\Component\Form\Form;
+use Symfony\Component\Form\DataTransformer\TransformationFailedException;
+use Symfony\Tests\Component\Form\Fixtures\Author;
+use Symfony\Tests\Component\Form\Fixtures\FixedDataTransformer;
+use Symfony\Tests\Component\Form\Fixtures\FixedFilterListener;
+
+class FieldTypeTest extends TestCase
+{
+    public function testGetPropertyPathDefaultPath()
+    {
+        $form = $this->factory->create('field', 'title');
+
+        $this->assertEquals(new PropertyPath('title'), $form->getAttribute('property_path'));
+    }
+
+    public function testGetPropertyPathPathIsZero()
+    {
+        $form = $this->factory->create('field', null, array('property_path' => '0'));
+
+        $this->assertEquals(new PropertyPath('0'), $form->getAttribute('property_path'));
+    }
+
+    public function testGetPropertyPathPathIsEmpty()
+    {
+        $form = $this->factory->create('field', null, array('property_path' => ''));
+
+        $this->assertNull($form->getAttribute('property_path'));
+    }
+
+    public function testGetPropertyPathPathIsFalse()
+    {
+        $form = $this->factory->create('field', null, array('property_path' => false));
+
+        $this->assertNull($form->getAttribute('property_path'));
+    }
+
+    public function testGetPropertyPathPathIsNull()
+    {
+        $form = $this->factory->create('field', 'title', array('property_path' => null));
+
+        $this->assertEquals(new PropertyPath('title'), $form->getAttribute('property_path'));
+    }
+
+    public function testPassRequiredAsOption()
+    {
+        $form = $this->factory->create('field', null, array('required' => false));
+
+        $this->assertFalse($form->isRequired());
+
+        $form = $this->factory->create('field', null, array('required' => true));
+
+        $this->assertTrue($form->isRequired());
+    }
+
+    public function testPassReadOnlyAsOption()
+    {
+        $form = $this->factory->create('field', null, array('read_only' => true));
+
+        $this->assertTrue($form->isReadOnly());
+    }
+
+    public function testBoundDataIsTrimmedBeforeTransforming()
+    {
+        $form = $this->factory->createBuilder('field')
+            ->appendClientTransformer(new FixedDataTransformer(array(
+                null => '',
+                'reverse[a]' => 'a',
+            )))
+            ->getForm();
+
+        $form->bind(' a ');
+
+        $this->assertEquals('a', $form->getClientData());
+        $this->assertEquals('reverse[a]', $form->getData());
+    }
+
+    public function testBoundDataIsNotTrimmedBeforeTransformingIfNoTrimming()
+    {
+        $form = $this->factory->createBuilder('field', null, array('trim' => false))
+            ->appendClientTransformer(new FixedDataTransformer(array(
+                null => '',
+                'reverse[ a ]' => ' a ',
+            )))
+            ->getForm();
+
+        $form->bind(' a ');
+
+        $this->assertEquals(' a ', $form->getClientData());
+        $this->assertEquals('reverse[ a ]', $form->getData());
+    }
+
+    public function testPassIdAndNameToView()
+    {
+        $form = $this->factory->create('field', 'name');
+        $view = $form->createView();
+
+        $this->assertEquals('name', $view->get('id'));
+        $this->assertEquals('name', $view->get('name'));
+    }
+
+    public function testPassIdAndNameToViewWithParent()
+    {
+        $parent = $this->factory->create('field', 'parent');
+        $parent->add($this->factory->create('field', 'child'));
+        $view = $parent->createView();
+
+        $this->assertEquals('parent_child', $view['child']->get('id'));
+        $this->assertEquals('parent[child]', $view['child']->get('name'));
+    }
+
+    public function testPassIdAndNameToViewWithGrandParent()
+    {
+        $parent = $this->factory->create('field', 'parent');
+        $parent->add($this->factory->create('field', 'child'));
+        $parent['child']->add($this->factory->create('field', 'grand_child'));
+        $view = $parent->createView();
+
+        $this->assertEquals('parent_child_grand_child', $view['child']['grand_child']->get('id'));
+        $this->assertEquals('parent[child][grand_child]', $view['child']['grand_child']->get('name'));
+    }
+
+    public function testPassMaxLengthToView()
+    {
+        $form = $this->factory->create('field', null, array('max_length' => 10));
+        $view = $form->createView();
+
+        $this->assertSame(10, $view->get('max_length'));
+    }
+
+    public function testBindWithEmptyDataCreatesObjectIfClassAvailable()
+    {
+        $form = $this->factory->create('form', 'author', array(
+            'data_class' => 'Symfony\Tests\Component\Form\Fixtures\Author',
+        ));
+        $form->add($this->factory->create('field', 'firstName'));
+
+        $form->setData(null);
+        $form->bind(array('firstName' => 'Bernhard'));
+
+        $author = new Author();
+        $author->firstName = 'Bernhard';
+
+        $this->assertEquals($author, $form->getData());
+    }
+
+    /*
+     * We need something to write the field values into
+     */
+    public function testBindWithEmptyDataStoresArrayIfNoClassAvailable()
+    {
+        $form = $this->factory->create('form', 'author');
+        $form->add($this->factory->create('field', 'firstName'));
+
+        $form->setData(null);
+        $form->bind(array('firstName' => 'Bernhard'));
+
+        $this->assertSame(array('firstName' => 'Bernhard'), $form->getData());
+    }
+
+    public function testBindWithEmptyDataUsesEmptyDataOption()
+    {
+        $author = new Author();
+
+        $form = $this->factory->create('form', 'author', array(
+            'empty_data' => $author,
+        ));
+        $form->add($this->factory->create('field', 'firstName'));
+
+        $form->bind(array('firstName' => 'Bernhard'));
+
+        $this->assertSame($author, $form->getData());
+        $this->assertEquals('Bernhard', $author->firstName);
+    }
+}
diff --git a/tests/Symfony/Tests/Component/Form/Type/FileTypeTest.php b/tests/Symfony/Tests/Component/Form/Type/FileTypeTest.php
new file mode 100644
index 0000000000..087d6f8129
--- /dev/null
+++ b/tests/Symfony/Tests/Component/Form/Type/FileTypeTest.php
@@ -0,0 +1,170 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Tests\Component\Form\Type;
+
+require_once __DIR__.'/TestCase.php';
+
+use Symfony\Component\Form\FileField;
+use Symfony\Component\HttpFoundation\File\File;
+
+class FileTypeTest extends TestCase
+{
+    public static $tmpFiles = array();
+
+    protected static $tmpDir;
+
+    protected $form;
+
+    public static function setUpBeforeClass()
+    {
+        self::$tmpDir = sys_get_temp_dir() . DIRECTORY_SEPARATOR . 'symfony-test';
+    }
+
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->form = $this->factory->create('file', 'file');
+    }
+
+    protected function tearDown()
+    {
+        foreach (self::$tmpFiles as $key => $file) {
+            @unlink($file);
+            unset(self::$tmpFiles[$key]);
+        }
+    }
+
+    public function createTmpFile($path)
+    {
+        self::$tmpFiles[] = $path;
+        file_put_contents($path, 'foobar');
+    }
+
+    public function testSubmitUploadsNewFiles()
+    {
+        $tmpDir = self::$tmpDir;
+        $generatedToken = '';
+
+        $this->storage->expects($this->atLeastOnce())
+            ->method('getTempDir')
+            ->will($this->returnCallback(function ($token) use ($tmpDir, &$generatedToken) {
+                // A 6-digit token is generated by FileUploader and passed
+                // to getTempDir()
+                $generatedToken = $token;
+
+                return $tmpDir;
+            }));
+
+        $file = $this->getMockBuilder('Symfony\Component\HttpFoundation\File\UploadedFile')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $file->expects($this->once())
+             ->method('move')
+             ->with($this->equalTo($tmpDir));
+        $file->expects($this->any())
+             ->method('isValid')
+             ->will($this->returnValue(true));
+        $file->expects($this->any())
+             ->method('getName')
+             ->will($this->returnValue('original_name.jpg'));
+        $file->expects($this->any())
+             ->method('getPath')
+             ->will($this->returnValue($tmpDir.'/original_name.jpg'));
+
+        $this->form->bind(array(
+            'file' => $file,
+            'token' => '',
+            'name' => '',
+        ));
+
+        $this->assertRegExp('/^\d{6}$/', $generatedToken);
+        $this->assertEquals(array(
+            'file' => $file,
+            'token' => $generatedToken,
+            'name' => 'original_name.jpg',
+        ), $this->form->getClientData());
+        $this->assertEquals($tmpDir.'/original_name.jpg', $this->form->getData());
+    }
+
+    public function testSubmitKeepsUploadedFilesOnErrors()
+    {
+        $tmpDir = self::$tmpDir;
+        $tmpPath = $tmpDir . DIRECTORY_SEPARATOR . 'original_name.jpg';
+        $this->createTmpFile($tmpPath);
+
+        $this->storage->expects($this->atLeastOnce())
+            ->method('getTempDir')
+            ->with($this->equalTo('123456'))
+            ->will($this->returnValue($tmpDir));
+
+        $this->form->bind(array(
+            'file' => null,
+            'token' => '123456',
+            'name' => 'original_name.jpg',
+        ));
+
+        $this->assertTrue(file_exists($tmpPath));
+
+        $file = new File($tmpPath);
+
+        $this->assertEquals(array(
+            'file' => $file,
+            'token' => '123456',
+            'name' => 'original_name.jpg',
+        ), $this->form->getClientData());
+        $this->assertEquals(realpath($tmpPath), realpath($this->form->getData()));
+    }
+
+    public function testSubmitEmpty()
+    {
+        $this->storage->expects($this->never())
+            ->method('getTempDir');
+
+        $this->form->bind(array(
+            'file' => '',
+            'token' => '',
+            'name' => '',
+        ));
+
+        $this->assertEquals(array(
+            'file' => '',
+            'token' => '',
+            'name' => '',
+        ), $this->form->getClientData());
+        $this->assertEquals(null, $this->form->getData());
+    }
+
+    public function testSubmitEmptyKeepsExistingFiles()
+    {
+        $tmpPath = self::$tmpDir . DIRECTORY_SEPARATOR . 'original_name.jpg';
+        $this->createTmpFile($tmpPath);
+        $file = new File($tmpPath);
+
+        $this->storage->expects($this->never())
+            ->method('getTempDir');
+
+        $this->form->setData($tmpPath);
+        $this->form->bind(array(
+            'file' => '',
+            'token' => '',
+            'name' => '',
+        ));
+
+        $this->assertEquals(array(
+            'file' => $file,
+            'token' => '',
+            'name' => '',
+        ), $this->form->getClientData());
+        $this->assertEquals(realpath($tmpPath), realpath($this->form->getData()));
+    }
+}
diff --git a/tests/Symfony/Tests/Component/Form/Type/FormTypeTest.php b/tests/Symfony/Tests/Component/Form/Type/FormTypeTest.php
new file mode 100644
index 0000000000..79f579beaa
--- /dev/null
+++ b/tests/Symfony/Tests/Component/Form/Type/FormTypeTest.php
@@ -0,0 +1,256 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Tests\Component\Form\Type;
+
+require_once __DIR__ . '/TestCase.php';
+require_once __DIR__ . '/../Fixtures/Author.php';
+
+use Symfony\Component\Form\Form;
+use Symfony\Component\Form\FormView;
+use Symfony\Component\Form\Field;
+use Symfony\Component\Form\FormError;
+use Symfony\Component\Form\DataError;
+use Symfony\Component\Form\HiddenField;
+use Symfony\Component\Form\Util\PropertyPath;
+use Symfony\Component\Form\DataTransformer\CallbackTransformer;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\File\UploadedFile;
+use Symfony\Component\Validator\ConstraintViolation;
+use Symfony\Component\Validator\ConstraintViolationList;
+use Symfony\Component\Validator\ExecutionView;
+use Symfony\Tests\Component\Form\Fixtures\Author;
+
+class FormTest_AuthorWithoutRefSetter
+{
+    protected $reference;
+
+    protected $referenceCopy;
+
+    public function __construct($reference)
+    {
+        $this->reference = $reference;
+        $this->referenceCopy = $reference;
+    }
+
+    // The returned object should be modified by reference without having
+    // to provide a setReference() method
+    public function getReference()
+    {
+        return $this->reference;
+    }
+
+    // The returned object is a copy, so setReferenceCopy() must be used
+    // to update it
+    public function getReferenceCopy()
+    {
+        return is_object($this->referenceCopy) ? clone $this->referenceCopy : $this->referenceCopy;
+    }
+
+    public function setReferenceCopy($reference)
+    {
+        $this->referenceCopy = $reference;
+    }
+}
+
+class FormTypeTest extends TestCase
+{
+    public function testCsrfProtectionByDefault()
+    {
+        $form =  $this->factory->create('form', 'author', array(
+            'csrf_field_name' => 'csrf',
+        ));
+
+        $this->assertTrue($form->has('csrf'));
+    }
+
+    public function testCsrfProtectionCanBeDisabled()
+    {
+        $form =  $this->factory->create('form', 'author', array(
+            'csrf_protection' => false,
+        ));
+
+        $this->assertEquals(0, count($form));
+    }
+
+    public function testValidationGroupNullByDefault()
+    {
+        $form =  $this->factory->create('form');
+
+        $this->assertNull($form->getAttribute('validation_groups'));
+    }
+
+    public function testValidationGroupsCanBeSetToString()
+    {
+        $form = $this->factory->create('form', 'author', array(
+            'validation_groups' => 'group',
+        ));
+
+        $this->assertEquals(array('group'), $form->getAttribute('validation_groups'));
+    }
+
+    public function testValidationGroupsCanBeSetToArray()
+    {
+        $form = $this->factory->create('form', 'author', array(
+            'validation_groups' => array('group1', 'group2'),
+        ));
+
+        $this->assertEquals(array('group1', 'group2'), $form->getAttribute('validation_groups'));
+    }
+
+    public function testBindValidatesData()
+    {
+        $builder = $this->factory->createBuilder('form', 'author', array(
+            'validation_groups' => 'group',
+        ));
+        $builder->add('firstName', 'field');
+        $form = $builder->getForm();
+
+        $this->validator->expects($this->once())
+            ->method('validate')
+            ->with($this->equalTo($form));
+
+        // specific data is irrelevant
+        $form->bind(array());
+    }
+
+    public function testSubformDoesntCallSetters()
+    {
+        $author = new FormTest_AuthorWithoutRefSetter(new Author());
+
+        $builder = $this->factory->createBuilder('form', 'author');
+        $builder->add('reference', 'form');
+        $builder->get('reference')->add('firstName', 'field');
+        $builder->setData($author);
+        $form = $builder->getForm();
+
+        $form->bind(array(
+        // reference has a getter, but not setter
+            'reference' => array(
+                'firstName' => 'Foo',
+        )
+        ));
+
+        $this->assertEquals('Foo', $author->getReference()->firstName);
+    }
+
+    public function testSubformCallsSettersIfTheObjectChanged()
+    {
+        // no reference
+        $author = new FormTest_AuthorWithoutRefSetter(null);
+        $newReference = new Author();
+
+        $builder = $this->factory->createBuilder('form', 'author');
+        $builder->add('referenceCopy', 'form');
+        $builder->get('referenceCopy')->add('firstName', 'field');
+        $builder->setData($author);
+        $form = $builder->getForm();
+
+        $form['referenceCopy']->setData($newReference); // new author object
+
+        $form->bind(array(
+        // referenceCopy has a getter that returns a copy
+            'referenceCopy' => array(
+                'firstName' => 'Foo',
+        )
+        ));
+
+        $this->assertEquals('Foo', $author->getReferenceCopy()->firstName);
+    }
+
+    public function testSubformCallsSettersIfByReferenceIsFalse()
+    {
+        $author = new FormTest_AuthorWithoutRefSetter(new Author());
+
+        $builder = $this->factory->createBuilder('form', 'author');
+        $builder->add('referenceCopy', 'form', array('by_reference' => false));
+        $builder->get('referenceCopy')->add('firstName', 'field');
+        $builder->setData($author);
+        $form = $builder->getForm();
+
+        $form->bind(array(
+        // referenceCopy has a getter that returns a copy
+            'referenceCopy' => array(
+                'firstName' => 'Foo',
+        )
+        ));
+
+        // firstName can only be updated if setReferenceCopy() was called
+        $this->assertEquals('Foo', $author->getReferenceCopy()->firstName);
+    }
+
+    public function testSubformCallsSettersIfReferenceIsScalar()
+    {
+        $author = new FormTest_AuthorWithoutRefSetter('scalar');
+
+        $builder = $this->factory->createBuilder('form', 'author');
+        $builder->add('referenceCopy', 'form');
+        $builder->get('referenceCopy')->appendClientTransformer(new CallbackTransformer(
+        function () {},
+        function ($value) { // reverseTransform
+            return 'foobar';
+        }
+        ));
+        $builder->setData($author);
+        $form = $builder->getForm();
+
+        $form->bind(array(
+            'referenceCopy' => array(), // doesn't matter actually
+        ));
+
+        // firstName can only be updated if setReferenceCopy() was called
+        $this->assertEquals('foobar', $author->getReferenceCopy());
+    }
+
+    public function testSubformAlwaysInsertsIntoArrays()
+    {
+        $ref1 = new Author();
+        $ref2 = new Author();
+        $author = array('referenceCopy' => $ref1);
+
+        $builder = $this->factory->createBuilder('form', 'author');
+        $builder->setData($author);
+        $builder->add('referenceCopy', 'form');
+        $builder->get('referenceCopy')->appendClientTransformer(new CallbackTransformer(
+        function () {},
+        function ($value) use ($ref2) { // reverseTransform
+            return $ref2;
+        }
+        ));
+        $form = $builder->getForm();
+
+        $form->bind(array(
+            'referenceCopy' => array('a' => 'b'), // doesn't matter actually
+        ));
+
+        // the new reference was inserted into the array
+        $author = $form->getData();
+        $this->assertSame($ref2, $author['referenceCopy']);
+    }
+
+    public function testPassMultipartFalseToView()
+    {
+        $form = $this->factory->create('form');
+        $view = $form->createView();
+
+        $this->assertFalse($view->get('multipart'));
+    }
+
+    public function testPassMultipartTrueIfAnyChildIsMultipartToView()
+    {
+        $form = $this->factory->create('form');
+        $form->add($this->factory->create('text'));
+        $form->add($this->factory->create('file'));
+        $view = $form->createView();
+
+        $this->assertTrue($view->get('multipart'));
+    }
+}
diff --git a/tests/Symfony/Tests/Component/Form/Type/Guesser/GuessTest.php b/tests/Symfony/Tests/Component/Form/Type/Guesser/GuessTest.php
new file mode 100644
index 0000000000..584d06b88c
--- /dev/null
+++ b/tests/Symfony/Tests/Component/Form/Type/Guesser/GuessTest.php
@@ -0,0 +1,36 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Tests\Component\Form\Type\Guesser;
+
+use Symfony\Component\Form\Type\Guesser\Guess;
+
+class TestGuess extends Guess {}
+
+class GuessTest extends \PHPUnit_Framework_TestCase
+{
+    public function testGetBestGuessReturnsGuessWithHighestConfidence()
+    {
+        $guess1 = new TestGuess(Guess::MEDIUM_CONFIDENCE);
+        $guess2 = new TestGuess(Guess::LOW_CONFIDENCE);
+        $guess3 = new TestGuess(Guess::HIGH_CONFIDENCE);
+
+        $this->assertSame($guess3, Guess::getBestGuess(array($guess1, $guess2, $guess3)));
+    }
+
+    /**
+     * @expectedException \UnexpectedValueException
+     */
+    public function testGuessExpectsValidConfidence()
+    {
+        new TestGuess(5);
+    }
+}
\ No newline at end of file
diff --git a/tests/Symfony/Tests/Component/Form/IntegerFieldTest.php b/tests/Symfony/Tests/Component/Form/Type/IntegerTypeTest.php
similarity index 58%
rename from tests/Symfony/Tests/Component/Form/IntegerFieldTest.php
rename to tests/Symfony/Tests/Component/Form/Type/IntegerTypeTest.php
index 94ea8cb922..b1700c1c93 100644
--- a/tests/Symfony/Tests/Component/Form/IntegerFieldTest.php
+++ b/tests/Symfony/Tests/Component/Form/Type/IntegerTypeTest.php
@@ -9,21 +9,21 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Tests\Component\Form;
+namespace Symfony\Tests\Component\Form\Type;
 
 require_once __DIR__ . '/LocalizedTestCase.php';
 
 use Symfony\Component\Form\IntegerField;
 
-class IntegerFieldTest extends LocalizedTestCase
+class IntegerTypeTest extends LocalizedTestCase
 {
     public function testSubmitCastsToInteger()
     {
-        $field = new IntegerField('name');
+        $form = $this->factory->create('integer', 'name');
 
-        $field->submit('1.678');
+        $form->bind('1.678');
 
-        $this->assertSame(1, $field->getData());
-        $this->assertSame('1', $field->getDisplayedData());
+        $this->assertSame(1, $form->getData());
+        $this->assertSame('1', $form->getClientData());
     }
 }
\ No newline at end of file
diff --git a/tests/Symfony/Tests/Component/Form/LanguageFieldTest.php b/tests/Symfony/Tests/Component/Form/Type/LanguageTypeTest.php
similarity index 71%
rename from tests/Symfony/Tests/Component/Form/LanguageFieldTest.php
rename to tests/Symfony/Tests/Component/Form/Type/LanguageTypeTest.php
index 82d4b5da07..dc15385c8e 100644
--- a/tests/Symfony/Tests/Component/Form/LanguageFieldTest.php
+++ b/tests/Symfony/Tests/Component/Form/Type/LanguageTypeTest.php
@@ -9,19 +9,22 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Tests\Component\Form;
+namespace Symfony\Tests\Component\Form\Type;
+
+require_once __DIR__.'/TestCase.php';
 
 use Symfony\Component\Form\LanguageField;
-use Symfony\Component\Form\FormContext;
+use Symfony\Component\Form\FormView;
 
-class LanguageFieldTest extends \PHPUnit_Framework_TestCase
+class LanguageTypeTest extends TestCase
 {
     public function testCountriesAreSelectable()
     {
         \Locale::setDefault('de_AT');
 
-        $field = new LanguageField('language');
-        $choices = $field->getOtherChoices();
+        $form = $this->factory->create('language');
+        $view = $form->createView();
+        $choices = $view->get('choices');
 
         $this->assertArrayHasKey('en', $choices);
         $this->assertEquals('Englisch', $choices['en']);
@@ -37,9 +40,10 @@ class LanguageFieldTest extends \PHPUnit_Framework_TestCase
 
     public function testMultipleLanguagesIsNotIncluded()
     {
-        $field = new LanguageField('language');
-        $choices = $field->getOtherChoices();
+        $form = $this->factory->create('language', 'language');
+        $view = $form->createView();
+        $choices = $view->get('choices');
 
         $this->assertArrayNotHasKey('mul', $choices);
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Symfony/Tests/Component/Form/Type/Loader/ArrayTypeLoaderTest.php b/tests/Symfony/Tests/Component/Form/Type/Loader/ArrayTypeLoaderTest.php
new file mode 100644
index 0000000000..b66cf992e5
--- /dev/null
+++ b/tests/Symfony/Tests/Component/Form/Type/Loader/ArrayTypeLoaderTest.php
@@ -0,0 +1,43 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Tests\Component\Form\Type\Loader;
+
+use Symfony\Component\Form\FormBuilder;
+use Symfony\Component\Form\Type\FormTypeInterface;
+use Symfony\Component\Form\Type\Loader\ArrayTypeLoader;
+
+class ArrayTypeLoaderTest extends \PHPUnit_Framework_TestCase
+{
+    public function testHasType()
+    {
+        $type = $this->getMock('Symfony\Component\Form\Type\FormTypeInterface');
+        $type->expects($this->once())
+             ->method('getName')
+             ->will($this->returnValue('foo'));
+
+        $loader = new ArrayTypeLoader(array($type));
+        $this->assertTrue($loader->hasType('foo'));
+        $this->assertFalse($loader->hasType('bar'));
+    }
+
+    public function testGetType()
+    {
+        $type = $this->getMock('Symfony\Component\Form\Type\FormTypeInterface');
+        $type->expects($this->once())
+             ->method('getName')
+             ->will($this->returnValue('foo'));
+
+        $loader = new ArrayTypeLoader(array($type));
+        $this->assertSame($type, $loader->getType('foo'));
+        $this->assertSame($loader->getType('foo'), $loader->getType('foo'));
+    }
+}
\ No newline at end of file
diff --git a/tests/Symfony/Tests/Component/Form/LocaleFieldTest.php b/tests/Symfony/Tests/Component/Form/Type/LocaleTypeTest.php
similarity index 73%
rename from tests/Symfony/Tests/Component/Form/LocaleFieldTest.php
rename to tests/Symfony/Tests/Component/Form/Type/LocaleTypeTest.php
index 7fbd51cac1..d0428b2409 100644
--- a/tests/Symfony/Tests/Component/Form/LocaleFieldTest.php
+++ b/tests/Symfony/Tests/Component/Form/Type/LocaleTypeTest.php
@@ -9,19 +9,22 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Tests\Component\Form;
+namespace Symfony\Tests\Component\Form\Type;
+
+require_once __DIR__.'/TestCase.php';
 
 use Symfony\Component\Form\LocaleField;
-use Symfony\Component\Form\FormContext;
+use Symfony\Component\Form\FormView;
 
-class LocaleFieldTest extends \PHPUnit_Framework_TestCase
+class LocaleTypeTest extends TestCase
 {
     public function testLocalesAreSelectable()
     {
         \Locale::setDefault('de_AT');
 
-        $field = new LocaleField('language');
-        $choices = $field->getOtherChoices();
+        $form = $this->factory->create('locale');
+        $view = $form->createView();
+        $choices = $view->get('choices');
 
         $this->assertArrayHasKey('en', $choices);
         $this->assertEquals('Englisch', $choices['en']);
@@ -30,4 +33,4 @@ class LocaleFieldTest extends \PHPUnit_Framework_TestCase
         $this->assertArrayHasKey('zh_Hans_MO', $choices);
         $this->assertEquals('Chinesisch (vereinfacht, Sonderverwaltungszone Macao)', $choices['zh_Hans_MO']);
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Symfony/Tests/Component/Form/Type/LocalizedTestCase.php b/tests/Symfony/Tests/Component/Form/Type/LocalizedTestCase.php
new file mode 100644
index 0000000000..42a73131c1
--- /dev/null
+++ b/tests/Symfony/Tests/Component/Form/Type/LocalizedTestCase.php
@@ -0,0 +1,26 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Tests\Component\Form\Type;
+
+require_once __DIR__ . '/TestCase.php';
+
+abstract class LocalizedTestCase extends TestCase
+{
+    protected function setUp()
+    {
+        parent::setUp();
+
+        if (!extension_loaded('intl')) {
+            $this->markTestSkipped('The "intl" extension is not available');
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/Symfony/Tests/Component/Form/Type/MoneyTypeTest.php b/tests/Symfony/Tests/Component/Form/Type/MoneyTypeTest.php
new file mode 100644
index 0000000000..68f9ee9e74
--- /dev/null
+++ b/tests/Symfony/Tests/Component/Form/Type/MoneyTypeTest.php
@@ -0,0 +1,27 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Tests\Component\Form\Type;
+
+require_once __DIR__ . '/LocalizedTestCase.php';
+
+class MoneyTypeTest extends LocalizedTestCase
+{
+    public function testPassMoneyPatternToView()
+    {
+        \Locale::setDefault('de_DE');
+
+        $form = $this->factory->create('money');
+        $view = $form->createView();
+
+        $this->assertSame('{{ widget }} €', $view->get('money_pattern'));
+    }
+}
diff --git a/tests/Symfony/Tests/Component/Form/Type/PasswordTypeTest.php b/tests/Symfony/Tests/Component/Form/Type/PasswordTypeTest.php
new file mode 100644
index 0000000000..ed29c37c27
--- /dev/null
+++ b/tests/Symfony/Tests/Component/Form/Type/PasswordTypeTest.php
@@ -0,0 +1,46 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Tests\Component\Form\Type;
+
+require_once __DIR__.'/TestCase.php';
+
+use Symfony\Component\Form\PasswordField;
+
+class PasswordTypeTest extends TestCase
+{
+    public function testEmptyIfNotBound()
+    {
+        $form = $this->factory->create('password');
+        $form->setData('pAs5w0rd');
+        $view = $form->createView();
+
+        $this->assertSame('', $view->get('value'));
+    }
+
+    public function testEmptyIfBound()
+    {
+        $form = $this->factory->create('password');
+        $form->bind('pAs5w0rd');
+        $view = $form->createView();
+
+        $this->assertSame('', $view->get('value'));
+    }
+
+    public function testNotEmptyIfBoundAndNotAlwaysEmpty()
+    {
+        $form = $this->factory->create('password', null, array('always_empty' => false));
+        $form->bind('pAs5w0rd');
+        $view = $form->createView();
+
+        $this->assertSame('pAs5w0rd', $view->get('value'));
+    }
+}
diff --git a/tests/Symfony/Tests/Component/Form/Type/RadioTypeTest.php b/tests/Symfony/Tests/Component/Form/Type/RadioTypeTest.php
new file mode 100644
index 0000000000..ecfe15c04e
--- /dev/null
+++ b/tests/Symfony/Tests/Component/Form/Type/RadioTypeTest.php
@@ -0,0 +1,52 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Tests\Component\Form\Type;
+
+require_once __DIR__.'/TestCase.php';
+
+class RadioTypeTest extends TestCase
+{
+    public function testPassValueToView()
+    {
+        $form = $this->factory->create('radio', 'name', array('value' => 'foobar'));
+        $view = $form->createView();
+
+        $this->assertEquals('foobar', $view->get('value'));
+    }
+
+    public function testPassParentNameToView()
+    {
+        $parent = $this->factory->create('field', 'parent');
+        $parent->add($this->factory->create('radio', 'child'));
+        $view = $parent->createView();
+
+        $this->assertEquals('parent', $view['child']->get('name'));
+    }
+
+    public function testCheckedIfDataTrue()
+    {
+        $form = $this->factory->create('radio');
+        $form->setData(true);
+        $view = $form->createView();
+
+        $this->assertTrue($view->get('checked'));
+    }
+
+    public function testNotCheckedIfDataFalse()
+    {
+        $form = $this->factory->create('radio');
+        $form->setData(false);
+        $view = $form->createView();
+
+        $this->assertFalse($view->get('checked'));
+    }
+}
diff --git a/tests/Symfony/Tests/Component/Form/Type/RepeatedTypeTest.php b/tests/Symfony/Tests/Component/Form/Type/RepeatedTypeTest.php
new file mode 100644
index 0000000000..88479f5359
--- /dev/null
+++ b/tests/Symfony/Tests/Component/Form/Type/RepeatedTypeTest.php
@@ -0,0 +1,66 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Tests\Component\Form\Type;
+
+require_once __DIR__.'/TestCase.php';
+
+use Symfony\Component\Form\RepeatedField;
+use Symfony\Component\Form\Field;
+
+class RepeatedTypeTest extends TestCase
+{
+    protected $form;
+
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->form = $this->factory->create('repeated', 'name', array(
+            'type' => 'field',
+        ));
+        $this->form->setData(null);
+    }
+
+    public function testSetData()
+    {
+        $this->form->setData('foobar');
+
+        $this->assertEquals('foobar', $this->form['first']->getData());
+        $this->assertEquals('foobar', $this->form['second']->getData());
+    }
+
+    public function testSubmitUnequal()
+    {
+        $input = array('first' => 'foo', 'second' => 'bar');
+
+        $this->form->bind($input);
+
+        $this->assertEquals('foo', $this->form['first']->getClientData());
+        $this->assertEquals('bar', $this->form['second']->getClientData());
+        $this->assertFalse($this->form->isSynchronized());
+        $this->assertEquals($input, $this->form->getClientData());
+        $this->assertEquals(null, $this->form->getData());
+    }
+
+    public function testSubmitEqual()
+    {
+        $input = array('first' => 'foo', 'second' => 'foo');
+
+        $this->form->bind($input);
+
+        $this->assertEquals('foo', $this->form['first']->getClientData());
+        $this->assertEquals('foo', $this->form['second']->getClientData());
+        $this->assertTrue($this->form->isSynchronized());
+        $this->assertEquals($input, $this->form->getClientData());
+        $this->assertEquals('foo', $this->form->getData());
+    }
+}
\ No newline at end of file
diff --git a/tests/Symfony/Tests/Component/Form/Type/TestCase.php b/tests/Symfony/Tests/Component/Form/Type/TestCase.php
new file mode 100644
index 0000000000..f7c725573c
--- /dev/null
+++ b/tests/Symfony/Tests/Component/Form/Type/TestCase.php
@@ -0,0 +1,67 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Tests\Component\Form\Type;
+
+use Symfony\Component\Form\FormBuilder;
+use Symfony\Component\Form\FormFactory;
+use Symfony\Component\Form\Type\Loader\DefaultTypeLoader;
+use Symfony\Component\Form\Type\Loader\TypeLoaderChain;
+use Symfony\Component\EventDispatcher\EventDispatcher;
+
+abstract class TestCase extends \PHPUnit_Framework_TestCase
+{
+    protected $csrfProvider;
+
+    protected $validator;
+
+    protected $storage;
+
+    protected $factory;
+
+    protected $builder;
+
+    protected $dispatcher;
+
+    protected $typeLoader;
+
+    protected function setUp()
+    {
+        $this->csrfProvider = $this->getMock('Symfony\Component\Form\CsrfProvider\CsrfProviderInterface');
+        $this->validator = $this->getMock('Symfony\Component\Validator\ValidatorInterface');
+        $this->dispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
+
+        $this->storage = $this->getMockBuilder('Symfony\Component\HttpFoundation\File\TemporaryStorage')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->typeLoader = new TypeLoaderChain();
+
+        // TODO should be passed to chain constructor instead
+        foreach ($this->getTypeLoaders() as $loader) {
+            $this->typeLoader->addLoader($loader);
+        }
+
+        $this->factory = new FormFactory($this->typeLoader);
+
+        $this->builder = new FormBuilder('name', $this->factory, $this->dispatcher);
+    }
+
+    protected function getTypeLoaders()
+    {
+        return array(new DefaultTypeLoader($this->validator, $this->csrfProvider, $this->storage));
+    }
+
+    public static function assertDateTimeEquals(\DateTime $expected, \DateTime $actual)
+    {
+        self::assertEquals($expected->format('c'), $actual->format('c'));
+    }
+}
diff --git a/tests/Symfony/Tests/Component/Form/Type/TimeTypeTest.php b/tests/Symfony/Tests/Component/Form/Type/TimeTypeTest.php
new file mode 100644
index 0000000000..c5939dafbb
--- /dev/null
+++ b/tests/Symfony/Tests/Component/Form/Type/TimeTypeTest.php
@@ -0,0 +1,399 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Tests\Component\Form\Type;
+
+require_once __DIR__ . '/LocalizedTestCase.php';
+
+use Symfony\Component\Form\TimeField;
+
+class TimeTypeTest extends LocalizedTestCase
+{
+    public function testSubmit_dateTime()
+    {
+        $form = $this->factory->create('time', 'name', array(
+            'data_timezone' => 'UTC',
+            'user_timezone' => 'UTC',
+            'input' => 'datetime',
+        ));
+
+        $input = array(
+            'hour' => '3',
+            'minute' => '4',
+        );
+
+        $form->bind($input);
+
+        $dateTime = new \DateTime('1970-01-01 03:04:00 UTC');
+
+        $this->assertEquals($dateTime, $form->getData());
+        $this->assertEquals($input, $form->getClientData());
+    }
+
+    public function testSubmit_string()
+    {
+        $form = $this->factory->create('time', 'name', array(
+            'data_timezone' => 'UTC',
+            'user_timezone' => 'UTC',
+            'input' => 'string',
+        ));
+
+        $input = array(
+            'hour' => '3',
+            'minute' => '4',
+        );
+
+        $form->bind($input);
+
+        $this->assertEquals('03:04:00', $form->getData());
+        $this->assertEquals($input, $form->getClientData());
+    }
+
+    public function testSubmit_timestamp()
+    {
+        $form = $this->factory->create('time', 'name', array(
+            'data_timezone' => 'UTC',
+            'user_timezone' => 'UTC',
+            'input' => 'timestamp',
+        ));
+
+        $input = array(
+            'hour' => '3',
+            'minute' => '4',
+        );
+
+        $form->bind($input);
+
+        $dateTime = new \DateTime('1970-01-01 03:04:00 UTC');
+
+        $this->assertEquals($dateTime->format('U'), $form->getData());
+        $this->assertEquals($input, $form->getClientData());
+    }
+
+    public function testSubmit_array()
+    {
+        $form = $this->factory->create('time', 'name', array(
+            'data_timezone' => 'UTC',
+            'user_timezone' => 'UTC',
+            'input' => 'array',
+        ));
+
+        $input = array(
+            'hour' => '3',
+            'minute' => '4',
+        );
+
+        $data = array(
+            'hour' => '3',
+            'minute' => '4',
+        );
+
+        $form->bind($input);
+
+        $this->assertEquals($data, $form->getData());
+        $this->assertEquals($input, $form->getClientData());
+    }
+
+    public function testSetData_withSeconds()
+    {
+        $form = $this->factory->create('time', 'name', array(
+            'data_timezone' => 'UTC',
+            'user_timezone' => 'UTC',
+            'input' => 'datetime',
+            'with_seconds' => true,
+        ));
+
+        $form->setData(new \DateTime('03:04:05 UTC'));
+
+        $this->assertEquals(array('hour' => 3, 'minute' => 4, 'second' => 5), $form->getClientData());
+    }
+
+    public function testSetData_differentTimezones()
+    {
+        $form = $this->factory->create('time', 'name', array(
+            'data_timezone' => 'America/New_York',
+            'user_timezone' => 'Pacific/Tahiti',
+            // don't do this test with DateTime, because it leads to wrong results!
+            'input' => 'string',
+            'with_seconds' => true,
+        ));
+
+        $dateTime = new \DateTime('03:04:05 America/New_York');
+
+        $form->setData($dateTime->format('H:i:s'));
+
+        $dateTime = clone $dateTime;
+        $dateTime->setTimezone(new \DateTimeZone('Pacific/Tahiti'));
+
+        $displayedData = array(
+            'hour' => (int)$dateTime->format('H'),
+            'minute' => (int)$dateTime->format('i'),
+            'second' => (int)$dateTime->format('s')
+        );
+
+        $this->assertEquals($displayedData, $form->getClientData());
+    }
+
+    public function testIsHourWithinRange_returnsTrueIfWithin()
+    {
+        $this->markTestSkipped('Needs to be reimplemented using validators');
+
+        $form = $this->factory->create('time', 'name', array(
+            'hours' => array(6, 7),
+        ));
+
+        $form->bind(array('hour' => '06', 'minute' => '12'));
+
+        $this->assertTrue($form->isHourWithinRange());
+    }
+
+    public function testIsHourWithinRange_returnsTrueIfEmpty()
+    {
+        $this->markTestSkipped('Needs to be reimplemented using validators');
+
+        $form = $this->factory->create('time', 'name', array(
+            'hours' => array(6, 7),
+        ));
+
+        $form->bind(array('hour' => '', 'minute' => '06'));
+
+        $this->assertTrue($form->isHourWithinRange());
+    }
+
+    public function testIsHourWithinRange_returnsFalseIfNotContained()
+    {
+        $this->markTestSkipped('Needs to be reimplemented using validators');
+
+        $form = $this->factory->create('time', 'name', array(
+            'hours' => array(6, 7),
+        ));
+
+        $form->bind(array('hour' => '08', 'minute' => '12'));
+
+        $this->assertFalse($form->isHourWithinRange());
+    }
+
+    public function testIsMinuteWithinRange_returnsTrueIfWithin()
+    {
+        $this->markTestSkipped('Needs to be reimplemented using validators');
+
+        $form = $this->factory->create('time', 'name', array(
+            'minutes' => array(6, 7),
+        ));
+
+        $form->bind(array('hour' => '06', 'minute' => '06'));
+
+        $this->assertTrue($form->isMinuteWithinRange());
+    }
+
+    public function testIsMinuteWithinRange_returnsTrueIfEmpty()
+    {
+        $this->markTestSkipped('Needs to be reimplemented using validators');
+
+        $form = $this->factory->create('time', 'name', array(
+            'minutes' => array(6, 7),
+        ));
+
+        $form->bind(array('hour' => '06', 'minute' => ''));
+
+        $this->assertTrue($form->isMinuteWithinRange());
+    }
+
+    public function testIsMinuteWithinRange_returnsFalseIfNotContained()
+    {
+        $this->markTestSkipped('Needs to be reimplemented using validators');
+
+        $form = $this->factory->create('time', 'name', array(
+            'minutes' => array(6, 7),
+        ));
+
+        $form->bind(array('hour' => '06', 'minute' => '08'));
+
+        $this->assertFalse($form->isMinuteWithinRange());
+    }
+
+    public function testIsSecondWithinRange_returnsTrueIfWithin()
+    {
+        $this->markTestSkipped('Needs to be reimplemented using validators');
+
+        $form = $this->factory->create('time', 'name', array(
+            'seconds' => array(6, 7),
+            'with_seconds' => true,
+        ));
+
+        $form->bind(array('hour' => '04', 'minute' => '05', 'second' => '06'));
+
+        $this->assertTrue($form->isSecondWithinRange());
+    }
+
+    public function testIsSecondWithinRange_returnsTrueIfEmpty()
+    {
+        $this->markTestSkipped('Needs to be reimplemented using validators');
+
+        $form = $this->factory->create('time', 'name', array(
+            'seconds' => array(6, 7),
+            'with_seconds' => true,
+        ));
+
+        $form->bind(array('hour' => '06', 'minute' => '06', 'second' => ''));
+
+        $this->assertTrue($form->isSecondWithinRange());
+    }
+
+    public function testIsSecondWithinRange_returnsTrueIfNotWithSeconds()
+    {
+        $this->markTestSkipped('Needs to be reimplemented using validators');
+
+        $form = $this->factory->create('time', 'name', array(
+            'seconds' => array(6, 7),
+        ));
+
+        $form->bind(array('hour' => '06', 'minute' => '06'));
+
+        $this->assertTrue($form->isSecondWithinRange());
+    }
+
+    public function testIsSecondWithinRange_returnsFalseIfNotContained()
+    {
+        $this->markTestSkipped('Needs to be reimplemented using validators');
+
+        $form = $this->factory->create('time', 'name', array(
+            'seconds' => array(6, 7),
+            'with_seconds' => true,
+        ));
+
+        $form->bind(array('hour' => '04', 'minute' => '05', 'second' => '08'));
+
+        $this->assertFalse($form->isSecondWithinRange());
+    }
+
+    public function testIsPartiallyFilled_returnsFalseIfCompletelyEmpty()
+    {
+        $this->markTestSkipped('Needs to be reimplemented using validators');
+
+        $form = $this->factory->create('time', 'name', array(
+            'widget' => 'choice',
+        ));
+
+        $form->bind(array(
+            'hour' => '',
+            'minute' => '',
+        ));
+
+        $this->assertFalse($form->isPartiallyFilled());
+    }
+
+    public function testIsPartiallyFilled_returnsFalseIfCompletelyEmpty_withSeconds()
+    {
+        $this->markTestSkipped('Needs to be reimplemented using validators');
+
+        $form = $this->factory->create('time', 'name', array(
+            'widget' => 'choice',
+            'with_seconds' => true,
+        ));
+
+        $form->bind(array(
+            'hour' => '',
+            'minute' => '',
+            'second' => '',
+        ));
+
+        $this->assertFalse($form->isPartiallyFilled());
+    }
+
+    public function testIsPartiallyFilled_returnsFalseIfCompletelyFilled()
+    {
+        $this->markTestSkipped('Needs to be reimplemented using validators');
+
+        $form = $this->factory->create('time', 'name', array(
+            'widget' => 'choice',
+        ));
+
+        $form->bind(array(
+            'hour' => '0',
+            'minute' => '0',
+        ));
+
+        $this->assertFalse($form->isPartiallyFilled());
+    }
+
+    public function testIsPartiallyFilled_returnsFalseIfCompletelyFilled_withSeconds()
+    {
+        $this->markTestSkipped('Needs to be reimplemented using validators');
+
+        $form = $this->factory->create('time', 'name', array(
+            'widget' => 'choice',
+            'with_seconds' => true,
+        ));
+
+        $form->bind(array(
+            'hour' => '0',
+            'minute' => '0',
+            'second' => '0',
+        ));
+
+        $this->assertFalse($form->isPartiallyFilled());
+    }
+
+    public function testIsPartiallyFilled_returnsTrueIfChoiceAndHourEmpty()
+    {
+        $this->markTestSkipped('Needs to be reimplemented using validators');
+
+        $form = $this->factory->create('time', 'name', array(
+            'widget' => 'choice',
+            'with_seconds' => true,
+        ));
+
+        $form->bind(array(
+            'hour' => '',
+            'minute' => '0',
+            'second' => '0',
+        ));
+
+        $this->assertTrue($form->isPartiallyFilled());
+    }
+
+    public function testIsPartiallyFilled_returnsTrueIfChoiceAndMinuteEmpty()
+    {
+        $this->markTestSkipped('Needs to be reimplemented using validators');
+
+        $form = $this->factory->create('time', 'name', array(
+            'widget' => 'choice',
+            'with_seconds' => true,
+        ));
+
+        $form->bind(array(
+            'hour' => '0',
+            'minute' => '',
+            'second' => '0',
+        ));
+
+        $this->assertTrue($form->isPartiallyFilled());
+    }
+
+    public function testIsPartiallyFilled_returnsTrueIfChoiceAndSecondsEmpty()
+    {
+        $this->markTestSkipped('Needs to be reimplemented using validators');
+
+        $form = $this->factory->create('time', 'name', array(
+            'widget' => 'choice',
+            'with_seconds' => true,
+        ));
+
+        $form->bind(array(
+            'hour' => '0',
+            'minute' => '0',
+            'second' => '',
+        ));
+
+        $this->assertTrue($form->isPartiallyFilled());
+    }
+}
\ No newline at end of file
diff --git a/tests/Symfony/Tests/Component/Form/TimezoneFieldTest.php b/tests/Symfony/Tests/Component/Form/Type/TimezoneTypeTest.php
similarity index 74%
rename from tests/Symfony/Tests/Component/Form/TimezoneFieldTest.php
rename to tests/Symfony/Tests/Component/Form/Type/TimezoneTypeTest.php
index 194dc1d61f..50c76220da 100644
--- a/tests/Symfony/Tests/Component/Form/TimezoneFieldTest.php
+++ b/tests/Symfony/Tests/Component/Form/Type/TimezoneTypeTest.php
@@ -9,16 +9,19 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Tests\Component\Form;
+namespace Symfony\Tests\Component\Form\Type;
+
+require_once __DIR__.'/TestCase.php';
 
 use Symfony\Component\Form\TimezoneField;
 
-class TimezoneFieldTest extends \PHPUnit_Framework_TestCase
+class TimezoneTypeTest extends TestCase
 {
     public function testTimezonesAreSelectable()
     {
-        $field = new TimeZoneField('timezone');
-        $choices = $field->getOtherChoices();
+        $form = $this->factory->create('timezone');
+        $view = $form->createView();
+        $choices = $view->get('choices');
 
         $this->assertArrayHasKey('Africa', $choices);
         $this->assertArrayHasKey('Africa/Kinshasa', $choices['Africa']);
@@ -28,4 +31,4 @@ class TimezoneFieldTest extends \PHPUnit_Framework_TestCase
         $this->assertArrayHasKey('America/New_York', $choices['America']);
         $this->assertEquals('New York', $choices['America']['America/New_York']);
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Symfony/Tests/Component/Form/Type/UrlTypeTest.php b/tests/Symfony/Tests/Component/Form/Type/UrlTypeTest.php
new file mode 100644
index 0000000000..a11e2fa134
--- /dev/null
+++ b/tests/Symfony/Tests/Component/Form/Type/UrlTypeTest.php
@@ -0,0 +1,65 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Tests\Component\Form\Type;
+
+require_once __DIR__ . '/LocalizedTestCase.php';
+
+use Symfony\Component\Form\UrlField;
+
+class UrlTypeTest extends LocalizedTestCase
+{
+    public function testSubmitAddsDefaultProtocolIfNoneIsIncluded()
+    {
+        $form = $this->factory->create('url', 'name');
+
+        $form->bind('www.domain.com');
+
+        $this->assertSame('http://www.domain.com', $form->getData());
+        $this->assertSame('http://www.domain.com', $form->getClientData());
+    }
+
+    public function testSubmitAddsNoDefaultProtocolIfAlreadyIncluded()
+    {
+        $form = $this->factory->create('url', 'name', array(
+            'default_protocol' => 'http',
+        ));
+
+        $form->bind('ftp://www.domain.com');
+
+        $this->assertSame('ftp://www.domain.com', $form->getData());
+        $this->assertSame('ftp://www.domain.com', $form->getClientData());
+    }
+
+    public function testSubmitAddsNoDefaultProtocolIfEmpty()
+    {
+        $form = $this->factory->create('url', 'name', array(
+            'default_protocol' => 'http',
+        ));
+
+        $form->bind('');
+
+        $this->assertSame(null, $form->getData());
+        $this->assertSame('', $form->getClientData());
+    }
+
+    public function testSubmitAddsNoDefaultProtocolIfSetToNull()
+    {
+        $form = $this->factory->create('url', 'name', array(
+            'default_protocol' => null,
+        ));
+
+        $form->bind('www.domain.com');
+
+        $this->assertSame('www.domain.com', $form->getData());
+        $this->assertSame('www.domain.com', $form->getClientData());
+    }
+}
\ No newline at end of file
diff --git a/tests/Symfony/Tests/Component/Form/UrlFieldTest.php b/tests/Symfony/Tests/Component/Form/UrlFieldTest.php
deleted file mode 100644
index 25c3202f00..0000000000
--- a/tests/Symfony/Tests/Component/Form/UrlFieldTest.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Tests\Component\Form;
-
-require_once __DIR__ . '/LocalizedTestCase.php';
-
-use Symfony\Component\Form\UrlField;
-
-class UrlFieldTest extends LocalizedTestCase
-{
-    public function testSubmitAddsDefaultProtocolIfNoneIsIncluded()
-    {
-        $field = new UrlField('name');
-
-        $field->submit('www.domain.com');
-
-        $this->assertSame('http://www.domain.com', $field->getData());
-        $this->assertSame('http://www.domain.com', $field->getDisplayedData());
-    }
-
-    public function testSubmitAddsNoDefaultProtocolIfAlreadyIncluded()
-    {
-        $field = new UrlField('name', array(
-            'default_protocol' => 'http',
-        ));
-
-        $field->submit('ftp://www.domain.com');
-
-        $this->assertSame('ftp://www.domain.com', $field->getData());
-        $this->assertSame('ftp://www.domain.com', $field->getDisplayedData());
-    }
-
-    public function testSubmitAddsNoDefaultProtocolIfEmpty()
-    {
-        $field = new UrlField('name', array(
-            'default_protocol' => 'http',
-        ));
-
-        $field->submit('');
-
-        $this->assertSame(null, $field->getData());
-        $this->assertSame('', $field->getDisplayedData());
-    }
-
-    public function testSubmitAddsNoDefaultProtocolIfSetToNull()
-    {
-        $field = new UrlField('name', array(
-            'default_protocol' => null,
-        ));
-
-        $field->submit('www.domain.com');
-
-        $this->assertSame('www.domain.com', $field->getData());
-        $this->assertSame('www.domain.com', $field->getDisplayedData());
-    }
-}
\ No newline at end of file
diff --git a/tests/Symfony/Tests/Component/Form/Util/FormUtilTest.php b/tests/Symfony/Tests/Component/Form/Util/FormUtilTest.php
new file mode 100644
index 0000000000..ec7b82b054
--- /dev/null
+++ b/tests/Symfony/Tests/Component/Form/Util/FormUtilTest.php
@@ -0,0 +1,53 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Tests\Component\Form\Util;
+
+use Symfony\Component\Form\Util\FormUtil;
+
+class FormUtilTest extends \PHPUnit_Framework_TestCase
+{
+    public function toArrayKeyProvider()
+    {
+        return array(
+            array(0, 0),
+            array('0', 0),
+            array('1', 1),
+            array(false, 0),
+            array(true, 1),
+            array('', ''),
+            array(null, ''),
+            array('1.23', '1.23'),
+            array('foo', 'foo'),
+            array('foo10', 'foo10'),
+        );
+    }
+
+    /**
+     * @dataProvider toArrayKeyProvider
+     */
+    public function testToArrayKey($in, $out)
+    {
+        $this->assertSame($out, FormUtil::toArrayKey($in));
+    }
+
+    public function testToArrayKeys()
+    {
+        $in = $out = array();
+
+        foreach ($this->toArrayKeyProvider() as $call) {
+            $in[] = $call[0];
+            $out[] = $call[1];
+        }
+
+        $this->assertSame($out, FormUtil::toArrayKeys($in));
+    }
+}
\ No newline at end of file
diff --git a/tests/Symfony/Tests/Component/Form/Validator/DelegatingValidatorTest.php b/tests/Symfony/Tests/Component/Form/Validator/DelegatingValidatorTest.php
new file mode 100644
index 0000000000..56381ecd6e
--- /dev/null
+++ b/tests/Symfony/Tests/Component/Form/Validator/DelegatingValidatorTest.php
@@ -0,0 +1,610 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Tests\Component\Form\Validator;
+
+use Symfony\Component\Form\FormBuilder;
+use Symfony\Component\Form\FormError;
+use Symfony\Component\Form\Util\PropertyPath;
+use Symfony\Component\Form\Validator\DelegatingValidator;
+use Symfony\Component\Form\DataTransformer\TransformationFailedException;
+use Symfony\Component\Validator\ConstraintViolation;
+use Symfony\Component\Validator\ExecutionContext;
+
+class DelegatingValidatorTest extends \PHPUnit_Framework_TestCase
+{
+    private $dispatcher;
+
+    private $factory;
+
+    private $builder;
+
+    private $delegate;
+
+    private $validator;
+
+    private $message;
+
+    private $params;
+
+    protected function setUp()
+    {
+        $this->dispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
+        $this->factory = $this->getMock('Symfony\Component\Form\FormFactoryInterface');
+        $this->delegate = $this->getMock('Symfony\Component\Validator\ValidatorInterface');
+        $this->validator = new DelegatingValidator($this->delegate);
+        $this->message = 'Message';
+        $this->params = array('foo' => 'bar');
+    }
+
+    protected function getMockGraphWalker()
+    {
+        return $this->getMockBuilder('Symfony\Component\Validator\GraphWalker')
+            ->disableOriginalConstructor()
+            ->getMock();
+    }
+
+    protected function getMockMetadataFactory()
+    {
+        return $this->getMock('Symfony\Component\Validator\Mapping\ClassMetadataFactoryInterface');
+    }
+
+    protected function getMockTransformer()
+    {
+        return $this->getMock('Symfony\Component\Form\DataTransformer\DataTransformerInterface', array(), array(), '', false, false);
+    }
+
+    protected function getConstraintViolation($propertyPath)
+    {
+        return new ConstraintViolation($this->message, $this->params, null, $propertyPath, null);
+    }
+
+    protected function getFormError()
+    {
+        return new FormError($this->message, $this->params);
+    }
+
+    protected function getBuilder($name = 'name', $propertyPath = null)
+    {
+        $builder = new FormBuilder($name, $this->factory, $this->dispatcher);
+        $builder->setAttribute('property_path', new PropertyPath($propertyPath ?: $name));
+        $builder->setAttribute('error_mapping', array());
+
+        return $builder;
+    }
+
+    protected function getForm($name = 'name', $propertyPath = null)
+    {
+        return $this->getBuilder($name, $propertyPath)->getForm();
+    }
+
+    protected function getMockForm()
+    {
+        return $this->getMock('Symfony\Tests\Component\Form\FormInterface');
+    }
+
+    public function testUseValidateValueWhenValidationConstraintExist()
+    {
+        $constraint = $this->getMockForAbstractClass('Symfony\Component\Validator\Constraint');
+        $form = $this
+            ->getBuilder('name')
+            ->setAttribute('validation_constraint', $constraint)
+            ->getForm();
+
+        $this->delegate->expects($this->once())->method('validateValue');
+
+        $this->validator->validate($form);
+    }
+
+    public function testFormErrorsOnForm()
+    {
+        $form = $this->getForm();
+
+        $this->delegate->expects($this->once())
+            ->method('validate')
+            ->will($this->returnValue(array(
+                $this->getConstraintViolation('constrainedProp')
+            )));
+
+        $this->validator->validate($form);
+
+        $this->assertEquals(array($this->getFormError()), $form->getErrors());
+    }
+
+    public function testFormErrorsOnChild()
+    {
+        $parent = $this->getForm();
+        $child = $this->getForm('firstName');
+
+        $parent->add($child);
+
+        $this->delegate->expects($this->once())
+            ->method('validate')
+            ->will($this->returnValue(array(
+                $this->getConstraintViolation('children[firstName].constrainedProp')
+            )));
+
+        $this->validator->validate($parent);
+
+        $this->assertFalse($parent->hasErrors());
+        $this->assertEquals(array($this->getFormError()), $child->getErrors());
+    }
+
+    public function testFormErrorsOnChildLongPropertyPath()
+    {
+        $parent = $this->getForm();
+        $child = $this->getForm('street', 'address.street');
+
+        $parent->add($child);
+
+        $this->delegate->expects($this->once())
+            ->method('validate')
+            ->will($this->returnValue(array(
+                $this->getConstraintViolation('children[address].data.street.constrainedProp')
+            )));
+
+        $this->validator->validate($parent);
+
+        $this->assertFalse($parent->hasErrors());
+        $this->assertEquals(array($this->getFormError()), $child->getErrors());
+    }
+
+    public function testFormErrorsOnGrandChild()
+    {
+        $parent = $this->getForm();
+        $child = $this->getForm('address');
+        $grandChild = $this->getForm('street');
+
+        $parent->add($child);
+        $child->add($grandChild);
+
+        $this->delegate->expects($this->once())
+            ->method('validate')
+            ->will($this->returnValue(array(
+                $this->getConstraintViolation('children[address].children[street].constrainedProp')
+            )));
+
+        $this->validator->validate($parent);
+
+        $this->assertFalse($parent->hasErrors());
+        $this->assertFalse($child->hasErrors());
+        $this->assertEquals(array($this->getFormError()), $grandChild->getErrors());
+    }
+
+    public function testFormErrorsOnChildWithChildren()
+    {
+        $parent = $this->getForm();
+        $child = $this->getForm('address');
+        $grandChild = $this->getForm('street');
+
+        $parent->add($child);
+        $child->add($grandChild);
+
+        $this->delegate->expects($this->once())
+            ->method('validate')
+            ->will($this->returnValue(array(
+                $this->getConstraintViolation('children[address].constrainedProp')
+            )));
+
+        $this->validator->validate($parent);
+
+        $this->assertFalse($parent->hasErrors());
+        $this->assertEquals(array($this->getFormError()), $child->getErrors());
+        $this->assertFalse($grandChild->hasErrors());
+    }
+
+    public function testFormErrorsOnParentIfNoChildFound()
+    {
+        $parent = $this->getForm();
+        $child = $this->getForm('firstName');
+
+        $parent->add($child);
+
+        $this->delegate->expects($this->once())
+            ->method('validate')
+            ->will($this->returnValue(array(
+                $this->getConstraintViolation('children[lastName].constrainedProp')
+            )));
+
+        $this->validator->validate($parent);
+
+        $this->assertEquals(array($this->getFormError()), $parent->getErrors());
+        $this->assertFalse($child->hasErrors());
+    }
+
+    public function testDataErrorsOnForm()
+    {
+        $form = $this->getForm();
+
+        $this->delegate->expects($this->once())
+            ->method('validate')
+            ->will($this->returnValue(array(
+                $this->getConstraintViolation('data.constrainedProp')
+            )));
+
+        $this->validator->validate($form);
+
+        $this->assertEquals(array($this->getFormError()), $form->getErrors());
+    }
+
+    public function testDataErrorsOnChild()
+    {
+        $parent = $this->getForm();
+        $child = $this->getForm('firstName');
+
+        $parent->add($child);
+
+        $this->delegate->expects($this->once())
+            ->method('validate')
+            ->will($this->returnValue(array(
+                $this->getConstraintViolation('data.firstName.constrainedProp')
+            )));
+
+        $this->validator->validate($parent);
+
+        $this->assertFalse($parent->hasErrors());
+        $this->assertEquals(array($this->getFormError()), $child->getErrors());
+    }
+
+    public function testDataErrorsOnChildLongPropertyPath()
+    {
+        $parent = $this->getForm();
+        $child = $this->getForm('street', 'address.street');
+
+        $parent->add($child);
+
+        $this->delegate->expects($this->once())
+            ->method('validate')
+            ->will($this->returnValue(array(
+                $this->getConstraintViolation('data.address.street.constrainedProp')
+            )));
+
+        $this->validator->validate($parent);
+
+        $this->assertFalse($parent->hasErrors());
+        $this->assertEquals(array($this->getFormError()), $child->getErrors());
+    }
+
+    public function testDataErrorsOnChildWithChildren()
+    {
+        $parent = $this->getForm();
+        $child = $this->getForm('address');
+        $grandChild = $this->getForm('street');
+
+        $parent->add($child);
+        $child->add($grandChild);
+
+        $this->delegate->expects($this->once())
+            ->method('validate')
+            ->will($this->returnValue(array(
+                $this->getConstraintViolation('data.address.constrainedProp')
+            )));
+
+        $this->validator->validate($parent);
+
+        $this->assertFalse($parent->hasErrors());
+        $this->assertEquals(array($this->getFormError()), $child->getErrors());
+        $this->assertFalse($grandChild->hasErrors());
+    }
+
+    public function testDataErrorsOnGrandChild()
+    {
+        $parent = $this->getForm();
+        $child = $this->getForm('address');
+        $grandChild = $this->getForm('street');
+
+        $parent->add($child);
+        $child->add($grandChild);
+
+        $this->delegate->expects($this->once())
+            ->method('validate')
+            ->will($this->returnValue(array(
+                $this->getConstraintViolation('data.address.street.constrainedProp')
+            )));
+
+        $this->validator->validate($parent);
+
+        $this->assertFalse($parent->hasErrors());
+        $this->assertFalse($child->hasErrors());
+        $this->assertEquals(array($this->getFormError()), $grandChild->getErrors());
+    }
+
+    public function testDataErrorsOnGrandChild2()
+    {
+        $parent = $this->getForm();
+        $child = $this->getForm('address');
+        $grandChild = $this->getForm('street');
+
+        $parent->add($child);
+        $child->add($grandChild);
+
+        $this->delegate->expects($this->once())
+            ->method('validate')
+            ->will($this->returnValue(array(
+                $this->getConstraintViolation('children[address].data.street.constrainedProp')
+            )));
+
+        $this->validator->validate($parent);
+
+        $this->assertFalse($parent->hasErrors());
+        $this->assertFalse($child->hasErrors());
+        $this->assertEquals(array($this->getFormError()), $grandChild->getErrors());
+    }
+
+    public function testDataErrorsOnParentIfNoChildFound()
+    {
+        $parent = $this->getForm();
+        $child = $this->getForm('firstName');
+
+        $parent->add($child);
+
+        $this->delegate->expects($this->once())
+            ->method('validate')
+            ->will($this->returnValue(array(
+                $this->getConstraintViolation('data.lastName.constrainedProp')
+            )));
+
+        $this->validator->validate($parent);
+
+        $this->assertEquals(array($this->getFormError()), $parent->getErrors());
+        $this->assertFalse($child->hasErrors());
+    }
+
+    public function testMappedError()
+    {
+        $parent = $this->getBuilder()
+            ->setAttribute('error_mapping', array(
+                'passwordPlain' => 'password',
+            ))
+            ->getForm();
+        $child = $this->getForm('password');
+
+        $parent->add($child);
+
+        $this->delegate->expects($this->once())
+            ->method('validate')
+            ->will($this->returnValue(array(
+                $this->getConstraintViolation('data.passwordPlain.constrainedProp')
+            )));
+
+        $this->validator->validate($parent);
+
+        $this->assertFalse($parent->hasErrors());
+        $this->assertEquals(array($this->getFormError()), $child->getErrors());
+    }
+
+    public function testMappedNestedError()
+    {
+        $parent = $this->getBuilder()
+            ->setAttribute('error_mapping', array(
+                'address.streetName' => 'address.street',
+            ))
+            ->getForm();
+        $child = $this->getForm('address');
+        $grandChild = $this->getForm('street');
+
+        $parent->add($child);
+        $child->add($grandChild);
+
+        $this->delegate->expects($this->once())
+            ->method('validate')
+            ->will($this->returnValue(array(
+                $this->getConstraintViolation('data.address.streetName.constrainedProp')
+            )));
+
+        $this->validator->validate($parent);
+
+        $this->assertFalse($parent->hasErrors());
+        $this->assertFalse($child->hasErrors());
+        $this->assertEquals(array($this->getFormError()), $grandChild->getErrors());
+    }
+
+    public function testNestedMappingUsingForm()
+    {
+        $parent = $this->getForm();
+        $child = $this->getBuilder('address')
+            ->setAttribute('error_mapping', array(
+                'streetName' => 'street',
+            ))
+            ->getForm();
+        $grandChild = $this->getForm('street');
+
+        $parent->add($child);
+        $child->add($grandChild);
+
+        $this->delegate->expects($this->once())
+            ->method('validate')
+            ->will($this->returnValue(array(
+                $this->getConstraintViolation('children[address].data.streetName.constrainedProp')
+            )));
+
+        $this->validator->validate($parent);
+
+        $this->assertFalse($parent->hasErrors());
+        $this->assertFalse($child->hasErrors());
+        $this->assertEquals(array($this->getFormError()), $grandChild->getErrors());
+    }
+
+    public function testNestedMappingUsingData()
+    {
+        $parent = $this->getForm();
+        $child = $this->getBuilder('address')
+            ->setAttribute('error_mapping', array(
+                'streetName' => 'street',
+            ))
+            ->getForm();
+        $grandChild = $this->getForm('street');
+
+        $parent->add($child);
+        $child->add($grandChild);
+
+        $this->delegate->expects($this->once())
+            ->method('validate')
+            ->will($this->returnValue(array(
+                $this->getConstraintViolation('data.address.streetName.constrainedProp')
+            )));
+
+        $this->validator->validate($parent);
+
+        $this->assertFalse($parent->hasErrors());
+        $this->assertFalse($child->hasErrors());
+        $this->assertEquals(array($this->getFormError()), $grandChild->getErrors());
+    }
+
+    public function testNestedMappingVirtualForm()
+    {
+        $parent = $this->getBuilder()
+            ->setAttribute('error_mapping', array(
+                'streetName' => 'street',
+            ))
+            ->getForm();
+        $child = $this->getBuilder('address')
+            ->setAttribute('virtual', true)
+            ->getForm();
+        $grandChild = $this->getForm('street');
+
+        $parent->add($child);
+        $child->add($grandChild);
+
+        $this->delegate->expects($this->once())
+            ->method('validate')
+            ->will($this->returnValue(array(
+                $this->getConstraintViolation('data.streetName.constrainedProp')
+            )));
+
+        $this->validator->validate($parent);
+
+        $this->assertFalse($parent->hasErrors());
+        $this->assertFalse($child->hasErrors());
+        $this->assertEquals(array($this->getFormError()), $grandChild->getErrors());
+    }
+
+    public function testValidateFormData()
+    {
+        $graphWalker = $this->getMockGraphWalker();
+        $metadataFactory = $this->getMockMetadataFactory();
+        $context = new ExecutionContext('Root', $graphWalker, $metadataFactory);
+        $object = $this->getMock('\stdClass');
+        $form = $this->getBuilder()
+            ->setAttribute('validation_groups', array('group1', 'group2'))
+            ->getForm();
+
+        $graphWalker->expects($this->at(0))
+            ->method('walkReference')
+            ->with($object, 'group1', 'data', true);
+        $graphWalker->expects($this->at(1))
+            ->method('walkReference')
+            ->with($object, 'group2', 'data', true);
+
+        $form->setData($object);
+
+        DelegatingValidator::validateFormData($form, $context);
+    }
+
+    public function testValidateFormDataUsesInheritedValidationGroup()
+    {
+        $graphWalker = $this->getMockGraphWalker();
+        $metadataFactory = $this->getMockMetadataFactory();
+        $context = new ExecutionContext('Root', $graphWalker, $metadataFactory);
+        $context->setPropertyPath('path');
+        $object = $this->getMock('\stdClass');
+
+        $parent = $this->getBuilder()
+            ->setAttribute('validation_groups', 'group')
+            ->getForm();
+        $child = $this->getBuilder()
+            ->setAttribute('validation_groups', null)
+            ->getForm();
+        $parent->add($child);
+
+        $child->setData($object);
+
+        $graphWalker->expects($this->once())
+            ->method('walkReference')
+            ->with($object, 'group', 'path.data', true);
+
+        DelegatingValidator::validateFormData($child, $context);
+    }
+
+    public function testValidateFormDataAppendsPropertyPath()
+    {
+        $graphWalker = $this->getMockGraphWalker();
+        $metadataFactory = $this->getMockMetadataFactory();
+        $context = new ExecutionContext('Root', $graphWalker, $metadataFactory);
+        $context->setPropertyPath('path');
+        $object = $this->getMock('\stdClass');
+        $form = $this->getForm();
+
+        $graphWalker->expects($this->once())
+            ->method('walkReference')
+            ->with($object, 'Default', 'path.data', true);
+
+        $form->setData($object);
+
+        DelegatingValidator::validateFormData($form, $context);
+    }
+
+    public function testValidateFormDataSetsCurrentPropertyToData()
+    {
+        $graphWalker = $this->getMockGraphWalker();
+        $metadataFactory = $this->getMockMetadataFactory();
+        $context = new ExecutionContext('Root', $graphWalker, $metadataFactory);
+        $object = $this->getMock('\stdClass');
+        $form = $this->getForm();
+        $test = $this;
+
+        $graphWalker->expects($this->once())
+            ->method('walkReference')
+            ->will($this->returnCallback(function () use ($context, $test) {
+                $test->assertEquals('data', $context->getCurrentProperty());
+            }));
+
+        $form->setData($object);
+
+        DelegatingValidator::validateFormData($form, $context);
+    }
+
+    public function testValidateFormDataDoesNotWalkScalars()
+    {
+        $graphWalker = $this->getMockGraphWalker();
+        $metadataFactory = $this->getMockMetadataFactory();
+        $context = new ExecutionContext('Root', $graphWalker, $metadataFactory);
+        $clientTransformer = $this->getMockTransformer();
+
+        $form = $this->getBuilder()
+            ->appendClientTransformer($clientTransformer)
+            ->getForm();
+
+        $graphWalker->expects($this->never())
+            ->method('walkReference');
+
+        $clientTransformer->expects($this->atLeastOnce())
+            ->method('reverseTransform')
+            ->will($this->returnValue('foobar'));
+
+        $form->bind(array('foo' => 'bar')); // reverse transformed to "foobar"
+
+        DelegatingValidator::validateFormData($form, $context);
+    }
+
+    public function testValidateIgnoresNonRoot()
+    {
+        $form = $this->getMockForm();
+        $form->expects($this->once())
+            ->method('isRoot')
+            ->will($this->returnValue(false));
+
+        $this->delegate->expects($this->never())
+            ->method('validate');
+
+        $this->validator->validate($form);
+    }
+}
\ No newline at end of file