diff --git a/core/modules/migrate/src/MigrateIdAuditor.php b/core/modules/migrate/src/MigrateIdAuditor.php index 2f3b33c..20d1ecf 100644 --- a/core/modules/migrate/src/MigrateIdAuditor.php +++ b/core/modules/migrate/src/MigrateIdAuditor.php @@ -38,7 +38,7 @@ public function auditIds(array $migrations) { if ($destination->getHighestDestinationId($field_name) > $id_map->getHighestMigratedId($field_name)) { $base_id = $migration->getBaseId(); $label = $migration->label(); - if (is_string($label)){ + if (is_string($label)) { $conflicts[$base_id] = $label; } elseif ($label instanceof TranslatableMarkup) { diff --git a/core/modules/migrate/src/Plugin/migrate/destination/EntityRevision.php b/core/modules/migrate/src/Plugin/migrate/destination/EntityRevision.php index b0db476..178b867 100644 --- a/core/modules/migrate/src/Plugin/migrate/destination/EntityRevision.php +++ b/core/modules/migrate/src/Plugin/migrate/destination/EntityRevision.php @@ -78,4 +78,11 @@ public function getIds() { throw new MigrateException('This entity type does not support revisions.'); } + /** + * {@inheritdoc} + */ + public function getAuditedIdFieldName() { + return $this->getKey('revision'); + } + } 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 975388e..dd1dd453 100644 --- a/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeTestBase.php +++ b/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeTestBase.php @@ -148,10 +148,7 @@ public function testMigrateUpgrade() { $this->drupalPostForm(NULL, $edits, t('Review upgrade')); $this->assertResponse(200); $this->assertText('Are you sure?'); - $this->assertSession()->pageTextContains('Entities may be overwritten?'); - $this->drupalPostForm(NULL, [], t('I acknowledge I may lose data, continue anyway.')); // Ensure we get errors about missing modules. - $this->assertText('Are you sure?'); $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.')); $this->assertSession()->pageTextContains(t('Destination module not found for migration_provider_test')); diff --git a/core/modules/node/migration_templates/d6_node_revision.yml b/core/modules/node/migration_templates/d6_node_revision.yml index f4ff301..26c2f37 100644 --- a/core/modules/node/migration_templates/d6_node_revision.yml +++ b/core/modules/node/migration_templates/d6_node_revision.yml @@ -2,6 +2,7 @@ id: d6_node_revision label: Node revisions migration_tags: - Drupal 6 +audit_ids: true deriver: Drupal\node\Plugin\migrate\D6NodeDeriver source: plugin: d6_node_revision diff --git a/core/modules/node/migration_templates/d7_node_revision.yml b/core/modules/node/migration_templates/d7_node_revision.yml index c6081ef..020e287 100644 --- a/core/modules/node/migration_templates/d7_node_revision.yml +++ b/core/modules/node/migration_templates/d7_node_revision.yml @@ -2,6 +2,7 @@ id: d7_node_revision label: Node revisions migration_tags: - Drupal 7 +audit_ids: true deriver: Drupal\node\Plugin\migrate\D7NodeDeriver source: plugin: d7_node_revision diff --git a/core/modules/taxonomy/migration_templates/d6_term_node_revision.yml b/core/modules/taxonomy/migration_templates/d6_term_node_revision.yml index 91c8362..974004a 100644 --- a/core/modules/taxonomy/migration_templates/d6_term_node_revision.yml +++ b/core/modules/taxonomy/migration_templates/d6_term_node_revision.yml @@ -2,6 +2,7 @@ id: d6_term_node_revision label: Term/node relationship revisions migration_tags: - Drupal 6 +audit_ids: true deriver: Drupal\taxonomy\Plugin\migrate\D6TermNodeDeriver source: plugin: d6_term_node_revision