From f8a82ab9e8f02fa12bad076a807e5a4cd30fe447 Mon Sep 17 00:00:00 2001
From: Herve Donner <hervedonner@gmail.com>
Date: Thu, 18 Apr 2024 09:24:04 +0200
Subject: [PATCH] ISAICP-8664: Rename type > feed_type var in github_feed theme
hook.
We can't use "#type" to pass vars in render arrays, it is reserved to render RenderElement's.
---
web/modules/custom/github_feed/github_feed.module | 4 ++--
.../Field/FieldFormatter/GitHubFeedDefaultFormatter.php | 2 +-
.../custom/github_feed/templates/github-feed.html.twig | 2 +-
.../ventuno/templates/github_feed/github-feed.html.twig | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/web/modules/custom/github_feed/github_feed.module b/web/modules/custom/github_feed/github_feed.module
index 86b95d8cdb..b302dbaa49 100644
--- a/web/modules/custom/github_feed/github_feed.module
+++ b/web/modules/custom/github_feed/github_feed.module
@@ -15,7 +15,7 @@ function github_feed_theme(array $existing, string $type, string $theme, string
'github_feed' => [
'variables' => [
'url' => NULL,
- 'type' => NULL,
+ 'feed_type' => NULL,
'items' => NULL,
],
],
@@ -52,7 +52,7 @@ function github_feed_theme(array $existing, string $type, string $theme, string
* Implements template_preprocess_HOOK().
*/
function template_preprocess_github_feed(array &$variables): void {
- switch ($variables['type']) {
+ switch ($variables['feed_type']) {
case 'issue':
$variables['type_parsed'] = t('Issues');
$variables['icon_id'] = 'info-circle';
diff --git a/web/modules/custom/github_feed/src/Plugin/Field/FieldFormatter/GitHubFeedDefaultFormatter.php b/web/modules/custom/github_feed/src/Plugin/Field/FieldFormatter/GitHubFeedDefaultFormatter.php
index 9aeb6b962f..1138a5ef04 100644
--- a/web/modules/custom/github_feed/src/Plugin/Field/FieldFormatter/GitHubFeedDefaultFormatter.php
+++ b/web/modules/custom/github_feed/src/Plugin/Field/FieldFormatter/GitHubFeedDefaultFormatter.php
@@ -90,7 +90,7 @@ public function viewElements(FieldItemListInterface $items, $langcode): array {
$element[$delta] = [
'#theme' => 'github_feed',
'#url' => $item->repository,
- '#type' => $item->type,
+ '#feed_type' => $item->type,
'#cache' => [
'max-age' => $this->getFieldSetting('cache_max_age'),
],
diff --git a/web/modules/custom/github_feed/templates/github-feed.html.twig b/web/modules/custom/github_feed/templates/github-feed.html.twig
index a61e624509..b762dfe8ed 100644
--- a/web/modules/custom/github_feed/templates/github-feed.html.twig
+++ b/web/modules/custom/github_feed/templates/github-feed.html.twig
@@ -3,7 +3,7 @@
* Variables:
* - items: The feed object.
* - url: The url of the feed.
- * - type: The type of the feed.
+ * - feed_type: The type of the feed.
#}
<div class="github-feed">
<h3>{{ "Items of type"|t }} "{{ type_parsed }}" {{ "from"|t }} {{ url }}:</h3>
diff --git a/web/themes/ventuno/templates/github_feed/github-feed.html.twig b/web/themes/ventuno/templates/github_feed/github-feed.html.twig
index e7d3bf41c6..1b4fa06e34 100644
--- a/web/themes/ventuno/templates/github_feed/github-feed.html.twig
+++ b/web/themes/ventuno/templates/github_feed/github-feed.html.twig
@@ -3,7 +3,7 @@
* Variables:
* - items: The feed object.
* - url: The url of the feed.
- * - type: The type of the feed.
+ * - feed_type: The type of the feed.
#}
<div class="github-feed mb-4">
<h4 class="mb-3">
--
GitLab