diff --git a/core/modules/migrate_drupal/src/Plugin/MigrateFieldPluginManager.php b/core/modules/migrate_drupal/src/Plugin/MigrateFieldPluginManager.php index cc198e39e4..56dd3b7411 100644 --- a/core/modules/migrate_drupal/src/Plugin/MigrateFieldPluginManager.php +++ b/core/modules/migrate_drupal/src/Plugin/MigrateFieldPluginManager.php @@ -67,18 +67,4 @@ public function processDefinition(&$definition, $plugin_id) { } } - /** - * {@inheritdoc} - */ - public function getSourceModule($definition) { - return $definition['source_module']; - } - - /** - * {@inheritdoc} - */ - public function getDestinationModule($definition) { - return $definition['destination_module']; - } - } diff --git a/core/modules/migrate_drupal/src/Plugin/MigrateFieldPluginManagerInterface.php b/core/modules/migrate_drupal/src/Plugin/MigrateFieldPluginManagerInterface.php index 82a8d6bf3c..7219c2b301 100644 --- a/core/modules/migrate_drupal/src/Plugin/MigrateFieldPluginManagerInterface.php +++ b/core/modules/migrate_drupal/src/Plugin/MigrateFieldPluginManagerInterface.php @@ -25,26 +25,4 @@ */ public function getPluginIdFromFieldType($field_type, array $configuration = [], MigrationInterface $migration = NULL); - /** - * Gets the source module providing the source data. - * - * @param array $definition - * The field plugin definition. - * - * @return string|null - * The source module or NULL if not found. - */ - public function getSourceModule($definition); - - /** - * Gets the destination module handling the destination data. - * - * @param array $definition - * The field plugin definition. - * - * @return string|null - * The destination module or NULL if not found. - */ - public function getDestinationModule($definition); - } diff --git a/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php index d41c751e8e..d4e7b6fad9 100644 --- a/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php +++ b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php @@ -508,8 +508,8 @@ public function buildConfirmForm(array $form, FormStateInterface $form_state) { // Get the source_module and destination_module from the field plugins. $definitions = $this->fieldPluginManager->getDefinitions(); foreach ($definitions as $definition) { - $source_module = $this->fieldPluginManager->getSourceModule($definition); - $destination_module = $this->fieldPluginManager->getDestinationModule($definition); + $source_module = $definition['source_module']; + $destination_module = $definition['destination_module']; $table_data[$source_module][$destination_module][$definition['id']] = $definition['id']; } @@ -522,13 +522,12 @@ public function buildConfirmForm(array $form, FormStateInterface $form_state) { // Fetch the system data at the first opportunity. $system_data = $form_state->get('system_data'); - $unmigrated_source_modules = array_diff_key($system_data['module'], $table_data); - - // Remove core profiles from the list. + // Remove core profiles from the system data. foreach (['standard', 'minimal'] as $profile) { - unset($unmigrated_source_modules[$profile]); + unset($system_data[$profile]); } + $unmigrated_source_modules = array_diff_key($system_data['module'], $table_data); // Missing migrations. $form['missing_module_list_title'] = [ '#type' => 'item',