8000 bug #30505 [TwigBridge] Remove usages of the spaceless tag (nicolas-g… · symfony/symfony@c6a35ac · GitHub
[go: up one dir, main page]
Skip to content

Commit c6a35ac

Browse files
nicolas-grekasnicolas-grekas
committed
bug #30505 [TwigBridge] Remove usages of the spaceless tag (nicolas-grekas)
This PR was merged into the 3.4 branch. Discussion ---------- [TwigBridge] Remove usages of the spaceless tag | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - The spaceless tag is deprecated since version 2.7. Commits ------- 2ee178b [TwigBridge] Remove use spaceless tag
2 parents d583f80 + 2ee178b commit c6a35ac

File tree

4 files changed

+17
-29
lines changed

4 files changed

+17
-29
lines changed

‎src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/custom_widgets.html.twig

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,19 @@
1-
{% block _text_id_widget %}
2-
{% spaceless %}
1+
{% block _text_id_widget -%}
32
<div id="container">
4-
{{ form_widget(form) }}
3+
{{- form_widget(form) -}}
54
</div>
6-
{% endspaceless %}
7-
{% endblock _text_id_widget %}
5+
{%- endblock _text_id_widget %}
86

9-
{% block _names_entry_label %}
10-
{% spaceless %}
7+
{% block _names_entry_label -%}
118
{% if label is empty %}
12-
{% set label = name|humanize %}
13-
{% endif %}
9+
{%- set label = name|humanize -%}
10+
{% endif -%}
1411
<label>Custom label: {{ label|trans({}, translation_domain) }}</label>
15-
{% endspaceless %}
16-
{% endblock _names_entry_label %}
12+
{%- endblock _names_entry_label %}
1713

18-
{% block _name_c_entry_label %}
19-
{% spaceless %}
14+
{% block _name_c_entry_label -%}
2015
{% if label is empty %}
21-
{% set label = name|humanize %}
22-
{% endif %}
16+
{%- set label = name|humanize -%}
17+
{% endif -%}
2318
<label>Custom name label: {{ label|trans({}, translation_domain) }}</label>
24-
{% endspaceless %}
25-
{% endblock _name_c_entry_label %}
19+
{%- endblock _name_c_entry_label %}

‎src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/theme.html.twig

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
{% block form_widget_simple %}
2-
{% spaceless %}
3-
{% set type = type|default('text') %}
2+
{%- set type = type|default('text') -%}
43
<input type="{{ type }}" {{ block('widget_attributes') }} value="{{ value }}" rel="theme" />
5-
{% endspaceless %}
6-
{% endblock form_widget_simple %}
4+
{%- endblock form_widget_simple %}

‎src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/theme_extends.html.twig

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
{% extends 'form_div_layout.html.twig' %}
22

33
{% block form_widget_simple %}
4-
{% spaceless %}
5-
{% set type = type|default('text') %}
4+
{%- set type = type|default('text') -%}
65
<input type="{{ type }}" {{ block('widget_attributes') }} value="{{ value }}" rel="theme" />
7-
{% endspaceless %}
8-
{% endblock form_widget_simple %}
6+
{%- endblock form_widget_simple %}

‎src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/theme_use.html.twig

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
{% use 'form_div_layout.html.twig' %}
22

33
{% block form_widget_simple %}
4-
{% spaceless %}
5-
{% set type = type|default('text') %}
4+
{%- set type = type|default('text') -%}
65
<input type="{{ type }}" {{ block('widget_attributes') }} value="{{ value }}" rel="theme" />
7-
{% endspaceless %}
8-
{% endblock form_widget_simple %}
6+
{%- endblock form_widget_simple %}

0 commit comments

Comments
 (0)
0