bug #22730 [FrameworkBundle] Sessions: configurable "use_strict_mode" option for NativeSessionStorage (MacDada)

fabpot · fabpot · commit ac9a527b81a0 · 2017-06-18T08:41:46.000-07:00
This PR was merged into the 2.7 branch. Discussion ---------- [FrameworkBundle] Sessions: configurable "use_strict_mode" option for NativeSessionStorage | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | License | MIT It is currently not possible to configure the `use_strict_mode` option for `NativeSessionStorage` in a proper manner. The reason of this PR: #22352 (comment) It could be considered a new feature, but I wish it wouldn't, as I don't want to do any ugly hacking to get it working. What else could be done? * implement more options from `NativeSessionStorage` in the config? * get rid of duplication somehow (maybe a static method in `NativeSessionStorage` that would return the option list and could be used in `FrameworkExtension`?) * update `FrameworkExtensionTest`? * update `ConfigurationTest`? * update [the docs](https://symfony.com/doc/current/reference/configuration/framework.html#session)? I'm willing to do those if decided. Commits ------- 90e192e Sessions: configurable "use_strict_mode" option for NativeSessionStorage
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -348,6 +348,7 @@ private function addSessionSection(ArrayNodeDefinition $rootNode)
                         ->scalarNode('gc_divisor')->end()
                         ->scalarNode('gc_probability')->defaultValue(1)->end()
                         ->scalarNode('gc_maxlifetime')->end()
+                        ->booleanNode('use_strict_mode')->end()
                         ->scalarNode('save_path')->defaultValue('%kernel.cache_dir%/sessions')->end()
                         ->integerNode('metadata_update_threshold')
                             ->defaultValue('0')
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -402,7 +402,7 @@ private function registerSessionConfiguration(array $config, ContainerBuilder $c
         // session storage
         $container->setAlias('session.storage', $config['storage_id']);
         $options = array();
-        foreach (array('name', 'cookie_lifetime', 'cookie_path', 'cookie_domain', 'cookie_secure', 'cookie_httponly', 'gc_maxlifetime', 'gc_probability', 'gc_divisor') as $key) {
+        foreach (array('name', 'cookie_lifetime', 'cookie_path', 'cookie_domain', 'cookie_secure', 'cookie_httponly', 'gc_maxlifetime', 'gc_probability', 'gc_divisor', 'use_strict_mode') as $key) {
             if (isset($config[$key])) {
                 $options[$key] = $config[$key];
             }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd b/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd
@@ -111,6 +111,7 @@
         <xsd:attribute name="gc-maxlifetime" type="xsd:string" />
         <xsd:attribute name="gc-divisor" type="xsd:string" />
         <xsd:attribute name="gc-probability" type="xsd:string" />
+        <xsd:attribute name="use-strict-mode" type="xsd:boolean" />
         <xsd:attribute name="save-path" type="xsd:string" />
     </xsd:complexType>
 

Original file line number	Diff line number	Diff line change
`@@ -402,7 +402,7 @@ private function registerSessionConfiguration(array $config, ContainerBuilder $c`
`402`	`402`	`// session storage`
`403`	`403`	`$container->setAlias('session.storage', $config['storage_id']);`
`404`	`404`	`$options = array();`
`405`		`- foreach (array('name', 'cookie_lifetime', 'cookie_path', 'cookie_domain', 'cookie_secure', 'cookie_httponly', 'gc_maxlifetime', 'gc_probability', 'gc_divisor') as $key) {`
	`405`	`+ foreach (array('name', 'cookie_lifetime', 'cookie_path', 'cookie_domain', 'cookie_secure', 'cookie_httponly', 'gc_maxlifetime', 'gc_probability', 'gc_divisor', 'use_strict_mode') as $key) {`
`406`	`406`	`if (isset($config[$key])) {`
`407`	`407`	`$options[$key] = $config[$key];`
`408`	`408`	`}`