Updated Drupal to 8.6. This goes with the following updates because it's possible...

[yaffs-website] / web / core / modules / block_content / src / Tests / Views / BlockContentTestBase.php

diff --git a/web/core/modules/block_content/src/Tests/Views/BlockContentTestBase.php b/web/core/modules/block_content/src/Tests/Views/BlockContentTestBase.php
index 3ea2dba06cfb846248ebacccfef2a8c0107dc662..0e3fbfeeb0099cece8985748de7cfd7bb820ba76 100644 (file)
--- a/web/core/modules/block_content/src/Tests/Views/BlockContentTestBase.php
+++ b/web/core/modules/block_content/src/Tests/Views/BlockContentTestBase.php
@@ -6,7 +6,7 @@ namespace Drupal\block_content\Tests\Views;
 
 use Drupal\block_content\Entity\BlockContent;
 use Drupal\block_content\Entity\BlockContentType;
-use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Component\Render\FormattableMarkup;
 use Drupal\views\Tests\ViewTestBase;
 use Drupal\views\Tests\ViewTestData;
 
@@ -73,7 +73,7 @@ abstract class BlockContentTestBase extends ViewTestBase {
     if ($block_content = BlockContent::create($settings)) {
       $status = $block_content->save();
     }
-    $this->assertEqual($status, SAVED_NEW, SafeMarkup::format('Created block content %info.', ['%info' => $block_content->label()]));
+    $this->assertEqual($status, SAVED_NEW, new FormattableMarkup('Created block content %info.', ['%info' => $block_content->label()]));
     return $block_content;
   }
 
@@ -99,13 +99,13 @@ abstract class BlockContentTestBase extends ViewTestBase {
     $values += [
       'id' => $id,
       'label' => $id,
-      'revision' => FALSE
+      'revision' => FALSE,
     ];
     $bundle = BlockContentType::create($values);
     $status = $bundle->save();
     block_content_add_body_field($bundle->id());
 
-    $this->assertEqual($status, SAVED_NEW, SafeMarkup::format('Created block content type %bundle.', ['%bundle' => $bundle->id()]));
+    $this->assertEqual($status, SAVED_NEW, new FormattableMarkup('Created block content type %bundle.', ['%bundle' => $bundle->id()]));
     return $bundle;
   }