Updated to Drupal 8.5. Core Media not yet in use.

[yaffs-website] / web / core / tests / Drupal / Tests / Core / Plugin / CategorizingPluginManagerTraitTest.php

diff --git a/web/core/tests/Drupal/Tests/Core/Plugin/CategorizingPluginManagerTraitTest.php b/web/core/tests/Drupal/Tests/Core/Plugin/CategorizingPluginManagerTraitTest.php
index db67ad7f1f786aeaf14e9e0f43fc340b6bfa4756..1fa0dda524705802021763ed5057c9bf23a1a524 100644 (file)
--- a/web/core/tests/Drupal/Tests/Core/Plugin/CategorizingPluginManagerTraitTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Plugin/CategorizingPluginManagerTraitTest.php
@@ -47,10 +47,10 @@ class CategorizingPluginManagerTraitTest extends UnitTestCase {
    * @covers ::getCategories
    */
   public function testGetCategories() {
-    $this->assertSame(array_values($this->pluginManager->getCategories()), [
+    $this->assertSame([
         'fruits',
         'vegetables',
-      ]);
+      ], array_values($this->pluginManager->getCategories()));
   }
 
   /**
@@ -58,7 +58,7 @@ class CategorizingPluginManagerTraitTest extends UnitTestCase {
    */
   public function testGetSortedDefinitions() {
     $sorted = $this->pluginManager->getSortedDefinitions();
-    $this->assertSame(array_keys($sorted), ['apple', 'mango', 'cucumber']);
+    $this->assertSame(['apple', 'mango', 'cucumber'], array_keys($sorted));
   }
 
   /**
@@ -66,9 +66,9 @@ class CategorizingPluginManagerTraitTest extends UnitTestCase {
    */
   public function testGetGroupedDefinitions() {
     $grouped = $this->pluginManager->getGroupedDefinitions();
-    $this->assertSame(array_keys($grouped), ['fruits', 'vegetables']);
-    $this->assertSame(array_keys($grouped['fruits']), ['apple', 'mango']);
-    $this->assertSame(array_keys($grouped['vegetables']), ['cucumber']);
+    $this->assertSame(['fruits', 'vegetables'], array_keys($grouped));
+    $this->assertSame(['apple', 'mango'], array_keys($grouped['fruits']));
+    $this->assertSame(['cucumber'], array_keys($grouped['vegetables']));
   }
 
   /**
@@ -82,7 +82,7 @@ class CategorizingPluginManagerTraitTest extends UnitTestCase {
       'category' => 'bag',
     ];
     $this->pluginManager->processDefinition($definition, 'some');
-    $this->assertSame($definition['category'], 'bag');
+    $this->assertSame('bag', $definition['category']);
 
     // No category, provider without label.
     $definition = [
@@ -90,7 +90,7 @@ class CategorizingPluginManagerTraitTest extends UnitTestCase {
       'provider' => 'core',
     ];
     $this->pluginManager->processDefinition($definition, 'some');
-    $this->assertSame($definition['category'], 'core');
+    $this->assertSame('core', $definition['category']);
 
     // No category, provider is module with label.
     $definition = [
@@ -98,7 +98,7 @@ class CategorizingPluginManagerTraitTest extends UnitTestCase {
       'provider' => 'node',
     ];
     $this->pluginManager->processDefinition($definition, 'some');
-    $this->assertSame($definition['category'], 'Node');
+    $this->assertSame('Node', $definition['category']);
   }
 
 }