reverted: --- b/core/modules/migrate/src/Plugin/migrate/destination/EntityConfigBase.php +++ a/core/modules/migrate/src/Plugin/migrate/destination/EntityConfigBase.php @@ -77,8 +77,7 @@ $plugin_definition, $migration, $container->get('entity.manager')->getStorage($entity_type_id), + array_keys($container->get('entity.manager')->getBundleInfo($entity_type_id)), - array_keys($container->get('entity.manager') - ->getBundleInfo($entity_type_id)), $container->get('language_manager'), $container->get('config.factory') ); diff -u b/core/modules/taxonomy/src/Plugin/migrate/source/d6/I18nTaxonomyVocabulary.php b/core/modules/taxonomy/src/Plugin/migrate/source/d6/I18nTaxonomyVocabulary.php --- b/core/modules/taxonomy/src/Plugin/migrate/source/d6/I18nTaxonomyVocabulary.php +++ b/core/modules/taxonomy/src/Plugin/migrate/source/d6/I18nTaxonomyVocabulary.php @@ -3,7 +3,6 @@ namespace Drupal\taxonomy\Plugin\migrate\source\d6; use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase; -use Drupal\migrate\Row; /** * Profile field source from database. @@ -34,9 +33,9 @@ */ public function query() { $query = $this->select('vocabulary', 'v') - ->fields('v', array('vid', 'name', 'description')) - ->fields('i18n', array('lid', 'type', 'property', 'objectid')) - ->fields('lt', array('lid', 'translation')) + ->fields('v', ['vid', 'name', 'description']) + ->fields('i18n', ['lid', 'type', 'property', 'objectid']) + ->fields('lt', ['lid', 'translation']) ->condition('i18n.type', 'vocabulary'); $query->addField('lt', 'language', 'language'); $query->join('i18n_strings', 'i18n', 'i18n.objectid = v.vid'); @@ -48,12 +47,12 @@ * {@inheritdoc} */ public function fields() { - return array( + return [ 'vid' => $this->t('The vocabulary ID.'), 'language' => $this->t('Language for this field.'), 'property' => $this->t('Name of property being translated.'), 'translation' => $this->t('Translation of either the title or explanation.') - ); + ]; } /** diff -u b/core/modules/taxonomy/tests/src/Kernel/Plugin/migrate/source/d6/I18nVocabularyTest.php b/core/modules/taxonomy/tests/src/Kernel/Plugin/migrate/source/d6/I18nVocabularyTest.php --- b/core/modules/taxonomy/tests/src/Kernel/Plugin/migrate/source/d6/I18nVocabularyTest.php +++ b/core/modules/taxonomy/tests/src/Kernel/Plugin/migrate/source/d6/I18nVocabularyTest.php @@ -94,7 +94,7 @@ 'lid' => '1', 'type' => 'vocabulary', 'property' => 'name', - 'objectid'=> '1', + 'objectid' => '1', 'lt_lid' => '1', 'translation' => 'fr - vocabulary 1', 'language' => 'fr', @@ -106,7 +106,7 @@ 'lid' => '2', 'type' => 'vocabulary', 'property' => 'name', - 'objectid'=> '2', + 'objectid' => '2', 'lt_lid' => '2', 'translation' => 'fr - vocabulary 2', 'language' => 'fr',