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

[yaffs-website] / web / core / modules / views_ui / tests / src / Functional / DisplayTest.php

diff --git a/web/core/modules/views_ui/tests/src/Functional/DisplayTest.php b/web/core/modules/views_ui/tests/src/Functional/DisplayTest.php
index 9b447ddc50163fc7a861b732600b5afdce10705a..8fa5a80de387055b3c379ec466992eb12508e3e6 100644 (file)
--- a/web/core/modules/views_ui/tests/src/Functional/DisplayTest.php
+++ b/web/core/modules/views_ui/tests/src/Functional/DisplayTest.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\views_ui\Functional;
 
-use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Component\Render\FormattableMarkup;
 use Drupal\views\Entity\View;
 use Drupal\views\Views;
 
@@ -45,7 +45,7 @@ class DisplayTest extends UITestBase {
    */
   public function testReorderDisplay() {
     $view = [
-      'block[create]' => TRUE
+      'block[create]' => TRUE,
     ];
     $view = $this->randomView($view);
 
@@ -60,7 +60,7 @@ class DisplayTest extends UITestBase {
     // Put the block display in front of the page display.
     $edit = [
       'displays[page_1][weight]' => 2,
-      'displays[block_1][weight]' => 1
+      'displays[block_1][weight]' => 1,
     ];
     $this->drupalPostForm(NULL, $edit, t('Apply'));
     $this->drupalPostForm(NULL, [], t('Save'));
@@ -136,7 +136,7 @@ class DisplayTest extends UITestBase {
     // Assert that the expected text is found in each area category.
     foreach ($areas as $type) {
       $element = $this->xpath('//div[contains(@class, :class)]/div', [':class' => $type]);
-      $this->assertEqual($element[0]->getHtml(), SafeMarkup::format('The selected display type does not use @type plugins', ['@type' => $type]));
+      $this->assertEqual($element[0]->getHtml(), new FormattableMarkup('The selected display type does not use @type plugins', ['@type' => $type]));
     }
   }