Revert "[DoctrineBundle] updated tests with shorter bundle names"

This reverts commit 082fd73b3ce2a534e8df609a81b0753a60bfc589.

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('Yaml' => array())))))), $container);
+        $loader->load(array(array('dbal' => null, 'orm' => array('default_entity_manager' => 'default', 'entity_managers' => array('default' => array('mappings' => array('YamlBundle' => 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('Yaml' => array()),
+                    'mappings' => array('YamlBundle' => 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('Yaml' => 'Fixtures\Bundles\YamlBundle\Entity'), $calls[0][1][0]);
+        $this->assertEquals(array('YamlBundle' => '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('Yaml' => array())))))), $container);
+        $loader->load(array(array('dbal' => null, 'orm' => array('default_entity_manager' => 'default', 'entity_managers' => array('default' => array('mappings' => array('YamlBundle' => 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('Yaml' => array())))))), $container);
+        $loader->load(array(array('orm' => array('default_entity_manager' => 'default', 'entity_managers' => array('default' => array('mappings' => array('YamlBundle' => array())))))), $container);
 
         $definition = $container->getDefinition('doctrine.orm.default_configuration');
         $this->assertDICDefinitionMethodCallOnce($definition, 'setEntityNamespaces',
-            array(array('Yaml' => 'Fixtures\Bundles\YamlBundle\Entity'))
+            array(array('YamlBundle' => '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('Yaml' => array('alias' => 'yml'))))))), $container);
+        $loader->load(array(array('orm' => array('default_entity_manager' => 'default', 'entity_managers' => array('default' => array('mappings' => array('YamlBundle' => 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('Yaml' => array())))))), $container);
+        $loader->load(array(array('orm' => array('default_entity_manager' => 'default', 'entity_managers' => array('default' => array('mappings' => array('YamlBundle' => 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('Xml' => array())))))), $container);
+        $loader->load(array(array('orm' => array('default_entity_manager' => 'default', 'entity_managers' => array('default' => array('mappings' => array('XmlBundle' => 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('Annotations' => array())))))), $container);
+        $loader->load(array(array('orm' => array('default_entity_manager' => 'default', 'entity_managers' => array('default' => array('mappings' => array('AnnotationsBundle' => 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('Annotations' => array()))
+                'default' => array('mappings' => array('AnnotationsBundle' => array()))
             ))),
             array('orm' => array(
                 'auto_generate_proxy_classes' => false,
                 'default_entity_manager' => 'default',
                 'entity_managers' => array(
-                    'default' => array('mappings' => array('Xml' => array()))
+                    'default' => array('mappings' => array('XmlBundle' => 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('Annotations' => array())))))), $container);
+        $loader->load(array(array('orm' => array('default_entity_manager' => 'default', 'entity_managers' => array('default' => array('mappings' => array('AnnotationsBundle' => 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[substr($bundle, 0, -6)] = 'Fixtures\\Bundles\\'.($vendor ? $vendor.'\\' : '').$bundle.'\\'.$bundle;
+            $map[$bundle] = '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="Yaml" />
+                <mapping name="YamlBundle" />
                 <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="Yaml" />
+                <mapping name="YamlBundle" />
             </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="Annotations" />
+                <mapping name="AnnotationsBundle" />
             </entity-manager>
             <entity-manager name="em2">
-                <mapping name="Yaml" dir="Resources/config/doctrine/metadata" alias="yml" />
+                <mapping name="YamlBundle" 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="Yaml" />
+                <mapping name="YamlBundle" />
             </entity-manager>
             <entity-manager name="em2" connection="conn2" metadata-cache-driver="apc">
-                <mapping name="Yaml" />
+                <mapping name="YamlBundle" />
             </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="Yaml" />
+                <mapping name="YamlBundle" />
             </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="Yaml" />
+                <mapping name="YamlBundle" />
             </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="Annotations" />
-                <mapping name="Yaml" dir="Resources/config/doctrine/metadata" alias="yml" />
+                <mapping name="AnnotationsBundle" />
+                <mapping name="YamlBundle" 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:
-                    Yaml: ~
+                    YamlBundle: ~
                 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:
-                    Yaml: ~
+                    YamlBundle: ~

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

@@ -4,10 +4,10 @@ doctrine:
         entity_managers:
             em1:
                 mappings:
-                    Annotations: ~
+                    AnnotationsBundle: ~
             em2:
                 mappings:
-                    Yaml:
+                    YamlBundle:
                         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:
-                    Yaml: ~
+                    YamlBundle: ~
             em2:
                 metadata_cache_driver: apc
                 connection: conn2
                 mappings:
-                    Yaml: ~
+                    YamlBundle: ~

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:
-                    Yaml: ~
+                    YamlBundle: ~
                 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:
-                    Yaml: ~
+                    YamlBundle: ~
                 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:
-                    Annotations: ~
-                    Yaml:
+                    AnnotationsBundle: ~
+                    YamlBundle:
                         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('Yaml' => 'Fixtures\Bundles\YamlBundle\YamlBundle'),
+            'kernel.bundles'     => array('YamlBundle' => '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('Yaml' => array(
+                    'mappings' => array('YamlBundle' => array(
                         'type' => 'yml',
                         'dir' => __DIR__ . "/DependencyInjection/Fixtures/Bundles/YamlBundle/Resources/config/doctrine/metadata/orm",
                         'prefix' => 'Fixtures\Bundles\YamlBundle',