Skip to content

Commit 42dcf4d

Browse files
committed
Merge branch '5.3' into 5.4
* 5.3: [Tests] Remove some unused fixtures added missing translations for portuguese [#43726] [HttpClient][Mime] Add correct IDN flags for IDNA2008 compliance properly parse quoted strings tagged with !!str do not merge label classes into expanded choice labels [Serializer] PropertyNormalizer - return unique (i.e. filter duplicate ) attributes in extractAttributes function
2 parents 97b844c + 90e2f25 commit 42dcf4d

File tree

3 files changed

+0
-9
lines changed

3 files changed

+0
-9
lines changed

Resources/views/Form/bootstrap_3_layout.html.twig

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,6 @@
9090
{%- if required -%}
9191
{%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' required')|trim}) -%}
9292
{%- endif -%}
93-
{%- if parent_label_class is defined -%}
94-
{%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' ' ~ parent_label_class)|trim}) -%}
95-
{%- endif -%}
9693
{%- if label is not same as(false) and label is empty -%}
9794
{%- if label_format is not empty -%}
9895
{%- set label = label_format|replace({

Resources/views/Form/bootstrap_4_layout.html.twig

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -283,9 +283,6 @@
283283
{%- if required -%}
284284
{%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' required')|trim}) -%}
285285
{%- endif -%}
286-
{%- if parent_label_class is defined -%}
287-
{%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' ' ~ parent_label_class)|replace({'checkbox-inline': '', 'radio-inline': '', 'checkbox-custom': '', 'radio-custom': ''})|trim}) -%}
288-
{%- endif -%}
289286
{%- if label is not same as(false) and label is empty -%}
290287
{%- if label_format is not empty -%}
291288
{%- set label = label_format|replace({

Resources/views/Form/foundation_5_layout.html.twig

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -253,9 +253,6 @@
253253
{% if errors|length > 0 -%}
254254
{% set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' error')|trim}) %}
255255
{% endif %}
256-
{% if parent_label_class is defined %}
257-
{% set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ parent_label_class)|trim}) %}
258-
{% endif %}
259256
{% if label is empty %}
260257
{%- if label_format is not empty -%}
261258
{% set label = label_format|replace({

0 commit comments

Comments
 (0)