diff -u b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php --- b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php +++ b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php @@ -490,10 +490,6 @@ 'source_module' => 'taxonomy', 'destination_module' => 'taxonomy', ], - 'd6_i18n_taxonomy_vocabulary' => [ - 'source_module' => 'taxonomy', - 'destination_module' => 'taxonomy', - ], 'd6_term_node' => [ 'source_module' => 'taxonomy', 'destination_module' => 'taxonomy', @@ -502,6 +498,10 @@ 'source_module' => 'taxonomy', 'destination_module' => 'taxonomy', ], + 'd6_i18n_taxonomy_vocabulary' => [ + 'source_module' => 'taxonomy', + 'destination_module' => 'taxonomy', + ], 'd6_term_node' => [ 'source_module' => 'taxonomy', 'destination_module' => 'taxonomy', reverted: --- b/core/modules/taxonomy/tests/src/Kernel/Plugin/migrate/d6/I18nVocabularyTest.php +++ /dev/null @@ -1,131 +0,0 @@ - 1, - 'objectid' => 1, - 'type' => 'vocabulary', - 'property' => 'name', - 'objectindex' => 1, - 'format' => 0, - ], - [ - 'lid' => 2, - 'objectid' => 2, - 'type' => 'vocabulary', - 'property' => 'name', - 'objectindex' => 2, - 'format' => 0, - ], - ]; - - protected $locales_target = [ - [ - 'lid' => 1, - 'language' => 'fr', - 'translation' => 'fr - vocabulary 1', - 'plid' => 0, - 'plural' => 0, - 'i18n_status' => 0, - ], - [ - 'lid' => 2, - 'language' => 'fr', - 'translation' => 'fr - vocabulary 2', - 'plid' => 0, - 'plural' => 0, - 'i18n_status' => 0, - ], - ]; - - protected $vocabulary = [ - [ - 'vid' => 1, - 'name' => 'vocabulary 1', - 'description' => 'description of vocabulary 1', - 'help' => 1, - 'relations' => 1, - 'hierarchy' => 1, - 'multiple' => 0, - 'required' => 0, - 'tags' => 0, - 'module' => 'taxonomy', - 'weight' => 4, - 'language' => '' - ], - [ - 'vid' => 2, - 'name' => 'vocabulary 2', - 'description' => 'description of vocabulary 2', - 'help' => 1, - 'relations' => 1, - 'hierarchy' => 1, - 'multiple' => 0, - 'required' => 0, - 'tags' => 0, - 'module' => 'taxonomy', - 'weight' => 5, - 'language' => '' - ], - ]; - - protected $expectedResults = [ - [ - 'vid' => 1, - 'name' => 'vocabulary 1', - 'description' => 'description of vocabulary 1', - 'lid' => '1', - 'type' => 'vocabulary', - 'property' => 'name', - 'objectid'=> '1', - 'lt_lid' => '1', - 'translation' => 'fr - vocabulary 1', - 'language' => 'fr', - ], - [ - 'vid' => 2, - 'name' => 'vocabulary 2', - 'description' => 'description of vocabulary 2', - 'lid' => '2', - 'type' => 'vocabulary', - 'property' => 'name', - 'objectid'=> '2', - 'lt_lid' => '2', - 'translation' => 'fr - vocabulary 2', - 'language' => 'fr', - ], - ]; - - /** - * {@inheritdoc} - */ - public function providerSource() { - $tests = []; - - $tests[0][0]['i18n_strings'] = $this->i18n_strings; - $tests[0][0]['locales_target'] = $this->locales_target; - $tests[0][0]['vocabulary'] = $this->vocabulary; - - $tests[0][1] = $this->expectedResults; - - return $tests; - } - -} only in patch2: unchanged: --- /dev/null +++ b/core/modules/taxonomy/tests/src/Kernel/Plugin/migrate/source/d6/I18nVocabularyTest.php @@ -0,0 +1,131 @@ + 1, + 'objectid' => 1, + 'type' => 'vocabulary', + 'property' => 'name', + 'objectindex' => 1, + 'format' => 0, + ], + [ + 'lid' => 2, + 'objectid' => 2, + 'type' => 'vocabulary', + 'property' => 'name', + 'objectindex' => 2, + 'format' => 0, + ], + ]; + + protected $locales_target = [ + [ + 'lid' => 1, + 'language' => 'fr', + 'translation' => 'fr - vocabulary 1', + 'plid' => 0, + 'plural' => 0, + 'i18n_status' => 0, + ], + [ + 'lid' => 2, + 'language' => 'fr', + 'translation' => 'fr - vocabulary 2', + 'plid' => 0, + 'plural' => 0, + 'i18n_status' => 0, + ], + ]; + + protected $vocabulary = [ + [ + 'vid' => 1, + 'name' => 'vocabulary 1', + 'description' => 'description of vocabulary 1', + 'help' => 1, + 'relations' => 1, + 'hierarchy' => 1, + 'multiple' => 0, + 'required' => 0, + 'tags' => 0, + 'module' => 'taxonomy', + 'weight' => 4, + 'language' => '' + ], + [ + 'vid' => 2, + 'name' => 'vocabulary 2', + 'description' => 'description of vocabulary 2', + 'help' => 1, + 'relations' => 1, + 'hierarchy' => 1, + 'multiple' => 0, + 'required' => 0, + 'tags' => 0, + 'module' => 'taxonomy', + 'weight' => 5, + 'language' => '' + ], + ]; + + protected $expectedResults = [ + [ + 'vid' => 1, + 'name' => 'vocabulary 1', + 'description' => 'description of vocabulary 1', + 'lid' => '1', + 'type' => 'vocabulary', + 'property' => 'name', + 'objectid'=> '1', + 'lt_lid' => '1', + 'translation' => 'fr - vocabulary 1', + 'language' => 'fr', + ], + [ + 'vid' => 2, + 'name' => 'vocabulary 2', + 'description' => 'description of vocabulary 2', + 'lid' => '2', + 'type' => 'vocabulary', + 'property' => 'name', + 'objectid'=> '2', + 'lt_lid' => '2', + 'translation' => 'fr - vocabulary 2', + 'language' => 'fr', + ], + ]; + + /** + * {@inheritdoc} + */ + public function providerSource() { + $tests = []; + + $tests[0][0]['i18n_strings'] = $this->i18n_strings; + $tests[0][0]['locales_target'] = $this->locales_target; + $tests[0][0]['vocabulary'] = $this->vocabulary; + + $tests[0][1] = $this->expectedResults; + + return $tests; + } + +}