From 8d0831774d7d325fc734b8d880dcbc99eb094788 Mon Sep 17 00:00:00 2001
From: catch <catch@35733.no-reply.drupal.org>
Date: Fri, 24 Jun 2022 23:55:19 +0100
Subject: [PATCH] Issue #3153852 by clayfreeman, catch: Both component and core
versions of ContextAwarePluginBase need updated deprecation documentation
---
.../lib/Drupal/Component/Plugin/ContextAwarePluginBase.php | 7 +++++++
core/lib/Drupal/Core/Plugin/ContextAwarePluginBase.php | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/core/lib/Drupal/Component/Plugin/ContextAwarePluginBase.php b/core/lib/Drupal/Component/Plugin/ContextAwarePluginBase.php
index f664a06fa30a..0dd57fa3067b 100644
--- a/core/lib/Drupal/Component/Plugin/ContextAwarePluginBase.php
+++ b/core/lib/Drupal/Component/Plugin/ContextAwarePluginBase.php
@@ -8,8 +8,15 @@
use Drupal\Component\Plugin\Context\Context;
use Symfony\Component\Validator\ConstraintViolationList;
+@trigger_error(__NAMESPACE__ . '\ContextAwarePluginBase is deprecated in drupal:9.1.0 and is removed from drupal:10.0.0 without replacement. See https://www.drupal.org/node/3120980', E_USER_DEPRECATED);
+
/**
* Base class for plugins that are context aware.
+ *
+ * @deprecated in drupal:9.1.0 and is removed from drupal:10.0.0 without
+ * replacement.
+ *
+ * @see https://www.drupal.org/node/3120980
*/
abstract class ContextAwarePluginBase extends PluginBase implements ContextAwarePluginInterface {
diff --git a/core/lib/Drupal/Core/Plugin/ContextAwarePluginBase.php b/core/lib/Drupal/Core/Plugin/ContextAwarePluginBase.php
index 1be0e353a51b..14f33d051e89 100644
--- a/core/lib/Drupal/Core/Plugin/ContextAwarePluginBase.php
+++ b/core/lib/Drupal/Core/Plugin/ContextAwarePluginBase.php
@@ -9,7 +9,7 @@
use Drupal\Core\StringTranslation\StringTranslationTrait;
use Drupal\Core\TypedData\TypedDataTrait;
-@trigger_error(__NAMESPACE__ . '\ContextAwarePluginBase is deprecated in drupal:9.1.0 and will be removed before drupal:10.0.0. Instead, use \Drupal\Core\Plugin\ContextAwarePluginTrait. See https://www.drupal.org/node/3120980', E_USER_DEPRECATED);
+@trigger_error(__NAMESPACE__ . '\ContextAwarePluginBase is deprecated in drupal:9.1.0 and is removed from drupal:10.0.0. Use \Drupal\Core\Plugin\ContextAwarePluginTrait instead. See https://www.drupal.org/node/3120980', E_USER_DEPRECATED);
/**
* Base class for plugins that are context aware.
--
GitLab