clean install

web/core/modules/block/src/Plugin/Derivative/ThemeLocalTask.php

@@ -0,0 +1,66 @@
+<?php
+
+namespace Drupal\block\Plugin\Derivative;
+
+use Drupal\Component\Plugin\Derivative\DeriverBase;
+use Drupal\Core\Extension\ThemeHandlerInterface;
+use Drupal\Core\Plugin\Discovery\ContainerDeriverInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Provides dynamic tabs based on active themes.
+ */
+class ThemeLocalTask extends DeriverBase implements ContainerDeriverInterface {
+
+  /**
+   * The theme handler.
+   *
+   * @var \Drupal\Core\Extension\ThemeHandlerInterface
+   */
+  protected $themeHandler;
+
+  /**
+   * Constructs a new ThemeLocalTask.
+   *
+   * @param \Drupal\Core\Extension\ThemeHandlerInterface $theme_handler
+   *   The theme handler.
+   */
+  public function __construct(ThemeHandlerInterface $theme_handler) {
+    $this->themeHandler = $theme_handler;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container, $base_plugin_id) {
+    return new static(
+      $container->get('theme_handler')
+    );
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getDerivativeDefinitions($base_plugin_definition) {
+    $default_theme = $this->themeHandler->getDefault();
+
+    foreach ($this->themeHandler->listInfo() as $theme_name => $theme) {
+      if ($this->themeHandler->hasUi($theme_name)) {
+        $this->derivatives[$theme_name] = $base_plugin_definition;
+        $this->derivatives[$theme_name]['title'] = $theme->info['name'];
+        $this->derivatives[$theme_name]['route_parameters'] = ['theme' => $theme_name];
+      }
+      // Default task!
+      if ($default_theme == $theme_name) {
+        $this->derivatives[$theme_name]['route_name'] = $base_plugin_definition['parent_id'];
+        // Emulate default logic because without the base plugin id we can't
+        // change the base_route.
+        $this->derivatives[$theme_name]['weight'] = -10;
+
+        unset($this->derivatives[$theme_name]['route_parameters']);
+      }
+    }
+    return $this->derivatives;
+  }
+
+}

web/core/modules/block/src/Plugin/DisplayVariant/BlockPageVariant.php

@@ -0,0 +1,205 @@
+<?php
+
+namespace Drupal\block\Plugin\DisplayVariant;
+
+use Drupal\block\BlockRepositoryInterface;
+use Drupal\Core\Block\MainContentBlockPluginInterface;
+use Drupal\Core\Block\TitleBlockPluginInterface;
+use Drupal\Core\Block\MessagesBlockPluginInterface;
+use Drupal\Core\Cache\CacheableMetadata;
+use Drupal\Core\Display\Attribute\PageDisplayVariant;
+use Drupal\Core\Display\PageVariantInterface;
+use Drupal\Core\Entity\EntityViewBuilderInterface;
+use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
+use Drupal\Core\Display\VariantBase;
+use Drupal\Core\StringTranslation\TranslatableMarkup;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Provides a page display variant that decorates the main content with blocks.
+ *
+ * To ensure essential information is displayed, each essential part of a page
+ * has a corresponding block plugin interface, so that BlockPageVariant can
+ * automatically provide a fallback in case no block for each of these
+ * interfaces is placed.
+ *
+ * @see \Drupal\Core\Block\MainContentBlockPluginInterface
+ * @see \Drupal\Core\Block\MessagesBlockPluginInterface
+ */
+#[PageDisplayVariant(
+  id: 'block_page',
+  admin_label: new TranslatableMarkup('Page with blocks')
+)]
+class BlockPageVariant extends VariantBase implements PageVariantInterface, ContainerFactoryPluginInterface {
+
+  /**
+   * The block repository.
+   *
+   * @var \Drupal\block\BlockRepositoryInterface
+   */
+  protected $blockRepository;
+
+  /**
+   * The block view builder.
+   *
+   * @var \Drupal\Core\Entity\EntityViewBuilderInterface
+   */
+  protected $blockViewBuilder;
+
+  /**
+   * The Block entity type list cache tags.
+   *
+   * @var string[]
+   */
+  protected $blockListCacheTags;
+
+  /**
+   * The render array representing the main page content.
+   *
+   * @var array
+   */
+  protected $mainContent = [];
+
+  /**
+   * The page title: a string (plain title) or a render array (formatted title).
+   *
+   * @var string|array
+   */
+  protected $title = '';
+
+  /**
+   * Constructs a new BlockPageVariant.
+   *
+   * @param array $configuration
+   *   A configuration array containing information about the plugin instance.
+   * @param string $plugin_id
+   *   The plugin ID for the plugin instance.
+   * @param mixed $plugin_definition
+   *   The plugin implementation definition.
+   * @param \Drupal\block\BlockRepositoryInterface $block_repository
+   *   The block repository.
+   * @param \Drupal\Core\Entity\EntityViewBuilderInterface $block_view_builder
+   *   The block view builder.
+   * @param string[] $block_list_cache_tags
+   *   The Block entity type list cache tags.
+   */
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, BlockRepositoryInterface $block_repository, EntityViewBuilderInterface $block_view_builder, array $block_list_cache_tags) {
+    parent::__construct($configuration, $plugin_id, $plugin_definition);
+    $this->blockRepository = $block_repository;
+    $this->blockViewBuilder = $block_view_builder;
+    $this->blockListCacheTags = $block_list_cache_tags;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
+    return new static(
+      $configuration,
+      $plugin_id,
+      $plugin_definition,
+      $container->get('block.repository'),
+      $container->get('entity_type.manager')->getViewBuilder('block'),
+      $container->get('entity_type.manager')->getDefinition('block')->getListCacheTags()
+    );
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setMainContent(array $main_content) {
+    $this->mainContent = $main_content;
+    return $this;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setTitle($title) {
+    $this->title = $title;
+    return $this;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function build() {
+    // Track whether blocks showing the main content and messages are displayed.
+    $main_content_block_displayed = FALSE;
+    $messages_block_displayed = FALSE;
+
+    $build = [
+      '#cache' => [
+        'tags' => $this->blockListCacheTags,
+      ],
+    ];
+    // Load all region content assigned via blocks.
+    $cacheable_metadata_list = [];
+    foreach ($this->blockRepository->getVisibleBlocksPerRegion($cacheable_metadata_list) as $region => $blocks) {
+      /** @var \Drupal\block\BlockInterface[] $blocks */
+      foreach ($blocks as $key => $block) {
+        $block_plugin = $block->getPlugin();
+        if ($block_plugin instanceof MainContentBlockPluginInterface) {
+          $block_plugin->setMainContent($this->mainContent);
+          $main_content_block_displayed = TRUE;
+        }
+        elseif ($block_plugin instanceof TitleBlockPluginInterface) {
+          $block_plugin->setTitle($this->title);
+        }
+        elseif ($block_plugin instanceof MessagesBlockPluginInterface) {
+          $messages_block_displayed = TRUE;
+        }
+        $build[$region][$key] = $this->blockViewBuilder->view($block);
+
+        // The main content block cannot be cached: it is a placeholder for the
+        // render array returned by the controller. It should be rendered as-is,
+        // with other placed blocks "decorating" it. Analogous reasoning for the
+        // title block.
+        if ($block_plugin instanceof MainContentBlockPluginInterface || $block_plugin instanceof TitleBlockPluginInterface) {
+          unset($build[$region][$key]['#cache']['keys']);
+        }
+      }
+      if (!empty($build[$region])) {
+        // \Drupal\block\BlockRepositoryInterface::getVisibleBlocksPerRegion()
+        // returns the blocks in sorted order.
+        $build[$region]['#sorted'] = TRUE;
+      }
+    }
+
+    // If no block that shows the main content is displayed, still show the main
+    // content. Otherwise the end user will see all displayed blocks, but not
+    // the main content they came for.
+    if (!$main_content_block_displayed) {
+      $build['content']['system_main'] = $this->mainContent;
+    }
+
+    // If no block displays status messages, still render them.
+    if (!$messages_block_displayed) {
+      $build['content']['messages'] = [
+        '#weight' => -1000,
+        '#type' => 'status_messages',
+        '#include_fallback' => TRUE,
+      ];
+    }
+
+    // If any render arrays are manually placed, render arrays and blocks must
+    // be sorted.
+    if (!$main_content_block_displayed || !$messages_block_displayed) {
+      unset($build['content']['#sorted']);
+    }
+
+    // The access results' cacheability is currently added to the top level of the
+    // render array. This is done to prevent issues with empty regions being
+    // displayed.
+    // This would need to be changed to allow caching of block regions, as each
+    // region must then have the relevant cacheable metadata.
+    $merged_cacheable_metadata = CacheableMetadata::createFromRenderArray($build);
+    foreach ($cacheable_metadata_list as $cacheable_metadata) {
+      $merged_cacheable_metadata = $merged_cacheable_metadata->merge($cacheable_metadata);
+    }
+    $merged_cacheable_metadata->applyTo($build);
+
+    return $build;
+  }
+
+}

web/core/modules/block/src/Plugin/migrate/destination/EntityBlock.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace Drupal\block\Plugin\migrate\destination;
+
+use Drupal\Core\Config\Schema\SchemaIncompleteException;
+use Drupal\migrate\Attribute\MigrateDestination;
+use Drupal\migrate\MigrateException;
+use Drupal\migrate\Plugin\migrate\destination\EntityConfigBase;
+use Drupal\migrate\Row;
+
+/**
+ * Migrate destination for block entity.
+ */
+#[MigrateDestination('entity:block')]
+class EntityBlock extends EntityConfigBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getEntityId(Row $row) {
+    // Try to find the block by its plugin ID and theme.
+    $properties = [
+      'plugin' => $row->getDestinationProperty('plugin'),
+      'theme' => $row->getDestinationProperty('theme'),
+    ];
+    $blocks = array_keys($this->storage->loadByProperties($properties));
+    return reset($blocks);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function import(Row $row, array $old_destination_id_values = []) {
+    try {
+      $entity_ids = parent::import($row, $old_destination_id_values);
+    }
+    catch (SchemaIncompleteException $e) {
+      throw new MigrateException($e->getMessage());
+    }
+    return $entity_ids;
+  }
+
+}

web/core/modules/block/src/Plugin/migrate/process/BlockPluginId.php

@@ -0,0 +1,112 @@
+<?php
+
+namespace Drupal\block\Plugin\migrate\process;
+
+use Drupal\Core\Entity\EntityStorageInterface;
+use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
+use Drupal\migrate\Attribute\MigrateProcess;
+use Drupal\migrate\MigrateLookupInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
+use Drupal\migrate\MigrateExecutableInterface;
+use Drupal\migrate\ProcessPluginBase;
+use Drupal\migrate\Row;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+#[MigrateProcess('block_plugin_id')]
+class BlockPluginId extends ProcessPluginBase implements ContainerFactoryPluginInterface {
+
+  /**
+   * The migrate lookup service.
+   *
+   * @var \Drupal\migrate\MigrateLookupInterface
+   */
+  protected $migrateLookup;
+
+  /**
+   * The block_content entity storage handler.
+   *
+   * @var \Drupal\Core\Entity\EntityStorageInterface|null
+   */
+  protected $blockContentStorage;
+
+  /**
+   * Constructs a BlockPluginId object.
+   *
+   * @param array $configuration
+   *   The plugin configuration.
+   * @param string $plugin_id
+   *   The plugin ID.
+   * @param array $plugin_definition
+   *   The plugin definition.
+   * @param \Drupal\Core\Entity\EntityStorageInterface|null $storage
+   *   The block content storage object. NULL if the block_content module is
+   *   not installed.
+   * @param \Drupal\migrate\MigrateLookupInterface $migrate_lookup
+   *   The migrate lookup service.
+   */
+  public function __construct(array $configuration, $plugin_id, array $plugin_definition, ?EntityStorageInterface $storage, MigrateLookupInterface $migrate_lookup) {
+    parent::__construct($configuration, $plugin_id, $plugin_definition);
+    $this->blockContentStorage = $storage;
+    $this->migrateLookup = $migrate_lookup;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition, ?MigrationInterface $migration = NULL) {
+    $entity_type_manager = $container->get('entity_type.manager');
+    return new static(
+      $configuration,
+      $plugin_id,
+      $plugin_definition,
+      $entity_type_manager->hasDefinition('block_content') ? $entity_type_manager->getStorage('block_content') : NULL,
+      $container->get('migrate.lookup')
+    );
+  }
+
+  /**
+   * {@inheritdoc}
+   *
+   * Set the block plugin id.
+   */
+  public function transform($value, MigrateExecutableInterface $migrate_executable, Row $row, $destination_property) {
+    if (is_array($value)) {
+      [$module, $delta] = $value;
+      switch ($module) {
+        case 'aggregator':
+          [$type] = explode('-', $delta);
+          if ($type == 'feed') {
+            return 'aggregator_feed_block';
+          }
+          break;
+
+        case 'menu':
+          return "system_menu_block:$delta";
+
+        case 'block':
+          if ($this->blockContentStorage) {
+            $block_id = $row->getDestinationProperty('_block_module_plugin_id');
+            // Legacy generated migrations will not have the destination
+            // property '_block_module_plugin_id'.
+            if (!$block_id) {
+              $lookup_result = $this->migrateLookup->lookup(['d6_custom_block', 'd7_custom_block'], [$delta]);
+              if ($lookup_result) {
+                $block_id = $lookup_result[0]['id'];
+              }
+            }
+            if ($block_id) {
+              return 'block_content:' . $this->blockContentStorage->load($block_id)->uuid();
+            }
+          }
+          break;
+
+        default:
+          break;
+      }
+    }
+    else {
+      return $value;
+    }
+  }
+
+}

web/core/modules/block/src/Plugin/migrate/process/BlockRegion.php

@@ -0,0 +1,70 @@
+<?php
+
+namespace Drupal\block\Plugin\migrate\process;
+
+use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
+use Drupal\migrate\Attribute\MigrateProcess;
+use Drupal\migrate\MigrateExecutableInterface;
+use Drupal\migrate\Plugin\migrate\process\StaticMap;
+use Drupal\migrate\Row;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+#[MigrateProcess('block_region')]
+class BlockRegion extends StaticMap implements ContainerFactoryPluginInterface {
+
+  /**
+   * List of regions, keyed by theme.
+   *
+   * @var array[]
+   */
+  protected $regions;
+
+  /**
+   * Constructs a BlockRegion plugin instance.
+   *
+   * @param array $configuration
+   *   The plugin configuration.
+   * @param string $plugin_id
+   *   The plugin ID.
+   * @param mixed $plugin_definition
+   *   The plugin definition.
+   * @param array $regions
+   *   Array of region maps, keyed by theme.
+   */
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, array $regions) {
+    parent::__construct($configuration, $plugin_id, $plugin_definition);
+    $this->regions = $regions;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
+    $regions = [];
+    foreach ($container->get('theme_handler')->listInfo() as $key => $theme) {
+      $regions[$key] = $theme->info['regions'];
+    }
+    return new static($configuration, $plugin_id, $plugin_definition, $regions);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function transform($value, MigrateExecutableInterface $migrate_executable, Row $row, $destination_property) {
+    // Set the destination region, based on the source region and theme as well
+    // as the current destination default theme.
+    [$source_theme, $destination_theme, $region] = $value;
+
+    // Theme is the same on both source and destination, so ensure that the
+    // region exists in the destination theme.
+    if (strtolower($source_theme) == strtolower($destination_theme)) {
+      if (isset($this->regions[$destination_theme][$region])) {
+        return $region;
+      }
+    }
+
+    // Fall back to static mapping.
+    return parent::transform($value, $migrate_executable, $row, $destination_property);
+  }
+
+}

web/core/modules/block/src/Plugin/migrate/process/BlockSettings.php

@@ -0,0 +1,67 @@
+<?php
+
+namespace Drupal\block\Plugin\migrate\process;
+
+use Drupal\Core\Block\BlockPluginInterface;
+use Drupal\migrate\Attribute\MigrateProcess;
+use Drupal\migrate\MigrateExecutableInterface;
+use Drupal\migrate\ProcessPluginBase;
+use Drupal\migrate\Row;
+
+// cspell:ignore whois
+
+/**
+ * Determines the block settings.
+ */
+#[MigrateProcess('block_settings')]
+class BlockSettings extends ProcessPluginBase {
+
+  /**
+   * {@inheritdoc}
+   *
+   * Set the block configuration.
+   */
+  public function transform($value, MigrateExecutableInterface $migrate_executable, Row $row, $destination_property) {
+    [$plugin, $delta, $old_settings, $title] = $value;
+    $settings = [];
+    $settings['label'] = $title;
+    if ($title && $title !== '<none>') {
+      $settings['label_display'] = BlockPluginInterface::BLOCK_LABEL_VISIBLE;
+    }
+    else {
+      $settings['label_display'] = '0';
+    }
+    switch ($plugin) {
+      case 'aggregator_feed_block':
+        [, $id] = explode('-', $delta);
+        $settings['block_count'] = $old_settings['aggregator']['item_count'];
+        $settings['feed'] = $id;
+        break;
+
+      case 'book_navigation':
+        $settings['block_mode'] = $old_settings['book']['block_mode'];
+        break;
+
+      case 'forum_active_block':
+      case 'forum_new_block':
+        $settings['block_count'] = $old_settings['forum']['block_num'];
+        break;
+
+      case 'statistics_popular_block':
+        $settings['top_day_num'] = $old_settings['statistics']['statistics_block_top_day_num'];
+        $settings['top_all_num'] = $old_settings['statistics']['statistics_block_top_all_num'];
+        $settings['top_last_num'] = $old_settings['statistics']['statistics_block_top_last_num'];
+        break;
+
+      case 'views_block:who_s_new-block_1':
+        $settings['items_per_page'] = $old_settings['user']['block_whois_new_count'];
+        break;
+
+      case 'views_block:who_s_online-who_s_online_block':
+        $settings['items_per_page'] = $old_settings['user']['max_list_count'];
+        break;
+    }
+    return $settings;
+  }
+
+}

web/core/modules/block/src/Plugin/migrate/process/BlockTheme.php

@@ -0,0 +1,94 @@
+<?php
+
+namespace Drupal\block\Plugin\migrate\process;
+
+use Drupal\Core\Config\Config;
+use Drupal\migrate\Attribute\MigrateProcess;
+use Drupal\migrate\MigrateExecutableInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
+use Drupal\migrate\ProcessPluginBase;
+use Drupal\migrate\Row;
+use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+#[MigrateProcess('block_theme')]
+class BlockTheme extends ProcessPluginBase implements ContainerFactoryPluginInterface {
+
+  /**
+   * Contains the system.theme configuration object.
+   */
+  protected Config $themeConfig;
+
+  /**
+   * List of themes available on the destination.
+   *
+   * @var string[]
+   */
+  protected array $themes;
+
+  /**
+   * Constructs a BlockTheme object.
+   *
+   * @param array $configuration
+   *   A configuration array containing information about the plugin instance.
+   * @param string $plugin_id
+   *   The plugin ID for the plugin instance.
+   * @param mixed $plugin_definition
+   *   The plugin implementation definition.
+   * @param \Drupal\Core\Config\Config|\Drupal\migrate\Plugin\MigrationInterface $theme_config
+   *   The system.theme configuration factory object.
+   * @param string[]|\Drupal\Core\Config\Config $themes
+   *   The list of themes available on the destination.
+   */
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, Config|MigrationInterface $theme_config, array|Config $themes) {
+    parent::__construct($configuration, $plugin_id, $plugin_definition);
+    if ($theme_config instanceof MigrationInterface) {
+      @trigger_error('Calling ' . __CLASS__ . '::__construct() with the $migration argument is deprecated in drupal:10.1.0 and is removed in drupal:11.0.0. See https://www.drupal.org/node/3323212', E_USER_DEPRECATED);
+      $theme_config = func_get_arg(4);
+      $themes = func_get_arg(5);
+    }
+    $this->themeConfig = $theme_config;
+    $this->themes = $themes;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
+    return new static(
+      $configuration,
+      $plugin_id,
+      $plugin_definition,
+      $container->get('config.factory')->get('system.theme'),
+      $container->get('theme_handler')->listInfo()
+    );
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function transform($value, MigrateExecutableInterface $migrate_executable, Row $row, $destination_property) {
+    [$theme, $default_theme, $admin_theme] = $value;
+
+    // If the source theme exists on the destination, we're good.
+    if (isset($this->themes[$theme])) {
+      return $theme;
+    }
+
+    // If the source block is assigned to a region in the source default theme,
+    // then assign it to the destination default theme.
+    if (strtolower($theme) == strtolower($default_theme)) {
+      return $this->themeConfig->get('default');
+    }
+
+    // If the source block is assigned to a region in the source admin theme,
+    // then assign it to the destination admin theme.
+    if ($admin_theme && strtolower($theme) == strtolower($admin_theme)) {
+      return $this->themeConfig->get('admin');
+    }
+
+    // We couldn't map it to a D8 theme so just return the incoming theme.
+    return $theme;
+  }
+
+}

web/core/modules/block/src/Plugin/migrate/process/BlockVisibility.php

@@ -0,0 +1,151 @@
+<?php
+
+namespace Drupal\block\Plugin\migrate\process;
+
+use Drupal\Core\Extension\ModuleHandlerInterface;
+use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
+use Drupal\migrate\Attribute\MigrateProcess;
+use Drupal\migrate\MigrateLookupInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
+use Drupal\migrate\MigrateExecutableInterface;
+use Drupal\migrate\MigrateSkipRowException;
+use Drupal\migrate\ProcessPluginBase;
+use Drupal\migrate\Row;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+#[MigrateProcess('block_visibility')]
+class BlockVisibility extends ProcessPluginBase implements ContainerFactoryPluginInterface {
+
+  /**
+   * The module handler.
+   *
+   * @var \Drupal\Core\Extension\ModuleHandlerInterface
+   */
+  protected $moduleHandler;
+
+  /**
+   * The migrate lookup service.
+   *
+   * @var \Drupal\migrate\MigrateLookupInterface
+   */
+  protected $migrateLookup;
+
+  /**
+   * Whether or not to skip blocks that use PHP for visibility.
+   *
+   * Only applies if the PHP module is not enabled.
+   *
+   * @var bool
+   */
+  protected $skipPHP = FALSE;
+
+  /**
+   * Constructs a BlockVisibility object.
+   *
+   * @param array $configuration
+   *   The plugin configuration.
+   * @param string $plugin_id
+   *   The plugin ID.
+   * @param mixed $plugin_definition
+   *   The plugin definition.
+   * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
+   *   The module handler service.
+   * @param \Drupal\migrate\MigrateLookupInterface $migrate_lookup
+   *   The migrate lookup service.
+   */
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, ModuleHandlerInterface $module_handler, MigrateLookupInterface $migrate_lookup) {
+    parent::__construct($configuration, $plugin_id, $plugin_definition);
+    $this->moduleHandler = $module_handler;
+    $this->migrateLookup = $migrate_lookup;
+
+    if (isset($configuration['skip_php'])) {
+      $this->skipPHP = $configuration['skip_php'];
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition, ?MigrationInterface $migration = NULL) {
+    return new static(
+      $configuration,
+      $plugin_id,
+      $plugin_definition,
+      $container->get('module_handler'),
+      $container->get('migrate.lookup')
+    );
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function transform($value, MigrateExecutableInterface $migrate_executable, Row $row, $destination_property) {
+    [$old_visibility, $pages, $roles] = $value;
+
+    $visibility = [];
+
+    // If the block is assigned to specific roles, add the user_role condition.
+    if ($roles) {
+      $visibility['user_role'] = [
+        'id' => 'user_role',
+        'roles' => [],
+        'context_mapping' => [
+          'user' => '@user.current_user_context:current_user',
+        ],
+        'negate' => FALSE,
+      ];
+      // Legacy generated migrations will not have the destination property
+      // '_role_ids'.
+      $role_ids = $row->getDestinationProperty('_role_ids');
+      foreach ($roles as $key => $role_id) {
+        if (!$role_ids) {
+          $lookup = $this->migrateLookup->lookup(['d6_user_role', 'd7_user_role'], [$role_id]);
+          $lookup_result = $lookup[0]['id'];
+        }
+        else {
+          $lookup_result = $role_ids[$role_id] ?? NULL;
+        }
+        if ($lookup_result) {
+          $roles[$key] = $lookup_result;
+        }
+      }
+
+      $visibility['user_role']['roles'] = array_combine($roles, $roles);
+    }
+
+    if ($pages) {
+      // 2 == BLOCK_VISIBILITY_PHP in Drupal 6 and 7.
+      if ($old_visibility == 2) {
+        // If the PHP module is present, migrate the visibility code unaltered.
+        if ($this->moduleHandler->moduleExists('php')) {
+          $visibility['php'] = [
+            'id' => 'php',
+            // PHP code visibility could not be negated in Drupal 6 or 7.
+            'negate' => FALSE,
+            'php' => $pages,
+          ];
+        }
+        // Skip the row if we're configured to. If not, we don't need to do
+        // anything else -- the block will simply have no PHP or request_path
+        // visibility configuration.
+        elseif ($this->skipPHP) {
+          throw new MigrateSkipRowException(sprintf("The block with bid '%d' from module '%s' will have no PHP or request_path visibility configuration.", $row->getSourceProperty('bid'), $row->getSourceProperty('module')));
+        }
+      }
+      else {
+        $paths = preg_split("(\r\n?|\n)", $pages);
+        foreach ($paths as $key => $path) {
+          $paths[$key] = $path === '<front>' ? $path : '/' . ltrim($path, '/');
+        }
+        $visibility['request_path'] = [
+          'id' => 'request_path',
+          'negate' => !$old_visibility,
+          'pages' => implode("\n", $paths),
+        ];
+      }
+    }
+
+    return $visibility;
+  }
+
+}

web/core/modules/block/src/Plugin/migrate/process/RolesLookup.php

@@ -0,0 +1,103 @@
+<?php
+
+namespace Drupal\block\Plugin\migrate\process;
+
+use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
+use Drupal\migrate\Attribute\MigrateProcess;
+use Drupal\migrate\MigrateLookupInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
+use Drupal\migrate\MigrateExecutableInterface;
+use Drupal\migrate\ProcessPluginBase;
+use Drupal\migrate\Row;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Gets the destination roles ID for an array of source roles IDs.
+ *
+ * The roles_lookup plugin is used to get the destination roles for roles that
+ * are assigned to a block. It always uses the 'roles' value on the row as the
+ * source value.
+ *
+ *  Examples
+ *
+ * @code
+ *  process:
+ *    roles:
+ *      plugin: roles_lookup
+ *      migration: d7_user_role
+ * @endcode
+ *
+ * This will get the destination role ID for each role in the 'roles' value on
+ * the source row.
+ *
+ * @see \Drupal\migrate\Plugin\MigrateProcessInterface
+ */
+#[MigrateProcess('roles_lookup')]
+class RolesLookup extends ProcessPluginBase implements ContainerFactoryPluginInterface {
+
+  /**
+   * The migrate lookup service.
+   *
+   * @var \Drupal\migrate\MigrateLookupInterface
+   */
+  protected $migrateLookup;
+
+  /**
+   * The migration for user role lookup.
+   *
+   * @var string
+   */
+  protected $migration;
+
+  /**
+   * Constructs a BlockVisibility object.
+   *
+   * @param array $configuration
+   *   The plugin configuration.
+   * @param string $plugin_id
+   *   The plugin ID.
+   * @param mixed $plugin_definition
+   *   The plugin definition.
+   * @param \Drupal\migrate\MigrateLookupInterface $migrate_lookup
+   *   The migrate lookup service.
+   */
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, MigrateLookupInterface $migrate_lookup) {
+    parent::__construct($configuration, $plugin_id, $plugin_definition);
+    $this->migrateLookup = $migrate_lookup;
+
+    if (isset($configuration['migration'])) {
+      $this->migration = $configuration['migration'];
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition, ?MigrationInterface $migration = NULL) {
+    return new static(
+      $configuration,
+      $plugin_id,
+      $plugin_definition,
+      $container->get('migrate.lookup')
+    );
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function transform($value, MigrateExecutableInterface $migrate_executable, Row $row, $destination_property) {
+    $roles = $row->get('roles');
+    $roles_result = [];
+    // If the block is assigned to specific roles, add the user_role condition.
+    if ($roles) {
+      foreach ($roles as $role_id) {
+        $lookup_result = $this->migrateLookup->lookup([$this->migration], [$role_id]);
+        if ($lookup_result) {
+          $roles_result[$role_id] = $lookup_result[0]['id'];
+        }
+      }
+    }
+    return $roles_result;
+  }
+
+}

web/core/modules/block/src/Plugin/migrate/source/Block.php

@@ -0,0 +1,189 @@
+<?php
+
+namespace Drupal\block\Plugin\migrate\source;
+
+use Drupal\migrate\Row;
+use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
+
+// cspell:ignore whois
+
+/**
+ * Drupal 6/7 block source from database.
+ *
+ * For available configuration keys, refer to the parent classes.
+ *
+ * @see \Drupal\migrate\Plugin\migrate\source\SqlBase
+ * @see \Drupal\migrate\Plugin\migrate\source\SourcePluginBase
+ *
+ * @MigrateSource(
+ *   id = "block",
+ *   source_module = "block"
+ * )
+ */
+class Block extends DrupalSqlBase {
+
+  /**
+   * The default theme name.
+   *
+   * @var string
+   */
+  protected $defaultTheme;
+
+  /**
+   * The admin theme name.
+   *
+   * @var string
+   */
+  protected $adminTheme;
+
+  /**
+   * Table containing block configuration.
+   *
+   * @var string
+   */
+  protected $blockTable;
+
+  /**
+   * Table mapping blocks to user roles.
+   *
+   * @var string
+   */
+  protected $blockRoleTable;
+
+  /**
+   * Table listing user roles.
+   *
+   * @var string
+   */
+  protected $userRoleTable;
+
+  /**
+   * {@inheritdoc}
+   */
+  public function query() {
+    if ($this->getModuleSchemaVersion('system') >= 7000) {
+      $this->blockTable = 'block';
+      $this->blockRoleTable = 'block_role';
+    }
+    else {
+      $this->blockTable = 'blocks';
+      $this->blockRoleTable = 'blocks_roles';
+    }
+    // Drupal 6 & 7 both use the same name for the user roles table.
+    $this->userRoleTable = 'role';
+
+    return $this->select($this->blockTable, 'b')->fields('b');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function initializeIterator() {
+    $this->defaultTheme = $this->variableGet('theme_default', 'Garland');
+    $this->adminTheme = $this->variableGet('admin_theme', NULL);
+    return parent::initializeIterator();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function fields() {
+    return [
+      'bid' => $this->t('The block numeric identifier.'),
+      'module' => $this->t('The module providing the block.'),
+      'delta' => $this->t("The block's delta."),
+      'theme' => $this->t('Which theme the block is placed in.'),
+      'status' => $this->t('Whether or not the block is enabled.'),
+      'weight' => $this->t('Weight of the block for ordering within regions.'),
+      'region' => $this->t('Region the block is placed in.'),
+      'visibility' => $this->t('Visibility expression.'),
+      'pages' => $this->t('Pages list.'),
+      'title' => $this->t('Block title.'),
+      'cache' => $this->t('Cache rule.'),
+    ];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getIds() {
+    $ids['module']['type'] = 'string';
+    $ids['delta']['type'] = 'string';
+    $ids['theme']['type'] = 'string';
+    return $ids;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function prepareRow(Row $row) {
+    $row->setSourceProperty('default_theme', $this->defaultTheme);
+    $row->setSourceProperty('admin_theme', $this->adminTheme);
+
+    $module = $row->getSourceProperty('module');
+    $delta = $row->getSourceProperty('delta');
+
+    $query = $this->select($this->blockRoleTable, 'br')
+      ->fields('br', ['rid'])
+      ->condition('module', $module)
+      ->condition('delta', $delta);
+    $query->join($this->userRoleTable, 'ur', '[br].[rid] = [ur].[rid]');
+    $roles = $query->execute()
+      ->fetchCol();
+    $row->setSourceProperty('roles', $roles);
+
+    $settings = [];
+    switch ($module) {
+      case 'aggregator':
+        [$type, $id] = explode('-', $delta);
+        if ($type == 'feed') {
+          $item_count = $this->select('aggregator_feed', 'af')
+            ->fields('af', ['block'])
+            ->condition('fid', $id)
+            ->execute()
+            ->fetchField();
+        }
+        else {
+          $item_count = $this->select('aggregator_category', 'ac')
+            ->fields('ac', ['block'])
+            ->condition('cid', $id)
+            ->execute()
+            ->fetchField();
+        }
+        $settings['aggregator']['item_count'] = $item_count;
+        break;
+
+      case 'book':
+        $settings['book']['block_mode'] = $this->variableGet('book_block_mode', 'all pages');
+        break;
+
+      case 'forum':
+        $settings['forum']['block_num'] = $this->variableGet('forum_block_num_' . $delta, 5);
+        break;
+
+      case 'statistics':
+        foreach (['statistics_block_top_day_num', 'statistics_block_top_all_num', 'statistics_block_top_last_num'] as $name) {
+          $settings['statistics'][$name] = $this->variableGet($name, 0);
+        }
+        break;
+
+      case 'user':
+        switch ($delta) {
+          case 2:
+          case 'new':
+            $settings['user']['block_whois_new_count'] = $this->variableGet('user_block_whois_new_count', 5);
+            break;
+
+          case 3:
+          case 'online':
+            $settings['user']['block_seconds_online'] = $this->variableGet('user_block_seconds_online', 900);
+            $settings['user']['max_list_count'] = $this->variableGet('user_block_max_list_count', 10);
+            break;
+        }
+        break;
+    }
+    $row->setSourceProperty('settings', $settings);
+    return parent::prepareRow($row);
+  }
+
+}

web/core/modules/block/src/Plugin/migrate/source/d6/BlockTranslation.php

@@ -0,0 +1,76 @@
+<?php
+
+namespace Drupal\block\Plugin\migrate\source\d6;
+
+use Drupal\block\Plugin\migrate\source\Block;
+use Drupal\migrate\Plugin\migrate\source\SourcePluginBase;
+use Drupal\migrate\Row;
+
+/**
+ * Drupal 6 i18n block data from database.
+ *
+ * For available configuration keys, refer to the parent classes.
+ *
+ * @see \Drupal\migrate\Plugin\migrate\source\SqlBase
+ * @see \Drupal\migrate\Plugin\migrate\source\SourcePluginBase
+ *
+ * @MigrateSource(
+ *   id = "d6_block_translation",
+ *   source_module = "i18nblocks"
+ * )
+ */
+class BlockTranslation extends Block {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function query() {
+    // Let the parent set the block table to use, but do not use the parent
+    // query. Instead build a query so can use an inner join to the selected
+    // block table.
+    parent::query();
+    $query = $this->select('i18n_blocks', 'i18n')
+      ->fields('i18n')
+      ->fields('b', ['bid', 'module', 'delta', 'theme', 'title']);
+    $query->innerJoin($this->blockTable, 'b', ('[b].[module] = [i18n].[module] AND [b].[delta] = [i18n].[delta]'));
+    return $query;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function fields() {
+    return [
+      'bid' => $this->t('The block numeric identifier.'),
+      'ibid' => $this->t('The i18n_blocks block numeric identifier.'),
+      'module' => $this->t('The module providing the block.'),
+      'delta' => $this->t("The block's delta."),
+      'type' => $this->t('Block type'),
+      'language' => $this->t('Language for this field.'),
+      'theme' => $this->t('Which theme the block is placed in.'),
+      'default_theme' => $this->t('The default theme.'),
+      'title' => $this->t('Block title.'),
+    ];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function prepareRow(Row $row) {
+    $row->setSourceProperty('default_theme', $this->defaultTheme);
+    return SourcePluginBase::prepareRow($row);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getIds() {
+    $ids = parent::getIds();
+    $ids['module']['alias'] = 'b';
+    $ids['delta']['alias'] = 'b';
+    $ids['theme']['alias'] = 'b';
+    $ids['language']['type'] = 'string';
+    return $ids;
+  }
+
+}

web/core/modules/block/src/Plugin/migrate/source/d7/BlockTranslation.php

@@ -0,0 +1,116 @@
+<?php
+
+namespace Drupal\block\Plugin\migrate\source\d7;
+
+use Drupal\block\Plugin\migrate\source\Block;
+
+// cspell:ignore objectid objectindex plid textgroup
+
+/**
+ * Drupal 7 i18n block data from database.
+ *
+ * For available configuration keys, refer to the parent classes.
+ *
+ * @see \Drupal\migrate\Plugin\migrate\source\SqlBase
+ * @see \Drupal\migrate\Plugin\migrate\source\SourcePluginBase
+ *
+ * @MigrateSource(
+ *   id = "d7_block_translation",
+ *   source_module = "i18n_block"
+ * )
+ */
+class BlockTranslation extends Block {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function query() {
+    // Let the parent set the block table to use, but do not use the parent
+    // query. Instead build a query so can use an inner join to the selected
+    // block table.
+    parent::query();
+    $query = $this->select('i18n_string', 'i18n')
+      ->fields('i18n')
+      ->fields('b', [
+        'bid',
+        'module',
+        'delta',
+        'theme',
+        'status',
+        'weight',
+        'region',
+        'custom',
+        'visibility',
+        'pages',
+        'title',
+        'cache',
+        'i18n_mode',
+      ])
+      ->fields('lt', [
+        'lid',
+        'translation',
+        'language',
+        'plid',
+        'plural',
+      ])
+      ->condition('i18n_mode', 1);
+    $query->leftJoin($this->blockTable, 'b', ('[b].[delta] = [i18n].[objectid]'));
+    $query->innerJoin('locales_target', 'lt', '[lt].[lid] = [i18n].[lid]');
+
+    // The i18n_string module adds a status column to locale_target. It was
+    // originally 'status' in a later revision it was named 'i18n_status'.
+    /** @var \Drupal\Core\Database\Schema $db */
+    if ($this->getDatabase()->schema()->fieldExists('locales_target', 'status')) {
+      $query->addField('lt', 'status', 'i18n_status');
+    }
+    if ($this->getDatabase()->schema()->fieldExists('locales_target', 'i18n_status')) {
+      $query->addField('lt', 'i18n_status', 'i18n_status');
+    }
+
+    return $query;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function fields() {
+    return [
+      'bid' => $this->t('The block numeric identifier.'),
+      'module' => $this->t('The module providing the block.'),
+      'delta' => $this->t("The block's delta."),
+      'theme' => $this->t('Which theme the block is placed in.'),
+      'status' => $this->t('Block enabled status'),
+      'weight' => $this->t('Block weight within region'),
+      'region' => $this->t('Theme region within which the block is set'),
+      'visibility' => $this->t('Visibility'),
+      'pages' => $this->t('Pages list.'),
+      'title' => $this->t('Block title.'),
+      'cache' => $this->t('Cache rule.'),
+      'i18n_mode' => $this->t('Multilingual mode'),
+      'lid' => $this->t('Language string ID'),
+      'textgroup' => $this->t('A module defined group of translations'),
+      'context' => $this->t('Full string ID for quick search: type:objectid:property.'),
+      'objectid' => $this->t('Object ID'),
+      'type' => $this->t('Object type for this string'),
+      'property' => $this->t('Object property for this string'),
+      'objectindex' => $this->t('Integer value of Object ID'),
+      'format' => $this->t('The {filter_format}.format of the string'),
+      'translation' => $this->t('Translation'),
+      'language' => $this->t('Language code'),
+      'plid' => $this->t('Parent lid'),
+      'plural' => $this->t('Plural index number'),
+      'i18n_status' => $this->t('Translation needs update'),
+    ];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getIds() {
+    $ids['delta']['type'] = 'string';
+    $ids['delta']['alias'] = 'b';
+    $ids['language']['type'] = 'string';
+    return $ids;
+  }
+
+}