Skip to content

Commit 2575983

Browse files
Merge branch '2.8' into 3.3
* 2.8: fix merge 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 cc40b1e + 125e5ea commit 2575983

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
@@ -186,10 +186,14 @@
186186
{% endblock %}
187187

188188
{% block checkbox_label -%}
189+
{%- set label_attr = label_attr|merge({'for': id}) -%}
190+
189191
{{- block('checkbox_radio_label') -}}
190192
{%- endblock checkbox_label %}
191193

192194
{% block radio_label -%}
195+
{%- set label_attr = label_attr|merge({'for': id}) -%}
196+
193197
{{- block('checkbox_radio_label') -}}
194198
{%- endblock radio_label %}
195199

Tests/AppVariableTest.php

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

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

composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
"symfony/asset": "~2.8|~3.0",
2525
"symfony/finder": "~2.8|~3.0",
2626
"symfony/form": "^3.2.10|^3.3.3",
27+
"symfony/http-foundation": "^3.3.11",
2728
"symfony/http-kernel": "~3.2",
2829
"symfony/polyfill-intl-icu": "~1.0",
2930
"symfony/routing": "~2.8|~3.0",

0 commit comments

Comments
 (0)