diff --git a/core/config/schema/core.data_types.schema.yml b/core/config/schema/core.data_types.schema.yml index ea67e43..210b151 100644 --- a/core/config/schema/core.data_types.schema.yml +++ b/core/config/schema/core.data_types.schema.yml @@ -427,6 +427,143 @@ field.string.value: type: string label: 'Value' + +# Schema for the String (long) field type. + +field.string_long.settings: + type: sequence + label: 'String (long) settings' + sequence: + - type: string + +field.string_long.instance_settings: + type: sequence + label: 'String (long) settings' + sequence: + - type: string + label: 'Setting' + +field.string_long.value: + type: sequence + label: 'Default value' + sequence: + - type: mapping + label: 'Default' + mapping: + value: + type: string + label: 'Value' + +# Schema for the URI field type. + +field.uri.settings: + type: sequence + label: 'URI settings' + sequence: + - type: string + +field.uri.instance_settings: + type: sequence + label: 'URI settings' + sequence: + - type: string + label: 'Setting' + +field.uri.value: + type: sequence + label: 'Default value' + sequence: + - type: mapping + label: 'Default' + mapping: + value: + type: string + label: 'Value' + +# Schema for the Created field type. + +field.created.settings: + type: sequence + label: 'Created timestamp settings' + sequence: + - type: string + +field.created.instance_settings: + type: sequence + label: 'Created timestamp settings' + sequence: + - type: string + label: 'Setting' + +field.created.value: + type: sequence + label: 'Default value' + sequence: + - type: mapping + label: 'Default' + mapping: + value: + type: string + label: 'Value' + +# Schema for the Created field type. + +field.changed.settings: + type: sequence + label: 'Changed timestamp settings' + sequence: + - type: string + +field.changed.instance_settings: + type: sequence + label: 'Changed timestamp settings' + sequence: + - type: string + label: 'Setting' + +field.changed.value: + type: sequence + label: 'Default value' + sequence: + - type: mapping + label: 'Default' + mapping: + value: + type: string + label: 'Value' + +# Schema for the configuration files of the Entity refeference field type. + +field.entity_reference.settings: + type: mapping + label: 'Entity reference settings' + mapping: + target_type: + type: string + label: 'Type of item to reference' + +field.entity_reference.instance_settings: + type: mapping + label: 'Entity reference settings' + mapping: + handler: + type: string + label: 'Reference method' + handler_settings: + type: entity_reference.[%parent.handler].handler_settings + label: 'Reference method settings' + +field.entity_reference.value: + type: sequence + label: 'Default value' + sequence: + - type: mapping + label: 'Default' + mapping: + target_id: + type: integer + label: 'Value' + # Schema for the configuration files of the Boolean field type. field.boolean.settings: diff --git a/core/modules/action/tests/action_bulk_test/action_bulk_test.info.yml b/core/modules/action/tests/action_bulk_test/action_bulk_test.info.yml index 296a33a..37b4285 100644 --- a/core/modules/action/tests/action_bulk_test/action_bulk_test.info.yml +++ b/core/modules/action/tests/action_bulk_test/action_bulk_test.info.yml @@ -7,3 +7,4 @@ core: 8.x dependencies: - action - views + - node diff --git a/core/modules/ckeditor/src/Tests/CKEditorAdminTest.php b/core/modules/ckeditor/src/Tests/CKEditorAdminTest.php index 7a0fd65..56376a8 100644 --- a/core/modules/ckeditor/src/Tests/CKEditorAdminTest.php +++ b/core/modules/ckeditor/src/Tests/CKEditorAdminTest.php @@ -147,8 +147,7 @@ function testExistingFormat() { $this->drupalGet('admin/config/content/formats/manage/filtered_html'); $expected_settings['toolbar']['rows'][0][] = array( 'name' => 'Action history', - 'items' => array('Undo', '|', 'Redo'), - array('JustifyCenter') + 'items' => array('Undo', '|', 'Redo', 'JustifyCenter'), ); $edit = array( 'editor[settings][toolbar][button_groups]' => json_encode($expected_settings['toolbar']['rows']), diff --git a/core/modules/comment/src/Plugin/views/field/Link.php b/core/modules/comment/src/Plugin/views/field/Link.php index 4a3842e..43a2560 100644 --- a/core/modules/comment/src/Plugin/views/field/Link.php +++ b/core/modules/comment/src/Plugin/views/field/Link.php @@ -115,7 +115,7 @@ protected function renderLink($data, ResultRow $values) { $this->options['alter']['fragment'] = "comment-" . $cid; } // If there is no comment link to the node. - elseif ($this->options['link_to_node']) { + elseif ($this->options['link_to_entity']) { $entity = $comment->getCommentedEntity(); $this->options['alter']['path'] = $entity->getSystemPath(); } diff --git a/core/modules/entity_reference/config/schema/entity_reference.schema.yml b/core/modules/entity_reference/config/schema/entity_reference.schema.yml index 242faf3..5404963 100644 --- a/core/modules/entity_reference/config/schema/entity_reference.schema.yml +++ b/core/modules/entity_reference/config/schema/entity_reference.schema.yml @@ -1,35 +1,5 @@ # Schema for the configuration files of the Entity Reference module. -field.entity_reference.settings: - type: mapping - label: 'Entity reference settings' - mapping: - target_type: - type: string - label: 'Type of item to reference' - -field.entity_reference.instance_settings: - type: mapping - label: 'Entity reference settings' - mapping: - handler: - type: string - label: 'Reference method' - handler_settings: - type: entity_reference.[%parent.handler].handler_settings - label: 'Reference method settings' - -field.entity_reference.value: - type: sequence - label: 'Default value' - sequence: - - type: mapping - label: 'Default' - mapping: - target_id: - type: integer - label: 'Value' - entity_reference.default.handler_settings: type: mapping label: 'View handler settings' diff --git a/core/modules/field/tests/modules/field_test/config/schema/field_test.schema.yml b/core/modules/field/tests/modules/field_test/config/schema/field_test.schema.yml index f9ef7b7..6d7fb1e 100644 --- a/core/modules/field/tests/modules/field_test/config/schema/field_test.schema.yml +++ b/core/modules/field/tests/modules/field_test/config/schema/field_test.schema.yml @@ -21,3 +21,36 @@ entity_form_display.field.test_field_widget_multiple: test_widget_setting_multiple: type: string label: 'Test setting' + +field.test_field.settings: + type: mapping + label: 'Test field settings' + mapping: + test_field_storage_setting: + type: string + label: 'Storage test setting' + changeable: + type: string + label: 'Changeable setting' + unchangeable: + type: string + label: 'Unchangeable setting' + +field.test_field.instance_settings: + type: mapping + label: 'Text settings' + mapping: + test_instance_setting: + type: string + label: 'Instance setting' + +field.test_field.value: + type: sequence + label: 'Default value' + sequence: + - type: mapping + label: 'Default' + mapping: + value: + type: label + label: 'Value' diff --git a/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldType/TestItem.php b/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldType/TestItem.php index 5234964..3a9db9e 100644 --- a/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldType/TestItem.php +++ b/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldType/TestItem.php @@ -42,7 +42,6 @@ public static function defaultSettings() { public static function defaultInstanceSettings() { return array( 'test_instance_setting' => 'dummy test string', - 'test_cached_data' => FALSE, ) + parent::defaultInstanceSettings(); }