Issue #2534006 by phenaproxima: Move module-specific migration support into the contact module

core/modules/contact/config/schema/contact.schema.yml

@@ -43,3 +43,14 @@ contact.settings:
     user_default_enabled:
       type: boolean
       label: 'Personal contact form enabled by default'
+
+migrate.source.d6_contact_settings:
+  type: migrate_source_sql
+  label: 'Drupal 6 contact settings'
+  mapping:
+    variables:
+      type: sequence
+      label: 'Variables'
+      sequence:
+        type: string
+        label: 'Variable'

core/modules/migrate_drupal/src/Plugin/migrate/source/d6/ContactCategory.php → core/modules/contact/src/Plugin/migrate/source/d6/ContactCategory.php

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

core/modules/migrate_drupal/src/Plugin/migrate/source/d6/ContactSettings.php → core/modules/contact/src/Plugin/migrate/source/d6/ContactSettings.php

@@ -2,10 +2,11 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\ContactSettings.
+ * Contains \Drupal\contact\Plugin\migrate\source\d6\ContactSettings.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
+namespace Drupal\contact\Plugin\migrate\source\d6;
+
 use Drupal\migrate_drupal\Plugin\migrate\source\Variable;
 
 /**

core/modules/migrate_drupal/src/Tests/d6/MigrateContactCategoryTest.php → core/modules/contact/src/Tests/Migrate/d6/MigrateContactCategoryTest.php

@@ -2,17 +2,18 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateContactCategoryTest.
+ * Contains \Drupal\contact\Tests\Migrate\d6\MigrateContactCategoryTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\contact\Tests\Migrate\d6;
 
 use Drupal\contact\Entity\ContactForm;
+use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Migrate contact categories to contact.form.*.yml.
  *
- * @group migrate_drupal
+ * @group contact
  */
 class MigrateContactCategoryTest extends MigrateDrupal6TestBase {
 

core/modules/migrate_drupal/src/Tests/d6/MigrateContactConfigsTest.php → core/modules/contact/src/Tests/Migrate/d6/MigrateContactConfigsTest.php

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

core/modules/migrate_drupal/tests/src/Unit/source/d6/ContactCategoryTest.php → core/modules/contact/tests/src/Unit/Plugin/migrate/source/d6/ContactCategoryTest.php

@@ -2,21 +2,21 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\migrate_drupal\Unit\source\d6\ContactCategoryTest.
+ * Contains \Drupal\Tests\contact\Unit\Plugin\migrate\source\d6\ContactCategoryTest.
  */
 
-namespace Drupal\Tests\migrate_drupal\Unit\source\d6;
+namespace Drupal\Tests\contact\Unit\Plugin\migrate\source\d6;
 
 use Drupal\Tests\migrate\Unit\MigrateSqlSourceTestCase;
 
 /**
  * Tests D6 contact category source plugin.
  *
- * @group migrate_drupal
+ * @group contact
  */
 class ContactCategoryTest extends MigrateSqlSourceTestCase {
 
-  const PLUGIN_CLASS = 'Drupal\migrate_drupal\Plugin\migrate\source\d6\ContactCategory';
+  const PLUGIN_CLASS = 'Drupal\contact\Plugin\migrate\source\d6\ContactCategory';
 
   protected $migrationConfiguration = array(
     'id' => 'test',

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

@@ -146,17 +146,6 @@ migrate.source.d6_comment_variable:
       type: migrate_entity_constant
       label: 'Constants'
 
-migrate.source.d6_contact_settings:
-  type: migrate_source_sql
-  label: 'Drupal 6 contact settings'
-  mapping:
-    variables:
-      type: sequence
-      label: 'Variables'
-      sequence:
-        type: string
-        label: 'Variable'
-
 migrate.source.d6_view_mode:
   type: migrate_source_sql
   label: 'Drupal 6 view mode'