diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug #30620 [FrameworkBundle][HttpFoundation] make session service resettable (dmaicher) 

This PR was merged into the 3.4 branch.

Discussion
----------

[FrameworkBundle][HttpFoundation] make session service resettable

| Q             | A
| ------------- | ---
| Branch?       | 3.4
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | https://github.com/symfony/symfony/issues/30619
| License       | MIT
| Doc PR        | -

This fixes https://github.com/symfony/symfony/issues/30619 by making the session service "resettable"  via `ServicesResetter`.

Commits
-------

e46ef76cb9 [FrameworkBundle][HttpFoundation] make session service resettable
This commit is contained in:
Fabien Potencier 2019-03-23 16:12:34 +01:00
parent 9dad29d61c e46ef76cb9
commit 029fb2e7e3
4 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Symfony/Bundle/FrameworkBundle/Resources/config/session.xml
View File

@ -15,6 +15,7 @@
<argument type="service" id="session.storage" />
<argument type="service" id="session.attribute_bag" />
<argument type="service" id="session.flash_bag" />
<tag name="kernel.reset" method="save" />
</service>
<service id="Symfony\Component\HttpFoundation\Session\SessionInterface" alias="session" />

2
src/Symfony/Bundle/FrameworkBundle/composer.json
View File

@ -23,7 +23,7 @@
"symfony/dependency-injection": "^3.4.24|^4.2.5",
"symfony/config": "~3.4|~4.0",
"symfony/event-dispatcher": "~3.4|~4.0",
"symfony/http-foundation": "^3.3.11|~4.0",
"symfony/http-foundation": "^3.4.24|^4.2.5",
"symfony/http-kernel": "~3.4|~4.0",
"symfony/polyfill-mbstring": "~1.0",
"symfony/filesystem": "~2.8|~3.0|~4.0",

4
src/Symfony/Component/HttpFoundation/Session/Session.php
View File

@ -193,7 +193,9 @@ class Session implements SessionInterface, \IteratorAggregate, \Countable
*/
public function save()
{
$this->storage->save();
if ($this->isStarted()) {
$this->storage->save();
}
}
/**

10
src/Symfony/Component/HttpFoundation/Tests/Session/SessionTest.php
View File

@ -260,4 +260,14 @@ class SessionTest extends TestCase
$flash->get('hello');
$this->assertTrue($this->session->isEmpty());
}
public function testSaveIfNotStarted()
{
$storage = $this->getMockBuilder('Symfony\Component\HttpFoundation\Session\Storage\SessionStorageInterface')->getMock();
$session = new Session($storage);
$storage->expects($this->once())->method('isStarted')->willReturn(false);
$storage->expects($this->never())->method('save');
$session->save();
}
}