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

[yaffs-website] / web / core / modules / node / tests / src / Functional / Views / BulkFormAccessTest.php

diff --git a/web/core/modules/node/tests/src/Functional/Views/BulkFormAccessTest.php b/web/core/modules/node/tests/src/Functional/Views/BulkFormAccessTest.php
index 04948c545a5f176393335edece20ea0423798daf..19c409719d06db8931d7262972909116e845d9b6 100644 (file)
--- a/web/core/modules/node/tests/src/Functional/Views/BulkFormAccessTest.php
+++ b/web/core/modules/node/tests/src/Functional/Views/BulkFormAccessTest.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\node\Functional\Views;
 
-use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Component\Render\FormattableMarkup;
 use Drupal\node\Entity\Node;
 use Drupal\node\Entity\NodeType;
 
@@ -67,9 +67,9 @@ class BulkFormAccessTest extends NodeTestBase {
     // Create a private node (author may view, edit and delete, others may not).
     $node = $this->drupalCreateNode([
       'type' => 'article',
-      'private' => [[
-        'value' => TRUE,
-      ]],
+      'private' => [
+        ['value' => TRUE],
+      ],
       'uid' => $author->id(),
     ]);
     // Create an account that may view the private node, but not edit it.
@@ -88,7 +88,7 @@ class BulkFormAccessTest extends NodeTestBase {
       'action' => 'node_unpublish_action',
     ];
     $this->drupalPostForm('test-node-bulk-form', $edit, t('Apply to selected items'));
-    $this->assertRaw(SafeMarkup::format('No access to execute %action on the @entity_type_label %entity_label.', [
+    $this->assertRaw(new FormattableMarkup('No access to execute %action on the @entity_type_label %entity_label.', [
       '%action' => 'Unpublish content',
       '@entity_type_label' => 'Content',
       '%entity_label' => $node->label(),
@@ -117,7 +117,7 @@ class BulkFormAccessTest extends NodeTestBase {
     ];
     $this->drupalPostForm('test-node-bulk-form', $edit, t('Apply to selected items'));
     // Test that the action message isn't shown.
-    $this->assertNoRaw(SafeMarkup::format('%action was applied to 1 item.', [
+    $this->assertNoRaw(new FormattableMarkup('%action was applied to 1 item.', [
       '%action' => 'Unpublish content',
     ]));
     // Re-load the node and check the status.
@@ -134,9 +134,9 @@ class BulkFormAccessTest extends NodeTestBase {
     // Create a private node (author may view, edit and delete, others may not).
     $private_node = $this->drupalCreateNode([
       'type' => 'article',
-      'private' => [[
-        'value' => TRUE,
-      ]],
+      'private' => [
+        ['value' => TRUE],
+      ],
       'uid' => $author->id(),
     ]);
     // Create an account that may view the private node, but not delete it.
@@ -146,9 +146,9 @@ class BulkFormAccessTest extends NodeTestBase {
     // deleted by the author.
     $own_node = $this->drupalCreateNode([
       'type' => 'article',
-      'private' => [[
-        'value' => TRUE,
-      ]],
+      'private' => [
+        ['value' => TRUE],
+      ],
       'uid' => $account->id(),
     ]);
     $this->drupalLogin($account);