Merge remote branch 'kriswallsmith/doctrine/test-fixes'

* kriswallsmith/doctrine/test-fixes:
  [FrameworkBundle] fixed shorter bundle name in test
  [HttpKernel] updated tests for shorter bundle names
  [DoctrineMongoDBBundle] updated tests with shorter bundle names
  [DoctrineBundle] updated tests with shorter bundle names

src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/AbstractDoctrineExtensionTest.php

@@ -112,7 +112,7 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
         $container = $this->getContainer();
         $loader = new DoctrineExtension();
 
-        $loader->load(array(array('dbal' => null, 'orm' => array('default_entity_manager' => 'default', 'entity_managers' => array('default' => array('mappings' => array('YamlBundle' => array())))))), $container);
+        $loader->load(array(array('dbal' => null, 'orm' => array('default_entity_manager' => 'default', 'entity_managers' => array('default' => array('mappings' => array('Yaml' => array())))))), $container);
 
         $this->assertFalse($container->getParameter('doctrine.orm.auto_generate_proxy_classes'));
         $this->assertEquals('Doctrine\ORM\Configuration', $container->getParameter('doctrine.orm.configuration_class'));
@@ -137,7 +137,7 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
             'default_entity_manager' => 'default',
             'entity_managers' => array(
                 'default' => array(
-                    'mappings' => array('YamlBundle' => array()),
+                    'mappings' => array('Yaml' => array()),
                     )
                 )
         );
@@ -171,7 +171,7 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
 
         $definition = $container->getDefinition('doctrine.orm.default_configuration');
         $calls = array_values($definition->getMethodCalls());
-        $this->assertEquals(array('YamlBundle' => 'Fixtures\Bundles\YamlBundle\Entity'), $calls[0][1][0]);
+        $this->assertEquals(array('Yaml' => 'Fixtures\Bundles\YamlBundle\Entity'), $calls[0][1][0]);
         $this->assertEquals('doctrine.orm.default_metadata_cache', (string) $calls[1][1][0]);
         $this->assertEquals('doctrine.orm.default_query_cache', (string) $calls[2][1][0]);
         $this->assertEquals('doctrine.orm.default_result_cache', (string) $calls[3][1][0]);
@@ -191,7 +191,7 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
         $container = $this->getContainer();
         $loader = new DoctrineExtension();
 
-        $loader->load(array(array('dbal' => null, 'orm' => array('default_entity_manager' => 'default', 'entity_managers' => array('default' => array('mappings' => array('YamlBundle' => array())))))), $container);
+        $loader->load(array(array('dbal' => null, 'orm' => array('default_entity_manager' => 'default', 'entity_managers' => array('default' => array('mappings' => array('Yaml' => array())))))), $container);
 
         $definition = $container->getDefinition('doctrine.dbal.default_connection');
         $this->assertEquals('Doctrine\DBAL\Connection', $definition->getClass());
@@ -362,11 +362,11 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
         $container = $this->getContainer();
         $loader = new DoctrineExtension();
 
-        $loader->load(array(array('orm' => array('default_entity_manager' => 'default', 'entity_managers' => array('default' => array('mappings' => array('YamlBundle' => array())))))), $container);
+        $loader->load(array(array('orm' => array('default_entity_manager' => 'default', 'entity_managers' => array('default' => array('mappings' => array('Yaml' => array())))))), $container);
 
         $definition = $container->getDefinition('doctrine.orm.default_configuration');
         $this->assertDICDefinitionMethodCallOnce($definition, 'setEntityNamespaces',
-            array(array('YamlBundle' => 'Fixtures\Bundles\YamlBundle\Entity'))
+            array(array('Yaml' => 'Fixtures\Bundles\YamlBundle\Entity'))
         );
     }
 
@@ -375,7 +375,7 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
         $container = $this->getContainer();
         $loader = new DoctrineExtension();
 
-        $loader->load(array(array('orm' => array('default_entity_manager' => 'default', 'entity_managers' => array('default' => array('mappings' => array('YamlBundle' => array('alias' => 'yml'))))))), $container);
+        $loader->load(array(array('orm' => array('default_entity_manager' => 'default', 'entity_managers' => array('default' => array('mappings' => array('Yaml' => array('alias' => 'yml'))))))), $container);
 
         $definition = $container->getDefinition('doctrine.orm.default_configuration');
         $this->assertDICDefinitionMethodCallOnce($definition, 'setEntityNamespaces',
@@ -388,7 +388,7 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
         $container = $this->getContainer('YamlBundle');
         $loader = new DoctrineExtension();
 
-        $loader->load(array(array('orm' => array('default_entity_manager' => 'default', 'entity_managers' => array('default' => array('mappings' => array('YamlBundle' => array())))))), $container);
+        $loader->load(array(array('orm' => array('default_entity_manager' => 'default', 'entity_managers' => array('default' => array('mappings' => array('Yaml' => array())))))), $container);
 
         $definition = $container->getDefinition('doctrine.orm.default_metadata_driver');
         $this->assertDICDefinitionMethodCallOnce($definition, 'addDriver', array(
@@ -402,7 +402,7 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
         $container = $this->getContainer('XmlBundle');
         $loader = new DoctrineExtension();
 
-        $loader->load(array(array('orm' => array('default_entity_manager' => 'default', 'entity_managers' => array('default' => array('mappings' => array('XmlBundle' => array())))))), $container);
+        $loader->load(array(array('orm' => array('default_entity_manager' => 'default', 'entity_managers' => array('default' => array('mappings' => array('Xml' => array())))))), $container);
 
         $definition = $container->getDefinition('doctrine.orm.default_metadata_driver');
         $this->assertDICDefinitionMethodCallOnce($definition, 'addDriver', array(
@@ -416,7 +416,7 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
         $container = $this->getContainer('AnnotationsBundle');
         $loader = new DoctrineExtension();
 
-        $loader->load(array(array('orm' => array('default_entity_manager' => 'default', 'entity_managers' => array('default' => array('mappings' => array('AnnotationsBundle' => array())))))), $container);
+        $loader->load(array(array('orm' => array('default_entity_manager' => 'default', 'entity_managers' => array('default' => array('mappings' => array('Annotations' => array())))))), $container);
 
         $definition = $container->getDefinition('doctrine.orm.default_metadata_driver');
         $this->assertDICDefinitionMethodCallOnce($definition, 'addDriver', array(
@@ -434,13 +434,13 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
             'auto_generate_proxy_classes' => true,
             'default_entity_manager' => 'default',
             'entity_managers' => array(
-                'default' => array('mappings' => array('AnnotationsBundle' => array()))
+                'default' => array('mappings' => array('Annotations' => array()))
             ))),
             array('orm' => array(
                 'auto_generate_proxy_classes' => false,
                 'default_entity_manager' => 'default',
                 'entity_managers' => array(
-                    'default' => array('mappings' => array('XmlBundle' => array()))
+                    'default' => array('mappings' => array('Xml' => array()))
         )))), $container);
 
         $definition = $container->getDefinition('doctrine.orm.default_metadata_driver');
@@ -628,7 +628,7 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
         $container = $this->getContainer('AnnotationsBundle', 'Vendor');
         $loader = new DoctrineExtension();
 
-        $loader->load(array(array('orm' => array('default_entity_manager' => 'default', 'entity_managers' => array('default' => array('mappings' => array('AnnotationsBundle' => array())))))), $container);
+        $loader->load(array(array('orm' => array('default_entity_manager' => 'default', 'entity_managers' => array('default' => array('mappings' => array('Annotations' => array())))))), $container);
 
         $calls = $container->getDefinition('doctrine.orm.default_metadata_driver')->getMethodCalls();
         $this->assertEquals('doctrine.orm.default_annotation_metadata_driver', (string) $calls[0][1][0]);
@@ -679,7 +679,7 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
         foreach ($bundles as $bundle) {
             require_once __DIR__.'/Fixtures/Bundles/'.($vendor ? $vendor.'/' : '').$bundle.'/'.$bundle.'.php';
 
-            $map[$bundle] = 'Fixtures\\Bundles\\'.($vendor ? $vendor.'\\' : '').$bundle.'\\'.$bundle;
+            $map[substr($bundle, 0, -6)] = 'Fixtures\\Bundles\\'.($vendor ? $vendor.'\\' : '').$bundle.'\\'.$bundle;
         }
 
         return new ContainerBuilder(new ParameterBag(array(

src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/Fixtures/config/xml/orm_functions.xml

@@ -10,7 +10,7 @@
         <dbal />
         <orm default-entity-manager="default">
             <entity-manager name="default">
-                <mapping name="YamlBundle" />
+                <mapping name="Yaml" />
                 <dql>
                     <string-function name="test_string" class="Symfony\Bundle\DoctrineBundle\Tests\DependencyInjection\TestStringFunction" />
                     <numeric-function name="test_numeric" class="Symfony\Bundle\DoctrineBundle\Tests\DependencyInjection\TestNumericFunction" />

src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/Fixtures/config/xml/orm_imports_import.xml

@@ -12,7 +12,7 @@
             default-entity-manager="default"
         >
             <entity-manager name="default" metadata-cache-driver="apc">
-                <mapping name="YamlBundle" />
+                <mapping name="Yaml" />
             </entity-manager>
         </orm>
     </config>

src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/Fixtures/config/xml/orm_multiple_em_bundle_mappings.xml

@@ -9,10 +9,10 @@
     <config>
         <orm default-entity-manager="em2">
             <entity-manager name="em1">
-                <mapping name="AnnotationsBundle" />
+                <mapping name="Annotations" />
             </entity-manager>
             <entity-manager name="em2">
-                <mapping name="YamlBundle" dir="Resources/config/doctrine/metadata" alias="yml" />
+                <mapping name="Yaml" dir="Resources/config/doctrine/metadata" alias="yml" />
                 <mapping name="manual" type="xml" prefix="Fixtures\Bundles\XmlBundle"
                     dir="%kernel.root_dir%/../src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/Fixtures/Bundles/XmlBundle/Resources/config/doctrine/metadata"
                     alias="TestAlias"

src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/Fixtures/config/xml/orm_service_multiple_entity_managers.xml

@@ -30,10 +30,10 @@
 
         <orm default-entity-manager="em2" auto-generate-proxy-classes="true">
             <entity-manager name="em1" metadata-cache-driver="xcache" connection="conn1">
-                <mapping name="YamlBundle" />
+                <mapping name="Yaml" />
             </entity-manager>
             <entity-manager name="em2" connection="conn2" metadata-cache-driver="apc">
-                <mapping name="YamlBundle" />
+                <mapping name="Yaml" />
             </entity-manager>
         </orm>
     </config>

src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/Fixtures/config/xml/orm_service_simple_single_entity_manager.xml

@@ -16,7 +16,7 @@
                     <port>11211</port>
                     <instance-class>Memcache</instance-class>
                 </metadata-cache-driver>
-                <mapping name="YamlBundle" />
+                <mapping name="Yaml" />
             </entity-manager>
         </orm>
     </config>

src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/Fixtures/config/xml/orm_service_single_entity_manager.xml

@@ -32,7 +32,7 @@
                     <port>11211</port>
                     <instance-class>Memcache</instance-class>
                 </metadata-cache-driver>
-                <mapping name="YamlBundle" />
+                <mapping name="Yaml" />
             </entity-manager>
         </orm>
     </config>

src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/Fixtures/config/xml/orm_single_em_bundle_mappings.xml

@@ -9,8 +9,8 @@
     <config>
         <orm default-entity-manager="default">
             <entity-manager name="default">
-                <mapping name="AnnotationsBundle" />
-                <mapping name="YamlBundle" dir="Resources/config/doctrine/metadata" alias="yml" />
+                <mapping name="Annotations" />
+                <mapping name="Yaml" dir="Resources/config/doctrine/metadata" alias="yml" />
                 <mapping name="manual" type="xml" prefix="Fixtures\Bundles\XmlBundle"
                     dir="%kernel.root_dir%/../src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/Fixtures/Bundles/XmlBundle/Resources/config/doctrine/metadata"
                     alias="TestAlias"

src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/Fixtures/config/yml/orm_functions.yml

@@ -4,7 +4,7 @@ doctrine:
         entity_managers:
             default:
                 mappings:
-                    YamlBundle: ~
+                    Yaml: ~
                 dql:
                     string_functions:
                         test_string: Symfony\Bundle\DoctrineBundle\Tests\DependencyInjection\TestStringFunction

src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/Fixtures/config/yml/orm_imports_import.yml

@@ -6,4 +6,4 @@ doctrine:
             default:
                 metadata_cache_driver: apc
                 mappings:
-                    YamlBundle: ~
+                    Yaml: ~

src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/Fixtures/config/yml/orm_multiple_em_bundle_mappings.yml

@@ -4,10 +4,10 @@ doctrine:
         entity_managers:
             em1:
                 mappings:
-                    AnnotationsBundle: ~
+                    Annotations: ~
             em2:
                 mappings:
-                    YamlBundle:
+                    Yaml:
                         dir: Resources/config/doctrine/metadata
                         alias: yml
                     manual:

src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/Fixtures/config/yml/orm_service_multiple_entity_managers.yml

@@ -26,9 +26,9 @@ doctrine:
                 metadata_cache_driver: xcache
                 connection: conn1
                 mappings:
-                    YamlBundle: ~
+                    Yaml: ~
             em2:
                 metadata_cache_driver: apc
                 connection: conn2
                 mappings:
-                    YamlBundle: ~
+                    Yaml: ~

src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/Fixtures/config/yml/orm_service_simple_single_entity_manager.yml

@@ -5,7 +5,7 @@ doctrine:
         entity_managers:
             default:
                 mappings:
-                    YamlBundle: ~
+                    Yaml: ~
                 metadata_cache_driver:
                     type: memcache
                     class: Doctrine\Common\Cache\MemcacheCache

src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/Fixtures/config/yml/orm_service_single_entity_manager.yml

@@ -17,7 +17,7 @@ doctrine:
             default:
                 connection: default
                 mappings:
-                    YamlBundle: ~
+                    Yaml: ~
                 metadata_cache_driver:
                     type: memcache
                     class: Doctrine\Common\Cache\MemcacheCache

src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/Fixtures/config/yml/orm_single_em_bundle_mappings.yml

@@ -4,8 +4,8 @@ doctrine:
         entity_managers:
             default:
                 mappings:
-                    AnnotationsBundle: ~
-                    YamlBundle:
+                    Annotations: ~
+                    Yaml:
                         dir: Resources/config/doctrine/metadata
                         alias: yml
                     manual:

src/Symfony/Bundle/DoctrineBundle/Tests/TestCase.php

@@ -51,7 +51,7 @@ class TestCase extends \PHPUnit_Framework_TestCase
     {
         $container = new ContainerBuilder(new ParameterBag(array(
             'kernel.debug'       => false,
-            'kernel.bundles'     => array('YamlBundle' => 'Fixtures\Bundles\YamlBundle\YamlBundle'),
+            'kernel.bundles'     => array('Yaml' => 'Fixtures\Bundles\YamlBundle\YamlBundle'),
             'kernel.cache_dir'   => sys_get_temp_dir(),
             'kernel.root_dir'    => __DIR__ . "/../../../../" // src dir
         )));
@@ -74,7 +74,7 @@ class TestCase extends \PHPUnit_Framework_TestCase
                 'default_entity_manager' => 'default',
                 'entity_managers' => array (
                     'default' => array(
-                    'mappings' => array('YamlBundle' => array(
+                    'mappings' => array('Yaml' => array(
                         'type' => 'yml',
                         'dir' => __DIR__ . "/DependencyInjection/Fixtures/Bundles/YamlBundle/Resources/config/doctrine/metadata/orm",
                         'prefix' => 'Fixtures\Bundles\YamlBundle',

src/Symfony/Bundle/DoctrineMongoDBBundle/Tests/ContainerTest.php

@@ -23,7 +23,7 @@ class ContainerTest extends TestCase
         require_once __DIR__.'/DependencyInjection/Fixtures/Bundles/YamlBundle/YamlBundle.php';
 
         $container = new ContainerBuilder(new ParameterBag(array(
-            'kernel.bundles'     => array('YamlBundle' => 'DoctrineMongoDBBundle\Tests\DependencyInjection\Fixtures\Bundles\YamlBundle\YamlBundle'),
+            'kernel.bundles'     => array('Yaml' => 'DoctrineMongoDBBundle\Tests\DependencyInjection\Fixtures\Bundles\YamlBundle\YamlBundle'),
             'kernel.cache_dir'   => sys_get_temp_dir(),
             'kernel.debug'       => false,
         )));
@@ -31,7 +31,7 @@ class ContainerTest extends TestCase
         $container->registerExtension($loader);
 
         $configs = array();
-        $configs[] = array('connections' => array('default' => array()), 'document_managers' => array('default' => array('mappings' => array('YamlBundle' => array()))));
+        $configs[] = array('connections' => array('default' => array()), 'document_managers' => array('default' => array('mappings' => array('Yaml' => array()))));
         $loader->load($configs, $container);
 
         return $container;

src/Symfony/Bundle/DoctrineMongoDBBundle/Tests/DependencyInjection/AbstractMongoDBExtensionTest.php

@@ -225,20 +225,20 @@ abstract class AbstractMongoDBExtensionTest extends TestCase
         $container = $this->getContainer();
         $loader = new DoctrineMongoDBExtension();
 
-        $loader->load(array(array('document_managers' => array('default' => array('mappings' => array('YamlBundle' => array()))))), $container);
+        $loader->load(array(array('document_managers' => array('default' => array('mappings' => array('Yaml' => array()))))), $container);
 
         $definition = $container->getDefinition('doctrine.odm.mongodb.default_configuration');
         $calls = $definition->getMethodCalls();
-        $this->assertTrue(isset($calls[0][1][0]['YamlBundle']));
-        $this->assertEquals('DoctrineMongoDBBundle\Tests\DependencyInjection\Fixtures\Bundles\YamlBundle\Document', $calls[0][1][0]['YamlBundle']);
+        $this->assertTrue(isset($calls[0][1][0]['Yaml']));
+        $this->assertEquals('DoctrineMongoDBBundle\Tests\DependencyInjection\Fixtures\Bundles\YamlBundle\Document', $calls[0][1][0]['Yaml']);
     }
 
     public function testYamlBundleMappingDetection()
     {
         $container = $this->getContainer();
-        $loader = new DoctrineMongoDBExtension('YamlBundle');
+        $loader = new DoctrineMongoDBExtension();
 
-        $loader->load(array(array('document_managers' => array('default' => array('mappings' => array('YamlBundle' => array()))))), $container);
+        $loader->load(array(array('document_managers' => array('default' => array('mappings' => array('Yaml' => array()))))), $container);
 
         $calls = $container->getDefinition('doctrine.odm.mongodb.default_metadata_driver')->getMethodCalls();
         $this->assertEquals('doctrine.odm.mongodb.default_yml_metadata_driver', (string) $calls[0][1][0]);
@@ -250,7 +250,7 @@ abstract class AbstractMongoDBExtensionTest extends TestCase
         $container = $this->getContainer('XmlBundle');
         $loader = new DoctrineMongoDBExtension();
 
-        $loader->load(array(array('document_managers' => array('default' => array('mappings' => array('XmlBundle' => array()))))), $container);
+        $loader->load(array(array('document_managers' => array('default' => array('mappings' => array('Xml' => array()))))), $container);
 
         $calls = $container->getDefinition('doctrine.odm.mongodb.default_metadata_driver')->getMethodCalls();
         $this->assertEquals('doctrine.odm.mongodb.default_xml_metadata_driver', (string) $calls[0][1][0]);
@@ -262,7 +262,7 @@ abstract class AbstractMongoDBExtensionTest extends TestCase
         $container = $this->getContainer('AnnotationsBundle');
         $loader = new DoctrineMongoDBExtension();
 
-        $loader->load(array(array('document_managers' => array('default' => array('mappings' => array('AnnotationsBundle' => array()))))), $container);
+        $loader->load(array(array('document_managers' => array('default' => array('mappings' => array('Annotations' => array()))))), $container);
 
         $calls = $container->getDefinition('doctrine.odm.mongodb.default_metadata_driver')->getMethodCalls();
         $this->assertEquals('doctrine.odm.mongodb.default_annotation_metadata_driver', (string) $calls[0][1][0]);
@@ -352,9 +352,8 @@ abstract class AbstractMongoDBExtensionTest extends TestCase
     {
         require_once __DIR__.'/Fixtures/Bundles/'.$bundle.'/'.$bundle.'.php';
 
-
         return new ContainerBuilder(new ParameterBag(array(
-            'kernel.bundles'     => array($bundle => 'DoctrineMongoDBBundle\\Tests\\DependencyInjection\\Fixtures\\Bundles\\'.$bundle.'\\'.$bundle),
+            'kernel.bundles'     => array(substr($bundle, 0, -6) => 'DoctrineMongoDBBundle\\Tests\\DependencyInjection\\Fixtures\\Bundles\\'.$bundle.'\\'.$bundle),
             'kernel.cache_dir'   => sys_get_temp_dir(),
             'kernel.debug'       => false,
         )));

src/Symfony/Bundle/DoctrineMongoDBBundle/Tests/DependencyInjection/ConfigurationTest.php

@@ -86,7 +86,7 @@ class ConfigurationTest extends \PHPUnit_Framework_TestCase
             'document_managers' => array(
                 'dm1' => array(
                     'mappings' => array(
-                        'FooBundle'     => array(
+                        'Foo' => array(
                             'type' => 'annotations',
                         ),
                     ),
@@ -103,7 +103,7 @@ class ConfigurationTest extends \PHPUnit_Framework_TestCase
                     'connection' => 'dm2_connection',
                     'database' => 'db1',
                     'mappings' => array(
-                        'BarBundle' => array(
+                        'Bar' => array(
                             'type'      => 'yml',
                             'dir'       => '%kernel.cache_dir%',
                             'prefix'    => 'prefix_val',

src/Symfony/Bundle/DoctrineMongoDBBundle/Tests/DependencyInjection/Fixtures/config/yml/full.yml

@@ -26,7 +26,7 @@ doctrine_mongo_db:
     document_managers:
         dm1:
             mappings:
-                FooBundle:   annotations
+                Foo: annotations
             metadata_cache_driver:
                 type:                  memcache
                 class:                 fooClass
@@ -37,7 +37,7 @@ doctrine_mongo_db:
             connection:       dm2_connection
             database:         db1
             mappings:
-                BarBundle:
+                Bar:
                     type:   yml
                     dir:    %kernel.cache_dir%
                     prefix: prefix_val

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php

@@ -176,7 +176,7 @@ abstract class FrameworkExtensionTest extends TestCase
     protected function createContainer()
     {
         return new ContainerBuilder(new ParameterBag(array(
-            'kernel.bundles'          => array('FrameworkBundle' => 'Symfony\\Bundle\\FrameworkBundle\\FrameworkBundle'),
+            'kernel.bundles'          => array('Framework' => 'Symfony\\Bundle\\FrameworkBundle\\FrameworkBundle'),
             'kernel.cache_dir'        => __DIR__,
             'kernel.compiled_classes' => array(),
             'kernel.debug'            => false,

tests/Symfony/Tests/Component/HttpKernel/KernelTest.php

@@ -306,7 +306,7 @@ EOF;
     public function testInitializeBundles()
     {
         $parent = $this->getBundle(null, null, 'ParentABundle');
-        $child = $this->getBundle(null, 'ParentABundle', 'ChildABundle');
+        $child = $this->getBundle(null, 'ParentA', 'ChildABundle');
 
         $kernel = $this->getKernel();
         $kernel
@@ -317,14 +317,14 @@ EOF;
         $kernel->initializeBundles();
 
         $map = $kernel->getBundleMap();
-        $this->assertEquals(array($child, $parent), $map['ParentABundle']);
+        $this->assertEquals(array($child, $parent), $map['ParentA']);
     }
 
     public function testInitializeBundlesSupportInheritanceCascade()
     {
         $grandparent = $this->getBundle(null, null, 'GrandParentBBundle');
-        $parent = $this->getBundle(null, 'GrandParentBBundle', 'ParentBBundle');
-        $child = $this->getBundle(null, 'ParentBBundle', 'ChildBBundle');
+        $parent = $this->getBundle(null, 'GrandParentB', 'ParentBBundle');
+        $child = $this->getBundle(null, 'ParentB', 'ChildBBundle');
 
         $kernel = $this->getKernel();
         $kernel
@@ -336,9 +336,9 @@ EOF;
         $kernel->initializeBundles();
 
         $map = $kernel->getBundleMap();
-        $this->assertEquals(array($child, $parent, $grandparent), $map['GrandParentBBundle']);
-        $this->assertEquals(array($child, $parent), $map['ParentBBundle']);
-        $this->assertEquals(array($child), $map['ChildBBundle']);
+        $this->assertEquals(array($child, $parent, $grandparent), $map['GrandParentB']);
+        $this->assertEquals(array($child, $parent), $map['ParentB']);
+        $this->assertEquals(array($child), $map['ChildB']);
     }
 
     /**
@@ -359,9 +359,9 @@ EOF;
 
     public function testInitializeBundlesSupportsArbitraryBundleRegistrationOrder()
     {
-        $grandparent = $this->getBundle(null, null, 'GrandParentCCundle');
-        $parent = $this->getBundle(null, 'GrandParentCCundle', 'ParentCCundle');
-        $child = $this->getBundle(null, 'ParentCCundle', 'ChildCCundle');
+        $grandparent = $this->getBundle(null, null, 'GrandParentCBundle');
+        $parent = $this->getBundle(null, 'GrandParentC', 'ParentCBundle');
+        $child = $this->getBundle(null, 'ParentC', 'ChildC1Bundle');
 
         $kernel = $this->getKernel();
         $kernel
@@ -373,9 +373,9 @@ EOF;
         $kernel->initializeBundles();
 
         $map = $kernel->getBundleMap();
-        $this->assertEquals(array($child, $parent, $grandparent), $map['GrandParentCCundle']);
-        $this->assertEquals(array($child, $parent), $map['ParentCCundle']);
-        $this->assertEquals(array($child), $map['ChildCCundle']);
+        $this->assertEquals(array($child, $parent, $grandparent), $map['GrandParentC']);
+        $this->assertEquals(array($child, $parent), $map['ParentC']);
+        $this->assertEquals(array($child), $map['ChildC1']);
     }
 
     /**
@@ -383,9 +383,9 @@ EOF;
      */
     public function testInitializeBundlesThrowsExceptionWhenABundleIsDirectlyExtendedByTwoBundles()
     {
-        $parent = $this->getBundle(null, null, 'ParentCBundle');
-        $child1 = $this->getBundle(null, 'ParentCBundle', 'ChildC1Bundle');
-        $child2 = $this->getBundle(null, 'ParentCBundle', 'ChildC2Bundle');
+        $parent = $this->getBundle(null, null, 'ParentC1Bundle');
+        $child1 = $this->getBundle(null, 'ParentC1', 'ChildC2Bundle');
+        $child2 = $this->getBundle(null, 'ParentC1', 'ChildC3Bundle');
 
         $kernel = $this->getKernel();
         $kernel
@@ -415,35 +415,31 @@ EOF;
 
     protected function getBundle($dir = null, $parent = null, $className = null, $bundleName = null)
     {
-        $bundle = $this
-            ->getMockBuilder('Symfony\Tests\Component\HttpKernel\BundleForTest')
-            ->setMethods(array('getPath', 'getParent', 'getName'))
-            ->disableOriginalConstructor()
-        ;
+        if (null === $className) {
+            $className = 'Test'.rand(11111, 99999).'Bundle';
+        }
 
-        if ($className) {
-            $bundle->setMockClassName($className);
+        if (null === $bundleName) {
+            $bundleName = substr($className, 0, -6);
         }
 
-        $bundle = $bundle->getMockForAbstractClass();
+        $bundle = $this->getMockBuilder('Symfony\Tests\Component\HttpKernel\BundleForTest')
+            ->disableOriginalConstructor()
+            ->setMethods(array('getPath', 'getParent', 'getName'))
+            ->setMockClassName($className)
+            ->getMockForAbstractClass();
 
-        $bundle
-            ->expects($this->any())
+        $bundle->expects($this->any())
             ->method('getName')
-            ->will($this->returnValue(is_null($bundleName) ? get_class($bundle) : $bundleName))
-        ;
+            ->will($this->returnValue($bundleName));
 
-        $bundle
-            ->expects($this->any())
+        $bundle->expects($this->any())
             ->method('getPath')
-            ->will($this->returnValue(strtr($dir, '\\', '/')))
-        ;
+            ->will($this->returnValue(strtr($dir, '\\', '/')));
 
-        $bundle
-            ->expects($this->any())
+        $bundle->expects($this->any())
             ->method('getParent')
-            ->will($this->returnValue($parent))
-        ;
+            ->will($this->returnValue($parent));
 
         return $bundle;
     }