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

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

This reverts commit 029fb2e7e3, reversing
changes made to 9dad29d61c.
This commit is contained in:
Nicolas Grekas 2019-05-01 10:04:33 +02:00
parent c3f57d0015
commit 4177331915
4 changed files with 2 additions and 15 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,7 +15,6 @@
<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.4.24|^4.2.5",
"symfony/http-foundation": "^3.3.11|~4.0",
"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,9 +193,7 @@ class Session implements SessionInterface, \IteratorAggregate, \Countable
*/
public function save()
{
if ($this->isStarted()) {
$this->storage->save();
}
$this->storage->save();
}
/**

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

@ -260,14 +260,4 @@ 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();
}
}