diff --git a/core/modules/migrate/src/Plugin/MigrationPluginManager.php b/core/modules/migrate/src/Plugin/MigrationPluginManager.php index 78e72c4..7714b2c 100644 --- a/core/modules/migrate/src/Plugin/MigrationPluginManager.php +++ b/core/modules/migrate/src/Plugin/MigrationPluginManager.php @@ -71,27 +71,27 @@ public function processDefinition(&$definition, $plugin_id) { // Loop over each of the definitions and tag it as config or content. /** @var \Drupal\migrate\Plugin\MigratePluginManagerInterface $migrate_plugin_manager */ - $migrate_plugin_manager = \Drupal::getContainer()->get('plugin.manager.migrate.destination'); + $migrate_plugin_manager = \Drupal::getContainer() + ->get('plugin.manager.migrate.destination'); $destination = $migrate_plugin_manager->getDefinition($definition['destination']['plugin'], FALSE); if (!empty($destination['class'])) { $definition += [ 'migration_tags' => [], ]; - $configuration_classes = [ - EntityConfigBase::class, - Config::class, - UserData::class, - ComponentEntityDisplayBase::class, - ]; - if ($this->classInArray($destination['class'], $configuration_classes) - && !in_array('Content', $definition['migration_tags']) - && !in_array('Configuration', $definition['migration_tags']) - ) { + $is_config_class = function ($class) { + return is_a($class, EntityConfigBase::class, TRUE) + || is_a($class, Config::class, TRUE) + || is_a($class, UserData::class, TRUE) + || is_a($class, ComponentEntityDisplayBase::class, TRUE); + }; + $is_already_assigned = function ($existing_tags) { + return in_array('Configuration', $existing_tags) || in_array('Content', $existing_tags); + }; + if ($is_config_class($destination['class']) && !$is_already_assigned($definition['migration_tags'])) { $definition['migration_tags'][] = 'Configuration'; } // Default to content. - elseif (!in_array('Content', $definition['migration_tags']) - && !in_array('Configuration', $definition['migration_tags'])) { + elseif (!$is_already_assigned($definition['migration_tags'])) { $definition['migration_tags'][] = 'Content'; } }