chore: reformat add_attributes being set in twig templates

Author: Callin Mullaney

templates/admin/admin-block-content.html.twig

@@ -22,8 +22,11 @@
     compact ? 'compact',
   ]
 %}
+{% set admin_block_content_attributes = {
+  class: classes,
+} %}
 {% if content %}
-  <dl{{ add_attributes({ class: classes }) }}>
+  <dl{{ add_attributes(admin_block_content_attributes) }}>
     {% for item in content %}
       <dt class="list-group__link">{{ item.link }}</dt>
       {% if item.description %}

templates/admin/admin-block.html.twig

@@ -18,7 +18,10 @@
     'panel',
   ]
 %}
-<div{{ add_attributes({ class: classes }) }}>
+{% set admin_block_attributes = {
+  class: classes,
+} %}
+<div{{ add_attributes(admin_block_attributes) }}>
   {% if block.title %}
     <h3 class="panel__title">{{ block.title }}</h3>
   {% endif %}

templates/admin/authorize-report.html.twig

@@ -17,8 +17,11 @@
  * @see https://www.drupal.org/node/3522119
  */
 #}
+{% set authorize_report_attributes = {
+  class: 'authorize-results',
+} %}
 {% if messages %}
-  <div{{ add_attributes({ class: 'authorize-results' }) }}>
+  <div{{ add_attributes(authorize_report_attributes) }}>
     {% for message_group in messages %}
       {{ message_group }}
     {% endfor %}

templates/admin/form-element--new-storage-type.html.twig

@@ -24,7 +24,10 @@
   variant ? variant ~ '__item'
 ]
 %}
-<div{{ add_attributes({ class: classes }) }}>
+{% set new_storage_type_attributes = {
+  class: classes,
+} %}
+<div{{ add_attributes(new_storage_type_attributes) }}>
   {% if variant == 'field-option' %}
     {{ label }}
     <div{{ description.attributes }}>
@@ -35,7 +38,10 @@
   {% if variant == 'field-suboption' %}
     {{ label }}
     {% with { attributes: description.attributes } %}
-      <div{{ add_attributes({ class: description_classes }) }}>
+      {% set new_storage_type_description_attributes = {
+        class: description_classes|default([]),
+      } %}
+      <div{{ add_attributes(new_storage_type_description_attributes) }}>
         {{ description.content }}
       </div>
     {% endwith %}

templates/admin/language-negotiation-configure-form.html.twig

@@ -29,7 +29,10 @@
     ]
   %}
   {% with { attributes: language_type.attributes } %}
-    <div{{ add_attributes({ class: language_classes }) }}>
+    {% set language_type_wrapper_attributes = {
+      class: language_classes,
+    } %}
+    <div{{ add_attributes(language_type_wrapper_attributes) }}>
       <h2>{{ language_type.title }}</h2>
       <div class="description">{{ language_type.description }}</div>
       {{ language_type.configurable }}

templates/admin/system-modules-details.html.twig

@@ -34,7 +34,10 @@
     {% for module in modules %}
       {% set zebra = cycle(['odd', 'even'], loop.index0) %}
       {% with { attributes: module.attributes } %}
-        <tr{{ add_attributes({ class: zebra }) }}>
+        {% set module_row_attributes = {
+          class: zebra,
+        } %}
+        <tr{{ add_attributes(module_row_attributes) }}>
         <td class="checkbox">
           {{ module.checkbox }}
         </td>

templates/admin/system-modules-uninstall.html.twig

@@ -33,7 +33,10 @@
     {% for module in modules %}
       {% set zebra = cycle(['odd', 'even'], loop.index0) -%}
       {% with { attributes: module.attributes } %}
-        <tr{{ add_attributes({ class: zebra }) }}>
+        {% set module_row_attributes = {
+          class: zebra,
+        } %}
+        <tr{{ add_attributes(module_row_attributes) }}>
         <td align="center">
           {{- module.checkbox -}}
         </td>

templates/admin/system-themes-page.html.twig

@@ -38,7 +38,10 @@
       ]
     %}
     {% with { attributes: theme_group.attributes } %}
-      <div{{ add_attributes({ class: theme_group_classes }) }}>
+      {% set theme_group_wrapper_attributes = {
+        class: theme_group_classes,
+      } %}
+      <div{{ add_attributes(theme_group_wrapper_attributes) }}>
         <h2 class="system-themes-list__header">{{ theme_group.title }}</h2>
         {% for theme in theme_group.themes %}
           {%
@@ -50,7 +53,10 @@
             ]
           %}
           {% with { attributes: theme.attributes } %}
-            <div{{ add_attributes({ class: theme_classes }) }}>
+            {% set theme_wrapper_attributes = {
+              class: theme_classes,
+            } %}
+            <div{{ add_attributes(theme_wrapper_attributes) }}>
               {% if theme.screenshot %}
                 {{ theme.screenshot }}
               {% endif %}

templates/admin/tablesort-indicator.html.twig

@@ -13,7 +13,10 @@
     'tablesort--' ~ style,
   ]
 %}
-<span{{ add_attributes({ class: classes }) }}>
+{% set tablesort_indicator_attributes = {
+  class: classes,
+} %}
+<span{{ add_attributes(tablesort_indicator_attributes) }}>
   <span class="visually-hidden">
     {% if style == 'asc' -%}
       {{ 'Sort ascending'|t }}

templates/admin/update-project-status.html.twig

@@ -35,7 +35,10 @@
   ]
 %}
 {% with { attributes: status.attributes } %}
-  <div{{ add_attributes({ class: ['project-update__status', status_classes] }) }}>
+  {% set project_status_attributes = {
+    class: ['project-update__status', status_classes],
+  } %}
+  <div{{ add_attributes(project_status_attributes) }}>
     {%- if status.label -%}
       <span>{{ status.label }}</span>
     {%- else -%}
@@ -77,7 +80,10 @@
     <div class="extra">
       {% for extra in extras %}
         {% with { attributes: extra.attributes } %}
-          <div{{ add_attributes({ class: extra_classes }) }}>
+          {% set project_extra_attributes = {
+            class: extra_classes,
+          } %}
+          <div{{ add_attributes(project_extra_attributes) }}>
             {{ extra.label }}: {{ extra.data }}
           </div>
         {% endwith %}