From c1aa46fbe6394e2ac0149810cb5292efc6fd3520 Mon Sep 17 00:00:00 2001 From: catch <catch@35733.no-reply.drupal.org> Date: Wed, 23 Sep 2015 12:37:12 +0200 Subject: [PATCH] Issue #2567183 by dawehner, pfrenssen, hussainweb: Re-export all built-in configuration in core --- core/lib/Drupal/Core/Config/ConfigManager.php | 8 +- ...ggregator_feed.aggregator_feed.default.yml | 21 ++-- ...ggregator_feed.aggregator_feed.summary.yml | 18 +-- ...ggregator_item.aggregator_item.summary.yml | 20 +-- ...tity_view_mode.aggregator_feed.summary.yml | 9 +- ...tity_view_mode.aggregator_item.summary.yml | 9 +- .../views.view.aggregator_rss_feed.yml | 15 +++ .../views.view.aggregator_sources.yml | 5 + ...re.entity_view_mode.block_content.full.yml | 9 +- .../optional/views.view.block_content.yml | 4 + ....base_field_override.node.book.promote.yml | 7 +- ....entity_form_display.node.book.default.yml | 35 +++--- ....entity_view_display.node.book.default.yml | 4 +- ...e.entity_view_display.node.book.teaser.yml | 4 +- .../core.entity_view_mode.node.print.yml | 9 +- .../install/field.field.node.book.body.yml | 1 - .../book/config/install/node.type.book.yml | 2 - .../core.entity_view_mode.comment.full.yml | 9 +- .../system.action.comment_publish_action.yml | 11 +- .../system.action.comment_save_action.yml | 11 +- ...system.action.comment_unpublish_action.yml | 11 +- .../optional/views.view.comments_recent.yml | 14 +++ .../config/install/contact.form.personal.yml | 5 +- .../file/config/optional/views.view.files.yml | 18 ++- .../install/filter.format.plain_text.yml | 9 +- ...base_field_override.node.forum.promote.yml | 7 +- ...e.base_field_override.node.forum.title.yml | 2 +- ..._display.comment.comment_forum.default.yml | 15 ++- ...entity_form_display.node.forum.default.yml | 43 ++++--- ...m_display.taxonomy_term.forums.default.yml | 14 +-- ..._display.comment.comment_forum.default.yml | 1 - ...entity_view_display.node.forum.default.yml | 18 ++- ....entity_view_display.node.forum.teaser.yml | 16 ++- ...w_display.taxonomy_term.forums.default.yml | 4 +- ...eld.comment.comment_forum.comment_body.yml | 1 - .../install/field.field.node.forum.body.yml | 1 - .../field.field.node.forum.comment_forum.yml | 1 - ...field.field.node.forum.taxonomy_forums.yml | 3 +- ...d.taxonomy_term.forums.forum_container.yml | 5 +- .../field.storage.node.taxonomy_forums.yml | 2 +- .../install/taxonomy.vocabulary.forums.yml | 1 - .../optional/rdf.mapping.node.forum.yml | 16 +-- .../rdf.mapping.taxonomy_term.forums.yml | 12 +- .../config/install/image.style.large.yml | 8 +- .../config/install/image.style.medium.yml | 8 +- .../config/install/image.style.thumbnail.yml | 8 +- .../config/install/language.entity.en.yml | 7 +- .../config/install/language.entity.und.yml | 9 +- .../config/install/language.entity.zxx.yml | 9 +- .../optional/tour.tour.language-add.yml | 6 +- .../optional/tour.tour.language-edit.yml | 6 +- .../config/optional/tour.tour.language.yml | 6 +- .../config/optional/tour.tour.locale.yml | 22 ++-- .../core.entity_view_mode.node.full.yml | 9 +- .../core.entity_view_mode.node.rss.yml | 9 +- ...ore.entity_view_mode.node.search_index.yml | 9 +- ...re.entity_view_mode.node.search_result.yml | 9 +- .../core.entity_view_mode.node.teaser.yml | 9 +- .../system.action.node_delete_action.yml | 11 +- .../system.action.node_make_sticky_action.yml | 11 +- ...ystem.action.node_make_unsticky_action.yml | 11 +- .../system.action.node_promote_action.yml | 11 +- .../system.action.node_publish_action.yml | 11 +- .../system.action.node_save_action.yml | 11 +- .../system.action.node_unpromote_action.yml | 11 +- .../system.action.node_unpublish_action.yml | 11 +- .../optional/search.page.node_search.yml | 10 +- .../config/optional/views.view.archive.yml | 27 ++++ .../config/optional/views.view.content.yml | 10 +- .../config/optional/views.view.frontpage.yml | 23 ++++ .../config/optional/views.view.glossary.yml | 30 +++++ .../config/install/shortcut.set.default.yml | 3 + .../install/core.date_format.fallback.yml | 5 +- .../install/core.date_format.html_date.yml | 5 +- .../core.date_format.html_datetime.yml | 5 +- .../install/core.date_format.html_month.yml | 5 +- .../install/core.date_format.html_time.yml | 5 +- .../install/core.date_format.html_week.yml | 5 +- .../install/core.date_format.html_year.yml | 7 +- .../core.date_format.html_yearless_date.yml | 5 +- .../config/install/core.date_format.long.yml | 5 +- .../install/core.date_format.medium.yml | 5 +- .../config/install/core.date_format.short.yml | 5 +- .../config/install/system.menu.account.yml | 4 +- .../config/install/system.menu.admin.yml | 4 +- .../config/install/system.menu.footer.yml | 4 +- .../config/install/system.menu.main.yml | 4 +- .../config/install/system.menu.tools.yml | 4 +- .../ConfigAfterInstallerTestBase.php | 49 ++++++++ .../Tests/Installer/MinimalInstallerTest.php | 33 +++++ .../Tests/Installer/StandardInstallerTest.php | 23 +++- ...re.entity_view_mode.taxonomy_term.full.yml | 9 +- .../optional/views.view.taxonomy_term.yml | 5 + .../core.entity_form_mode.user.register.yml | 8 +- .../core.entity_view_mode.user.compact.yml | 9 +- .../core.entity_view_mode.user.full.yml | 9 +- .../system.action.user_block_user_action.yml | 11 +- .../system.action.user_cancel_user_action.yml | 11 +- ...system.action.user_unblock_user_action.yml | 11 +- .../config/install/user.role.anonymous.yml | 7 +- .../install/user.role.authenticated.yml | 7 +- .../config/optional/rdf.mapping.user.user.yml | 8 +- .../optional/views.view.user_admin_people.yml | 20 ++- .../config/optional/views.view.who_s_new.yml | 14 +++ .../optional/views.view.who_s_online.yml | 14 +++ .../config/optional/tour.tour.views-ui.yml | 19 +-- .../install/block.block.stark_admin.yml | 22 ++-- .../install/block.block.stark_branding.yml | 20 +-- .../block.block.stark_local_actions.yml | 16 +-- .../install/block.block.stark_local_tasks.yml | 16 ++- .../install/block.block.stark_login.yml | 18 +-- .../install/block.block.stark_messages.yml | 18 +-- .../install/block.block.stark_tools.yml | 22 ++-- .../block.block.bartik_account_menu.yml | 23 ++-- .../install/block.block.bartik_branding.yml | 20 +-- .../block.block.bartik_breadcrumbs.yml | 17 +-- .../install/block.block.bartik_content.yml | 17 +-- .../install/block.block.bartik_footer.yml | 21 ++-- .../install/block.block.bartik_help.yml | 19 +-- .../block.block.bartik_local_actions.yml | 16 +-- .../block.block.bartik_local_tasks.yml | 16 ++- .../install/block.block.bartik_login.yml | 17 +-- .../install/block.block.bartik_main_menu.yml | 23 ++-- .../install/block.block.bartik_messages.yml | 18 +-- .../install/block.block.bartik_powered.yml | 17 +-- .../install/block.block.bartik_search.yml | 17 +-- .../install/block.block.bartik_tools.yml | 21 ++-- .../install/block.block.seven_breadcrumbs.yml | 17 +-- .../install/block.block.seven_content.yml | 17 +-- .../config/install/block.block.seven_help.yml | 19 +-- .../block.block.seven_local_actions.yml | 16 +-- .../install/block.block.seven_login.yml | 17 +-- .../install/block.block.seven_messages.yml | 18 +-- .../block.block.seven_primary_local_tasks.yml | 16 +-- ...lock.block.seven_secondary_local_tasks.yml | 16 +-- .../install/block_content.type.basic.yml | 4 +- .../config/install/comment.type.comment.yml | 7 +- .../config/install/contact.form.feedback.yml | 8 +- ....base_field_override.node.page.promote.yml | 9 +- ...rm_display.block_content.basic.default.yml | 15 ++- ...y_form_display.comment.comment.default.yml | 15 ++- ...tity_form_display.node.article.default.yml | 59 +++++---- ....entity_form_display.node.page.default.yml | 44 ++++--- ....entity_form_display.user.user.default.yml | 22 +++- ...ew_display.block_content.basic.default.yml | 1 - ...y_view_display.comment.comment.default.yml | 1 - ...tity_view_display.node.article.default.yml | 22 ++-- ...e.entity_view_display.node.article.rss.yml | 2 - ...ntity_view_display.node.article.teaser.yml | 19 ++- ....entity_view_display.node.page.default.yml | 4 +- ...e.entity_view_display.node.page.teaser.yml | 4 +- ....entity_view_display.user.user.compact.yml | 16 +-- ....entity_view_display.user.user.default.yml | 16 ++- .../install/editor.editor.basic_html.yml | 14 +-- .../install/editor.editor.full_html.yml | 16 +-- .../field.field.block_content.basic.body.yml | 1 - ...eld.field.comment.comment.comment_body.yml | 1 - .../install/field.field.node.article.body.yml | 1 - .../field.field.node.article.comment.yml | 1 - .../field.field.node.article.field_image.yml | 19 +-- .../field.field.node.article.field_tags.yml | 23 ++-- .../install/field.field.node.page.body.yml | 1 - .../field.field.user.user.user_picture.yml | 18 ++- .../field.storage.node.field_image.yml | 18 +-- .../install/field.storage.node.field_tags.yml | 15 +-- .../field.storage.user.user_picture.yml | 17 ++- .../install/filter.format.basic_html.yml | 12 +- .../install/filter.format.full_html.yml | 12 +- .../install/filter.format.restricted_html.yml | 7 +- .../config/install/node.type.article.yml | 7 +- .../config/install/node.type.page.yml | 7 +- .../install/rdf.mapping.node.article.yml | 16 +-- .../config/install/rdf.mapping.node.page.yml | 16 +-- .../rdf.mapping.taxonomy_term.tags.yml | 12 +- .../install/taxonomy.vocabulary.tags.yml | 7 +- .../install/user.role.administrator.yml | 5 +- core/scripts/run-tests.sh | 6 + .../Drupal/KernelTests/AssertConfigTrait.php | 92 ++++++++++++++ .../KernelTests/Config/DefaultConfigTest.php | 119 ++++++++++++++++++ 179 files changed, 1505 insertions(+), 855 deletions(-) create mode 100644 core/modules/system/src/Tests/Installer/ConfigAfterInstallerTestBase.php create mode 100644 core/modules/system/src/Tests/Installer/MinimalInstallerTest.php create mode 100644 core/tests/Drupal/KernelTests/AssertConfigTrait.php create mode 100644 core/tests/Drupal/KernelTests/Config/DefaultConfigTest.php diff --git a/core/lib/Drupal/Core/Config/ConfigManager.php b/core/lib/Drupal/Core/Config/ConfigManager.php index fb8f6589b389..eb5949749832 100644 --- a/core/lib/Drupal/Core/Config/ConfigManager.php +++ b/core/lib/Drupal/Core/Config/ConfigManager.php @@ -155,11 +155,15 @@ public function diff(StorageInterface $source_storage, StorageInterface $target_ // Check for new or removed files. if ($source_data === array('false')) { // Added file. - $source_data = array($this->t('File added')); + // Cast the result of t() to a string, as the diff engine doesn't know + // about objects. + $source_data = array((string) $this->t('File added')); } if ($target_data === array('false')) { // Deleted file. - $target_data = array($this->t('File removed')); + // Cast the result of t() to a string, as the diff engine doesn't know + // about objects. + $target_data = array((string) $this->t('File removed')); } return new Diff($source_data, $target_data); diff --git a/core/modules/aggregator/config/install/core.entity_view_display.aggregator_feed.aggregator_feed.default.yml b/core/modules/aggregator/config/install/core.entity_view_display.aggregator_feed.aggregator_feed.default.yml index 58e360f4557c..e3c23cfb1370 100644 --- a/core/modules/aggregator/config/install/core.entity_view_display.aggregator_feed.aggregator_feed.default.yml +++ b/core/modules/aggregator/config/install/core.entity_view_display.aggregator_feed.aggregator_feed.default.yml @@ -1,31 +1,32 @@ +langcode: en +status: true +dependencies: + module: + - aggregator id: aggregator_feed.aggregator_feed.default targetEntityType: aggregator_feed bundle: aggregator_feed mode: default -status: true content: - items: - weight: 0 checked: type: timestamp_ago weight: 1 settings: { } third_party_settings: { } label: inline - image: - weight: 2 description: weight: 3 + feed_icon: + weight: 5 + image: + weight: 2 + items: + weight: 0 link: type: uri_link weight: 4 settings: { } third_party_settings: { } label: inline - feed_icon: - weight: 5 hidden: more_link: true -dependencies: - module: - - aggregator diff --git a/core/modules/aggregator/config/install/core.entity_view_display.aggregator_feed.aggregator_feed.summary.yml b/core/modules/aggregator/config/install/core.entity_view_display.aggregator_feed.aggregator_feed.summary.yml index 4c840d5affe6..40425f2f5431 100644 --- a/core/modules/aggregator/config/install/core.entity_view_display.aggregator_feed.aggregator_feed.summary.yml +++ b/core/modules/aggregator/config/install/core.entity_view_display.aggregator_feed.aggregator_feed.summary.yml @@ -1,22 +1,22 @@ +langcode: en +status: true +dependencies: + config: + - core.entity_view_mode.aggregator_feed.summary + module: + - aggregator id: aggregator_feed.aggregator_feed.summary targetEntityType: aggregator_feed bundle: aggregator_feed mode: summary -status: true content: items: weight: 0 more_link: weight: 1 hidden: - link: true checked: true description: true - image: true feed_icon: true -status: true -dependencies: - config: - - core.entity_view_mode.aggregator_feed.summary - module: - - aggregator + image: true + link: true diff --git a/core/modules/aggregator/config/install/core.entity_view_display.aggregator_item.aggregator_item.summary.yml b/core/modules/aggregator/config/install/core.entity_view_display.aggregator_item.aggregator_item.summary.yml index 6cb424d3de48..39536e4df380 100644 --- a/core/modules/aggregator/config/install/core.entity_view_display.aggregator_item.aggregator_item.summary.yml +++ b/core/modules/aggregator/config/install/core.entity_view_display.aggregator_item.aggregator_item.summary.yml @@ -1,20 +1,20 @@ +langcode: en +status: true +dependencies: + config: + - core.entity_view_mode.aggregator_item.summary + module: + - aggregator + - entity_reference id: aggregator_item.aggregator_item.summary targetEntityType: aggregator_item bundle: aggregator_item mode: summary -status: true content: timestamp: weight: 0 hidden: - link: true author: true - feed: true description: true -status: true -dependencies: - config: - - core.entity_view_mode.aggregator_item.summary - module: - - aggregator - - entity_reference + feed: true + link: true diff --git a/core/modules/aggregator/config/install/core.entity_view_mode.aggregator_feed.summary.yml b/core/modules/aggregator/config/install/core.entity_view_mode.aggregator_feed.summary.yml index c1b4bb8643b2..b5df8cbabddf 100644 --- a/core/modules/aggregator/config/install/core.entity_view_mode.aggregator_feed.summary.yml +++ b/core/modules/aggregator/config/install/core.entity_view_mode.aggregator_feed.summary.yml @@ -1,8 +1,9 @@ -id: aggregator_feed.summary -label: Summary +langcode: en status: true -cache: true -targetEntityType: aggregator_feed dependencies: module: - aggregator +id: aggregator_feed.summary +label: Summary +targetEntityType: aggregator_feed +cache: true diff --git a/core/modules/aggregator/config/install/core.entity_view_mode.aggregator_item.summary.yml b/core/modules/aggregator/config/install/core.entity_view_mode.aggregator_item.summary.yml index 58d6c7dbaafe..b7a3a96ebf87 100644 --- a/core/modules/aggregator/config/install/core.entity_view_mode.aggregator_item.summary.yml +++ b/core/modules/aggregator/config/install/core.entity_view_mode.aggregator_item.summary.yml @@ -1,8 +1,9 @@ -id: aggregator_item.summary -label: Summary +langcode: en status: true -cache: true -targetEntityType: aggregator_item dependencies: module: - aggregator +id: aggregator_item.summary +label: Summary +targetEntityType: aggregator_item +cache: true diff --git a/core/modules/aggregator/config/optional/views.view.aggregator_rss_feed.yml b/core/modules/aggregator/config/optional/views.view.aggregator_rss_feed.yml index a3c0b719299d..97698649f879 100644 --- a/core/modules/aggregator/config/optional/views.view.aggregator_rss_feed.yml +++ b/core/modules/aggregator/config/optional/views.view.aggregator_rss_feed.yml @@ -129,6 +129,14 @@ display: empty: { } relationships: { } arguments: { } + display_extenders: { } + cache_metadata: + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - url.query_args + - user.permissions + cacheable: false feed_items: display_plugin: feed id: feed_items @@ -139,3 +147,10 @@ display: display_description: '' defaults: arguments: true + display_extenders: { } + cache_metadata: + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - user.permissions + cacheable: false diff --git a/core/modules/aggregator/config/optional/views.view.aggregator_sources.yml b/core/modules/aggregator/config/optional/views.view.aggregator_sources.yml index cccd45b992cd..bb0f0ab5a439 100644 --- a/core/modules/aggregator/config/optional/views.view.aggregator_sources.yml +++ b/core/modules/aggregator/config/optional/views.view.aggregator_sources.yml @@ -141,6 +141,8 @@ display: contexts: - 'languages:language_content' - 'languages:language_interface' + - url.query_args + - user.permissions cacheable: false feed_1: display_plugin: feed @@ -398,6 +400,7 @@ display: contexts: - 'languages:language_content' - 'languages:language_interface' + - user.permissions cacheable: false page_1: display_plugin: page @@ -418,4 +421,6 @@ display: contexts: - 'languages:language_content' - 'languages:language_interface' + - url.query_args + - user.permissions cacheable: false diff --git a/core/modules/block_content/config/install/core.entity_view_mode.block_content.full.yml b/core/modules/block_content/config/install/core.entity_view_mode.block_content.full.yml index c558d549fb0e..30115ee4eb00 100644 --- a/core/modules/block_content/config/install/core.entity_view_mode.block_content.full.yml +++ b/core/modules/block_content/config/install/core.entity_view_mode.block_content.full.yml @@ -1,8 +1,9 @@ -id: block_content.full -label: Full +langcode: en status: false -cache: true -targetEntityType: block_content dependencies: module: - block_content +id: block_content.full +label: Full +targetEntityType: block_content +cache: true diff --git a/core/modules/block_content/config/optional/views.view.block_content.yml b/core/modules/block_content/config/optional/views.view.block_content.yml index f25b3ab3404a..27ecb0cb9666 100644 --- a/core/modules/block_content/config/optional/views.view.block_content.yml +++ b/core/modules/block_content/config/optional/views.view.block_content.yml @@ -466,6 +466,8 @@ display: - 'languages:language_content' - 'languages:language_interface' - url + - url.query_args + - user.permissions cacheable: false page_1: display_plugin: page @@ -488,4 +490,6 @@ display: - 'languages:language_content' - 'languages:language_interface' - url + - url.query_args + - user.permissions cacheable: false diff --git a/core/modules/book/config/install/core.base_field_override.node.book.promote.yml b/core/modules/book/config/install/core.base_field_override.node.book.promote.yml index a368aed8ea4b..79e2ed677e84 100644 --- a/core/modules/book/config/install/core.base_field_override.node.book.promote.yml +++ b/core/modules/book/config/install/core.base_field_override.node.book.promote.yml @@ -7,7 +7,7 @@ id: node.book.promote field_name: promote entity_type: node bundle: book -label: Promoted to front page +label: 'Promoted to front page' description: '' required: false translatable: true @@ -15,6 +15,7 @@ default_value: - value: 0 default_value_callback: '' -settings: { } -third_party_settings: { } +settings: + on_label: 'On' + off_label: 'Off' field_type: boolean diff --git a/core/modules/book/config/install/core.entity_form_display.node.book.default.yml b/core/modules/book/config/install/core.entity_form_display.node.book.default.yml index 0b7ccf615649..7c2144d98409 100644 --- a/core/modules/book/config/install/core.entity_form_display.node.book.default.yml +++ b/core/modules/book/config/install/core.entity_form_display.node.book.default.yml @@ -12,19 +12,12 @@ targetEntityType: node bundle: book 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: 26 settings: - match_operator: CONTAINS - size: 60 + rows: 9 + summary_rows: 3 placeholder: '' third_party_settings: { } created: @@ -44,13 +37,19 @@ content: display_label: true weight: 16 third_party_settings: { } - body: - type: text_textarea_with_summary - weight: 26 + title: + type: string_textfield + weight: -5 settings: - rows: 9 - summary_rows: 3 + size: 60 + placeholder: '' + third_party_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/modules/book/config/install/core.entity_view_display.node.book.default.yml b/core/modules/book/config/install/core.entity_view_display.node.book.default.yml index ff46c58adbd8..729516eb8b4b 100644 --- a/core/modules/book/config/install/core.entity_view_display.node.book.default.yml +++ b/core/modules/book/config/install/core.entity_view_display.node.book.default.yml @@ -20,6 +20,4 @@ content: third_party_settings: { } links: weight: 101 -hidden: - langcode: true -third_party_settings: { } +hidden: { } diff --git a/core/modules/book/config/install/core.entity_view_display.node.book.teaser.yml b/core/modules/book/config/install/core.entity_view_display.node.book.teaser.yml index 61920f4fa995..fb22db652389 100644 --- a/core/modules/book/config/install/core.entity_view_display.node.book.teaser.yml +++ b/core/modules/book/config/install/core.entity_view_display.node.book.teaser.yml @@ -22,6 +22,4 @@ content: third_party_settings: { } links: weight: 101 -hidden: - langcode: true -third_party_settings: { } +hidden: { } diff --git a/core/modules/book/config/install/core.entity_view_mode.node.print.yml b/core/modules/book/config/install/core.entity_view_mode.node.print.yml index de47b0cbe3d6..270694929432 100644 --- a/core/modules/book/config/install/core.entity_view_mode.node.print.yml +++ b/core/modules/book/config/install/core.entity_view_mode.node.print.yml @@ -1,8 +1,5 @@ -id: node.print -label: Print +langcode: en status: false -cache: true -targetEntityType: node dependencies: module: - book @@ -10,3 +7,7 @@ dependencies: enforced: module: - book +id: node.print +label: Print +targetEntityType: node +cache: true diff --git a/core/modules/book/config/install/field.field.node.book.body.yml b/core/modules/book/config/install/field.field.node.book.body.yml index 4c128b60f081..b97b9fa8b9e6 100644 --- a/core/modules/book/config/install/field.field.node.book.body.yml +++ b/core/modules/book/config/install/field.field.node.book.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/modules/book/config/install/node.type.book.yml b/core/modules/book/config/install/node.type.book.yml index a5076b2107ba..531677fd15d0 100644 --- a/core/modules/book/config/install/node.type.book.yml +++ b/core/modules/book/config/install/node.type.book.yml @@ -11,7 +11,5 @@ type: book description: '<em>Books</em> have a built-in hierarchical navigation. Use for handbooks or tutorials.' help: '' new_revision: false -display_submitted: true preview_mode: 1 display_submitted: true -third_party_settings: { } diff --git a/core/modules/comment/config/install/core.entity_view_mode.comment.full.yml b/core/modules/comment/config/install/core.entity_view_mode.comment.full.yml index c30d77dcf459..b2013dd09123 100644 --- a/core/modules/comment/config/install/core.entity_view_mode.comment.full.yml +++ b/core/modules/comment/config/install/core.entity_view_mode.comment.full.yml @@ -1,8 +1,9 @@ -id: comment.full -label: 'Full comment' +langcode: en status: false -cache: true -targetEntityType: comment dependencies: module: - comment +id: comment.full +label: 'Full comment' +targetEntityType: comment +cache: true diff --git a/core/modules/comment/config/install/system.action.comment_publish_action.yml b/core/modules/comment/config/install/system.action.comment_publish_action.yml index e1e12ad338d6..8fbd48d349dc 100644 --- a/core/modules/comment/config/install/system.action.comment_publish_action.yml +++ b/core/modules/comment/config/install/system.action.comment_publish_action.yml @@ -1,9 +1,10 @@ -id: comment_publish_action -label: 'Publish comment' -status: true langcode: en -type: comment -plugin: comment_publish_action +status: true dependencies: module: - comment +id: comment_publish_action +label: 'Publish comment' +type: comment +plugin: comment_publish_action +configuration: { } diff --git a/core/modules/comment/config/install/system.action.comment_save_action.yml b/core/modules/comment/config/install/system.action.comment_save_action.yml index 8c605b0fefe9..640d2811cd5e 100644 --- a/core/modules/comment/config/install/system.action.comment_save_action.yml +++ b/core/modules/comment/config/install/system.action.comment_save_action.yml @@ -1,9 +1,10 @@ -id: comment_save_action -label: 'Save comment' -status: true langcode: en -type: comment -plugin: comment_save_action +status: true dependencies: module: - comment +id: comment_save_action +label: 'Save comment' +type: comment +plugin: comment_save_action +configuration: { } diff --git a/core/modules/comment/config/install/system.action.comment_unpublish_action.yml b/core/modules/comment/config/install/system.action.comment_unpublish_action.yml index 5e8e1697732d..99902e8be397 100644 --- a/core/modules/comment/config/install/system.action.comment_unpublish_action.yml +++ b/core/modules/comment/config/install/system.action.comment_unpublish_action.yml @@ -1,9 +1,10 @@ -id: comment_unpublish_action -label: 'Unpublish comment' -status: true langcode: en -type: comment -plugin: comment_unpublish_action +status: true dependencies: module: - comment +id: comment_unpublish_action +label: 'Unpublish comment' +type: comment +plugin: comment_unpublish_action +configuration: { } diff --git a/core/modules/comment/config/optional/views.view.comments_recent.yml b/core/modules/comment/config/optional/views.view.comments_recent.yml index 5e2bb894b106..9688145919a9 100644 --- a/core/modules/comment/config/optional/views.view.comments_recent.yml +++ b/core/modules/comment/config/optional/views.view.comments_recent.yml @@ -235,6 +235,13 @@ display: content: 'No comments available.' tokenize: false plugin_id: text_custom + display_extenders: { } + cache_metadata: + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - user.permissions + cacheable: false block_1: display_plugin: block id: block_1 @@ -245,3 +252,10 @@ display: block_category: 'Lists (Views)' allow: items_per_page: true + display_extenders: { } + cache_metadata: + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - user.permissions + cacheable: false diff --git a/core/modules/contact/config/install/contact.form.personal.yml b/core/modules/contact/config/install/contact.form.personal.yml index 2fc59f196842..c766fddb3dd6 100644 --- a/core/modules/contact/config/install/contact.form.personal.yml +++ b/core/modules/contact/config/install/contact.form.personal.yml @@ -1,7 +1,8 @@ +langcode: en +status: true +dependencies: { } id: personal label: 'Personal contact form' recipients: { } reply: '' weight: 0 -status: true -langcode: en diff --git a/core/modules/file/config/optional/views.view.files.yml b/core/modules/file/config/optional/views.view.files.yml index 5d83195fdf97..869b7768f78c 100644 --- a/core/modules/file/config/optional/views.view.files.yml +++ b/core/modules/file/config/optional/views.view.files.yml @@ -395,8 +395,8 @@ display: type: boolean settings: format: custom - format_custom_false: 'Temporary' - format_custom_true: 'Permanent' + format_custom_false: Temporary + format_custom_true: Permanent plugin_id: field entity_type: file entity_field: status @@ -718,8 +718,11 @@ display: display_extenders: { } cache_metadata: contexts: - - languages + - 'languages:language_content' + - 'languages:language_interface' - url + - url.query_args + - user.permissions cacheable: false page_1: display_plugin: page @@ -751,8 +754,11 @@ display: display_extenders: { } cache_metadata: contexts: - - languages + - 'languages:language_content' + - 'languages:language_interface' - url + - url.query_args + - user.permissions cacheable: false page_2: display_plugin: page @@ -1105,6 +1111,8 @@ display: display_extenders: { } cache_metadata: contexts: - - languages + - 'languages:language_interface' - url + - url.query_args + - user.permissions cacheable: false diff --git a/core/modules/filter/config/install/filter.format.plain_text.yml b/core/modules/filter/config/install/filter.format.plain_text.yml index 5de8988b874d..4abd6552bc1f 100644 --- a/core/modules/filter/config/install/filter.format.plain_text.yml +++ b/core/modules/filter/config/install/filter.format.plain_text.yml @@ -2,13 +2,12 @@ # - is accessible to all users. # - is secure, using very basic formatting only. # - may be modified by installation profiles to have other properties. -format: plain_text -name: 'Plain text' +langcode: en status: true +dependencies: { } +name: 'Plain text' +format: plain_text weight: 10 -roles: - - anonymous - - authenticated filters: # Escape all HTML. filter_html_escape: diff --git a/core/modules/forum/config/install/core.base_field_override.node.forum.promote.yml b/core/modules/forum/config/install/core.base_field_override.node.forum.promote.yml index 11dbe49b1785..be6e1a338df9 100644 --- a/core/modules/forum/config/install/core.base_field_override.node.forum.promote.yml +++ b/core/modules/forum/config/install/core.base_field_override.node.forum.promote.yml @@ -1,4 +1,3 @@ -# Changes the default value of the promote base field on the forum node type. langcode: en status: true dependencies: @@ -8,7 +7,7 @@ id: node.forum.promote field_name: promote entity_type: node bundle: forum -label: Promoted to front page +label: 'Promoted to front page' description: '' required: false translatable: true @@ -16,5 +15,7 @@ default_value: - value: 0 default_value_callback: '' -settings: { } +settings: + on_label: 'On' + off_label: 'Off' field_type: boolean diff --git a/core/modules/forum/config/install/core.base_field_override.node.forum.title.yml b/core/modules/forum/config/install/core.base_field_override.node.forum.title.yml index fa69248db99c..71c5835d3147 100644 --- a/core/modules/forum/config/install/core.base_field_override.node.forum.title.yml +++ b/core/modules/forum/config/install/core.base_field_override.node.forum.title.yml @@ -1,4 +1,3 @@ -# Changes the label of the title base field on the forum node type. langcode: en status: true dependencies: @@ -9,6 +8,7 @@ field_name: title entity_type: node bundle: forum label: Subject +description: '' required: true translatable: true default_value: { } diff --git a/core/modules/forum/config/install/core.entity_form_display.comment.comment_forum.default.yml b/core/modules/forum/config/install/core.entity_form_display.comment.comment_forum.default.yml index 85a039308f2b..a09c30b0069e 100644 --- a/core/modules/forum/config/install/core.entity_form_display.comment.comment_forum.default.yml +++ b/core/modules/forum/config/install/core.entity_form_display.comment.comment_forum.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/modules/forum/config/install/core.entity_form_display.node.forum.default.yml b/core/modules/forum/config/install/core.entity_form_display.node.forum.default.yml index 8731335ef0b1..d4e7c4dc9f30 100644 --- a/core/modules/forum/config/install/core.entity_form_display.node.forum.default.yml +++ b/core/modules/forum/config/install/core.entity_form_display.node.forum.default.yml @@ -15,20 +15,18 @@ targetEntityType: node bundle: forum mode: default content: - title: - type: string_textfield - weight: -5 + body: + type: text_textarea_with_summary + weight: 27 settings: - size: 60 + rows: 9 + summary_rows: 3 placeholder: '' third_party_settings: { } - uid: - type: entity_reference_autocomplete - weight: 5 - settings: - match_operator: CONTAINS - size: 60 - placeholder: '' + comment_forum: + type: comment_default + weight: 20 + settings: { } third_party_settings: { } created: type: datetime_timestamp @@ -47,23 +45,24 @@ content: display_label: true weight: 16 third_party_settings: { } - comment_forum: - type: comment_default - weight: 20 - settings: { } - third_party_settings: { } taxonomy_forums: type: options_select weight: 26 settings: { } third_party_settings: { } - body: - type: text_textarea_with_summary - weight: 27 + title: + type: string_textfield + weight: -5 settings: - rows: 9 - summary_rows: 3 + size: 60 + placeholder: '' + third_party_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/modules/forum/config/install/core.entity_form_display.taxonomy_term.forums.default.yml b/core/modules/forum/config/install/core.entity_form_display.taxonomy_term.forums.default.yml index dfca8466a140..a2f890d30872 100644 --- a/core/modules/forum/config/install/core.entity_form_display.taxonomy_term.forums.default.yml +++ b/core/modules/forum/config/install/core.entity_form_display.taxonomy_term.forums.default.yml @@ -10,6 +10,11 @@ targetEntityType: taxonomy_term bundle: forums mode: default content: + description: + type: text_textfield + weight: 0 + settings: { } + third_party_settings: { } name: type: string_textfield weight: -5 @@ -17,10 +22,5 @@ content: size: 60 placeholder: '' third_party_settings: { } - description: - type: text_textfield - weight: 0 - settings: { } - third_party_settings: { } -hidden: { } -third_party_settings: { } +hidden: + forum_container: true diff --git a/core/modules/forum/config/install/core.entity_view_display.comment.comment_forum.default.yml b/core/modules/forum/config/install/core.entity_view_display.comment.comment_forum.default.yml index 624024f2263d..f4f0112f588b 100644 --- a/core/modules/forum/config/install/core.entity_view_display.comment.comment_forum.default.yml +++ b/core/modules/forum/config/install/core.entity_view_display.comment.comment_forum.default.yml @@ -20,4 +20,3 @@ content: links: weight: 100 hidden: { } -third_party_settings: { } diff --git a/core/modules/forum/config/install/core.entity_view_display.node.forum.default.yml b/core/modules/forum/config/install/core.entity_view_display.node.forum.default.yml index 8da8d3b401c1..69fdb79bf78f 100644 --- a/core/modules/forum/config/install/core.entity_view_display.node.forum.default.yml +++ b/core/modules/forum/config/install/core.entity_view_display.node.forum.default.yml @@ -16,13 +16,6 @@ targetEntityType: node bundle: forum mode: default content: - taxonomy_forums: - type: entity_reference_label - weight: -1 - label: above - settings: - link: true - third_party_settings: { } body: label: hidden type: text_default @@ -38,6 +31,11 @@ content: third_party_settings: { } links: weight: 100 -hidden: - langcode: true -third_party_settings: { } + taxonomy_forums: + type: entity_reference_label + weight: -1 + label: above + settings: + link: true + third_party_settings: { } +hidden: { } diff --git a/core/modules/forum/config/install/core.entity_view_display.node.forum.teaser.yml b/core/modules/forum/config/install/core.entity_view_display.node.forum.teaser.yml index 2333ad8bd0ca..6eb1a0c4ba83 100644 --- a/core/modules/forum/config/install/core.entity_view_display.node.forum.teaser.yml +++ b/core/modules/forum/config/install/core.entity_view_display.node.forum.teaser.yml @@ -16,13 +16,6 @@ targetEntityType: node bundle: forum mode: teaser content: - taxonomy_forums: - type: entity_reference_label - weight: 10 - label: above - settings: - link: true - third_party_settings: { } body: label: hidden type: text_summary_or_trimmed @@ -32,7 +25,12 @@ content: third_party_settings: { } links: weight: 101 + taxonomy_forums: + type: entity_reference_label + weight: 10 + label: above + settings: + link: true + third_party_settings: { } hidden: - langcode: true comment_forum: true -third_party_settings: { } diff --git a/core/modules/forum/config/install/core.entity_view_display.taxonomy_term.forums.default.yml b/core/modules/forum/config/install/core.entity_view_display.taxonomy_term.forums.default.yml index b3d695bac218..07b131a64b1b 100644 --- a/core/modules/forum/config/install/core.entity_view_display.taxonomy_term.forums.default.yml +++ b/core/modules/forum/config/install/core.entity_view_display.taxonomy_term.forums.default.yml @@ -16,5 +16,5 @@ content: settings: { } third_party_settings: { } label: above -hidden: { } -third_party_settings: { } +hidden: + forum_container: true diff --git a/core/modules/forum/config/install/field.field.comment.comment_forum.comment_body.yml b/core/modules/forum/config/install/field.field.comment.comment_forum.comment_body.yml index d0b64729d94b..215199cc2270 100644 --- a/core/modules/forum/config/install/field.field.comment.comment_forum.comment_body.yml +++ b/core/modules/forum/config/install/field.field.comment.comment_forum.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/modules/forum/config/install/field.field.node.forum.body.yml b/core/modules/forum/config/install/field.field.node.forum.body.yml index 279f160f2149..af6f7ad123a7 100644 --- a/core/modules/forum/config/install/field.field.node.forum.body.yml +++ b/core/modules/forum/config/install/field.field.node.forum.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/modules/forum/config/install/field.field.node.forum.comment_forum.yml b/core/modules/forum/config/install/field.field.node.forum.comment_forum.yml index 6153e7273b1b..8812273ee67c 100644 --- a/core/modules/forum/config/install/field.field.node.forum.comment_forum.yml +++ b/core/modules/forum/config/install/field.field.node.forum.comment_forum.yml @@ -29,5 +29,4 @@ settings: form_location: true anonymous: 0 preview: 1 -third_party_settings: { } field_type: comment diff --git a/core/modules/forum/config/install/field.field.node.forum.taxonomy_forums.yml b/core/modules/forum/config/install/field.field.node.forum.taxonomy_forums.yml index b5e73320835a..1f7bc5c6b768 100644 --- a/core/modules/forum/config/install/field.field.node.forum.taxonomy_forums.yml +++ b/core/modules/forum/config/install/field.field.node.forum.taxonomy_forums.yml @@ -17,12 +17,11 @@ translatable: true default_value: { } default_value_callback: '' settings: - handler: default + handler: 'default:taxonomy_term' handler_settings: target_bundles: forums: forums sort: field: _none auto_create: true -third_party_settings: { } field_type: entity_reference diff --git a/core/modules/forum/config/install/field.field.taxonomy_term.forums.forum_container.yml b/core/modules/forum/config/install/field.field.taxonomy_term.forums.forum_container.yml index 8565083cc8ef..4cf3e8333b34 100644 --- a/core/modules/forum/config/install/field.field.taxonomy_term.forums.forum_container.yml +++ b/core/modules/forum/config/install/field.field.taxonomy_term.forums.forum_container.yml @@ -17,7 +17,6 @@ default_value: value: 0 default_value_callback: '' settings: - on_label: Yes - off_label: No -third_party_settings: { } + on_label: 'Yes' + off_label: 'No' field_type: boolean diff --git a/core/modules/forum/config/install/field.storage.node.taxonomy_forums.yml b/core/modules/forum/config/install/field.storage.node.taxonomy_forums.yml index 0f1e8ae3b29e..7ff1c58fbfef 100644 --- a/core/modules/forum/config/install/field.storage.node.taxonomy_forums.yml +++ b/core/modules/forum/config/install/field.storage.node.taxonomy_forums.yml @@ -10,7 +10,7 @@ entity_type: node type: entity_reference settings: target_type: taxonomy_term -module: taxonomy +module: entity_reference locked: false cardinality: 1 translatable: true diff --git a/core/modules/forum/config/install/taxonomy.vocabulary.forums.yml b/core/modules/forum/config/install/taxonomy.vocabulary.forums.yml index cfbcca558306..311f6fca6a0e 100644 --- a/core/modules/forum/config/install/taxonomy.vocabulary.forums.yml +++ b/core/modules/forum/config/install/taxonomy.vocabulary.forums.yml @@ -11,4 +11,3 @@ vid: forums description: 'Forum navigation vocabulary' hierarchy: 1 weight: -10 -third_party_settings: { } diff --git a/core/modules/forum/config/optional/rdf.mapping.node.forum.yml b/core/modules/forum/config/optional/rdf.mapping.node.forum.yml index 4d159daaab7f..2fbd52109918 100644 --- a/core/modules/forum/config/optional/rdf.mapping.node.forum.yml +++ b/core/modules/forum/config/optional/rdf.mapping.node.forum.yml @@ -1,3 +1,10 @@ +langcode: en +status: true +dependencies: + config: + - node.type.forum + module: + - node id: node.forum targetEntityType: node bundle: forum @@ -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.forum - module: - - node + interaction_type: UserComments diff --git a/core/modules/forum/config/optional/rdf.mapping.taxonomy_term.forums.yml b/core/modules/forum/config/optional/rdf.mapping.taxonomy_term.forums.yml index 78408d82f4a9..6daa517c4d0b 100644 --- a/core/modules/forum/config/optional/rdf.mapping.taxonomy_term.forums.yml +++ b/core/modules/forum/config/optional/rdf.mapping.taxonomy_term.forums.yml @@ -1,3 +1,10 @@ +langcode: en +status: true +dependencies: + config: + - taxonomy.vocabulary.forums + module: + - taxonomy id: taxonomy_term.forums targetEntityType: taxonomy_term bundle: forums @@ -11,8 +18,3 @@ fieldMappings: description: properties: - 'schema:description' -dependencies: - config: - - taxonomy.vocabulary.forums - module: - - taxonomy diff --git a/core/modules/image/config/install/image.style.large.yml b/core/modules/image/config/install/image.style.large.yml index 17e908b00078..c7935849a93b 100644 --- a/core/modules/image/config/install/image.style.large.yml +++ b/core/modules/image/config/install/image.style.large.yml @@ -1,12 +1,14 @@ +langcode: en +status: true +dependencies: { } name: large label: 'Large (480×480)' effects: ddd73aa7-4bd6-4c85-b600-bdf2b1628d1d: + uuid: ddd73aa7-4bd6-4c85-b600-bdf2b1628d1d id: image_scale + weight: 0 data: width: 480 height: 480 upscale: false - weight: 0 - uuid: ddd73aa7-4bd6-4c85-b600-bdf2b1628d1d -langcode: en diff --git a/core/modules/image/config/install/image.style.medium.yml b/core/modules/image/config/install/image.style.medium.yml index 72ed32794aa3..775a511b0c1d 100644 --- a/core/modules/image/config/install/image.style.medium.yml +++ b/core/modules/image/config/install/image.style.medium.yml @@ -1,12 +1,14 @@ +langcode: en +status: true +dependencies: { } name: medium label: 'Medium (220×220)' effects: bddf0d06-42f9-4c75-a700-a33cafa25ea0: + uuid: bddf0d06-42f9-4c75-a700-a33cafa25ea0 id: image_scale + weight: 0 data: width: 220 height: 220 upscale: false - weight: 0 - uuid: bddf0d06-42f9-4c75-a700-a33cafa25ea0 -langcode: en diff --git a/core/modules/image/config/install/image.style.thumbnail.yml b/core/modules/image/config/install/image.style.thumbnail.yml index 4869191c34b3..73dc9b85c2bf 100644 --- a/core/modules/image/config/install/image.style.thumbnail.yml +++ b/core/modules/image/config/install/image.style.thumbnail.yml @@ -1,12 +1,14 @@ +langcode: en +status: true +dependencies: { } name: thumbnail label: 'Thumbnail (100×100)' effects: 1cfec298-8620-4749-b100-ccb6c4500779: + uuid: 1cfec298-8620-4749-b100-ccb6c4500779 id: image_scale + weight: 0 data: width: 100 height: 100 upscale: false - weight: 0 - uuid: 1cfec298-8620-4749-b100-ccb6c4500779 -langcode: en diff --git a/core/modules/language/config/install/language.entity.en.yml b/core/modules/language/config/install/language.entity.en.yml index 34b6c290789a..7c3305f51599 100644 --- a/core/modules/language/config/install/language.entity.en.yml +++ b/core/modules/language/config/install/language.entity.en.yml @@ -1,7 +1,8 @@ +langcode: en +status: true +dependencies: { } id: en label: English -direction: 'ltr' +direction: ltr weight: 0 locked: false -status: true -langcode: en diff --git a/core/modules/language/config/install/language.entity.und.yml b/core/modules/language/config/install/language.entity.und.yml index 67caf48e8f37..86b51e58028e 100644 --- a/core/modules/language/config/install/language.entity.und.yml +++ b/core/modules/language/config/install/language.entity.und.yml @@ -1,7 +1,8 @@ +langcode: en +status: true +dependencies: { } id: und label: 'Not specified' -direction: 'ltr' -weight: 1 +direction: ltr +weight: 2 locked: true -status: true -langcode: en diff --git a/core/modules/language/config/install/language.entity.zxx.yml b/core/modules/language/config/install/language.entity.zxx.yml index 7f02cf7ea82e..8b0c8625f59b 100644 --- a/core/modules/language/config/install/language.entity.zxx.yml +++ b/core/modules/language/config/install/language.entity.zxx.yml @@ -1,7 +1,8 @@ +langcode: en +status: true +dependencies: { } id: zxx label: 'Not applicable' -direction: 'ltr' -weight: 2 +direction: ltr +weight: 3 locked: true -status: true -langcode: en diff --git a/core/modules/language/config/optional/tour.tour.language-add.yml b/core/modules/language/config/optional/tour.tour.language-add.yml index 8f39e49a8200..65c5dda0a54c 100644 --- a/core/modules/language/config/optional/tour.tour.language-add.yml +++ b/core/modules/language/config/optional/tour.tour.language-add.yml @@ -1,7 +1,9 @@ +langcode: en +status: true +dependencies: { } id: language-add -module: language label: 'Adding languages' -langcode: en +module: language routes: - route_name: language.add tips: diff --git a/core/modules/language/config/optional/tour.tour.language-edit.yml b/core/modules/language/config/optional/tour.tour.language-edit.yml index a166ce19514c..0d37ead7f261 100644 --- a/core/modules/language/config/optional/tour.tour.language-edit.yml +++ b/core/modules/language/config/optional/tour.tour.language-edit.yml @@ -1,7 +1,9 @@ +langcode: en +status: true +dependencies: { } id: language-edit +label: 'Editing languages' module: language -label: Editing languages -langcode: en routes: - route_name: entity.configurable_language.edit_form tips: diff --git a/core/modules/language/config/optional/tour.tour.language.yml b/core/modules/language/config/optional/tour.tour.language.yml index ffc855de6fc6..7ee56b41a1db 100644 --- a/core/modules/language/config/optional/tour.tour.language.yml +++ b/core/modules/language/config/optional/tour.tour.language.yml @@ -1,7 +1,9 @@ +langcode: en +status: true +dependencies: { } id: language -module: language label: Language -langcode: en +module: language routes: - route_name: entity.configurable_language.collection tips: diff --git a/core/modules/locale/config/optional/tour.tour.locale.yml b/core/modules/locale/config/optional/tour.tour.locale.yml index 0fe00d13560d..041a62352d50 100644 --- a/core/modules/locale/config/optional/tour.tour.locale.yml +++ b/core/modules/locale/config/optional/tour.tour.locale.yml @@ -1,7 +1,11 @@ +langcode: en +status: true +dependencies: + module: + - locale id: locale +label: Translation module: locale -label: 'Translation' -langcode: en routes: - route_name: locale.translate_page tips: @@ -11,7 +15,6 @@ tips: label: 'User interface translation' body: 'This page allows you to translate the user interface or modify existing translations. If you have installed your site initially in English, you must first add another language on the <a href="[site:url]/admin/config/regional/language">Languages page</a>, in order to use this page.' weight: 1 - locale-language: id: locale-language plugin: text @@ -20,16 +23,14 @@ tips: weight: 2 attributes: data-id: edit-langcode - locale-search: id: locale-search plugin: text - label: 'Search' + label: Search body: 'Enter the specific word or sentence you want to translate, you can also write just a part of a word.' weight: 3 attributes: data-id: edit-string - locale-filter: id: locale-filter plugin: text @@ -38,7 +39,6 @@ tips: weight: 4 attributes: data-id: edit-translation - locale-submit: id: locale-submit plugin: text @@ -47,16 +47,14 @@ tips: weight: 5 attributes: data-id: edit-submit - locale-translate: id: locale-translate plugin: text - label: 'Translate' + label: Translate body: 'You can write your own translation in the text fields of the right column. Try to figure out in which context the text will be used in order to translate it in the appropriate way.' weight: 6 attributes: data-class: js-form-type-textarea - locale-validate: id: locale-validate plugin: text @@ -65,13 +63,9 @@ tips: weight: 7 attributes: data-id: edit-submit--2 - locale-continue: id: locale-continue plugin: text label: 'Continuing on' body: 'The translations you have made here will be used on your site''s user interface. If you want to use them on another site or modify them on an external translation editor, you can <a href="[site:url]/admin/config/regional/translate/export">export them</a> to a .po file and <a href="[site:url]/admin/config/regional/translate/import">import them</a> later.' weight: 8 -dependencies: - module: - - locale diff --git a/core/modules/node/config/install/core.entity_view_mode.node.full.yml b/core/modules/node/config/install/core.entity_view_mode.node.full.yml index 3a8654a4deab..f52a51dc3d84 100644 --- a/core/modules/node/config/install/core.entity_view_mode.node.full.yml +++ b/core/modules/node/config/install/core.entity_view_mode.node.full.yml @@ -1,8 +1,9 @@ -id: node.full -label: 'Full content' +langcode: en status: false -cache: true -targetEntityType: node dependencies: module: - node +id: node.full +label: 'Full content' +targetEntityType: node +cache: true diff --git a/core/modules/node/config/install/core.entity_view_mode.node.rss.yml b/core/modules/node/config/install/core.entity_view_mode.node.rss.yml index 6a79ca5fdf84..6418e4758e6c 100644 --- a/core/modules/node/config/install/core.entity_view_mode.node.rss.yml +++ b/core/modules/node/config/install/core.entity_view_mode.node.rss.yml @@ -1,8 +1,9 @@ -id: node.rss -label: RSS +langcode: en status: false -cache: true -targetEntityType: node dependencies: module: - node +id: node.rss +label: RSS +targetEntityType: node +cache: true diff --git a/core/modules/node/config/install/core.entity_view_mode.node.search_index.yml b/core/modules/node/config/install/core.entity_view_mode.node.search_index.yml index 54385d9cf5b8..7d082be3c3e0 100644 --- a/core/modules/node/config/install/core.entity_view_mode.node.search_index.yml +++ b/core/modules/node/config/install/core.entity_view_mode.node.search_index.yml @@ -1,8 +1,9 @@ -id: node.search_index -label: 'Search index' +langcode: en status: false -cache: true -targetEntityType: node dependencies: module: - node +id: node.search_index +label: 'Search index' +targetEntityType: node +cache: true diff --git a/core/modules/node/config/install/core.entity_view_mode.node.search_result.yml b/core/modules/node/config/install/core.entity_view_mode.node.search_result.yml index a680fa042563..73252b1369a5 100644 --- a/core/modules/node/config/install/core.entity_view_mode.node.search_result.yml +++ b/core/modules/node/config/install/core.entity_view_mode.node.search_result.yml @@ -1,8 +1,9 @@ -id: node.search_result -label: 'Search result highlighting input' +langcode: en status: false -cache: true -targetEntityType: node dependencies: module: - node +id: node.search_result +label: 'Search result highlighting input' +targetEntityType: node +cache: true diff --git a/core/modules/node/config/install/core.entity_view_mode.node.teaser.yml b/core/modules/node/config/install/core.entity_view_mode.node.teaser.yml index be00b8d4603f..dcde72c4c32d 100644 --- a/core/modules/node/config/install/core.entity_view_mode.node.teaser.yml +++ b/core/modules/node/config/install/core.entity_view_mode.node.teaser.yml @@ -1,8 +1,9 @@ -id: node.teaser -label: Teaser +langcode: en status: true -cache: true -targetEntityType: node dependencies: module: - node +id: node.teaser +label: Teaser +targetEntityType: node +cache: true diff --git a/core/modules/node/config/install/system.action.node_delete_action.yml b/core/modules/node/config/install/system.action.node_delete_action.yml index 282d5cc7de5a..97662dc50447 100644 --- a/core/modules/node/config/install/system.action.node_delete_action.yml +++ b/core/modules/node/config/install/system.action.node_delete_action.yml @@ -1,9 +1,10 @@ -id: node_delete_action -label: 'Delete content' -status: true langcode: en -type: node -plugin: node_delete_action +status: true dependencies: module: - node +id: node_delete_action +label: 'Delete content' +type: node +plugin: node_delete_action +configuration: { } diff --git a/core/modules/node/config/install/system.action.node_make_sticky_action.yml b/core/modules/node/config/install/system.action.node_make_sticky_action.yml index 04276c0322e8..94a81bf86022 100644 --- a/core/modules/node/config/install/system.action.node_make_sticky_action.yml +++ b/core/modules/node/config/install/system.action.node_make_sticky_action.yml @@ -1,9 +1,10 @@ -id: node_make_sticky_action -label: 'Make content sticky' -status: true langcode: en -type: node -plugin: node_make_sticky_action +status: true dependencies: module: - node +id: node_make_sticky_action +label: 'Make content sticky' +type: node +plugin: node_make_sticky_action +configuration: { } diff --git a/core/modules/node/config/install/system.action.node_make_unsticky_action.yml b/core/modules/node/config/install/system.action.node_make_unsticky_action.yml index 03a99c552e22..657296356656 100644 --- a/core/modules/node/config/install/system.action.node_make_unsticky_action.yml +++ b/core/modules/node/config/install/system.action.node_make_unsticky_action.yml @@ -1,9 +1,10 @@ -id: node_make_unsticky_action -label: 'Make content unsticky' -status: true langcode: en -type: node -plugin: node_make_unsticky_action +status: true dependencies: module: - node +id: node_make_unsticky_action +label: 'Make content unsticky' +type: node +plugin: node_make_unsticky_action +configuration: { } diff --git a/core/modules/node/config/install/system.action.node_promote_action.yml b/core/modules/node/config/install/system.action.node_promote_action.yml index 4b3a9ae1608c..7c45a42db355 100644 --- a/core/modules/node/config/install/system.action.node_promote_action.yml +++ b/core/modules/node/config/install/system.action.node_promote_action.yml @@ -1,9 +1,10 @@ -id: node_promote_action -label: 'Promote content to front page' -status: true langcode: en -type: node -plugin: node_promote_action +status: true dependencies: module: - node +id: node_promote_action +label: 'Promote content to front page' +type: node +plugin: node_promote_action +configuration: { } diff --git a/core/modules/node/config/install/system.action.node_publish_action.yml b/core/modules/node/config/install/system.action.node_publish_action.yml index af0b82c5c845..20ed19b63908 100644 --- a/core/modules/node/config/install/system.action.node_publish_action.yml +++ b/core/modules/node/config/install/system.action.node_publish_action.yml @@ -1,9 +1,10 @@ -id: node_publish_action -label: 'Publish content' -status: true langcode: en -type: node -plugin: node_publish_action +status: true dependencies: module: - node +id: node_publish_action +label: 'Publish content' +type: node +plugin: node_publish_action +configuration: { } diff --git a/core/modules/node/config/install/system.action.node_save_action.yml b/core/modules/node/config/install/system.action.node_save_action.yml index 4dc2073b55cd..887ff43d05a6 100644 --- a/core/modules/node/config/install/system.action.node_save_action.yml +++ b/core/modules/node/config/install/system.action.node_save_action.yml @@ -1,9 +1,10 @@ -id: node_save_action -label: 'Save content' -status: true langcode: en -type: node -plugin: node_save_action +status: true dependencies: module: - node +id: node_save_action +label: 'Save content' +type: node +plugin: node_save_action +configuration: { } diff --git a/core/modules/node/config/install/system.action.node_unpromote_action.yml b/core/modules/node/config/install/system.action.node_unpromote_action.yml index 21c0ae86c2b1..cb290ddcc4fd 100644 --- a/core/modules/node/config/install/system.action.node_unpromote_action.yml +++ b/core/modules/node/config/install/system.action.node_unpromote_action.yml @@ -1,9 +1,10 @@ -id: node_unpromote_action -label: 'Remove content from front page' -status: true langcode: en -type: node -plugin: node_unpromote_action +status: true dependencies: module: - node +id: node_unpromote_action +label: 'Remove content from front page' +type: node +plugin: node_unpromote_action +configuration: { } diff --git a/core/modules/node/config/install/system.action.node_unpublish_action.yml b/core/modules/node/config/install/system.action.node_unpublish_action.yml index 2e01fae43370..1e778c0dca57 100644 --- a/core/modules/node/config/install/system.action.node_unpublish_action.yml +++ b/core/modules/node/config/install/system.action.node_unpublish_action.yml @@ -1,9 +1,10 @@ -id: node_unpublish_action -label: 'Unpublish content' -status: true langcode: en -type: node -plugin: node_unpublish_action +status: true dependencies: module: - node +id: node_unpublish_action +label: 'Unpublish content' +type: node +plugin: node_unpublish_action +configuration: { } diff --git a/core/modules/node/config/optional/search.page.node_search.yml b/core/modules/node/config/optional/search.page.node_search.yml index 440c135bdf9e..e9a8afd19c4b 100644 --- a/core/modules/node/config/optional/search.page.node_search.yml +++ b/core/modules/node/config/optional/search.page.node_search.yml @@ -1,12 +1,12 @@ +langcode: en +status: true +dependencies: + module: + - node id: node_search label: Content -status: true -langcode: en path: node weight: -10 plugin: node_search configuration: rankings: { } -dependencies: - module: - - node diff --git a/core/modules/node/config/optional/views.view.archive.yml b/core/modules/node/config/optional/views.view.archive.yml index c30650b35600..c201e02b3225 100644 --- a/core/modules/node/config/optional/views.view.archive.yml +++ b/core/modules/node/config/optional/views.view.archive.yml @@ -166,6 +166,15 @@ display: empty: { } relationships: { } fields: { } + display_extenders: { } + cache_metadata: + contexts: + - 'languages:language_interface' + - url + - url.query_args + - 'user.node_grants:view' + - user.permissions + cacheable: false block_1: id: block_1 display_title: Block @@ -195,6 +204,15 @@ display: specify_validation: true plugin_id: date_year_month entity_type: node + display_extenders: { } + cache_metadata: + contexts: + - 'languages:language_interface' + - url + - url.query_args + - 'user.node_grants:view' + - user.permissions + cacheable: false page_1: id: page_1 display_title: Page @@ -205,3 +223,12 @@ display: type: views_query options: { } path: archive + display_extenders: { } + cache_metadata: + contexts: + - 'languages:language_interface' + - url + - url.query_args + - 'user.node_grants:view' + - user.permissions + cacheable: false diff --git a/core/modules/node/config/optional/views.view.content.yml b/core/modules/node/config/optional/views.view.content.yml index 150cf1fed416..78b080d8dca0 100644 --- a/core/modules/node/config/optional/views.view.content.yml +++ b/core/modules/node/config/optional/views.view.content.yml @@ -561,10 +561,13 @@ display: position: 0 cache_metadata: contexts: - - languages + - 'languages:language_content' + - 'languages:language_interface' - url + - url.query_args - user - 'user.node_grants:view' + - user.permissions cacheable: false page_1: display_options: @@ -589,8 +592,11 @@ display: position: 1 cache_metadata: contexts: - - languages + - 'languages:language_content' + - 'languages:language_interface' - url + - url.query_args - user - 'user.node_grants:view' + - user.permissions cacheable: false diff --git a/core/modules/node/config/optional/views.view.frontpage.yml b/core/modules/node/config/optional/views.view.frontpage.yml index 8b51ebb0b671..09e1d1ba7f1b 100644 --- a/core/modules/node/config/optional/views.view.frontpage.yml +++ b/core/modules/node/config/optional/views.view.frontpage.yml @@ -233,10 +233,18 @@ display: relationships: { } fields: { } arguments: { } + display_extenders: { } display_plugin: default display_title: Master id: default position: 0 + cache_metadata: + contexts: + - 'languages:language_interface' + - url.query_args + - 'user.node_grants:view' + - user.permissions + cacheable: false feed_1: display_plugin: feed id: feed_1 @@ -264,10 +272,25 @@ display: options: relationship: none view_mode: rss + display_extenders: { } + cache_metadata: + contexts: + - 'languages:language_interface' + - 'user.node_grants:view' + - user.permissions + cacheable: false page_1: display_options: path: node + display_extenders: { } display_plugin: page display_title: Page id: page_1 position: 1 + cache_metadata: + contexts: + - 'languages:language_interface' + - url.query_args + - 'user.node_grants:view' + - user.permissions + cacheable: false diff --git a/core/modules/node/config/optional/views.view.glossary.yml b/core/modules/node/config/optional/views.view.glossary.yml index eab49b7af8e0..611947e48a7e 100644 --- a/core/modules/node/config/optional/views.view.glossary.yml +++ b/core/modules/node/config/optional/views.view.glossary.yml @@ -346,6 +346,16 @@ display: plugin_id: language entity_type: node entity_field: langcode + display_extenders: { } + cache_metadata: + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - url + - url.query_args + - 'user.node_grants:view' + - user.permissions + cacheable: false attachment_1: id: attachment_1 display_title: Attachment @@ -403,6 +413,16 @@ display: default: default page_1: page_1 inherit_arguments: false + display_extenders: { } + cache_metadata: + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - url + - url.query_args + - 'user.node_grants:view' + - user.permissions + cacheable: false page_1: id: page_1 display_title: Page @@ -419,3 +439,13 @@ display: weight: 0 menu_name: main parent: '' + display_extenders: { } + cache_metadata: + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - url + - url.query_args + - 'user.node_grants:view' + - user.permissions + cacheable: false diff --git a/core/modules/shortcut/config/install/shortcut.set.default.yml b/core/modules/shortcut/config/install/shortcut.set.default.yml index 3e50e3bbd3de..263a7f1c44ca 100644 --- a/core/modules/shortcut/config/install/shortcut.set.default.yml +++ b/core/modules/shortcut/config/install/shortcut.set.default.yml @@ -1,2 +1,5 @@ +langcode: en +status: true +dependencies: { } id: default label: Default diff --git a/core/modules/system/config/install/core.date_format.fallback.yml b/core/modules/system/config/install/core.date_format.fallback.yml index 6e5c9dc22bac..c3ae46d6a2ea 100644 --- a/core/modules/system/config/install/core.date_format.fallback.yml +++ b/core/modules/system/config/install/core.date_format.fallback.yml @@ -1,6 +1,7 @@ +langcode: en +status: true +dependencies: { } id: fallback label: 'Fallback date format' -status: true -langcode: en locked: true pattern: 'D, m/d/Y - H:i' diff --git a/core/modules/system/config/install/core.date_format.html_date.yml b/core/modules/system/config/install/core.date_format.html_date.yml index c489b83fa2b1..ad3e3275e393 100644 --- a/core/modules/system/config/install/core.date_format.html_date.yml +++ b/core/modules/system/config/install/core.date_format.html_date.yml @@ -1,6 +1,7 @@ +langcode: en +status: true +dependencies: { } id: html_date label: 'HTML Date' -status: true -langcode: en locked: true pattern: Y-m-d diff --git a/core/modules/system/config/install/core.date_format.html_datetime.yml b/core/modules/system/config/install/core.date_format.html_datetime.yml index 32debaefc67b..853257844124 100644 --- a/core/modules/system/config/install/core.date_format.html_datetime.yml +++ b/core/modules/system/config/install/core.date_format.html_datetime.yml @@ -1,6 +1,7 @@ +langcode: en +status: true +dependencies: { } id: html_datetime label: 'HTML Datetime' -status: true -langcode: en locked: true pattern: 'Y-m-d\TH:i:sO' diff --git a/core/modules/system/config/install/core.date_format.html_month.yml b/core/modules/system/config/install/core.date_format.html_month.yml index a3703206e553..94cd8278ee7b 100644 --- a/core/modules/system/config/install/core.date_format.html_month.yml +++ b/core/modules/system/config/install/core.date_format.html_month.yml @@ -1,6 +1,7 @@ +langcode: en +status: true +dependencies: { } id: html_month label: 'HTML Month' -status: true -langcode: en locked: true pattern: Y-m diff --git a/core/modules/system/config/install/core.date_format.html_time.yml b/core/modules/system/config/install/core.date_format.html_time.yml index 0c45877c21ce..65bc75334731 100644 --- a/core/modules/system/config/install/core.date_format.html_time.yml +++ b/core/modules/system/config/install/core.date_format.html_time.yml @@ -1,6 +1,7 @@ +langcode: en +status: true +dependencies: { } id: html_time label: 'HTML Time' -status: true -langcode: en locked: true pattern: 'H:i:s' diff --git a/core/modules/system/config/install/core.date_format.html_week.yml b/core/modules/system/config/install/core.date_format.html_week.yml index bb5dc6e9cdd9..bc9300955343 100644 --- a/core/modules/system/config/install/core.date_format.html_week.yml +++ b/core/modules/system/config/install/core.date_format.html_week.yml @@ -1,6 +1,7 @@ +langcode: en +status: true +dependencies: { } id: html_week label: 'HTML Week' -status: true -langcode: en locked: true pattern: Y-\WW diff --git a/core/modules/system/config/install/core.date_format.html_year.yml b/core/modules/system/config/install/core.date_format.html_year.yml index 1a3aadc0b68e..90afaf541ef9 100644 --- a/core/modules/system/config/install/core.date_format.html_year.yml +++ b/core/modules/system/config/install/core.date_format.html_year.yml @@ -1,6 +1,7 @@ +langcode: en +status: true +dependencies: { } id: html_year label: 'HTML Year' -status: true -langcode: en locked: true -pattern: Y +pattern: 'Y' diff --git a/core/modules/system/config/install/core.date_format.html_yearless_date.yml b/core/modules/system/config/install/core.date_format.html_yearless_date.yml index a17ef344d5a7..f1fec73b3c5a 100644 --- a/core/modules/system/config/install/core.date_format.html_yearless_date.yml +++ b/core/modules/system/config/install/core.date_format.html_yearless_date.yml @@ -1,6 +1,7 @@ +langcode: en +status: true +dependencies: { } id: html_yearless_date label: 'HTML Yearless date' -status: true -langcode: en locked: true pattern: m-d diff --git a/core/modules/system/config/install/core.date_format.long.yml b/core/modules/system/config/install/core.date_format.long.yml index b8a09e31bfd7..9e385f1c1687 100644 --- a/core/modules/system/config/install/core.date_format.long.yml +++ b/core/modules/system/config/install/core.date_format.long.yml @@ -1,6 +1,7 @@ +langcode: en +status: true +dependencies: { } id: long label: 'Default long date' -status: true -langcode: en locked: false pattern: 'l, F j, Y - H:i' diff --git a/core/modules/system/config/install/core.date_format.medium.yml b/core/modules/system/config/install/core.date_format.medium.yml index 59376fdb3d88..be3561673ebc 100644 --- a/core/modules/system/config/install/core.date_format.medium.yml +++ b/core/modules/system/config/install/core.date_format.medium.yml @@ -1,6 +1,7 @@ +langcode: en +status: true +dependencies: { } id: medium label: 'Default medium date' -status: true -langcode: en locked: false pattern: 'D, m/d/Y - H:i' diff --git a/core/modules/system/config/install/core.date_format.short.yml b/core/modules/system/config/install/core.date_format.short.yml index 654fed40499c..f7fbe193a1db 100644 --- a/core/modules/system/config/install/core.date_format.short.yml +++ b/core/modules/system/config/install/core.date_format.short.yml @@ -1,6 +1,7 @@ +langcode: en +status: true +dependencies: { } id: short label: 'Default short date' -status: true -langcode: en locked: false pattern: 'm/d/Y - H:i' diff --git a/core/modules/system/config/install/system.menu.account.yml b/core/modules/system/config/install/system.menu.account.yml index 7d4cdd026f27..219520f4412e 100644 --- a/core/modules/system/config/install/system.menu.account.yml +++ b/core/modules/system/config/install/system.menu.account.yml @@ -1,5 +1,7 @@ +langcode: en +status: true +dependencies: { } id: account label: 'User account menu' description: 'Links related to the user account.' -langcode: en locked: true diff --git a/core/modules/system/config/install/system.menu.admin.yml b/core/modules/system/config/install/system.menu.admin.yml index 4751eb1e073b..aba9d4074565 100644 --- a/core/modules/system/config/install/system.menu.admin.yml +++ b/core/modules/system/config/install/system.menu.admin.yml @@ -1,5 +1,7 @@ +langcode: en +status: true +dependencies: { } id: admin label: Administration description: 'Contains links to administrative tasks.' -langcode: en locked: true diff --git a/core/modules/system/config/install/system.menu.footer.yml b/core/modules/system/config/install/system.menu.footer.yml index 540c118ff3cc..7a7604787fd5 100644 --- a/core/modules/system/config/install/system.menu.footer.yml +++ b/core/modules/system/config/install/system.menu.footer.yml @@ -1,5 +1,7 @@ +langcode: en +status: true +dependencies: { } id: footer label: Footer description: 'Use this for linking to site information.' -langcode: en locked: true diff --git a/core/modules/system/config/install/system.menu.main.yml b/core/modules/system/config/install/system.menu.main.yml index fe9ced51a7a5..96f24c45a8a5 100644 --- a/core/modules/system/config/install/system.menu.main.yml +++ b/core/modules/system/config/install/system.menu.main.yml @@ -1,5 +1,7 @@ +langcode: en +status: true +dependencies: { } id: main label: 'Main navigation' description: 'Use this for linking to the main site sections.' -langcode: en locked: true diff --git a/core/modules/system/config/install/system.menu.tools.yml b/core/modules/system/config/install/system.menu.tools.yml index 4a3084faf791..298f2c941479 100644 --- a/core/modules/system/config/install/system.menu.tools.yml +++ b/core/modules/system/config/install/system.menu.tools.yml @@ -1,5 +1,7 @@ +langcode: en +status: true +dependencies: { } id: tools label: Tools description: 'Contains links for site visitors. Some modules add their links here.' -langcode: en locked: true diff --git a/core/modules/system/src/Tests/Installer/ConfigAfterInstallerTestBase.php b/core/modules/system/src/Tests/Installer/ConfigAfterInstallerTestBase.php new file mode 100644 index 000000000000..753142415a9b --- /dev/null +++ b/core/modules/system/src/Tests/Installer/ConfigAfterInstallerTestBase.php @@ -0,0 +1,49 @@ +<?php + +/** + * @file + * Contains \Drupal\system\Tests\Installer\ConfigAfterInstallerTestBase. + */ + +namespace Drupal\system\Tests\Installer; + +use Drupal\Core\Config\FileStorage; +use Drupal\Core\Config\InstallStorage; +use Drupal\Core\Config\StorageInterface; +use Drupal\KernelTests\AssertConfigTrait; +use Drupal\simpletest\InstallerTestBase; + +/** + * Provides a class for install profiles to check their installed config. + */ +abstract class ConfigAfterInstallerTestBase extends InstallerTestBase { + + use AssertConfigTrait; + + /** + * Ensures that all the installed config looks like the exported one. + * + * @param array $skipped_config + * An array of skipped config. + */ + protected function assertInstalledConfig(array $skipped_config) { + /** @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'); + + $default_install_path = 'core/profiles/' . $this->profile . '/' . InstallStorage::CONFIG_INSTALL_DIRECTORY; + $profile_config_storage = new FileStorage($default_install_path, StorageInterface::DEFAULT_COLLECTION); + + foreach ($profile_config_storage->listAll() as $config_name) { + $result = $config_manager->diff($profile_config_storage, $active_config_storage, $config_name); + try { + $this->assertConfigDiff($result, $config_name, $skipped_config); + } + catch (\Exception $e) { + $this->fail($e->getMessage()); + } + } + } + +} diff --git a/core/modules/system/src/Tests/Installer/MinimalInstallerTest.php b/core/modules/system/src/Tests/Installer/MinimalInstallerTest.php new file mode 100644 index 000000000000..54c07b3ca437 --- /dev/null +++ b/core/modules/system/src/Tests/Installer/MinimalInstallerTest.php @@ -0,0 +1,33 @@ +<?php + +/** + * @file + * Contains \Drupal\system\Tests\Installer\MinimalInstallerTest. + */ + +namespace Drupal\system\Tests\Installer; + +use Drupal\KernelTests\AssertConfigTrait; + +/** + * Tests the interactive installer installing the minimal profile. + * + * @group Installer + */ +class MinimalInstallerTest extends ConfigAfterInstallerTestBase { + + use AssertConfigTrait; + + /** + * {@inheritdoc} + */ + protected $profile = 'minimal'; + + /** + * Ensures that the exported minimal configuration is up to date. + */ + public function testMinimalConfig() { + $this->assertInstalledConfig([]); + } + +} diff --git a/core/modules/system/src/Tests/Installer/StandardInstallerTest.php b/core/modules/system/src/Tests/Installer/StandardInstallerTest.php index a19ab6c83109..184e07b65b37 100644 --- a/core/modules/system/src/Tests/Installer/StandardInstallerTest.php +++ b/core/modules/system/src/Tests/Installer/StandardInstallerTest.php @@ -7,14 +7,12 @@ namespace Drupal\system\Tests\Installer; -use Drupal\simpletest\InstallerTestBase; - /** * Tests the interactive installer installing the standard profile. * * @group Installer */ -class StandardInstallerTest extends InstallerTestBase { +class StandardInstallerTest extends ConfigAfterInstallerTestBase { /** * {@inheritdoc} @@ -42,5 +40,24 @@ protected function setUpSite() { parent::setUpSite(); } + /** + * Ensures that the exported standard configuration is up to date. + */ + public function testStandardConfig() { + $skipped_config = []; + // \Drupal\simpletest\WebTestBase::installParameters() uses + // simpletest@example.com as mail address. + $skipped_config['contact.form.feedback'][] = ' - simpletest@example.com'; + // \Drupal\filter\Entity\FilterFormat::toArray() drops the roles of filter + // formats. + $skipped_config['filter.format.basic_html'][] = 'roles:'; + $skipped_config['filter.format.basic_html'][] = ' - authenticated'; + $skipped_config['filter.format.full_html'][] = 'roles:'; + $skipped_config['filter.format.full_html'][] = ' - administrator'; + $skipped_config['filter.format.restricted_html'][] = 'roles:'; + $skipped_config['filter.format.restricted_html'][] = ' - anonymous'; + + $this->assertInstalledConfig($skipped_config); + } } diff --git a/core/modules/taxonomy/config/install/core.entity_view_mode.taxonomy_term.full.yml b/core/modules/taxonomy/config/install/core.entity_view_mode.taxonomy_term.full.yml index bb8c47e80905..3a1f31314da0 100644 --- a/core/modules/taxonomy/config/install/core.entity_view_mode.taxonomy_term.full.yml +++ b/core/modules/taxonomy/config/install/core.entity_view_mode.taxonomy_term.full.yml @@ -1,8 +1,9 @@ -id: taxonomy_term.full -label: 'Taxonomy term page' +langcode: en status: true -cache: true -targetEntityType: taxonomy_term dependencies: module: - taxonomy +id: taxonomy_term.full +label: 'Taxonomy term page' +targetEntityType: taxonomy_term +cache: true diff --git a/core/modules/taxonomy/config/optional/views.view.taxonomy_term.yml b/core/modules/taxonomy/config/optional/views.view.taxonomy_term.yml index 7a325836e289..23c8a4d153d8 100644 --- a/core/modules/taxonomy/config/optional/views.view.taxonomy_term.yml +++ b/core/modules/taxonomy/config/optional/views.view.taxonomy_term.yml @@ -246,7 +246,9 @@ display: contexts: - 'languages:language_interface' - url + - url.query_args - 'user.node_grants:view' + - user.permissions cacheable: false feed_1: id: feed_1 @@ -283,6 +285,7 @@ display: - 'languages:language_interface' - url - 'user.node_grants:view' + - user.permissions cacheable: false page_1: id: page_1 @@ -299,5 +302,7 @@ display: contexts: - 'languages:language_interface' - url + - url.query_args - 'user.node_grants:view' + - user.permissions cacheable: false diff --git a/core/modules/user/config/install/core.entity_form_mode.user.register.yml b/core/modules/user/config/install/core.entity_form_mode.user.register.yml index 06919cdc7e58..32c026b99238 100644 --- a/core/modules/user/config/install/core.entity_form_mode.user.register.yml +++ b/core/modules/user/config/install/core.entity_form_mode.user.register.yml @@ -1,7 +1,9 @@ -id: user.register -label: Register +langcode: en status: true -targetEntityType: user dependencies: module: - user +id: user.register +label: Register +targetEntityType: user +cache: true diff --git a/core/modules/user/config/install/core.entity_view_mode.user.compact.yml b/core/modules/user/config/install/core.entity_view_mode.user.compact.yml index 6e0b13dde7a3..0c41655c2027 100644 --- a/core/modules/user/config/install/core.entity_view_mode.user.compact.yml +++ b/core/modules/user/config/install/core.entity_view_mode.user.compact.yml @@ -1,8 +1,9 @@ -id: user.compact -label: Compact +langcode: en status: true -cache: true -targetEntityType: user dependencies: module: - user +id: user.compact +label: Compact +targetEntityType: user +cache: true diff --git a/core/modules/user/config/install/core.entity_view_mode.user.full.yml b/core/modules/user/config/install/core.entity_view_mode.user.full.yml index 2f0f250d8e87..5574ab95bf47 100644 --- a/core/modules/user/config/install/core.entity_view_mode.user.full.yml +++ b/core/modules/user/config/install/core.entity_view_mode.user.full.yml @@ -1,8 +1,9 @@ -id: user.full -label: 'User account' +langcode: en status: false -cache: true -targetEntityType: user dependencies: module: - user +id: user.full +label: 'User account' +targetEntityType: user +cache: true diff --git a/core/modules/user/config/install/system.action.user_block_user_action.yml b/core/modules/user/config/install/system.action.user_block_user_action.yml index d7e15c6ffb06..d9753bc59bfb 100644 --- a/core/modules/user/config/install/system.action.user_block_user_action.yml +++ b/core/modules/user/config/install/system.action.user_block_user_action.yml @@ -1,9 +1,10 @@ -id: user_block_user_action -label: 'Block the selected user(s)' -status: true langcode: en -type: user -plugin: user_block_user_action +status: true dependencies: module: - user +id: user_block_user_action +label: 'Block the selected user(s)' +type: user +plugin: user_block_user_action +configuration: { } diff --git a/core/modules/user/config/install/system.action.user_cancel_user_action.yml b/core/modules/user/config/install/system.action.user_cancel_user_action.yml index bcc03ed4df43..cd90ff2ca1fc 100644 --- a/core/modules/user/config/install/system.action.user_cancel_user_action.yml +++ b/core/modules/user/config/install/system.action.user_cancel_user_action.yml @@ -1,9 +1,10 @@ -id: user_cancel_user_action -label: 'Cancel the selected user account(s)' -status: true langcode: en -type: user -plugin: user_cancel_user_action +status: true dependencies: module: - user +id: user_cancel_user_action +label: 'Cancel the selected user account(s)' +type: user +plugin: user_cancel_user_action +configuration: { } diff --git a/core/modules/user/config/install/system.action.user_unblock_user_action.yml b/core/modules/user/config/install/system.action.user_unblock_user_action.yml index 0d313eafadd8..406edb20667c 100644 --- a/core/modules/user/config/install/system.action.user_unblock_user_action.yml +++ b/core/modules/user/config/install/system.action.user_unblock_user_action.yml @@ -1,9 +1,10 @@ -id: user_unblock_user_action -label: 'Unblock the selected user(s)' -status: true langcode: en -type: user -plugin: user_unblock_user_action +status: true dependencies: module: - user +id: user_unblock_user_action +label: 'Unblock the selected user(s)' +type: user +plugin: user_unblock_user_action +configuration: { } diff --git a/core/modules/user/config/install/user.role.anonymous.yml b/core/modules/user/config/install/user.role.anonymous.yml index 21d727b57b41..c89e023b031f 100644 --- a/core/modules/user/config/install/user.role.anonymous.yml +++ b/core/modules/user/config/install/user.role.anonymous.yml @@ -1,7 +1,8 @@ +langcode: en +status: true +dependencies: { } id: anonymous label: 'Anonymous user' weight: 0 -langcode: en -status: true is_admin: false -dependencies: { } +permissions: { } diff --git a/core/modules/user/config/install/user.role.authenticated.yml b/core/modules/user/config/install/user.role.authenticated.yml index 68b7e021b5fe..5da2abdd938c 100644 --- a/core/modules/user/config/install/user.role.authenticated.yml +++ b/core/modules/user/config/install/user.role.authenticated.yml @@ -1,7 +1,8 @@ +langcode: en +status: true +dependencies: { } id: authenticated label: 'Authenticated user' weight: 1 -langcode: en -status: true is_admin: false -dependencies: { } +permissions: { } diff --git a/core/modules/user/config/optional/rdf.mapping.user.user.yml b/core/modules/user/config/optional/rdf.mapping.user.user.yml index f052a1ab673a..4c6825a5f69b 100644 --- a/core/modules/user/config/optional/rdf.mapping.user.user.yml +++ b/core/modules/user/config/optional/rdf.mapping.user.user.yml @@ -1,3 +1,8 @@ +langcode: en +status: true +dependencies: + module: + - user id: user.user targetEntityType: user bundle: user @@ -7,6 +12,3 @@ fieldMappings: name: properties: - 'schema:name' -dependencies: - module: - - user diff --git a/core/modules/user/config/optional/views.view.user_admin_people.yml b/core/modules/user/config/optional/views.view.user_admin_people.yml index 0644e803c700..0ae79660153a 100644 --- a/core/modules/user/config/optional/views.view.user_admin_people.yml +++ b/core/modules/user/config/optional/views.view.user_admin_people.yml @@ -293,8 +293,8 @@ display: type: boolean settings: format: custom - format_custom_true: 'Active' - format_custom_false: 'Blocked' + format_custom_true: Active + format_custom_false: Blocked entity_type: user entity_field: status roles_target_id: @@ -868,6 +868,14 @@ display: groups: 1: AND display_extenders: { } + cache_metadata: + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - url + - url.query_args + - user.permissions + cacheable: false page_1: display_plugin: page id: page_1 @@ -892,3 +900,11 @@ display: defaults: show_admin_links: false display_extenders: { } + cache_metadata: + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - url + - url.query_args + - user.permissions + cacheable: false diff --git a/core/modules/user/config/optional/views.view.who_s_new.yml b/core/modules/user/config/optional/views.view.who_s_new.yml index dc7cde716537..79fd2a756232 100644 --- a/core/modules/user/config/optional/views.view.who_s_new.yml +++ b/core/modules/user/config/optional/views.view.who_s_new.yml @@ -163,6 +163,13 @@ display: empty: { } relationships: { } arguments: { } + display_extenders: { } + cache_metadata: + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - user.permissions + cacheable: false block_1: display_plugin: block id: block_1 @@ -172,3 +179,10 @@ display: display_description: 'A list of new users' block_description: 'Who''s new' block_category: User + display_extenders: { } + cache_metadata: + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - user.permissions + cacheable: false diff --git a/core/modules/user/config/optional/views.view.who_s_online.yml b/core/modules/user/config/optional/views.view.who_s_online.yml index e48c0d38dbf3..4669e34b1a84 100644 --- a/core/modules/user/config/optional/views.view.who_s_online.yml +++ b/core/modules/user/config/optional/views.view.who_s_online.yml @@ -193,6 +193,13 @@ display: plugin_id: text_custom relationships: { } arguments: { } + display_extenders: { } + cache_metadata: + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - user.permissions + cacheable: false who_s_online_block: display_plugin: block id: who_s_online_block @@ -201,3 +208,10 @@ display: display_options: block_description: 'Who''s online' display_description: 'A list of users that are currently logged in.' + display_extenders: { } + cache_metadata: + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - user.permissions + cacheable: false diff --git a/core/modules/views_ui/config/optional/tour.tour.views-ui.yml b/core/modules/views_ui/config/optional/tour.tour.views-ui.yml index 1b4e475ac60d..42193dd6f5fd 100644 --- a/core/modules/views_ui/config/optional/tour.tour.views-ui.yml +++ b/core/modules/views_ui/config/optional/tour.tour.views-ui.yml @@ -1,10 +1,16 @@ +langcode: en +status: true +dependencies: + module: + - views_ui id: views-ui -module: views_ui label: 'View edit page' -langcode: en +module: views_ui routes: - - route_name: entity.view.edit_form - - route_name: entity.view.edit_display_form + - + route_name: entity.view.edit_form + - + route_name: entity.view.edit_display_form tips: views-main: id: views-main @@ -80,12 +86,9 @@ tips: views-ui-preview: id: views-ui-preview plugin: text - label: 'Preview' + label: Preview body: 'Show a preview of the view output.' weight: 10 location: left attributes: data-id: preview-submit -dependencies: - module: - - views_ui diff --git a/core/profiles/minimal/config/install/block.block.stark_admin.yml b/core/profiles/minimal/config/install/block.block.stark_admin.yml index 68ac791d2775..d4deb186dad1 100644 --- a/core/profiles/minimal/config/install/block.block.stark_admin.yml +++ b/core/profiles/minimal/config/install/block.block.stark_admin.yml @@ -1,21 +1,23 @@ +langcode: en +status: true +dependencies: + config: + - system.menu.admin + module: + - system + theme: + - stark id: stark_admin theme: stark -weight: 1 -status: true -langcode: en region: sidebar_first +weight: 1 +provider: null plugin: 'system_menu_block:admin' settings: + id: 'system_menu_block:admin' label: Administration provider: system label_display: visible level: 1 depth: 0 -dependencies: - config: - - system.menu.admin - module: - - system - theme: - - stark visibility: { } diff --git a/core/profiles/minimal/config/install/block.block.stark_branding.yml b/core/profiles/minimal/config/install/block.block.stark_branding.yml index f37a2b1275b9..f3407459c8e5 100644 --- a/core/profiles/minimal/config/install/block.block.stark_branding.yml +++ b/core/profiles/minimal/config/install/block.block.stark_branding.yml @@ -1,18 +1,22 @@ +langcode: en +status: true +dependencies: + module: + - system + theme: + - stark id: stark_branding theme: stark -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: - - stark + use_site_logo: true + use_site_name: true + use_site_slogan: true visibility: { } diff --git a/core/profiles/minimal/config/install/block.block.stark_local_actions.yml b/core/profiles/minimal/config/install/block.block.stark_local_actions.yml index f2dd88b9a21b..66b19e6b9cdf 100644 --- a/core/profiles/minimal/config/install/block.block.stark_local_actions.yml +++ b/core/profiles/minimal/config/install/block.block.stark_local_actions.yml @@ -1,15 +1,17 @@ +langcode: en +status: true +dependencies: + theme: + - stark id: stark_local_actions theme: stark -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: - - stark visibility: { } diff --git a/core/profiles/minimal/config/install/block.block.stark_local_tasks.yml b/core/profiles/minimal/config/install/block.block.stark_local_tasks.yml index 2d0c5dca3a77..df1321954de6 100644 --- a/core/profiles/minimal/config/install/block.block.stark_local_tasks.yml +++ b/core/profiles/minimal/config/install/block.block.stark_local_tasks.yml @@ -1,15 +1,19 @@ +langcode: en +status: true +dependencies: + theme: + - stark id: stark_local_tasks theme: stark -weight: -20 -status: true -langcode: en region: content +weight: -20 +provider: null plugin: local_tasks_block settings: id: local_tasks_block label: Tabs + provider: core label_display: '0' -dependencies: - theme: - - stark + primary: true + secondary: true visibility: { } diff --git a/core/profiles/minimal/config/install/block.block.stark_login.yml b/core/profiles/minimal/config/install/block.block.stark_login.yml index 41eba3ff30c6..2e4178c0a183 100644 --- a/core/profiles/minimal/config/install/block.block.stark_login.yml +++ b/core/profiles/minimal/config/install/block.block.stark_login.yml @@ -1,17 +1,19 @@ +langcode: en +status: true +dependencies: + module: + - user + theme: + - stark id: stark_login theme: stark -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: - - stark visibility: { } diff --git a/core/profiles/minimal/config/install/block.block.stark_messages.yml b/core/profiles/minimal/config/install/block.block.stark_messages.yml index 34a5e23dc9aa..085f7ee66d3b 100644 --- a/core/profiles/minimal/config/install/block.block.stark_messages.yml +++ b/core/profiles/minimal/config/install/block.block.stark_messages.yml @@ -1,17 +1,19 @@ +langcode: en +status: true +dependencies: + module: + - system + theme: + - stark id: stark_messages theme: stark -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: - - stark +visibility: { } diff --git a/core/profiles/minimal/config/install/block.block.stark_tools.yml b/core/profiles/minimal/config/install/block.block.stark_tools.yml index e833fe00d3dc..2b6d1d5e44d3 100644 --- a/core/profiles/minimal/config/install/block.block.stark_tools.yml +++ b/core/profiles/minimal/config/install/block.block.stark_tools.yml @@ -1,21 +1,23 @@ +langcode: en +status: true +dependencies: + config: + - system.menu.tools + module: + - system + theme: + - stark id: stark_tools theme: stark -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 level: 1 depth: 0 -dependencies: - config: - - system.menu.tools - module: - - system - theme: - - stark visibility: { } 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 ef0f44cca61f..93cadc8bac4c 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,9 +1,17 @@ +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' @@ -12,11 +20,4 @@ settings: label_display: '0' 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 a0f6efe47fc4..6cf70a77c98c 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,22 @@ +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 + 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 5589c10d5fcb..bce3d01baaa8 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,19 @@ +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 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 87d320faf379..b1e0c801b445 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,19 @@ +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 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 f3a4dcfd53b7..a8623d11eae8 100644 --- a/core/profiles/standard/config/install/block.block.bartik_footer.yml +++ b/core/profiles/standard/config/install/block.block.bartik_footer.yml @@ -1,9 +1,17 @@ +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' @@ -12,11 +20,4 @@ settings: label_display: '0' 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 e93a546f7009..cf344d360c89 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,19 @@ +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 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 c88b875382db..a58496db1c8e 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,17 @@ +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 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 1cf88fe09f4b..6b7c5d3a4ff0 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,19 @@ +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 + 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 3a5f5433fd6d..73ee47057d31 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,19 @@ +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 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 32a3d1dbb219..dc7ebecb024b 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,9 +1,17 @@ +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' @@ -12,11 +20,4 @@ settings: label_display: '0' 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 0bb959079d94..e6bb7d76605a 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,19 @@ +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 +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 f7e4c9036662..bb74cc80d7af 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,19 @@ +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 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 af99dea99c14..90b81cbfeef3 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,19 @@ +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 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 af3672d65719..5a2aae5cb3c8 100644 --- a/core/profiles/standard/config/install/block.block.bartik_tools.yml +++ b/core/profiles/standard/config/install/block.block.bartik_tools.yml @@ -1,9 +1,17 @@ +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' @@ -12,11 +20,4 @@ settings: label_display: visible 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 fc95b026f35d..edbdfbd125df 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,19 @@ +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 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 dd2bfbec584b..d92214c67df9 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,19 @@ +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 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 5bb35297e37a..9a4e2180f3b2 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,19 @@ +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 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 999807f0fdaa..61cdb177c832 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,17 @@ +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 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 0a488a798f90..110e8fd80087 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,19 @@ +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 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 35c3531387a0..f7b6038b230e 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,19 @@ +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 +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 66e8d7bf038e..d0017c2c8fe1 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,19 @@ +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' 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 7824d64c68a2..33391991c7db 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,19 @@ +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' 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 02982e47a47c..f01ced96bc23 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 651028791236..ddcbbc986095 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 8fb776506cb2..47f0e908d473 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 0f353341db6a..27226a1a6f26 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 b146f340c403..ee0c1384d950 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 51a97b14005b..fa5d834ce799 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 64f8efcb7a33..189737caca0c 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 967c74eb82c6..1fef06d1e8a9 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 d93cb2c8a0df..107d36362f0e 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 f9ee027911ad..bd52f77507d0 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 0489d233b26f..1ed49ce2f6c5 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 1ed0d74c15b9..e0d378238e45 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 @@ -49,7 +55,5 @@ content: 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 4308faf52f61..75a14a3fb456 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 464606dc4a14..1cf18dc76847 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 d331484a31da..dcb2d3eceee9 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 3d4d9ed509e5..f235a10eded6 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 a46bd1bd3134..9c74439bb77a 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 ebf106c8dae6..807fefe3dd8c 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 797dfba9ed53..966cec6a19fb 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 80da28c4a013..f5dd7bcc170b 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 e1157002919f..89118eff0821 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 30aaabe1d814..1337070d16b8 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 e2cdb3a72f5b..8f3681d9627c 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 932daff87684..59218f0b42b6 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 0a7c7f635c23..15285d66df8a 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 d69a558e50e3..77eb70c4a25e 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 57bb0b08748d..6c09432b410b 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 e1d8b643a505..267265039198 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: true 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 eb40f3736c99..9c1a644890aa 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 71e0425f643f..ca20381ca153 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 b7e3141932ba..48da5578a52a 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 21a46563e3b3..a2562d26b54c 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 cfdf9e2219bd..e5febb218aa8 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 0e403780098d..cbd40c067ec9 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 7cb127db6521..cc5f7b8d1690 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 <em>articles</em> 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 f9b4353b45c8..70bed483cc6a 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 <em>basic pages</em> 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 f1b167e805a6..72427598111d 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 166bd2abffbb..dd6535c30446 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 9c7b4dcf5bfa..46b43f15f3da 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 0f8001e0f9c0..8fac8f5a2d6c 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 daf926b7e528..e5453b725d30 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/scripts/run-tests.sh b/core/scripts/run-tests.sh index 6f11827b72e2..1b931488f2ab 100755 --- a/core/scripts/run-tests.sh +++ b/core/scripts/run-tests.sh @@ -589,6 +589,12 @@ function simpletest_script_execute_batch($test_classes) { * Run a group of phpunit tests. */ function simpletest_script_run_phpunit($test_id, $class) { + + $reflection = new \ReflectionClass($class); + if ($reflection->hasProperty('runLimit')) { + set_time_limit($reflection->getStaticPropertyValue('runLimit')); + } + $results = simpletest_run_phpunit_tests($test_id, array($class)); simpletest_process_phpunit_results($results); diff --git a/core/tests/Drupal/KernelTests/AssertConfigTrait.php b/core/tests/Drupal/KernelTests/AssertConfigTrait.php new file mode 100644 index 000000000000..24d393e77ce5 --- /dev/null +++ b/core/tests/Drupal/KernelTests/AssertConfigTrait.php @@ -0,0 +1,92 @@ +<?php + +/** + * @file + * Contains \Drupal\KernelTests\AssertConfigTrait. + */ + +namespace Drupal\KernelTests; + +use Drupal\Component\Diff\Diff; + +/** + * Trait to help with diffing config. + */ +trait AssertConfigTrait { + + /** + * Ensures that a specific config diff does not contain unwanted changes. + * + * @param \Drupal\Component\Diff\Diff $result + * The diff result for the passed in config name. + * @param string $config_name + * The config name to check. + * @param array $skipped_config + * An array of skipped config, keyed by string. If the value is TRUE, the + * entire file will be ignored, otherwise it's an array of strings which are + * ignored. + * + * @throws \Exception + * Thrown when a configuration is different. + */ + 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\DiffOpDelete': + case 'Drupal\Component\Diff\Engine\DiffOpChange': + // It is 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; + + $changes = get_class($op) == 'Drupal\Component\Diff\Engine\DiffOpDelete' ? $op->orig : $op->closing; + foreach ($changes 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; + } + } + } + +} diff --git a/core/tests/Drupal/KernelTests/Config/DefaultConfigTest.php b/core/tests/Drupal/KernelTests/Config/DefaultConfigTest.php new file mode 100644 index 000000000000..77270c34f9b2 --- /dev/null +++ b/core/tests/Drupal/KernelTests/Config/DefaultConfigTest.php @@ -0,0 +1,119 @@ +<?php + +/** + * @file + * Contains \Drupal\KernelTests\Config\DefaultConfigTest. + */ + +namespace Drupal\KernelTests\Config; + +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\AssertConfigTrait; +use Drupal\KernelTests\KernelTestBase; + +/** + * Tests that the installed config matches the default config. + * + * @group Config + */ +class DefaultConfigTest extends KernelTestBase { + + use AssertConfigTrait; + + /** + * {@inheritdoc} + */ + protected static $timeLimit = 500; + + /** + * {@inheritdoc} + */ + public static $modules = ['system', 'user']; + + /** + * {@inheritdoc} + */ + protected function setUp() { + parent::setUp(); + + // @todo ModuleInstaller calls system_rebuild_module_data which is part of + // system.module, see https://www.drupal.org/node/2208429. + include_once $this->root . '/core/modules/system/system.module'; + + // Set up the state values so we know where to find the files when running + // drupal_get_filename(). + // @todo Remove as part of https://www.drupal.org/node/2186491 + system_rebuild_module_data(); + + $this->installSchema('system', 'router'); + } + + /** + * Tests if installed config is equal to the exported config. + * + * @dataProvider providerTestModuleConfig + */ + public function testModuleConfig($module) { + /** @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'); + + $module_installer->install([$module]); + + // System and user are required in order to be able to install some of the + // other modules. Therefore they are put into static::$modules, which though + // doesn't install config files, so import those config files explicitly. + switch ($module) { + case 'system': + case 'user': + $this->installConfig([$module]); + break; + } + + $default_install_path = drupal_get_path('module', $module) . '/' . InstallStorage::CONFIG_INSTALL_DIRECTORY; + $module_config_storage = new FileStorage($default_install_path, StorageInterface::DEFAULT_COLLECTION); + + // The following config entries are changed on module install, so compare + // them doesn't make sense. + $skipped_config = []; + $skipped_config['locale.settings'][] = 'path: '; + $skipped_config['syslog.settings'][] = 'facility: '; + // @todo Figure out why simpletest.settings is not installed. + $skipped_config['simpletest.settings'] = TRUE; + + // 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); + $this->assertConfigDiff($result, $config_name, $skipped_config); + } + } + + /** + * Test data provider for ::testModuleConfig(). + * + * @return array + * An array of module names to test. + */ + public function providerTestModuleConfig() { + $module_dirs = array_keys(iterator_to_array(new \FilesystemIterator(__DIR__ . '/../../../../modules/'))); + $module_names = array_map(function($path) { + return str_replace(__DIR__ . '/../../../../modules/', '', $path); + }, $module_dirs); + $modules_keyed = array_combine($module_names, $module_names); + + $data = array_map(function ($module) { + return [$module]; + }, $modules_keyed); + + return $data; + } + +} + -- GitLab