Issue #2534034 by mikeryan: Move module-specific migration support into the taxonomy module

core/modules/migrate_drupal/config/schema/migrate_drupal.source.schema.yml

@@ -87,14 +87,6 @@ migrate.source.d6_box:
           type: string
           label: 'Type'
 
-migrate.source.d6_taxonomy_vocabulary:
-  type: migrate_source_sql
-  label: 'Drupal 6 field instance form display'
-  mapping:
-    constants:
-      type: migrate_entity_constant
-      label: 'Constants'
-
 migrate.source.d6_field_instance_per_form_display:
   type: migrate_source_sql
   label: 'Drupal 6 field instance form display'
@@ -103,22 +95,6 @@ migrate.source.d6_field_instance_per_form_display:
       type: migrate_entity_constant
       label: 'Constants'
 
-migrate.source.d6_taxonomy_vocabulary_per_type:
-  type: migrate_source_sql
-  label: 'Drupal 6 field instance form display'
-  mapping:
-    constants:
-      type: migrate_entity_constant
-      label: 'Constants'
-
-migrate.source.d6_taxonomy_vocabulary_per_type:
-  type: migrate_source_sql
-  label: 'Drupal 6 field instance form display'
-  mapping:
-    constants:
-      type: migrate_entity_constant
-      label: 'Constants'
-
 migrate.source.d6_field:
   type: migrate_source_sql
   label: 'Drupal 6 field'

core/modules/taxonomy/config/schema/taxonomy.source.schema.yml

+# Schema for the migration source plugins.
+
+migrate.source.d6_taxonomy_vocabulary:
+  type: migrate_source_sql
+  label: 'Drupal 6 field instance form display'
+  mapping:
+    constants:
+      type: migrate_entity_constant
+      label: 'Constants'
+
+migrate.source.d6_taxonomy_vocabulary_per_type:
+  type: migrate_source_sql
+  label: 'Drupal 6 field instance form display'
+  mapping:
+    constants:
+      type: migrate_entity_constant
+      label: 'Constants'
+
+migrate.source.d6_taxonomy_vocabulary_per_type:
+  type: migrate_source_sql
+  label: 'Drupal 6 field instance form display'
+  mapping:
+    constants:
+      type: migrate_entity_constant
+      label: 'Constants'

core/modules/migrate/src/Plugin/migrate/destination/EntityTaxonomyTerm.php → core/modules/taxonomy/src/Plugin/Migrate/destination/EntityTaxonomyTerm.php

@@ -2,12 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Plugin\migrate\destination\EntityTaxonomyTerm.
+ * Contains \Drupal\taxonomy\Plugin\migrate\destination\EntityTaxonomyTerm.
  */
 
-namespace Drupal\migrate\Plugin\migrate\destination;
+namespace Drupal\taxonomy\Plugin\migrate\destination;
 
 use Drupal\migrate\Row;
+use Drupal\migrate\Plugin\migrate\destination\EntityContentBase;
 
 /**
  * @MigrateDestination(

core/modules/migrate_drupal/src/Plugin/migrate/load/d6/LoadTermNode.php → core/modules/taxonomy/src/Plugin/migrate/load/d6/LoadTermNode.php

@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\load\d6\LoadTermNode.
+ * Contains \Drupal\taxonomy\Plugin\migrate\load\d6\LoadTermNode.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\load\d6;
+namespace Drupal\taxonomy\Plugin\migrate\load\d6;
 
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\migrate\Entity\MigrationInterface;

core/modules/migrate_drupal/src/Plugin/migrate/source/d6/Term.php → core/modules/taxonomy/src/Plugin/migrate/source/d6/Term.php

@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\Term.
+ * Contains \Drupal\taxonomy\Plugin\migrate\source\d6\Term.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
+namespace Drupal\taxonomy\Plugin\migrate\source\d6;
 
 use Drupal\migrate\Row;
 use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;

core/modules/migrate_drupal/src/Plugin/migrate/source/d6/TermNode.php → core/modules/taxonomy/src/Plugin/migrate/source/d6/TermNode.php

@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\TermNode.
+ * Contains \Drupal\taxonomy\Plugin\migrate\source\d6\TermNode.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
+namespace Drupal\taxonomy\Plugin\migrate\source\d6;
 
 use Drupal\migrate\Plugin\SourceEntityInterface;
 use Drupal\migrate\Row;

core/modules/migrate_drupal/src/Plugin/migrate/source/d6/TermNodeRevision.php → core/modules/taxonomy/src/Plugin/migrate/source/d6/TermNodeRevision.php

@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\TermNodeRevision.
+ * Contains \Drupal\taxonomy\Plugin\migrate\source\d6\TermNodeRevision.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
+namespace Drupal\taxonomy\Plugin\migrate\source\d6;
 
 /**
  * Source returning tids from the term_node table for the non-current revision.

core/modules/migrate_drupal/src/Plugin/migrate/source/d6/Vocabulary.php → core/modules/taxonomy/src/Plugin/migrate/source/d6/Vocabulary.php

@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\Vocabulary.
+ * Contains \Drupal\taxonomy\Plugin\migrate\source\d6\Vocabulary.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
+namespace Drupal\taxonomy\Plugin\migrate\source\d6;
 
 use Drupal\migrate\Row;
 

core/modules/migrate_drupal/src/Plugin/migrate/source/d6/VocabularyBase.php → core/modules/taxonomy/src/Plugin/migrate/source/d6/VocabularyBase.php

@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\VocabularyBase.
+ * Contains \Drupal\taxonomy\Plugin\migrate\source\d6\VocabularyBase.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
+namespace Drupal\taxonomy\Plugin\migrate\source\d6;
 
 use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
 

core/modules/migrate_drupal/src/Plugin/migrate/source/d6/VocabularyPerType.php → core/modules/taxonomy/src/Plugin/migrate/source/d6/VocabularyPerType.php

@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\VocabularyPerType.
+ * Contains \Drupal\taxonomy\Plugin\migrate\source\d6\VocabularyPerType.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
+namespace Drupal\taxonomy\Plugin\migrate\source\d6;
 
 /**
  * Gets all the vocabularies based on the node types that have Taxonomy enabled.

core/modules/migrate_drupal/src/Tests/d6/MigrateTaxonomyConfigsTest.php → core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTaxonomyConfigsTest.php

@@ -2,17 +2,18 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateTaxonomyConfigsTest.
+ * Contains \Drupal\taxonomy\Tests\Migrate\d6\MigrateTaxonomyConfigsTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\taxonomy\Tests\Migrate\d6;
 
 use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade variables to taxonomy.settings.yml.
  *
- * @group migrate_drupal
+ * @group taxonomy
  */
 class MigrateTaxonomyConfigsTest extends MigrateDrupal6TestBase {
 

core/modules/migrate_drupal/src/Tests/d6/MigrateTaxonomyTermTest.php → core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTaxonomyTermTest.php

@@ -2,17 +2,18 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateTaxonomyTermTest.
+ * Contains \Drupal\taxonomy\Tests\Migrate\d6\MigrateTaxonomyTermTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\taxonomy\Tests\Migrate\d6;
 
 use Drupal\taxonomy\Entity\Term;
+use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade taxonomy terms.
  *
- * @group migrate_drupal
+ * @group taxonomy
  */
 class MigrateTaxonomyTermTest extends MigrateDrupal6TestBase {
 

core/modules/migrate_drupal/src/Tests/d6/MigrateTaxonomyVocabularyTest.php → core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTaxonomyVocabularyTest.php

@@ -2,17 +2,18 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateTaxonomyVocabularyTest.
+ * Contains \Drupal\taxonomy\Tests\Migrate\d6\MigrateTaxonomyVocabularyTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\taxonomy\Tests\Migrate\d6;
 
 use Drupal\taxonomy\Entity\Vocabulary;
+use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Migrate taxonomy vocabularies to taxonomy.vocabulary.*.yml.
  *
- * @group migrate_drupal
+ * @group taxonomy
  */
 class MigrateTaxonomyVocabularyTest extends MigrateDrupal6TestBase {
 

core/modules/migrate_drupal/src/Tests/d6/MigrateTermNodeRevisionTest.php → core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTermNodeRevisionTest.php

@@ -2,17 +2,17 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateTermNodeRevisionTest.
+ * Contains \Drupal\taxonomy\Tests\Migrate\d6\MigrateTermNodeRevisionTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\taxonomy\Tests\Migrate\d6;
 
 use Drupal\migrate\MigrateExecutable;
 
 /**
  * Upgrade taxonomy term node associations.
  *
- * @group migrate_drupal
+ * @group taxonomy
  */
 class MigrateTermNodeRevisionTest extends MigrateTermNodeTestBase {
 

core/modules/migrate_drupal/src/Tests/d6/MigrateTermNodeTest.php → core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTermNodeTest.php

@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateTermNodeTest.
+ * Contains \Drupal\taxonomy\Tests\Migrate\d6\MigrateTermNodeTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\taxonomy\Tests\Migrate\d6;
 
 use Drupal\migrate\MigrateExecutable;
 use Drupal\node\Entity\Node;
@@ -13,7 +13,7 @@
 /**
  * Upgrade taxonomy term node associations.
  *
- * @group migrate_drupal
+ * @group taxonomy
  */
 class MigrateTermNodeTest extends MigrateTermNodeTestBase {
 

core/modules/migrate_drupal/src/Tests/d6/MigrateTermNodeTestBase.php → core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTermNodeTestBase.php

@@ -2,13 +2,14 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateTermNodeTestBase.
+ * Contains \Drupal\taxonomy\Tests\Migrate\d6\MigrateTermNodeTestBase.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\taxonomy\Tests\Migrate\d6;
 
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
 use Drupal\entity_reference\Tests\EntityReferenceTestTrait;
+use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Base class for Taxonomy/Node migration tests.

core/modules/migrate_drupal/src/Tests/d6/MigrateVocabularyEntityDisplayTest.php → core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyEntityDisplayTest.php

@@ -2,15 +2,17 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateVocabularyEntityDisplayTest.
+ * Contains \Drupal\taxonomy\Tests\Migrate\d6\MigrateVocabularyEntityDisplayTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\taxonomy\Tests\Migrate\d6;
+
+use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Vocabulary entity display migration.
  *
- * @group migrate_drupal
+ * @group taxonomy
  */
 class MigrateVocabularyEntityDisplayTest extends MigrateDrupal6TestBase {
 

core/modules/migrate_drupal/src/Tests/d6/MigrateVocabularyEntityFormDisplayTest.php → core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyEntityFormDisplayTest.php

@@ -2,15 +2,17 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateVocabularyEntityFormDisplayTest.
+ * Contains \Drupal\taxonomy\Tests\Migrate\d6\MigrateVocabularyEntityFormDisplayTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\taxonomy\Tests\Migrate\d6;
+
+use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Vocabulary entity form display migration.
  *
- * @group migrate_drupal
+ * @group taxonomy
  */
 class MigrateVocabularyEntityFormDisplayTest extends MigrateDrupal6TestBase {
 

core/modules/migrate_drupal/src/Tests/d6/MigrateVocabularyFieldInstanceTest.php → core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyFieldInstanceTest.php

@@ -2,18 +2,19 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateVocabularyFieldInstanceTest.
+ * Contains \Drupal\taxonomy\Tests\Migrate\d6\MigrateVocabularyFieldInstanceTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\taxonomy\Tests\Migrate\d6;
 
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
 use Drupal\field\Entity\FieldConfig;
+use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Vocabulary field instance migration.
  *
- * @group migrate_drupal
+ * @group taxonomy
  */
 class MigrateVocabularyFieldInstanceTest extends MigrateDrupal6TestBase {
 

core/modules/migrate_drupal/src/Tests/d6/MigrateVocabularyFieldTest.php → core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyFieldTest.php

@@ -2,17 +2,18 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateVocabularyFieldTest.
+ * Contains \Drupal\taxonomy\Tests\Migrate\d6\MigrateVocabularyFieldTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\taxonomy\Tests\Migrate\d6;
 
 use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Vocabulary field migration.
  *
- * @group migrate_drupal
+ * @group taxonomy
  */
 class MigrateVocabularyFieldTest extends MigrateDrupal6TestBase {
 

core/modules/migrate_drupal/tests/src/Unit/source/d6/TermSourceWithVocabularyFilterTest.php → core/modules/taxonomy/tests/src/Unit/Migrate/d6/TermSourceWithVocabularyFilterTest.php

@@ -2,15 +2,15 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\migrate_drupal\Unit\source\d6\TermSourceWithVocabularyFilterTest.
+ * Contains \Drupal\Tests\taxonomy\Unit\Migrate\d6\TermSourceWithVocabularyFilterTest.
  */
 
-namespace Drupal\Tests\migrate_drupal\Unit\source\d6;
+namespace Drupal\Tests\taxonomy\Unit\Migrate\d6;
 
 /**
  * Tests the Drupal 6 taxonomy term source with vocabulary filter.
  *
- * @group migrate_drupal
+ * @group taxonomy
  */
 class TermSourceWithVocabularyFilterTest extends TermTestBase {
 

core/modules/migrate_drupal/tests/src/Unit/source/d6/TermTest.php → core/modules/taxonomy/tests/src/Unit/Migrate/d6/TermTest.php

@@ -2,15 +2,15 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\migrate_drupal\Unit\source\d6\TermTest.
+ * Contains \Drupal\Tests\taxonomy\Unit\Migrate\d6\TermTest.
  */
 
-namespace Drupal\Tests\migrate_drupal\Unit\source\d6;
+namespace Drupal\Tests\taxonomy\Unit\Migrate\d6;
 
 /**
  * Tests D6 taxonomy term source plugin.
  *
- * @group migrate_drupal
+ * @group taxonomy
  */
 class TermTest extends TermTestBase {
 

core/modules/migrate_drupal/tests/src/Unit/source/d6/TermTestBase.php → core/modules/taxonomy/tests/src/Unit/Migrate/d6/TermTestBase.php

@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\migrate_drupal\Unit\source\d6\TermTestBase.
+ * Contains \Drupal\Tests\taxonomy\Unit\Migrate\d6\TermTestBase.
  */
 
-namespace Drupal\Tests\migrate_drupal\Unit\source\d6;
+namespace Drupal\Tests\taxonomy\Unit\Migrate\d6;
 
 use Drupal\Tests\migrate\Unit\MigrateSqlSourceTestCase;
 
@@ -14,7 +14,7 @@
  */
 abstract class TermTestBase extends MigrateSqlSourceTestCase {
 
-  const PLUGIN_CLASS = 'Drupal\migrate_drupal\Plugin\migrate\source\d6\Term';
+  const PLUGIN_CLASS = 'Drupal\taxonomy\Plugin\migrate\source\d6\Term';
 
   protected $migrationConfiguration = array(
     'id' => 'test',

core/modules/migrate_drupal/tests/src/Unit/source/d6/VocabularyTest.php → core/modules/taxonomy/tests/src/Unit/Migrate/d6/VocabularyTest.php

@@ -2,21 +2,21 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\migrate_drupal\Unit\source\d6\VocabularyTest.
+ * Contains \Drupal\Tests\taxonomy\Unit\Migrate\d6\VocabularyTest.
  */
 
-namespace Drupal\Tests\migrate_drupal\Unit\source\d6;
+namespace Drupal\Tests\taxonomy\Unit\Migrate\d6;
 
 use Drupal\Tests\migrate\Unit\MigrateSqlSourceTestCase;
 
 /**
  * Tests D6 vocabulary source plugin.
  *
- * @group migrate_drupal
+ * @group taxonomy
  */
 class VocabularyTest extends MigrateSqlSourceTestCase {
 
-  const PLUGIN_CLASS = 'Drupal\migrate_drupal\Plugin\migrate\source\d6\Vocabulary';
+  const PLUGIN_CLASS = 'Drupal\taxonomy\Plugin\migrate\source\d6\Vocabulary';
 
   // The fake Migration configuration entity.
   protected $migrationConfiguration = [