diff --git a/core/modules/action/tests/action_bulk_test/config/views.view.test_bulk_form.yml b/core/modules/action/tests/action_bulk_test/config/views.view.test_bulk_form.yml index 330bc4e..ff05d91 100644 --- a/core/modules/action/tests/action_bulk_test/config/views.view.test_bulk_form.yml +++ b/core/modules/action/tests/action_bulk_test/config/views.view.test_bulk_form.yml @@ -30,7 +30,7 @@ display: row_class: '' default_row_class: true row_class_special: true - override: false + override: true sticky: false summary: '' columns: diff --git a/core/modules/aggregator/tests/modules/aggregator_test_views/test_views/views.view.test_aggregator_items.yml b/core/modules/aggregator/tests/modules/aggregator_test_views/test_views/views.view.test_aggregator_items.yml index 34ce767..0d6dcbb 100644 --- a/core/modules/aggregator/tests/modules/aggregator_test_views/test_views/views.view.test_aggregator_items.yml +++ b/core/modules/aggregator/tests/modules/aggregator_test_views/test_views/views.view.test_aggregator_items.yml @@ -4,6 +4,17 @@ core: 8.x description: '' status: true display: + feed_1: + display_plugin: feed + id: feed_1 + display_title: Feed + position: null + display_options: + path: test-aggregator-items-feed + row: + type: aggregator_rss + options: + item_length: default default: display_plugin: default id: default @@ -36,32 +47,32 @@ display: id: title plugin_id: aggregator_title_link alter: - alter_text: + alter_text: false text: '' - make_link: '0' + make_link: false path: '' - absolute: '0' - external: '0' - replace_spaces: '0' + absolute: false + external: false + replace_spaces: false path_case: none - trim_whitespace: '0' + trim_whitespace: false alt: '' rel: '' link_class: '' prefix: '' suffix: '' target: '' - nl2br: '0' + nl2br: false max_length: '' - word_boundary: '1' - ellipsis: '1' - more_link: '0' + word_boundary: true + ellipsis: true + more_link: false more_link_text: '' more_link_path: '' - strip_tags: '0' - trim: '0' + strip_tags: false + trim: false preserve_tags: '' - html: '0' + html: false timestamp: table: aggregator_item field: timestamp @@ -150,19 +161,9 @@ display: plugin_id: aggregator_xss filters: { } sorts: { } - feed_1: - display_plugin: feed - id: feed_1 - display_title: Feed - position: null - display_options: - path: test-aggregator-items-feed - row: - type: aggregator_rss - options: - item_length: default label: test_aggregator_items module: views id: test_aggregator_items tag: '' langcode: en +uuid: 19dd643f-9324-44df-ac72-0be915b334d1 diff --git a/core/modules/comment/config/schema/comment.views.schema.yml b/core/modules/comment/config/schema/comment.views.schema.yml index ae7cd67..3a95f9d 100644 --- a/core/modules/comment/config/schema/comment.views.schema.yml +++ b/core/modules/comment/config/schema/comment.views.schema.yml @@ -64,7 +64,7 @@ views.field.comment_link_reply: views.field.node_new_comments: type: views.field.numeric - label: 'Number of new comment' + label: 'Number of new comments' mapping: link_to_comment: type: boolean 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 9f3d6b0..5a50bbf 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 @@ -4,6 +4,13 @@ core: 8.x description: '' status: true display: + page_1: + display_plugin: page + id: page_1 + display_title: Page + position: 1 + display_options: + path: test-comment-row default: display_plugin: default id: default @@ -23,7 +30,7 @@ display: disable_sql_rewrite: false distinct: false slave: false - query_comment: '' + query_comment: false query_tags: { } exposed_form: type: basic @@ -32,7 +39,7 @@ display: reset_button: false reset_button_label: Reset exposed_sorts_label: 'Sort by' - expose_sort_order: 1 + expose_sort_order: true sort_asc_label: Asc sort_desc_label: Desc pager: @@ -41,14 +48,14 @@ display: items_per_page: 10 offset: 0 id: 0 - total_pages: '' + total_pages: null expose: items_per_page: false items_per_page_label: 'Items per page' - items_per_page_options: 5, 10, 20, 40, 60 - items_per_page_options_all: 0 + items_per_page_options: '5, 10, 20, 40, 60' + items_per_page_options_all: false items_per_page_options_all_label: '- All -' - offset: 0 + offset: false offset_label: Offset tags: previous: '‹ previous' @@ -98,7 +105,7 @@ display: element_class: '' element_label_type: '' element_label_class: '' - element_label_colon: true + element_label_colon: true element_wrapper_type: '' element_wrapper_class: '' element_default_classes: true @@ -107,21 +114,21 @@ display: link_to_node: false filters: status: - value: true + value: '1' table: comment field: status id: status expose: - operator: false + operator: '' group: 1 status_node: - value: 1 + value: '1' table: node_field_data field: status relationship: node id: status_node expose: - operator: false + operator: '' group: 1 sorts: { } title: test_comment_row @@ -129,15 +136,9 @@ display: footer: { } empty: { } arguments: { } - page_1: - display_plugin: page - id: page_1 - display_title: Page - position: 1 - display_options: - path: test-comment-row label: test_comment_row module: views id: test_comment_row tag: '' langcode: en +uuid: fb77b691-eeef-4ac8-8382-15f5fd25aae0 diff --git a/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_rss.yml b/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_rss.yml index 58293ae..e6facd9 100644 --- a/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_rss.yml +++ b/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_rss.yml @@ -2,8 +2,15 @@ base_field: cid base_table: comment core: 8.x description: '' -status: 1 +status: true display: + feed_1: + display_plugin: feed + id: feed_1 + display_title: Feed + position: null + display_options: + path: test-comment-rss default: display_plugin: default id: default @@ -28,7 +35,7 @@ display: node: field: node id: node - required: 1 + required: true table: comment provider: views fields: @@ -39,28 +46,23 @@ display: plugin_id: comment label: '' alter: - alter_text: 0 - make_link: 0 - absolute: 0 - trim: 0 - word_boundary: 0 - ellipsis: 0 - strip_tags: 0 - html: 0 - hide_empty: 0 - empty_zero: 0 - link_to_comment: 1 + alter_text: false + make_link: false + absolute: false + trim: false + word_boundary: false + ellipsis: false + strip_tags: false + html: false + hide_empty: false + empty_zero: false + link_to_comment: true provider: comment filters: { } sorts: { } - feed_1: - display_plugin: feed - id: feed_1 - display_title: Feed - position: null - display_options: - path: test-comment-rss label: test_comment_rss module: views id: test_comment_rss tag: '' +uuid: 0a29eea8-0dc4-45bd-a6d2-4b3ae711c7d4 +langcode: und diff --git a/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_user_uid.yml b/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_user_uid.yml index ab94876..e518584 100644 --- a/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_user_uid.yml +++ b/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_user_uid.yml @@ -1,7 +1,7 @@ base_table: node -core: 8 +core: '8' description: '' -status: 1 +status: true display: default: display_options: @@ -9,7 +9,7 @@ display: type: perm arguments: uid_touch: - default_argument_skip_url: 0 + default_argument_skip_url: false default_argument_type: fixed field: uid_touch id: uid_touch @@ -36,7 +36,7 @@ display: type: full query: options: - query_comment: 0 + query_comment: false type: views_query style: type: default @@ -49,3 +49,7 @@ display: label: test_comment_user_uid id: test_comment_user_uid tag: default +base_field: nid +module: comment_test_views +uuid: 8f8244da-6e5e-4a8c-a17a-13ae6a3e4a88 +langcode: und diff --git a/core/modules/config/lib/Drupal/config/Tests/DefaultConfigTest.php b/core/modules/config/lib/Drupal/config/Tests/DefaultConfigTest.php index c505bab..52fc732 100644 --- a/core/modules/config/lib/Drupal/config/Tests/DefaultConfigTest.php +++ b/core/modules/config/lib/Drupal/config/Tests/DefaultConfigTest.php @@ -2,7 +2,7 @@ /** * @file - * Definition of Drupal\config\Tests\DefaultConfigTest. + * Contains Drupal\config\Tests\DefaultConfigTest. */ namespace Drupal\config\Tests; @@ -12,7 +12,6 @@ use Drupal\Core\TypedData\Type\BooleanInterface; use Drupal\Core\TypedData\Type\StringInterface; use Drupal\simpletest\DrupalUnitTestBase; -use Drupal\simpletest\WebTestBase; use Drupal\Component\Utility\String; use Drupal\Core\Config\Schema\SchemaIncompleteException; use Drupal\Core\TypedData\PrimitiveInterface; @@ -43,6 +42,9 @@ class DefaultConfigTest extends DrupalUnitTestBase { */ protected $configPass; + /** + * {@inheritdoc} + */ public static function getInfo() { return array( 'name' => 'Default configuration', @@ -51,6 +53,9 @@ public static function getInfo() { ); } + /** + * Tests default configuration data type. + */ public function testDefaultConfig() { /** @var \Drupal\Core\Config\TypedConfigManager $typed_config */ $typed_config = $this->container->get('config.typed'); @@ -88,6 +93,14 @@ public function testDefaultConfig() { } } + /** + * Helper method to check data type. + * + * @param $key + * @param $value + * + * @return array + */ protected function checkValue($key, $value) { if (is_scalar($value) || $value === NULL) { try { @@ -113,16 +126,13 @@ protected function checkValue($key, $value) { } } else { - // Hmmm? + // @todo throw an exception due to an incomplete schema. Only possible + // once https://drupal.org/node/1910624 is complete. } $class = get_class($element); if (!$success) { $this->fail("{$this->configName}:$key has the wrong schema. Variable type is $type and schema class is $class."); } - //else { - // $this->pass("{$this->configName}:$key has the correct schema. Variable type is $type and schema class is $class."); - //} - } catch (SchemaIncompleteException $e) { $this->fail("{$this->configName}:$key has no schema."); @@ -141,6 +151,9 @@ protected function checkValue($key, $value) { return $value; } + /** + * {@inheritdoc} + */ protected function fail($message = NULL, $group = 'Other') { $this->configPass = FALSE; return parent::fail($message, $group); diff --git a/core/modules/datetime/config/schema/datetime.schema.yml b/core/modules/datetime/config/schema/datetime.schema.yml index 9369168..bd64841 100644 --- a/core/modules/datetime/config/schema/datetime.schema.yml +++ b/core/modules/datetime/config/schema/datetime.schema.yml @@ -72,4 +72,4 @@ entity_form_display.field.datetime_default: type: sequence label: 'Settings' sequence: - - type: string \ No newline at end of file + - type: string diff --git a/core/modules/entity/config/schema/entity.data_types.yml b/core/modules/entity/config/schema/entity.data_types.yml index 49dbb9a..51b118a 100644 --- a/core/modules/entity/config/schema/entity.data_types.yml +++ b/core/modules/entity/config/schema/entity.data_types.yml @@ -1,6 +1,6 @@ # Schema for entity fields, specifying generic component data type information. -# Schema for the base of the view mode or form mode display format settings. +# Schema for the base of the view mode display format settings. entity_field_display_base: type: mapping mapping: @@ -14,7 +14,7 @@ entity_field_display_base: type: integer label: 'Weight' -# Schema for the base of the view mode or form mode display format settings. +# Schema for the base of the form mode display format settings. entity_field_form_display_base: type: mapping mapping: diff --git a/core/modules/entity/config/schema/entity.schema.yml b/core/modules/entity/config/schema/entity.schema.yml index 5f483b5..ba30475 100644 --- a/core/modules/entity/config/schema/entity.schema.yml +++ b/core/modules/entity/config/schema/entity.schema.yml @@ -116,7 +116,7 @@ entity.form_display.*.*.*: type: boolean label: 'Enabled' -# for hidden, there is no type. +# Default schemas, as no type for hidden. entity_display.field.*: type: mapping label: 'Entity display default' diff --git a/core/modules/entity_reference/tests/modules/entity_reference_test/config/views.view.test_entity_reference.yml b/core/modules/entity_reference/tests/modules/entity_reference_test/config/views.view.test_entity_reference.yml index 1e5c2d9..fbe112a 100644 --- a/core/modules/entity_reference/tests/modules/entity_reference_test/config/views.view.test_entity_reference.yml +++ b/core/modules/entity_reference/tests/modules/entity_reference_test/config/views.view.test_entity_reference.yml @@ -1,9 +1,25 @@ base_field: nid base_table: node -core: 8.x +core: '8' description: '' status: true display: + entity_reference_1: + display_plugin: entity_reference + id: entity_reference_1 + display_title: EntityReference + position: null + display_options: + style: + type: entity_reference + options: + grouping: { } + search_fields: + title: title + pager: + type: none + options: + offset: 0 default: display_plugin: default id: default @@ -95,22 +111,6 @@ display: order: DESC plugin_id: date provider: views - entity_reference_1: - display_plugin: entity_reference - id: entity_reference_1 - display_title: EntityReference - position: null - display_options: - style: - type: entity_reference - options: - grouping: { } - search_fields: - title: title - pager: - type: none - options: - offset: 0 label: 'Entity reference' module: entity_reference_test id: test_entity_reference