Skip to content

Commit 5695b11

Browse files
Merge branch '3.4'
* 3.4: [TwigBridge] Fixed the .form-check-input class in the bs4 templates [Console] Fix traversable autocomplete values [SecurityBundle] Improve deprecations [DI] Friendlier name for generated container in "as_files" mode [Debug] Remove false-positive deprecation from DebugClassLoader [SecurityBundle] Add missing quotes in deprecation messages [ExpressionLanguage] Fix PhpDoc type-hints on Token value bumped Symfony version to 3.3.12 Add default translations path option and convention updated VERSION for 3.3.11 updated CHANGELOG for 3.3.11 bumped Symfony version to 2.8.30 updated VERSION for 2.8.29 updated CHANGELOG for 2.8.29 bumped Symfony version to 2.7.37 updated VERSION for 2.7.36 update CONTRIBUTORS for 2.7.36 updated CHANGELOG for 2.7.36
2 parents 9ecbe06 + 93ab5dc commit 5695b11

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Resources/views/Form/bootstrap_4_layout.html.twig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171

7272
{% block checkbox_widget -%}
7373
{%- set parent_label_class = parent_label_class|default(label_attr.class|default('')) -%}
74-
{%- set attr = attr|merge({class: attr.class|default('form-check-input')}) -%}
74+
{%- set attr = attr|merge({class: (attr.class|default('') ~ ' form-check-input')|trim}) -%}
7575
{% if 'checkbox-inline' in parent_label_class %}
7676
{{- form_label(form, null, { widget: parent() }) -}}
7777
{% else -%}
@@ -83,7 +83,7 @@
8383

8484
{% block radio_widget -%}
8585
{%- set parent_label_class = parent_label_class|default(label_attr.class|default('')) -%}
86-
{%- set attr = attr|merge({class: attr.class|default('form-check-input')}) -%}
86+
{%- set attr = attr|merge({class: (attr.class|default('') ~ ' form-check-input')|trim}) -%}
8787
{%- if 'radio-inline' in parent_label_class -%}
8888
{{- form_label(form, null, { widget: parent() }) -}}
8989
{%- else -%}

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"symfony/asset": "~3.4|~4.0",
2525
"symfony/dependency-injection": "~3.4|~4.0",
2626
"symfony/finder": "~3.4|~4.0",
27-
"symfony/form": "~3.4-beta2|~4.0-beta2",
27+
"symfony/form": "~3.4-beta4|~4.0-beta4",
2828
"symfony/http-foundation": "~3.4|~4.0",
2929
"symfony/http-kernel": "~3.4|~4.0",
3030
"symfony/polyfill-intl-icu": "~1.0",

0 commit comments

Comments
 (0)