diff --git a/core/modules/file/config/schema/file.schema.yml b/core/modules/file/config/schema/file.schema.yml index b9f8918..0d41b90 100644 --- a/core/modules/file/config/schema/file.schema.yml +++ b/core/modules/file/config/schema/file.schema.yml @@ -121,3 +121,11 @@ field.formatter.settings.file_extension: extension_detect_tar: type: boolean label: 'Detect tar' + +migrate.source.d6_upload_instance: + type: migrate_source_sql + label: 'Drupal 6 upload form display' + mapping: + constants: + type: migrate_entity_constant + label: 'Constants' diff --git a/core/modules/migrate_drupal/migration_templates/d6_file.yml b/core/modules/file/migration_templates/d6_file.yml similarity index 100% rename from core/modules/migrate_drupal/migration_templates/d6_file.yml rename to core/modules/file/migration_templates/d6_file.yml diff --git a/core/modules/migrate_drupal/migration_templates/d6_file_settings.yml b/core/modules/file/migration_templates/d6_file_settings.yml similarity index 100% rename from core/modules/migrate_drupal/migration_templates/d6_file_settings.yml rename to core/modules/file/migration_templates/d6_file_settings.yml diff --git a/core/modules/migrate_drupal/migration_templates/d6_upload.yml b/core/modules/file/migration_templates/d6_upload.yml similarity index 99% rename from core/modules/migrate_drupal/migration_templates/d6_upload.yml rename to core/modules/file/migration_templates/d6_upload.yml index 2d04241..4e59e31 100644 --- a/core/modules/migrate_drupal/migration_templates/d6_upload.yml +++ b/core/modules/file/migration_templates/d6_upload.yml @@ -4,7 +4,6 @@ migration_tags: - Drupal 6 source: plugin: d6_upload - process: nid: nid vid: vid diff --git a/core/modules/migrate_drupal/migration_templates/d6_upload_entity_display.yml b/core/modules/file/migration_templates/d6_upload_entity_display.yml similarity index 100% rename from core/modules/migrate_drupal/migration_templates/d6_upload_entity_display.yml rename to core/modules/file/migration_templates/d6_upload_entity_display.yml diff --git a/core/modules/migrate_drupal/migration_templates/d6_upload_entity_form_display.yml b/core/modules/file/migration_templates/d6_upload_entity_form_display.yml similarity index 100% rename from core/modules/migrate_drupal/migration_templates/d6_upload_entity_form_display.yml rename to core/modules/file/migration_templates/d6_upload_entity_form_display.yml diff --git a/core/modules/migrate_drupal/migration_templates/d6_upload_field.yml b/core/modules/file/migration_templates/d6_upload_field.yml similarity index 100% rename from core/modules/migrate_drupal/migration_templates/d6_upload_field.yml rename to core/modules/file/migration_templates/d6_upload_field.yml diff --git a/core/modules/migrate_drupal/migration_templates/d6_upload_field_instance.yml b/core/modules/file/migration_templates/d6_upload_field_instance.yml similarity index 100% rename from core/modules/migrate_drupal/migration_templates/d6_upload_field_instance.yml rename to core/modules/file/migration_templates/d6_upload_field_instance.yml diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FileUri.php b/core/modules/file/src/Plugin/migrate/process/d6/FileUri.php similarity index 89% rename from core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FileUri.php rename to core/modules/file/src/Plugin/migrate/process/d6/FileUri.php index 722cc96..8668e05 100644 --- a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FileUri.php +++ b/core/modules/file/src/Plugin/migrate/process/d6/FileUri.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\migrate_drupal\Plugin\migrate\process\d6\FileUri. + * Contains \Drupal\file\Plugin\migrate\process\d6\FileUri. */ -namespace Drupal\migrate_drupal\Plugin\migrate\process\d6; +namespace Drupal\file\Plugin\migrate\process\d6; use Drupal\migrate\MigrateExecutableInterface; use Drupal\migrate\ProcessPluginBase; diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/File.php b/core/modules/file/src/Plugin/migrate/source/d6/File.php similarity index 95% rename from core/modules/migrate_drupal/src/Plugin/migrate/source/d6/File.php rename to core/modules/file/src/Plugin/migrate/source/d6/File.php index ed307a4..d4351d2 100644 --- a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/File.php +++ b/core/modules/file/src/Plugin/migrate/source/d6/File.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\File. + * Contains \Drupal\file\Plugin\migrate\source\d6\File. */ -namespace Drupal\migrate_drupal\Plugin\migrate\source\d6; +namespace Drupal\file\Plugin\migrate\source\d6; use Drupal\migrate\Row; use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase; diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateFileConfigsTest.php b/core/modules/file/src/Tests/Migrate/d6/MigrateFileConfigsTest.php similarity index 84% rename from core/modules/migrate_drupal/src/Tests/d6/MigrateFileConfigsTest.php rename to core/modules/file/src/Tests/Migrate/d6/MigrateFileConfigsTest.php index 4e974a0..c7964e4 100644 --- a/core/modules/migrate_drupal/src/Tests/d6/MigrateFileConfigsTest.php +++ b/core/modules/file/src/Tests/Migrate/d6/MigrateFileConfigsTest.php @@ -2,17 +2,18 @@ /** * @file - * Contains \Drupal\migrate_drupal\Tests\d6\MigrateFileConfigsTest. + * Contains \Drupal\file\Tests\Migrate\d6\MigrateFileConfigsTest. */ -namespace Drupal\migrate_drupal\Tests\d6; +namespace Drupal\file\Tests\Migrate\d6; use Drupal\config\Tests\SchemaCheckTestTrait; +use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase; /** * Upgrade variables to file.settings.yml. * - * @group migrate_drupal + * @group file */ class MigrateFileConfigsTest extends MigrateDrupal6TestBase { diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateFileTest.php b/core/modules/file/src/Tests/Migrate/d6/MigrateFileTest.php similarity index 95% rename from core/modules/migrate_drupal/src/Tests/d6/MigrateFileTest.php rename to core/modules/file/src/Tests/Migrate/d6/MigrateFileTest.php index fa4d5c8..c5b68fc 100644 --- a/core/modules/migrate_drupal/src/Tests/d6/MigrateFileTest.php +++ b/core/modules/file/src/Tests/Migrate/d6/MigrateFileTest.php @@ -2,21 +2,22 @@ /** * @file - * Contains \Drupal\migrate_drupal\Tests\d6\MigrateFileTest. + * Contains \Drupal\file\Tests\Migrate\d6\MigrateFileTest. */ -namespace Drupal\migrate_drupal\Tests\d6; +namespace Drupal\file\Tests\Migrate\d6; use Drupal\Component\Utility\Random; use Drupal\migrate\Tests\MigrateDumpAlterInterface; use Drupal\Core\Database\Database; +use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase; use Drupal\simpletest\TestBase; use Drupal\file\Entity\File; /** * file migration. * - * @group migrate_drupal + * @group file */ class MigrateFileTest extends MigrateDrupal6TestBase implements MigrateDumpAlterInterface { diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateUploadBase.php b/core/modules/file/src/Tests/Migrate/d6/MigrateUploadBase.php similarity index 93% rename from core/modules/migrate_drupal/src/Tests/d6/MigrateUploadBase.php rename to core/modules/file/src/Tests/Migrate/d6/MigrateUploadBase.php index b392116..2d1d179 100644 --- a/core/modules/migrate_drupal/src/Tests/d6/MigrateUploadBase.php +++ b/core/modules/file/src/Tests/Migrate/d6/MigrateUploadBase.php @@ -2,10 +2,12 @@ /** * @file - * Contains \Drupal\migrate_drupal\Tests\d6\MigrateUploadBase. + * Contains \Drupal\file\Tests\Migrate\d6\MigrateUploadBase. */ -namespace Drupal\migrate_drupal\Tests\d6; +namespace Drupal\file\Tests\Migrate\d6; + +use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase; /** * Base class for file/upload migration tests. diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateUploadEntityDisplayTest.php b/core/modules/file/src/Tests/Migrate/d6/MigrateUploadEntityDisplayTest.php similarity index 90% rename from core/modules/migrate_drupal/src/Tests/d6/MigrateUploadEntityDisplayTest.php rename to core/modules/file/src/Tests/Migrate/d6/MigrateUploadEntityDisplayTest.php index c48bbbd..ff170a3 100644 --- a/core/modules/migrate_drupal/src/Tests/d6/MigrateUploadEntityDisplayTest.php +++ b/core/modules/file/src/Tests/Migrate/d6/MigrateUploadEntityDisplayTest.php @@ -2,15 +2,17 @@ /** * @file - * Contains \Drupal\migrate_drupal\Tests\d6\MigrateUploadEntityDisplayTest. + * Contains \Drupal\file\Tests\Migrate\d6\MigrateUploadEntityDisplayTest. */ -namespace Drupal\migrate_drupal\Tests\d6; +namespace Drupal\file\Tests\Migrate\d6; + +use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase; /** * Upload entity display. * - * @group migrate_drupal + * @group file */ class MigrateUploadEntityDisplayTest extends MigrateDrupal6TestBase { diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateUploadEntityFormDisplayTest.php b/core/modules/file/src/Tests/Migrate/d6/MigrateUploadEntityFormDisplayTest.php similarity index 90% rename from core/modules/migrate_drupal/src/Tests/d6/MigrateUploadEntityFormDisplayTest.php rename to core/modules/file/src/Tests/Migrate/d6/MigrateUploadEntityFormDisplayTest.php index 3555fcc..b72f645 100644 --- a/core/modules/migrate_drupal/src/Tests/d6/MigrateUploadEntityFormDisplayTest.php +++ b/core/modules/file/src/Tests/Migrate/d6/MigrateUploadEntityFormDisplayTest.php @@ -2,15 +2,17 @@ /** * @file - * Contains \Drupal\migrate_drupal\Tests\d6\MigrateUploadEntityFormDisplayTest. + * Contains \Drupal\file\Tests\Migrate\d6\MigrateUploadEntityFormDisplayTest. */ -namespace Drupal\migrate_drupal\Tests\d6; +namespace Drupal\file\Tests\Migrate\d6; + +use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase; /** * Upload form entity display. * - * @group migrate_drupal + * @group file */ class MigrateUploadEntityFormDisplayTest extends MigrateDrupal6TestBase { diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateUploadFieldTest.php b/core/modules/file/src/Tests/Migrate/d6/MigrateUploadFieldTest.php similarity index 100% rename from core/modules/migrate_drupal/src/Tests/d6/MigrateUploadFieldTest.php rename to core/modules/file/src/Tests/Migrate/d6/MigrateUploadFieldTest.php diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateUploadInstanceTest.php b/core/modules/file/src/Tests/Migrate/d6/MigrateUploadInstanceTest.php similarity index 100% rename from core/modules/migrate_drupal/src/Tests/d6/MigrateUploadInstanceTest.php rename to core/modules/file/src/Tests/Migrate/d6/MigrateUploadInstanceTest.php diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateUploadTest.php b/core/modules/file/src/Tests/Migrate/d6/MigrateUploadTest.php similarity index 100% rename from core/modules/migrate_drupal/src/Tests/d6/MigrateUploadTest.php rename to core/modules/file/src/Tests/Migrate/d6/MigrateUploadTest.php diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/FileTest.php b/core/modules/file/tests/src/Unit/Plugin/migrate/source/d6/FileTest.php similarity index 84% rename from core/modules/migrate_drupal/tests/src/Unit/source/d6/FileTest.php rename to core/modules/file/tests/src/Unit/Plugin/migrate/source/d6/FileTest.php index 52614c9..90cbafe 100644 --- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/FileTest.php +++ b/core/modules/file/tests/src/Unit/Plugin/migrate/source/d6/FileTest.php @@ -2,21 +2,21 @@ /** * @file - * Contains \Drupal\Tests\migrate_drupal\Unit\source\d6\FileTest. + * Contains \Drupal\Tests\file\Unit\Plugin\migrate\source\d6\FileTest. */ -namespace Drupal\Tests\migrate_drupal\Unit\source\d6; +namespace Drupal\Tests\file\Unit\Plugin\migrate\source\d6; use Drupal\Tests\migrate\Unit\MigrateSqlSourceTestCase; /** * Tests D6 file source plugin. * - * @group migrate_drupal + * @group file */ class FileTest extends MigrateSqlSourceTestCase { - const PLUGIN_CLASS = 'Drupal\migrate_drupal\Plugin\migrate\source\d6\File'; + const PLUGIN_CLASS = 'Drupal\file\Plugin\migrate\source\d6\File'; // The fake Migration configuration entity. protected $migrationConfiguration = array( diff --git a/core/modules/migrate_drupal/config/schema/migrate_drupal.source.schema.yml b/core/modules/migrate_drupal/config/schema/migrate_drupal.source.schema.yml index 9fdf6d8..ddb76c8 100644 --- a/core/modules/migrate_drupal/config/schema/migrate_drupal.source.schema.yml +++ b/core/modules/migrate_drupal/config/schema/migrate_drupal.source.schema.yml @@ -216,14 +216,6 @@ migrate.source.d6_node_revision: type: ignore label: 'Node type' -migrate.source.d6_upload_instance: - type: migrate_source_sql - label: 'Drupal 6 upload form display' - mapping: - constants: - type: migrate_entity_constant - label: 'Constants' - migrate.source.d6_field_instance: type: migrate_source_sql label: 'Drupal 6 field instance'