From c68c8b87c3946c75daddf03a58c8f61cbcb2066a Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Sun, 11 Mar 2012 23:31:17 +0100
Subject: [PATCH] [SecurityBundle] Lazily load the post schema listener

---
 .../DependencyInjection/MainConfiguration.php            | 3 +--
 .../DependencyInjection/SecurityExtension.php            | 9 ++++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
index 30dd54be57..a43734b4f4 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
@@ -90,8 +90,7 @@ class MainConfiguration implements ConfigurationInterface
                 ->arrayNode('acl')
                     ->children()
                         ->scalarNode('connection')
-                            ->defaultValue('default')
-                            ->cannotBeEmpty()
+                            ->defaultNull()
                             ->setInfo('any name configured in doctrine.dbal section')
                         ->end()
                         ->arrayNode('cache')
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
index 0fb4929362..71d8d36451 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
@@ -133,13 +133,16 @@ class SecurityExtension extends Extension
     {
         $loader->load('security_acl_dbal.xml');
 
-        $container->setAlias('security.acl.dbal.connection', sprintf('doctrine.dbal.%s_connection', $config['connection']));
+        if (null !== $config['connection']) {
+            $container->setAlias('security.acl.dbal.connection', sprintf('doctrine.dbal.%s_connection', $config['connection']));
+        }
 
         $container
             ->getDefinition('security.acl.dbal.schema_listener')
             ->addTag('doctrine.event_listener', array(
-                    'connection' => $config['connection'],
-                    'event'      => 'postGenerateSchema'
+                'connection' => $config['connection'],
+                'event'      => 'postGenerateSchema',
+                'lazy'       => true
             ))
         ;