Przeglądaj źródła

[DoctrineBundle] Use doctrine.dbal.logging parameter.

Benjamin Eberlei 14 lat temu
rodzic
commit
8930048ff8

+ 5 - 3
src/Symfony/Bundle/DoctrineBundle/DependencyInjection/DoctrineExtension.php

@@ -44,7 +44,7 @@ class DoctrineExtension extends AbstractDoctrineExtension
         $loader = new XmlFileLoader($container, __DIR__.'/../Resources/config');
         $loader->load('dbal.xml');
 
-        $config = $this->mergeDbalConfig($configs);
+        $config = $this->mergeDbalConfig($configs, $container);
 
         $container->setAlias('database_connection', sprintf('doctrine.dbal.%s_connection', $config['default_connection']));
         $container->setParameter('doctrine.dbal.default_connection', $config['default_connection']);
@@ -64,7 +64,7 @@ class DoctrineExtension extends AbstractDoctrineExtension
      * @param array $configs
      * @return array
      */
-    protected function mergeDbalConfig(array $configs)
+    protected function mergeDbalConfig(array $configs, $container)
     {
         $supportedConnectionParams = array(
             'dbname'                => 'dbname',
@@ -101,7 +101,9 @@ class DoctrineExtension extends AbstractDoctrineExtension
                 'password'            => null,
                 'port'                => null,
             ),
-            'container' => array(),
+            'container' => array(
+                'logging'             => (bool)$container->getParameter('doctrine.dbal.logging')
+            ),
         );
 
         foreach ($configs AS $config) {

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

@@ -13,7 +13,7 @@
         <parameter key="doctrine.dbal.event_manager_class">Doctrine\Common\EventManager</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.logging">false</parameter>
+        <parameter key="doctrine.dbal.logging">0</parameter>
     </parameters>
 
     <services>