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

[yaffs-website] / web / core / lib / Drupal / Core / Config / PreExistingConfigException.php

diff --git a/web/core/lib/Drupal/Core/Config/PreExistingConfigException.php b/web/core/lib/Drupal/Core/Config/PreExistingConfigException.php
index 57f54b29656d71992c50d62654ba64b764548b4a..a71604e16009344a1f5cc75dbbde7f5c3f720814 100644 (file)
--- a/web/core/lib/Drupal/Core/Config/PreExistingConfigException.php
+++ b/web/core/lib/Drupal/Core/Config/PreExistingConfigException.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Core\Config;
 
-use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Component\Render\FormattableMarkup;
 
 /**
  * An exception thrown if configuration with the same name already exists.
@@ -56,10 +56,10 @@ class PreExistingConfigException extends ConfigException {
    * @return \Drupal\Core\Config\PreExistingConfigException
    */
   public static function create($extension, array $config_objects) {
-    $message = SafeMarkup::format('Configuration objects (@config_names) provided by @extension already exist in active configuration',
+    $message = new FormattableMarkup('Configuration objects (@config_names) provided by @extension already exist in active configuration',
       [
         '@config_names' => implode(', ', static::flattenConfigObjects($config_objects)),
-        '@extension' => $extension
+        '@extension' => $extension,
       ]
     );
     $e = new static($message);