diff --git a/src/Symfony/Bundle/DoctrineAbstractBundle/DependencyInjection/AbstractDoctrineExtension.php b/src/Symfony/Bundle/DoctrineAbstractBundle/DependencyInjection/AbstractDoctrineExtension.php
index a89063941a..8c59cc6f0a 100644
--- a/src/Symfony/Bundle/DoctrineAbstractBundle/DependencyInjection/AbstractDoctrineExtension.php
+++ b/src/Symfony/Bundle/DoctrineAbstractBundle/DependencyInjection/AbstractDoctrineExtension.php
@@ -180,7 +180,7 @@ abstract class AbstractDoctrineExtension extends Extension
if ($container->hasDefinition($this->getObjectManagerElementName($objectManager['name'] . '_metadata_driver'))) {
$chainDriverDef = $container->getDefinition($this->getObjectManagerElementName($objectManager['name'] . '_metadata_driver'));
} else {
- $chainDriverDef = new Definition('%'.$this->getObjectManagerElementName('metadata.driver_chain_class%'));
+ $chainDriverDef = new Definition('%'.$this->getObjectManagerElementName('metadata.driver_chain.class%'));
$chainDriverDef->setPublic(false);
}
@@ -196,12 +196,12 @@ abstract class AbstractDoctrineExtension extends Extension
}
$mappingDriverDef->setArguments($args);
} else if ($driverType == 'annotation') {
- $mappingDriverDef = new Definition('%'.$this->getObjectManagerElementName('metadata.' . $driverType . '_class%'), array(
+ $mappingDriverDef = new Definition('%'.$this->getObjectManagerElementName('metadata.' . $driverType . '.class%'), array(
new Reference($this->getObjectManagerElementName('metadata.annotation_reader')),
array_values($driverPaths)
));
} else {
- $mappingDriverDef = new Definition('%'.$this->getObjectManagerElementName('metadata.' . $driverType . '_class%'), array(
+ $mappingDriverDef = new Definition('%'.$this->getObjectManagerElementName('metadata.' . $driverType . '.class%'), array(
array_values($driverPaths)
));
}
diff --git a/src/Symfony/Bundle/DoctrineBundle/DependencyInjection/Compiler/RegisterEventListenersAndSubscribersPass.php b/src/Symfony/Bundle/DoctrineBundle/DependencyInjection/Compiler/RegisterEventListenersAndSubscribersPass.php
index fe25624e92..676c3b8977 100644
--- a/src/Symfony/Bundle/DoctrineBundle/DependencyInjection/Compiler/RegisterEventListenersAndSubscribersPass.php
+++ b/src/Symfony/Bundle/DoctrineBundle/DependencyInjection/Compiler/RegisterEventListenersAndSubscribersPass.php
@@ -14,7 +14,7 @@ class RegisterEventListenersAndSubscribersPass implements CompilerPassInterface
{
$this->container = $container;
foreach ($container->getDefinitions() as $id => $definition) {
- if ('%doctrine.dbal.event_manager_class%' !== $definition->getClass()) {
+ if ('%doctrine.dbal.event_manager.class%' !== $definition->getClass()) {
continue;
}
diff --git a/src/Symfony/Bundle/DoctrineBundle/DependencyInjection/DoctrineExtension.php b/src/Symfony/Bundle/DoctrineBundle/DependencyInjection/DoctrineExtension.php
index c8b4467094..1f695c0bbd 100755
--- a/src/Symfony/Bundle/DoctrineBundle/DependencyInjection/DoctrineExtension.php
+++ b/src/Symfony/Bundle/DoctrineBundle/DependencyInjection/DoctrineExtension.php
@@ -83,7 +83,7 @@ class DoctrineExtension extends AbstractDoctrineExtension
*/
protected function loadDbalConnection($name, array $connection, ContainerBuilder $container)
{
- $containerDef = new Definition('%doctrine.dbal.configuration_class%');
+ $containerDef = new Definition('%doctrine.dbal.configuration.class%');
$containerDef->setPublic(false);
if (isset($connection['logging']) && $connection['logging']) {
$containerDef->addMethodCall('setSQLLogger', array(new Reference('doctrine.dbal.logger')));
@@ -98,7 +98,7 @@ class DoctrineExtension extends AbstractDoctrineExtension
// event manager
$eventManagerId = sprintf('doctrine.dbal.%s_connection.event_manager', $name);
- $eventManagerDef = new Definition('%doctrine.dbal.event_manager_class%');
+ $eventManagerDef = new Definition('%doctrine.dbal.event_manager.class%');
$eventManagerDef->setPublic(false);
$container->setDefinition($eventManagerId, $eventManagerDef);
@@ -176,7 +176,7 @@ class DoctrineExtension extends AbstractDoctrineExtension
{
$configServiceName = sprintf('doctrine.orm.%s_configuration', $entityManager['name']);
- $ormConfigDef = new Definition('%doctrine.orm.configuration_class%');
+ $ormConfigDef = new Definition('%doctrine.orm.configuration.class%');
$ormConfigDef->setPublic(false);
$container->setDefinition($configServiceName, $ormConfigDef);
@@ -221,8 +221,8 @@ class DoctrineExtension extends AbstractDoctrineExtension
new Reference($connectionId),
new Reference(sprintf('doctrine.orm.%s_configuration', $entityManager['name']))
);
- $ormEmDef = new Definition('%doctrine.orm.entity_manager_class%', $ormEmArgs);
- $ormEmDef->setFactoryClass('%doctrine.orm.entity_manager_class%');
+ $ormEmDef = new Definition('%doctrine.orm.entity_manager.class%', $ormEmArgs);
+ $ormEmDef->setFactoryClass('%doctrine.orm.entity_manager.class%');
$ormEmDef->setFactoryMethod('create');
$ormEmDef->addTag('doctrine.orm.entity_manager');
$container->setDefinition($entityManagerService, $ormEmDef);
@@ -333,8 +333,8 @@ class DoctrineExtension extends AbstractDoctrineExtension
{
switch ($cacheDriver['type']) {
case 'memcache':
- $memcacheClass = !empty ($cacheDriver['class']) ? $cacheDriver['class'] : '%doctrine.orm.cache.memcache_class%';
- $memcacheInstanceClass = !empty ($cacheDriver['instance_class']) ? $cacheDriver['instance_class'] : '%doctrine.orm.cache.memcache_instance_class%';
+ $memcacheClass = !empty ($cacheDriver['class']) ? $cacheDriver['class'] : '%doctrine.orm.cache.memcache.class%';
+ $memcacheInstanceClass = !empty ($cacheDriver['instance_class']) ? $cacheDriver['instance_class'] : '%doctrine.orm.cache.memcache_instance.class%';
$memcacheHost = !empty ($cacheDriver['host']) ? $cacheDriver['host'] : '%doctrine.orm.cache.memcache_host%';
$memcachePort = !empty ($cacheDriver['port']) ? $cacheDriver['port'] : '%doctrine.orm.cache.memcache_port%';
$cacheDef = new Definition($memcacheClass);
@@ -348,7 +348,7 @@ class DoctrineExtension extends AbstractDoctrineExtension
case 'apc':
case 'array':
case 'xcache':
- $cacheDef = new Definition('%'.sprintf('doctrine.orm.cache.%s_class', $cacheDriver['type']).'%');
+ $cacheDef = new Definition('%'.sprintf('doctrine.orm.cache.%s.class', $cacheDriver['type']).'%');
break;
default:
throw new \InvalidArgumentException(sprintf('%s is unrecognized cache driver.', $cacheDriver['type']));
diff --git a/src/Symfony/Bundle/DoctrineBundle/Resources/config/dbal.xml b/src/Symfony/Bundle/DoctrineBundle/Resources/config/dbal.xml
index 6207f9e068..2a887c73a4 100644
--- a/src/Symfony/Bundle/DoctrineBundle/Resources/config/dbal.xml
+++ b/src/Symfony/Bundle/DoctrineBundle/Resources/config/dbal.xml
@@ -6,20 +6,20 @@
default
- Doctrine\DBAL\Logging\DebugStack
- Symfony\Bundle\DoctrineBundle\Logger\DbalLogger
- Doctrine\DBAL\Configuration
+ Doctrine\DBAL\Logging\DebugStack
+ Symfony\Bundle\DoctrineBundle\Logger\DbalLogger
+ Doctrine\DBAL\Configuration
Symfony\Bundle\DoctrineBundle\DataCollector\DoctrineDataCollector
- Doctrine\Common\EventManager
- Symfony\Bundle\DoctrineBundle\ConnectionFactory
+ Doctrine\Common\EventManager
+ Symfony\Bundle\DoctrineBundle\ConnectionFactory
Doctrine\DBAL\Event\Listeners\MysqlSessionInit
Doctrine\DBAL\Event\Listeners\OracleSessionInit
-
+
-
+
@@ -29,7 +29,7 @@
-
+
%doctrine.dbal.types%
diff --git a/src/Symfony/Bundle/DoctrineBundle/Resources/config/orm.xml b/src/Symfony/Bundle/DoctrineBundle/Resources/config/orm.xml
index 1808ffe241..e7913c21f7 100644
--- a/src/Symfony/Bundle/DoctrineBundle/Resources/config/orm.xml
+++ b/src/Symfony/Bundle/DoctrineBundle/Resources/config/orm.xml
@@ -6,8 +6,8 @@
default
- Doctrine\ORM\Configuration
- Doctrine\ORM\EntityManager
+ Doctrine\ORM\Configuration
+ Doctrine\ORM\EntityManager
false
@@ -16,22 +16,22 @@
%kernel.cache_dir%/doctrine/orm/Proxies
- Doctrine\Common\Cache\ArrayCache
- Doctrine\Common\Cache\ApcCache
- Doctrine\Common\Cache\MemcacheCache
+ Doctrine\Common\Cache\ArrayCache
+ Doctrine\Common\Cache\ApcCache
+ Doctrine\Common\Cache\MemcacheCache
localhost
11211
- Memcache
- Doctrine\Common\Cache\XcacheCache
+ Memcache
+ Doctrine\Common\Cache\XcacheCache
- Doctrine\ORM\Mapping\Driver\DriverChain
- Doctrine\ORM\Mapping\Driver\AnnotationDriver
- Doctrine\Common\Annotations\AnnotationReader
- Doctrine\ORM\Mapping\Driver\XmlDriver
- Doctrine\ORM\Mapping\Driver\YamlDriver
- Doctrine\ORM\Mapping\Driver\PHPDriver
- Doctrine\ORM\Mapping\Driver\StaticPHPDriver
+ Doctrine\ORM\Mapping\Driver\DriverChain
+ Doctrine\ORM\Mapping\Driver\AnnotationDriver
+ Doctrine\Common\Annotations\AnnotationReader
+ Doctrine\ORM\Mapping\Driver\XmlDriver
+ Doctrine\ORM\Mapping\Driver\YamlDriver
+ Doctrine\ORM\Mapping\Driver\PHPDriver
+ Doctrine\ORM\Mapping\Driver\StaticPHPDriver
Doctrine\ORM\Mapping\ClassMetadataFactory
@@ -43,7 +43,7 @@
-
+
Doctrine\ORM\Mapping\
orm
diff --git a/src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/AbstractDoctrineExtensionTest.php b/src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/AbstractDoctrineExtensionTest.php
index 5ded6f3423..8846a2357d 100755
--- a/src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/AbstractDoctrineExtensionTest.php
+++ b/src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/AbstractDoctrineExtensionTest.php
@@ -115,21 +115,21 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
$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'));
- $this->assertEquals('Doctrine\ORM\EntityManager', $container->getParameter('doctrine.orm.entity_manager_class'));
+ $this->assertEquals('Doctrine\ORM\Configuration', $container->getParameter('doctrine.orm.configuration.class'));
+ $this->assertEquals('Doctrine\ORM\EntityManager', $container->getParameter('doctrine.orm.entity_manager.class'));
$this->assertEquals('Proxies', $container->getParameter('doctrine.orm.proxy_namespace'));
- $this->assertEquals('Doctrine\Common\Cache\ArrayCache', $container->getParameter('doctrine.orm.cache.array_class'));
- $this->assertEquals('Doctrine\Common\Cache\ApcCache', $container->getParameter('doctrine.orm.cache.apc_class'));
- $this->assertEquals('Doctrine\Common\Cache\MemcacheCache', $container->getParameter('doctrine.orm.cache.memcache_class'));
+ $this->assertEquals('Doctrine\Common\Cache\ArrayCache', $container->getParameter('doctrine.orm.cache.array.class'));
+ $this->assertEquals('Doctrine\Common\Cache\ApcCache', $container->getParameter('doctrine.orm.cache.apc.class'));
+ $this->assertEquals('Doctrine\Common\Cache\MemcacheCache', $container->getParameter('doctrine.orm.cache.memcache.class'));
$this->assertEquals('localhost', $container->getParameter('doctrine.orm.cache.memcache_host'));
$this->assertEquals('11211', $container->getParameter('doctrine.orm.cache.memcache_port'));
- $this->assertEquals('Memcache', $container->getParameter('doctrine.orm.cache.memcache_instance_class'));
- $this->assertEquals('Doctrine\Common\Cache\XcacheCache', $container->getParameter('doctrine.orm.cache.xcache_class'));
- $this->assertEquals('Doctrine\ORM\Mapping\Driver\DriverChain', $container->getParameter('doctrine.orm.metadata.driver_chain_class'));
- $this->assertEquals('Doctrine\ORM\Mapping\Driver\AnnotationDriver', $container->getParameter('doctrine.orm.metadata.annotation_class'));
- $this->assertEquals('Doctrine\Common\Annotations\AnnotationReader', $container->getParameter('doctrine.orm.metadata.annotation_reader_class'));
- $this->assertEquals('Doctrine\ORM\Mapping\Driver\XmlDriver', $container->getParameter('doctrine.orm.metadata.xml_class'));
- $this->assertEquals('Doctrine\ORM\Mapping\Driver\YamlDriver', $container->getParameter('doctrine.orm.metadata.yml_class'));
+ $this->assertEquals('Memcache', $container->getParameter('doctrine.orm.cache.memcache_instance.class'));
+ $this->assertEquals('Doctrine\Common\Cache\XcacheCache', $container->getParameter('doctrine.orm.cache.xcache.class'));
+ $this->assertEquals('Doctrine\ORM\Mapping\Driver\DriverChain', $container->getParameter('doctrine.orm.metadata.driver_chain.class'));
+ $this->assertEquals('Doctrine\ORM\Mapping\Driver\AnnotationDriver', $container->getParameter('doctrine.orm.metadata.annotation.class'));
+ $this->assertEquals('Doctrine\Common\Annotations\AnnotationReader', $container->getParameter('doctrine.orm.metadata.annotation_reader.class'));
+ $this->assertEquals('Doctrine\ORM\Mapping\Driver\XmlDriver', $container->getParameter('doctrine.orm.metadata.xml.class'));
+ $this->assertEquals('Doctrine\ORM\Mapping\Driver\YamlDriver', $container->getParameter('doctrine.orm.metadata.yml.class'));
$config = array(
'proxy_namespace' => 'MyProxies',
@@ -156,8 +156,8 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
$this->assertEquals('doctrine.dbal.default_connection.event_manager', (string) $args[2]);
$definition = $container->getDefinition('doctrine.orm.default_entity_manager');
- $this->assertEquals('%doctrine.orm.entity_manager_class%', $definition->getClass());
- $this->assertEquals('%doctrine.orm.entity_manager_class%', $definition->getFactoryClass());
+ $this->assertEquals('%doctrine.orm.entity_manager.class%', $definition->getClass());
+ $this->assertEquals('%doctrine.orm.entity_manager.class%', $definition->getFactoryClass());
$this->assertEquals('create', $definition->getFactoryMethod());
$this->assertArrayHasKey('doctrine.orm.entity_manager', $definition->getTags());
@@ -177,13 +177,13 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
$this->assertEquals('doctrine.orm.default_result_cache', (string) $calls[3][1][0]);
$definition = $container->getDefinition('doctrine.orm.default_metadata_cache');
- $this->assertEquals('%doctrine.orm.cache.array_class%', $definition->getClass());
+ $this->assertEquals('%doctrine.orm.cache.array.class%', $definition->getClass());
$definition = $container->getDefinition('doctrine.orm.default_query_cache');
- $this->assertEquals('%doctrine.orm.cache.array_class%', $definition->getClass());
+ $this->assertEquals('%doctrine.orm.cache.array.class%', $definition->getClass());
$definition = $container->getDefinition('doctrine.orm.default_result_cache');
- $this->assertEquals('%doctrine.orm.cache.array_class%', $definition->getClass());
+ $this->assertEquals('%doctrine.orm.cache.array.class%', $definition->getClass());
}
public function testSingleEntityManagerConfiguration()
@@ -197,8 +197,8 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
$this->assertEquals('Doctrine\DBAL\Connection', $definition->getClass());
$definition = $container->getDefinition('doctrine.orm.default_entity_manager');
- $this->assertEquals('%doctrine.orm.entity_manager_class%', $definition->getClass());
- $this->assertEquals('%doctrine.orm.entity_manager_class%', $definition->getFactoryClass());
+ $this->assertEquals('%doctrine.orm.entity_manager.class%', $definition->getClass());
+ $this->assertEquals('%doctrine.orm.entity_manager.class%', $definition->getFactoryClass());
$this->assertEquals('create', $definition->getFactoryMethod());
$this->assertArrayHasKey('doctrine.orm.entity_manager', $definition->getTags());
@@ -237,8 +237,8 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
));
$definition = $container->getDefinition('doctrine.orm.default_entity_manager');
- $this->assertEquals('%doctrine.orm.entity_manager_class%', $definition->getClass());
- $this->assertEquals('%doctrine.orm.entity_manager_class%', $definition->getFactoryClass());
+ $this->assertEquals('%doctrine.orm.entity_manager.class%', $definition->getClass());
+ $this->assertEquals('%doctrine.orm.entity_manager.class%', $definition->getFactoryClass());
$this->assertEquals('create', $definition->getFactoryMethod());
$this->assertArrayHasKey('doctrine.orm.entity_manager', $definition->getTags());
@@ -279,8 +279,8 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
));
$definition = $container->getDefinition('doctrine.orm.default_entity_manager');
- $this->assertEquals('%doctrine.orm.entity_manager_class%', $definition->getClass());
- $this->assertEquals('%doctrine.orm.entity_manager_class%', $definition->getFactoryClass());
+ $this->assertEquals('%doctrine.orm.entity_manager.class%', $definition->getClass());
+ $this->assertEquals('%doctrine.orm.entity_manager.class%', $definition->getFactoryClass());
$this->assertEquals('create', $definition->getFactoryMethod());
$this->assertArrayHasKey('doctrine.orm.entity_manager', $definition->getTags());
@@ -314,8 +314,8 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
$this->assertEquals('doctrine.orm.em2_entity_manager', (string) $container->getAlias('doctrine.orm.entity_manager'));
$definition = $container->getDefinition('doctrine.orm.em1_entity_manager');
- $this->assertEquals('%doctrine.orm.entity_manager_class%', $definition->getClass());
- $this->assertEquals('%doctrine.orm.entity_manager_class%', $definition->getFactoryClass());
+ $this->assertEquals('%doctrine.orm.entity_manager.class%', $definition->getClass());
+ $this->assertEquals('%doctrine.orm.entity_manager.class%', $definition->getFactoryClass());
$this->assertEquals('create', $definition->getFactoryMethod());
$this->assertArrayHasKey('doctrine.orm.entity_manager', $definition->getTags());
@@ -336,8 +336,8 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
$this->assertEquals('doctrine.dbal.conn2_connection.event_manager', (string) $args[2]);
$definition = $container->getDefinition('doctrine.orm.em2_entity_manager');
- $this->assertEquals('%doctrine.orm.entity_manager_class%', $definition->getClass());
- $this->assertEquals('%doctrine.orm.entity_manager_class%', $definition->getFactoryClass());
+ $this->assertEquals('%doctrine.orm.entity_manager.class%', $definition->getClass());
+ $this->assertEquals('%doctrine.orm.entity_manager.class%', $definition->getFactoryClass());
$this->assertEquals('create', $definition->getFactoryMethod());
$this->assertArrayHasKey('doctrine.orm.entity_manager', $definition->getTags());
@@ -348,13 +348,13 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
$this->assertEquals('doctrine.orm.em2_configuration', (string) $arguments[1]);
$definition = $container->getDefinition('doctrine.orm.em1_metadata_cache');
- $this->assertEquals('%doctrine.orm.cache.xcache_class%', $definition->getClass());
+ $this->assertEquals('%doctrine.orm.cache.xcache.class%', $definition->getClass());
$definition = $container->getDefinition('doctrine.orm.em1_query_cache');
- $this->assertEquals('%doctrine.orm.cache.array_class%', $definition->getClass());
+ $this->assertEquals('%doctrine.orm.cache.array.class%', $definition->getClass());
$definition = $container->getDefinition('doctrine.orm.em1_result_cache');
- $this->assertEquals('%doctrine.orm.cache.array_class%', $definition->getClass());
+ $this->assertEquals('%doctrine.orm.cache.array.class%', $definition->getClass());
}
public function testBundleEntityAliases()
@@ -478,10 +478,10 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
$container->compile();
$definition = $container->getDefinition('doctrine.orm.em1_metadata_cache');
- $this->assertDICDefinitionClass($definition, '%doctrine.orm.cache.xcache_class%');
+ $this->assertDICDefinitionClass($definition, '%doctrine.orm.cache.xcache.class%');
$definition = $container->getDefinition('doctrine.orm.em2_metadata_cache');
- $this->assertDICDefinitionClass($definition, '%doctrine.orm.cache.apc_class%');
+ $this->assertDICDefinitionClass($definition, '%doctrine.orm.cache.apc.class%');
}
public function testEntityManagerMemcacheMetadataCacheDriverConfiguration()
@@ -522,7 +522,7 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
$container->compile();
$cacheDefinition = $container->getDefinition('doctrine.orm.default_metadata_cache');
- $this->assertEquals('%doctrine.orm.cache.apc_class%', $cacheDefinition->getClass());
+ $this->assertEquals('%doctrine.orm.cache.apc.class%', $cacheDefinition->getClass());
$configDefinition = $container->getDefinition('doctrine.orm.default_configuration');
$this->assertDICDefinitionMethodCallOnce($configDefinition, 'setAutoGenerateProxyClasses', array(true));