Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #3046397 by quietone: Change length in make_unique_entity_field to less than 32

merge-requests/55/head
Lee Rowlands 2019-09-11 19:35:39 +10:00
parent 3dc32db65f
commit 201bf4a6d0
No known key found for this signature in database
GPG Key ID: 2B829A3DF9204DC4
13 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/modules/block/migrations/d6_block.yml
View File

@ -19,7 +19,7 @@ process:
entity_type: block
field: id
postfix: _
length: 32
length: 29
source: module
plugin:
-

2
core/modules/config_translation/migrations/d6_taxonomy_vocabulary_translation.yml
View File

@ -13,7 +13,7 @@ process:
source: name
-
plugin: substr
length: 32
length: 30
langcode: language
property:
plugin: static_map

2
core/modules/contact/migrations/contact_category.yml
View File

@ -15,7 +15,7 @@ process:
plugin: make_unique_entity_field
entity_type: contact_form
field: id
length: 32
length: 30
label: category
recipients: recipients
reply: reply

2
core/modules/contact/tests/src/Kernel/Migrate/MigrateContactCategoryTest.php
View File

@ -58,7 +58,7 @@ class MigrateContactCategoryTest extends MigrateDrupal6TestBase {
public function testContactCategory() {
$this->assertEntity('website_feedback', 'Website feedback', ['admin@example.com'], '', 0);
$this->assertEntity('some_other_category', 'Some other category', ['test@example.com'], 'Thanks for contacting us, we will reply ASAP!', 1);
$this->assertEntity('a_category_much_longer_than_thir', 'A category much longer than thirty two characters', ['fortyninechars@example.com'], '', 2);
$this->assertEntity('a_category_much_longer_than_th', 'A category much longer than thirty two characters', ['fortyninechars@example.com'], '', 2);
// Test there are no duplicated roles.
$contact_forms = [

2
core/modules/image/migrations/d6_imagecache_presets.yml
View File

@ -14,7 +14,7 @@ process:
plugin: make_unique_entity_field
entity_type: image_style
field: name
length: 32
length: 30
label: presetname
effects:
plugin: d6_imagecache_actions

2
core/modules/language/tests/src/Kernel/Migrate/d6/MigrateLanguageContentTaxonomyVocabularySettingsTest.php
View File

@ -47,7 +47,7 @@ class MigrateLanguageContentTaxonomyVocabularySettingsTest extends MigrateDrupal
// Localize terms.
$this->assertLanguageContentSettings($target_entity, 'vocabulary_3_i_2_', LanguageInterface::LANGCODE_SITE_DEFAULT, TRUE, ['enabled' => FALSE]);
// None translation enabled.
$this->assertLanguageContentSettings($target_entity, 'vocabulary_name_much_longer_than', LanguageInterface::LANGCODE_SITE_DEFAULT, TRUE, ['enabled' => TRUE]);
$this->assertLanguageContentSettings($target_entity, 'vocabulary_name_much_longer_th', LanguageInterface::LANGCODE_SITE_DEFAULT, TRUE, ['enabled' => TRUE]);
$this->assertLanguageContentSettings($target_entity, 'tags', LanguageInterface::LANGCODE_SITE_DEFAULT, FALSE, ['enabled' => FALSE]);
$this->assertLanguageContentSettings($target_entity, 'forums', LanguageInterface::LANGCODE_SITE_DEFAULT, FALSE, ['enabled' => FALSE]);
$this->assertLanguageContentSettings($target_entity, 'type', LanguageInterface::LANGCODE_SITE_DEFAULT, FALSE, ['enabled' => FALSE]);

2
core/modules/language/tests/src/Kernel/Migrate/d7/MigrateLanguageContentTaxonomyVocabularySettingsTest.php
View File

@ -44,7 +44,7 @@ class MigrateLanguageContentTaxonomyVocabularySettingsTest extends MigrateDrupal
// No multilingual options for terms, i18n_mode = 0.
$this->assertLanguageContentSettings($target_entity, 'tags', LanguageInterface::LANGCODE_NOT_SPECIFIED, FALSE, ['enabled' => FALSE]);
$this->assertLanguageContentSettings($target_entity, 'forums', LanguageInterface::LANGCODE_NOT_SPECIFIED, FALSE, ['enabled' => FALSE]);
$this->assertLanguageContentSettings($target_entity, 'vocabulary_name_much_longer_than', LanguageInterface::LANGCODE_NOT_SPECIFIED, FALSE, ['enabled' => FALSE]);
$this->assertLanguageContentSettings($target_entity, 'vocabulary_name_much_longer_th', LanguageInterface::LANGCODE_NOT_SPECIFIED, FALSE, ['enabled' => FALSE]);
$this->assertLanguageContentSettings($target_entity, 'test_vocabulary', LanguageInterface::LANGCODE_NOT_SPECIFIED, FALSE, ['enabled' => FALSE]);
// Localize, i18n_mode = 1.
$this->assertLanguageContentSettings($target_entity, 'vocablocalized', LanguageInterface::LANGCODE_NOT_SPECIFIED, TRUE, ['enabled' => TRUE]);

2
core/modules/taxonomy/migrations/d6_taxonomy_vocabulary.yml
View File

@ -14,7 +14,7 @@ process:
plugin: make_unique_entity_field
entity_type: taxonomy_vocabulary
field: vid
length: 32
length: 30
migrated: true
-
# This plugin checks if the vocabulary being migrated is the one used by

2
core/modules/taxonomy/migrations/d7_taxonomy_vocabulary.yml
View File

@ -12,7 +12,7 @@ process:
source: machine_name
entity_type: taxonomy_vocabulary
field: vid
length: 32
length: 30
migrated: true
-
# This plugin checks if the vocabulary being migrated is the one used by

2
core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTaxonomyVocabularyTest.php
View File

@ -37,7 +37,7 @@ class MigrateTaxonomyVocabularyTest extends MigrateDrupal6TestBase {
$this->assertSame("description of vocabulary $j (i=$i)", $vocabulary->getDescription());
$this->assertSame(4 + $i, $vocabulary->get('weight'));
}
$vocabulary = Vocabulary::load('vocabulary_name_much_longer_than');
$vocabulary = Vocabulary::load('vocabulary_name_much_longer_th');
$this->assertSame('vocabulary name much longer than thirty two characters', $vocabulary->label());
$this->assertSame('description of vocabulary name much longer than thirty two characters', $vocabulary->getDescription());
$this->assertSame(7, $vocabulary->get('weight'));

2
core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTaxonomyVocabularyTranslationTest.php
View File

@ -46,7 +46,7 @@ class MigrateTaxonomyVocabularyTranslationTest extends MigrateDrupal6TestBase {
$this->assertSame('fr - vocabulary 2 (i=1)', $config->get('name'));
$config = $language_manager->getLanguageConfigOverride('fr', 'taxonomy.vocabulary.vocabulary_3_i_2_');
$this->assertSame('fr - vocabulary 3 (i=2)', $config->get('name'));
$config = $language_manager->getLanguageConfigOverride('fr', 'taxonomy.vocabulary.vocabulary_name_much_longer_than');
$config = $language_manager->getLanguageConfigOverride('fr', 'taxonomy.vocabulary.vocabulary_name_much_longer_th');
$this->assertSame('Nom de vocabulaire beaucoup plus long que trente-deux caractères', $config->get('name'));
$config = $language_manager->getLanguageConfigOverride('fr', 'taxonomy.vocabulary.tags');
$this->assertSame('fr - Tags', $config->get('name'));

4
core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTermLocalizedTranslationTest.php
View File

@ -116,8 +116,8 @@ class MigrateTermLocalizedTranslationTest extends MigrateDrupal6TestBase {
* Tests the Drupal 6 i18n localized taxonomy term to Drupal 8 migration.
*/
public function testTranslatedLocalizedTaxonomyTerms() {
$this->assertEntity(14, 'en', 'Talos IV', 'vocabulary_name_much_longer_than', 'The home of Captain Christopher Pike.', NULL, '0', []);
$this->assertEntity(15, 'en', 'Vulcan', 'vocabulary_name_much_longer_than', NULL, NULL, '0', []);
$this->assertEntity(14, 'en', 'Talos IV', 'vocabulary_name_much_longer_th', 'The home of Captain Christopher Pike.', NULL, '0', []);
$this->assertEntity(15, 'en', 'Vulcan', 'vocabulary_name_much_longer_th', NULL, NULL, '0', []);
/** @var \Drupal\taxonomy\TermInterface $entity */
$entity = Term::load(14);

2
core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTaxonomyVocabularyTest.php
View File

@ -54,7 +54,7 @@ class MigrateTaxonomyVocabularyTest extends MigrateDrupal7TestBase {
$this->assertEntity('tags', 'Tags', 'Use tags to group articles on similar topics into categories.', 0);
$this->assertEntity('forums', 'Sujet de discussion', 'Forum navigation vocabulary', -10);
$this->assertEntity('test_vocabulary', 'Test Vocabulary', 'This is the vocabulary description', 0);
$this->assertEntity('vocabulary_name_much_longer_than', 'vocabulary name clearly different than machine name and much longer than thirty two characters', 'description of vocabulary name much longer than thirty two characters', 0);
$this->assertEntity('vocabulary_name_much_longer_th', 'vocabulary name clearly different than machine name and much longer than thirty two characters', 'description of vocabulary name much longer than thirty two characters', 0);
}
}