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

[yaffs-website] / web / core / tests / Drupal / Tests / SchemaCheckTestTrait.php

diff --git a/web/core/tests/Drupal/Tests/SchemaCheckTestTrait.php b/web/core/tests/Drupal/Tests/SchemaCheckTestTrait.php
index 0d4dd4bd57be22e800cd2ebbdffaa777c705c5a1..96a0a7f804993aa6b8b2fc0e129f8a40df02cd39 100644 (file)
--- a/web/core/tests/Drupal/Tests/SchemaCheckTestTrait.php
+++ b/web/core/tests/Drupal/Tests/SchemaCheckTestTrait.php
@@ -4,7 +4,7 @@ namespace Drupal\Tests;
 
 use Drupal\Core\Config\TypedConfigManagerInterface;
 use Drupal\Core\Config\Schema\SchemaCheckTrait;
-use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Component\Render\FormattableMarkup;
 
 /**
  * Provides a class for checking configuration schema.
@@ -28,19 +28,19 @@ trait SchemaCheckTestTrait {
     if ($errors === FALSE) {
       // @todo Since the use of this trait is under TestBase, it works.
       //   Can be fixed as part of https://www.drupal.org/node/2260053.
-      $this->fail(SafeMarkup::format('No schema for @config_name', ['@config_name' => $config_name]));
+      $this->fail(new FormattableMarkup('No schema for @config_name', ['@config_name' => $config_name]));
       return;
     }
     elseif ($errors === TRUE) {
       // @todo Since the use of this trait is under TestBase, it works.
       //   Can be fixed as part of https://www.drupal.org/node/2260053.
-      $this->pass(SafeMarkup::format('Schema found for @config_name and values comply with schema.', ['@config_name' => $config_name]));
+      $this->pass(new FormattableMarkup('Schema found for @config_name and values comply with schema.', ['@config_name' => $config_name]));
     }
     else {
       foreach ($errors as $key => $error) {
         // @todo Since the use of this trait is under TestBase, it works.
         //   Can be fixed as part of https://www.drupal.org/node/2260053.
-        $this->fail(SafeMarkup::format('Schema key @key failed with: @error', ['@key' => $key, '@error' => $error]));
+        $this->fail(new FormattableMarkup('Schema key @key failed with: @error', ['@key' => $key, '@error' => $error]));
       }
     }
   }