diff core/modules/contact/tests/src/Functional/ContactPersonalTest.php @ 17:129ea1e6d783

Update, including to Drupal core 8.6.10

--- a/core/modules/contact/tests/src/Functional/ContactPersonalTest.php	Tue Jul 10 15:07:59 2018 +0100
+++ b/core/modules/contact/tests/src/Functional/ContactPersonalTest.php	Thu Feb 28 13:21:36 2019 +0000
@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\contact\Functional;
 
-use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Component\Render\FormattableMarkup;
 use Drupal\Component\Render\PlainTextOutput;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\Test\AssertMailTrait;
@@ -98,9 +98,9 @@
     $placeholders = [
       '@sender_name' => $this->webUser->username,
       '@sender_email' => $this->webUser->getEmail(),
-      '@recipient_name' => $this->contactUser->getUsername()
+      '@recipient_name' => $this->contactUser->getUsername(),
     ];
-    $this->assertRaw(SafeMarkup::format('@sender_name (@sender_email) sent @recipient_name an email.', $placeholders));
+    $this->assertRaw(new FormattableMarkup('@sender_name (@sender_email) sent @recipient_name an email.', $placeholders));
     // Ensure an unescaped version of the email does not exist anywhere.
     $this->assertNoRaw($this->webUser->getEmail());
   }