[FrameworkBundle] removed the session.default_locale parameter

This commit is contained in:
Fabien Potencier 2011-03-30 17:26:33 +02:00
parent f77b94074f
commit ce4a8de789
4 changed files with 6 additions and 10 deletions

View File

@ -143,11 +143,11 @@ class Configuration
}
return $v;
})
->end()
->end()
->children()
->booleanNode('auto_start')->end()
->scalarNode('class')->end()
->scalarNode('default_locale')->end()
->scalarNode('default_locale')->defaultValue('en')->end()
->scalarNode('storage_id')->defaultValue('native')->end()
// NativeSessionStorage options
->scalarNode('name')->end()

View File

@ -295,9 +295,7 @@ class FrameworkExtension extends Extension
$container->setParameter('session.class', $config['class']);
}
if (isset($config['default_locale'])) {
$container->setParameter('session.default_locale', $config['default_locale']);
}
$container->getDefinition('session')->setArgument(1, $config['default_locale']);
$container->setAlias('session.storage', 'session.storage.'.$config['storage_id']);

View File

@ -6,7 +6,6 @@
<parameters>
<parameter key="session.class">Symfony\Component\HttpFoundation\Session</parameter>
<parameter key="session.default_locale">en</parameter>
<parameter key="session.storage.native.class">Symfony\Component\HttpFoundation\SessionStorage\NativeSessionStorage</parameter>
<parameter key="session.storage.native.options" type="collection" />
<parameter key="session.storage.pdo.class">Symfony\Component\HttpFoundation\SessionStorage\PdoSessionStorage</parameter>
@ -18,9 +17,7 @@
<services>
<service id="session" class="%session.class%">
<argument type="service" id="session.storage" />
<argument type="collection">
<argument key="default_locale">%session.default_locale%</argument>
</argument>
<argument /> <!-- default locale -->
</service>
<service id="session.storage.native" class="%session.storage.native.class%" public="false">

View File

@ -72,7 +72,8 @@ abstract class FrameworkExtensionTest extends TestCase
$container = $this->createContainerFromFile('full');
$this->assertTrue($container->hasDefinition('session'), '->registerSessionConfiguration() loads session.xml');
$this->assertEquals('fr', $container->getParameter('session.default_locale'));
$arguments = $container->getDefinition('session')->getArguments();
$this->assertEquals('fr', $arguments[1]);
$this->assertTrue($container->getDefinition('session')->hasMethodCall('start'));
$this->assertEquals('Session', $container->getParameter('session.class'));
$this->assertEquals('session.storage.native', (string) $container->getAlias('session.storage'));