diff --git a/core/config/schema/core.data_types.schema.yml b/core/config/schema/core.data_types.schema.yml index 069ff09..e4e13df 100644 --- a/core/config/schema/core.data_types.schema.yml +++ b/core/config/schema/core.data_types.schema.yml @@ -250,6 +250,11 @@ config_entity: dependencies: type: config_dependencies label: 'Dependencies' + third_party_settings: + type: sequence + label: 'Third party settings' + sequence: + - type: fixme.third_party.[%key] block_settings: type: mapping @@ -376,11 +381,6 @@ field_config_base: label: 'Default value callback' settings: type: field.[%parent.field_type].field_settings - third_party_settings: - type: sequence - label: 'Third party settings' - sequence: - - type: field_config.third_party.[%key] field_type: type: string label: 'Field type' diff --git a/core/config/schema/core.entity.data_types.schema.yml b/core/config/schema/core.entity.data_types.schema.yml index f0b87ee..3935f62 100644 --- a/core/config/schema/core.entity.data_types.schema.yml +++ b/core/config/schema/core.entity.data_types.schema.yml @@ -10,11 +10,6 @@ entity_field_view_display_base: weight: type: integer label: 'Weight' - third_party_settings: - type: sequence - label: 'Third party settings' - sequence: - - type: entity_view_display.third_party.[%key] label: type: string label: 'Label setting machine name' @@ -29,8 +24,3 @@ entity_field_form_display_base: weight: type: integer label: 'Weight' - third_party_settings: - type: sequence - label: 'Third party settings' - sequence: - - type: entity_form_display.third_party.[%key] diff --git a/core/config/schema/core.entity.schema.yml b/core/config/schema/core.entity.schema.yml index 63a35eb..0ec7901 100644 --- a/core/config/schema/core.entity.schema.yml +++ b/core/config/schema/core.entity.schema.yml @@ -25,9 +25,6 @@ core.entity_view_mode.*.*: langcode: type: string label: 'Default language' - dependencies: - type: config_dependencies - label: 'Dependencies' core.entity_form_mode.*.*: type: config_entity @@ -77,11 +74,6 @@ core.entity_view_display.*.*.*: sequence: - type: boolean label: 'Value' - third_party_settings: - type: sequence - label: 'Third party settings' - sequence: - - type: entity_view_display.third_party.[%key] # Overview configuration information for form mode displays. core.entity_form_display.*.*.*: @@ -114,11 +106,6 @@ core.entity_form_display.*.*.*: sequence: - type: boolean label: 'Component' - third_party_settings: - type: sequence - label: 'Third party settings' - sequence: - - type: entity_form_display.third_party.[%key] # Default schema for entity display field with undefined type. entity_view_display.field.*: diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php b/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php index 627bb83..3679cb9 100644 --- a/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php +++ b/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php @@ -7,12 +7,12 @@ namespace Drupal\Core\Config\Entity; -use Drupal\Component\Plugin\ConfigurablePluginInterface; use Drupal\Component\Utility\String; use Drupal\Core\Cache\Cache; use Drupal\Core\Config\Schema\SchemaIncompleteException; use Drupal\Core\Entity\Entity; use Drupal\Core\Config\ConfigDuplicateUUIDException; +use Drupal\Core\Config\Entity\ThirdPartySettingsTrait; use Drupal\Core\Entity\EntityStorageInterface; use Drupal\Core\Entity\EntityWithPluginCollectionInterface; use Drupal\Core\Language\LanguageInterface; @@ -29,6 +29,8 @@ addDependency as addDependencyTrait; } + use ThirdPartySettingsTrait; + /** * The original ID of the configuration entity. * diff --git a/core/lib/Drupal/Core/Entity/EntityDisplayBase.php b/core/lib/Drupal/Core/Entity/EntityDisplayBase.php index 251bb00..8fcd902 100644 --- a/core/lib/Drupal/Core/Entity/EntityDisplayBase.php +++ b/core/lib/Drupal/Core/Entity/EntityDisplayBase.php @@ -8,7 +8,6 @@ namespace Drupal\Core\Entity; use Drupal\Core\Config\Entity\ConfigEntityBase; -use Drupal\Core\Config\Entity\ThirdPartySettingsTrait; use Drupal\Core\Field\FieldDefinitionInterface; use Drupal\Core\Entity\Display\EntityDisplayInterface; use Drupal\field\Entity\FieldConfig; @@ -19,8 +18,6 @@ */ abstract class EntityDisplayBase extends ConfigEntityBase implements EntityDisplayInterface { - use ThirdPartySettingsTrait; - /** * Unique ID for the config entity. * diff --git a/core/lib/Drupal/Core/Field/FieldConfigBase.php b/core/lib/Drupal/Core/Field/FieldConfigBase.php index 05fc94b..d0341cc 100644 --- a/core/lib/Drupal/Core/Field/FieldConfigBase.php +++ b/core/lib/Drupal/Core/Field/FieldConfigBase.php @@ -8,7 +8,6 @@ namespace Drupal\Core\Field; use Drupal\Core\Config\Entity\ConfigEntityBase; -use Drupal\Core\Config\Entity\ThirdPartySettingsTrait; use Drupal\Core\Entity\EntityStorageInterface; use Drupal\Core\Entity\FieldableEntityInterface; use Drupal\Core\Field\TypedData\FieldItemDataDefinition; @@ -18,8 +17,6 @@ */ abstract class FieldConfigBase extends ConfigEntityBase implements FieldConfigInterface { - use ThirdPartySettingsTrait; - /** * The field ID. * diff --git a/core/modules/contact/config/schema/contact.schema.yml b/core/modules/contact/config/schema/contact.schema.yml index 011ae37..7ebb6f4 100644 --- a/core/modules/contact/config/schema/contact.schema.yml +++ b/core/modules/contact/config/schema/contact.schema.yml @@ -22,11 +22,6 @@ contact.form.*: weight: type: integer label: 'Weight' - third_party_settings: - type: sequence - label: 'Third party settings' - sequence: - - type: contact_form.third_party.[%key] contact.settings: type: mapping diff --git a/core/modules/contact/src/Entity/ContactForm.php b/core/modules/contact/src/Entity/ContactForm.php index 2dd7ce3..2331a7c 100644 --- a/core/modules/contact/src/Entity/ContactForm.php +++ b/core/modules/contact/src/Entity/ContactForm.php @@ -9,7 +9,6 @@ use Drupal\Core\Config\Entity\ConfigEntityBundleBase; use Drupal\contact\ContactFormInterface; -use Drupal\Core\Config\Entity\ThirdPartySettingsTrait; /** * Defines the contact form entity. @@ -41,8 +40,6 @@ */ class ContactForm extends ConfigEntityBundleBase implements ContactFormInterface { - use ThirdPartySettingsTrait; - /** * The form ID. * diff --git a/core/modules/image/config/schema/image.schema.yml b/core/modules/image/config/schema/image.schema.yml index f0db0d5..35cb060 100644 --- a/core/modules/image/config/schema/image.schema.yml +++ b/core/modules/image/config/schema/image.schema.yml @@ -22,11 +22,6 @@ image.style.*: type: integer uuid: type: string - third_party_settings: - type: sequence - label: 'Third party settings' - sequence: - - type: image_style.third_party.[%key] image.effect.image_crop: type: image_size diff --git a/core/modules/image/src/Entity/ImageStyle.php b/core/modules/image/src/Entity/ImageStyle.php index 32e5d3b..a293a41 100644 --- a/core/modules/image/src/Entity/ImageStyle.php +++ b/core/modules/image/src/Entity/ImageStyle.php @@ -9,7 +9,6 @@ use Drupal\Core\Cache\Cache; use Drupal\Core\Config\Entity\ConfigEntityBase; -use Drupal\Core\Config\Entity\ThirdPartySettingsTrait; use Drupal\Core\Entity\EntityStorageInterface; use Drupal\Core\Entity\EntityWithPluginCollectionInterface; use Drupal\Core\Routing\RequestHelper; @@ -52,8 +51,6 @@ */ class ImageStyle extends ConfigEntityBase implements ImageStyleInterface, EntityWithPluginCollectionInterface { - use ThirdPartySettingsTrait; - /** * The name of the image style to use as replacement upon delete. * diff --git a/core/modules/node/config/schema/node.schema.yml b/core/modules/node/config/schema/node.schema.yml index 0680b57..abb9b50 100644 --- a/core/modules/node/config/schema/node.schema.yml +++ b/core/modules/node/config/schema/node.schema.yml @@ -36,11 +36,6 @@ node.type.*: display_submitted: type: boolean label: 'Display setting for author and date Submitted by post information' - third_party_settings: - type: sequence - label: 'Third party settings' - sequence: - - type: node_type.third_party.[%key] # Plugin \Drupal\node\Plugin\Search\NodeSearch search.plugin.node_search: diff --git a/core/modules/node/src/Entity/NodeType.php b/core/modules/node/src/Entity/NodeType.php index 73e1202..5b4f735 100644 --- a/core/modules/node/src/Entity/NodeType.php +++ b/core/modules/node/src/Entity/NodeType.php @@ -8,7 +8,6 @@ namespace Drupal\node\Entity; use Drupal\Core\Config\Entity\ConfigEntityBundleBase; -use Drupal\Core\Config\Entity\ThirdPartySettingsTrait; use Drupal\Core\Entity\EntityStorageInterface; use Drupal\node\NodeTypeInterface; @@ -41,7 +40,6 @@ * ) */ class NodeType extends ConfigEntityBundleBase implements NodeTypeInterface { - use ThirdPartySettingsTrait; /** * The machine name of this node type. diff --git a/core/modules/taxonomy/config/schema/taxonomy.schema.yml b/core/modules/taxonomy/config/schema/taxonomy.schema.yml index 579f673..04d8f5a 100644 --- a/core/modules/taxonomy/config/schema/taxonomy.schema.yml +++ b/core/modules/taxonomy/config/schema/taxonomy.schema.yml @@ -33,11 +33,6 @@ taxonomy.vocabulary.*: weight: type: integer label: 'Weight' - third_party_settings: - type: sequence - label: 'Third party settings' - sequence: - - type: taxonomy.vocabulary.third_party.[%key] field.taxonomy_term_reference.storage_settings: type: base_entity_reference_field_settings diff --git a/core/modules/taxonomy/src/Entity/Vocabulary.php b/core/modules/taxonomy/src/Entity/Vocabulary.php index e650551..b6decd5 100644 --- a/core/modules/taxonomy/src/Entity/Vocabulary.php +++ b/core/modules/taxonomy/src/Entity/Vocabulary.php @@ -8,7 +8,6 @@ namespace Drupal\taxonomy\Entity; use Drupal\Core\Config\Entity\ConfigEntityBundleBase; -use Drupal\Core\Config\Entity\ThirdPartySettingsTrait; use Drupal\Core\Entity\EntityStorageInterface; use Drupal\taxonomy\VocabularyInterface; @@ -45,7 +44,6 @@ * ) */ class Vocabulary extends ConfigEntityBundleBase implements VocabularyInterface { - use ThirdPartySettingsTrait; /** * The taxonomy vocabulary ID. diff --git a/core/tests/Drupal/Tests/Core/Config/Entity/Fixtures/ConfigEntityBaseWithThirdPartySettings.php b/core/tests/Drupal/Tests/Core/Config/Entity/Fixtures/ConfigEntityBaseWithThirdPartySettings.php index 6834e63..100999c 100644 --- a/core/tests/Drupal/Tests/Core/Config/Entity/Fixtures/ConfigEntityBaseWithThirdPartySettings.php +++ b/core/tests/Drupal/Tests/Core/Config/Entity/Fixtures/ConfigEntityBaseWithThirdPartySettings.php @@ -9,7 +9,6 @@ use Drupal\Core\Config\Entity\ConfigEntityBase; use Drupal\Core\Config\Entity\ThirdPartySettingsInterface; -use Drupal\Core\Config\Entity\ThirdPartySettingsTrait; /** * Enables testing of dependency calculation. @@ -18,6 +17,5 @@ * @see \Drupal\Core\Config\Entity\ConfigEntityBase::calculateDependencies() */ abstract class ConfigEntityBaseWithThirdPartySettings extends ConfigEntityBase implements ThirdPartySettingsInterface { - use ThirdPartySettingsTrait; }