Pull merge.

[yaffs-website] / web / core / modules / views / tests / src / Kernel / ModuleTest.php

diff --git a/web/core/modules/views/tests/src/Kernel/ModuleTest.php b/web/core/modules/views/tests/src/Kernel/ModuleTest.php
index 68612b78f40beaf3cc0f948e4d53449b99565d72..1333c6225b9828357988ecb5a22fe97d36354428 100644 (file)
--- a/web/core/modules/views/tests/src/Kernel/ModuleTest.php
+++ b/web/core/modules/views/tests/src/Kernel/ModuleTest.php
@@ -9,7 +9,6 @@ namespace Drupal\Tests\views\Kernel;
  */
 use Drupal\views\Plugin\views\filter\Standard;
 use Drupal\views\Views;
-use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Component\Render\FormattableMarkup;
 
 class ModuleTest extends ViewsKernelTestBase {
@@ -29,7 +28,7 @@ class ModuleTest extends ViewsKernelTestBase {
   public static $modules = ['field', 'user', 'block'];
 
   /**
-   * Stores the last triggered error, for example via debug().
+   * Stores the last triggered error.
    *
    * @var string
    *
@@ -38,9 +37,9 @@ class ModuleTest extends ViewsKernelTestBase {
   protected $lastErrorMessage;
 
   /**
-   * Tests the views_get_handler method.
+   * Tests the  ViewsHandlerManager::getHandler() method.
    *
-   * @see views_get_handler()
+   * @see \Drupal\views\Plugin\ViewsHandlerManager::getHandler()
    */
   public function testViewsGetHandler() {
     $types = ['field', 'area', 'filter'];
@@ -158,13 +157,13 @@ class ModuleTest extends ViewsKernelTestBase {
     $this->assertEquals(array_keys($all_views), array_keys(Views::getAllViews()), 'Views::getAllViews works as expected.');
 
     // Test Views::getEnabledViews().
-    $expected_enabled = array_filter($all_views, function($view) {
+    $expected_enabled = array_filter($all_views, function ($view) {
       return views_view_is_enabled($view);
     });
     $this->assertEquals(array_keys($expected_enabled), array_keys(Views::getEnabledViews()), 'Expected enabled views returned.');
 
     // Test Views::getDisabledViews().
-    $expected_disabled = array_filter($all_views, function($view) {
+    $expected_disabled = array_filter($all_views, function ($view) {
       return views_view_is_disabled($view);
     });
     $this->assertEquals(array_keys($expected_disabled), array_keys(Views::getDisabledViews()), 'Expected disabled views returned.');
@@ -256,7 +255,7 @@ class ModuleTest extends ViewsKernelTestBase {
       list($plugin_type, $plugin_id) = explode(':', $key);
       $plugin_def = $this->container->get("plugin.manager.views.$plugin_type")->getDefinition($plugin_id);
 
-      $this->assertTrue(isset($plugin_list[$key]), SafeMarkup::format('The expected @key plugin list key was found.', ['@key' => $key]));
+      $this->assertTrue(isset($plugin_list[$key]), new FormattableMarkup('The expected @key plugin list key was found.', ['@key' => $key]));
       $plugin_details = $plugin_list[$key];
 
       $this->assertEqual($plugin_details['type'], $plugin_type, 'The expected plugin type was found.');