Переглянути джерело

[FrameworkBundle] changed configuration to always include the session service

Fabien Potencier 14 роки тому
батько
коміт
8b9e979118

+ 3 - 5
src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

@@ -111,9 +111,7 @@ class FrameworkExtension extends Extension
             $this->registerTestConfiguration($config, $container);
             $this->registerTestConfiguration($config, $container);
         }
         }
 
 
-        if (isset($config['session'])) {
-            $this->registerSessionConfiguration($config, $container);
-        }
+        $this->registerSessionConfiguration($config, $container);
 
 
         $this->registerTranslatorConfiguration($config, $container);
         $this->registerTranslatorConfiguration($config, $container);
 
 
@@ -305,13 +303,13 @@ class FrameworkExtension extends Extension
      */
      */
     protected function registerSessionConfiguration($config, ContainerBuilder $container)
     protected function registerSessionConfiguration($config, ContainerBuilder $container)
     {
     {
-        $config = $config['session'];
-
         if (!$container->hasDefinition('session')) {
         if (!$container->hasDefinition('session')) {
             $loader = new XmlFileLoader($container, array(__DIR__.'/../Resources/config', __DIR__.'/Resources/config'));
             $loader = new XmlFileLoader($container, array(__DIR__.'/../Resources/config', __DIR__.'/Resources/config'));
             $loader->load('session.xml');
             $loader->load('session.xml');
         }
         }
 
 
+        $config = isset($config['session']) ? $config['session'] : array();
+
         foreach (array('default_locale', 'default-locale') as $key) {
         foreach (array('default_locale', 'default-locale') as $key) {
             if (isset($config[$key])) {
             if (isset($config[$key])) {
                 $container->setParameter('session.default_locale', $config[$key]);
                 $container->setParameter('session.default_locale', $config[$key]);