Issue #2700581 by mikeryan, benjy, heddn, vasi: Destination bundle set in destination plugin, not in process

core/modules/block_content/migration_templates/d6_custom_block.yml

@@ -4,11 +4,8 @@ migration_tags:
   - Drupal 6
 source:
   plugin: d6_box
-  constants:
-    type: basic
 process:
   id: bid
-  type: 'constants/type'
   info: info
   'body/format':
     plugin: migration
@@ -17,6 +14,7 @@ process:
   'body/value': body
 destination:
   plugin: entity:block_content
+  default_bundle: basic
   no_stub: true
 migration_dependencies:
   required:

core/modules/block_content/migration_templates/d7_custom_block.yml

@@ -4,11 +4,8 @@ migration_tags:
   - Drupal 7
 source:
   plugin: d7_block_custom
-  constants:
-    type: basic
 process:
   id: bid
-  type: 'constants/type'
   info: info
   'body/format':
     plugin: migration
@@ -17,6 +14,7 @@ process:
   'body/value': body
 destination:
   plugin: entity:block_content
+  default_bundle: basic
   no_stub: true
 migration_dependencies:
   required:

core/modules/menu_link_content/migration_templates/menu_links.yml

@@ -5,11 +5,8 @@ migration_tags:
   - Drupal 7
 source:
   plugin: menu_link
-  constants:
-    bundle: menu_link_content
 process:
   id: mlid
-  bundle: 'constants/bundle'
   title: link_title
   description: description
   menu_name:
@@ -49,6 +46,7 @@ process:
   changed: updated
 destination:
   plugin: entity:menu_link_content
+  default_bundle: menu_link_content
   no_stub: true
 migration_dependencies:
   required:

core/modules/migrate/src/Plugin/migrate/destination/Entity.php

@@ -88,6 +88,21 @@ abstract class Entity extends DestinationBase implements ContainerFactoryPluginI
     return substr($plugin_id, 7);
   }
 
+  /**
+   * Gets the bundle for the row taking into account the default.
+   *
+   * @param \Drupal\migrate\Row $row
+   *   The current row we're importing.
+   *
+   * @return string
+   *   The bundle for this row.
+   */
+  public function getBundle(Row $row) {
+    $default_bundle = isset($this->configuration['default_bundle']) ? $this->configuration['default_bundle'] : '';
+    $bundle_key = $this->getKey('bundle');
+    return $row->getDestinationProperty($bundle_key) ?: $default_bundle;
+  }
+
   /**
    * {@inheritdoc}
    */
@@ -112,6 +127,11 @@ abstract class Entity extends DestinationBase implements ContainerFactoryPluginI
       $this->updateEntity($entity, $row);
     }
     else {
+      // Attempt to ensure we always have a bundle.
+      if ($bundle = $this->getBundle($row)) {
+        $row->setDestinationProperty($this->getKey('bundle'), $bundle);
+      }
+
       // Stubs might need some required fields filled in.
       if ($row->isStub()) {
         $this->processStubRow($row);

core/modules/migrate/tests/src/Kernel/MigrateBundleTest.php

@@ -0,0 +1,155 @@
+<?php
+
+namespace Drupal\Tests\migrate\Kernel;
+
+use Drupal\migrate\MigrateExecutable;
+use Drupal\taxonomy\Entity\Term;
+use Drupal\taxonomy\Entity\Vocabulary;
+
+/**
+ * Tests setting of bundles on content entity migrations.
+ *
+ * @group migrate
+ */
+class MigrateBundleTest extends MigrateTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['taxonomy', 'text'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installEntitySchema('taxonomy_vocabulary');
+    $this->installEntitySchema('taxonomy_term');
+    $this->installConfig(['taxonomy']);
+    // Set up two vocabularies (taxonomy bundles).
+    Vocabulary::create(['vid' => 'tags', 'name' => 'Tags']);
+    Vocabulary::create(['vid' => 'categories', 'name' => 'Categories']);
+  }
+
+  /**
+   * Tests setting the bundle in the destination.
+   */
+  public function testDestinationBundle() {
+    $term_data_rows = [
+      ['id' => 1, 'name' => 'Category 1'],
+    ];
+    $ids = ['id' => ['type' => 'integer']];
+    $definition = [
+      'id' => 'terms',
+      'migration_tags' => ['Bundle test'],
+      'source' => [
+        'plugin' => 'embedded_data',
+        'data_rows' => $term_data_rows,
+        'ids' => $ids,
+      ],
+      'process' => [
+        'tid' => 'id',
+        'name' => 'name',
+      ],
+      'destination' => [
+        'plugin' => 'entity:taxonomy_term',
+        'default_bundle' => 'categories',
+      ],
+      'migration_dependencies' => [],
+    ];
+
+    $term_migration = \Drupal::service('plugin.manager.migration')->createStubMigration($definition);
+
+    // Import and validate the term entity was created with the correct bundle.
+    $term_executable = new MigrateExecutable($term_migration, $this);
+    $term_executable->import();
+    /** @var Term $term */
+    $term = Term::load(1);
+    $this->assertEquals($term->bundle(), 'categories');
+  }
+
+  /**
+   * Tests setting the bundle in the process pipeline.
+   */
+  public function testProcessBundle() {
+    $term_data_rows = [
+      ['id' => 1, 'vocab' => 'categories', 'name' => 'Category 1'],
+      ['id' => 2, 'vocab' => 'tags', 'name' => 'Tag 1'],
+    ];
+    $ids = ['id' => ['type' => 'integer']];
+    $definition = [
+      'id' => 'terms',
+      'migration_tags' => ['Bundle test'],
+      'source' => [
+        'plugin' => 'embedded_data',
+        'data_rows' => $term_data_rows,
+        'ids' => $ids,
+      ],
+      'process' => [
+        'tid' => 'id',
+        'vid' => 'vocab',
+        'name' => 'name',
+      ],
+      'destination' => [
+        'plugin' => 'entity:taxonomy_term',
+      ],
+      'migration_dependencies' => [],
+    ];
+
+    $term_migration = \Drupal::service('plugin.manager.migration')->createStubMigration($definition);
+
+    // Import and validate the term entities were created with the correct bundle.
+    $term_executable = new MigrateExecutable($term_migration, $this);
+    $term_executable->import();
+    /** @var Term $term */
+    $term = Term::load(1);
+    $this->assertEquals($term->bundle(), 'categories');
+    $term = Term::load(2);
+    $this->assertEquals($term->bundle(), 'tags');
+  }
+
+  /**
+   * Tests setting bundles both in process and destination.
+   */
+  public function testMixedBundles() {
+    $term_data_rows = [
+      ['id' => 1, 'vocab' => 'categories', 'name' => 'Category 1'],
+      ['id' => 2, 'name' => 'Tag 1'],
+    ];
+    $ids = ['id' => ['type' => 'integer']];
+    $definition = [
+      'id' => 'terms',
+      'migration_tags' => ['Bundle test'],
+      'source' => [
+        'plugin' => 'embedded_data',
+        'data_rows' => $term_data_rows,
+        'ids' => $ids,
+      ],
+      'process' => [
+        'tid' => 'id',
+        'vid' => 'vocab',
+        'name' => 'name',
+      ],
+      'destination' => [
+        'plugin' => 'entity:taxonomy_term',
+        // When no vocab is provided, the destination bundle is applied.
+        'default_bundle' => 'tags',
+      ],
+      'migration_dependencies' => [],
+    ];
+
+    $term_migration = \Drupal::service('plugin.manager.migration')->createStubMigration($definition);
+
+    // Import and validate the term entities were created with the correct bundle.
+    $term_executable = new MigrateExecutable($term_migration, $this);
+    $term_executable->import();
+    /** @var Term $term */
+    $term = Term::load(1);
+    $this->assertEquals($term->bundle(), 'categories');
+    $term = Term::load(2);
+    $this->assertEquals($term->bundle(), 'tags');
+  }
+
+}

core/modules/node/migration_templates/d6_node.yml

@@ -8,7 +8,6 @@ source:
 process:
   nid: nid
   vid: vid
-  type: type
   langcode:
     plugin: default_value
     source: language

core/modules/node/migration_templates/d6_node_revision.yml

@@ -8,7 +8,6 @@ source:
 process:
   nid: nid
   vid: vid
-  type: type
   langcode:
     plugin: default_value
     source: language

core/modules/node/migration_templates/d7_node.yml

@@ -8,7 +8,6 @@ source:
 process:
   nid: nid
   vid: vid
-  type: type
   langcode:
     plugin: default_value
     source: language

core/modules/node/migration_templates/d7_node_revision.yml

@@ -8,7 +8,6 @@ source:
 process:
   nid: nid
   vid: vid
-  type: type
   langcode:
     plugin: default_value
     source: language

core/modules/node/src/Plugin/migrate/D6NodeDeriver.php

@@ -98,6 +98,7 @@ class D6NodeDeriver extends DeriverBase implements ContainerDeriverInterface {
           '@type' => $node_type,
         ]);
         $values['source']['node_type'] = $node_type;
+        $values['destination']['default_bundle'] = $node_type;
 
         // If this migration is based on the d6_node_revision migration, it
         // should explicitly depend on the corresponding d6_node variant.

core/modules/node/src/Plugin/migrate/D7NodeDeriver.php

@@ -92,6 +92,7 @@ class D7NodeDeriver extends DeriverBase implements ContainerDeriverInterface {
           '@type' => $row->getSourceProperty('name'),
         ]);
         $values['source']['node_type'] = $node_type;
+        $values['destination']['default_bundle'] = $node_type;
 
         $migration = \Drupal::service('plugin.manager.migration')->createStubMigration($values);
         if (isset($fields[$node_type])) {