Merge branch 'ISAICP-8664' into 'patch/v1.104.1'

ISAICP-8664: Fix PHP error in joinup_modal_anonymous.

See merge request digit/digit-joinup-dev!1297

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';

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'),
         ],

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>

web/modules/custom/joinup_modal/joinup_modal.module

@@ -14,7 +14,6 @@ function joinup_modal_theme(): array {
   return [
     'joinup_modal_anonymous' => [
       'variables' => [
-        'type' => NULL,
         'title' => NULL,
         'description' => NULL,
         'login' => NULL,
@@ -23,12 +22,3 @@ function joinup_modal_theme(): array {
     ],
   ];
 }
-
-/**
- * Implements hook_theme_suggestions_HOOK().
- */
-function joinup_modal_theme_suggestions_joinup_modal_anonymous(array $variables): array {
-  return [
-    'joinup_modal_anonymous__' . $variables['type'],
-  ];
-}

web/modules/custom/joinup_modal/src/Controller/JoinupModalAnonymousController.php

@@ -30,8 +30,7 @@ public function render(string $type): array {
       'query' => $this->getDestinationArray(),
     ]);
     return [
-      '#theme' => 'joinup_modal_anonymous',
-      '#type' => $type,
+      '#theme' => "joinup_modal_anonymous__$type",
       '#title' => $this->t('You are not signed in'),
       '#login' => new Link('Sign in', $login),
       // Replicate logic of "Create an account" from navigation, it points

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">