Deprecate 'context' on Block and Condition plugin annotations in favor of 'context_definitions'

+++ b/core/lib/Drupal/Core/Plugin/DefaultPluginManager.php
@@ -297,6 +299,38 @@ protected function findDefinitions() {
+  private function fixContextAwareDefinitions(array &$definitions) {

hah! found a good use for private, nice.

This seems super reasonable and I support this change completely.

Eclipse

This change looks sensible. Not the plugin definition key matches the method name \Drupal\Core\Plugin\Context\ContextHandler::getContextDefinitions()

+++ b/core/tests/Drupal/Tests/Core/Plugin/DefaultPluginManagerTest.php
@@ -451,6 +452,34 @@ public function providerTestProcessDefinition() {
+   * @group legacy
+   */
+  public function testFixContextAwareDefinitions() {

Let's add an @expectedDeprecation to make that's triggered.

i shud add @expectedDeprecation of which method ?

Looks good to me.

Eclipse

doh forgot to ask for a change record. As a deprecation and a change we need one. Also probably need a release note snippet.

@tim.plunkett we added the expectDeprecation functionality to have dynamic expectations... but we've always hoped to move this upstream.

/**
 * Adds the ability to dynamically set expected deprecation messages in tests.
 *
 * @internal
 *   This class should only be used by Drupal core and will be removed once
 *   https://github.com/symfony/symfony/pull/25757 is resolved.
 *
 * @todo Remove once https://github.com/symfony/symfony/pull/25757 is resolved.
 */

Symfony's deprecation functionality on it's own only supports the annotation at this point.

Change record added: https://www.drupal.org/node/3016699

Committed bab4f6d and pushed to 8.7.x. Thanks!

diff --git a/core/lib/Drupal/Core/Plugin/DefaultPluginManager.php b/core/lib/Drupal/Core/Plugin/DefaultPluginManager.php
index d7f7f125c2..b1c79fe7ca 100644
--- a/core/lib/Drupal/Core/Plugin/DefaultPluginManager.php
+++ b/core/lib/Drupal/Core/Plugin/DefaultPluginManager.php
@@ -3,7 +3,6 @@
 namespace Drupal\Core\Plugin;
 
 use Drupal\Component\Assertion\Inspector;
-use Drupal\Component\Plugin\ContextAwarePluginInterface as ComponentContextAwarePluginInterface;
 use Drupal\Component\Plugin\Definition\PluginDefinitionInterface;
 use Drupal\Component\Plugin\Discovery\CachedDiscoveryInterface;
 use Drupal\Core\Cache\CacheableDependencyInterface;

Fixed unused use on commit.

Adding #2809305: Block Context assignment form element shows even if no options are available as related.