From 96eaf663d3f86b4b8ee828b331e880ee75ca0fc8 Mon Sep 17 00:00:00 2001
From: Tobias Feijten <tobias93@live.nl>
Date: Tue, 25 Feb 2025 21:43:04 +0100
Subject: [PATCH] Remove deprecated spaceless filter applications

---
 .../PrintableColumns/boolean.php.twig         | 12 ++--
 .../PrintableColumns/collection.php.twig      | 12 ++--
 .../PrintableColumns/date.php.twig            | 50 ++++++++--------
 .../PrintableColumns/datetime.php.twig        | 60 +++++++++----------
 .../PrintableColumns/decimal.php.twig         | 10 ++--
 .../PrintableColumns/money.php.twig           | 12 ++--
 .../CommonAdmin/object_actions.php.twig       | 28 ++++-----
 7 files changed, 84 insertions(+), 100 deletions(-)

diff --git a/Resources/views/templates/CommonAdmin/PrintableColumns/boolean.php.twig b/Resources/views/templates/CommonAdmin/PrintableColumns/boolean.php.twig
index 3c3d79a..bf60135 100644
--- a/Resources/views/templates/CommonAdmin/PrintableColumns/boolean.php.twig
+++ b/Resources/views/templates/CommonAdmin/PrintableColumns/boolean.php.twig
@@ -1,9 +1,7 @@
 {% block column_boolean %}
-    {% apply spaceless %}
-        {{ echo_if(builder.ModelClass ~ '.' ~ column.getter) }}
-            <i class="fa fa-check"></i>
-        {{ echo_else() }}
-            <i class="fa fa-times"></i>
-        {{ echo_endif() }}
-    {% endapply %}
+    {{- echo_if(builder.ModelClass ~ '.' ~ column.getter) -}}
+        <i class="fa fa-check"></i>
+    {{- echo_else() -}}
+        <i class="fa fa-times"></i>
+    {{- echo_endif() -}}
 {% endblock %}
diff --git a/Resources/views/templates/CommonAdmin/PrintableColumns/collection.php.twig b/Resources/views/templates/CommonAdmin/PrintableColumns/collection.php.twig
index 116ab55..ede5d05 100644
--- a/Resources/views/templates/CommonAdmin/PrintableColumns/collection.php.twig
+++ b/Resources/views/templates/CommonAdmin/PrintableColumns/collection.php.twig
@@ -1,9 +1,7 @@
 {% block column_collection %}
-    {% apply spaceless %}
-        <ul>
-            {{ echo_for('object', builder.ModelClass ~ '.' ~ column.getter ) }}
-                <li>{{ echo_twig('object') }}</li>
-            {{ echo_endfor() }}
-        </ul>
-    {% endapply %}
+    <ul>
+        {{- echo_for('object', builder.ModelClass ~ '.' ~ column.getter ) -}}
+            <li>{{ echo_twig('object') }}</li>
+        {{- echo_endfor() -}}
+    </ul>
 {% endblock %}
diff --git a/Resources/views/templates/CommonAdmin/PrintableColumns/date.php.twig b/Resources/views/templates/CommonAdmin/PrintableColumns/date.php.twig
index 5d23c7f..f97ac09 100644
--- a/Resources/views/templates/CommonAdmin/PrintableColumns/date.php.twig
+++ b/Resources/views/templates/CommonAdmin/PrintableColumns/date.php.twig
@@ -1,30 +1,28 @@
 {% block column_date %}
-    {% apply spaceless %}
-        {%- if builder.generator.bundleConfig.twig.use_localized_date == true -%}
-            {{ echo_if (builder.ModelClass ~ '.' ~ column.getter) }}
-                {%- if column.localized_date_format is defined -%}
-                    {{ echo_set('localized_date_format', column.formOptions.localized_date_format) }}
-                {%- else -%}
-                    {{ echo_set('localized_date_format', builder.generator.bundleConfig.twig.localized_date_format) }}
-                {%- endif -%}
-                {%- if column.formOptions.format is defined -%}
-                    {{ echo_set('date_format', column.formOptions.format) }}
-                {%- else -%}
-                    {{ echo_set('date_format', builder.generator.bundleConfig.twig.date_format) }}
-                {%- endif -%}
+    {%- if builder.generator.bundleConfig.twig.use_localized_date == true -%}
+        {{ echo_if (builder.ModelClass ~ '.' ~ column.getter) }}
+            {%- if column.localized_date_format is defined -%}
+                {{ echo_set('localized_date_format', column.formOptions.localized_date_format) }}
+            {%- else -%}
+                {{ echo_set('localized_date_format', builder.generator.bundleConfig.twig.localized_date_format) }}
+            {%- endif -%}
+            {%- if column.formOptions.format is defined -%}
+                {{ echo_set('date_format', column.formOptions.format) }}
+            {%- else -%}
+                {{ echo_set('date_format', builder.generator.bundleConfig.twig.date_format) }}
+            {%- endif -%}
 
-                {{ echo_twig(builder.ModelClass ~ '.' ~ column.getter ~ '|format_date(localized_date_format, pattern=date_format)') }}
-            {{ echo_endif() }}
-        {%- else -%}
-            {{ echo_if (builder.ModelClass ~ '.' ~ column.getter) }}
-                {%- if column.formOptions.format is defined -%}
-                    {{ echo_set('date_format', column.formOptions.format) }}
-                {%- else -%}
-                    {{ echo_set('date_format', builder.generator.bundleConfig.twig.date_format) }}
-                {%- endif -%}
+            {{ echo_twig(builder.ModelClass ~ '.' ~ column.getter ~ '|format_date(localized_date_format, pattern=date_format)') }}
+        {{ echo_endif() }}
+    {%- else -%}
+        {{ echo_if (builder.ModelClass ~ '.' ~ column.getter) }}
+            {%- if column.formOptions.format is defined -%}
+                {{ echo_set('date_format', column.formOptions.format) }}
+            {%- else -%}
+                {{ echo_set('date_format', builder.generator.bundleConfig.twig.date_format) }}
+            {%- endif -%}
 
-                {{ echo_twig(builder.ModelClass ~ '.' ~ column.getter ~ '|date(date_format)') }}
-            {{ echo_endif() }}
-        {%- endif -%}
-    {% endapply %}
+            {{ echo_twig(builder.ModelClass ~ '.' ~ column.getter ~ '|date(date_format)') }}
+        {{- echo_endif() }}
+    {%- endif -%}
 {% endblock %}
diff --git a/Resources/views/templates/CommonAdmin/PrintableColumns/datetime.php.twig b/Resources/views/templates/CommonAdmin/PrintableColumns/datetime.php.twig
index 4a85735..ce82f8f 100644
--- a/Resources/views/templates/CommonAdmin/PrintableColumns/datetime.php.twig
+++ b/Resources/views/templates/CommonAdmin/PrintableColumns/datetime.php.twig
@@ -1,35 +1,33 @@
 {% block column_datetime %}
-    {% apply spaceless %}
-        {% if builder.generator.bundleConfig.twig.use_localized_date == true -%}
-            {{ echo_if (builder.ModelClass ~ '.' ~ column.getter) }}
-                {%- if column.localized_date_format is defined -%}
-                    {{ echo_set('localized_date_format', column.formOptions.localized_date_format) }}
-                {%- else -%}
-                    {{ echo_set('localized_date_format', builder.generator.bundleConfig.twig.localized_date_format) }}
-                {%- endif -%}
-                {%- if column.localized_time_format is defined -%}
-                    {{ echo_set('localized_time_format', column.formOptions.localized_datetime_format) }}
-                {%- else -%}
-                    {{ echo_set('localized_time_format', builder.generator.bundleConfig.twig.localized_datetime_format) }}
-                {%- endif -%}
-                {%- if column.formOptions.format is defined -%}
-                    {{ echo_set('datetime_format', column.formOptions.format) }}
-                {%- else -%}
-                    {{ echo_set('datetime_format', builder.generator.bundleConfig.twig.datetime_format) }}
-                {%- endif -%}
+    {% if builder.generator.bundleConfig.twig.use_localized_date == true -%}
+        {{ echo_if (builder.ModelClass ~ '.' ~ column.getter) }}
+            {%- if column.localized_date_format is defined -%}
+                {{ echo_set('localized_date_format', column.formOptions.localized_date_format) }}
+            {%- else -%}
+                {{ echo_set('localized_date_format', builder.generator.bundleConfig.twig.localized_date_format) }}
+            {%- endif -%}
+            {%- if column.localized_time_format is defined -%}
+                {{ echo_set('localized_time_format', column.formOptions.localized_datetime_format) }}
+            {%- else -%}
+                {{ echo_set('localized_time_format', builder.generator.bundleConfig.twig.localized_datetime_format) }}
+            {%- endif -%}
+            {%- if column.formOptions.format is defined -%}
+                {{ echo_set('datetime_format', column.formOptions.format) }}
+            {%- else -%}
+                {{ echo_set('datetime_format', builder.generator.bundleConfig.twig.datetime_format) }}
+            {%- endif -%}
 
-                {{ echo_twig(builder.ModelClass ~ '.' ~ column.getter ~ '|format_datetime(localized_date_format, localized_time_format, pattern=datetime_format)') }}
-            {{ echo_endif() }}
-        {%- else -%}
-            {{ echo_if (builder.ModelClass ~ '.' ~ column.getter) }}
-                {% if column.formOptions.format is defined %}
-                    {{ echo_set('datetime_format', column.formOptions.format) }}
-                {% else %}
-                    {{ echo_set('datetime_format', builder.generator.bundleConfig.twig.datetime_format) }}
-                {% endif %}
+            {{ echo_twig(builder.ModelClass ~ '.' ~ column.getter ~ '|format_datetime(localized_date_format, localized_time_format, pattern=datetime_format)') }}
+        {{ echo_endif() }}
+    {%- else -%}
+        {{ echo_if (builder.ModelClass ~ '.' ~ column.getter) }}
+            {% if column.formOptions.format is defined %}
+                {{ echo_set('datetime_format', column.formOptions.format) }}
+            {% else %}
+                {{ echo_set('datetime_format', builder.generator.bundleConfig.twig.datetime_format) }}
+            {% endif %}
 
-                {{ echo_twig(builder.ModelClass ~ '.' ~ column.getter ~ '|date(datetime_format)') }}
-            {{ echo_endif() }}
-        {%- endif %}
-    {% endapply %}
+            {{ echo_twig(builder.ModelClass ~ '.' ~ column.getter ~ '|date(datetime_format)') }}
+        {{ echo_endif() }}
+    {%- endif %}
 {% endblock %}
diff --git a/Resources/views/templates/CommonAdmin/PrintableColumns/decimal.php.twig b/Resources/views/templates/CommonAdmin/PrintableColumns/decimal.php.twig
index df71b21..f13d382 100644
--- a/Resources/views/templates/CommonAdmin/PrintableColumns/decimal.php.twig
+++ b/Resources/views/templates/CommonAdmin/PrintableColumns/decimal.php.twig
@@ -1,8 +1,6 @@
 {% block column_decimal %}
-    {% apply spaceless %}
-        {{- echo_twig(builder.ModelClass ~ '.' ~ column.getter ~ "|number_format(" ~
-            column.formOptions.precision|default(admingenerator_config('twig.number_format.decimal')) ~ ", '" ~
-            admingenerator_config('twig.number_format.decimal_point') ~ "', '" ~
-            admingenerator_config('twig.number_format.thousand_separator')~ "')") -}}
-    {% endapply %}
+    {{- echo_twig(builder.ModelClass ~ '.' ~ column.getter ~ "|number_format(" ~
+        column.formOptions.precision|default(admingenerator_config('twig.number_format.decimal')) ~ ", '" ~
+        admingenerator_config('twig.number_format.decimal_point') ~ "', '" ~
+        admingenerator_config('twig.number_format.thousand_separator')~ "')") -}}
 {% endblock %}
diff --git a/Resources/views/templates/CommonAdmin/PrintableColumns/money.php.twig b/Resources/views/templates/CommonAdmin/PrintableColumns/money.php.twig
index 4216509..6a01ea9 100644
--- a/Resources/views/templates/CommonAdmin/PrintableColumns/money.php.twig
+++ b/Resources/views/templates/CommonAdmin/PrintableColumns/money.php.twig
@@ -1,10 +1,8 @@
 {% block column_money %}
-    {% apply spaceless %}
-        {% set currency   = column.formOptions.currency|default('EUR') %}
-        {% set precision  = column.formOptions.precision|default(2) %}
-        {% set grouping   = column.formOptions.grouping|default(true) %}
-        {% set divisor    = column.formOptions.divisor|default(1) %}
+    {% set currency   = column.formOptions.currency|default('EUR') %}
+    {% set precision  = column.formOptions.precision|default(2) %}
+    {% set grouping   = column.formOptions.grouping|default(true) %}
+    {% set divisor    = column.formOptions.divisor|default(1) %}
 
-        {{ echo_twig('localized_money('~ builder.ModelClass~'.'~column.getter ~', "'~ currency ~'", "'~ precision ~'", '~ grouping ~', '~ divisor ~')') }}
-    {% endapply %}
+    {{- echo_twig('localized_money('~ builder.ModelClass~'.'~column.getter ~', "'~ currency ~'", "'~ precision ~'", '~ grouping ~', '~ divisor ~')') -}}
 {% endblock %}
diff --git a/Resources/views/templates/CommonAdmin/object_actions.php.twig b/Resources/views/templates/CommonAdmin/object_actions.php.twig
index 711c5c9..0249c51 100644
--- a/Resources/views/templates/CommonAdmin/object_actions.php.twig
+++ b/Resources/views/templates/CommonAdmin/object_actions.php.twig
@@ -33,22 +33,18 @@
     {% set actionParams = action.params ? echo_twig_assoc(action.params) : "{ 'pk': " ~ builder.ModelClass ~ "." ~ builder.getFieldGuesser().getModelPrimaryKeyName(model) ~ ", action: '" ~ action.name ~ "' }" %}
     {% set translationDomain = action.type is same as('custom') ? i18n_catalog|default("Admin") : 'Admingenerator' %}
 
-    {% apply spaceless %}
-        {{ echo_spaceless() }}
-        <a  class="object-action btn btn-default {% if builder.yamlKey is same as('list') or builder.yamlKey is same as('nested_list') %}btn-xs {% endif %}{{ action.class|default('') }}"
-            href="{{ echo_path(actionRoute, actionParams) }}"
-            title="{{ echo_trans(action.label, {}, translationDomain, 'html_attr') }}"
-                {%- if action.confirm and not action.forceIntermediate %}
-                    data-confirm="{{ echo_trans(action.confirm, {}, translationDomain, 'html_attr') }}"
-                    data-confirm-modal="{{ action.confirmModal|default('#confirmObjectModal') }}"
-                    data-toggle="modal"
-                {% endif -%}
-                {%- if action.csrfProtected and not action.forceIntermediate %} data-csrf-token="{{ echo_path(actionRoute, actionParams, ['csrf_token']) }}" {% endif -%}>
-            <i class="fa fa-fw {{ action.icon|default('fa-square fa-regular') }}"></i>
-            <span>{{ echo_trans(action.label, {}, translationDomain, 'html') }}</span>
-        </a>
-        {{ echo_endspaceless() }}
-    {% endapply %}
+    <a  class="object-action btn btn-default {% if builder.yamlKey is same as('list') or builder.yamlKey is same as('nested_list') %}btn-xs {% endif %}{{ action.class|default('') }}"
+        href="{{ echo_path(actionRoute, actionParams) }}"
+        title="{{ echo_trans(action.label, {}, translationDomain, 'html_attr') }}"
+            {%- if action.confirm and not action.forceIntermediate %}
+                data-confirm="{{ echo_trans(action.confirm, {}, translationDomain, 'html_attr') }}"
+                data-confirm-modal="{{ action.confirmModal|default('#confirmObjectModal') }}"
+                data-toggle="modal"
+            {% endif -%}
+            {%- if action.csrfProtected and not action.forceIntermediate %} data-csrf-token="{{ echo_path(actionRoute, actionParams, ['csrf_token']) }}" {% endif -%}>
+        <i class="fa fa-fw {{ action.icon|default('fa-square fa-regular') }}"></i>
+        <span>{{ echo_trans(action.label, {}, translationDomain, 'html') }}</span>
+    </a>
 {% endblock %}
 
 {% block object_actions_script %}