[FrameworkBundle] Fix passing request_stack to session.listener

nicolas-grekas · nicolas-grekas · commit 90c709391521 · 2024-10-04T14:46:07.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -1167,7 +1167,6 @@ private function registerSessionConfiguration(array $config, ContainerBuilder $c
                 $locator = $container->getDefinition('session_listener')->getArgument(0);
                 $locator->setValues($locator->getValues() + [
                     'session_storage' => new Reference('session.storage', ContainerInterface::IGNORE_ON_INVALID_REFERENCE),
-                    'request_stack' => new Reference('request_stack'),
                 ]);
             } else {
                 $container->getDefinition('session.storage.factory.native')->replaceArgument(3, true);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/session.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/session.php
@@ -156,6 +156,7 @@
                     'initialized_session' => service('.session.do-not-use')->ignoreOnUninitialized(),
                     'logger' => service('logger')->ignoreOnInvalid(),
                     'session_collector' => service('data_collector.request.session_collector')->ignoreOnInvalid(),
+                    'request_stack' => service('request_stack')->ignoreOnInvalid(),
                 ]),
                 param('kernel.debug'),
                 param('session.storage.options'),
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php
@@ -652,7 +652,7 @@ public function testNullSessionHandler()
         $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'];
+        $expected = ['session_factory', 'session', 'initialized_session', 'logger', 'session_collector', 'request_stack'];
         $this->assertEquals($expected, array_keys($container->getDefinition('session_listener')->getArgument(0)->getValues()));
         $this->assertFalse($container->getDefinition('session.storage.factory.native')->getArgument(3));
     }
@@ -670,7 +670,7 @@ public function testNullSessionHandlerLegacy()
         $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'];
+        $expected = ['session_factory', 'session', 'initialized_session', 'logger', 'session_collector', 'request_stack'];
         $this->assertEquals($expected, array_keys($container->getDefinition('session_listener')->getArgument(0)->getValues()));
         $this->assertFalse($container->getDefinition('session.storage.factory.native')->getArgument(3));
     }
@@ -1801,7 +1801,7 @@ public function testSessionCookieSecureAuto()
     {
         $container = $this->createContainerFromFile('session_cookie_secure_auto');
 
-        $expected = ['session_factory', 'session', 'initialized_session', 'logger', 'session_collector'];
+        $expected = ['session_factory', 'session', 'initialized_session', 'logger', 'session_collector', 'request_stack'];
         $this->assertEquals($expected, array_keys($container->getDefinition('session_listener')->getArgument(0)->getValues()));
     }
 
@@ -1814,7 +1814,7 @@ public function testSessionCookieSecureAutoLegacy()
 
         $container = $this->createContainerFromFile('session_cookie_secure_auto_legacy');
 
-        $expected = ['session_factory', 'session', 'initialized_session', 'logger', 'session_collector', 'session_storage', 'request_stack'];
+        $expected = ['session_factory', 'session', 'initialized_session', 'logger', 'session_collector', 'request_stack', 'session_storage'];
         $this->assertEquals($expected, array_keys($container->getDefinition('session_listener')->getArgument(0)->getValues()));
     }
 

Original file line number	Diff line number	Diff line change
`@@ -652,7 +652,7 @@ public function testNullSessionHandler()`
`652`	`652`	`$this->assertNull($container->getParameter('session.save_path'));`
`653`	`653`	`$this->assertSame('session.handler.native', (string) $container->getAlias('session.handler'));`
`654`	`654`
`655`		`- $expected = ['session_factory', 'session', 'initialized_session', 'logger', 'session_collector'];`
	`655`	`+ $expected = ['session_factory', 'session', 'initialized_session', 'logger', 'session_collector', 'request_stack'];`
`656`	`656`	`$this->assertEquals($expected, array_keys($container->getDefinition('session_listener')->getArgument(0)->getValues()));`
`657`	`657`	`$this->assertFalse($container->getDefinition('session.storage.factory.native')->getArgument(3));`
`658`	`658`	`}`
`@@ -670,7 +670,7 @@ public function testNullSessionHandlerLegacy()`
`670`	`670`	`$this->assertNull($container->getParameter('session.save_path'));`
`671`	`671`	`$this->assertSame('session.handler.native', (string) $container->getAlias('session.handler'));`
`672`	`672`
`673`		`- $expected = ['session_factory', 'session', 'initialized_session', 'logger', 'session_collector'];`
	`673`	`+ $expected = ['session_factory', 'session', 'initialized_session', 'logger', 'session_collector', 'request_stack'];`
`674`	`674`	`$this->assertEquals($expected, array_keys($container->getDefinition('session_listener')->getArgument(0)->getValues()));`
`675`	`675`	`$this->assertFalse($container->getDefinition('session.storage.factory.native')->getArgument(3));`
`676`	`676`	`}`
`@@ -1801,7 +1801,7 @@ public function testSessionCookieSecureAuto()`
`1801`	`1801`	`{`
`1802`	`1802`	`$container = $this->createContainerFromFile('session_cookie_secure_auto');`
`1803`	`1803`
`1804`		`- $expected = ['session_factory', 'session', 'initialized_session', 'logger', 'session_collector'];`
	`1804`	`+ $expected = ['session_factory', 'session', 'initialized_session', 'logger', 'session_collector', 'request_stack'];`
`1805`	`1805`	`$this->assertEquals($expected, array_keys($container->getDefinition('session_listener')->getArgument(0)->getValues()));`
`1806`	`1806`	`}`
`1807`	`1807`
`@@ -1814,7 +1814,7 @@ public function testSessionCookieSecureAutoLegacy()`
`1814`	`1814`
`1815`	`1815`	`$container = $this->createContainerFromFile('session_cookie_secure_auto_legacy');`
`1816`	`1816`
`1817`		`- $expected = ['session_factory', 'session', 'initialized_session', 'logger', 'session_collector', 'session_storage', 'request_stack'];`
	`1817`	`+ $expected = ['session_factory', 'session', 'initialized_session', 'logger', 'session_collector', 'request_stack', 'session_storage'];`
`1818`	`1818`	`$this->assertEquals($expected, array_keys($container->getDefinition('session_listener')->getArgument(0)->getValues()));`
`1819`	`1819`	`}`
`1820`	`1820`