[FrameworkBundle] Fix wiring session.handler when handler_id is null

nicolas-grekas · nicolas-grekas · commit e23be5834812 · 2023-03-20T16:51:32.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -1178,16 +1178,8 @@ private function registerSessionConfiguration(array $config, ContainerBuilder $c
 
         // session handler (the internal callback registered with PHP session management)
         if (null === $config['handler_id']) {
-            // Set the handler class to be null
-            if ($container->hasDefinition('session.storage.native')) {
-                $container->getDefinition('session.storage.native')->replaceArgument(1, null);
-                $container->getDefinition('session.storage.php_bridge')->replaceArgument(0, null);
-            } else {
-                $container->getDefinition('session.storage.factory.native')->replaceArgument(1, null);
-                $container->getDefinition('session.storage.factory.php_bridge')->replaceArgument(0, null);
-            }
-
-            $container->setAlias('session.handler', 'session.handler.native_file');
+            $config['save_path'] = null;
+            $container->setAlias('session.handler', 'session.handler.native');
         } else {
             $container->resolveEnvPlaceholders($config['handler_id'], null, $usedEnvs);
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/session.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/session.php
@@ -133,6 +133,11 @@
             ])
             ->deprecate('symfony/framework-bundle', '5.3', 'The "%service_id%" service is deprecated, use "session.storage.factory.mock_file" instead.')
 
+        ->set('session.handler.native', StrictSessionHandler::class)
+            ->args([
+                inline_service(\SessionHandler::class),
+            ])
+
         ->set('session.handler.native_file', StrictSessionHandler::class)
             ->args([
                 inline_service(NativeFileSessionHandler::class)
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php
@@ -648,9 +648,8 @@ public function testNullSessionHandler()
         $container = $this->createContainerFromFile('session');
 
         $this->assertTrue($container->hasAlias(SessionInterface::class), '->registerSessionConfiguration() loads session.xml');
-        $this->assertNull($container->getDefinition('session.storage.factory.native')->getArgument(1));
-        $this->assertNull($container->getDefinition('session.storage.factory.php_bridge')->getArgument(0));
-        $this->assertSame('session.handler.native_file', (string) $container->getAlias('session.handler'));
+        $this->assertNull($container->getParameter('session.save_path'));
+        $this->assertSame('session.handler.native', (string) $container->getAlias('session.handler'));
 
         $expected = ['session_factory', 'session', 'initialized_session', 'logger', 'session_collector'];
         $this->assertEquals($expected, array_keys($container->getDefinition('session_listener')->getArgument(0)->getValues()));
@@ -667,9 +666,8 @@ public function testNullSessionHandlerLegacy()
         $container = $this->createContainerFromFile('session_legacy');
 
         $this->assertTrue($container->hasAlias(SessionInterface::class), '->registerSessionConfiguration() loads session.xml');
-        $this->assertNull($container->getDefinition('session.storage.native')->getArgument(1));
-        $this->assertNull($container->getDefinition('session.storage.php_bridge')->getArgument(0));
-        $this->assertSame('session.handler.native_file', (string) $container->getAlias('session.handler'));
+        $this->assertNull($container->getParameter('session.save_path'));
+        $this->assertSame('session.handler.native', (string) $container->getAlias('session.handler'));
 
         $expected = ['session_factory', 'session', 'initialized_session', 'logger', 'session_collector'];
         $this->assertEquals($expected, array_keys($container->getDefinition('session_listener')->getArgument(0)->getValues()));
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeFileSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeFileSessionHandler.php
@@ -49,7 +49,11 @@ public function __construct(string $savePath = null)
             throw new \RuntimeException(sprintf('Session Storage was not able to create directory "%s".', $baseDir));
         }
 
-        ini_set('session.save_path', $savePath);
-        ini_set('session.save_handler', 'files');
+        if ($savePath !== \ini_get('session.save_path')) {
+            ini_set('session.save_path', $savePath);
+        }
+        if ('files' !== \ini_get('session.save_handler')) {
+            ini_set('session.save_handler', 'files');
+        }
     }
 }
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
@@ -455,9 +455,10 @@ public function setOptions(array $options)
      */
     public function setSaveHandler($saveHandler = null)
     {
-        if (!$saveHandler instanceof AbstractProxy &&
-            !$saveHandler instanceof \SessionHandlerInterface &&
-            null !== $saveHandler) {
+        if (!$saveHandler instanceof AbstractProxy
+            && !$saveHandler instanceof \SessionHandlerInterface
+            && null !== $saveHandler
+        ) {
             throw new \InvalidArgumentException('Must be instance of AbstractProxy; implement \SessionHandlerInterface; or be null.');
         }
 

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,11 @@ public function __construct(string $savePath = null)`
`49`	`49`	`throw new \RuntimeException(sprintf('Session Storage was not able to create directory "%s".', $baseDir));`
`50`	`50`	`}`
`51`	`51`
`52`		`- ini_set('session.save_path', $savePath);`
`53`		`- ini_set('session.save_handler', 'files');`
	`52`	`+ if ($savePath !== \ini_get('session.save_path')) {`
	`53`	`+ ini_set('session.save_path', $savePath);`
	`54`	`+ }`
	`55`	`+ if ('files' !== \ini_get('session.save_handler')) {`
	`56`	`+ ini_set('session.save_handler', 'files');`
	`57`	`+ }`
`54`	`58`	`}`
`55`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -455,9 +455,10 @@ public function setOptions(array $options)`
`455`	`455`	`*/`
`456`	`456`	`public function setSaveHandler($saveHandler = null)`
`457`	`457`	`{`
`458`		`- if (!$saveHandler instanceof AbstractProxy &&`
`459`		`- !$saveHandler instanceof \SessionHandlerInterface &&`
`460`		`- null !== $saveHandler) {`
	`458`	`+ if (!$saveHandler instanceof AbstractProxy`
	`459`	`+ && !$saveHandler instanceof \SessionHandlerInterface`
	`460`	`+ && null !== $saveHandler`
	`461`	`+ ) {`
`461`	`462`	`throw new \InvalidArgumentException('Must be instance of AbstractProxy; implement \SessionHandlerInterface; or be null.');`
`462`	`463`	`}`
`463`	`464`