diff --git a/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php index 3d9df38286..4d1fa76741 100644 --- a/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php +++ b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php @@ -170,8 +170,8 @@ public function buildOverviewForm(array $form, FormStateInterface $form_state) { else { $form['info_header'] = [ '#markup' => '

' . $this->t('Upgrade a site by importing its files and the data from its database into a clean and empty new install of Drupal 8. See the Drupal site upgrades handbook for more information.', [ - ':url' => 'https://www.drupal.org/upgrade/migrate', - ]), + ':url' => 'https://www.drupal.org/upgrade/migrate', + ]), ]; $form['legend']['#markup'] = ''; @@ -580,7 +580,6 @@ public function buildConfirmForm(array $form, FormStateInterface $form_state) { '#value' => $this->t('Modules that will be upgraded'), '#attributes' => ['id' => ['checked']], ], - '#description' => $this->t('This is a list of the modules that will be upgraded and the Drupal 8 module or modules it will be upgraded to.'), '#weight' => 3, ]; @@ -641,10 +640,6 @@ public function buildConfirmForm(array $form, FormStateInterface $form_state) { ]; $general_info[] = $available_module_list; } - $form['upgrade_option_item'] = [ - '#type' => 'item', - '#description' => $this->t('Here is a summary of the upgrade status for all installed modules on the old site.'), - ]; $form['status_report_page'] = [ '#theme' => 'status_report_page', @@ -704,7 +699,7 @@ protected function getDatabaseTypes() { * {@inheritdoc} */ public function getQuestion() { - return $this->t('Pre upgrade analysis'); + return $this->t('Pre-upgrade analysis'); } /** diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeTestBase.php b/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeTestBase.php index b6dc9715c9..e217317240 100644 --- a/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeTestBase.php +++ b/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeTestBase.php @@ -154,7 +154,7 @@ public function testMigrateUpgrade() { $this->drupalPostForm(NULL, $edits, t('Review upgrade')); $this->assertResponse(200); - $this->assertText('Pre upgrade analysis'); + $this->assertText('Pre-upgrade analysis'); // Ensure we get errors about missing modules. $this->assertSession()->pageTextContains(t('Source module not found for migration_provider_no_annotation.')); $this->assertSession()->pageTextContains(t('Source module not found for migration_provider_test.')); @@ -173,7 +173,7 @@ public function testMigrateUpgrade() { $this->drupalPostForm(NULL, $edits, t('Review upgrade')); $this->assertSession()->statusCodeEquals(200); - $this->assertSession()->pageTextContains('Pre upgrade analysis'); + $this->assertSession()->pageTextContains('Pre-upgrade analysis'); // Ensure there are no errors about the missing modules from the test module. $this->assertSession()->pageTextNotContains(t('Source module not found for migration_provider_no_annotation.')); $this->assertSession()->pageTextNotContains(t('Source module not found for migration_provider_test.'));