diff --git a/core/modules/user/src/Plugin/migrate/ProfileValues.php b/core/modules/user/src/Plugin/migrate/ProfileValues.php index 6a3d4a5..970ee59 100644 --- a/core/modules/user/src/Plugin/migrate/ProfileValues.php +++ b/core/modules/user/src/Plugin/migrate/ProfileValues.php @@ -8,6 +8,7 @@ namespace Drupal\user\Plugin\migrate; use Drupal\migrate\Exception\RequirementsException; +use Drupal\migrate\Plugin\Migration; /** * Plugin class for user migrations dealing with profile values. @@ -33,7 +34,7 @@ public function getProcess() { ] + $this->source; $definition['destination']['plugin'] = 'null'; try { - $profile_field_migration = \Drupal::service('plugin.manager.migration')->createMigrationFromCustomDefinition($definition); + $profile_field_migration = $this->migrationPluginManager->createMigrationFromCustomDefinition($definition); $source_plugin = $profile_field_migration->getSourcePlugin(); $source_plugin->checkRequirements(); foreach ($source_plugin as $row) { diff --git a/core/modules/user/src/Plugin/migrate/User.php b/core/modules/user/src/Plugin/migrate/User.php index 4a949eb..a233466 100644 --- a/core/modules/user/src/Plugin/migrate/User.php +++ b/core/modules/user/src/Plugin/migrate/User.php @@ -8,6 +8,7 @@ namespace Drupal\user\Plugin\migrate; use Drupal\migrate\Exception\RequirementsException; +use Drupal\migrate\Plugin\Migration; /** * Plugin class for Drupal 7 user migrations dealing with fields and profiles. @@ -34,7 +35,7 @@ public function getProcess() { $definition['destination']['plugin'] = 'null'; if (\Drupal::moduleHandler()->moduleExists('field')) { $definition['source']['plugin'] = 'd7_field_instance'; - $field_migration = \Drupal::service('plugin.manager.migration')->createMigrationFromCustomDefinition($definition); + $field_migration = $this->migrationPluginManager->createMigrationFromCustomDefinition($definition); foreach ($field_migration->getSourcePlugin() as $row) { $field_name = $row->getSourceProperty('field_name'); $this->process[$field_name] = $field_name; @@ -42,7 +43,7 @@ public function getProcess() { } try { $definition['source']['plugin'] = 'profile_field'; - $profile_migration = \Drupal::service('plugin.manager.migration')->createMigrationFromCustomDefinition($definition); + $profile_migration = $this->migrationPluginManager->createMigrationFromCustomDefinition($definition); // Ensure that Profile is enabled in the source DB. $profile_migration->checkRequirements(); foreach ($profile_migration->getSourcePlugin() as $row) {