1322: Applied Twig coding standards

Author: rimi-itk

.gitignore

@@ -201,3 +201,4 @@ yarn-error.log
 .DS_Store
 
 .env*.local
+.twig-cs-fixer.cache

.twig-cs-fixer.php

@@ -0,0 +1,9 @@
+<?php
+
+// @see https://github.com/VincentLanglet/Twig-CS-Fixer/blob/main/docs/configuration.md#standard
+$config = new TwigCsFixer\Config\Config();
+
+// @see https://github.com/VincentLanglet/Twig-CS-Fixer/pull/134#issuecomment-1756924889
+$config->addTokenParser(new Drupal\Core\Template\TwigTransTokenParser());
+
+return $config;

composer.json

@@ -65,13 +65,13 @@
         "drupal/core-dev": "^10.1",
         "drupal/devel": "^5.1",
         "ergebnis/composer-normalize": "^2.42",
-        "friendsoftwig/twigcs": "^6.2",
         "kint-php/kint": "^5.0",
         "mglaman/phpstan-drupal": "^1.2",
         "os2loop/os2loop_fixtures": "*",
         "phpspec/prophecy-phpunit": "^2.0",
         "phpstan/extension-installer": "^1.3",
-        "phpstan/phpstan-deprecation-rules": "^1.1"
+        "phpstan/phpstan-deprecation-rules": "^1.1",
+        "vincentlanglet/twig-cs-fixer": "^2.9"
     },
     "conflict": {
         "drupal/drupal": "*"
@@ -216,27 +216,31 @@
         ],
         "coding-standards-apply": [
             "@coding-standards-apply/phpcs",
+            "@coding-standards-apply/twig-cs-fixer",
             "@coding-standards-apply/composer-normalize"
         ],
         "coding-standards-apply/composer-normalize": [
-            "@normalize"
+            "composer normalize"
         ],
         "coding-standards-apply/phpcs": [
             "vendor/bin/phpcbf --standard=phpcs.xml.dist"
         ],
+        "coding-standards-apply/twig-cs-fixer": [
+            "twig-cs-fixer lint --fix web/profiles/custom/os2loop/themes/os2loop_theme/templates"
+        ],
         "coding-standards-check": [
             "@coding-standards-check/phpcs",
-            "@coding-standards-check/twigcs",
+            "@coding-standards-check/twig-cs-fixer",
             "@coding-standards-check/composer-normalize"
         ],
         "coding-standards-check/composer-normalize": [
-            "@normalize --dry-run"
+            "composer normalize --dry-run"
         ],
         "coding-standards-check/phpcs": [
             "php vendor/bin/phpcs --standard=phpcs.xml.dist"
         ],
-        "coding-standards-check/twigcs": [
-            "twigcs web/profiles/custom/os2loop/themes/os2loop_theme/templates"
+        "coding-standards-check/twig-cs-fixer": [
+            "twig-cs-fixer lint web/profiles/custom/os2loop/themes/os2loop_theme/templates"
         ]
     }
 }

composer.lock

@@ -37,4 +37,3 @@
 {% block content %}
   {{ content }}
 {% endblock %}
-

web/profiles/custom/os2loop/themes/os2loop_theme/templates/block/block--mainnavigation.html.twig

@@ -1,4 +1,4 @@
 {# Only select users can edit their account details #}
 {% if is_granted('os2loop_user_manual') %}
-  {% include 'container.html.twig' %}
+  {{ include('container.html.twig') }}
 {% endif %}

web/profiles/custom/os2loop/themes/os2loop_theme/templates/container--edit-account.html.twig

@@ -84,7 +84,7 @@
       {% endif %}
     </div>
     <div class="d-flex mt-10 mb-0">
-      <a href="{{ path('entity.comment.canonical', {'comment': comment.id}) }}#comment-{{ comment.id }}" class="link-unstyled">
+      <a href="{{ path('entity.comment.canonical', {comment: comment.id}) }}#comment-{{ comment.id }}" class="link-unstyled">
         {% if comment_value_truncated %}
           {{ comment_value|truncate(200, true, '...')|raw }}
         {% else %}

web/profiles/custom/os2loop/themes/os2loop_theme/templates/content-entities/comment--list-display.html.twig

@@ -87,8 +87,8 @@
     indicator here would break the render cache.
   #}
   <div class="container entity-header d-inline-flex align-items-top">
-    {% include '@os2loop_theme/field/user-info.html.twig' with {user: drupal_entity('user', comment.uid.target_id), date: created, entity: comment, attributes: attributes} %}
-    {% include '@os2loop_theme/navigation/comment-tasks.html.twig' with {node: drupal_entity('node', comment.entity_id.target_id)} %}
+    {{ include('@os2loop_theme/field/user-info.html.twig', {user: drupal_entity('user', comment.uid.target_id), date: created, entity: comment, attributes: attributes}) }}
+    {{ include('@os2loop_theme/navigation/comment-tasks.html.twig', {node: drupal_entity('node', comment.entity_id.target_id)}) }}
   </div>
   {#
     Indicate the semantic relationship between parent and child comments for
@@ -104,7 +104,7 @@
           <p class="visually-hidden">{{ parent }}</p>
           <div class="parent-entity" aria-hidden="true">
             <div class="parent-entity-header row no-gutters mb-10">
-              {% include '@os2loop_theme/field/user-info.html.twig' with {user: drupal_entity('user', parent_comment.uid.target_id), date: parent_created, entity: parent_comment, attributes: null} %}
+              {{ include('@os2loop_theme/field/user-info.html.twig', {user: drupal_entity('user', parent_comment.uid.target_id), date: parent_created, entity: parent_comment, attributes: null}) }}
             </div>
             <div class="parent-entity-body{{ toggle_parent_comment ? ' collapse' }}" id="parent-entity-body-{{ parent_comment.id() }}">
               {{ parent_comment.os2loop_post_comment.value }}

web/profiles/custom/os2loop/themes/os2loop_theme/templates/content-entities/comment--os2loop-post-comments.html.twig

@@ -87,8 +87,8 @@
     indicator here would break the render cache.
   #}
   <div class="container entity-header d-inline-flex align-items-top">
-    {% include '@os2loop_theme/field/user-info.html.twig' with {user: drupal_entity('user', comment.uid.target_id), date: created, entity: comment, attributes: attributes} %}
-    {% include '@os2loop_theme/navigation/comment-tasks.html.twig' with {node: drupal_entity('node', comment.entity_id.target_id)} %}
+    {{ include('@os2loop_theme/field/user-info.html.twig', {user: drupal_entity('user', comment.uid.target_id), date: created, entity: comment, attributes: attributes}) }}
+    {{ include('@os2loop_theme/navigation/comment-tasks.html.twig', {node: drupal_entity('node', comment.entity_id.target_id)}) }}
   </div>
   {#
     Indicate the semantic relationship between parent and child comments for
@@ -104,7 +104,7 @@
           <p class="visually-hidden">{{ parent }}</p>
           <div class="parent-entity" aria-hidden="true">
             <div class="parent-entity-header row no-gutters mb-10">
-              {% include '@os2loop_theme/field/user-info.html.twig' with {user: drupal_entity('user', parent_comment.uid.target_id), date: parent_created, entity: parent_comment, attributes: null} %}
+              {{ include('@os2loop_theme/field/user-info.html.twig', {user: drupal_entity('user', parent_comment.uid.target_id), date: parent_created, entity: parent_comment, attributes: null}) }}
             </div>
             <div class="parent-entity-body{{ toggle_parent_comment ? ' collapse' }}" id="parent-entity-body-{{ parent_comment.id() }}">
               {{ parent_comment.os2loop_question_answer.value }}

web/profiles/custom/os2loop/themes/os2loop_theme/templates/content-entities/comment--os2loop-question-answers.html.twig

@@ -1,4 +1,4 @@
-{% set content_url = path('entity.node.canonical', {'node': commented_entity.id}) %}
+{% set content_url = path('entity.node.canonical', {node: commented_entity.id}) %}
 {% set comment_url = content_url ~ '#comment-' ~ comment.id %}
 
 <div class="my-3 search-result search-result--comment search-result--comment--{{ comment.bundle }}">