Skip to content

Commit b403745

Browse files
Merge branch '4.0' into 4.1
* 4.0: [Filesystem] fix lock file permissions [Lock] fix lock file permissions [Form] Removed .form-control-label class. Removed .mb-0 in errors. Fix the detection of the Process new argument add @xabbuh as a code owner of the Yaml component improve deprecation messages Replace .initialism with .text-uppercase.
2 parents 5fb0f30 + 87a4614 commit b403745

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

Resources/views/Form/bootstrap_4_layout.html.twig

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@
189189
{% elseif type is defined and type == 'file' %}
190190
{%- set label_attr = label_attr|merge({for: id, class: (label_attr.class|default('') ~ ' custom-file-label')|trim}) -%}
191191
{%- else -%}
192-
{%- set label_attr = label_attr|merge({for: id, class: (label_attr.class|default('') ~ ' form-control-label')|trim}) -%}
192+
{%- set label_attr = label_attr|merge({for: id}) -%}
193193
{%- endif -%}
194194
{% if required -%}
195195
{% set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' required')|trim}) %}
@@ -284,8 +284,8 @@
284284
{%- if errors|length > 0 -%}
285285
<span class="{% if form is not rootform %}invalid-feedback{% else %}alert alert-danger{% endif %} d-block">
286286
{%- for error in errors -%}
287-
<span class="mb-0 d-block">
288-
<span class="initialism form-error-icon badge badge-danger">{{ 'Error'|trans({}, 'validators') }}</span> <span class="form-error-message">{{ error.message }}</span>
287+
<span class="d-block">
288+
<span class="form-error-icon badge badge-danger text-uppercase">{{ 'Error'|trans({}, 'validators') }}</span> <span class="form-error-message">{{ error.message }}</span>
289289
</span>
290290
{%- endfor -%}
291291
</span>

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"symfony/asset": "~3.4|~4.0",
2424
"symfony/dependency-injection": "~3.4|~4.0",
2525
"symfony/finder": "~3.4|~4.0",
26-
"symfony/form": "^4.1",
26+
"symfony/form": "^4.1.2",
2727
"symfony/http-foundation": "~3.4|~4.0",
2828
"symfony/http-kernel": "~3.4|~4.0",
2929
"symfony/polyfill-intl-icu": "~1.0",
@@ -41,7 +41,7 @@
4141
"symfony/workflow": "~3.4|~4.0"
4242
},
4343
"conflict": {
44-
"symfony/form": "<4.1",
44+
"symfony/form": "<4.1.2",
4545
"symfony/console": "<3.4"
4646
},
4747
"suggest": {

0 commit comments

Comments
 (0)