Commit c6516a5c authored by Vitalii Podoba's avatar Vitalii Podoba Committed by Oleksandr Kuzava
Browse files

[#3313644] Fixed sitemap ^4.1 compatibility issues

parent 358969a1

modules/rocketship_content/src/EventSubscriber/RocketshipCoreDemoContentSubscriber.php

+6 −6
Original line number Diff line number Diff line
@@ -108,8 +108,8 @@ class RocketshipCoreDemoContentSubscriber implements EventSubscriberInterface { 


    try {

      // Exclude this page from being indexed.

      /** @var \Drupal\simple_sitemap\Simplesitemap $generator */

      $generator = \Drupal::service('simple_sitemap.generator');

      /** @var \Drupal\simple_sitemap\Manager\EntityManager $generator */

      $generator = \Drupal::service('simple_sitemap.entity_manager');

      $settings = [

        'index' => FALSE,

        'priority' => 0,
@@ -156,8 +156,8 @@ class RocketshipCoreDemoContentSubscriber implements EventSubscriberInterface { 


    try {

      // Exclude this page from being indexed.

      /** @var \Drupal\simple_sitemap\Simplesitemap $generator */

      $generator = \Drupal::service('simple_sitemap.generator');

      /** @var \Drupal\simple_sitemap\Manager\EntityManager $generator */

      $generator = \Drupal::service('simple_sitemap.entity_manager');

      $settings = [

        'index' => FALSE,

        'priority' => 0,
@@ -209,8 +209,8 @@ class RocketshipCoreDemoContentSubscriber implements EventSubscriberInterface { 
      // Exclude this page from being indexed, homepage gets indexed as is

      // because we added it as custom link. If we index this node, it'll get

      // indexed using its alias. No bueno.

      /** @var \Drupal\simple_sitemap\Simplesitemap $generator */

      $generator = \Drupal::service('simple_sitemap.generator');

      /** @var \Drupal\simple_sitemap\Manager\EntityManager $generator */

      $generator = \Drupal::service('simple_sitemap.entity_manager');

      $settings = [

        'index' => FALSE,

        'priority' => 0,

modules/rocketship_seo/rocketship_seo.install

+5 −4
Original line number Diff line number Diff line
@@ -75,8 +75,8 @@ function rocketship_seo_requirements($phase) { 
        $nid = str_replace('node/', '', $frontpage_path);

        $node = Node::load($nid);

        if ($node) {

          /** @var \Drupal\simple_sitemap\Simplesitemap $generator */

          $generator = \Drupal::service('simple_sitemap.generator');

          /** @var \Drupal\simple_sitemap\Manager\EntityManager $generator */

          $generator = \Drupal::service('simple_sitemap.entity_manager');

          $settings = $generator->getEntityInstanceSettings($node->getEntityTypeId(), $node->id());

          if (!empty($settings['index'])) {

            $requirements['rocketship_seo_no_index_node'] = [
@@ -108,9 +108,10 @@ function rocketship_seo_requirements($phase) { 
      'description' => t('Because we do not index the node or path itself, we must create a manual entry for the homepage.'),

      'severity' => REQUIREMENT_OK,

    ];

    /** @var \Drupal\simple_sitemap\Simplesitemap $generator */

    /** @var \Drupal\simple_sitemap\Manager\Generator $generator */

    $generator = \Drupal::service('simple_sitemap.generator');

    $link = $generator->getCustomLinks('/');

    $custom_link_manager = $generator->CustomLinkManager();

    $link = $custom_link_manager->get('/');

    if (!$link) {

      $requirements['rocketship_seo_no_index_node'] = [

        'title' => t('SEO: Homepage as Custom Link'),