diff -u b/core/modules/text/src/Plugin/Field/FieldType/TextItemBase.php b/core/modules/text/src/Plugin/Field/FieldType/TextItemBase.php --- b/core/modules/text/src/Plugin/Field/FieldType/TextItemBase.php +++ b/core/modules/text/src/Plugin/Field/FieldType/TextItemBase.php @@ -34,7 +34,7 @@ '#options' => $this->get('format')->getPossibleOptions(), '#default_value' => $settings['allowed_formats'], '#description' => $this->t('Select the allowed text formats. If no formats are selected, all available text formats will be displayed to the user.'), - '#element_validate' => [[static::class, 'validateAllowedFormats']] + '#element_validate' => [[static::class, 'validateAllowedFormats']], ]; return $element; diff -u b/core/modules/text/tests/src/Functional/TextFieldTest.php b/core/modules/text/tests/src/Functional/TextFieldTest.php --- b/core/modules/text/tests/src/Functional/TextFieldTest.php +++ b/core/modules/text/tests/src/Functional/TextFieldTest.php @@ -161,18 +161,21 @@ // Create one text format. $this->drupalLogin($this->adminUser); $edit = [ - 'format' => Unicode::strtolower($this->randomMachineName()), + 'format' => mb_strtolower($this->randomMachineName()), 'name' => $this->randomMachineName(), ]; $this->drupalPostForm('admin/config/content/formats/add', $edit, t('Save configuration')); filter_formats_reset(); - $filter_format_storage = \Drupal::entityTypeManager()->getStorage('filter_format'); + /** @var \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager */ + $entity_type_manager = $this->container->get('entity_type.manager'); + $filter_format_storage = $entity_type_manager + ->getStorage('filter_format'); /** @var \Drupal\filter\Entity\FilterFormat $format1 */ $format1 = $filter_format_storage->load($edit['format']); // Create a second text format. $edit = [ - 'format' => Unicode::strtolower($this->randomMachineName()), + 'format' => mb_strtolower($this->randomMachineName()), 'name' => $this->randomMachineName(), ]; $this->drupalPostForm('admin/config/content/formats/add', $edit, t('Save configuration')); @@ -189,26 +192,29 @@ ]); // Create a field with multiple formats allowed. - $field_name = Unicode::strtolower($this->randomMachineName()); - $field_storage = entity_create('field_storage_config', [ + $field_name = mb_strtolower($this->randomMachineName()); + $field_storage = FieldStorageConfig::create([ 'field_name' => $field_name, 'entity_type' => 'entity_test', 'type' => 'text', ]); $field_storage->save(); - $field = entity_create('field_config', [ + $field = FieldConfig::create([ 'field_storage' => $field_storage, 'bundle' => 'entity_test', 'label' => $this->randomMachineName() . '_label', 'settings' => ['allowed_formats' => [$format1->id(), $format2->id()]], ]); $field->save(); - entity_get_form_display('entity_test', 'entity_test', 'default') + + /** @var \Drupal\Core\Entity\EntityDisplayRepositoryInterface $entity_display_repository */ + $entity_display_repository = $this->container->get('entity_display.repository'); + $entity_display_repository->getFormDisplay('entity_test', 'entity_test', 'default') ->setComponent($field_name, [ 'type' => 'text_textfield', ]) ->save(); - entity_get_display('entity_test', 'entity_test', 'full') + $entity_display_repository->getViewDisplay('entity_test', 'entity_test', 'full') ->setComponent($field_name) ->save(); only in patch2: unchanged: --- a/core/modules/field/tests/modules/field_test_config/config/install/field.field.entity_test.entity_test.field_test_import.yml +++ b/core/modules/field/tests/modules/field_test_config/config/install/field.field.entity_test.entity_test.field_test_import.yml @@ -8,7 +8,8 @@ description: '' required: false default_value: { } default_value_callback: '' -settings: { } +settings: + allowed_formats: { } field_type: text dependencies: config: only in patch2: unchanged: --- a/core/modules/field/tests/modules/field_test_config/config/install/field.field.entity_test.entity_test.field_test_import_2.yml +++ b/core/modules/field/tests/modules/field_test_config/config/install/field.field.entity_test.entity_test.field_test_import_2.yml @@ -8,7 +8,8 @@ description: '' required: false default_value: { } default_value_callback: '' -settings: { } +settings: + allowed_formats: { } field_type: text dependencies: config: only in patch2: unchanged: --- a/core/modules/field/tests/modules/field_test_config/config/install/field.field.entity_test.test_bundle.field_test_import_2.yml +++ b/core/modules/field/tests/modules/field_test_config/config/install/field.field.entity_test.test_bundle.field_test_import_2.yml @@ -8,7 +8,8 @@ description: '' required: false default_value: { } default_value_callback: '' -settings: { } +settings: + allowed_formats: { } field_type: text dependencies: config: only in patch2: unchanged: --- a/core/modules/field/tests/modules/field_test_config/sync/field.field.entity_test.entity_test.field_test_import_sync.yml +++ b/core/modules/field/tests/modules/field_test_config/sync/field.field.entity_test.entity_test.field_test_import_sync.yml @@ -9,7 +9,8 @@ description: '' required: '0' default_value: { } default_value_callback: '' -settings: { } +settings: + allowed_formats: { } field_type: text dependencies: config: only in patch2: unchanged: --- a/core/modules/field/tests/modules/field_test_config/sync/field.field.entity_test.test_bundle.field_test_import_sync_2.yml +++ b/core/modules/field/tests/modules/field_test_config/sync/field.field.entity_test.test_bundle.field_test_import_sync_2.yml @@ -9,7 +9,8 @@ description: '' required: '0' default_value: { } default_value_callback: '' -settings: { } +settings: + allowed_formats: { } field_type: text dependencies: config: only in patch2: unchanged: --- a/core/modules/field/tests/modules/field_test_config/sync/field.field.entity_test.test_bundle_2.field_test_import_sync_2.yml +++ b/core/modules/field/tests/modules/field_test_config/sync/field.field.entity_test.test_bundle_2.field_test_import_sync_2.yml @@ -9,7 +9,8 @@ description: '' required: '0' default_value: { } default_value_callback: '' -settings: { } +settings: + allowed_formats: { } field_type: text dependencies: config: only in patch2: unchanged: --- a/core/modules/jsonapi/tests/src/Functional/FieldConfigTest.php +++ b/core/modules/jsonapi/tests/src/Functional/FieldConfigTest.php @@ -119,7 +119,7 @@ protected function getExpectedDocument() { 'label' => 'field_llama', 'langcode' => 'en', 'required' => FALSE, - 'settings' => [], + 'settings' => ['allowed_formats' => []], 'status' => TRUE, 'translatable' => TRUE, 'drupal_internal__id' => 'node.camelids.field_llama', only in patch2: unchanged: --- a/core/profiles/demo_umami/config/install/field.field.block_content.disclaimer_block.field_disclaimer.yml +++ b/core/profiles/demo_umami/config/install/field.field.block_content.disclaimer_block.field_disclaimer.yml @@ -16,5 +16,6 @@ required: false translatable: true default_value: { } default_value_callback: '' -settings: { } +settings: + allowed_formats: { } field_type: text_long only in patch2: unchanged: --- a/core/profiles/demo_umami/config/install/field.field.node.article.body.yml +++ b/core/profiles/demo_umami/config/install/field.field.node.article.body.yml @@ -19,4 +19,5 @@ default_value_callback: '' settings: display_summary: true required_summary: false + allowed_formats: { } field_type: text_with_summary only in patch2: unchanged: --- a/core/profiles/demo_umami/config/install/field.field.node.page.body.yml +++ b/core/profiles/demo_umami/config/install/field.field.node.page.body.yml @@ -19,4 +19,5 @@ default_value_callback: '' settings: display_summary: true required_summary: false + allowed_formats: { } field_type: text_with_summary only in patch2: unchanged: --- a/core/profiles/demo_umami/config/install/field.field.node.recipe.field_recipe_instruction.yml +++ b/core/profiles/demo_umami/config/install/field.field.node.recipe.field_recipe_instruction.yml @@ -16,5 +16,6 @@ required: true translatable: true default_value: { } default_value_callback: '' -settings: { } +settings: + allowed_formats: { } field_type: text_long only in patch2: unchanged: --- a/core/profiles/demo_umami/config/install/field.field.node.recipe.field_summary.yml +++ b/core/profiles/demo_umami/config/install/field.field.node.recipe.field_summary.yml @@ -16,5 +16,6 @@ required: true translatable: true default_value: { } default_value_callback: '' -settings: { } +settings: + allowed_formats: { } field_type: text_long