Merge branch '3.4' into 4.2
* 3.4: fix accessing session bags
This commit is contained in:
commit
dd68ae3962
@ -253,7 +253,9 @@ class Session implements SessionInterface, \IteratorAggregate, \Countable
|
||||
*/
|
||||
public function getBag($name)
|
||||
{
|
||||
return $this->storage->getBag($name)->getBag();
|
||||
$bag = $this->storage->getBag($name);
|
||||
|
||||
return method_exists($bag, 'getBag') ? $bag->getBag() : $bag;
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -15,6 +15,7 @@ use PHPUnit\Framework\TestCase;
|
||||
use Symfony\Component\HttpFoundation\Session\Attribute\AttributeBag;
|
||||
use Symfony\Component\HttpFoundation\Session\Flash\FlashBag;
|
||||
use Symfony\Component\HttpFoundation\Session\Session;
|
||||
use Symfony\Component\HttpFoundation\Session\SessionBagProxy;
|
||||
use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
|
||||
|
||||
/**
|
||||
@ -260,4 +261,28 @@ class SessionTest extends TestCase
|
||||
$flash->get('hello');
|
||||
$this->assertTrue($this->session->isEmpty());
|
||||
}
|
||||
|
||||
public function testGetBagWithBagImplementingGetBag()
|
||||
{
|
||||
$bag = new AttributeBag();
|
||||
$bag->setName('foo');
|
||||
|
||||
$storage = new MockArraySessionStorage();
|
||||
$storage->registerBag($bag);
|
||||
|
||||
$this->assertSame($bag, (new Session($storage))->getBag('foo'));
|
||||
}
|
||||
|
||||
public function testGetBagWithBagNotImplementingGetBag()
|
||||
{
|
||||
$data = [];
|
||||
|
||||
$bag = new AttributeBag();
|
||||
$bag->setName('foo');
|
||||
|
||||
$storage = new MockArraySessionStorage();
|
||||
$storage->registerBag(new SessionBagProxy($bag, $data, $usageIndex));
|
||||
|
||||
$this->assertSame($bag, (new Session($storage))->getBag('foo'));
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user