Merge pull request #1666 from acquia/ACMS-3337

ACMS-3337: Fix Simple Sitemap 4.1.7 version breaks site install.
acquia · Nov 6, 2023 · fa94352 · fa94352
2 parents 325abf0 + 4decb50
commit fa94352
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 14 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/modules/acquia_cms_common/composer.json b/modules/acquia_cms_common/composer.json
@@ -26,7 +26,7 @@
         "drupal/scheduler_content_moderation_integration": "^2.0",
         "drupal/schema_metatag": "^2.4 || ^3.0",
         "drupal/seckit": "^2.0",
-        "drupal/simple_sitemap": "^4.1",
+        "drupal/simple_sitemap": "4.1.7",
         "drupal/smart_trim": "^2.0",
         "drupal/social_media_links": "^2.9",
         "drupal/username_enumeration_prevention": "^1.3",
@@ -81,6 +81,9 @@
                 "3371005 - Toolbar does not indicate active menu trail for pages not included in Toolbar": "https://git.drupalcode.org/project/drupal/-/commit/3165269bb01a5a8e5f53c1f369135b967c9d5924.patch",
                 "3370946 - Page title should contextualize the local navigation": "https://www.drupal.org/files/issues/2023-09-11/3370946-page-title-backport-10-1-x.patch",
                 "3347291: - Combine field storage and field instance forms": "https://www.drupal.org/files/issues/2023-09-13/10.1-3347291-combine-mega-e.patch"
+            },
+            "drupal/simple_sitemap": {
+                "3398996 - Declare min PHP version": "https://git.drupalcode.org/project/simple_sitemap/-/merge_requests/82.patch"
             }
         }
     },

diff --git a/modules/acquia_cms_common/src/Facade/SitemapFacade.php b/modules/acquia_cms_common/src/Facade/SitemapFacade.php
@@ -7,7 +7,6 @@
 use Drupal\Core\Logger\LoggerChannelInterface;
 use Drupal\node\NodeTypeInterface;
 use Drupal\simple_sitemap\Manager\EntityManager;
-use Drupal\simple_sitemap\Manager\VariantSetterTrait;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -20,8 +19,6 @@
  */
 final class SitemapFacade implements ContainerInjectionInterface {
 
-  use VariantSetterTrait;
-
   /**
    * The config installer service.
    *
@@ -93,7 +90,7 @@ public function enableSitemap(NodeTypeInterface $node_type) {
       return;
     }
     // Check if the entity type is enabled and variant exists for the sitemap.
-    $all_default_variants = $this->getVariants();
+    $all_default_variants = array_keys($this->sitemapManager->getSitemaps());
     if ($this->sitemapManager->entityTypeIsEnabled('node') && in_array($sitemap_variant, $all_default_variants)) {
       $this->sitemapManager->setBundleSettings('node', $node_type->id());
     }