Merge remote branch 'yethee/doctrine_bridge'

* yethee/doctrine_bridge:
  [DoctrineBridge] Removed all options of the parent type
  [DoctrineBridge] Removed unneeded use statement
  [DoctrineBridge] Fixed typo
  [DoctrineBridge] Removed duplicating options in EntityType

src/Symfony/Bridge/Doctrine/Form/DataTransformer/EntitiesToArrayTransformer.php

@@ -41,7 +41,7 @@ class EntitiesToArrayTransformer implements DataTransformerInterface
         }
 
         if (!($collection instanceof Collection)) {
-            throw new UnexpectedTypeException($collection, 'Doctrine\Common\Collection\Collection');
+            throw new UnexpectedTypeException($collection, 'Doctrine\Common\Collections\Collection');
         }
 
         $array = array();

src/Symfony/Bridge/Doctrine/Form/Type/EntityType.php

@@ -44,16 +44,11 @@ class EntityType extends AbstractType
     public function getDefaultOptions(array $options)
     {
         $defaultOptions = array(
-            'multiple'          => false,
-            'expanded'          => false,
             'em'                => null,
             'class'             => null,
             'property'          => null,
             'query_builder'     => null,
             'choices'           => array(),
-            'preferred_choices' => array(),
-            'multiple'          => false,
-            'expanded'          => false,
         );
 
         $options = array_replace($defaultOptions, $options);

src/Symfony/Bridge/Doctrine/RegistryInterface.php

@@ -11,7 +11,6 @@
 
 namespace Symfony\Bridge\Doctrine;
 
-use Symfony\Bridge\Doctrine\RegistryInterface;
 use Doctrine\DBAL\Connection;
 use Doctrine\ORM\Configuration;
 use Doctrine\ORM\ORMException;