[DoctrineBundle] renamed DIC class parameters (they end with .class instead of _class to follow the convention of other bundles)
This commit is contained in:
parent
647efcffda
commit
e68f8f40b9
@ -180,7 +180,7 @@ abstract class AbstractDoctrineExtension extends Extension
|
|||||||
if ($container->hasDefinition($this->getObjectManagerElementName($objectManager['name'] . '_metadata_driver'))) {
|
if ($container->hasDefinition($this->getObjectManagerElementName($objectManager['name'] . '_metadata_driver'))) {
|
||||||
$chainDriverDef = $container->getDefinition($this->getObjectManagerElementName($objectManager['name'] . '_metadata_driver'));
|
$chainDriverDef = $container->getDefinition($this->getObjectManagerElementName($objectManager['name'] . '_metadata_driver'));
|
||||||
} else {
|
} else {
|
||||||
$chainDriverDef = new Definition('%'.$this->getObjectManagerElementName('metadata.driver_chain_class%'));
|
$chainDriverDef = new Definition('%'.$this->getObjectManagerElementName('metadata.driver_chain.class%'));
|
||||||
$chainDriverDef->setPublic(false);
|
$chainDriverDef->setPublic(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -196,12 +196,12 @@ abstract class AbstractDoctrineExtension extends Extension
|
|||||||
}
|
}
|
||||||
$mappingDriverDef->setArguments($args);
|
$mappingDriverDef->setArguments($args);
|
||||||
} else if ($driverType == 'annotation') {
|
} 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')),
|
new Reference($this->getObjectManagerElementName('metadata.annotation_reader')),
|
||||||
array_values($driverPaths)
|
array_values($driverPaths)
|
||||||
));
|
));
|
||||||
} else {
|
} else {
|
||||||
$mappingDriverDef = new Definition('%'.$this->getObjectManagerElementName('metadata.' . $driverType . '_class%'), array(
|
$mappingDriverDef = new Definition('%'.$this->getObjectManagerElementName('metadata.' . $driverType . '.class%'), array(
|
||||||
array_values($driverPaths)
|
array_values($driverPaths)
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
@ -14,7 +14,7 @@ class RegisterEventListenersAndSubscribersPass implements CompilerPassInterface
|
|||||||
{
|
{
|
||||||
$this->container = $container;
|
$this->container = $container;
|
||||||
foreach ($container->getDefinitions() as $id => $definition) {
|
foreach ($container->getDefinitions() as $id => $definition) {
|
||||||
if ('%doctrine.dbal.event_manager_class%' !== $definition->getClass()) {
|
if ('%doctrine.dbal.event_manager.class%' !== $definition->getClass()) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -83,7 +83,7 @@ class DoctrineExtension extends AbstractDoctrineExtension
|
|||||||
*/
|
*/
|
||||||
protected function loadDbalConnection($name, array $connection, ContainerBuilder $container)
|
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);
|
$containerDef->setPublic(false);
|
||||||
if (isset($connection['logging']) && $connection['logging']) {
|
if (isset($connection['logging']) && $connection['logging']) {
|
||||||
$containerDef->addMethodCall('setSQLLogger', array(new Reference('doctrine.dbal.logger')));
|
$containerDef->addMethodCall('setSQLLogger', array(new Reference('doctrine.dbal.logger')));
|
||||||
@ -98,7 +98,7 @@ class DoctrineExtension extends AbstractDoctrineExtension
|
|||||||
|
|
||||||
// event manager
|
// event manager
|
||||||
$eventManagerId = sprintf('doctrine.dbal.%s_connection.event_manager', $name);
|
$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);
|
$eventManagerDef->setPublic(false);
|
||||||
$container->setDefinition($eventManagerId, $eventManagerDef);
|
$container->setDefinition($eventManagerId, $eventManagerDef);
|
||||||
|
|
||||||
@ -176,7 +176,7 @@ class DoctrineExtension extends AbstractDoctrineExtension
|
|||||||
{
|
{
|
||||||
$configServiceName = sprintf('doctrine.orm.%s_configuration', $entityManager['name']);
|
$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);
|
$ormConfigDef->setPublic(false);
|
||||||
$container->setDefinition($configServiceName, $ormConfigDef);
|
$container->setDefinition($configServiceName, $ormConfigDef);
|
||||||
|
|
||||||
@ -221,8 +221,8 @@ class DoctrineExtension extends AbstractDoctrineExtension
|
|||||||
new Reference($connectionId),
|
new Reference($connectionId),
|
||||||
new Reference(sprintf('doctrine.orm.%s_configuration', $entityManager['name']))
|
new Reference(sprintf('doctrine.orm.%s_configuration', $entityManager['name']))
|
||||||
);
|
);
|
||||||
$ormEmDef = new Definition('%doctrine.orm.entity_manager_class%', $ormEmArgs);
|
$ormEmDef = new Definition('%doctrine.orm.entity_manager.class%', $ormEmArgs);
|
||||||
$ormEmDef->setFactoryClass('%doctrine.orm.entity_manager_class%');
|
$ormEmDef->setFactoryClass('%doctrine.orm.entity_manager.class%');
|
||||||
$ormEmDef->setFactoryMethod('create');
|
$ormEmDef->setFactoryMethod('create');
|
||||||
$ormEmDef->addTag('doctrine.orm.entity_manager');
|
$ormEmDef->addTag('doctrine.orm.entity_manager');
|
||||||
$container->setDefinition($entityManagerService, $ormEmDef);
|
$container->setDefinition($entityManagerService, $ormEmDef);
|
||||||
@ -333,8 +333,8 @@ class DoctrineExtension extends AbstractDoctrineExtension
|
|||||||
{
|
{
|
||||||
switch ($cacheDriver['type']) {
|
switch ($cacheDriver['type']) {
|
||||||
case 'memcache':
|
case 'memcache':
|
||||||
$memcacheClass = !empty ($cacheDriver['class']) ? $cacheDriver['class'] : '%doctrine.orm.cache.memcache_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%';
|
$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%';
|
$memcacheHost = !empty ($cacheDriver['host']) ? $cacheDriver['host'] : '%doctrine.orm.cache.memcache_host%';
|
||||||
$memcachePort = !empty ($cacheDriver['port']) ? $cacheDriver['port'] : '%doctrine.orm.cache.memcache_port%';
|
$memcachePort = !empty ($cacheDriver['port']) ? $cacheDriver['port'] : '%doctrine.orm.cache.memcache_port%';
|
||||||
$cacheDef = new Definition($memcacheClass);
|
$cacheDef = new Definition($memcacheClass);
|
||||||
@ -348,7 +348,7 @@ class DoctrineExtension extends AbstractDoctrineExtension
|
|||||||
case 'apc':
|
case 'apc':
|
||||||
case 'array':
|
case 'array':
|
||||||
case 'xcache':
|
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;
|
break;
|
||||||
default:
|
default:
|
||||||
throw new \InvalidArgumentException(sprintf('%s is unrecognized cache driver.', $cacheDriver['type']));
|
throw new \InvalidArgumentException(sprintf('%s is unrecognized cache driver.', $cacheDriver['type']));
|
||||||
|
@ -6,20 +6,20 @@
|
|||||||
|
|
||||||
<parameters>
|
<parameters>
|
||||||
<parameter key="doctrine.dbal.default_connection">default</parameter>
|
<parameter key="doctrine.dbal.default_connection">default</parameter>
|
||||||
<parameter key="doctrine.dbal.logger.debug_class">Doctrine\DBAL\Logging\DebugStack</parameter>
|
<parameter key="doctrine.dbal.logger.debug.class">Doctrine\DBAL\Logging\DebugStack</parameter>
|
||||||
<parameter key="doctrine.dbal.logger_class">Symfony\Bundle\DoctrineBundle\Logger\DbalLogger</parameter>
|
<parameter key="doctrine.dbal.logger.class">Symfony\Bundle\DoctrineBundle\Logger\DbalLogger</parameter>
|
||||||
<parameter key="doctrine.dbal.configuration_class">Doctrine\DBAL\Configuration</parameter>
|
<parameter key="doctrine.dbal.configuration.class">Doctrine\DBAL\Configuration</parameter>
|
||||||
<parameter key="doctrine.data_collector.class">Symfony\Bundle\DoctrineBundle\DataCollector\DoctrineDataCollector</parameter>
|
<parameter key="doctrine.data_collector.class">Symfony\Bundle\DoctrineBundle\DataCollector\DoctrineDataCollector</parameter>
|
||||||
<parameter key="doctrine.dbal.event_manager_class">Doctrine\Common\EventManager</parameter>
|
<parameter key="doctrine.dbal.event_manager.class">Doctrine\Common\EventManager</parameter>
|
||||||
<parameter key="doctrine.dbal.connection_factory_class">Symfony\Bundle\DoctrineBundle\ConnectionFactory</parameter>
|
<parameter key="doctrine.dbal.connection_factory.class">Symfony\Bundle\DoctrineBundle\ConnectionFactory</parameter>
|
||||||
<parameter key="doctrine.dbal.events.mysql_session_init.class">Doctrine\DBAL\Event\Listeners\MysqlSessionInit</parameter>
|
<parameter key="doctrine.dbal.events.mysql_session_init.class">Doctrine\DBAL\Event\Listeners\MysqlSessionInit</parameter>
|
||||||
<parameter key="doctrine.dbal.events.oracle_session_init.class">Doctrine\DBAL\Event\Listeners\OracleSessionInit</parameter>
|
<parameter key="doctrine.dbal.events.oracle_session_init.class">Doctrine\DBAL\Event\Listeners\OracleSessionInit</parameter>
|
||||||
</parameters>
|
</parameters>
|
||||||
|
|
||||||
<services>
|
<services>
|
||||||
<service id="doctrine.dbal.logger.debug" class="%doctrine.dbal.logger.debug_class%" public="false" />
|
<service id="doctrine.dbal.logger.debug" class="%doctrine.dbal.logger.debug.class%" public="false" />
|
||||||
|
|
||||||
<service id="doctrine.dbal.logger" class="%doctrine.dbal.logger_class%" public="false">
|
<service id="doctrine.dbal.logger" class="%doctrine.dbal.logger.class%" public="false">
|
||||||
<tag name="monolog.logger" channel="doctrine" />
|
<tag name="monolog.logger" channel="doctrine" />
|
||||||
<argument type="service" id="logger" on-invalid="null" />
|
<argument type="service" id="logger" on-invalid="null" />
|
||||||
</service>
|
</service>
|
||||||
@ -29,7 +29,7 @@
|
|||||||
<argument type="service" id="doctrine.dbal.logger" />
|
<argument type="service" id="doctrine.dbal.logger" />
|
||||||
</service>
|
</service>
|
||||||
|
|
||||||
<service id="doctrine.dbal.connection_factory" class="%doctrine.dbal.connection_factory_class%">
|
<service id="doctrine.dbal.connection_factory" class="%doctrine.dbal.connection_factory.class%">
|
||||||
<argument>%doctrine.dbal.types%</argument>
|
<argument>%doctrine.dbal.types%</argument>
|
||||||
</service>
|
</service>
|
||||||
</services>
|
</services>
|
||||||
|
@ -6,8 +6,8 @@
|
|||||||
|
|
||||||
<parameters>
|
<parameters>
|
||||||
<parameter key="doctrine.orm.default_entity_manager">default</parameter>
|
<parameter key="doctrine.orm.default_entity_manager">default</parameter>
|
||||||
<parameter key="doctrine.orm.configuration_class">Doctrine\ORM\Configuration</parameter>
|
<parameter key="doctrine.orm.configuration.class">Doctrine\ORM\Configuration</parameter>
|
||||||
<parameter key="doctrine.orm.entity_manager_class">Doctrine\ORM\EntityManager</parameter>
|
<parameter key="doctrine.orm.entity_manager.class">Doctrine\ORM\EntityManager</parameter>
|
||||||
<parameter key="doctrine.orm.auto_generate_proxy_classes">false</parameter>
|
<parameter key="doctrine.orm.auto_generate_proxy_classes">false</parameter>
|
||||||
<parameter key="doctrine.orm.entity_managers" type="collection"></parameter>
|
<parameter key="doctrine.orm.entity_managers" type="collection"></parameter>
|
||||||
|
|
||||||
@ -16,22 +16,22 @@
|
|||||||
<parameter key="doctrine.orm.proxy_dir">%kernel.cache_dir%/doctrine/orm/Proxies</parameter>
|
<parameter key="doctrine.orm.proxy_dir">%kernel.cache_dir%/doctrine/orm/Proxies</parameter>
|
||||||
|
|
||||||
<!-- cache -->
|
<!-- cache -->
|
||||||
<parameter key="doctrine.orm.cache.array_class">Doctrine\Common\Cache\ArrayCache</parameter>
|
<parameter key="doctrine.orm.cache.array.class">Doctrine\Common\Cache\ArrayCache</parameter>
|
||||||
<parameter key="doctrine.orm.cache.apc_class">Doctrine\Common\Cache\ApcCache</parameter>
|
<parameter key="doctrine.orm.cache.apc.class">Doctrine\Common\Cache\ApcCache</parameter>
|
||||||
<parameter key="doctrine.orm.cache.memcache_class">Doctrine\Common\Cache\MemcacheCache</parameter>
|
<parameter key="doctrine.orm.cache.memcache.class">Doctrine\Common\Cache\MemcacheCache</parameter>
|
||||||
<parameter key="doctrine.orm.cache.memcache_host">localhost</parameter>
|
<parameter key="doctrine.orm.cache.memcache_host">localhost</parameter>
|
||||||
<parameter key="doctrine.orm.cache.memcache_port">11211</parameter>
|
<parameter key="doctrine.orm.cache.memcache_port">11211</parameter>
|
||||||
<parameter key="doctrine.orm.cache.memcache_instance_class">Memcache</parameter>
|
<parameter key="doctrine.orm.cache.memcache_instance.class">Memcache</parameter>
|
||||||
<parameter key="doctrine.orm.cache.xcache_class">Doctrine\Common\Cache\XcacheCache</parameter>
|
<parameter key="doctrine.orm.cache.xcache.class">Doctrine\Common\Cache\XcacheCache</parameter>
|
||||||
|
|
||||||
<!-- metadata -->
|
<!-- metadata -->
|
||||||
<parameter key="doctrine.orm.metadata.driver_chain_class">Doctrine\ORM\Mapping\Driver\DriverChain</parameter>
|
<parameter key="doctrine.orm.metadata.driver_chain.class">Doctrine\ORM\Mapping\Driver\DriverChain</parameter>
|
||||||
<parameter key="doctrine.orm.metadata.annotation_class">Doctrine\ORM\Mapping\Driver\AnnotationDriver</parameter>
|
<parameter key="doctrine.orm.metadata.annotation.class">Doctrine\ORM\Mapping\Driver\AnnotationDriver</parameter>
|
||||||
<parameter key="doctrine.orm.metadata.annotation_reader_class">Doctrine\Common\Annotations\AnnotationReader</parameter>
|
<parameter key="doctrine.orm.metadata.annotation_reader.class">Doctrine\Common\Annotations\AnnotationReader</parameter>
|
||||||
<parameter key="doctrine.orm.metadata.xml_class">Doctrine\ORM\Mapping\Driver\XmlDriver</parameter>
|
<parameter key="doctrine.orm.metadata.xml.class">Doctrine\ORM\Mapping\Driver\XmlDriver</parameter>
|
||||||
<parameter key="doctrine.orm.metadata.yml_class">Doctrine\ORM\Mapping\Driver\YamlDriver</parameter>
|
<parameter key="doctrine.orm.metadata.yml.class">Doctrine\ORM\Mapping\Driver\YamlDriver</parameter>
|
||||||
<parameter key="doctrine.orm.metadata.php_class">Doctrine\ORM\Mapping\Driver\PHPDriver</parameter>
|
<parameter key="doctrine.orm.metadata.php.class">Doctrine\ORM\Mapping\Driver\PHPDriver</parameter>
|
||||||
<parameter key="doctrine.orm.metadata.staticphp_class">Doctrine\ORM\Mapping\Driver\StaticPHPDriver</parameter>
|
<parameter key="doctrine.orm.metadata.staticphp.class">Doctrine\ORM\Mapping\Driver\StaticPHPDriver</parameter>
|
||||||
<parameter key="doctrine.orm.class_metadata_factory_name">Doctrine\ORM\Mapping\ClassMetadataFactory</parameter>
|
<parameter key="doctrine.orm.class_metadata_factory_name">Doctrine\ORM\Mapping\ClassMetadataFactory</parameter>
|
||||||
|
|
||||||
<!-- cache warmer -->
|
<!-- cache warmer -->
|
||||||
@ -43,7 +43,7 @@
|
|||||||
|
|
||||||
<services>
|
<services>
|
||||||
<!--- Annotation Metadata Reader Service -->
|
<!--- Annotation Metadata Reader Service -->
|
||||||
<service id="doctrine.orm.metadata.annotation_reader" class="%doctrine.orm.metadata.annotation_reader_class%" public="false">
|
<service id="doctrine.orm.metadata.annotation_reader" class="%doctrine.orm.metadata.annotation_reader.class%" public="false">
|
||||||
<call method="setAnnotationNamespaceAlias">
|
<call method="setAnnotationNamespaceAlias">
|
||||||
<argument>Doctrine\ORM\Mapping\</argument>
|
<argument>Doctrine\ORM\Mapping\</argument>
|
||||||
<argument>orm</argument>
|
<argument>orm</argument>
|
||||||
|
@ -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);
|
$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->assertFalse($container->getParameter('doctrine.orm.auto_generate_proxy_classes'));
|
||||||
$this->assertEquals('Doctrine\ORM\Configuration', $container->getParameter('doctrine.orm.configuration_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('Doctrine\ORM\EntityManager', $container->getParameter('doctrine.orm.entity_manager.class'));
|
||||||
$this->assertEquals('Proxies', $container->getParameter('doctrine.orm.proxy_namespace'));
|
$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\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\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\MemcacheCache', $container->getParameter('doctrine.orm.cache.memcache.class'));
|
||||||
$this->assertEquals('localhost', $container->getParameter('doctrine.orm.cache.memcache_host'));
|
$this->assertEquals('localhost', $container->getParameter('doctrine.orm.cache.memcache_host'));
|
||||||
$this->assertEquals('11211', $container->getParameter('doctrine.orm.cache.memcache_port'));
|
$this->assertEquals('11211', $container->getParameter('doctrine.orm.cache.memcache_port'));
|
||||||
$this->assertEquals('Memcache', $container->getParameter('doctrine.orm.cache.memcache_instance_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\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\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\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\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\XmlDriver', $container->getParameter('doctrine.orm.metadata.xml.class'));
|
||||||
$this->assertEquals('Doctrine\ORM\Mapping\Driver\YamlDriver', $container->getParameter('doctrine.orm.metadata.yml_class'));
|
$this->assertEquals('Doctrine\ORM\Mapping\Driver\YamlDriver', $container->getParameter('doctrine.orm.metadata.yml.class'));
|
||||||
|
|
||||||
$config = array(
|
$config = array(
|
||||||
'proxy_namespace' => 'MyProxies',
|
'proxy_namespace' => 'MyProxies',
|
||||||
@ -156,8 +156,8 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
|
|||||||
$this->assertEquals('doctrine.dbal.default_connection.event_manager', (string) $args[2]);
|
$this->assertEquals('doctrine.dbal.default_connection.event_manager', (string) $args[2]);
|
||||||
|
|
||||||
$definition = $container->getDefinition('doctrine.orm.default_entity_manager');
|
$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->getClass());
|
||||||
$this->assertEquals('%doctrine.orm.entity_manager_class%', $definition->getFactoryClass());
|
$this->assertEquals('%doctrine.orm.entity_manager.class%', $definition->getFactoryClass());
|
||||||
$this->assertEquals('create', $definition->getFactoryMethod());
|
$this->assertEquals('create', $definition->getFactoryMethod());
|
||||||
$this->assertArrayHasKey('doctrine.orm.entity_manager', $definition->getTags());
|
$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]);
|
$this->assertEquals('doctrine.orm.default_result_cache', (string) $calls[3][1][0]);
|
||||||
|
|
||||||
$definition = $container->getDefinition('doctrine.orm.default_metadata_cache');
|
$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');
|
$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');
|
$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()
|
public function testSingleEntityManagerConfiguration()
|
||||||
@ -197,8 +197,8 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
|
|||||||
$this->assertEquals('Doctrine\DBAL\Connection', $definition->getClass());
|
$this->assertEquals('Doctrine\DBAL\Connection', $definition->getClass());
|
||||||
|
|
||||||
$definition = $container->getDefinition('doctrine.orm.default_entity_manager');
|
$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->getClass());
|
||||||
$this->assertEquals('%doctrine.orm.entity_manager_class%', $definition->getFactoryClass());
|
$this->assertEquals('%doctrine.orm.entity_manager.class%', $definition->getFactoryClass());
|
||||||
$this->assertEquals('create', $definition->getFactoryMethod());
|
$this->assertEquals('create', $definition->getFactoryMethod());
|
||||||
$this->assertArrayHasKey('doctrine.orm.entity_manager', $definition->getTags());
|
$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');
|
$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->getClass());
|
||||||
$this->assertEquals('%doctrine.orm.entity_manager_class%', $definition->getFactoryClass());
|
$this->assertEquals('%doctrine.orm.entity_manager.class%', $definition->getFactoryClass());
|
||||||
$this->assertEquals('create', $definition->getFactoryMethod());
|
$this->assertEquals('create', $definition->getFactoryMethod());
|
||||||
$this->assertArrayHasKey('doctrine.orm.entity_manager', $definition->getTags());
|
$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');
|
$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->getClass());
|
||||||
$this->assertEquals('%doctrine.orm.entity_manager_class%', $definition->getFactoryClass());
|
$this->assertEquals('%doctrine.orm.entity_manager.class%', $definition->getFactoryClass());
|
||||||
$this->assertEquals('create', $definition->getFactoryMethod());
|
$this->assertEquals('create', $definition->getFactoryMethod());
|
||||||
$this->assertArrayHasKey('doctrine.orm.entity_manager', $definition->getTags());
|
$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'));
|
$this->assertEquals('doctrine.orm.em2_entity_manager', (string) $container->getAlias('doctrine.orm.entity_manager'));
|
||||||
|
|
||||||
$definition = $container->getDefinition('doctrine.orm.em1_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->getClass());
|
||||||
$this->assertEquals('%doctrine.orm.entity_manager_class%', $definition->getFactoryClass());
|
$this->assertEquals('%doctrine.orm.entity_manager.class%', $definition->getFactoryClass());
|
||||||
$this->assertEquals('create', $definition->getFactoryMethod());
|
$this->assertEquals('create', $definition->getFactoryMethod());
|
||||||
$this->assertArrayHasKey('doctrine.orm.entity_manager', $definition->getTags());
|
$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]);
|
$this->assertEquals('doctrine.dbal.conn2_connection.event_manager', (string) $args[2]);
|
||||||
|
|
||||||
$definition = $container->getDefinition('doctrine.orm.em2_entity_manager');
|
$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->getClass());
|
||||||
$this->assertEquals('%doctrine.orm.entity_manager_class%', $definition->getFactoryClass());
|
$this->assertEquals('%doctrine.orm.entity_manager.class%', $definition->getFactoryClass());
|
||||||
$this->assertEquals('create', $definition->getFactoryMethod());
|
$this->assertEquals('create', $definition->getFactoryMethod());
|
||||||
$this->assertArrayHasKey('doctrine.orm.entity_manager', $definition->getTags());
|
$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]);
|
$this->assertEquals('doctrine.orm.em2_configuration', (string) $arguments[1]);
|
||||||
|
|
||||||
$definition = $container->getDefinition('doctrine.orm.em1_metadata_cache');
|
$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');
|
$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');
|
$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()
|
public function testBundleEntityAliases()
|
||||||
@ -478,10 +478,10 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
|
|||||||
$container->compile();
|
$container->compile();
|
||||||
|
|
||||||
$definition = $container->getDefinition('doctrine.orm.em1_metadata_cache');
|
$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');
|
$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()
|
public function testEntityManagerMemcacheMetadataCacheDriverConfiguration()
|
||||||
@ -522,7 +522,7 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
|
|||||||
$container->compile();
|
$container->compile();
|
||||||
|
|
||||||
$cacheDefinition = $container->getDefinition('doctrine.orm.default_metadata_cache');
|
$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');
|
$configDefinition = $container->getDefinition('doctrine.orm.default_configuration');
|
||||||
$this->assertDICDefinitionMethodCallOnce($configDefinition, 'setAutoGenerateProxyClasses', array(true));
|
$this->assertDICDefinitionMethodCallOnce($configDefinition, 'setAutoGenerateProxyClasses', array(true));
|
||||||
|
Reference in New Issue
Block a user