diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/BlockRegion.php b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/BlockRegion.php index b28c6db..ed62183 100644 --- a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/BlockRegion.php +++ b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/BlockRegion.php @@ -20,18 +20,20 @@ class BlockRegion extends ProcessPluginBase { /** * {@inheritdoc} * - * Set the destination block region, based on the source region and theme as well as - * the current destination default theme. + * Set the destination block region, based on the source region and theme as well + * as the current destination default theme. */ public function transform($value, MigrateExecutable $migrate_executable, Row $row, $destination_property) { list($region, $source_theme, $destination_theme) = $value; - // Theme is the same on both source and destination, we will assume they have the same regions. + // Theme is the same on both source and destination, we will assume they have + // the same regions. if (strtolower($source_theme) == strtolower($destination_theme)) { return $region; } - // If the source and destination theme are different, try to use the mappings defined in the configuration. + // If the source and destination theme are different, try to use the mappings + // defined in the configuration. $region_map = $this->configuration['region_map']; if (isset($region_map[$region])) { return $region_map[$region]; diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/BlockTheme.php b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/BlockTheme.php index cf77da5..63c8551 100644 --- a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/BlockTheme.php +++ b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/BlockTheme.php @@ -40,6 +40,8 @@ class BlockTheme extends ProcessPluginBase implements ContainerFactoryPluginInte * The migration entity. * @param \Drupal\Core\Config\Config $config * The configuration factory object. + * @param array $themes + * The list of themes available on the destination. */ public function __construct(array $configuration, $plugin_id, $plugin_definition, MigrationInterface $migration, Config $config, array $themes) { parent::__construct($configuration, $plugin_id, $plugin_definition, $migration); @@ -78,12 +80,14 @@ public function transform($value, MigrateExecutable $migrate_executable, Row $ro $d8_default_theme = $this->config->get('default'); $d8_admin_theme = $this->config->get('admin'); - // If the source block is assigned to a region in the source default theme, then assign it to the destination default 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($d6_default_theme)) { return $d8_default_theme; } - // If the source block is assigned to a region in the source admin theme, then assign it to the destination admin theme. + // If the source block is assigned to a region in the source admin theme, + // then assign it to the destination admin theme. if (strtolower($theme) == strtolower($d6_admin_theme)) { return $d8_admin_theme; }