reverted:
--- b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/Upgrade6Test.php
+++ a/core/modules/migrate_drupal_ui/tests/src/Functional/d6/Upgrade6Test.php
@@ -102,7 +102,7 @@
       'path_alias' => 8,
       'taxonomy_term' => 15,
       'taxonomy_vocabulary' => 7,
+      'tour' => 5,
-      'tour' => 6,
       'user' => 7,
       'user_role' => 6,
       'menu_link_content' => 10,
reverted:
--- b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/Upgrade7Test.php
+++ a/core/modules/migrate_drupal_ui/tests/src/Functional/d7/Upgrade7Test.php
@@ -104,7 +104,7 @@
       'taxonomy_term' => 24,
       'taxonomy_vocabulary' => 7,
       'path_alias' => 8,
+      'tour' => 5,
-      'tour' => 6,
       'user' => 4,
       'user_role' => 3,
       'menu_link_content' => 12,
diff -u b/core/modules/toolbar/config/optional/tour.tour.frontpage.yml b/core/modules/toolbar/config/optional/tour.tour.frontpage.yml
--- b/core/modules/toolbar/config/optional/tour.tour.frontpage.yml
+++ b/core/modules/toolbar/config/optional/tour.tour.frontpage.yml
@@ -23,7 +23,7 @@
     body: 'The toolbar gives you access to site administration menu items, shortcuts and your user account.'
     weight: 2
     attributes:
-        data-id: 'toolbar-bar'
+      data-id: 'toolbar-bar'
   toolbar-menu-admin:
     id: toolbar-menu-admin
     plugin: text
diff -u b/core/modules/toolbar/tests/src/Functional/FrontpageTourTest.php b/core/modules/toolbar/tests/src/Functional/FrontpageTourTest.php
--- b/core/modules/toolbar/tests/src/Functional/FrontpageTourTest.php
+++ b/core/modules/toolbar/tests/src/Functional/FrontpageTourTest.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\toolbar\tests\FrontpageTourTest.
- */
-
 namespace Drupal\Tests\toolbar\Functional;
 
 use Drupal\Tests\tour\Functional\TourTestBase;
diff -u b/core/modules/toolbar/toolbar.module b/core/modules/toolbar/toolbar.module
--- b/core/modules/toolbar/toolbar.module
+++ b/core/modules/toolbar/toolbar.module
@@ -6,6 +6,7 @@
  */
 
 use Drupal\Core\Cache\CacheableMetadata;
+use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Render\Element;
 use Drupal\Core\Render\RenderContext;
 use Drupal\Core\Routing\RouteMatchInterface;
@@ -307,8 +308,7 @@
  * @param \Drupal\Core\Entity\EntityInterface $entity
  *   The tour which contains the $tour_tips.
  */
-function toolbar_tour_tips_alter(array &$tour_tips, Drupal\Core\Entity\EntityInterface $entity) {
-  // print_r($tour_tips);die;
+function toolbar_tour_tips_alter(array $tour_tips, EntityInterface $entity) {
   foreach ($tour_tips as $tour_tip) {
     if ($tour_tip->get('id') == 'toolbar-search-block') {
       $body = $tour_tip->get('body');