Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
bug #30505 [TwigBridge] Remove usages of the spaceless tag (nicolas-g…
…rekas) 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
- Loading branch information
Showing
4 changed files
with
17 additions
and
29 deletions.
There are no files selected for viewing
28 changes: 11 additions & 17 deletions
28
src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/custom_widgets.html.twig
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,25 +1,19 @@ | ||
{% block _text_id_widget %} | ||
{% spaceless %} | ||
{% block _text_id_widget -%} | ||
<div id="container"> | ||
{{ form_widget(form) }} | ||
{{- form_widget(form) -}} | ||
</div> | ||
{% endspaceless %} | ||
{% endblock _text_id_widget %} | ||
{%- endblock _text_id_widget %} | ||
|
||
{% block _names_entry_label %} | ||
{% spaceless %} | ||
{% block _names_entry_label -%} | ||
{% if label is empty %} | ||
{% set label = name|humanize %} | ||
{% endif %} | ||
{%- set label = name|humanize -%} | ||
{% endif -%} | ||
<label>Custom label: {{ label|trans({}, translation_domain) }}</label> | ||
{% endspaceless %} | ||
{% endblock _names_entry_label %} | ||
{%- endblock _names_entry_label %} | ||
|
||
{% block _name_c_entry_label %} | ||
{% spaceless %} | ||
{% block _name_c_entry_label -%} | ||
{% if label is empty %} | ||
{% set label = name|humanize %} | ||
{% endif %} | ||
{%- set label = name|humanize -%} | ||
{% endif -%} | ||
<label>Custom name label: {{ label|trans({}, translation_domain) }}</label> | ||
{% endspaceless %} | ||
{% endblock _name_c_entry_label %} | ||
{%- endblock _name_c_entry_label %} |
6 changes: 2 additions & 4 deletions
6
src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/theme.html.twig
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,4 @@ | ||
{% block form_widget_simple %} | ||
{% spaceless %} | ||
{% set type = type|default('text') %} | ||
{%- set type = type|default('text') -%} | ||
<input type="{{ type }}" {{ block('widget_attributes') }} value="{{ value }}" rel="theme" /> | ||
{% endspaceless %} | ||
{% endblock form_widget_simple %} | ||
{%- endblock form_widget_simple %} |
6 changes: 2 additions & 4 deletions
6
src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/theme_extends.html.twig
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,6 @@ | ||
{% extends 'form_div_layout.html.twig' %} | ||
|
||
{% block form_widget_simple %} | ||
{% spaceless %} | ||
{% set type = type|default('text') %} | ||
{%- set type = type|default('text') -%} | ||
<input type="{{ type }}" {{ block('widget_attributes') }} value="{{ value }}" rel="theme" /> | ||
{% endspaceless %} | ||
{% endblock form_widget_simple %} | ||
{%- endblock form_widget_simple %} |
6 changes: 2 additions & 4 deletions
6
src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/theme_use.html.twig
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,6 @@ | ||
{% use 'form_div_layout.html.twig' %} | ||
|
||
{% block form_widget_simple %} | ||
{% spaceless %} | ||
{% set type = type|default('text') %} | ||
{%- set type = type|default('text') -%} | ||
<input type="{{ type }}" {{ block('widget_attributes') }} value="{{ value }}" rel="theme" /> | ||
{% endspaceless %} | ||
{% endblock form_widget_simple %} | ||
{%- endblock form_widget_simple %} |