diff --git a/core/lib/Drupal/Core/Config/StorableConfigBase.php b/core/lib/Drupal/Core/Config/StorableConfigBase.php index 9c0fba8..4d8c5b3 100644 --- a/core/lib/Drupal/Core/Config/StorableConfigBase.php +++ b/core/lib/Drupal/Core/Config/StorableConfigBase.php @@ -9,7 +9,6 @@ use Drupal\Component\Utility\String; use Drupal\Core\Config\Schema\Ignore; -use Drupal\Core\Config\Schema\SchemaIncompleteException; use Drupal\Core\TypedData\PrimitiveInterface; use Drupal\Core\TypedData\Type\FloatInterface; use Drupal\Core\TypedData\Type\IntegerInterface; @@ -169,16 +168,7 @@ protected function validateValue($key, $value) { * Exception on unsupported/undefined data type deducted. */ protected function castValue($key, $value) { - $element = FALSE; - try { - $element = $this->getSchemaWrapper()->get($key); - } - catch (SchemaIncompleteException $e) { - // @todo Consider making schema handling more strict by throwing - // SchemaIncompleteException for all incomplete schema conditions *and* - // throwing it forward. See https://drupal.org/node/2183983. - // Until then, we need to handle the Undefined case below. - } + $element = $this->getSchemaWrapper()->get($key); // Do not cast value if it is unknown or defined to be ignored. if ($element && ($element instanceof Undefined || $element instanceof Ignore)) { return $value; diff --git a/core/modules/block/custom_block/config/schema/custom_block.schema.yml b/core/modules/block/custom_block/config/schema/custom_block.schema.yml index 1a9c04d..9c1c4e3 100644 --- a/core/modules/block/custom_block/config/schema/custom_block.schema.yml +++ b/core/modules/block/custom_block/config/schema/custom_block.schema.yml @@ -22,6 +22,9 @@ custom_block.type.*: status: type: boolean label: 'Status' + dependencies: + type: config_dependencies + label: 'Dependencies' langcode: type: string label: 'Default language' diff --git a/core/modules/contact/config/schema/contact.schema.yml b/core/modules/contact/config/schema/contact.schema.yml index c853697..4bac845 100644 --- a/core/modules/contact/config/schema/contact.schema.yml +++ b/core/modules/contact/config/schema/contact.schema.yml @@ -28,6 +28,9 @@ contact.category.*: status: type: boolean label: 'Status' + dependencies: + type: config_dependencies + label: 'Dependencies' langcode: type: string label: 'Default language' diff --git a/core/modules/filter/config/schema/filter.schema.yml b/core/modules/filter/config/schema/filter.schema.yml index f1df7df..2e8dd3f 100644 --- a/core/modules/filter/config/schema/filter.schema.yml +++ b/core/modules/filter/config/schema/filter.schema.yml @@ -44,6 +44,9 @@ filter.format.*: label: 'Enabled filters' sequence: - type: filter + dependencies: + type: config_dependencies + label: 'Dependencies' langcode: type: string label: 'Default language' diff --git a/core/modules/image/config/schema/image.schema.yml b/core/modules/image/config/schema/image.schema.yml index 5b642b3..d0c77e6 100644 --- a/core/modules/image/config/schema/image.schema.yml +++ b/core/modules/image/config/schema/image.schema.yml @@ -24,6 +24,9 @@ image.style.*: type: integer uuid: type: string + dependencies: + type: config_dependencies + label: 'Dependencies' langcode: type: string label: 'Default language' diff --git a/core/modules/menu_ui/config/schema/menu_ui.schema.yml b/core/modules/menu_ui/config/schema/menu_ui.schema.yml index ce6be8b..aef46b8 100644 --- a/core/modules/menu_ui/config/schema/menu_ui.schema.yml +++ b/core/modules/menu_ui/config/schema/menu_ui.schema.yml @@ -24,3 +24,6 @@ menu.entity.node.*: sequence: - type: string label: 'Menu machine name' + parent: + type: string + label: 'Parent' diff --git a/core/modules/shortcut/config/schema/shortcut.schema.yml b/core/modules/shortcut/config/schema/shortcut.schema.yml index 81192bc..ac96296 100644 --- a/core/modules/shortcut/config/schema/shortcut.schema.yml +++ b/core/modules/shortcut/config/schema/shortcut.schema.yml @@ -25,3 +25,6 @@ shortcut.set.*: status: type: boolean label: 'Status' + dependencies: + type: config_dependencies + label: 'Dependencies' diff --git a/core/modules/system/config/schema/system.schema.yml b/core/modules/system/config/schema/system.schema.yml index 690a3ec..27e1a39 100644 --- a/core/modules/system/config/schema/system.schema.yml +++ b/core/modules/system/config/schema/system.schema.yml @@ -130,6 +130,9 @@ system.date_format.*: status: type: boolean label: 'Enabled' + dependencies: + type: config_dependencies + label: 'Dependencies' locked: type: boolean label: 'Locked' @@ -297,6 +300,9 @@ system.menu.*: langcode: type: string label: 'Default language' + dependencies: + type: config_dependencies + label: 'Dependencies' locked: type: boolean label: '' diff --git a/core/modules/user/config/schema/user.schema.yml b/core/modules/user/config/schema/user.schema.yml index 7361704..5c921fc 100644 --- a/core/modules/user/config/schema/user.schema.yml +++ b/core/modules/user/config/schema/user.schema.yml @@ -140,6 +140,9 @@ user.role.*: status: type: boolean label: 'Status' + dependencies: + type: config_dependencies + label: 'Dependencies' langcode: type: string label: 'Default language'