Skip to content

Commit 125e5ea

Browse files
Merge branch '2.7' into 2.8
* 2.7: Fix 7.2 compat layer Fix PHP 7.2 support [HttpFoundation] Add missing session.lazy_write config option [HttpFoundation] Combine Cache-Control headers [Form] fix parsing invalid floating point numbers Escape command usage when displaying it in the text descriptor Use for=ID on radio/checkbox label.
2 parents 624cfc9 + c8c8f0f commit 125e5ea

File tree

3 files changed

+8
-0
lines changed

3 files changed

+8
-0
lines changed

Resources/views/Form/bootstrap_3_layout.html.twig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,10 +148,14 @@
148148
{% endblock %}
149149

150150
{% block checkbox_label -%}
151+
{%- set label_attr = label_attr|merge({'for': id}) -%}
152+
151153
{{- block('checkbox_radio_label') -}}
152154
{%- endblock checkbox_label %}
153155

154156
{% block radio_label -%}
157+
{%- set label_attr = label_attr|merge({'for': id}) -%}
158+
155159
{{- block('checkbox_radio_label') -}}
156160
{%- endblock radio_label %}
157161

Tests/AppVariableTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ public function testEnvironment()
4444
$this->assertEquals('dev', $this->appVariable->getEnvironment());
4545
}
4646

47+
/**
48+
* @runInSeparateProcess
49+
*/
4750
public function testGetSession()
4851
{
4952
$request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->getMock();

composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
"symfony/asset": "~2.7|~3.0.0",
2424
"symfony/finder": "~2.3|~3.0.0",
2525
"symfony/form": "^2.8.23",
26+
"symfony/http-foundation": "^2.8.29|~3.0.0",
2627
"symfony/http-kernel": "~2.8|~3.0.0",
2728
"symfony/polyfill-intl-icu": "~1.0",
2829
"symfony/routing": "~2.2|~3.0.0",

0 commit comments

Comments
 (0)