Revert "Issue #3062281 by rpsu, acbramley, xjm, catch, Berdir: Deprecate and...

Revert "Issue #3062281 by rpsu, acbramley, xjm, catch, Berdir: Deprecate and remove block_place module in Drupal 9"

This reverts commit 93b7946d.

core/modules/block_place/block_place.info.yml

 name: Place Blocks
 type: module
-description: 'Allow administrators to place blocks from any Drupal page. This module is deprecated in Drupal 8.8.0 and will be removed in Drupal 9.0.0. Using Layout Builder (available in Drupal 8.7.0) module is recommended. See https://www.drupal.org/node/3081957. Alternatively you may use the contrib module Place Blocks.'
+description: 'Allow administrators to place blocks from any Drupal page'
 package: Core (Experimental)
 version: VERSION
 core: 8.x

core/modules/block_place/block_place.install

-<?php
-
-/**
- * @file
- * Contains install and update functions for Place Blocks.
- */
-
-/**
- * Implements hook_requirements().
- */
-function block_place_requirements($phase) {
-  $requirements = [];
-  // Notify about the module being deprecated.
-  if ($phase == 'runtime') {
-    $requirements['block_place'] = [
-      'title' => t('Place blocks'),
-      'severity' => REQUIREMENT_INFO,
-      'description' => t('Place Blocks (Core, Experimental) is deprecated in Drupal 8.8.0 and  will be removed in Drupal 9.0.0. Using Layout Builder (available in Drupal 8.7.0) module is recommended. See <a href=":change-record">the change record</a>. Alternatively you may use the contrib module <a href=":contrib-link">Place Blocks</a>.', [
-        ':change-record' => 'https://www.drupal.org/node/3081957',
-        ':contrib-link' => 'https://www.drupal.org/project/block_place',
-      ]),
-    ];
-  }
-
-  return $requirements;
-}
-
-/**
- * Implements hook_install().
- */
-function block_place_install() {
-  \Drupal::messenger()->addWarning(t('Place Blocks (Core, Experimental) is deprecated in Drupal 8.8.0 and  will be removed in Drupal 9.0.0. Using Layout Builder (available in Drupal 8.7.0) module is recommended. See <a href=":change-record">the change record</a>. Alternatively you may use the contrib module <a href=":contrib-link">Place Block</a>.', [
-    ':change-record' => 'https://www.drupal.org/node/3081957',
-    ':contrib-link' => 'https://www.drupal.org/project/block_place',
-  ]));
-}

core/modules/block_place/block_place.libraries.yml

@@ -3,11 +3,9 @@ drupal.block_place:
   css:
     theme:
       css/block-place.css: {}
-  deprecated: The "%library_id%" asset is deprecated in drupal:8.8.0 and will be removed in drupal:9.0.0. Using Layout Builder (available in drupal:8.7.0) module is recommended. See https://www.drupal.org/node/3081957. Alternatively you may use the contrib module Place Blocks.
 
 drupal.block_place.icons:
   version: VERSION
   css:
     theme:
       css/block-place.icons.theme.css: {}
-  deprecated: The "%library_id%" asset is deprecated in drupal:8.8.0 and will be removed in drupal:9.0.0. Using Layout Builder (available in drupal:8.7.0) module is recommended. See https://www.drupal.org/node/3081957. Alternatively you may use the contrib module Place Blocks.

core/modules/block_place/block_place.module

@@ -3,19 +3,8 @@
 /**
  * @file
  * Controls the placement of blocks from all pages.
- *
- * @deprecated in drupal:8.8.0 and is removed from drupal:9.0.0.
- *   See each function in the file for individual deprecation notices with
- *   upgrade instructions.
- *
- * @see https://www.drupal.org/node/3081957
  */
 
-@trigger_error('The Place Blocks module is deprecated in drupal:8.8.0 and is removed
-  from drupal:9.0.0. Using Layout Builder (available in Drupal 8.7.0) module is
-  recommended. See https://www.drupal.org/node/3081957. Alternatively you may use
-  the contrib module Place Blocks.', E_USER_DEPRECATED);
-
 use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\Core\Url;
 
@@ -26,10 +15,6 @@ function block_place_help($route_name, RouteMatchInterface $route_match) {
   switch ($route_name) {
     case 'help.page.block_place':
       $output = '<h3>' . t('About') . '</h3>';
-      $output .= '<p><strong>' . t('Place Blocks (Core, Experimental) is deprecated in Drupal 8.8.0 and  will be removed in Drupal 9.0.0. Using Layout Builder (available in Drupal 8.7.0) module is recommended. See <a href=":change-record">the change record</a>. Alternatively you may use the contrib module <a href=":contrib-link">Place Blocks</a>.', [
-          ':change-record' => 'https://www.drupal.org/node/3081957',
-          ':contrib-link' => 'https://www.drupal.org/project/block_place',
-        ]) . '</strong></p>';
       $output .= '<p>' . t('The Place Blocks module allows you to place blocks from every page. For more information, see the <a href=":blocks-documentation">online documentation for the Place Blocks module</a>.', [':blocks-documentation' => 'https://www.drupal.org/documentation/modules/block_place/']) . '</p>';
       $output .= '<h3>' . t('Uses') . '</h3>';
       $output .= '<p>' . t('Block placement is specific to each theme on your site. This module allows you to place blocks in the context of your content pages.') . '</p>';

core/modules/block_place/block_place.services.yml

@@ -4,4 +4,3 @@ services:
     arguments: ['@request_stack', '@current_user']
     tags:
       - { name: event_subscriber }
-    deprecated: The "%service_id%" service is deprecated in drupal:8.8.0 and will be removed in drupal:9.0.0. Using Layout Builder (available in drupal:8.7.0) module is recommended. See https://www.drupal.org/node/3081957. Alternatively you may use the contrib module Place Blocks.

core/modules/block_place/src/EventSubscriber/BlockPlaceEventSubscriber.php

@@ -2,12 +2,6 @@
 
 namespace Drupal\block_place\EventSubscriber;
 
-@trigger_error('The ' . __NAMESPACE__ . '\BlockPlaceEventSubscriber is
-  deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. Using Layout
-  Builder (available in Drupal 8.7.0) module is recommended. See
-  https://www.drupal.org/node/3081957. Alternatively you may use the
-  contrib module Place Blocks.', E_USER_DEPRECATED);
-
 use Drupal\Core\Render\PageDisplayVariantSelectionEvent;
 use Drupal\Core\Render\RenderEvents;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
@@ -16,12 +10,6 @@
 
 /**
  * @see \Drupal\block_place\Plugin\DisplayVariant\PlaceBlockPageVariant
- *
- * @deprecated in drupal:8.8.0 and is removed from drupal:9.0.0.
- * Using Layout Builder (available in Drupal 8.7.0) module is recommended.
- * Alternatively you may use the contrib module Place Blocks.
- *
- * @see https://www.drupal.org/node/3081957
  */
 class BlockPlaceEventSubscriber implements EventSubscriberInterface {
 
@@ -48,13 +36,6 @@ class BlockPlaceEventSubscriber implements EventSubscriberInterface {
    *   The current user.
    */
   public function __construct(RequestStack $request_stack, AccountInterface $account) {
-
-    @trigger_error('The ' . __NAMESPACE__ . '\BlockPlaceEventSubscriber is
-      deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. Using
-      Layout Builder (available in Drupal 8.7.0) module is recommended.
-      See https://www.drupal.org/node/3081957. Alternatively you may use the
-      contrib module Place Blocks.', E_USER_DEPRECATED);
-
     $this->requestStack = $request_stack;
     $this->account = $account;
   }

core/modules/block_place/src/Plugin/DisplayVariant/PlaceBlockPageVariant.php

@@ -2,12 +2,6 @@
 
 namespace Drupal\block_place\Plugin\DisplayVariant;
 
-@trigger_error('The ' . __NAMESPACE__ . '\PlaceBlockPageVariant is
-  deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. Using Layout
-  Builder (available in Drupal 8.7.0) module is recommended. See
-  https://www.drupal.org/node/3081957. Alternatively you may use the
-  contrib module Place Blocks.', E_USER_DEPRECATED);
-
 use Drupal\block\BlockRepositoryInterface;
 use Drupal\block\Plugin\DisplayVariant\BlockPageVariant;
 use Drupal\Component\Serialization\Json;
@@ -24,12 +18,6 @@
  *   id = "block_place_page",
  *   admin_label = @Translation("Page with blocks and place block buttons")
  * )
- *
- * @deprecated in drupal:8.8.0 and is removed from drupal:9.0.0.
- * Using Layout Builder (available in Drupal 8.7.0) module is recommended.
- * Alternatively you may use the contrib module Place Blocks.
- *
- * @see https://www.drupal.org/node/3081957
  */
 class PlaceBlockPageVariant extends BlockPageVariant {
 
@@ -70,12 +58,6 @@ class PlaceBlockPageVariant extends BlockPageVariant {
   public function __construct(array $configuration, $plugin_id, $plugin_definition, BlockRepositoryInterface $block_repository, EntityViewBuilderInterface $block_view_builder, array $block_list_cache_tags, ThemeManagerInterface $theme_manager, RedirectDestinationInterface $redirect_destination) {
     parent::__construct($configuration, $plugin_id, $plugin_definition, $block_repository, $block_view_builder, $block_list_cache_tags);
 
-    @trigger_error('The ' . __NAMESPACE__ . '\PlaceBlockPageVariant is
-      deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. Using
-      Layout Builder (available in Drupal 8.7.0) module is recommended.
-      See https://www.drupal.org/node/3081957. Alternatively you may use the
-      contrib module Place Blocks.', E_USER_DEPRECATED);
-
     $this->themeManager = $theme_manager;
     $this->redirectDestination = $redirect_destination;
   }

core/modules/block_place/tests/src/Functional/BlockPlaceTest.php

@@ -9,7 +9,6 @@
  * Tests the placing a block.
  *
  * @group block_place
- * @group legacy
  */
 class BlockPlaceTest extends BrowserTestBase {
 

core/modules/field/tests/src/Kernel/FieldTypePluginManagerTest.php

@@ -11,7 +11,6 @@
  * Tests the field type manager.
  *
  * @group field
- * @group legacy
  */
 class FieldTypePluginManagerTest extends FieldKernelTestBase {
 

core/modules/help_topics/tests/src/Functional/HelpTopicsSyntaxTest.php

@@ -36,11 +36,6 @@ public function testHelpTopics() {
     // Enable all modules and themes, so that all routes mentioned in topics
     // will be defined.
     $module_directories = $this->listDirectories('module');
-
-    // @todo Temporary exclusion of a deprecated Place block module.
-    // @see https://www.drupal.org/project/drupal/issues/3084471
-    unset($module_directories['block_place']);
-
     \Drupal::service('module_installer')->install(array_keys($module_directories));
     $theme_directories = $this->listDirectories('theme');
     \Drupal::service('theme_installer')->install(array_keys($theme_directories));

core/modules/migrate/tests/src/Kernel/Plugin/MigrationProvidersExistTest.php

@@ -11,7 +11,6 @@
  * Tests that modules exist for all source and destination plugins.
  *
  * @group migrate_drupal_ui
- * @group legacy
  */
 class MigrationProvidersExistTest extends MigrateDrupalTestBase {
 

core/modules/migrate_drupal/tests/src/Kernel/Plugin/migrate/DestinationCategoryTest.php

@@ -21,7 +21,6 @@
  * Tests that all migrations are tagged as either content or configuration.
  *
  * @group migrate_drupal
- * @group legacy
  */
 class DestinationCategoryTest extends MigrateDrupalTestBase {
 

core/modules/migrate_drupal/tests/src/Kernel/StateFileExists.php

@@ -15,7 +15,6 @@
  * to determine that all the required files exits.
  *
  * @group migrate_drupal
- * @group legacy
  */
 class StateFileExists extends MigrateDrupalTestBase {
 

core/modules/migrate_drupal/tests/src/Kernel/d6/MigrateDrupal6AuditIdsTest.php

@@ -14,7 +14,6 @@
  * Tests the migration auditor for ID conflicts.
  *
  * @group migrate_drupal
- * @group legacy
  */
 class MigrateDrupal6AuditIdsTest extends MigrateDrupal6TestBase {
 

core/modules/migrate_drupal/tests/src/Kernel/d6/MigrationProcessTest.php

@@ -8,7 +8,6 @@
  * Tests the getProcess() method of all Drupal 6 migrations.
  *
  * @group migrate_drupal
- * @group legacy
  */
 class MigrationProcessTest extends MigrateDrupal6TestBase {
   use FileSystemModuleDiscoveryDataProviderTrait;

core/modules/migrate_drupal/tests/src/Kernel/d6/ValidateMigrationStateTest.php

@@ -8,7 +8,6 @@
  * Tests the migration state information in module.migrate_drupal.yml.
  *
  * @group migrate_drupal
- * @group legacy
  */
 class ValidateMigrationStateTest extends MigrateDrupal6TestBase {
 

core/modules/migrate_drupal/tests/src/Kernel/d7/MigrateDrupal7AuditIdsTest.php

@@ -14,7 +14,6 @@
  * Tests the migration auditor for ID conflicts.
  *
  * @group migrate_drupal
- * @group legacy
  */
 class MigrateDrupal7AuditIdsTest extends MigrateDrupal7TestBase {
 

core/modules/migrate_drupal/tests/src/Kernel/d7/MigrationProcessTest.php

@@ -8,7 +8,6 @@
  * Tests the getProcess() method of all Drupal 7 migrations.
  *
  * @group migrate_drupal
- * @group legacy
  */
 class MigrationProcessTest extends MigrateDrupal7TestBase {
   use FileSystemModuleDiscoveryDataProviderTrait;

core/modules/migrate_drupal/tests/src/Kernel/d7/ValidateMigrationStateTest.php

@@ -8,7 +8,6 @@
  * Tests the migration state information in module.migrate_drupal.yml.
  *
  * @group migrate_drupal
- * @group legacy
  */
 class ValidateMigrationStateTest extends MigrateDrupal7TestBase {
 

core/modules/migrate_drupal_ui/tests/src/Kernel/MigrationLabelExistTest.php

@@ -10,7 +10,6 @@
  * Tests that labels exist for all migrations.
  *
  * @group migrate_drupal_ui
- * @group legacy
  */
 class MigrationLabelExistTest extends MigrateDrupalTestBase {