summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathaniel Catchpole2016-11-23 14:23:45 +0000
committerNathaniel Catchpole2016-11-23 14:23:45 +0000
commit09ad5fdb76452510bcaca4ab1bc231ffaf72db73 (patch)
tree2992b6430ff7c151d5967c27de3ede5b7bd4060f
parent11cb2b73a69ede44e8e028b00fdc1e02fc877f00 (diff)
Issue #2543568 by mikeryan, quietone, Ryan Weal, chipway, iMiksu, heddn, alexpott: Remove the md_entity destination plugin hack
-rw-r--r--core/modules/comment/migration_templates/d6_comment_field.yml5
-rw-r--r--core/modules/field/migration_templates/d6_field.yml2
-rw-r--r--core/modules/file/migration_templates/d6_upload_field.yml5
-rw-r--r--core/modules/migrate/src/Plugin/MigrateDestinationInterface.php5
-rw-r--r--core/modules/migrate_drupal/src/Plugin/migrate/destination/EntityFieldStorageConfig.php8
-rw-r--r--core/modules/taxonomy/migration_templates/d6_vocabulary_field.yml5
-rw-r--r--core/modules/user/migration_templates/user_picture_field.yml5
-rw-r--r--core/modules/user/migration_templates/user_profile_field.yml2
8 files changed, 26 insertions, 11 deletions
diff --git a/core/modules/comment/migration_templates/d6_comment_field.yml b/core/modules/comment/migration_templates/d6_comment_field.yml
index 469d604..d14d1aa 100644
--- a/core/modules/comment/migration_templates/d6_comment_field.yml
+++ b/core/modules/comment/migration_templates/d6_comment_field.yml
@@ -13,7 +13,10 @@ process:
type: 'constants/type'
'settings/comment_type': comment_type
destination:
- plugin: md_entity:field_storage_config
+ plugin: entity:field_storage_config
+ dependencies:
+ module:
+ - comment
migration_dependencies:
required:
- d6_comment_type
diff --git a/core/modules/field/migration_templates/d6_field.yml b/core/modules/field/migration_templates/d6_field.yml
index 3157808..1205b67 100644
--- a/core/modules/field/migration_templates/d6_field.yml
+++ b/core/modules/field/migration_templates/d6_field.yml
@@ -123,4 +123,4 @@ process:
- '@type'
- global_settings
destination:
- plugin: md_entity:field_storage_config
+ plugin: entity:field_storage_config
diff --git a/core/modules/file/migration_templates/d6_upload_field.yml b/core/modules/file/migration_templates/d6_upload_field.yml
index c0b4569..a919f91 100644
--- a/core/modules/file/migration_templates/d6_upload_field.yml
+++ b/core/modules/file/migration_templates/d6_upload_field.yml
@@ -20,4 +20,7 @@ process:
cardinality: 'constants/cardinality'
'settings/display_field': 'constants/display_field'
destination:
- plugin: md_entity:field_storage_config
+ plugin: entity:field_storage_config
+ dependencies:
+ module:
+ - file
diff --git a/core/modules/migrate/src/Plugin/MigrateDestinationInterface.php b/core/modules/migrate/src/Plugin/MigrateDestinationInterface.php
index b6e86a0..9c83baf 100644
--- a/core/modules/migrate/src/Plugin/MigrateDestinationInterface.php
+++ b/core/modules/migrate/src/Plugin/MigrateDestinationInterface.php
@@ -83,11 +83,8 @@ interface MigrateDestinationInterface extends PluginInspectionInterface {
* Derived classes must implement fields(), returning a list of available
* destination fields.
*
- * @todo Review the cases where we need the Migration parameter, can we avoid
- * that? To be resolved with https://www.drupal.org/node/2543568.
- *
* @param \Drupal\migrate\Plugin\MigrationInterface $migration
- * (optional) The migration containing this destination. Defaults to NULL.
+ * Unused, will be removed before Drupal 9.0.x. Defaults to NULL.
*
* @return array
* - Keys: machine names of the fields
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/destination/EntityFieldStorageConfig.php b/core/modules/migrate_drupal/src/Plugin/migrate/destination/EntityFieldStorageConfig.php
index cc8431d..169390a 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/destination/EntityFieldStorageConfig.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/destination/EntityFieldStorageConfig.php
@@ -9,11 +9,17 @@ use Drupal\migrate\Plugin\MigrationInterface;
use Drupal\migrate\Plugin\migrate\destination\EntityFieldStorageConfig as BaseEntityFieldStorageConfig;
/**
- * Destination with Drupal specific config dependencies.
+ * Deprecated. Destination with Drupal specific config dependencies.
*
* @MigrateDestination(
* id = "md_entity:field_storage_config"
* )
+ *
+ * @deprecated in Drupal 8.2.x and will be removed in Drupal 9.0.x. Use
+ * \Drupal\migrate\Plugin\migrate\destination\EntityFieldStorageConfig
+ * instead.
+ *
+ * @see \Drupal\migrate\Plugin\migrate\destination\EntityFieldStorageConfig
*/
class EntityFieldStorageConfig extends BaseEntityFieldStorageConfig {
diff --git a/core/modules/taxonomy/migration_templates/d6_vocabulary_field.yml b/core/modules/taxonomy/migration_templates/d6_vocabulary_field.yml
index a1c9735..0e1a487 100644
--- a/core/modules/taxonomy/migration_templates/d6_vocabulary_field.yml
+++ b/core/modules/taxonomy/migration_templates/d6_vocabulary_field.yml
@@ -22,7 +22,10 @@ process:
'settings/target_type': 'constants/target_entity_type'
cardinality: cardinality
destination:
- plugin: md_entity:field_storage_config
+ plugin: entity:field_storage_config
+ dependencies:
+ module:
+ - entity_reference
migration_dependencies:
required:
- d6_taxonomy_vocabulary
diff --git a/core/modules/user/migration_templates/user_picture_field.yml b/core/modules/user/migration_templates/user_picture_field.yml
index a484ab8..ff8bd82 100644
--- a/core/modules/user/migration_templates/user_picture_field.yml
+++ b/core/modules/user/migration_templates/user_picture_field.yml
@@ -18,4 +18,7 @@ process:
type: 'constants/type'
cardinality: 'constants/cardinality'
destination:
- plugin: md_entity:field_storage_config
+ plugin: entity:field_storage_config
+ dependencies:
+ module:
+ - image
diff --git a/core/modules/user/migration_templates/user_profile_field.yml b/core/modules/user/migration_templates/user_profile_field.yml
index bf81898..3ba0eee 100644
--- a/core/modules/user/migration_templates/user_profile_field.yml
+++ b/core/modules/user/migration_templates/user_profile_field.yml
@@ -32,4 +32,4 @@ process:
map:
list: -1
destination:
- plugin: md_entity:field_storage_config
+ plugin: entity:field_storage_config