Verified Commit aebff2a5 authored by Lee Rowlands's avatar Lee Rowlands
Browse files

Issue #3119254 by quietone, shaktik, douggreen, larowlan: [backport] Add... 

Issue #3119254 by quietone, shaktik, douggreen, larowlan: [backport] Add taxonomy_term_reference_plain and taxonomy_term_reference_rss_category to TaxonomyTermReference

(cherry picked from commit 9a2ef65f)
parent bd8685e6

core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldFormatterSettingsTest.php

+2 −0
Original line number Diff line number Diff line
@@ -128,6 +128,8 @@ public function testMigration() { 


    $this->assertEntity('node.blog.teaser');

    $this->assertComponent('node.blog.teaser', 'body', 'text_summary_or_trimmed', 'hidden', 0);

    $this->assertComponent('node.blog.default', 'field_termplain', 'entity_reference_label', 'above', 13);

    $this->assertComponent('node.blog.default', 'field_termrss', 'entity_reference_label', 'above', 14);



    $this->assertEntity('node.book.default');

    $this->assertComponent('node.book.default', 'body', 'text_default', 'hidden', 0);

core/modules/migrate_drupal/tests/fixtures/drupal7.php

+295 −0
Original line number Diff line number Diff line
@@ -4512,6 +4512,36 @@ 
  'translatable' => '1',

  'deleted' => '0',

))

->values(array(

  'id' => '54',

  'field_name' => 'field_termplain',

  'type' => 'taxonomy_term_reference',

  'module' => 'taxonomy',

  'active' => '1',

  'storage_type' => 'field_sql_storage',

  'storage_module' => 'field_sql_storage',

  'storage_active' => '1',

  'locked' => '0',

  'data' => 'a:7:{s:12:"translatable";s:1:"0";s:12:"entity_types";a:0:{}s:8:"settings";a:3:{s:14:"allowed_values";a:1:{i:0;a:2:{s:10:"vocabulary";s:4:"tags";s:6:"parent";s:1:"0";}}s:21:"options_list_callback";s:29:"title_taxonomy_allowed_values";s:23:"entity_translation_sync";b:0;}s:7:"storage";a:5:{s:4:"type";s:17:"field_sql_storage";s:8:"settings";a:0:{}s:6:"module";s:17:"field_sql_storage";s:6:"active";s:1:"1";s:7:"details";a:1:{s:3:"sql";a:2:{s:18:"FIELD_LOAD_CURRENT";a:1:{s:26:"field_data_field_termplain";a:1:{s:3:"tid";s:19:"field_termplain_tid";}}s:19:"FIELD_LOAD_REVISION";a:1:{s:30:"field_revision_field_termplain";a:1:{s:3:"tid";s:19:"field_termplain_tid";}}}}}s:12:"foreign keys";a:1:{s:3:"tid";a:2:{s:5:"table";s:18:"taxonomy_term_data";s:7:"columns";a:1:{s:3:"tid";s:3:"tid";}}}s:7:"indexes";a:1:{s:3:"tid";a:1:{i:0;s:3:"tid";}}s:2:"id";s:2:"55";}',

  'cardinality' => '1',

  'translatable' => '1',

  'deleted' => '0',

))

->values(array(

  'id' => '55',

  'field_name' => 'field_termrss',

  'type' => 'taxonomy_term_reference',

  'module' => 'taxonomy',

  'active' => '1',

  'storage_type' => 'field_sql_storage',

  'storage_module' => 'field_sql_storage',

  'storage_active' => '1',

  'locked' => '0',

  'data' => 'a:7:{s:12:"translatable";i:0;s:12:"entity_types";a:0:{}s:8:"settings";a:3:{s:14:"allowed_values";a:1:{i:0;a:2:{s:10:"vocabulary";s:19:"sujet_de_discussion";s:6:"parent";s:1:"0";}}s:21:"options_list_callback";s:29:"title_taxonomy_allowed_values";s:23:"entity_translation_sync";b:0;}s:7:"storage";a:5:{s:4:"type";s:17:"field_sql_storage";s:8:"settings";a:0:{}s:6:"module";s:17:"field_sql_storage";s:6:"active";s:1:"1";s:7:"details";a:1:{s:3:"sql";a:2:{s:18:"FIELD_LOAD_CURRENT";a:1:{s:24:"field_data_field_termrss";a:1:{s:3:"tid";s:17:"field_termrss_tid";}}s:19:"FIELD_LOAD_REVISION";a:1:{s:28:"field_revision_field_termrss";a:1:{s:3:"tid";s:17:"field_termrss_tid";}}}}}s:12:"foreign keys";a:1:{s:3:"tid";a:2:{s:5:"table";s:18:"taxonomy_term_data";s:7:"columns";a:1:{s:3:"tid";s:3:"tid";}}}s:7:"indexes";a:1:{s:3:"tid";a:1:{i:0;s:3:"tid";}}s:2:"id";s:2:"56";}',

  'cardinality' => '1',

  'translatable' => '1',

  'deleted' => '0',

))

->execute();

$connection->schema()->createTable('field_config_instance', array(

  'fields' => array(
@@ -5291,6 +5321,24 @@ 
  'data' => 'a:6:{s:5:"label";s:7:"Comment";s:8:"settings";a:2:{s:15:"text_processing";i:1;s:18:"user_register_form";b:0;}s:8:"required";b:1;s:7:"display";a:1:{s:7:"default";a:5:{s:5:"label";s:6:"hidden";s:4:"type";s:12:"text_default";s:6:"weight";i:0;s:8:"settings";a:0:{}s:6:"module";s:4:"text";}}s:6:"widget";a:4:{s:4:"type";s:13:"text_textarea";s:8:"settings";a:1:{s:4:"rows";i:5;}s:6:"weight";i:0;s:6:"module";s:4:"text";}s:11:"description";s:0:"";}',

  'deleted' => '0',

))

->values(array(

  'id' => '84',

  'field_id' => '54',

  'field_name' => 'field_termplain',

  'entity_type' => 'node',

  'bundle' => 'blog',

  'data' => 'a:6:{s:5:"label";s:9:"termplain";s:6:"widget";a:4:{s:4:"type";s:15:"options_buttons";s:6:"weight";s:2:"15";s:8:"settings";a:0:{}s:6:"module";s:7:"options";}s:8:"settings";a:2:{s:18:"user_register_form";b:0;s:23:"entity_translation_sync";b:0;}s:7:"display";a:1:{s:7:"default";a:5:{s:5:"label";s:5:"above";s:4:"type";s:29:"taxonomy_term_reference_plain";s:6:"weight";s:2:"13";s:8:"settings";a:0:{}s:6:"module";s:8:"taxonomy";}}s:8:"required";b:0;s:11:"description";s:0:"";}',

  'deleted' => '0',

))

->values(array(

  'id' => '85',

  'field_id' => '55',

  'field_name' => 'field_termrss',

  'entity_type' => 'node',

  'bundle' => 'blog',

  'data' => 'a:7:{s:5:"label";s:7:"termrss";s:6:"widget";a:5:{s:6:"weight";s:2:"16";s:4:"type";s:15:"options_buttons";s:6:"module";s:7:"options";s:6:"active";i:1;s:8:"settings";a:0:{}}s:8:"settings";a:2:{s:18:"user_register_form";b:0;s:23:"entity_translation_sync";b:0;}s:7:"display";a:1:{s:7:"default";a:5:{s:5:"label";s:5:"above";s:4:"type";s:36:"taxonomy_term_reference_rss_category";s:6:"weight";s:2:"14";s:8:"settings";a:0:{}s:6:"module";s:8:"taxonomy";}}s:8:"required";i:0;s:11:"description";s:0:"";s:13:"default_value";N;}',

  'deleted' => '0',

))

->execute();

$connection->schema()->createTable('field_data_body', array(

  'fields' => array(
@@ -8437,6 +8485,128 @@ 
  'field_tags_tid' => '17',

))

->execute();

$connection->schema()->createTable('field_data_field_termplain', array(

  'fields' => array(

    'entity_type' => array(

      'type' => 'varchar',

      'not null' => TRUE,

      'length' => '128',

      'default' => '',

    ),

    'bundle' => array(

      'type' => 'varchar',

      'not null' => TRUE,

      'length' => '128',

      'default' => '',

    ),

    'deleted' => array(

      'type' => 'int',

      'not null' => TRUE,

      'size' => 'normal',

      'default' => '0',

    ),

    'entity_id' => array(

      'type' => 'int',

      'not null' => TRUE,

      'size' => 'normal',

      'unsigned' => TRUE,

    ),

    'revision_id' => array(

      'type' => 'int',

      'not null' => FALSE,

      'size' => 'normal',

      'unsigned' => TRUE,

    ),

    'language' => array(

      'type' => 'varchar',

      'not null' => TRUE,

      'length' => '32',

      'default' => '',

    ),

    'delta' => array(

      'type' => 'int',

      'not null' => TRUE,

      'size' => 'normal',

      'unsigned' => TRUE,

    ),

    'field_termplain_tid' => array(

      'type' => 'int',

      'not null' => FALSE,

      'size' => 'normal',

      'unsigned' => TRUE,

    ),

  ),

  'primary key' => array(

    'entity_type',

    'deleted',

    'entity_id',

    'language',

    'delta',

  ),

  'mysql_character_set' => 'utf8',

));













$connection->schema()->createTable('field_data_field_termrss', array(













  'fields' => array(













    'entity_type' => array(













      'type' => 'varchar',













      'not null' => TRUE,













      'length' => '128',













      'default' => '',













    ),













    'bundle' => array(













      'type' => 'varchar',













      'not null' => TRUE,













      'length' => '128',













      'default' => '',













    ),













    'deleted' => array(













      'type' => 'int',













      'not null' => TRUE,













      'size' => 'normal',













      'default' => '0',













    ),













    'entity_id' => array(













      'type' => 'int',













      'not null' => TRUE,













      'size' => 'normal',













      'unsigned' => TRUE,













    ),













    'revision_id' => array(













      'type' => 'int',













      'not null' => FALSE,













      'size' => 'normal',













      'unsigned' => TRUE,













    ),













    'language' => array(













      'type' => 'varchar',













      'not null' => TRUE,













      'length' => '32',













      'default' => '',













    ),













    'delta' => array(













      'type' => 'int',













      'not null' => TRUE,













      'size' => 'normal',













      'unsigned' => TRUE,













    ),













    'field_termrss_tid' => array(













      'type' => 'int',













      'not null' => FALSE,













      'size' => 'normal',













      'unsigned' => TRUE,













    ),













  ),













  'primary key' => array(













    'entity_type',













    'deleted',













    'entity_id',













    'language',













    'delta',













  ),













  'mysql_character_set' => 'utf8',













));



























$connection->schema()->createTable('field_data_field_term_entityreference', array(















  'fields' => array(















    'entity_type' => array(










@@ -14521,6 +14691,131 @@













  'field_term_entityreference_target_id' => '15',















))















->execute();

























$connection->schema()->createTable('field_revision_field_termplain', array(













  'fields' => array(













    'entity_type' => array(













      'type' => 'varchar',













      'not null' => TRUE,













      'length' => '128',













      'default' => '',













    ),













    'bundle' => array(













      'type' => 'varchar',













      'not null' => TRUE,













      'length' => '128',













      'default' => '',













    ),













    'deleted' => array(













      'type' => 'int',













      'not null' => TRUE,













      'size' => 'normal',













      'default' => '0',













    ),













    'entity_id' => array(













      'type' => 'int',













      'not null' => TRUE,













      'size' => 'normal',













      'unsigned' => TRUE,













    ),













    'revision_id' => array(













      'type' => 'int',













      'not null' => TRUE,













      'size' => 'normal',













      'unsigned' => TRUE,













    ),













    'language' => array(













      'type' => 'varchar',













      'not null' => TRUE,













      'length' => '32',













      'default' => '',













    ),













    'delta' => array(













      'type' => 'int',













      'not null' => TRUE,













      'size' => 'normal',













      'unsigned' => TRUE,













    ),













    'field_termplain_tid' => array(













      'type' => 'int',













      'not null' => FALSE,













      'size' => 'normal',













      'unsigned' => TRUE,













    ),













  ),













  'primary key' => array(













    'entity_type',













    'deleted',













    'entity_id',













    'revision_id',













    'language',













    'delta',













  ),













  'mysql_character_set' => 'utf8',













));

























$connection->schema()->createTable('field_revision_field_termrss', array(













  'fields' => array(













    'entity_type' => array(













      'type' => 'varchar',













      'not null' => TRUE,













      'length' => '128',













      'default' => '',













    ),













    'bundle' => array(













      'type' => 'varchar',













      'not null' => TRUE,













      'length' => '128',













      'default' => '',













    ),













    'deleted' => array(













      'type' => 'int',













      'not null' => TRUE,













      'size' => 'normal',













      'default' => '0',













    ),













    'entity_id' => array(













      'type' => 'int',













      'not null' => TRUE,













      'size' => 'normal',













      'unsigned' => TRUE,













    ),













    'revision_id' => array(













      'type' => 'int',













      'not null' => TRUE,













      'size' => 'normal',













      'unsigned' => TRUE,













    ),













    'language' => array(













      'type' => 'varchar',













      'not null' => TRUE,













      'length' => '32',













      'default' => '',













    ),













    'delta' => array(













      'type' => 'int',













      'not null' => TRUE,













      'size' => 'normal',













      'unsigned' => TRUE,













    ),













    'field_termrss_tid' => array(













      'type' => 'int',













      'not null' => FALSE,













      'size' => 'normal',













      'unsigned' => TRUE,













    ),













  ),













  'primary key' => array(













    'entity_type',













    'deleted',













    'entity_id',













    'revision_id',













    'language',













    'delta',













  ),













  'mysql_character_set' => 'utf8',













));



























$connection->schema()->createTable('field_revision_field_term_reference', array(















  'fields' => array(















    'entity_type' => array(

























core/modules/migrate_drupal/tests/src/Kernel/d7/FieldDiscoveryTest.php



+2
−0






























Original line number
Diff line number
Diff line








@@ -203,6 +203,8 @@ public function addAllFieldProcessesAltersData() {













              'map' => [















                'taxonomy_term_reference' => [















                  'taxonomy_term_reference_link' => 'entity_reference_label',













                  'taxonomy_term_reference_plain' => 'entity_reference_label',













                  'taxonomy_term_reference_rss_category' => 'entity_reference_label',















                  'i18n_taxonomy_term_reference_link' => 'entity_reference_label',















                  'entityreference_entity_view' => 'entity_reference_entity_view',















                ],

































core/modules/migrate_drupal_ui/tests/src/Functional/d7/Upgrade7Test.php



+2
−2






























Original line number
Diff line number
Diff line








@@ -89,8 +89,8 @@ protected function getEntityCounts() {













      'contact_form' => 3,















      'contact_message' => 0,















      'editor' => 2,













      'field_config' => 79,













      'field_storage_config' => 60,













      'field_config' => 81,













      'field_storage_config' => 62,















      'file' => 3,















      'filter_format' => 7,















      'image_style' => 6,

































core/modules/taxonomy/src/Plugin/migrate/field/TaxonomyTermReference.php



+2
−0






























Original line number
Diff line number
Diff line








@@ -24,6 +24,8 @@ class TaxonomyTermReference extends FieldPluginBase {













  public function getFieldFormatterMap() {















    return [















      'taxonomy_term_reference_link' => 'entity_reference_label',













      'taxonomy_term_reference_plain' => 'entity_reference_label',













      'taxonomy_term_reference_rss_category' => 'entity_reference_label',















      'i18n_taxonomy_term_reference_link' => 'entity_reference_label',















      'entityreference_entity_view' => 'entity_reference_entity_view',















    ];