Merge pull request #795 from KnpLabs/fix-twig-cs

fix coding standard in templates
KnpLabs · Jul 2, 2024 · cf9d768 · cf9d768
2 parents a9cbcb3 + 695797f
commit cf9d768
Show file tree

Hide file tree

Showing 12 changed files with 30 additions and 15 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -25,8 +25,22 @@ jobs:
               uses: actions/checkout@v4
             - name: Run PHP-CS-Fixer
               uses: docker://oskarstark/php-cs-fixer-ga
+
+    twig-cs-fixer:
+        runs-on: ubuntu-22.04
+        name: Twig-CS-Fixer
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v4
+            - name: Require the vendor
+              run: composer require --dev --no-update vincentlanglet/twig-cs-fixer ^2.11
+            - name: Update
+              run: composer update --no-interaction --no-progress
+            - name: Run
+              run: vendor/bin/twig-cs-fixer lint templates
+
     tests:
-        runs-on: ubuntu-20.04
+        runs-on: ubuntu-22.04
         strategy:
             matrix:
                 php:
@@ -38,6 +52,7 @@ jobs:
                 symfony:
                   - '6.4.*'
                   - '7.0.*'
+                  - '7.1.*'
                 include:
                   - php: '8.1'
                     symfony: '6.4.*'

diff --git a/templates/Pagination/bootstrap_v5_bi_sortable_link.html.twig b/templates/Pagination/bootstrap_v5_bi_sortable_link.html.twig
@@ -7,7 +7,7 @@
  * Overview:         https://icons.getbootstrap.com/
  */
 #}
-<a{% for attr, value  in options %} {{ attr }}="{{ value }}"{% endfor %}>
+<a{% for attr, value in options %} {{ attr }}="{{ value }}"{% endfor %}>
     <span class="float-end">
         {% if sorted %}
             {% if direction == 'desc' %}

diff --git a/templates/Pagination/bootstrap_v5_fa_sortable_link.html.twig b/templates/Pagination/bootstrap_v5_fa_sortable_link.html.twig
@@ -4,7 +4,7 @@
  * Bootstrap v5 with Font Awesome Sorting control implementation.
  */
 #}
-<a{% for attr, value  in options %} {{ attr }}="{{ value }}"{% endfor %}>
+<a{% for attr, value in options %} {{ attr }}="{{ value }}"{% endfor %}>
     <span class="float-end">
         {% if sorted %}
             {% if direction == 'desc' %}

diff --git a/templates/Pagination/bootstrap_v5_md_sortable_link.html.twig b/templates/Pagination/bootstrap_v5_md_sortable_link.html.twig
@@ -7,7 +7,7 @@
  * Overview:         https://material.io/resources/icons/?style=baseline
  */
 #}
-<a{% for attr, value  in options %} {{ attr }}="{{ value }}"{% endfor %}>
+<a{% for attr, value in options %} {{ attr }}="{{ value }}"{% endfor %}>
     <span class="float-end">
         {% if sorted %}
             {% if direction == 'desc' %}

diff --git a/templates/Pagination/foundation_v5_pagination.html.twig b/templates/Pagination/foundation_v5_pagination.html.twig
@@ -3,7 +3,7 @@
  * @file
  * Foundation 5 Sliding pagination control implementation.
  *
- * View that can be used with the pagination module 
+ * View that can be used with the pagination module
  * from the Foundation 5 CSS Toolkit
  * https://get.foundation/sites/docs-v5/components/pagination.html
  *
@@ -70,7 +70,7 @@
                 {% else %}
                     <li>
                         <a href="{{ path(route, query|merge({(pageParameterName): (pageCount - 1)})) }}">
-                            {{ pageCount -1 }}
+                            {{ pageCount - 1 }}
                         </a>
                     </li>
                 {% endif %}

diff --git a/templates/Pagination/foundation_v6_pagination.html.twig b/templates/Pagination/foundation_v6_pagination.html.twig
@@ -47,7 +47,7 @@
                     {% else %}
                         <li>
                             <a href="{{ path(route, query|merge({(pageParameterName): (pageCount - 1)})) }}">
-                                {{ pageCount -1 }}
+                                {{ pageCount - 1 }}
                             </a>
                         </li>
                     {% endif %}

diff --git a/templates/Pagination/semantic_ui_sortable_link.html.twig b/templates/Pagination/semantic_ui_sortable_link.html.twig
@@ -1,4 +1,4 @@
-<a{% for attr, value  in options %} {{ attr }}="{{ value }}"{% endfor %}>
+<a{% for attr, value in options %} {{ attr }}="{{ value }}"{% endfor %}>
     <span class="right floated">
         {% if sorted %}
             {% if direction == 'desc' %}

diff --git a/templates/Pagination/twitter_bootstrap_v4_font_awesome_sortable_link.html.twig b/templates/Pagination/twitter_bootstrap_v4_font_awesome_sortable_link.html.twig
@@ -6,7 +6,7 @@
  * @author Rodrigo Régis Palmeira <[email protected]>
  */
 #}
-<a{% for attr, value  in options %} {{ attr }}="{{ value }}"{% endfor %}>
+<a{% for attr, value in options %} {{ attr }}="{{ value }}"{% endfor %}>
     <span class="float-right">
         {% if sorted %}
             {% if direction == 'desc' %}

diff --git a/templates/Pagination/twitter_bootstrap_v4_material_design_icons_sortable_link.html.twig b/templates/Pagination/twitter_bootstrap_v4_material_design_icons_sortable_link.html.twig
@@ -9,7 +9,7 @@
  * @author Mike Stuebbe <[email protected]>
  */
 #}
-<a{% for attr, value  in options %} {{ attr }}="{{ value }}"{% endfor %}>
+<a{% for attr, value in options %} {{ attr }}="{{ value }}"{% endfor %}>
     <span class="float-right">
         {% if sorted %}
             {% if direction == 'desc' %}

diff --git a/templates/Pagination/twitter_bootstrap_v4_pagination.html.twig b/templates/Pagination/twitter_bootstrap_v4_pagination.html.twig
@@ -11,8 +11,8 @@
 #}
 {% if pageCount > 1 %}
     <nav>
-        {% set classAlign = (align is not defined) ? '' : align=='center' ? ' justify-content-center' : (align=='right' ? ' justify-content-end' : '') %}
-        {% set classSize = (size is not defined) ? '' : size=='large' ? ' pagination-lg' : (size=='small' ? ' pagination-sm' : '') %}
+        {% set classAlign = (align is not defined) ? '' : align == 'center' ? ' justify-content-center' : (align == 'right' ? ' justify-content-end' : '') %}
+        {% set classSize = (size is not defined) ? '' : size == 'large' ? ' pagination-lg' : (size == 'small' ? ' pagination-sm' : '') %}
         <ul class="pagination{{ classAlign }}{{ classSize }}">
 
             {% if previous is defined %}
@@ -61,7 +61,7 @@
                         </li>
                     {% else %}
                         <li class="page-item">
-                            <a class="page-link" href="{{ path(route, query|merge({(pageParameterName): (pageCount - 1)})) }}">{{ pageCount -1 }}</a>
+                            <a class="page-link" href="{{ path(route, query|merge({(pageParameterName): (pageCount - 1)})) }}">{{ pageCount - 1 }}</a>
                         </li>
                     {% endif %}
                 {% endif %}

diff --git a/templates/Pagination/uikit_v3_pagination.html.twig b/templates/Pagination/uikit_v3_pagination.html.twig
@@ -60,7 +60,7 @@
                         </li>
                     {% else %}
                         <li>
-                            <a href="{{ path(route, query|merge({(pageParameterName): (pageCount - 1)})) }}">{{ pageCount -1 }}</a>
+                            <a href="{{ path(route, query|merge({(pageParameterName): (pageCount - 1)})) }}">{{ pageCount - 1 }}</a>
                         </li>
                     {% endif %}
                 {% endif %}

diff --git a/templates/Pagination/uikit_v3_sortable.html.twig b/templates/Pagination/uikit_v3_sortable.html.twig
@@ -6,7 +6,7 @@
  * @author KULDIP PIPALIYA <[email protected]>
  */
 #}
-<a{% for attr, value  in options %} {{ attr }}="{{ value }}"{% endfor %} style="color: #000;">
+<a{% for attr, value in options %} {{ attr }}="{{ value }}"{% endfor %} style="color: #000;">
 <span class="pull-right">
         {% if sorted %}
             {% if direction == 'desc' %}