nelmio
diff --git a/‎Parser/FormTypeParser.php
Copy file name to clipboardExpand all lines: Parser/FormTypeParser.php
+25-10Lines changed: 25 additions & 10 deletions b/‎Parser/FormTypeParser.php
Copy file name to clipboardExpand all lines: Parser/FormTypeParser.php
+25-10Lines changed: 25 additions & 10 deletions
diff --git a/‎Tests/Fixtures/app/AppKernel.php
Copy file name to clipboardExpand all lines: Tests/Fixtures/app/AppKernel.php
-5Lines changed: 0 additions & 5 deletions b/‎Tests/Fixtures/app/AppKernel.php
Copy file name to clipboardExpand all lines: Tests/Fixtures/app/AppKernel.php
-5Lines changed: 0 additions & 5 deletions
diff --git a/‎Tests/WebTestCase.php
Copy file name to clipboardExpand all lines: Tests/WebTestCase.php
+7-5Lines changed: 7 additions & 5 deletions b/‎Tests/WebTestCase.php
Copy file name to clipboardExpand all lines: Tests/WebTestCase.php
+7-5Lines changed: 7 additions & 5 deletions
@@ -144,21 +144,31 @@ private function parseForm($form)
                  $type instanceof FormInterface || $type instanceof ResolvedFormTypeInterface;
                  $type = $type->getParent()
             ) {
-                if (isset($this->mapTypes[$type->getName()])) {
-                    $bestType   = $this->mapTypes[$type->getName()];
+                $typeName = method_exists($type, 'getBlockPrefix') ?
+                    $type->getBlockPrefix() : $type->getName();
+
+                if (isset($this->mapTypes[$typeName])) {
+                    $bestType   = $this->mapTypes[$typeName];
                     $actualType = $bestType;
-                } elseif ('collection' === $type->getName()) {
-                    if (is_string($config->getOption('type')) && isset($this->mapTypes[$config->getOption('type')])) {
-                        $subType    = $this->mapTypes[$config->getOption('type')];
+                } elseif ('collection' === $typeName) {
+                    $typeOption = $config->getOption('type');
+
+                    if (is_object($typeOption)) {
+                        $typeOption = method_exists($typeOption, 'getBlockPrefix') ?
+                            $typeOption->getBlockPrefix() : $typeOption->getName();
+                    }
+
+                    if (isset($this->mapTypes[$typeOption])) {
+                        $subType    = $this->mapTypes[$typeOption];
                         $actualType = DataTypes::COLLECTION;
                         $bestType   = sprintf('array of %ss', $subType);
                     } else {
                         // Embedded form collection
                         $embbededType = $config->getOption('type');
-                        $subForm    = $this->formFactory->create($embbededType, null, $config->getOption('options', array()));
-                        $children   = $this->parseForm($subForm);
-                        $actualType = DataTypes::COLLECTION;
-                        $subType    = is_object($embbededType) ? get_class($embbededType) : $embbededType;
+                        $subForm      = $this->formFactory->create($embbededType, null, $config->getOption('options', array()));
+                        $children     = $this->parseForm($subForm);
+                        $actualType   = DataTypes::COLLECTION;
+                        $subType      = is_object($embbededType) ? get_class($embbededType) : $embbededType;
 
                         if (class_exists($subType)) {
                             $parts = explode('\\', $subType);
@@ -263,7 +273,12 @@ private function parseForm($form)
                     if (($choices = $config->getOption('choices')) && is_array($choices) && count($choices)) {
                         $parameters[$name]['format'] = json_encode($choices);
                     } elseif ($choiceList = $config->getOption('choice_list')) {
-                        if (('entity' === $config->getType()->getName() && false === $this->entityToChoice)) {
+                        $choiceListType = $config->getType();
+                        $choiceListName = method_exists($choiceListType, 'getBlockPrefix') ?
+                            $choiceListType->getBlockPrefix() : $choiceListType->getName();
+
+
+                        if (('entity' === $choiceListName && false === $this->entityToChoice)) {
                             $choices = array();
                         } else {
                             // TODO: fixme
 
@@ -19,11 +19,6 @@
  */
 class AppKernel extends Kernel
 {
-    public function __construct($environment, $debug)
-    {
-        parent::__construct($environment, $debug);
-    }
-
     public function registerBundles()
     {
         $bundles = array(
 
@@ -39,16 +39,18 @@ public static function handleDeprecation($errorNumber, $message, $file, $line, $
 
     protected function getContainer(array $options = array())
     {
-        if (!static::$container) {
-            if (!static::$kernel) {
-                static::$kernel = static::createKernel($options);
-            }
+        if (!static::$kernel) {
+            static::$kernel = static::createKernel($options);
+        }
 
-            static::$kernel->boot();
+        static::$kernel->boot();
 
+        if (!static::$container) {
             static::$container = static::$kernel->getContainer();
         }
 
+        static::$container->set('kernel', static::$kernel);
+
         return static::$container;
     }
Original file line number	Diff line number	Diff line change
`@@ -19,11 +19,6 @@`
`19`	`19`	`*/`
`20`	`20`	`class AppKernel extends Kernel`
`21`	`21`	`{`
`22`		`- public function __construct($environment, $debug)`
`23`		`- {`
`24`		`- parent::__construct($environment, $debug);`
`25`		`- }`
`26`		`-`
`27`	`22`	`public function registerBundles()`
`28`	`23`	`{`
`29`	`24`	`$bundles = array(`