diff -u b/core/modules/migrate_drupal/migrate_drupal.install b/core/modules/migrate_drupal/migrate_drupal.install --- b/core/modules/migrate_drupal/migrate_drupal.install +++ b/core/modules/migrate_drupal/migrate_drupal.install @@ -31,4 +31,3 @@ function migrate_drupal_update_8601() { - $moduleInstaller = \Drupal::service('module_installer'); - $moduleInstaller->install(['migrate_drupal_multilingual']); + \Drupal::service('module_installer')->install(['migrate_drupal_multilingual']); } diff -u b/core/modules/migrate_drupal/src/MigrationConfigurationTrait.php b/core/modules/migrate_drupal/src/MigrationConfigurationTrait.php --- b/core/modules/migrate_drupal/src/MigrationConfigurationTrait.php +++ b/core/modules/migrate_drupal/src/MigrationConfigurationTrait.php @@ -114,9 +114,9 @@ // @todo https://drupal.org/node/2681867 We should be able to validate // the entire migration at this point. - // Multilingual migrations require the module migrate_drupal_multilingual. - $tags = $migration->getMigrationTags() ? $migration->getMigrationTags() : []; - if (in_array('Multilingual', $tags) && (!\Drupal::service('module_handler')->moduleExists('migrate_drupal_multilingual'))) { + // Multilingual migrations require migrate_drupal_multilingual. + $tags = $migration->getMigrationTags() ?: []; + if (in_array('Multilingual', $tags, TRUE) && (!\Drupal::service('module_handler')->moduleExists('migrate_drupal_multilingual'))) { throw new RequirementsException("The module migrate_drupal_multilingual is not enabled on the new site."); } diff -u b/core/modules/migrate_drupal_multilingual/migrate_drupal_multilingual.info.yml b/core/modules/migrate_drupal_multilingual/migrate_drupal_multilingual.info.yml --- b/core/modules/migrate_drupal_multilingual/migrate_drupal_multilingual.info.yml +++ b/core/modules/migrate_drupal_multilingual/migrate_drupal_multilingual.info.yml @@ -2,7 +2,6 @@ type: module -description: 'Provides a requirement for entity and i18n migrations.' +description: 'Provides a requirement for mulitlingual migrations.' package: 'Core (Experimental)' core: 8.x dependencies: - - migrate - migrate_drupal diff -u b/core/modules/migrate_drupal_multilingual/migrate_drupal_multilingual.module b/core/modules/migrate_drupal_multilingual/migrate_drupal_multilingual.module --- b/core/modules/migrate_drupal_multilingual/migrate_drupal_multilingual.module +++ b/core/modules/migrate_drupal_multilingual/migrate_drupal_multilingual.module @@ -15,7 +15,7 @@ case 'help.page.migrate_drupal_multilingual': $output = ''; $output .= '

' . t('About') . '

'; - $output .= '

' . t('The Migrate Drupal i18n module is a requirement for migrating entity and i18n translations. It does not provide a user interface. For more information, see the online documentation for the Migrate Drupal Multilingual module.', [':migrate_drupal_multilingual' => 'https://www.drupal.org/docs/8/core/modules/experimental-migrate-drupal-i18n']) . '

'; + $output .= '

' . t('The Migrate Drupal i18n module is a requirement for migrating translations. It does not provide a user interface. For more information, see the online documentation for the Migrate Drupal Multilingual module.', [':migrate_drupal_multilingual' => 'https://www.drupal.org/docs/8/core/modules/experimental-migrate-drupal-i18n']) . '

'; return $output; } } diff -u b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MigrateUpgrade6I18nTest.php b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MigrateUpgrade6I18nTest.php --- b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MigrateUpgrade6I18nTest.php +++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MigrateUpgrade6I18nTest.php @@ -17,9 +17,7 @@ class MigrateUpgrade6I18nTest extends MigrateUpgradeExecuteTestBase { /** - * Modules to enable. - * - * @var array + * {@inheritdoc} */ public static $modules = [ 'language', @@ -182,7 +180,6 @@ * {@inheritdoc} */ public function testMigrateUpgradeExecute() { - $connection_options = $this->sourceDatabase->getConnectionOptions(); $this->drupalGet('/upgrade'); $session = $this->assertSession(); @@ -315,7 +312,7 @@ // Ensure migrated users can log in. $user = User::load(2); - $user->passRaw = 'john.doe_pass'; + $user->passRaw = 'a password'; $this->drupalLogin($user); $this->assertFollowUpMigrationResults(); } diff -u b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MigrateUpgrade7I18nTest.php b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MigrateUpgrade7I18nTest.php --- b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MigrateUpgrade7I18nTest.php +++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MigrateUpgrade7I18nTest.php @@ -17,9 +17,7 @@ class MigrateUpgrade7I18nTest extends MigrateUpgradeExecuteTestBase { /** - * Modules to enable. - * - * @var array + * {@inheritdoc} */ public static $modules = [ 'file',