diff -u b/core/modules/migrate/tests/src/Unit/MigrateSqlIdMapTest.php b/core/modules/migrate/tests/src/Unit/MigrateSqlIdMapTest.php --- b/core/modules/migrate/tests/src/Unit/MigrateSqlIdMapTest.php +++ b/core/modules/migrate/tests/src/Unit/MigrateSqlIdMapTest.php @@ -6,8 +6,8 @@ use Drupal\migrate\Plugin\MigrationInterface; use Drupal\migrate\MigrateException; use Drupal\migrate\Plugin\MigrateIdMapInterface; -use Drupal\migrate\Row; use Drupal\migrate\Plugin\migrate\id_map\Sql; +use Drupal\migrate\Row; /** * Tests the SQL ID map plugin. only in patch2: unchanged: --- a/core/modules/migrate/tests/src/Kernel/MigrateRollbackTest.php +++ b/core/modules/migrate/tests/src/Kernel/MigrateRollbackTest.php @@ -4,6 +4,7 @@ use Drupal\migrate\MigrateExecutable; use Drupal\migrate\Plugin\MigrateIdMapInterface; +use Drupal\migrate\Plugin\migrate\id_map\Sql; use Drupal\migrate\Row; use Drupal\taxonomy\Entity\Term; use Drupal\taxonomy\Entity\Vocabulary; @@ -72,7 +73,7 @@ public function testRollback() { $vocabulary = Vocabulary::load($row['id']); $this->assertTrue($vocabulary); $map_row = $vocabulary_id_map->getRowBySource(['id' => $row['id']]); - $this->assertNotNull($map_row['destid1']); + $this->assertNotNull($map_row['vid' . SQL::ID_SUFFIX]); } // We use taxonomy terms to demonstrate importing and rolling back content @@ -117,7 +118,7 @@ public function testRollback() { $preserved_term_ids[] = 2; $map_row = $term_id_map->getRowBySource(['id' => 2]); $dummy_row = new Row(['id' => 2], $ids); - $term_id_map->saveIdMapping($dummy_row, [$map_row['destid1']], + $term_id_map->saveIdMapping($dummy_row, [$map_row['id' . SQL::ID_SUFFIX]], $map_row['source_row_status'], MigrateIdMapInterface::ROLLBACK_PRESERVE); foreach ($term_data_rows as $row) { @@ -125,7 +126,7 @@ public function testRollback() { $term = Term::load($row['id']); $this->assertTrue($term); $map_row = $term_id_map->getRowBySource(['id' => $row['id']]); - $this->assertNotNull($map_row['destid1']); + $this->assertNotNull($map_row['id' . SQL::ID_SUFFIX]); } // Rollback and verify the entities are gone. only in patch2: unchanged: --- a/core/modules/taxonomy/tests/src/Kernel/Migrate/MigrateTaxonomyTermStubTest.php +++ b/core/modules/taxonomy/tests/src/Kernel/Migrate/MigrateTaxonomyTermStubTest.php @@ -72,7 +72,7 @@ public function testStubWithWeightMapping() { $migration = $this->getMigration('taxonomy_term_stub_test'); $term_executable = new MigrateExecutable($migration, $this); $term_executable->import(); - $this->assertTrue($migration->getIdMap()->getRowBySource(['2']), 'Stub row exists in the ID map table'); + $this->assertTrue($migration->getIdMap()->getRowBySource(['id' => '2']), 'Stub row exists in the ID map table'); // Load the referenced term, which should exist as a stub. /** @var \Drupal\Core\Entity\ContentEntityBase $stub_entity */