From f1263c54598127179f0203013492e1fb288e0fb5 Mon Sep 17 00:00:00 2001
From: catch <6915-catch@users.noreply.drupalcode.org>
Date: Mon, 8 Jul 2024 15:53:07 +0100
Subject: [PATCH] Issue #3449851 by Liam Morland, alexpott, smustgrave,
solideogloria, catch, kopeboy: Replace LogicException with trigger_error in
LangcodeRequiredIfTranslatableValues constraint
(cherry picked from commit b12dd10f7558579d1268b16a76f278023fc78e2a)
---
...equiredIfTranslatableValuesConstraintValidator.php | 8 ++++++--
.../config_test/config/schema/config_test.schema.yml | 7 +++++++
.../KernelTests/Core/Config/ConfigSchemaTest.php | 11 +++++++++++
3 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/core/lib/Drupal/Core/Config/Plugin/Validation/Constraint/LangcodeRequiredIfTranslatableValuesConstraintValidator.php b/core/lib/Drupal/Core/Config/Plugin/Validation/Constraint/LangcodeRequiredIfTranslatableValuesConstraintValidator.php
index 89a45e7b18dc..b28fbac753dd 100644
--- a/core/lib/Drupal/Core/Config/Plugin/Validation/Constraint/LangcodeRequiredIfTranslatableValuesConstraintValidator.php
+++ b/core/lib/Drupal/Core/Config/Plugin/Validation/Constraint/LangcodeRequiredIfTranslatableValuesConstraintValidator.php
@@ -22,8 +22,12 @@ public function validate(mixed $value, Constraint $constraint): void {
$mapping = $this->context->getObject();
assert($mapping instanceof Mapping);
- if ($mapping !== $this->context->getRoot()) {
- throw new LogicException('The LangcodeRequiredIfTranslatableValues constraint can only operate on the root object being validated.');
+ $root = $this->context->getRoot();
+ if ($mapping !== $root) {
+ throw new LogicException(sprintf(
+ 'The LangcodeRequiredIfTranslatableValues constraint is applied to \'%s\'. This constraint can only operate on the root object being validated.',
+ $root->getName() . '::' . $mapping->getName()
+ ));
}
assert(in_array('langcode', $mapping->getValidKeys(), TRUE));
diff --git a/core/modules/config/tests/config_test/config/schema/config_test.schema.yml b/core/modules/config/tests/config_test/config/schema/config_test.schema.yml
index 99b7cfd8f064..aeac1edea756 100644
--- a/core/modules/config/tests/config_test/config/schema/config_test.schema.yml
+++ b/core/modules/config/tests/config_test/config/schema/config_test.schema.yml
@@ -241,6 +241,13 @@ config_test.foo:
label:
type: label
label: 'Label'
+ # Note that config_object should never be used on a non-root key.
+ broken_langcode_required:
+ type: config_object
+ required: false
+ mapping:
+ foo:
+ type: string
config_test.bar:
type: config_test.foo
diff --git a/core/tests/Drupal/KernelTests/Core/Config/ConfigSchemaTest.php b/core/tests/Drupal/KernelTests/Core/Config/ConfigSchemaTest.php
index 85340992c89e..57b1cf095653 100644
--- a/core/tests/Drupal/KernelTests/Core/Config/ConfigSchemaTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Config/ConfigSchemaTest.php
@@ -848,4 +848,15 @@ public function testConfigSaveWithWrappingSchemaDoubleBrackets(): void {
], $definition['mapping']['breed']);
}
+ public function testLangcodeRequiredIfTranslatableValuesConstraintError(): void {
+ $config = \Drupal::configFactory()->getEditable('config_test.foo');
+
+ $this->expectException(\LogicException::class);
+ $this->expectExceptionMessage('The LangcodeRequiredIfTranslatableValues constraint is applied to \'config_test.foo::broken_langcode_required\'. This constraint can only operate on the root object being validated.');
+
+ $config
+ ->set('broken_langcode_required.foo', 'bar')
+ ->save();
+ }
+
}
--
GitLab