diff --git a/core/modules/simpletest/src/TestBase.php b/core/modules/simpletest/src/TestBase.php index e822adb..1354d5a 100644 --- a/core/modules/simpletest/src/TestBase.php +++ b/core/modules/simpletest/src/TestBase.php @@ -209,7 +209,7 @@ * * @var bool */ - protected $strictConfigSchema = FALSE; + protected $strictConfigSchema = TRUE; /** * Constructor for Test. diff --git a/core/lib/Drupal/Core/Menu/MenuParentFormSelector.php b/core/lib/Drupal/Core/Menu/MenuParentFormSelector.php index 93bfba1..e5a1264 100644 --- a/core/lib/Drupal/Core/Menu/MenuParentFormSelector.php +++ b/core/lib/Drupal/Core/Menu/MenuParentFormSelector.php @@ -84,18 +84,21 @@ public function parentSelectElement($menu_parent, $id = '', array $menus = NULL) $options = $this->getParentSelectOptions($id, $menus); // If no options were found, there is nothing to select. if ($options) { + $element = array( + '#type' => 'select', + '#options' => $options, + ); if (!isset($options[$menu_parent])) { - // Try putting it at the top level in the current menu. + // The requested menu parent cannot be found in the menu anymore. Try + // setting it to the top level in the current menu. list($menu_name, $parent) = explode(':', $menu_parent, 2); $menu_parent = $menu_name . ':'; } if (isset($options[$menu_parent])) { - return array( - '#type' => 'select', - '#options' => $options, - '#default_value' => $menu_parent, - ); + // Only provide the default value if it is valid among the options. + $element += array('#default_value' => $menu_parent); } + return $element; } return array(); } diff --git a/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_row.yml b/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_row.yml index 5fa0ef5..d49daf7 100644 --- a/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_row.yml +++ b/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_row.yml @@ -113,18 +113,20 @@ display: element_default_classes: true empty: '' hide_alter_empty: true - link_to_node: false + link_to_entity: false + plugin_id: comment filters: status: - value: '1' + value: true table: comment_field_data field: status id: status expose: operator: '' group: 1 + plugin_id: boolean status_node: - value: '1' + value: true table: node_field_data field: status relationship: node @@ -132,6 +134,7 @@ display: expose: operator: '' group: 1 + plugin_id: boolean sorts: { } title: test_comment_row header: { } diff --git a/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_field_filters.yml b/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_field_filters.yml index 4856548..3d0bec3 100644 --- a/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_field_filters.yml +++ b/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_field_filters.yml @@ -84,7 +84,7 @@ display: html: false hide_empty: false empty_zero: false - link_to_comment: 1 + link_to_comment: true relationship: none group_type: group admin_label: '' diff --git a/core/modules/content_translation/tests/modules/content_translation_test_views/test_views/views.view.test_entity_translations_link.yml b/core/modules/content_translation/tests/modules/content_translation_test_views/test_views/views.view.test_entity_translations_link.yml index 805a6d8..61e95a4 100644 --- a/core/modules/content_translation/tests/modules/content_translation_test_views/test_views/views.view.test_entity_translations_link.yml +++ b/core/modules/content_translation/tests/modules/content_translation_test_views/test_views/views.view.test_entity_translations_link.yml @@ -94,8 +94,9 @@ display: table: views field: area empty: true - content: 'No people available.' - format: plain_text + content: + value: 'No people available.' + format: plain_text plugin_id: text field_langcode: '***LANGUAGE_language_content***' field_langcode_add_to_query: null diff --git a/core/modules/entity_reference/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_view.yml b/core/modules/entity_reference/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_view.yml index ffd9f26..abdda33 100644 --- a/core/modules/entity_reference/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_view.yml +++ b/core/modules/entity_reference/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_view.yml @@ -16,7 +16,6 @@ display: fields: false relationships: false pager: false - pager_options: false sorts: false fields: id: @@ -28,7 +27,6 @@ display: id_1: field: id id: id_1 - order: ASC relationship: test_relationship table: entity_test plugin_id: numeric @@ -36,7 +34,6 @@ display: options: offset: 0 type: none - pager_options: { } sorts: id: field: id diff --git a/core/modules/field/config/schema/field.views.schema.yml b/core/modules/field/config/schema/field.views.schema.yml index 9f6d995..56d852d 100644 --- a/core/modules/field/config/schema/field.views.schema.yml +++ b/core/modules/field/config/schema/field.views.schema.yml @@ -26,18 +26,24 @@ views.field.field: type: type: string label: 'Formatter' - field_api_classes: - type: boolean - label: 'Use field template' + settings: + type: sequence + label: 'Settings' + sequence: + - type: string + label: 'Setting' + group_column: + type: string + label: 'Group by column' + group_columns: + type: sequence + label: 'Group by columns' + sequence: + - type: string + label: 'Column' group_rows: type: boolean label: 'Display all values in the same row' - multi_type: - type: string - label: 'Display type' - separator: - type: label - label: 'Separator' delta_limit: type: string label: 'Field' @@ -50,6 +56,15 @@ views.field.field: delta_first_last: type: boolean label: 'First and last only' + multi_type: + type: string + label: 'Display type' + separator: + type: label + label: 'Separator' + field_api_classes: + type: boolean + label: 'Use field template' views.filter.field_list: type: views.filter.many_to_one diff --git a/core/modules/file/config/install/views.view.files.yml b/core/modules/file/config/install/views.view.files.yml index b8c4298..185d142 100644 --- a/core/modules/file/config/install/views.view.files.yml +++ b/core/modules/file/config/install/views.view.files.yml @@ -679,7 +679,6 @@ display: display_description: '' defaults: pager: true - pager_options: true relationships: false relationships: fid: @@ -704,7 +703,6 @@ display: defaults: empty: false pager: false - pager_options: false filters: false filter_groups: false fields: false @@ -732,7 +730,6 @@ display: items_per_page_options_all_label: '- All -' offset: false offset_label: Offset - pager_options: false filters: { } filter_groups: operator: AND diff --git a/core/modules/file/tests/modules/file_test_views/test_views/views.view.file_extension_view.yml b/core/modules/file/tests/modules/file_test_views/test_views/views.view.file_extension_view.yml index ee59f2b..c5149b0 100644 --- a/core/modules/file/tests/modules/file_test_views/test_views/views.view.file_extension_view.yml +++ b/core/modules/file/tests/modules/file_test_views/test_views/views.view.file_extension_view.yml @@ -15,7 +15,6 @@ display: defaults: fields: false pager: false - pager_options: false sorts: false fields: age: @@ -40,7 +39,6 @@ display: options: offset: 0 type: none - pager_options: { } sorts: id: field: id diff --git a/core/modules/node/config/schema/node.views.schema.yml b/core/modules/node/config/schema/node.views.schema.yml index f3521e3..b1d24d9 100644 --- a/core/modules/node/config/schema/node.views.schema.yml +++ b/core/modules/node/config/schema/node.views.schema.yml @@ -94,12 +94,12 @@ views.argument_validator.node: label: 'Filter value format' views.field.node_language: - type: views_field + type: views.field.node label: 'Node language' mapping: - link_to_node: + native_language: type: boolean - label: 'Link this field to the original piece of content' + label: 'Native language' views.field.node: type: views_field diff --git a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_contextual_links.yml b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_contextual_links.yml index 2c2995a..e0f09ae 100644 --- a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_contextual_links.yml +++ b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_contextual_links.yml @@ -90,7 +90,7 @@ display: type: tab title: 'Test contextual link' description: '' - name: tools + menu_name: tools weight: 0 context: '1' field_langcode: '***LANGUAGE_language_content***' diff --git a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_language.yml b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_language.yml index 29764e5..cf5894e 100644 --- a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_language.yml +++ b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_language.yml @@ -107,7 +107,8 @@ display: hide_empty: false empty_zero: false hide_alter_empty: true - link_to_node: 0 + link_to_node: false + plugin_id: node langcode: id: langcode table: node_field_data @@ -157,7 +158,7 @@ display: empty_zero: false hide_alter_empty: true link_to_node: false - native_language: 0 + native_language: false plugin_id: node_language filters: status: @@ -168,12 +169,14 @@ display: expose: operator: '' group: 1 + plugin_id: boolean type: id: type table: node_field_data field: type value: page: page + plugin_id: bundle langcode: id: langcode table: node_field_data diff --git a/core/modules/search/config/schema/search.views.schema.yml b/core/modules/search/config/schema/search.views.schema.yml index 54b5b26..9903e73 100644 --- a/core/modules/search/config/schema/search.views.schema.yml +++ b/core/modules/search/config/schema/search.views.schema.yml @@ -23,6 +23,10 @@ views.filter.search: type: string label: 'On empty input' +views.filter_value.search_keywords: + type: string + label: 'Search keywords' + views.row.search_view: type: views_row label: 'Source link' diff --git a/core/modules/statistics/tests/modules/statistics_test_views/test_views/views.view.test_statistics_integration.yml b/core/modules/statistics/tests/modules/statistics_test_views/test_views/views.view.test_statistics_integration.yml index 20e336d..4836dec 100644 --- a/core/modules/statistics/tests/modules/statistics_test_views/test_views/views.view.test_statistics_integration.yml +++ b/core/modules/statistics/tests/modules/statistics_test_views/test_views/views.view.test_statistics_integration.yml @@ -53,6 +53,7 @@ display: hide_empty: false empty_zero: false link_to_node: true + plugin_id: node timestamp: id: timestamp table: node_counter @@ -104,6 +105,7 @@ display: date_format: html_year custom_date_format: '' timezone: '' + plugin_id: date totalcount: id: totalcount table: node_counter @@ -153,7 +155,7 @@ display: empty_zero: false hide_alter_empty: true set_precision: false - precision: false + precision: 0 decimal: . separator: '' format_plural: false @@ -161,6 +163,7 @@ display: format_plural_plural: '@count' prefix: '' suffix: '' + plugin_id: numeric daycount: id: daycount table: node_counter @@ -210,7 +213,7 @@ display: empty_zero: false hide_alter_empty: true set_precision: false - precision: false + precision: 0 decimal: . separator: '' format_plural: false @@ -218,6 +221,7 @@ display: format_plural_plural: '@count' prefix: '' suffix: '' + plugin_id: numeric filters: status: value: true @@ -227,6 +231,7 @@ display: expose: operator: '' group: 1 + plugin_id: boolean sorts: created: id: created diff --git a/core/modules/taxonomy/config/schema/taxonomy.views.schema.yml b/core/modules/taxonomy/config/schema/taxonomy.views.schema.yml index 560a320..3b46f3d 100644 --- a/core/modules/taxonomy/config/schema/taxonomy.views.schema.yml +++ b/core/modules/taxonomy/config/schema/taxonomy.views.schema.yml @@ -79,17 +79,13 @@ views.argument_default.taxonomy_tid: sequence: - type: string label: 'Vocabulary' + anyall: + type: string + label: 'Multiple-value handling' views.field.taxonomy_term_language: - type: views_field + type: views.field.taxonomy label: 'Taxonomy language' - mapping: - link_to_taxonomy: - type: boolean - label: 'Link this field to its taxonomy term page' - convert_spaces: - type: boolean - label: 'Convert spaces in term names to hyphens' views.field.term_link_edit: type: views_field @@ -110,7 +106,6 @@ views.field.taxonomy: type: boolean label: 'Convert spaces in term names to hyphens' - views.field.taxonomy_index_tid: type: views_field label: 'Taxonomy language' @@ -135,18 +130,9 @@ views.field.taxonomy_index_tid: label: 'Vocabulary' views.filter.taxonomy_index_tid: - type: views.filter.in_operator + type: views.filter.many_to_one label: 'Taxonomy term ID' mapping: - operator: - type: string - label: 'Operator' - value: - type: sequence - label: 'Values' - sequence: - - type: string - label: 'Value' vid: type: string label: 'Vocabulary' @@ -156,6 +142,12 @@ views.filter.taxonomy_index_tid: hierarchy: type: boolean label: 'Show hierarchy in dropdown' + limit: + type: boolean + label: 'Limit to vocabulary' + error_message: + type: boolean + label: 'Display error message' views.filter.taxonomy_index_tid_depth: type: views.filter.in_operator diff --git a/core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTid.php b/core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTid.php index 071b2f8..cf57b6f 100644 --- a/core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTid.php +++ b/core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTid.php @@ -48,7 +48,7 @@ protected function defineOptions() { $options['type'] = array('default' => 'textfield'); $options['limit'] = array('default' => TRUE); $options['vid'] = array('default' => ''); - $options['hierarchy'] = array('default' => 0); + $options['hierarchy'] = array('default' => FALSE); $options['error_message'] = array('default' => TRUE); return $options; diff --git a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.taxonomy_default_argument_test.yml b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.taxonomy_default_argument_test.yml index aeac763..e8d3e30 100644 --- a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.taxonomy_default_argument_test.yml +++ b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.taxonomy_default_argument_test.yml @@ -95,7 +95,7 @@ display: html: false hide_empty: false empty_zero: false - link_to_taxonomy: 1 + link_to_taxonomy: true relationship: none group_type: group admin_label: '' @@ -111,6 +111,7 @@ display: empty: '' hide_alter_empty: true convert_spaces: false + plugin_id: taxonomy filters: { } sorts: { } header: { } diff --git a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_field_filters.yml b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_field_filters.yml index 23d7d3e..133ee54 100644 --- a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_field_filters.yml +++ b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_field_filters.yml @@ -70,7 +70,7 @@ display: html: false hide_empty: false empty_zero: false - link_to_taxonomy: 1 + link_to_taxonomy: true relationship: none group_type: group admin_label: '' @@ -86,6 +86,7 @@ display: empty: '' hide_alter_empty: true convert_spaces: false + plugin_id: taxonomy filters: name: id: name diff --git a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_filter_taxonomy_index_tid.yml b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_filter_taxonomy_index_tid.yml index 1d4d44f..7671e0f 100644 --- a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_filter_taxonomy_index_tid.yml +++ b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_filter_taxonomy_index_tid.yml @@ -112,6 +112,7 @@ display: element_default_classes: true empty: '' hide_alter_empty: true + plugin_id: node filters: status: value: true @@ -121,6 +122,7 @@ display: expose: operator: '0' group: 1 + plugin_id: boolean tid: id: tid table: taxonomy_index diff --git a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_groupwise_term.yml b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_groupwise_term.yml index 68cf51f..20bfe3b 100644 --- a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_groupwise_term.yml +++ b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_groupwise_term.yml @@ -42,11 +42,10 @@ display: type: views_query relationships: tid_representative: - admin_label: '' + admin_label: 'Representative node' field: tid_representative group_type: group id: tid_representative - label: 'Representative node' relationship: none required: false subquery_namespace: '' diff --git a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_node_term_data.yml b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_node_term_data.yml index 2bda51d..2afdfb1 100644 --- a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_node_term_data.yml +++ b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_node_term_data.yml @@ -55,7 +55,7 @@ display: term_node_tid: field: term_node_tid id: term_node_tid - label: 'Term #1' + admin_label: 'Term #1' table: node vids: tags: '' @@ -63,7 +63,7 @@ display: term_node_tid_1: field: term_node_tid id: term_node_tid_1 - label: 'Term #2' + admin_label: 'Term #2' table: node vids: tags: '' diff --git a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_parent.yml b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_parent.yml index d9d3931..b80befb 100644 --- a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_parent.yml +++ b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_parent.yml @@ -96,7 +96,7 @@ display: html: false hide_empty: false empty_zero: false - link_to_taxonomy: 1 + link_to_taxonomy: true relationship: none group_type: group admin_label: '' @@ -112,6 +112,7 @@ display: empty: '' hide_alter_empty: true convert_spaces: false + plugin_id: taxonomy filters: { } sorts: { } header: { } diff --git a/core/modules/tracker/tests/modules/tracker_test_views/test_views/views.view.test_tracker_user_uid.yml b/core/modules/tracker/tests/modules/tracker_test_views/test_views/views.view.test_tracker_user_uid.yml index efeaf3a..f87de54 100644 --- a/core/modules/tracker/tests/modules/tracker_test_views/test_views/views.view.test_tracker_user_uid.yml +++ b/core/modules/tracker/tests/modules/tracker_test_views/test_views/views.view.test_tracker_user_uid.yml @@ -103,6 +103,7 @@ display: empty_zero: false hide_alter_empty: true link_to_node: true + plugin_id: node filters: uid_touch_tracker: id: uid_touch_tracker diff --git a/core/modules/user/config/schema/user.views.schema.yml b/core/modules/user/config/schema/user.views.schema.yml index f8ab213..7ef485e 100644 --- a/core/modules/user/config/schema/user.views.schema.yml +++ b/core/modules/user/config/schema/user.views.schema.yml @@ -129,6 +129,17 @@ views.field.user_bulk_form: type: views_field_bulk_form label: 'User operations bulk form' +views.field.user_data: + type: views_field + label: 'User data field' + mapping: + data_module: + type: string + label: 'Module name' + data_name: + type: string + label: 'Name' + views.filter.user_current: type: views.filter.boolean label: 'Current user' diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_groupwise_user.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_groupwise_user.yml index deaa942..0ed9fd5 100644 --- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_groupwise_user.yml +++ b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_groupwise_user.yml @@ -16,7 +16,8 @@ display: default: display_options: access: - perm: 'access user profiles' + options: + perm: 'access user profiles' type: perm cache: type: none @@ -52,11 +53,10 @@ display: type: views_query relationships: uid_representative: - admin_label: '' + admin_label: 'Representative node' field: uid_representative group_type: group id: uid_representative - label: 'Representative node' relationship: none required: false subquery_namespace: '' diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_plugin_argument_default_current_user.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_plugin_argument_default_current_user.yml index 2731db1..b83989c 100644 --- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_plugin_argument_default_current_user.yml +++ b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_plugin_argument_default_current_user.yml @@ -22,9 +22,9 @@ display: default_argument_type: current_user field: 'null' id: 'null' - must_not_be: '0' - style_plugin: default_summary + must_not_be: false table: views + plugin_id: 'null' cache: type: none exposed_form: @@ -43,8 +43,9 @@ display: field: title hide_empty: false id: title - link_to_node: '0' + link_to_node: false table: node_field_data + plugin_id: node pager: options: id: 0 diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_changed.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_changed.yml index fc7ba4e..4b65b37 100644 --- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_changed.yml +++ b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_changed.yml @@ -37,6 +37,7 @@ display: field: changed label: 'Updated date' date_format: html_date + plugin_id: date filters: { } field_langcode: '***LANGUAGE_language_content***' field_langcode_add_to_query: null diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_data.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_data.yml index 51bc05b..f4d517b 100644 --- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_data.yml +++ b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_data.yml @@ -20,7 +20,8 @@ display: display_options: access: type: perm - perm: 'access user profiles' + options: + perm: 'access user profiles' cache: type: none query: @@ -50,9 +51,9 @@ display: html: false hide_empty: false empty_zero: false - link_to_user: '1' - overwrite_anonymous: '0' - plugin_id: string + link_to_user: true + overwrite_anonymous: false + plugin_id: user_name data: id: data table: users @@ -107,7 +108,7 @@ display: filters: uid: value: - - '2' + value: '2' table: users field: uid id: uid diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_view_argument_validate_user.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_view_argument_validate_user.yml index d19fe78..99c541a 100644 --- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_view_argument_validate_user.yml +++ b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_view_argument_validate_user.yml @@ -20,7 +20,6 @@ display: field: 'null' id: 'null' must_not_be: false - style_plugin: default_summary table: views validate: type: 'entity:user' diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_view_argument_validate_username.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_view_argument_validate_username.yml index 09fda94..af599f8 100644 --- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_view_argument_validate_username.yml +++ b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_view_argument_validate_username.yml @@ -20,7 +20,6 @@ display: field: 'null' id: 'null' must_not_be: false - style_plugin: default_summary table: views validate: type: user_name diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_views_handler_field_role.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_views_handler_field_role.yml index 35590a8..c4ecb23 100644 --- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_views_handler_field_role.yml +++ b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_views_handler_field_role.yml @@ -20,7 +20,8 @@ display: display_options: access: type: perm - perm: 'access user profiles' + options: + perm: 'access user profiles' cache: type: none query: diff --git a/core/modules/views/config/schema/views.area.schema.yml b/core/modules/views/config/schema/views.area.schema.yml index b75deb1..58ff0d2 100644 --- a/core/modules/views/config/schema/views.area.schema.yml +++ b/core/modules/views/config/schema/views.area.schema.yml @@ -54,7 +54,6 @@ views.area.result: type: text label: 'The shown text of the result summary area' - views.area.title: type: views_area label: 'Title' @@ -70,6 +69,15 @@ views.area.view: view_to_insert: type: string label: 'View to insert' - inherit_to_arguments: + inherit_arguments: type: boolean label: 'Inherit contextual filters' + +views.area.http_status_code: + type: views_area + label: 'HTTP status code' + mapping: + status_code: + type: integer + label: 'HTTP status code' + diff --git a/core/modules/views/config/schema/views.data_types.schema.yml b/core/modules/views/config/schema/views.data_types.schema.yml index d05fa57..c2c2ffc 100644 --- a/core/modules/views/config/schema/views.data_types.schema.yml +++ b/core/modules/views/config/schema/views.data_types.schema.yml @@ -154,6 +154,9 @@ views_display: exposed_form: type: boolean label: 'Exposed form style' + exposed_form_options: + type: boolean + label: 'Exposed form options' link_display: type: boolean label: 'Link display' @@ -190,6 +193,12 @@ views_display: pager_options: type: boolean label: 'Pager options' + header: + type: boolean + label: 'Header' + footer: + type: boolean + label: 'Footer' relationships: type: sequence label: 'Relationships' @@ -260,6 +269,9 @@ views_display: contexts: type: sequence label: 'Cache contexts' + exposed_block: + type: boolean + label: 'Put the exposed form in a block' views_sort: type: views_handler diff --git a/core/modules/views/src/Tests/Entity/ViewEntityDependenciesTest.php b/core/modules/views/src/Tests/Entity/ViewEntityDependenciesTest.php index d3c19bb..5b36b62 100644 --- a/core/modules/views/src/Tests/Entity/ViewEntityDependenciesTest.php +++ b/core/modules/views/src/Tests/Entity/ViewEntityDependenciesTest.php @@ -99,10 +99,10 @@ public function testCalculateDependencies() { // The argument handler has an explicit dependency on views_test_data. 'views_test_data', ], - 'test_dependency' => [ - 'access', - 'row', - 'style', + 'content' => [ + 'RowTest', + 'StaticTest', + 'StyleTest', ] ]; foreach ($this::$testViews as $view_id) { diff --git a/core/modules/views/src/Tests/TestViewsTest.php b/core/modules/views/src/Tests/TestViewsTest.php new file mode 100644 index 0000000..ca869ea --- /dev/null +++ b/core/modules/views/src/Tests/TestViewsTest.php @@ -0,0 +1,61 @@ +listAll() as $config_name) { + // Skip files provided by the config_schema_test module since that module + // is explicitly for testing schema. + if (strpos($config_name, 'config_schema_test') === 0) { + continue; + } + + $data = $default_config_storage->read($config_name); + $this->assertConfigSchema($typed_config, $config_name, $data); + } + } + +} diff --git a/core/modules/views/src/Tests/ViewElementTest.php b/core/modules/views/src/Tests/ViewElementTest.php index c252af8..c0b7829 100644 --- a/core/modules/views/src/Tests/ViewElementTest.php +++ b/core/modules/views/src/Tests/ViewElementTest.php @@ -83,13 +83,8 @@ public function testViewElement() { $view->displayHandlers->get('default')->overrideOption('arguments', array( 'age' => array( 'default_action' => 'ignore', - 'style_plugin' => 'default_summary', - 'style_options' => array(), - 'wildcard' => 'all', - 'wildcard_substitution' => 'All', 'title' => '', 'default_argument_type' => 'fixed', - 'default_argument' => '', 'validate' => array( 'type' => 'none', 'fail' => 'not found', @@ -99,7 +94,6 @@ public function testViewElement() { 'id' => 'age', 'table' => 'views_test_data', 'field' => 'age', - 'validate_user_argument_type' => 'uid', ) )); $view->save(); diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_aggregate_count.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_aggregate_count.yml index bdc8b2f..71f537c 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_aggregate_count.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_aggregate_count.yml @@ -42,7 +42,6 @@ display: field: id hide_empty: false id: id - link_to_node: '0' table: entity_test plugin_id: numeric group_by: true diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_ajax_view.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_ajax_view.yml index c1c781e..1a67001 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_ajax_view.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_ajax_view.yml @@ -15,7 +15,6 @@ display: defaults: fields: false pager: false - pager_options: false sorts: false fields: age: @@ -41,7 +40,6 @@ display: offset: 0 items_per_page: 2 type: mini - pager_options: { } sorts: id: field: id diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_alias.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_alias.yml index 00fa31e..e4bdecd 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_alias.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_alias.yml @@ -15,7 +15,8 @@ display: default: display_options: access: - perm: 'access user profiles' + options: + perm: 'access user profiles' type: perm cache: type: none @@ -87,7 +88,6 @@ display: type: views_query row: type: fields - style_plugin: default field_langcode: '***LANGUAGE_language_content***' field_langcode_add_to_query: null display_plugin: default diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_area_title.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_area_title.yml index 002d0ce..f8ee30a 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_area_title.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_area_title.yml @@ -15,7 +15,6 @@ display: defaults: fields: false pager: false - pager_options: false sorts: false fields: id: @@ -28,7 +27,6 @@ display: options: offset: 0 type: none - pager_options: { } sorts: id: field: id @@ -54,7 +52,7 @@ display: display_options: path: test-area-title defaults: - header: '0' + header: false header: title: field: title diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_area_view.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_area_view.yml index 9f53750..68302cb 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_area_view.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_area_view.yml @@ -15,7 +15,6 @@ display: defaults: fields: false pager: false - pager_options: false sorts: false fields: id: @@ -28,7 +27,6 @@ display: options: offset: 0 type: none - pager_options: { } sorts: id: field: id @@ -43,7 +41,7 @@ display: id: view table: views view_to_insert: 'test_simple_argument:default' - inherit_arguments: 1 + inherit_arguments: true plugin_id: view field_langcode: '***LANGUAGE_language_content***' field_langcode_add_to_query: null diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_date.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_date.yml index 32dd3fe..aa218bf 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_date.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_date.yml @@ -15,7 +15,6 @@ display: defaults: fields: false pager: false - pager_options: false sorts: false arguments: date_fulldate: @@ -34,7 +33,6 @@ display: options: offset: 0 type: none - pager_options: { } sorts: id: field: id diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_default_fixed.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_default_fixed.yml index 50ee050..cb2813b 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_default_fixed.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_default_fixed.yml @@ -23,7 +23,6 @@ display: field: 'null' id: 'null' must_not_be: false - style_plugin: default_summary table: views plugin_id: 'null' cache: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_click_sort.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_click_sort.yml index b76aec3..8cfdba2 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_click_sort.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_click_sort.yml @@ -2,7 +2,6 @@ langcode: und status: true dependencies: { } id: test_click_sort -label: { } module: views description: '' tag: '' @@ -31,11 +30,10 @@ display: field: created label: created plugin_id: date - display_options: - access: - type: none - cache: - type: none + access: + type: none + cache: + type: none style: type: table options: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_destroy.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_destroy.yml index 7e9a8b2..08dacbb 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_destroy.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_destroy.yml @@ -23,21 +23,18 @@ display: default_argument_type: fixed field: created_day id: created_day - style_plugin: default_summary table: node_field_data plugin_id: date_day created_fulldate: default_argument_type: fixed field: created_fulldate id: created_fulldate - style_plugin: default_summary table: node_field_data plugin_id: date_fulldate created_month: default_argument_type: fixed field: created_month id: created_month - style_plugin: default_summary table: node_field_data plugin_id: date_month cache: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display.yml index b727a2a..3a0189b 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display.yml @@ -52,7 +52,6 @@ display: order: DESC table: node_field_data plugin_id: date - style_plugin: default title: 'Test Display' field_langcode: '***LANGUAGE_language_content***' field_langcode_add_to_query: null @@ -64,22 +63,16 @@ display: display_options: defaults: pager: false - pager_options: false - style_options: '0' - style_plugin: '0' fields: title: - link_to_node: '1' + link_to_node: true plugin_id: node pager: options: items_per_page: 5 type: some - pager_options: { } row: type: fields - style_options: { } - style_plugin: default field_langcode: '***LANGUAGE_language_content***' field_langcode_add_to_query: null display_plugin: block diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_attachment.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_attachment.yml index ab78656..bafbdc9 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_attachment.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_attachment.yml @@ -49,7 +49,6 @@ display: html: false hide_empty: false empty_zero: false - link_to_node: '1' title: test_display_attachment field_langcode: '***LANGUAGE_language_content***' field_langcode_add_to_query: null diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_empty.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_empty.yml index dbae270..237b401 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_empty.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_empty.yml @@ -15,7 +15,6 @@ display: defaults: fields: false pager: false - pager_options: false sorts: false fields: id: @@ -28,7 +27,6 @@ display: options: offset: 0 type: none - pager_options: { } header: area: field: area diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_more.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_more.yml index a97d7f7..857c0c0 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_more.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_more.yml @@ -15,7 +15,6 @@ display: defaults: fields: false pager: false - pager_options: false sorts: false fields: id: @@ -28,7 +27,6 @@ display: options: offset: 0 type: none - pager_options: { } sorts: id: field: id diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_dropbutton.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_dropbutton.yml index 65cb57b..5447c42 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_dropbutton.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_dropbutton.yml @@ -234,8 +234,5 @@ display: position: null display_options: path: test-dropbutton - field: - title: - link_to_node: '0' field_langcode: '***LANGUAGE_language_content***' field_langcode_add_to_query: null diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_area.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_area.yml index f2beef2..38bbf78 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_area.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_area.yml @@ -15,7 +15,6 @@ display: defaults: fields: false pager: false - pager_options: false sorts: false header: entity_entity_test: @@ -50,7 +49,6 @@ display: options: offset: 0 type: none - pager_options: { } field_langcode: '***LANGUAGE_language_content***' field_langcode_add_to_query: null display_plugin: default diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_row.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_row.yml index f6c628a..a0b397c 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_row.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_row.yml @@ -15,13 +15,11 @@ display: defaults: fields: false pager: false - pager_options: false sorts: false pager: options: offset: 0 type: none - pager_options: { } row: type: 'entity:taxonomy_term' options: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_row_renderers.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_row_renderers.yml index 06902bd..3aba1c0 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_row_renderers.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_row_renderers.yml @@ -21,13 +21,11 @@ display: defaults: fields: false pager: false - pager_options: false sorts: false pager: options: offset: 0 type: none - pager_options: { } row: type: 'entity:node' options: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_type_filter.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_type_filter.yml index 9d6d5bb..a628e83 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_type_filter.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_type_filter.yml @@ -72,6 +72,7 @@ display: hide_empty: false empty_zero: false hide_alter_empty: true + plugin_id: node_type defaults: fields: false filters: false @@ -85,5 +86,6 @@ display: all: all test_bundle: test_bundle test_bundle_2: test_bundle_2 + plugin_id: bundle field_langcode: '***LANGUAGE_language_content***' field_langcode_add_to_query: null diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_example_area.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_example_area.yml index 6abe0e2..d472bc0 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_example_area.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_example_area.yml @@ -2,7 +2,6 @@ langcode: und status: true dependencies: { } id: test_example_area -label: { } module: views description: '' tag: '' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_block.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_block.yml index 8c68841..86f1486 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_block.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_block.yml @@ -28,12 +28,12 @@ display: identifier: type label: 'Content: Type' operator_id: type_op - reduce: '0' + reduce: false exposed: true field: type id: type table: node_field_data - plugin_id: node_type + plugin_id: in_operator pager: type: full query: @@ -53,7 +53,7 @@ display: page_1: display_options: path: test_exposed_block - exposed_block: '1' + exposed_block: true field_langcode: '***LANGUAGE_language_content***' field_langcode_add_to_query: null display_plugin: page diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_form_buttons.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_form_buttons.yml index 5d87695..7d5978c 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_form_buttons.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_form_buttons.yml @@ -28,12 +28,12 @@ display: identifier: type label: 'Content: Type' operator_id: type_op - reduce: '0' + reduce: false exposed: true field: type id: type table: node_field_data - plugin_id: node_type + plugin_id: in_operator pager: type: full query: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_classes.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_classes.yml index 3c134e7..e45746f 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_classes.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_classes.yml @@ -2,7 +2,6 @@ langcode: und status: true dependencies: { } id: test_field_classes -label: { } module: views description: '' tag: '' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_get_entity.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_get_entity.yml index ed818a1..d61789d 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_get_entity.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_get_entity.yml @@ -56,11 +56,10 @@ display: table: comment_field_data plugin_id: standard uid: - admin_label: '' + admin_label: 'Author' field: uid group_type: group id: uid - label: author relationship: node required: false table: node_field_data diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_in_operator_ui.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_in_operator_ui.yml index 2aa2ddd..a95a984 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_in_operator_ui.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_in_operator_ui.yml @@ -24,13 +24,13 @@ display: identifier: type label: 'Content: Type' operator_id: type_op - reduce: '0' + reduce: false use_operator: false exposed: true field: type id: type table: node_field_data - plugin_id: string + plugin_id: in_operator pager: type: full style: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_grid.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_grid.yml index 9167fc3..622ace0 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_grid.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_grid.yml @@ -15,7 +15,6 @@ display: defaults: fields: false pager: false - pager_options: false sorts: false fields: age: @@ -40,7 +39,6 @@ display: options: offset: 0 type: none - pager_options: { } sorts: id: field: id diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_group_by_count.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_group_by_count.yml index 786b5c8..0226ad2 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_group_by_count.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_group_by_count.yml @@ -30,7 +30,7 @@ display: word_boundary: true empty_zero: false field: id - group_type: { } + group_type: group hide_empty: false id: id table: entity_test diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_groupwise_term_ui.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_groupwise_term_ui.yml index a4ffadb..bd2d65e 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_groupwise_term_ui.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_groupwise_term_ui.yml @@ -42,11 +42,10 @@ display: type: views_query relationships: tid_representative: - admin_label: '' + admin_label: 'Representative node' field: tid_representative group_type: group id: tid_representative - label: 'Representative node' relationship: none required: false subquery_namespace: '' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_history.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_history.yml index ee4dcc9..b8b74cd 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_history.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_history.yml @@ -186,7 +186,8 @@ display: group_type: group admin_label: '' operator: '=' - value: '' + value: + value: '' group: 1 exposed: false expose: @@ -213,6 +214,7 @@ display: default_group: All default_group_multiple: { } group_items: { } + plugin_id: date defaults: filters: false filter_groups: false diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_http_status_code.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_http_status_code.yml index b26cdc5..bd2334c 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_http_status_code.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_http_status_code.yml @@ -49,16 +49,18 @@ display: html: false hide_empty: false empty_zero: false - link_to_node: '1' + link_to_node: true + plugin_id: node filters: status: - value: '1' + value: true table: node field: status id: status expose: operator: '0' group: 1 + plugin_id: boolean sorts: created: id: created @@ -75,7 +77,8 @@ display: admin_label: '' label: '' empty: true - status_code: '200' + status_code: 200 + plugin_id: http_status_code field_langcode: '***LANGUAGE_language_content***' field_langcode_add_to_query: null page_1: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display.yml index 8f47f63..7396031 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display.yml @@ -15,7 +15,6 @@ display: defaults: fields: false pager: false - pager_options: false sorts: false fields: age: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_arguments.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_arguments.yml index f147876..2b3ff40 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_arguments.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_arguments.yml @@ -15,7 +15,6 @@ display: defaults: fields: false pager: false - pager_options: false sorts: false fields: id: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_menu.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_menu.yml index 7737c62..c9b40a5 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_menu.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_menu.yml @@ -15,7 +15,6 @@ display: defaults: fields: false pager: false - pager_options: false sorts: false fields: id: @@ -101,7 +100,7 @@ display: title: 'Test child' parent: system.admin description: '' - name: tools + menu_name: tools weight: 0 context: '0' defaults: @@ -121,7 +120,7 @@ display: title: 'Test child' parent: system.admin description: '' - name: not-existing-menu-name + menu_name: not-existing-menu-name weight: 0 context: '0' defaults: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_route.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_route.yml index f5addb2..7b412f9 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_route.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_route.yml @@ -3,8 +3,8 @@ status: true dependencies: module: - views_test_data - test_dependency: - - access + content: + - StaticTest id: test_page_display_route label: '' module: views @@ -19,7 +19,6 @@ display: defaults: fields: false pager: false - pager_options: false sorts: false fields: id: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_view.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_view.yml index fffb2ff..3909cf7 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_view.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_view.yml @@ -15,7 +15,6 @@ display: defaults: fields: false pager: false - pager_options: false sorts: false fields: age: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_plugin_dependencies.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_plugin_dependencies.yml index 635faf9..d4b73cd 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_plugin_dependencies.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_plugin_dependencies.yml @@ -4,10 +4,10 @@ dependencies: module: - comment - views_test_data - test_dependency: - - access - - row - - style + content: + - StaticTest + - RowTest + - StyleTest id: test_plugin_dependencies label: test_plugin_dependencies module: views @@ -27,7 +27,6 @@ display: default_argument_type: fixed id: 'null' must_not_be: false - style_plugin: default_summary table: views field: null plugin_id: 'null' @@ -49,7 +48,7 @@ display: type: full query: type: views_query - relationships: null + relationships: { } sorts: { } style: type: test_style diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_search.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_search.yml index 844e44d..1e89c1a 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_search.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_search.yml @@ -73,7 +73,7 @@ display: html: false hide_empty: false empty_zero: false - link_to_node: 1 + link_to_node: true relationship: none group_type: group admin_label: '' @@ -89,6 +89,7 @@ display: element_default_classes: true empty: '' hide_alter_empty: true + plugin_id: node filters: status: value: true @@ -130,13 +131,14 @@ display: display_description: '' filters: status: - value: '1' + value: true table: node_field_data field: status id: status expose: operator: '' group: 1 + plugin_id: boolean keys: id: keys table: node_search_index @@ -194,13 +196,14 @@ display: display_description: '' filters: status: - value: '1' + value: true table: node_field_data field: status id: status expose: operator: '' group: 1 + plugin_id: boolean defaults: filters: false filter_groups: false diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_simple_argument.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_simple_argument.yml index f99308c..651ef5b 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_simple_argument.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_simple_argument.yml @@ -15,7 +15,6 @@ display: defaults: fields: false pager: false - pager_options: false sorts: false arguments: false fields: @@ -38,7 +37,6 @@ display: options: offset: 0 type: none - pager_options: { } sorts: id: field: id @@ -49,39 +47,18 @@ display: arguments: age: default_action: ignore - style_plugin: default_summary - style_options: { } - wildcard: all - wildcard_substitution: All title: '' default_argument_type: fixed - default_argument: '' validate: type: none fail: 'not found' break_phrase: false - not: '0' + not: false id: age table: views_test_data field: age - validate_user_argument_type: uid - validate_user_roles: - 2: '0' relationship: none - default_options_div_prefix: '' - default_argument_user: '0' - default_argument_fixed: '' - default_argument_php: '' - validate_argument_node_type: - page: '0' - story: '0' - validate_argument_node_access: '0' - validate_argument_nid_type: nid - validate_argument_vocabulary: { } - validate_argument_type: tid - validate_argument_transform: '0' - validate_user_restrict_roles: '0' - validate_argument_php: '' + plugin_id: numeric field_langcode: '***LANGUAGE_language_content***' field_langcode_add_to_query: null display_plugin: default diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_style_mapping.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_style_mapping.yml index a72852e..81a8c88 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_style_mapping.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_style_mapping.yml @@ -17,7 +17,6 @@ display: defaults: fields: false pager: false - pager_options: false sorts: false fields: age: @@ -42,7 +41,6 @@ display: options: offset: 0 type: none - pager_options: { } sorts: id: field: id @@ -59,8 +57,8 @@ display: numeric_field: age: age title_field: name - toggle_numeric_field: '1' - toggle_title_field: '1' + toggle_numeric_field: true + toggle_title_field: true field_langcode: '***LANGUAGE_language_content***' field_langcode_add_to_query: null display_plugin: default diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_table.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_table.yml index 8a4f3f4..8d2bba4 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_table.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_table.yml @@ -15,7 +15,6 @@ display: defaults: fields: false pager: false - pager_options: false sorts: false fields: age: @@ -40,7 +39,6 @@ display: options: offset: 0 type: none - pager_options: { } sorts: id: field: id diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_tag_cache.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_tag_cache.yml index 4e816ea..b83e7a8 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_tag_cache.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_tag_cache.yml @@ -32,7 +32,7 @@ display: word_boundary: true empty_zero: false field: nid - group_type: { } + group_type: group hide_empty: false id: nid table: node diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_tokens.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_tokens.yml index 8214abe..cc7732d 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_tokens.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_tokens.yml @@ -16,7 +16,6 @@ display: defaults: fields: false pager: false - pager_options: false sorts: false fields: age: @@ -41,7 +40,6 @@ display: type: full options: items_per_page: 10 - pager_options: { } field_langcode: '***LANGUAGE_language_content***' field_langcode_add_to_query: null display_plugin: default diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view.yml index 8055ae8..8a32058 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view.yml @@ -15,7 +15,6 @@ display: defaults: fields: false pager: false - pager_options: false sorts: false row: type: fields diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_argument_validate_numeric.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_argument_validate_numeric.yml index 6f09560..313b763 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_argument_validate_numeric.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_argument_validate_numeric.yml @@ -20,7 +20,6 @@ display: field: 'null' id: 'null' must_not_be: false - style_plugin: default_summary table: views validate: type: numeric diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_broken.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_broken.yml index d2088a0..f247a1e 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_broken.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_broken.yml @@ -15,7 +15,6 @@ display: defaults: fields: false pager: false - pager_options: false sorts: false fields: id_broken: @@ -78,7 +77,6 @@ display: options: offset: 0 type: none - pager_options: { } field_langcode: '***LANGUAGE_language_content***' field_langcode_add_to_query: null display_plugin: default diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_display_template.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_display_template.yml index 549cf71..2c2abd5 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_display_template.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_display_template.yml @@ -19,7 +19,6 @@ display: position: 1 display_options: access: { } - cache: { } query: { } pager: { } style: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_empty.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_empty.yml index 41739a0..95b533b 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_empty.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_empty.yml @@ -15,7 +15,6 @@ display: defaults: fields: false pager: false - pager_options: false sorts: false fields: id: @@ -28,7 +27,6 @@ display: options: offset: 0 type: none - pager_options: { } field_langcode: '***LANGUAGE_language_content***' field_langcode_add_to_query: null display_plugin: default diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_handler_weight.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_handler_weight.yml index 6c7ee9d..9b5c3d4 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_handler_weight.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_handler_weight.yml @@ -15,7 +15,6 @@ display: defaults: fields: false pager: false - pager_options: false sorts: false fields: id: @@ -40,7 +39,6 @@ display: options: offset: 0 type: none - pager_options: { } sorts: id: field: id diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_render.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_render.yml index 0e532b1..1dec7f0 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_render.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_render.yml @@ -15,7 +15,6 @@ display: defaults: fields: false pager: false - pager_options: false sorts: false fields: age: @@ -40,7 +39,6 @@ display: options: offset: 0 type: none - pager_options: { } sorts: id: field: id diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_storage.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_storage.yml index f42a34d..5a8ad5f 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_storage.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_storage.yml @@ -15,7 +15,6 @@ display: defaults: fields: false pager: false - pager_options: false sorts: false fields: id: diff --git a/core/modules/views/tests/modules/views_test_data/config/schema/views_test_data.views.schema.yml b/core/modules/views/tests/modules/views_test_data/config/schema/views_test_data.views.schema.yml new file mode 100644 index 0000000..4b51a2b --- /dev/null +++ b/core/modules/views/tests/modules/views_test_data/config/schema/views_test_data.views.schema.yml @@ -0,0 +1,28 @@ +# Schema for the views plugins of the Views test data module. + +views.style.mapping_test: + type: views_style + label: 'Mapping test style' + mapping: + mapping: + type: mapping + label: 'Mapping' + mapping: + name_field: + type: string + label: 'Name field' + title_field: + type: string + label: 'Title field' + numeric_field: + type: sequence + label: 'Numeric fields' + sequence: + - type: string + label: 'Numeric field' + toggle_numeric_field: + type: boolean + label: 'Toggle numeric field' + toggle_title_field: + type: boolean + label: 'Toggle title field' diff --git a/core/modules/views/tests/modules/views_test_data/src/Plugin/views/access/StaticTest.php b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/access/StaticTest.php index 0f95a09..d0fa62f 100644 --- a/core/modules/views/tests/modules/views_test_data/src/Plugin/views/access/StaticTest.php +++ b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/access/StaticTest.php @@ -47,7 +47,7 @@ public function alterRouteDefinition(Route $route) { */ public function calculateDependencies() { return [ - 'test_dependency' => ['access'], + 'content' => ['StaticTest'], ]; } diff --git a/core/modules/views/tests/modules/views_test_data/src/Plugin/views/argument_default/ArgumentDefaultTest.php b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/argument_default/ArgumentDefaultTest.php index 91f2a39..7c6afbb 100644 --- a/core/modules/views/tests/modules/views_test_data/src/Plugin/views/argument_default/ArgumentDefaultTest.php +++ b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/argument_default/ArgumentDefaultTest.php @@ -41,7 +41,7 @@ public function getArgument() { */ public function calculateDependencies() { return [ - 'test_dependency' => ['argument_default'], + 'content' => ['ArgumentDefaultTest'], ]; } diff --git a/core/modules/views/tests/modules/views_test_data/src/Plugin/views/display/DisplayTest.php b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/display/DisplayTest.php index c466fa9..442285c 100644 --- a/core/modules/views/tests/modules/views_test_data/src/Plugin/views/display/DisplayTest.php +++ b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/display/DisplayTest.php @@ -145,7 +145,7 @@ public function preview() { */ public function calculateDependencies() { return parent::calculateDependencies() + [ - 'test_dependency' => ['display'], + 'content' => ['DisplayTest'], ]; } diff --git a/core/modules/views/tests/modules/views_test_data/src/Plugin/views/query/QueryTest.php b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/query/QueryTest.php index f81c500..58ac453 100644 --- a/core/modules/views/tests/modules/views_test_data/src/Plugin/views/query/QueryTest.php +++ b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/query/QueryTest.php @@ -151,7 +151,7 @@ public function match($element, $condition) { */ public function calculateDependencies() { return parent::calculateDependencies() + [ - 'test_dependency' => ['query'], + 'content' => ['QueryTest'], ]; } diff --git a/core/modules/views/tests/modules/views_test_data/src/Plugin/views/row/RowTest.php b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/row/RowTest.php index f4489e1..f3c8d9e 100644 --- a/core/modules/views/tests/modules/views_test_data/src/Plugin/views/row/RowTest.php +++ b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/row/RowTest.php @@ -87,7 +87,7 @@ public function render($row) { */ public function calculateDependencies() { return [ - 'test_dependency' => ['row'], + 'content' => ['RowTest'], ]; } diff --git a/core/modules/views/tests/modules/views_test_data/src/Plugin/views/style/StyleTest.php b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/style/StyleTest.php index 1f891cc..a81ac82 100644 --- a/core/modules/views/tests/modules/views_test_data/src/Plugin/views/style/StyleTest.php +++ b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/style/StyleTest.php @@ -116,7 +116,7 @@ public function render() { */ public function calculateDependencies() { return [ - 'test_dependency' => ['style'], + 'content' => ['StyleTest'], ]; } diff --git a/core/modules/views/tests/modules/views_test_data/test_views/views.view.test_access_static.yml b/core/modules/views/tests/modules/views_test_data/test_views/views.view.test_access_static.yml index a09bc80..7835dc9 100644 --- a/core/modules/views/tests/modules/views_test_data/test_views/views.view.test_access_static.yml +++ b/core/modules/views/tests/modules/views_test_data/test_views/views.view.test_access_static.yml @@ -3,8 +3,8 @@ status: true dependencies: module: - views_test_data - test_dependency: - - access + content: + - StaticTest id: test_access_static label: '' module: views