8000 Use getter injection for SessionListener · symfony/symfony@550f877 · GitHub
[go: up one dir, main page]
Skip to content

Commit 550f877

Browse files
chalasrchalasr
committed
Use getter injection for SessionListener
1 parent 1f63f2e commit 550f877

File tree

4 files changed

+13
-7
lines changed

4 files changed

+13
-7
lines changed

‎src/Symfony/Bundle/FrameworkBundle/EventListener/SessionListener.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,17 @@
1111

1212
namespace Symfony\Bundle\FrameworkBundle\EventListener;
1313

14-
use Psr\Container\ContainerInterface;
1514
use Symfony\Component\HttpKernel\EventListener\SessionListener as BaseSessionListener;
15+
use Symfony\Component\DependencyInjection\ContainerInterface;
16+
17+
@trigger_error(sprintf('The %s class is deprecated since version 3.3 and will be removed in 4.0. Use %s instead.'), SessionListener::class, BaseSessionListener::class);
1618

1719
/**
1820
* Sets the session in the request.
1921
*
2022
* @author Fabien Potencier <fabien@symfony.com>
23+
*
24+
* @deprecated since version 3.3, to be removed in 4.0.
2125
*/
2226
class SessionListener extends BaseSessionListener
2327
{

‎src/Symfony/Bundle/FrameworkBundle/EventListener/TestSessionListener.php

Lines changed: 4 additions & 0 deletions

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/session.xml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,14 @@
1414
use Symfony\Component\HttpKernel\EventListener\TestSessionListener as BaseTestSessionListener;
1515
use Symfony\Component\DependencyInjection\ContainerInterface;
1616

17+
@trigger_error(sprintf('The %s class is deprecated since version 3.3 and will be removed in 4.0. Use %s instead.'), TestSessionListener::class, BaseTestSessionListener::class);
18+
1719
/**
1820
* TestSessionListener.
1921
*
2022
* @author Fabien Potencier <fabien@symfony.com>
23+
*
24+
* @deprecated since version 3.3, to be removed in 4.0.
2125
*/
2226
class TestSessionListener extends BaseTestSessionListener
2327
{
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,9 @@
4747

4848
<service id="session.handler.write_check" class="Symfony\Component\HttpFoundation\Session\Storage\Handler\WriteCheckSessionHandler" public="false" />
4949

50-
<service id="session_listener" class="Symfony\Bundle\FrameworkBundle\EventListener\SessionListener">
50+
<service id="session_listener" class="Symfony\Component\HttpKernel\EventListener\SessionListener">
5151
<tag name="kernel.event_subscriber" />
52-
<argument type="service-locator">
53-
<argument key="session" type="service" id="session" on-invalid="null" />
54-
</argument>
52+
<getter name="getSession" type="service" id="session" on-invalid="null" />
5553
</service>
5654

5755
<service id="session.save_listener" class="Symfony\Component\HttpKernel\EventListener\SaveSessionListener">

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/test.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020

2121
<service id="test.client.cookiejar" class="Symfony\Component\BrowserKit\CookieJar" shared="false" />
2222

23-
<service id="test.session.listener" class="Symfony\Bundle\FrameworkBundle\EventListener\TestSessionListener">
24-
<argument type="service" id="service_container" />
23+
<service id="test.session.listener" class="Symfony\Component\HttpKernel\EventListener\TestSessionListener">
2524
<tag name="kernel.event_subscriber" />
25+
<getter name="getSession" type="service" id="session" on-invalid="null" />
2626
</service>
2727
</services>
2828
</container>

0 commit comments

Comments
 (0)
0