symfony · Nyholm · Jun 28, 2017 · Jun 28, 2017 · Jun 28, 2017
diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -10,6 +10,7 @@ CHANGELOG
    require symfony/stopwatch` in your `dev` environment.
  * Deprecated using the `KERNEL_DIR` environment variable with `KernelTestCase::getKernelClass()`.
  * Deprecated the `KernelTestCase::getPhpUnitXmlDir()` and `KernelTestCase::getPhpUnitCliConfigArgument()` methods.
+ * Added support for `PSR6SessionHandler`.
 
 3.3.0
 -----

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -437,11 +437,26 @@ private function addSessionSection(ArrayNodeDefinition $rootNode)
                         ->scalarNode('gc_maxlifetime')->end()
                         ->booleanNode('use_strict_mode')->end()
                         ->scalarNode('save_path')->defaultValue('%kernel.cache_dir%/sessions')->end()
+                        ->scalarNode('psr6_ttl')->defaultNull()->end()
+                        ->scalarNode('psr6_prefix')->defaultNull()->end()
+                        ->scalarNode('psr6_service')->defaultNull()->end()
                         ->integerNode('metadata_update_threshold')
                             ->defaultValue('0')
                             ->info('seconds to wait between 2 session metadata updates, it will also prevent the session handler to write if the session has not changed')
                         ->end()
                     ->end()
+                    ->validate()
+                        ->ifTrue(function ($v) {
+                            return $v['handler_id'] === 'session.handler.psr6' && !isset($v['psr6_service']);
+                        })
+                        ->thenInvalid('When handler_id="session.handler.psr6" you must also define a value for "psr6_service". Example "cache.app".')
+                    ->end()
+                    ->validate()
+                        ->ifTrue(function ($v) {
+                            return $v['handler_id'] !== 'session.handler.psr6' && (isset($v['psr6_ttl']) || isset($v['psr6_prefix']) || isset($v['psr6_service']));
+                        })
+                        ->thenInvalid('You must specify handler_id="session.handler.psr6" when you use "psr6_ttl", "psr6_prefix" or "psr6_service".')
+                    ->end()
                 ->end()
             ->end()
         ;

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -40,6 +40,7 @@
 use Symfony\Component\Finder\Finder;
 use Symfony\Component\Form\FormTypeGuesserInterface;
 use Symfony\Component\Form\FormTypeInterface;
+use Symfony\Component\HttpFoundation\Session\Storage\Handler\Psr6SessionHandler;
 use Symfony\Component\HttpKernel\CacheClearer\CacheClearerInterface;
 use Symfony\Component\HttpKernel\CacheWarmer\CacheWarmerInterface;
 use Symfony\Component\HttpKernel\DataCollector\DataCollectorInterface;
@@ -765,6 +766,13 @@ private function registerSessionConfiguration(array $config, ContainerBuilder $c
             // Set the handler class to be null
             $container->getDefinition('session.storage.native')->replaceArgument(1, null);
             $container->getDefinition('session.storage.php_bridge')->replaceArgument(0, null);
+        } elseif ('session.handler.psr6' === $config['handler_id']) {
+            $container->register('session.handler.psr6', Psr6SessionHandler::class)
+                ->addArgument(new Reference($config['psr6_service']))
+                ->addArgument([
+                    'prefix' => $config['psr6_prefix'],
+                    'ttl' => $config['psr6_ttl'],
+                ]);
         } else {
             $handlerId = $config['handler_id'];