diff -u b/core/modules/migrate_drupal/src/Tests/MigrateDrupalTestBase.php b/core/modules/migrate_drupal/src/Tests/MigrateDrupalTestBase.php --- b/core/modules/migrate_drupal/src/Tests/MigrateDrupalTestBase.php +++ b/core/modules/migrate_drupal/src/Tests/MigrateDrupalTestBase.php @@ -53,9 +53,7 @@ * Drupal version as provided in migration_tags - e.g., 'Drupal 6'. */ protected function installMigrations($version) { - /** @var MigrationStorage $migration_storage */ - $migration_storage = \Drupal::entityManager()->getStorage('migration'); - $migration_templates = $migration_storage->findTemplatesByTag($version); + $migration_templates = \Drupal::service('migrate.template_storage')->findTemplatesByTag($version); foreach ($migration_templates as $template_name => $template) { try { $migration = Migration::create($template); diff -u b/core/modules/migrate_drupal/src/Tests/MigrateFullDrupalTestBase.php b/core/modules/migrate_drupal/src/Tests/MigrateFullDrupalTestBase.php --- b/core/modules/migrate_drupal/src/Tests/MigrateFullDrupalTestBase.php +++ b/core/modules/migrate_drupal/src/Tests/MigrateFullDrupalTestBase.php @@ -8,9 +8,10 @@ namespace Drupal\migrate_drupal\Tests; use Drupal\Component\Utility\SafeMarkup; -use Drupal\migrate\ExtensionInstallStorage; +use Drupal\Core\Config\ExtensionInstallStorage; use Drupal\Core\Config\StorageInterface; use Drupal\migrate\MigrateExecutable; +use Drupal\migrate\MigrateTemplateStorage; use Drupal\simpletest\TestBase; /** @@ -57,7 +58,7 @@ $this->loadDumps($dumps); $classes = $this->getTestClassesList(); - $extension_install_storage = new ExtensionInstallStorage(\Drupal::service('config.storage'), ExtensionInstallStorage::MIGRATION_TEMPLATE_DIRECTORY, StorageInterface::DEFAULT_COLLECTION, TRUE); + $extension_install_storage = new ExtensionInstallStorage(\Drupal::service('config.storage'), MigrateTemplateStorage::MIGRATION_TEMPLATE_DIRECTORY, StorageInterface::DEFAULT_COLLECTION, TRUE); foreach ($classes as $class) { if (is_subclass_of($class, '\Drupal\migrate\Tests\MigrateDumpAlterInterface')) { $class::migrateDumpAlter($this);