X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs-website;a=blobdiff_plain;f=web%2Fcore%2Ftests%2FDrupal%2FKernelTests%2FCore%2FPlugin%2FPluginTestBase.php;h=1d3734fae0770d172d768cfe8d62c3725bbb329e;hp=ccc82369a0e48c8f1c93fc3ea87fddcf764ae8a9;hb=0bf8d09d2542548982e81a441b1f16e75873a04f;hpb=74df008bdbb3a11eeea356744f39b802369bda3c

diff --git a/web/core/tests/Drupal/KernelTests/Core/Plugin/PluginTestBase.php b/web/core/tests/Drupal/KernelTests/Core/Plugin/PluginTestBase.php
index ccc82369a..1d3734fae 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Plugin/PluginTestBase.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Plugin/PluginTestBase.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\KernelTests\Core\Plugin;
 
-use Drupal\Core\Plugin\Context\ContextDefinition;
+use Drupal\Core\Plugin\Context\EntityContextDefinition;
 use Drupal\KernelTests\KernelTestBase;
 use Drupal\plugin_test\Plugin\TestPluginManager;
 use Drupal\plugin_test\Plugin\MockBlockManager;
@@ -42,7 +42,7 @@ abstract class PluginTestBase extends KernelTestBase {
     //   as derivatives and ReflectionFactory.
     $this->testPluginManager = new TestPluginManager();
     $this->mockBlockManager = new MockBlockManager();
-    $module_handler = new ModuleHandler(\Drupal::root(), [], new MemoryBackend(), $this->container->get('event_dispatcher'));
+    $module_handler = new ModuleHandler($this->root, [], new MemoryBackend(), $this->container->get('event_dispatcher'));
     $this->defaultsTestPluginManager = new DefaultsTestPluginManager($module_handler);
 
     // The expected plugin definitions within each manager. Several tests assert
@@ -93,7 +93,7 @@ abstract class PluginTestBase extends KernelTestBase {
         'label' => 'User name',
         'class' => 'Drupal\plugin_test\Plugin\plugin_test\mock_block\MockUserNameBlock',
         'context' => [
-          'user' => new ContextDefinition('entity:user', 'User'),
+          'user' => EntityContextDefinition::fromEntityTypeId('user')->setLabel('User'),
         ],
       ],
       'user_name_optional' => [
@@ -101,7 +101,7 @@ abstract class PluginTestBase extends KernelTestBase {
         'label' => 'User name optional',
         'class' => 'Drupal\plugin_test\Plugin\plugin_test\mock_block\MockUserNameBlock',
         'context' => [
-          'user' => new ContextDefinition('entity:user', 'User', FALSE),
+          'user' => EntityContextDefinition::fromEntityTypeId('user')->setLabel('User')->setRequired(FALSE),
         ],
       ],
       'string_context' => [
@@ -114,8 +114,8 @@ abstract class PluginTestBase extends KernelTestBase {
         'label' => 'Complex context',
         'class' => 'Drupal\plugin_test\Plugin\plugin_test\mock_block\MockComplexContextBlock',
         'context' => [
-          'user' => new ContextDefinition('entity:user', 'User'),
-          'node' => new ContextDefinition('entity:node', 'Node'),
+          'user' => EntityContextDefinition::fromEntityTypeId('user')->setLabel('User'),
+          'node' => EntityContextDefinition::fromEntityTypeId('node')->setLabel('Node'),
         ],
       ],
     ];