Skip to content

Commit 9563cd0

Browse files
author
Ian Thomas
committed
Replace deprecated spaceless tag with apply
Minimum twig version increased to match Symfony 3.4 and ensure the apply tag is available
1 parent 7a54d8b commit 9563cd0

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

Resources/views/Form/fields.html.twig

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{% block comur_image_widget %}
22
{% trans_default_domain comur_translation_domain %}
33
{# trans_default_domain 'ComurImageBundle' #}
4-
{% spaceless %}
4+
{% apply spaceless %}
55
{# block('form_widget_simple') #}
66
{{ form_widget(form[name])}}
77
{% if options.uploadConfig.saveOriginal %}
@@ -35,7 +35,7 @@
3535

3636
</div>
3737
</div>
38-
{% endspaceless %}
38+
{% endapply %}
3939

4040
<script>
4141
$(document).ready(function(){
@@ -80,7 +80,7 @@
8080
{% trans_default_domain comur_translation_domain %}
8181
{# trans_default_domain 'ComurImageBundle' #}
8282

83-
{% spaceless %}
83+
{% apply spaceless %}
8484
{{- form_errors(form) -}}
8585
<div class="field-error clearfix hidden">
8686
<div id="{{form[name].vars.id}}_widget_error" class="alert alert-danger span6">
@@ -108,7 +108,7 @@
108108
</div>
109109

110110

111-
{% endspaceless %}
111+
{% endapply %}
112112

113113
<script>
114114

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"symfony/routing": "~3.4 || ~4.2",
2222
"symfony/config": "~3.4 || ~4.2",
2323
"symfony/twig-bridge": "~3.4 || ~4.2",
24-
"twig/twig": "~1.35 || ~2.5",
24+
"twig/twig": "^1.41 || ^2.10",
2525
"twig/extensions": "~1.0",
2626
"friendsofsymfony/jsrouting-bundle": "@stable",
2727
"jms/translation-bundle": "^1.2.2"

0 commit comments

Comments
 (0)