Pull merge.

[yaffs-website] / web / core / lib / Drupal / Core / Plugin / Context / Context.php

diff --git a/web/core/lib/Drupal/Core/Plugin/Context/Context.php b/web/core/lib/Drupal/Core/Plugin/Context/Context.php
index 35eaacda59d92fc5b196bd3278626f3fc5e62917..ac541c430f0630b17b4374e6012134a4fd74aa7c 100644 (file)
--- a/web/core/lib/Drupal/Core/Plugin/Context/Context.php
+++ b/web/core/lib/Drupal/Core/Plugin/Context/Context.php
@@ -6,6 +6,7 @@ use Drupal\Component\Plugin\Context\Context as ComponentContext;
 use Drupal\Component\Plugin\Exception\ContextException;
 use Drupal\Core\Cache\CacheableDependencyInterface;
 use Drupal\Core\Cache\CacheableMetadata;
+use Drupal\Core\DependencyInjection\DependencySerializationTrait;
 use Drupal\Core\TypedData\TypedDataInterface;
 use Drupal\Core\TypedData\TypedDataTrait;
 
@@ -15,6 +16,7 @@ use Drupal\Core\TypedData\TypedDataTrait;
 class Context extends ComponentContext implements ContextInterface {
 
   use TypedDataTrait;
+  use DependencySerializationTrait;
 
   /**
    * The data associated with the context.
@@ -42,7 +44,7 @@ class Context extends ComponentContext implements ContextInterface {
    *
    * @param \Drupal\Core\Plugin\Context\ContextDefinitionInterface $context_definition
    *   The context definition.
-   * @param mixed $context_value|null
+   * @param mixed|null $context_value
    *   The context value object.
    */
   public function __construct(ContextDefinitionInterface $context_definition, $context_value = NULL) {
@@ -123,7 +125,6 @@ class Context extends ComponentContext implements ContextInterface {
     return $this->contextData;
   }
 
-
   /**
    * {@inheritdoc}
    */