bug symfony#32137 [HttpFoundation] fix accessing session bags (xabbuh)

fabpot · fabpot · commit c042b5b6a5d8 · 2019-06-26T09:16:02.000+02:00
This PR was merged into the 3.4 branch. Discussion ---------- [HttpFoundation] fix accessing session bags | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | symfony#30682 | License | MIT | Doc PR | Commits ------- 7a4570d fix accessing session bags
diff --git a/src/Symfony/Component/HttpFoundation/Session/Session.php b/src/Symfony/Component/HttpFoundation/Session/Session.php
@@ -253,7 +253,9 @@ public function registerBag(SessionBagInterface $bag)
      */
     public function getBag($name)
     {
-        return $this->storage->getBag($name)->getBag();
+        $bag = $this->storage->getBag($name);
+
+        return method_exists($bag, 'getBag') ? $bag->getBag() : $bag;
     }
 
     /**
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/SessionTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/SessionTest.php
@@ -15,6 +15,7 @@
 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 @@ public function testIsEmpty()
         $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'));
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -253,7 +253,9 @@ public function registerBag(SessionBagInterface $bag)`
`253`	`253`	`*/`
`254`	`254`	`public function getBag($name)`
`255`	`255`	`{`
`256`		`- return $this->storage->getBag($name)->getBag();`
	`256`	`+ $bag = $this->storage->getBag($name);`
	`257`	`+`
	`258`	`+ return method_exists($bag, 'getBag') ? $bag->getBag() : $bag;`
`257`	`259`	`}`
`258`	`260`
`259`	`261`	`/**`