diff --git a/core/modules/migrate_drupal/src/MigrationState.php b/core/modules/migrate_drupal/src/MigrationState.php index 31ba1bb82c..fdbf64f14c 100644 --- a/core/modules/migrate_drupal/src/MigrationState.php +++ b/core/modules/migrate_drupal/src/MigrationState.php @@ -16,32 +16,33 @@ * Menu module should be listed as will be upgraded. If any one of the * migrations are not finished then it should be listed as will not be upgraded. * There is not enough information in the existing system to determine if a - * source module has a complete upgrade path or not. + * source module has a complete upgrade path or not or even if it does not need + * an upgrade path. * - * The solution is for each Drupal 8 module that is, or will be, providing - * an upgrade path to declare the state of each path for Drupal 6 and/or - * Drupal 7. The upgrade path is either 'finished' or 'not_finished'. A path - * marked 'finished' is used for source module/destination module pairs that are - * complete in a given module, irregardless if another module is also providing - * migrations for the same pair. A path marked 'not_finished' is used when all - * the migrations for the source module/destination module pair do not yet exist - * in a given module. + * The solution is for every Drupal 8 module that is the successor to a Drupal 6 + * or Drupal 7 module to declare the state of the upgrade paths for Drupal 6 + * and/or Drupal 7. The upgrade path is either 'finished' or 'not_finished'. A + * A marked 'finished' is used for source module/destination module pairs that + * are complete in a given module, irregardless if another module is also + * providing migrations for the same pair. A path marked 'not_finished' is used + * when all the migrations for the source module/destination module pair do not + * yet exist in a given module. * - * Modules inform the upgrade process of the upgrade paths that they provide, or - * will provide, by adding them to their .migrate_drupal.yml file. + * Modules inform the upgrade process of the upgrade paths by adding them to + * their .migrate_drupal.yml file. * - * The .migrate_drupal.yml file may use the following structure: + * The .migrate_drupal.yml file uses the following structure: * - finished: (optional) List of the source_module/destination_module pairs * for the migrations that this module provides and are complete. * - version: A Drupal legacy version number. - * - source module: A list of destination modules. + * - source module: A comma separated list of destination modules. * - not_finished: (optional) List of the source_module/destination_module pairs * that this module provides, or will be providing, that are incomplete or do * not yet exist. * - version: A Drupal legacy version number. - * - source_module: A list of destination modules. + * - source_module: A comma separated list of destination modules. * - * Example: + * Examples: * @code * finished: * 6: @@ -58,10 +59,18 @@ * Drupal 6 and Drupal 7 Node modules to the Drupal 8 Node module and for data * from the Drupal 7 Entity Translation module to the Drupal 8 Node module. * - * This module also plans on providing an upgrade path for data from the - * Drupal 7 Commerce Product module to the Drupal 8 Commerce Product module - * but either no migrations exist or some do and more migrations need to be - * created to finish the upgrade path. + * @code + * finished: + * 6: + * pirate: pirate + * 7: + * pirate: pirate + * @endcode + * + * The Pirate module does not require an upgrade path. By declaring the upgrade + * finished the Pirate module will be included in the finished list. That is, + * as long as no other module has an entry "pirate: ' in its + * not_finished section. */ class MigrationState { @@ -232,13 +241,13 @@ public function getMigrationStates() { * * If there are no migrations for a module and the module is listed in the * NoUpgradePath list then the state is set to FINISHED. If it is not listed - * in NoUpgradePath list the state is to NOT_FINISHED. + * in NoUpgradePath list the state is set to NOT_FINISHED. * - * When there are migrations for a module the following happens. If the + * If there are migrations for a module the following happens. If the * destination module is 'core' the state is set to FINISHED. If there are * any occurrences of 'not_finished' in the *.migrate_drupal.yml information - * for this source module then the state is set to NOT_FINISHED otherwise the - * state is set to FINISHED. + * for this source module then the state is set to NOT_FINISHED. And finally, + * if there is an occurrence of 'finished' the state is set to FINISHED. * * @param string $version * The legacy drupal version. diff --git a/core/modules/migrate_drupal_ui/src/Form/ReviewForm.php b/core/modules/migrate_drupal_ui/src/Form/ReviewForm.php index 8ffe1305c5..6982dbe9e6 100644 --- a/core/modules/migrate_drupal_ui/src/Form/ReviewForm.php +++ b/core/modules/migrate_drupal_ui/src/Form/ReviewForm.php @@ -159,7 +159,6 @@ public function buildForm(array $form, FormStateInterface $form_state) { '#type' => 'table', '#header' => [ $this->t('Drupal @version', ['@version' => $version]), - $this->t('Drupal 8'), ], ]; @@ -181,9 +180,6 @@ public function buildForm(array $form, FormStateInterface $form_state) { ], ], ], - 'destination_module' => [ - '#plain_text' => $destination_modules, - ], ]; } }