diff --git a/core/lib/Drupal/Core/Config/ConfigInstaller.php b/core/lib/Drupal/Core/Config/ConfigInstaller.php index 0cc5d00..8dbf1a3 100644 --- a/core/lib/Drupal/Core/Config/ConfigInstaller.php +++ b/core/lib/Drupal/Core/Config/ConfigInstaller.php @@ -523,7 +523,7 @@ protected function validateDependencies($config_name, array $data, array $enable if (!empty($list_to_check)) { $missing = array_diff($dependencies, $list_to_check); if (!empty($missing)) { - return FALSE; + return FALSE; } } } diff --git a/core/profiles/standard/config/install/block.block.bartik_account_menu.yml b/core/profiles/standard/config/install/block.block.bartik_account_menu.yml index ef0f44c..090ecaa 100644 --- a/core/profiles/standard/config/install/block.block.bartik_account_menu.yml +++ b/core/profiles/standard/config/install/block.block.bartik_account_menu.yml @@ -1,22 +1,25 @@ +langcode: en +status: true +dependencies: + config: + - system.menu.account + module: + - system + theme: + - bartik id: bartik_account_menu theme: bartik -weight: 0 -status: true -langcode: en region: secondary_menu +weight: 0 +provider: null plugin: 'system_menu_block:account' settings: id: 'system_menu_block:account' label: 'User account menu' provider: system label_display: '0' + cache: + max_age: -1 level: 1 depth: 1 -dependencies: - config: - - system.menu.account - module: - - system - theme: - - bartik -visibility: { } +visibility: { } diff --git a/core/profiles/standard/config/install/block.block.bartik_branding.yml b/core/profiles/standard/config/install/block.block.bartik_branding.yml index 3bed730..87fb1ec 100644 --- a/core/profiles/standard/config/install/block.block.bartik_branding.yml +++ b/core/profiles/standard/config/install/block.block.bartik_branding.yml @@ -1,18 +1,24 @@ +langcode: en +status: true +dependencies: + module: + - system + theme: + - bartik id: bartik_branding theme: bartik -weight: 0 -status: true -langcode: en region: header +weight: 0 +provider: null plugin: system_branding_block settings: id: system_branding_block label: 'Site Branding' provider: system label_display: '0' -dependencies: - module: - - system - theme: - - bartik + cache: + max_age: -1 + use_site_logo: true + use_site_name: true + use_site_slogan: true visibility: { } diff --git a/core/profiles/standard/config/install/block.block.bartik_breadcrumbs.yml b/core/profiles/standard/config/install/block.block.bartik_breadcrumbs.yml index 5589c10..c1fbc89 100644 --- a/core/profiles/standard/config/install/block.block.bartik_breadcrumbs.yml +++ b/core/profiles/standard/config/install/block.block.bartik_breadcrumbs.yml @@ -1,18 +1,21 @@ +langcode: en +status: true +dependencies: + module: + - system + theme: + - bartik id: bartik_breadcrumbs theme: bartik -weight: 0 -status: true -langcode: en region: breadcrumb +weight: 0 +provider: null plugin: system_breadcrumb_block settings: id: system_breadcrumb_block label: Breadcrumbs provider: system label_display: '0' -dependencies: - module: - - system - theme: - - bartik + cache: + max_age: -1 visibility: { } diff --git a/core/profiles/standard/config/install/block.block.bartik_content.yml b/core/profiles/standard/config/install/block.block.bartik_content.yml index 87d320f..5bc7943 100644 --- a/core/profiles/standard/config/install/block.block.bartik_content.yml +++ b/core/profiles/standard/config/install/block.block.bartik_content.yml @@ -1,18 +1,21 @@ +langcode: en +status: true +dependencies: + module: + - system + theme: + - bartik id: bartik_content theme: bartik -weight: 0 -status: true -langcode: en region: content +weight: 0 +provider: null plugin: system_main_block settings: id: system_main_block label: 'Main page content' provider: system label_display: '0' -dependencies: - module: - - system - theme: - - bartik + cache: + max_age: -1 visibility: { } diff --git a/core/profiles/standard/config/install/block.block.bartik_footer.yml b/core/profiles/standard/config/install/block.block.bartik_footer.yml index f3a4dcf..c6f783e 100644 --- a/core/profiles/standard/config/install/block.block.bartik_footer.yml +++ b/core/profiles/standard/config/install/block.block.bartik_footer.yml @@ -1,22 +1,25 @@ +langcode: en +status: true +dependencies: + config: + - system.menu.footer + module: + - system + theme: + - bartik id: bartik_footer theme: bartik -weight: 0 -status: true -langcode: en region: footer_fifth +weight: 0 +provider: null plugin: 'system_menu_block:footer' settings: id: 'system_menu_block:footer' label: 'Footer menu' provider: system label_display: '0' + cache: + max_age: -1 level: 1 depth: 0 -dependencies: - config: - - system.menu.footer - module: - - system - theme: - - bartik visibility: { } diff --git a/core/profiles/standard/config/install/block.block.bartik_help.yml b/core/profiles/standard/config/install/block.block.bartik_help.yml index e93a546..a37f60e 100644 --- a/core/profiles/standard/config/install/block.block.bartik_help.yml +++ b/core/profiles/standard/config/install/block.block.bartik_help.yml @@ -1,18 +1,21 @@ +langcode: en +status: true +dependencies: + module: + - help + theme: + - bartik id: bartik_help theme: bartik -weight: -30 -status: true -langcode: en region: content +weight: -30 +provider: null plugin: help_block settings: id: help_block - label: 'Help' + label: Help provider: help label_display: '0' -dependencies: - module: - - help - theme: - - bartik + cache: + max_age: -1 visibility: { } diff --git a/core/profiles/standard/config/install/block.block.bartik_local_actions.yml b/core/profiles/standard/config/install/block.block.bartik_local_actions.yml index c88b8753..834a1f9 100644 --- a/core/profiles/standard/config/install/block.block.bartik_local_actions.yml +++ b/core/profiles/standard/config/install/block.block.bartik_local_actions.yml @@ -1,15 +1,19 @@ +langcode: en +status: true +dependencies: + theme: + - bartik id: bartik_local_actions theme: bartik -weight: -20 -status: true -langcode: en region: content +weight: -20 +provider: null plugin: local_actions_block settings: id: local_actions_block - label: Primary admin actions + label: 'Primary admin actions' + provider: core label_display: '0' -dependencies: - theme: - - bartik + cache: + max_age: -1 visibility: { } diff --git a/core/profiles/standard/config/install/block.block.bartik_local_tasks.yml b/core/profiles/standard/config/install/block.block.bartik_local_tasks.yml index 1cf88fe..3d5daf1 100644 --- a/core/profiles/standard/config/install/block.block.bartik_local_tasks.yml +++ b/core/profiles/standard/config/install/block.block.bartik_local_tasks.yml @@ -1,15 +1,21 @@ +langcode: en +status: true +dependencies: + theme: + - bartik id: bartik_local_tasks theme: bartik -weight: -40 -status: true -langcode: en region: content +weight: -40 +provider: null plugin: local_tasks_block settings: id: local_tasks_block label: Tabs + provider: core label_display: '0' -dependencies: - theme: - - bartik + cache: + max_age: -1 + primary: true + secondary: true visibility: { } diff --git a/core/profiles/standard/config/install/block.block.bartik_login.yml b/core/profiles/standard/config/install/block.block.bartik_login.yml index 3a5f543..ad56058 100644 --- a/core/profiles/standard/config/install/block.block.bartik_login.yml +++ b/core/profiles/standard/config/install/block.block.bartik_login.yml @@ -1,18 +1,21 @@ +langcode: en +status: true +dependencies: + module: + - user + theme: + - bartik id: bartik_login theme: bartik -weight: 0 -status: true -langcode: en region: sidebar_first +weight: 0 +provider: null plugin: user_login_block settings: id: user_login_block label: 'User login' provider: user label_display: visible -dependencies: - module: - - user - theme: - - bartik + cache: + max_age: -1 visibility: { } diff --git a/core/profiles/standard/config/install/block.block.bartik_main_menu.yml b/core/profiles/standard/config/install/block.block.bartik_main_menu.yml index 32a3d1d..b04cdbc 100644 --- a/core/profiles/standard/config/install/block.block.bartik_main_menu.yml +++ b/core/profiles/standard/config/install/block.block.bartik_main_menu.yml @@ -1,22 +1,25 @@ +langcode: en +status: true +dependencies: + config: + - system.menu.main + module: + - system + theme: + - bartik id: bartik_main_menu theme: bartik -weight: 0 -status: true -langcode: en region: primary_menu +weight: 0 +provider: null plugin: 'system_menu_block:main' settings: id: 'system_menu_block:main' label: 'Main navigation' provider: system label_display: '0' + cache: + max_age: -1 level: 1 depth: 1 -dependencies: - config: - - system.menu.main - module: - - system - theme: - - bartik -visibility: {} +visibility: { } diff --git a/core/profiles/standard/config/install/block.block.bartik_messages.yml b/core/profiles/standard/config/install/block.block.bartik_messages.yml index 0bb9590..01716ee 100644 --- a/core/profiles/standard/config/install/block.block.bartik_messages.yml +++ b/core/profiles/standard/config/install/block.block.bartik_messages.yml @@ -1,17 +1,21 @@ +langcode: en +status: true +dependencies: + module: + - system + theme: + - bartik id: bartik_messages theme: bartik -weight: 0 -status: true -langcode: en region: highlighted +weight: 0 +provider: null plugin: system_messages_block settings: id: system_messages_block label: 'Status messages' provider: system label_display: '0' -dependencies: - module: - - system - theme: - - bartik + cache: + max_age: -1 +visibility: { } diff --git a/core/profiles/standard/config/install/block.block.bartik_powered.yml b/core/profiles/standard/config/install/block.block.bartik_powered.yml index f7e4c90..ff54516 100644 --- a/core/profiles/standard/config/install/block.block.bartik_powered.yml +++ b/core/profiles/standard/config/install/block.block.bartik_powered.yml @@ -1,18 +1,21 @@ +langcode: en +status: true +dependencies: + module: + - system + theme: + - bartik id: bartik_powered theme: bartik -weight: 10 -status: true -langcode: en region: footer_fifth +weight: 10 +provider: null plugin: system_powered_by_block settings: id: system_powered_by_block label: 'Powered by Drupal' provider: system label_display: '0' -dependencies: - module: - - system - theme: - - bartik + cache: + max_age: -1 visibility: { } diff --git a/core/profiles/standard/config/install/block.block.bartik_search.yml b/core/profiles/standard/config/install/block.block.bartik_search.yml index af99dea..18423cc 100644 --- a/core/profiles/standard/config/install/block.block.bartik_search.yml +++ b/core/profiles/standard/config/install/block.block.bartik_search.yml @@ -1,18 +1,21 @@ +langcode: en +status: true +dependencies: + module: + - search + theme: + - bartik id: bartik_search theme: bartik -weight: -1 -status: true -langcode: en region: sidebar_first +weight: -1 +provider: null plugin: search_form_block settings: id: search_form_block label: Search provider: search label_display: visible -dependencies: - module: - - search - theme: - - bartik + cache: + max_age: -1 visibility: { } diff --git a/core/profiles/standard/config/install/block.block.bartik_tools.yml b/core/profiles/standard/config/install/block.block.bartik_tools.yml index af3672d..cd046d5 100644 --- a/core/profiles/standard/config/install/block.block.bartik_tools.yml +++ b/core/profiles/standard/config/install/block.block.bartik_tools.yml @@ -1,22 +1,25 @@ +langcode: en +status: true +dependencies: + config: + - system.menu.tools + module: + - system + theme: + - bartik id: bartik_tools theme: bartik -weight: 0 -status: true -langcode: en region: sidebar_first +weight: 0 +provider: null plugin: 'system_menu_block:tools' settings: id: 'system_menu_block:tools' label: Tools provider: system label_display: visible + cache: + max_age: -1 level: 1 depth: 0 -dependencies: - config: - - system.menu.tools - module: - - system - theme: - - bartik visibility: { } diff --git a/core/profiles/standard/config/install/block.block.seven_breadcrumbs.yml b/core/profiles/standard/config/install/block.block.seven_breadcrumbs.yml index fc95b02..9044ad3 100644 --- a/core/profiles/standard/config/install/block.block.seven_breadcrumbs.yml +++ b/core/profiles/standard/config/install/block.block.seven_breadcrumbs.yml @@ -1,18 +1,21 @@ +langcode: en +status: true +dependencies: + module: + - system + theme: + - seven id: seven_breadcrumbs theme: seven -weight: 0 -status: true -langcode: en region: breadcrumb +weight: 0 +provider: null plugin: system_breadcrumb_block settings: id: system_breadcrumb_block label: Breadcrumbs provider: system label_display: '0' -dependencies: - module: - - system - theme: - - seven + cache: + max_age: -1 visibility: { } diff --git a/core/profiles/standard/config/install/block.block.seven_content.yml b/core/profiles/standard/config/install/block.block.seven_content.yml index dd2bfbe..b99aa1b 100644 --- a/core/profiles/standard/config/install/block.block.seven_content.yml +++ b/core/profiles/standard/config/install/block.block.seven_content.yml @@ -1,18 +1,21 @@ +langcode: en +status: true +dependencies: + module: + - system + theme: + - seven id: seven_content theme: seven -weight: 0 -status: true -langcode: en region: content +weight: 0 +provider: null plugin: system_main_block settings: id: system_main_block label: 'Main page content' provider: system label_display: '0' -dependencies: - module: - - system - theme: - - seven + cache: + max_age: -1 visibility: { } diff --git a/core/profiles/standard/config/install/block.block.seven_help.yml b/core/profiles/standard/config/install/block.block.seven_help.yml index 5bb3529..30680f0 100644 --- a/core/profiles/standard/config/install/block.block.seven_help.yml +++ b/core/profiles/standard/config/install/block.block.seven_help.yml @@ -1,18 +1,21 @@ +langcode: en +status: true +dependencies: + module: + - help + theme: + - seven id: seven_help theme: seven -weight: 0 -status: true -langcode: en region: help +weight: 0 +provider: null plugin: help_block settings: id: help_block - label: 'Help' + label: Help provider: help label_display: '0' -dependencies: - module: - - help - theme: - - seven + cache: + max_age: -1 visibility: { } diff --git a/core/profiles/standard/config/install/block.block.seven_local_actions.yml b/core/profiles/standard/config/install/block.block.seven_local_actions.yml index 999807f..31f23c4 100644 --- a/core/profiles/standard/config/install/block.block.seven_local_actions.yml +++ b/core/profiles/standard/config/install/block.block.seven_local_actions.yml @@ -1,15 +1,19 @@ +langcode: en +status: true +dependencies: + theme: + - seven id: seven_local_actions theme: seven -weight: -10 -status: true -langcode: en region: content +weight: -10 +provider: null plugin: local_actions_block settings: id: local_actions_block - label: Primary admin actions + label: 'Primary admin actions' + provider: core label_display: '0' -dependencies: - theme: - - seven + cache: + max_age: -1 visibility: { } diff --git a/core/profiles/standard/config/install/block.block.seven_login.yml b/core/profiles/standard/config/install/block.block.seven_login.yml index 0a488a7..4423aed 100644 --- a/core/profiles/standard/config/install/block.block.seven_login.yml +++ b/core/profiles/standard/config/install/block.block.seven_login.yml @@ -1,18 +1,21 @@ +langcode: en +status: true +dependencies: + module: + - user + theme: + - seven id: seven_login theme: seven -weight: 10 -status: true -langcode: en region: content +weight: 10 +provider: null plugin: user_login_block settings: id: user_login_block label: 'User login' provider: user label_display: visible -dependencies: - module: - - user - theme: - - seven + cache: + max_age: -1 visibility: { } diff --git a/core/profiles/standard/config/install/block.block.seven_messages.yml b/core/profiles/standard/config/install/block.block.seven_messages.yml index 35c3531..dca7680 100644 --- a/core/profiles/standard/config/install/block.block.seven_messages.yml +++ b/core/profiles/standard/config/install/block.block.seven_messages.yml @@ -1,17 +1,21 @@ +langcode: en +status: true +dependencies: + module: + - system + theme: + - seven id: seven_messages theme: seven -weight: 0 -status: true -langcode: en region: highlighted +weight: 0 +provider: null plugin: system_messages_block settings: id: system_messages_block label: 'Status messages' provider: system label_display: '0' -dependencies: - module: - - system - theme: - - seven + cache: + max_age: -1 +visibility: { } diff --git a/core/profiles/standard/config/install/block.block.seven_primary_local_tasks.yml b/core/profiles/standard/config/install/block.block.seven_primary_local_tasks.yml index 66e8d7b..b08c5c3 100644 --- a/core/profiles/standard/config/install/block.block.seven_primary_local_tasks.yml +++ b/core/profiles/standard/config/install/block.block.seven_primary_local_tasks.yml @@ -1,17 +1,21 @@ +langcode: en +status: true +dependencies: + theme: + - seven id: seven_primary_local_tasks theme: seven -weight: 0 -status: true -langcode: en region: header +weight: 0 +provider: null plugin: local_tasks_block settings: id: local_tasks_block - label: Primary tabs + label: 'Primary tabs' + provider: core label_display: '0' + cache: + max_age: -1 primary: true secondary: false -dependencies: - theme: - - seven visibility: { } diff --git a/core/profiles/standard/config/install/block.block.seven_secondary_local_tasks.yml b/core/profiles/standard/config/install/block.block.seven_secondary_local_tasks.yml index 7824d64..7ff0003 100644 --- a/core/profiles/standard/config/install/block.block.seven_secondary_local_tasks.yml +++ b/core/profiles/standard/config/install/block.block.seven_secondary_local_tasks.yml @@ -1,17 +1,21 @@ +langcode: en +status: true +dependencies: + theme: + - seven id: seven_secondary_local_tasks theme: seven -weight: 0 -status: true -langcode: en region: pre_content +weight: 0 +provider: null plugin: local_tasks_block settings: id: local_tasks_block - label: Secondary tabs + label: 'Secondary tabs' + provider: core label_display: '0' + cache: + max_age: -1 primary: false secondary: true -dependencies: - theme: - - seven visibility: { } diff --git a/core/profiles/standard/config/install/block_content.type.basic.yml b/core/profiles/standard/config/install/block_content.type.basic.yml index 02982e4..f01ced9 100644 --- a/core/profiles/standard/config/install/block_content.type.basic.yml +++ b/core/profiles/standard/config/install/block_content.type.basic.yml @@ -1,5 +1,7 @@ +langcode: en +status: true +dependencies: { } id: basic label: 'Basic block' revision: 0 description: 'A basic block contains a title and a body.' -langcode: en diff --git a/core/profiles/standard/config/install/comment.type.comment.yml b/core/profiles/standard/config/install/comment.type.comment.yml index 6510287..ddcbbc9 100644 --- a/core/profiles/standard/config/install/comment.type.comment.yml +++ b/core/profiles/standard/config/install/comment.type.comment.yml @@ -1,6 +1,7 @@ +langcode: en +status: true +dependencies: { } id: comment label: 'Default comments' -description: 'Allows commenting on content' target_entity_type_id: node -status: true -langcode: en +description: 'Allows commenting on content' diff --git a/core/profiles/standard/config/install/contact.form.feedback.yml b/core/profiles/standard/config/install/contact.form.feedback.yml index 8fb7765..47f0e90 100644 --- a/core/profiles/standard/config/install/contact.form.feedback.yml +++ b/core/profiles/standard/config/install/contact.form.feedback.yml @@ -1,7 +1,9 @@ +langcode: en +status: true +dependencies: { } id: feedback label: 'Website feedback' -recipients: { } +recipients: + - admin@example.com reply: '' weight: 0 -status: true -langcode: en diff --git a/core/profiles/standard/config/install/core.base_field_override.node.page.promote.yml b/core/profiles/standard/config/install/core.base_field_override.node.page.promote.yml index 0f35334..27226a1 100644 --- a/core/profiles/standard/config/install/core.base_field_override.node.page.promote.yml +++ b/core/profiles/standard/config/install/core.base_field_override.node.page.promote.yml @@ -1,4 +1,3 @@ -# Changes the default value of the promote base field on the page node type. langcode: en status: true dependencies: @@ -8,13 +7,15 @@ id: node.page.promote field_name: promote entity_type: node bundle: page -label: Promoted to front page +label: 'Promoted to front page' description: '' required: false -translatable: true +translatable: false default_value: - value: 0 default_value_callback: '' -settings: { } +settings: + on_label: 'On' + off_label: 'Off' field_type: boolean diff --git a/core/profiles/standard/config/install/core.entity_form_display.block_content.basic.default.yml b/core/profiles/standard/config/install/core.entity_form_display.block_content.basic.default.yml index b146f34..ee0c138 100644 --- a/core/profiles/standard/config/install/core.entity_form_display.block_content.basic.default.yml +++ b/core/profiles/standard/config/install/core.entity_form_display.block_content.basic.default.yml @@ -11,13 +11,6 @@ targetEntityType: block_content bundle: basic mode: default content: - info: - type: string_textfield - weight: -5 - settings: - size: 60 - placeholder: '' - third_party_settings: { } body: type: text_textarea_with_summary weight: -4 @@ -26,5 +19,11 @@ content: summary_rows: 3 placeholder: '' third_party_settings: { } + info: + type: string_textfield + weight: -5 + settings: + size: 60 + placeholder: '' + third_party_settings: { } hidden: { } -third_party_settings: { } diff --git a/core/profiles/standard/config/install/core.entity_form_display.comment.comment.default.yml b/core/profiles/standard/config/install/core.entity_form_display.comment.comment.default.yml index 51a97b1..fa5d834 100644 --- a/core/profiles/standard/config/install/core.entity_form_display.comment.comment.default.yml +++ b/core/profiles/standard/config/install/core.entity_form_display.comment.comment.default.yml @@ -13,13 +13,6 @@ mode: default content: author: weight: -2 - subject: - type: string_textfield - weight: 10 - settings: - size: 60 - placeholder: '' - third_party_settings: { } comment_body: type: text_textarea weight: 11 @@ -27,5 +20,11 @@ content: rows: 5 placeholder: '' third_party_settings: { } + subject: + type: string_textfield + weight: 10 + settings: + size: 60 + placeholder: '' + third_party_settings: { } hidden: { } -third_party_settings: { } diff --git a/core/profiles/standard/config/install/core.entity_form_display.node.article.default.yml b/core/profiles/standard/config/install/core.entity_form_display.node.article.default.yml index 64f8efc..189737c 100644 --- a/core/profiles/standard/config/install/core.entity_form_display.node.article.default.yml +++ b/core/profiles/standard/config/install/core.entity_form_display.node.article.default.yml @@ -9,23 +9,14 @@ dependencies: - node.type.article module: - comment - - entity_reference - image - path - - taxonomy - text id: node.article.default targetEntityType: node bundle: article mode: default content: - title: - type: string_textfield - weight: 0 - settings: - size: 60 - placeholder: '' - third_party_settings: { } body: type: text_textarea_with_summary weight: 1 @@ -34,9 +25,14 @@ content: summary_rows: 3 placeholder: '' third_party_settings: { } - field_tags: - type: entity_reference_autocomplete_tags - weight: 3 + comment: + type: comment_default + weight: 20 + settings: { } + third_party_settings: { } + created: + type: datetime_timestamp + weight: 10 settings: { } third_party_settings: { } field_image: @@ -46,17 +42,14 @@ content: progress_indicator: throbber preview_image_style: thumbnail third_party_settings: { } - uid: - type: entity_reference_autocomplete - weight: 5 - settings: - match_operator: CONTAINS - size: 60 - placeholder: '' + field_tags: + type: entity_reference_autocomplete_tags + weight: 3 + settings: { } third_party_settings: { } - created: - type: datetime_timestamp - weight: 10 + path: + type: path + weight: 30 settings: { } third_party_settings: { } promote: @@ -71,15 +64,19 @@ content: display_label: true weight: 16 third_party_settings: { } - comment: - type: comment_default - weight: 20 - settings: { } + title: + type: string_textfield + weight: 0 + settings: + size: 60 + placeholder: '' third_party_settings: { } - path: - type: path - weight: 30 - settings: { } + uid: + type: entity_reference_autocomplete + weight: 5 + settings: + match_operator: CONTAINS + size: 60 + placeholder: '' third_party_settings: { } hidden: { } -third_party_settings: { } diff --git a/core/profiles/standard/config/install/core.entity_form_display.node.page.default.yml b/core/profiles/standard/config/install/core.entity_form_display.node.page.default.yml index 967c74e..1fef06d 100644 --- a/core/profiles/standard/config/install/core.entity_form_display.node.page.default.yml +++ b/core/profiles/standard/config/install/core.entity_form_display.node.page.default.yml @@ -5,7 +5,6 @@ dependencies: - field.field.node.page.body - node.type.page module: - - entity_reference - path - text id: node.page.default @@ -13,19 +12,12 @@ targetEntityType: node bundle: page mode: default content: - title: - type: string_textfield - weight: -5 - settings: - size: 60 - placeholder: '' - third_party_settings: { } - uid: - type: entity_reference_autocomplete - weight: 5 + body: + type: text_textarea_with_summary + weight: 31 settings: - match_operator: CONTAINS - size: 60 + rows: 9 + summary_rows: 3 placeholder: '' third_party_settings: { } created: @@ -33,6 +25,11 @@ content: weight: 10 settings: { } third_party_settings: { } + path: + type: path + weight: 30 + settings: { } + third_party_settings: { } promote: type: boolean_checkbox settings: @@ -45,18 +42,19 @@ content: display_label: true weight: 16 third_party_settings: { } - path: - type: path - weight: 30 - settings: { } + title: + type: string_textfield + weight: -5 + settings: + size: 60 + placeholder: '' third_party_settings: { } - body: - type: text_textarea_with_summary - weight: 31 + uid: + type: entity_reference_autocomplete + weight: 5 settings: - rows: 9 - summary_rows: 3 + match_operator: CONTAINS + size: 60 placeholder: '' third_party_settings: { } hidden: { } -third_party_settings: { } diff --git a/core/profiles/standard/config/install/core.entity_form_display.user.user.default.yml b/core/profiles/standard/config/install/core.entity_form_display.user.user.default.yml index d93cb2c..107d363 100644 --- a/core/profiles/standard/config/install/core.entity_form_display.user.user.default.yml +++ b/core/profiles/standard/config/install/core.entity_form_display.user.user.default.yml @@ -1,8 +1,24 @@ +langcode: en +status: true +dependencies: + config: + - field.field.user.user.user_picture + module: + - image + - user id: user.user.default targetEntityType: user bundle: user mode: default content: + account: + weight: -10 + contact: + weight: 5 + language: + weight: 0 + timezone: + weight: 6 user_picture: type: image_image settings: @@ -10,8 +26,4 @@ content: preview_image_style: thumbnail third_party_settings: { } weight: -1 -status: true -dependencies: - module: - - image - - user +hidden: { } diff --git a/core/profiles/standard/config/install/core.entity_view_display.block_content.basic.default.yml b/core/profiles/standard/config/install/core.entity_view_display.block_content.basic.default.yml index f9ee027..bd52f77 100644 --- a/core/profiles/standard/config/install/core.entity_view_display.block_content.basic.default.yml +++ b/core/profiles/standard/config/install/core.entity_view_display.block_content.basic.default.yml @@ -18,4 +18,3 @@ content: settings: { } third_party_settings: { } hidden: { } -third_party_settings: { } diff --git a/core/profiles/standard/config/install/core.entity_view_display.comment.comment.default.yml b/core/profiles/standard/config/install/core.entity_view_display.comment.comment.default.yml index 0489d23..1ed49ce 100644 --- a/core/profiles/standard/config/install/core.entity_view_display.comment.comment.default.yml +++ b/core/profiles/standard/config/install/core.entity_view_display.comment.comment.default.yml @@ -20,4 +20,3 @@ content: links: weight: 100 hidden: { } -third_party_settings: { } diff --git a/core/profiles/standard/config/install/core.entity_view_display.node.article.default.yml b/core/profiles/standard/config/install/core.entity_view_display.node.article.default.yml index 0689b22..a35424e 100644 --- a/core/profiles/standard/config/install/core.entity_view_display.node.article.default.yml +++ b/core/profiles/standard/config/install/core.entity_view_display.node.article.default.yml @@ -10,7 +10,6 @@ dependencies: module: - comment - image - - taxonomy - text - user id: node.article.default @@ -18,6 +17,19 @@ targetEntityType: node bundle: article mode: default content: + body: + type: text_default + weight: 0 + settings: { } + third_party_settings: { } + label: hidden + comment: + label: above + type: comment_default + weight: 20 + settings: + pager_id: 0 + third_party_settings: { } field_image: type: image weight: -1 @@ -26,12 +38,6 @@ content: image_link: '' third_party_settings: { } label: hidden - body: - type: text_default - weight: 0 - settings: { } - third_party_settings: { } - label: hidden field_tags: type: entity_reference_label weight: 10 @@ -39,17 +45,8 @@ content: settings: link: true third_party_settings: { } - comment: - label: above - type: comment_default - weight: 20 - settings: - pager_id: 0 - third_party_settings: { } links: weight: 100 hidden: - langcode: true field_image: true field_tags: true -third_party_settings: { } diff --git a/core/profiles/standard/config/install/core.entity_view_display.node.article.rss.yml b/core/profiles/standard/config/install/core.entity_view_display.node.article.rss.yml index 4308faf..75a14a3 100644 --- a/core/profiles/standard/config/install/core.entity_view_display.node.article.rss.yml +++ b/core/profiles/standard/config/install/core.entity_view_display.node.article.rss.yml @@ -18,9 +18,7 @@ content: links: weight: 100 hidden: - langcode: true body: true comment: true field_image: true field_tags: true -third_party_settings: { } diff --git a/core/profiles/standard/config/install/core.entity_view_display.node.article.teaser.yml b/core/profiles/standard/config/install/core.entity_view_display.node.article.teaser.yml index 464606d..1cf18dc 100644 --- a/core/profiles/standard/config/install/core.entity_view_display.node.article.teaser.yml +++ b/core/profiles/standard/config/install/core.entity_view_display.node.article.teaser.yml @@ -10,7 +10,6 @@ dependencies: - node.type.article module: - image - - taxonomy - text - user id: node.article.teaser @@ -18,6 +17,13 @@ targetEntityType: node bundle: article mode: teaser content: + body: + type: text_summary_or_trimmed + weight: 0 + settings: + trim_length: 600 + third_party_settings: { } + label: hidden field_image: type: image weight: -1 @@ -26,13 +32,6 @@ content: image_link: content third_party_settings: { } label: hidden - body: - type: text_summary_or_trimmed - weight: 0 - settings: - trim_length: 600 - third_party_settings: { } - label: hidden field_tags: type: entity_reference_label weight: 10 @@ -43,8 +42,6 @@ content: links: weight: 100 hidden: - langcode: true + comment: true field_image: true field_tags: true - comment: true -third_party_settings: { } diff --git a/core/profiles/standard/config/install/core.entity_view_display.node.page.default.yml b/core/profiles/standard/config/install/core.entity_view_display.node.page.default.yml index d331484..dcb2d3e 100644 --- a/core/profiles/standard/config/install/core.entity_view_display.node.page.default.yml +++ b/core/profiles/standard/config/install/core.entity_view_display.node.page.default.yml @@ -20,6 +20,4 @@ content: third_party_settings: { } links: weight: 101 -hidden: - langcode: true -third_party_settings: { } +hidden: { } diff --git a/core/profiles/standard/config/install/core.entity_view_display.node.page.teaser.yml b/core/profiles/standard/config/install/core.entity_view_display.node.page.teaser.yml index 3d4d9ed..f235a10 100644 --- a/core/profiles/standard/config/install/core.entity_view_display.node.page.teaser.yml +++ b/core/profiles/standard/config/install/core.entity_view_display.node.page.teaser.yml @@ -22,6 +22,4 @@ content: third_party_settings: { } links: weight: 101 -hidden: - langcode: true -third_party_settings: { } +hidden: { } diff --git a/core/profiles/standard/config/install/core.entity_view_display.user.user.compact.yml b/core/profiles/standard/config/install/core.entity_view_display.user.user.compact.yml index a46bd1b..9c74439 100644 --- a/core/profiles/standard/config/install/core.entity_view_display.user.user.compact.yml +++ b/core/profiles/standard/config/install/core.entity_view_display.user.user.compact.yml @@ -1,3 +1,12 @@ +langcode: en +status: true +dependencies: + config: + - core.entity_view_mode.user.compact + - field.field.user.user.user_picture + module: + - image + - user id: user.user.compact targetEntityType: user bundle: user @@ -13,10 +22,3 @@ content: label: hidden hidden: member_for: true -status: true -dependencies: - config: - - core.entity_view_mode.user.compact - module: - - image - - user diff --git a/core/profiles/standard/config/install/core.entity_view_display.user.user.default.yml b/core/profiles/standard/config/install/core.entity_view_display.user.user.default.yml index ebf106c..807fefe 100644 --- a/core/profiles/standard/config/install/core.entity_view_display.user.user.default.yml +++ b/core/profiles/standard/config/install/core.entity_view_display.user.user.default.yml @@ -1,8 +1,18 @@ +langcode: en +status: true +dependencies: + config: + - field.field.user.user.user_picture + module: + - image + - user id: user.user.default targetEntityType: user bundle: user mode: default content: + member_for: + weight: 5 user_picture: type: image weight: 0 @@ -11,8 +21,4 @@ content: image_link: content third_party_settings: { } label: hidden -status: true -dependencies: - module: - - image - - user +hidden: { } diff --git a/core/profiles/standard/config/install/editor.editor.basic_html.yml b/core/profiles/standard/config/install/editor.editor.basic_html.yml index 797dfba..966cec6 100644 --- a/core/profiles/standard/config/install/editor.editor.basic_html.yml +++ b/core/profiles/standard/config/install/editor.editor.basic_html.yml @@ -1,3 +1,10 @@ +langcode: en +status: true +dependencies: + config: + - filter.format.basic_html + module: + - ckeditor format: basic_html editor: ckeditor settings: @@ -43,10 +50,3 @@ image_upload: max_dimensions: width: 0 height: 0 -status: true -langcode: en -dependencies: - config: - - filter.format.basic_html - module: - - ckeditor diff --git a/core/profiles/standard/config/install/editor.editor.full_html.yml b/core/profiles/standard/config/install/editor.editor.full_html.yml index 80da28c..f5dd7bc 100644 --- a/core/profiles/standard/config/install/editor.editor.full_html.yml +++ b/core/profiles/standard/config/install/editor.editor.full_html.yml @@ -1,3 +1,10 @@ +langcode: en +status: true +dependencies: + config: + - filter.format.full_html + module: + - ckeditor format: full_html editor: ckeditor settings: @@ -12,7 +19,7 @@ settings: - Strike - Superscript - Subscript - - - + - '-' - RemoveFormat - name: Linking @@ -51,10 +58,3 @@ image_upload: max_dimensions: width: 0 height: 0 -status: true -langcode: en -dependencies: - config: - - filter.format.full_html - module: - - ckeditor diff --git a/core/profiles/standard/config/install/field.field.block_content.basic.body.yml b/core/profiles/standard/config/install/field.field.block_content.basic.body.yml index e115700..89118ef 100644 --- a/core/profiles/standard/config/install/field.field.block_content.basic.body.yml +++ b/core/profiles/standard/config/install/field.field.block_content.basic.body.yml @@ -18,5 +18,4 @@ default_value: { } default_value_callback: '' settings: display_summary: false -third_party_settings: { } field_type: text_with_summary diff --git a/core/profiles/standard/config/install/field.field.comment.comment.comment_body.yml b/core/profiles/standard/config/install/field.field.comment.comment.comment_body.yml index 30aaabe..1337070 100644 --- a/core/profiles/standard/config/install/field.field.comment.comment.comment_body.yml +++ b/core/profiles/standard/config/install/field.field.comment.comment.comment_body.yml @@ -17,5 +17,4 @@ translatable: true default_value: { } default_value_callback: '' settings: { } -third_party_settings: { } field_type: text_long diff --git a/core/profiles/standard/config/install/field.field.node.article.body.yml b/core/profiles/standard/config/install/field.field.node.article.body.yml index e2cdb3a..8f3681d 100644 --- a/core/profiles/standard/config/install/field.field.node.article.body.yml +++ b/core/profiles/standard/config/install/field.field.node.article.body.yml @@ -18,5 +18,4 @@ default_value: { } default_value_callback: '' settings: display_summary: true -third_party_settings: { } field_type: text_with_summary diff --git a/core/profiles/standard/config/install/field.field.node.article.comment.yml b/core/profiles/standard/config/install/field.field.node.article.comment.yml index 932daff..59218f0 100644 --- a/core/profiles/standard/config/install/field.field.node.article.comment.yml +++ b/core/profiles/standard/config/install/field.field.node.article.comment.yml @@ -29,5 +29,4 @@ settings: form_location: true anonymous: 0 preview: 1 -third_party_settings: { } field_type: comment diff --git a/core/profiles/standard/config/install/field.field.node.article.field_image.yml b/core/profiles/standard/config/install/field.field.node.article.field_image.yml index 0a7c7f6..15285d6 100644 --- a/core/profiles/standard/config/install/field.field.node.article.field_image.yml +++ b/core/profiles/standard/config/install/field.field.node.article.field_image.yml @@ -1,10 +1,19 @@ +langcode: en +status: true +dependencies: + config: + - field.storage.node.field_image + - node.type.article + module: + - image id: node.article.field_image +field_name: field_image entity_type: node bundle: article -field_name: field_image label: Image description: '' required: false +translatable: true default_value: { } default_value_callback: '' settings: @@ -23,10 +32,6 @@ settings: title: '' width: null height: null -status: true -langcode: en + handler: 'default:node' + handler_settings: { } field_type: image -dependencies: - config: - - field.storage.node.field_image - - node.type.article diff --git a/core/profiles/standard/config/install/field.field.node.article.field_tags.yml b/core/profiles/standard/config/install/field.field.node.article.field_tags.yml index d69a558..77eb70c 100644 --- a/core/profiles/standard/config/install/field.field.node.article.field_tags.yml +++ b/core/profiles/standard/config/install/field.field.node.article.field_tags.yml @@ -1,26 +1,27 @@ +langcode: en +status: true +dependencies: + config: + - field.storage.node.field_tags + - node.type.article + module: + - entity_reference id: node.article.field_tags +field_name: field_tags entity_type: node bundle: article -field_name: field_tags -field_type: entity_reference label: Tags description: 'Enter a comma-separated list. For example: Amsterdam, Mexico City, "Cleveland, Ohio"' required: false +translatable: true default_value: { } default_value_callback: '' settings: - handler: default + handler: 'default:taxonomy_term' handler_settings: target_bundles: tags: tags sort: field: _none auto_create: true -status: true -langcode: en -dependencies: - config: - - field.storage.node.field_tags - - node.type.article - module: - - entity_reference +field_type: entity_reference diff --git a/core/profiles/standard/config/install/field.field.node.page.body.yml b/core/profiles/standard/config/install/field.field.node.page.body.yml index 57bb0b0..6c09432 100644 --- a/core/profiles/standard/config/install/field.field.node.page.body.yml +++ b/core/profiles/standard/config/install/field.field.node.page.body.yml @@ -18,5 +18,4 @@ default_value: { } default_value_callback: '' settings: display_summary: true -third_party_settings: { } field_type: text_with_summary diff --git a/core/profiles/standard/config/install/field.field.user.user.user_picture.yml b/core/profiles/standard/config/install/field.field.user.user.user_picture.yml index e1d8b64..a59642e 100644 --- a/core/profiles/standard/config/install/field.field.user.user.user_picture.yml +++ b/core/profiles/standard/config/install/field.field.user.user.user_picture.yml @@ -1,12 +1,19 @@ -id: user.user.user_picture -status: true langcode: en +status: true +dependencies: + config: + - field.storage.user.user_picture + module: + - image + - user +id: user.user.user_picture +field_name: user_picture entity_type: user bundle: user -field_name: user_picture label: Picture description: 'Your virtual face or picture.' required: false +translatable: false default_value: { } default_value_callback: '' settings: @@ -25,7 +32,6 @@ settings: height: null alt_field_required: false title_field_required: false + handler: 'default:node' + handler_settings: { } field_type: image -dependencies: - config: - - field.storage.user.user_picture diff --git a/core/profiles/standard/config/install/field.storage.node.field_image.yml b/core/profiles/standard/config/install/field.storage.node.field_image.yml index eb40f37..9c1a644 100644 --- a/core/profiles/standard/config/install/field.storage.node.field_image.yml +++ b/core/profiles/standard/config/install/field.storage.node.field_image.yml @@ -1,8 +1,13 @@ +langcode: en +status: true +dependencies: + module: + - node + - image id: node.field_image field_name: field_image entity_type: node type: image -module: image settings: uri_scheme: public default_image: @@ -11,16 +16,15 @@ settings: title: '' width: null height: null + target_type: file + display_field: false + display_default: false + target_bundle: null +module: image locked: false cardinality: 1 translatable: true indexes: target_id: - target_id -status: true -langcode: en -dependencies: - module: - - node - - image persist_with_no_fields: false diff --git a/core/profiles/standard/config/install/field.storage.node.field_tags.yml b/core/profiles/standard/config/install/field.storage.node.field_tags.yml index 71e0425..ca20381 100644 --- a/core/profiles/standard/config/install/field.storage.node.field_tags.yml +++ b/core/profiles/standard/config/install/field.storage.node.field_tags.yml @@ -1,17 +1,18 @@ +langcode: en +status: true +dependencies: + module: + - node + - taxonomy id: node.field_tags field_name: field_tags entity_type: node type: entity_reference -module: taxonomy settings: target_type: taxonomy_term +module: entity_reference locked: false cardinality: -1 translatable: true -status: true -langcode: en -dependencies: - module: - - node - - taxonomy +indexes: { } persist_with_no_fields: false diff --git a/core/profiles/standard/config/install/field.storage.user.user_picture.yml b/core/profiles/standard/config/install/field.storage.user.user_picture.yml index b7e3141..48da557 100644 --- a/core/profiles/standard/config/install/field.storage.user.user_picture.yml +++ b/core/profiles/standard/config/install/field.storage.user.user_picture.yml @@ -1,6 +1,10 @@ -id: user.user_picture -status: true langcode: en +status: true +dependencies: + module: + - image + - user +id: user.user_picture field_name: user_picture entity_type: user type: image @@ -12,14 +16,15 @@ settings: title: '' width: null height: null + target_type: file + display_field: false + display_default: false + target_bundle: null module: image locked: false cardinality: 1 +translatable: true indexes: target_id: - target_id -dependencies: - module: - - image - - user persist_with_no_fields: false diff --git a/core/profiles/standard/config/install/filter.format.basic_html.yml b/core/profiles/standard/config/install/filter.format.basic_html.yml index 21a4656..a2562d2 100644 --- a/core/profiles/standard/config/install/filter.format.basic_html.yml +++ b/core/profiles/standard/config/install/filter.format.basic_html.yml @@ -1,6 +1,10 @@ -format: basic_html -name: 'Basic HTML' +langcode: en status: true +dependencies: + module: + - editor +name: 'Basic HTML' +format: basic_html weight: 0 roles: - authenticated @@ -44,7 +48,3 @@ filters: status: true weight: 11 settings: { } -langcode: en -dependencies: - module: - - editor diff --git a/core/profiles/standard/config/install/filter.format.full_html.yml b/core/profiles/standard/config/install/filter.format.full_html.yml index cfdf9e2..e5febb2 100644 --- a/core/profiles/standard/config/install/filter.format.full_html.yml +++ b/core/profiles/standard/config/install/filter.format.full_html.yml @@ -1,6 +1,10 @@ -format: full_html -name: 'Full HTML' +langcode: en status: true +dependencies: + module: + - editor +name: 'Full HTML' +format: full_html weight: 1 roles: - administrator @@ -29,7 +33,3 @@ filters: status: true weight: 11 settings: { } -langcode: en -dependencies: - module: - - editor diff --git a/core/profiles/standard/config/install/filter.format.restricted_html.yml b/core/profiles/standard/config/install/filter.format.restricted_html.yml index 0e40378..cbd40c0 100644 --- a/core/profiles/standard/config/install/filter.format.restricted_html.yml +++ b/core/profiles/standard/config/install/filter.format.restricted_html.yml @@ -1,6 +1,8 @@ -format: restricted_html -name: 'Restricted HTML' +langcode: en status: true +dependencies: { } +name: 'Restricted HTML' +format: restricted_html weight: 0 roles: - anonymous @@ -33,4 +35,3 @@ filters: status: true weight: 10 settings: { } -langcode: en diff --git a/core/profiles/standard/config/install/node.type.article.yml b/core/profiles/standard/config/install/node.type.article.yml index 7cb127d..cc5f7b8 100644 --- a/core/profiles/standard/config/install/node.type.article.yml +++ b/core/profiles/standard/config/install/node.type.article.yml @@ -1,9 +1,10 @@ -type: article +langcode: en +status: true +dependencies: { } name: Article +type: article description: 'Use articles for time-sensitive content like news, press releases or blog posts.' help: '' new_revision: false preview_mode: 1 display_submitted: true -status: true -langcode: en diff --git a/core/profiles/standard/config/install/node.type.page.yml b/core/profiles/standard/config/install/node.type.page.yml index f9b4353..70bed48 100644 --- a/core/profiles/standard/config/install/node.type.page.yml +++ b/core/profiles/standard/config/install/node.type.page.yml @@ -1,9 +1,10 @@ -type: page +langcode: en +status: true +dependencies: { } name: 'Basic page' +type: page description: 'Use basic pages for your static content, such as an ''About us'' page.' help: '' new_revision: false preview_mode: 1 display_submitted: false -status: true -langcode: en diff --git a/core/profiles/standard/config/install/rdf.mapping.node.article.yml b/core/profiles/standard/config/install/rdf.mapping.node.article.yml index f1b167e..7242759 100644 --- a/core/profiles/standard/config/install/rdf.mapping.node.article.yml +++ b/core/profiles/standard/config/install/rdf.mapping.node.article.yml @@ -1,3 +1,10 @@ +langcode: en +status: true +dependencies: + config: + - node.type.article + module: + - node id: node.article targetEntityType: node bundle: article @@ -26,22 +33,17 @@ fieldMappings: comment: properties: - 'schema:comment' - mapping_type: 'rel' + mapping_type: rel comment_count: properties: - 'schema:interactionCount' datatype_callback: callable: 'Drupal\rdf\SchemaOrgDataConverter::interactionCount' arguments: - interaction_type: 'UserComments' + interaction_type: UserComments field_image: properties: - 'schema:image' field_tags: properties: - 'schema:about' -dependencies: - config: - - node.type.article - module: - - node diff --git a/core/profiles/standard/config/install/rdf.mapping.node.page.yml b/core/profiles/standard/config/install/rdf.mapping.node.page.yml index 166bd2a..dd6535c 100644 --- a/core/profiles/standard/config/install/rdf.mapping.node.page.yml +++ b/core/profiles/standard/config/install/rdf.mapping.node.page.yml @@ -1,3 +1,10 @@ +langcode: en +status: true +dependencies: + config: + - node.type.page + module: + - node id: node.page targetEntityType: node bundle: page @@ -23,16 +30,11 @@ fieldMappings: uid: properties: - 'schema:author' - mapping_type: 'rel' + mapping_type: rel comment_count: properties: - 'schema:interactionCount' datatype_callback: callable: 'Drupal\rdf\SchemaOrgDataConverter::interactionCount' arguments: - interaction_type: 'UserComments' -dependencies: - config: - - node.type.page - module: - - node + interaction_type: UserComments diff --git a/core/profiles/standard/config/install/rdf.mapping.taxonomy_term.tags.yml b/core/profiles/standard/config/install/rdf.mapping.taxonomy_term.tags.yml index 9c7b4dc..46b43f1 100644 --- a/core/profiles/standard/config/install/rdf.mapping.taxonomy_term.tags.yml +++ b/core/profiles/standard/config/install/rdf.mapping.taxonomy_term.tags.yml @@ -1,3 +1,10 @@ +langcode: en +status: true +dependencies: + config: + - taxonomy.vocabulary.tags + module: + - taxonomy id: taxonomy_term.tags targetEntityType: taxonomy_term bundle: tags @@ -10,8 +17,3 @@ fieldMappings: description: properties: - 'schema:description' -dependencies: - config: - - taxonomy.vocabulary.tags - module: - - taxonomy diff --git a/core/profiles/standard/config/install/taxonomy.vocabulary.tags.yml b/core/profiles/standard/config/install/taxonomy.vocabulary.tags.yml index 0f8001e..8fac8f5 100644 --- a/core/profiles/standard/config/install/taxonomy.vocabulary.tags.yml +++ b/core/profiles/standard/config/install/taxonomy.vocabulary.tags.yml @@ -1,7 +1,8 @@ -vid: tags +langcode: en +status: true +dependencies: { } name: Tags +vid: tags description: 'Use tags to group articles on similar topics into categories.' hierarchy: 0 weight: 0 -status: true -langcode: en diff --git a/core/profiles/standard/config/install/user.role.administrator.yml b/core/profiles/standard/config/install/user.role.administrator.yml index daf926b..e5453b7 100644 --- a/core/profiles/standard/config/install/user.role.administrator.yml +++ b/core/profiles/standard/config/install/user.role.administrator.yml @@ -1,5 +1,8 @@ +langcode: en +status: true +dependencies: { } id: administrator label: Administrator weight: 2 -langcode: en is_admin: true +permissions: { } diff --git a/core/tests/Drupal/KernelTests/Config/DefaultConfigTest.php b/core/tests/Drupal/KernelTests/Config/DefaultConfigTest.php index 6e979bc..5679f65 100644 --- a/core/tests/Drupal/KernelTests/Config/DefaultConfigTest.php +++ b/core/tests/Drupal/KernelTests/Config/DefaultConfigTest.php @@ -7,12 +7,14 @@ namespace Drupal\KernelTests\Config; +use Drupal\Component\Diff\Diff; use Drupal\Component\FileCache\FileCacheFactory; use Drupal\Core\Config\FileStorage; use Drupal\Core\Config\InstallStorage; use Drupal\Core\Config\StorageInterface; use Drupal\Core\Site\Settings; use Drupal\KernelTests\KernelTestBase; +use Drupal\user\Entity\User; /** * Tests that the installed config matches the default config. @@ -51,7 +53,7 @@ protected function setUp() { /** * @dataProvider providerTestModuleConfig */ - public function testModuleConfig($module) { + public function ptestModuleConfig($module) { /** @var \Drupal\Core\Extension\ModuleInstallerInterface $module_installer */ $module_installer = $this->container->get('module_installer'); /** @var \Drupal\Core\Config\StorageInterface $active_config_storage */ @@ -85,60 +87,7 @@ public function testModuleConfig($module) { // Compare the installed config with the one in the module directory. foreach ($module_config_storage->listAll() as $config_name) { $result = $config_manager->diff($module_config_storage, $active_config_storage, $config_name); - foreach ($result->getEdits() as $op) { - switch (get_class($op)) { - case 'Drupal\Component\Diff\Engine\DiffOpCopy': - // Nothing to do, a copy is what we expect. - break; - case 'Drupal\Component\Diff\Engine\DiffOpChange': - // Its not part of the skipped config, so we can directly throw the - // exception. - if (!in_array($config_name, array_keys($skipped_config))) { - throw new \Exception($config_name . ': ' . var_export($op, TRUE)); - } - - // Allow to skip entire config files. - if ($skipped_config[$config_name] === TRUE) { - continue; - } - - // Allow to skip some specific lines of imported config files. - // Ensure that the only changed lines are the ones we marked as - // skipped. - $all_skipped = TRUE; - - foreach ($op->closing as $closing) { - // Skip some of the changes, as they are caused by module install - // code. - $found = FALSE; - if (!empty($skipped_config[$config_name])) { - foreach ($skipped_config[$config_name] as $line) { - if (strpos($closing, $line) !== FALSE) { - $found = TRUE; - break; - } - } - } - $all_skipped = $all_skipped && $found; - } - - if (!$all_skipped) { - throw new \Exception($config_name . ': ' . var_export($op, TRUE)); - } - break; - case 'Drupal\Component\Diff\Engine\DiffOpAdd': - foreach ($op->closing as $closing) { - if (strpos($closing, 'uuid: ') === 0) { - continue; - } - throw new \Exception($config_name . ': ' . var_export($op, TRUE)); - } - break; - default: - throw new \Exception($config_name . ': ' . var_export($op, TRUE)); - break; - } - } + $this->assertConfigDiff($result, $config_name, $skipped_config); } } @@ -211,4 +160,124 @@ public function providerTestModuleConfig() { return $data; } + public function testDefaultConfigInstallProfile($profile = 'standard') { + /** @var \Drupal\Core\Extension\ModuleInstallerInterface $module_installer */ + $module_installer = $this->container->get('module_installer'); + /** @var \Drupal\Core\Config\StorageInterface $active_config_storage */ + $active_config_storage = $this->container->get('config.storage'); + /** @var \Drupal\Core\Config\ConfigManagerInterface $config_manager */ + $config_manager = $this->container->get('config.manager'); + /** @var \Drupal\Core\Config\ConfigInstallerInterface $config_installer */ + $config_installer = $this->container->get('config.installer'); + /** @var \Drupal\Core\Extension\ThemeInstallerInterface $theme_installer */ + $theme_installer = $this->container->get('theme_installer'); + /** @var \Drupal\Core\Extension\ModuleHandlerInterface $module_handler */ + $module_handler = $this->container->get('module_handler'); + + $this->installConfig(['system', 'user']); + + // Register the profile manually. + $settings = Settings::getAll(); + $settings['install_profile'] = $profile; + new Settings($settings); + drupal_static_reset('system_rebuild_module_data'); + $module_handler->addProfile($profile, 'core/profiles/' . $profile); + + // Create the needed tables / default content from system and user. + $this->installEntitySchema('user'); + $this->installSchema('system', 'sequences'); + User::create(['name' => 'admin'])->save(); + + // The install profile might depend on themes as well. + $theme_installer->install(['bartik', 'seven']); + + // Finally install the theme and validate the config by diffing. + $module_installer->install([$profile], TRUE); + $config_installer->installOptionalConfig(); + + $default_install_path = 'core/profiles/' . $profile . '/' . InstallStorage::CONFIG_INSTALL_DIRECTORY; + $profile_config_storage = new FileStorage($default_install_path, StorageInterface::DEFAULT_COLLECTION); + + // Standard.install + $skipped_config = []; + + // @FIXME figure out how to let standard.install override existing config. + $skipped_config['system.cron'][] = 'autorun'; + $skipped_config['system.theme'][] = 'admin: '; + $skipped_config['system.theme'][] = 'default: '; + + foreach ($profile_config_storage->listAll() as $config_name) { + $result = $config_manager->diff($profile_config_storage, $active_config_storage, $config_name); + $this->assertConfigDiff($result, $config_name, $skipped_config); + } + } + + /** + * Ensures that a specific config diff does not contain unwanted changes. + * + * @param \Drupal\Component\Diff\Diff $result + * @param $config_name + * @param array $skipped_config + * + * @throws \Exception + */ + protected function assertConfigDiff(Diff $result, $config_name, array $skipped_config) { + foreach ($result->getEdits() as $op) { + switch (get_class($op)) { + case 'Drupal\Component\Diff\Engine\DiffOpCopy': + // Nothing to do, a copy is what we expect. + break; + case 'Drupal\Component\Diff\Engine\DiffOpChange': + // Its not part of the skipped config, so we can directly throw the + // exception. + if (!in_array($config_name, array_keys($skipped_config))) { + throw new \Exception($config_name . ': ' . var_export($op, TRUE)); + } + + // Allow to skip entire config files. + if ($skipped_config[$config_name] === TRUE) { + continue; + } + + // Allow to skip some specific lines of imported config files. + // Ensure that the only changed lines are the ones we marked as + // skipped. + $all_skipped = TRUE; + + foreach ($op->closing as $closing) { + // Skip some of the changes, as they are caused by module install + // code. + $found = FALSE; + if (!empty($skipped_config[$config_name])) { + foreach ($skipped_config[$config_name] as $line) { + if (strpos($closing, $line) !== FALSE) { + $found = TRUE; + break; + } + } + } + $all_skipped = $all_skipped && $found; + } + + if (!$all_skipped) { + throw new \Exception($config_name . ': ' . var_export($op, TRUE)); + } + break; + case 'Drupal\Component\Diff\Engine\DiffOpAdd': + foreach ($op->closing as $closing) { + // The UUIDs don't exist in the default config. + if (strpos($closing, 'uuid: ') === 0) { + continue; + } + throw new \Exception($config_name . ': ' . var_export($op, TRUE)); + } + break; + default: + throw new \Exception($config_name . ': ' . var_export($op, TRUE)); + break; + } + } + } + } +