symfony
diff --git a/‎src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig
Lines changed: 1 addition & 0 deletions b/‎src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig
Lines changed: 1 addition & 0 deletions
diff --git a/‎src/Symfony/Component/HttpFoundation/Session/Session.php
Lines changed: 3 additions & 1 deletion b/‎src/Symfony/Component/HttpFoundation/Session/Session.php
Lines changed: 3 additions & 1 deletion
diff --git a/‎src/Symfony/Component/HttpFoundation/Tests/Session/SessionTest.php
Lines changed: 25 additions & 0 deletions b/‎src/Symfony/Component/HttpFoundation/Tests/Session/SessionTest.php
Lines changed: 25 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Lock/Store/RedisStore.php
Lines changed: 3 additions & 0 deletions b/‎src/Symfony/Component/Lock/Store/RedisStore.php
Lines changed: 3 additions & 0 deletions
@@ -114,6 +114,7 @@
     <div class="form-group{% if (not compound or force_error|default(false)) and not valid %} has-error{% endif %}">
         {{- form_label(form) }} {# -#}
         {{ form_widget(form, widget_attr) }} {# -#}
+        {{- form_help(form) -}}
         {{ form_errors(form) }} {# -#}
     </div> {# -#}
 {%- endblock form_row %}
 
@@ -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;
     }
 
     /**
 
@@ -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'));
+    }
 }
@@ -71,6 +71,9 @@ public function save(Key $key)
         $this->checkNotExpired($key);
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function waitAndSave(Key $key)
     {
         throw new InvalidArgumentException(sprintf('The store "%s" does not supports blocking locks.', \get_class($this)));
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`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,9 @@ public function save(Key $key)`
`71`	`71`	`$this->checkNotExpired($key);`
`72`	`72`	`}`
`73`	`73`
	`74`	`+ /**`
	`75`	`+ * {@inheritdoc}`
	`76`	`+ */`
`74`	`77`	`public function waitAndSave(Key $key)`
`75`	`78`	`{`
`76`	`79`	`throw new InvalidArgumentException(sprintf('The store "%s" does not supports blocking locks.', \get_class($this)));`