phpstan level 3, fixed deprecations, code cleanup (#811)

templates/macros/actions.html.twig

@@ -247,7 +247,7 @@
 {% endmacro %}
 
 {% macro timesheet(timesheet, view) %}
-    {%- filter spaceless -%}
+    {%- apply spaceless -%}
     {% import "macros/widgets.html.twig" as widgets %}
     {% set actions = {} %}
 
@@ -283,7 +283,7 @@
     {% else %}
         {{ widgets.entity_actions(event.payload.actions) }}
     {% endif %}
-    {%- endfilter -%}
+    {%- endapply -%}
 {% endmacro %}
 
 {% macro timesheets_team(view) %}

templates/macros/datatables.html.twig

@@ -31,7 +31,7 @@
 {% endmacro %}
 
 {% macro data_table_column_class(name, columns, column) %}
-{% spaceless %}
+{% apply spaceless %}
     {% set class = '' %}
     {% set always = false %}
 
@@ -67,7 +67,7 @@
     {% if not class is empty %}
         {{ class }}
     {% endif %}
-{% endspaceless %}
+{% endapply %}
 {% endmacro %}
 
 {% macro data_table_header_options(name, columns, options) %}

templates/macros/widgets.html.twig

@@ -180,7 +180,7 @@
             <button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" aria-expanded="false">{{ 'label.actions'|trans }}
                 <span class="fa fa-caret-down"></span></button>
             <ul class="dropdown-menu dropdown-menu-right">
-                {%- filter spaceless -%}
+                {%- apply spaceless -%}
                     {%- for icon,values in actions  %}
                         {% set class = '' %}
                         {% if icon == 'trash' %}
@@ -197,7 +197,7 @@
                             {% endif %}
                         </li>
                     {% endfor -%}
-                {% endfilter %}
+                {% endapply %}
             </ul>
         </div>
     {% endif %}
@@ -205,7 +205,7 @@
 
 {% macro action_button(icon, values, type) %}
     {%- import _self as macro -%}
-    {%- filter spaceless -%}
+    {%- apply spaceless -%}
         {% set id = null %}
         {% set onclick = null %}
         {% set modal = null %}
@@ -278,17 +278,17 @@
                     {%- endfor -%}
                 {%- endif -%}
         >{% if title is not null %}{{ title }}{% else %}{{ macro.icon(icon) }}{% endif %}</a>
-    {% endfilter %}
+    {% endapply %}
 {% endmacro %}
 
 {% macro button_group(actions, type) %}
     {%- import _self as macro -%}
     <div class="btn-group">
-        {%- filter spaceless -%}
+        {%- apply spaceless -%}
         {%- for icon,values in actions  %}
             {{ macro.action_button(icon, values, type) }}
         {% endfor -%}
-        {% endfilter %}
+        {% endapply %}
     </div>
 {% endmacro %}