Update core 8.3.0

web/core/modules/migrate_drupal_ui/migrate_drupal_ui.module

@@ -6,6 +6,7 @@
  */
 
 use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Core\Url;
 
 /**
  * Implements hook_help().
@@ -13,7 +14,28 @@ use Drupal\Core\Routing\RouteMatchInterface;
 function migrate_drupal_ui_help($route_name, RouteMatchInterface $route_match) {
   switch ($route_name) {
     case 'help.page.migrate_drupal_ui':
-      $output = '<p>' . t('The Migrate Drupal UI module provides a one-click upgrade from an earlier version of Drupal. For details, see the <a href=":migrate">online documentation for the Migrate Drupal UI module</a> in the handbook on upgrading from previous versions.', [':migrate' => 'https://www.drupal.org/upgrade/migrate']) . '</p>';
+      $output = '';
+      $output .= '<h3>' . t('About') . '</h3>';
+      $output .= '<p>' . t('The Migrate Drupal UI module provides a simple user interface to perform an upgrade from an earlier version of Drupal. For more information, see the <a href=":migrate">online documentation for the Migrate Drupal UI module</a>.',
+          [':migrate' => 'https://www.drupal.org/upgrade/migrate']) . '</p>';
+      $output .= '<h3>' . t('Uses') . '</h3>';
+      $output .= '<dl>';
+      $output .= '<dt>' . t('Preparing the site') . '</dt>';
+      $output .= '<dd>' . t('You need to enable all modules on this site that are enabled on the previous site. For example, if you have used the Book module on the previous site then you must enable the Book module on this site for that data to be available on this site.') . '</dd>';
+      $output .= '<dt>' . t('Performing the upgrade') . '</dt>';
+      $output .= '<dd>' . t('On the <a href=":upgrade">Upgrade</a> page, you are guided through performing the upgrade in several steps.',
+          [':upgrade' => \Drupal::url('migrate_drupal_ui.upgrade')]) . '</dd>';
+      $output .= '<dd><ol><li>' . t('You need to enter the database credentials of the Drupal site that you want to upgrade. You can also include its files directory in the upgrade.') . '</li>';
+      $output .= '<li>' . t('The next page then provides an overview of which upgrade paths are available or missing, before you proceed to perform the upgrade.') . '</li>';
+      $output .= '<li>' . t('Lastly, a message is displayed about the number of upgrade tasks that were successful or failed.') . '</li></ol></dd>';
+      $output .= '<dt>' . t('Reviewing the upgrade log') . '</dt>';
+      $output .= '<dd>' . t('You can review a <a href=":log">log of upgrade messages</a> by clicking the link in the message provided after the upgrade or by filtering the messages for the type <em>migrate_drupal_ui</em> on the <a href=":messages">Recent log messages</a> page.',
+          [':log' => \Drupal::url('migrate_drupal_ui.log'), ':messages' => \Drupal::url('dblog.overview')]) . '</dd>';
+      $output .= '<dt>' . t('Incremental upgrades') . '</dt>';
+      $output .= '<dd>' . t('Incremental upgrades are not yet supported through the user interface.') . '</dd>';
+      $output .= '<dt>' . t('Rolling back an upgrade') . '</dt>';
+      $output .= '<dd>' . t('Rolling back an upgrade is not yet supported through the user interface.') . '</dd>';
+      $output .= '</dl>';
       return $output;
   }
 }

web/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php

@@ -374,6 +374,10 @@ class MigrateUpgradeForm extends ConfirmFormBase {
       'source_module' => 'node',
       'destination_module' => 'node',
     ],
+    'd7_node_translation' => [
+      'source_module' => 'node',
+      'destination_module' => 'node',
+    ],
     'd7_node_title_label' => [
       'source_module' => 'node',
       'destination_module' => 'node',
@@ -650,6 +654,10 @@ class MigrateUpgradeForm extends ConfirmFormBase {
       'source_module' => 'profile',
       'destination_module' => 'user',
     ],
+    'd6_i18n_user_profile_field_instance' => [
+      'source_module' => 'i18n',
+      'destination_module' => 'user',
+    ],
   ];
 
   /**
@@ -1050,7 +1058,7 @@ class MigrateUpgradeForm extends ConfirmFormBase {
     $form['missing_module_list_title'] = [
       '#type' => 'item',
       '#title' => $this->t('Missing upgrade paths'),
-      '#description' => $this->t('The following items will not be upgraded. For more information see <a href=":migrate">Upgrading from Drupal 6 or 7 to Drupal 8</a>.', array(':migrate' => 'https://www.drupal.org/upgrade/migrate')),
+      '#description' => $this->t('The following items will not be upgraded. For more information see <a href=":migrate">Upgrading from Drupal 6 or 7 to Drupal 8</a>.', [':migrate' => 'https://www.drupal.org/upgrade/migrate']),
     ];
     $form['missing_module_list'] = [
       '#type' => 'table',

web/core/modules/migrate_drupal_ui/src/Tests/MigrateAccessTest.php

@@ -21,7 +21,7 @@ class MigrateAccessTest extends WebTestBase {
   /**
    * Tests that only user 1 can access the migrate UI.
    */
-  protected function testAccess() {
+  public function testAccess() {
     $this->drupalLogin($this->rootUser);
     $this->drupalGet('upgrade');
     $this->assertResponse(200);

web/core/modules/migrate_drupal_ui/src/Tests/MigrateUpgradeTestBase.php

@@ -101,7 +101,7 @@ abstract class MigrateUpgradeTestBase extends WebTestBase {
   /**
    * Executes all steps of migrations upgrade.
    */
-  protected function testMigrateUpgrade() {
+  public function testMigrateUpgrade() {
     $connection_options = $this->sourceDatabase->getConnectionOptions();
     $this->drupalGet('/upgrade');
     $this->assertText('Upgrade a site by importing it into a clean and empty new install of Drupal 8. You will lose any existing configuration once you import your site into it. See the online documentation for Drupal site upgrades for more detailed information.');
@@ -162,7 +162,7 @@ abstract class MigrateUpgradeTestBase extends WebTestBase {
         $source_id_values = array_values(unserialize($source_id));
         $row = $id_map->getRowBySource($source_id_values);
         $destination = serialize($id_map->currentDestination());
-        $message = "Successful migration of $source_id to $destination as part of the {$migration->id()} migration. The source row status is " . $row['source_row_status'];
+        $message = "Migration of $source_id to $destination as part of the {$migration->id()} migration. The source row status is " . $row['source_row_status'];
         // A completed migration should have maps with
         // MigrateIdMapInterface::STATUS_IGNORED or
         // MigrateIdMapInterface::STATUS_IMPORTED.
@@ -175,6 +175,7 @@ abstract class MigrateUpgradeTestBase extends WebTestBase {
       }
     }
     \Drupal::service('module_installer')->install(['forum']);
+    \Drupal::service('module_installer')->install(['book']);
   }
 
   /**

web/core/modules/migrate_drupal_ui/src/Tests/d6/MigrateUpgrade6Test.php

@@ -76,7 +76,7 @@ class MigrateUpgrade6Test extends MigrateUpgradeTestBase {
   /**
    * Executes all steps of migrations upgrade.
    */
-  protected function testMigrateUpgrade() {
+  public function testMigrateUpgrade() {
     parent::testMigrateUpgrade();
 
     // Ensure migrated users can log in.

web/core/modules/migrate_drupal_ui/src/Tests/d7/MigrateUpgrade7Test.php

@@ -77,7 +77,7 @@ class MigrateUpgrade7Test extends MigrateUpgradeTestBase {
   /**
    * Executes all steps of migrations upgrade.
    */
-  protected function testMigrateUpgrade() {
+  public function testMigrateUpgrade() {
     parent::testMigrateUpgrade();
 
     // Ensure migrated users can log in.