Преглед изворни кода

[DoctrineBundle] removed doctrine.dbal.types parameter

Fabien Potencier пре 14 година
родитељ
комит
b80bb9c7ab

+ 2 - 1
src/Symfony/Bundle/DoctrineBundle/DependencyInjection/DoctrineExtension.php

@@ -67,7 +67,8 @@ class DoctrineExtension extends AbstractDoctrineExtension
         $container->setAlias('database_connection', sprintf('doctrine.dbal.%s_connection', $config['default_connection']));
         $container->setAlias('doctrine.dbal.event_manager', new Alias(sprintf('doctrine.dbal.%s_connection.event_manager', $config['default_connection']), false));
         $container->setParameter('doctrine.dbal.default_connection', $config['default_connection']);
-        $container->setParameter('doctrine.dbal.types', $config['types']);
+
+        $container->getDefinition('doctrine.dbal.connection_factory')->replaceArgument(0, $config['types']);
 
         foreach ($config['connections'] as $name => $connection) {
             $this->loadDbalConnection($name, $connection, $container);

+ 1 - 1
src/Symfony/Bundle/DoctrineBundle/Resources/config/dbal.xml

@@ -30,7 +30,7 @@
         </service>
 
         <service id="doctrine.dbal.connection_factory" class="%doctrine.dbal.connection_factory.class%">
-            <argument>%doctrine.dbal.types%</argument>
+            <argument /> <!-- Types -->
         </service>
     </services>
 </container>

+ 2 - 1
src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/AbstractDoctrineExtensionTest.php

@@ -646,9 +646,10 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
         $container->getCompilerPassConfig()->setRemovingPasses(array());
         $container->compile();
 
+        $arguments = $container->getDefinition('doctrine.dbal.connection_factory')->getArguments();
         $this->assertEquals(
             array('test' => 'Symfony\Bundle\DoctrineBundle\Tests\DependencyInjection\TestType'),
-            $container->getParameter('doctrine.dbal.types')
+            $arguments[0]
         );
     }