From da9ef0b8c6516101b6272dc0f9a54a7df8aeb44a Mon Sep 17 00:00:00 2001 From: David Cameron <david@cadeyrn.us> Date: Sat, 5 Jul 2025 19:25:30 -0500 Subject: [PATCH 1/4] Converted the patch in #2 and added tests --- core/config/schema/core.data_types.schema.yml | 6 ++++ core/config/schema/core.entity.schema.yml | 3 ++ .../config/schema/ckeditor5.schema.yml | 3 ++ .../tests/src/Kernel/ConfigSchemaTest.php | 29 +++++++++++++++++++ .../search/config/schema/search.schema.yml | 3 ++ .../tests/src/Kernel/ConfigSchemaTest.php | 29 +++++++++++++++++++ .../config/schema/views.display.schema.yml | 3 ++ .../tests/src/Kernel/ConfigSchemaTest.php | 29 +++++++++++++++++++ .../Config/Schema/FallbackSchemaTest.php | 25 ++++++++++++++++ 9 files changed, 130 insertions(+) create mode 100644 core/modules/ckeditor5/tests/src/Kernel/ConfigSchemaTest.php create mode 100644 core/modules/search/tests/src/Kernel/ConfigSchemaTest.php create mode 100644 core/modules/views/tests/src/Kernel/ConfigSchemaTest.php create mode 100644 core/tests/Drupal/KernelTests/Config/Schema/FallbackSchemaTest.php diff --git a/core/config/schema/core.data_types.schema.yml b/core/config/schema/core.data_types.schema.yml index 8bbffd2acb29..0071822bd809 100644 --- a/core/config/schema/core.data_types.schema.yml +++ b/core/config/schema/core.data_types.schema.yml @@ -461,6 +461,9 @@ block_settings: sequence: type: string +condition.plugin.*: + type: ignore + condition.plugin: type: mapping label: 'Condition' @@ -491,6 +494,9 @@ condition.plugin.entity_bundle:*: sequence: type: string +display_variant.plugin.*: + type: ignore + display_variant.plugin: type: mapping label: 'Display variant' diff --git a/core/config/schema/core.entity.schema.yml b/core/config/schema/core.entity.schema.yml index 47f9674785f0..d99bee3cd4da 100644 --- a/core/config/schema/core.entity.schema.yml +++ b/core/config/schema/core.entity.schema.yml @@ -470,6 +470,9 @@ action.configuration.entity:*:*: type: action_configuration_default label: 'Entity action' +action.configuration.*: + type: ignore + action.configuration.action_send_email_action: type: mapping label: 'Send email configuration' diff --git a/core/modules/ckeditor5/config/schema/ckeditor5.schema.yml b/core/modules/ckeditor5/config/schema/ckeditor5.schema.yml index 683444948410..e952e71e5e7c 100644 --- a/core/modules/ckeditor5/config/schema/ckeditor5.schema.yml +++ b/core/modules/ckeditor5/config/schema/ckeditor5.schema.yml @@ -30,6 +30,9 @@ editor.settings.ckeditor5: # must exist in here. CKEditor5EnabledConfigurablePlugins: [] +ckeditor5.plugin.*: + type: ignore + # Plugin \Drupal\ckeditor5\Plugin\CKEditor5Plugin\Language ckeditor5.plugin.ckeditor5_language: type: mapping diff --git a/core/modules/ckeditor5/tests/src/Kernel/ConfigSchemaTest.php b/core/modules/ckeditor5/tests/src/Kernel/ConfigSchemaTest.php new file mode 100644 index 000000000000..fb5b5fa47cae --- /dev/null +++ b/core/modules/ckeditor5/tests/src/Kernel/ConfigSchemaTest.php @@ -0,0 +1,29 @@ +<?php + +declare(strict_types=1); + +namespace Drupal\Tests\ckeditor5\Kernel; + +use Drupal\KernelTests\KernelTestBase; + +/** + * Tests CKEditor5 configuration schemas. + * + * @group ckeditor5 + */ +class ConfigSchemaTest extends KernelTestBase { + + /** + * {@inheritdoc} + */ + protected static $modules = ['ckeditor5']; + + /** + * Verifies the existence of fallback config schemas. + */ + public function testVerifySchemas(): void { + $storage = $this->container->get('config.storage.schema'); + $this->assertArrayHasKey('ckeditor5.plugin.*', $storage->read('ckeditor5.schema')); + } + +} diff --git a/core/modules/search/config/schema/search.schema.yml b/core/modules/search/config/schema/search.schema.yml index 4dc4d53e0574..26e2aac875f9 100644 --- a/core/modules/search/config/schema/search.schema.yml +++ b/core/modules/search/config/schema/search.schema.yml @@ -130,3 +130,6 @@ block.settings.search_form_block: constraints: ConfigExists: prefix: search.page. + +search.plugin.*: + type: ignore diff --git a/core/modules/search/tests/src/Kernel/ConfigSchemaTest.php b/core/modules/search/tests/src/Kernel/ConfigSchemaTest.php new file mode 100644 index 000000000000..a373319574f7 --- /dev/null +++ b/core/modules/search/tests/src/Kernel/ConfigSchemaTest.php @@ -0,0 +1,29 @@ +<?php + +declare(strict_types=1); + +namespace Drupal\Tests\search\Kernel; + +use Drupal\KernelTests\KernelTestBase; + +/** + * Tests Views configuration schemas. + * + * @group search + */ +class ConfigSchemaTest extends KernelTestBase { + + /** + * {@inheritdoc} + */ + protected static $modules = ['search']; + + /** + * Verifies the existence of fallback config schemas. + */ + public function testVerifySchemas(): void { + $storage = $this->container->get('config.storage.schema'); + $this->assertArrayHasKey('search.plugin.*', $storage->read('search.schema')); + } + +} diff --git a/core/modules/views/config/schema/views.display.schema.yml b/core/modules/views/config/schema/views.display.schema.yml index d4af22527010..5e4ce4341b01 100644 --- a/core/modules/views/config/schema/views.display.schema.yml +++ b/core/modules/views/config/schema/views.display.schema.yml @@ -1,5 +1,8 @@ # Schema for the views display plugins. +views.display.*: + type: ignore + views.display.default: type: views_display label: 'Default display options' diff --git a/core/modules/views/tests/src/Kernel/ConfigSchemaTest.php b/core/modules/views/tests/src/Kernel/ConfigSchemaTest.php new file mode 100644 index 000000000000..1fb673a422bc --- /dev/null +++ b/core/modules/views/tests/src/Kernel/ConfigSchemaTest.php @@ -0,0 +1,29 @@ +<?php + +declare(strict_types=1); + +namespace Drupal\Tests\views\Kernel; + +use Drupal\KernelTests\KernelTestBase; + +/** + * Tests Views configuration schemas. + * + * @group views + */ +class ConfigSchemaTest extends KernelTestBase { + + /** + * {@inheritdoc} + */ + protected static $modules = ['views']; + + /** + * Verifies the existence of fallback config schemas. + */ + public function testVerifySchemas(): void { + $storage = $this->container->get('config.storage.schema'); + $this->assertArrayHasKey('views.display.*', $storage->read('views.display.schema')); + } + +} diff --git a/core/tests/Drupal/KernelTests/Config/Schema/FallbackSchemaTest.php b/core/tests/Drupal/KernelTests/Config/Schema/FallbackSchemaTest.php new file mode 100644 index 000000000000..56c12de4650f --- /dev/null +++ b/core/tests/Drupal/KernelTests/Config/Schema/FallbackSchemaTest.php @@ -0,0 +1,25 @@ +<?php + +declare(strict_types=1); + +namespace Drupal\KernelTests\Config\Schema; + +use Drupal\KernelTests\KernelTestBase; + +/** + * Tests fallback configuration schemas. + * + * @group Config + */ +class FallbackSchemaTest extends KernelTestBase { + + /** + * Verifies the existence of fallback config schemas. + */ + public function testVerifySchemas(): void { + $storage = $this->container->get('config.storage.schema'); + $this->assertArrayHasKey('display_variant.plugin.*', $storage->read('core.data_types.schema')); + $this->assertArrayHasKey('action.configuration.*', $storage->read('core.entity.schema')); + } + +} -- GitLab From b57431a3d98f29325948123d6b6cac6eeac394c2 Mon Sep 17 00:00:00 2001 From: David Cameron <david@cadeyrn.us> Date: Fri, 11 Jul 2025 23:44:19 -0500 Subject: [PATCH 2/4] Reverted changes to ckeditor5.schema.yml --- core/modules/ckeditor5/config/schema/ckeditor5.schema.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/core/modules/ckeditor5/config/schema/ckeditor5.schema.yml b/core/modules/ckeditor5/config/schema/ckeditor5.schema.yml index e952e71e5e7c..683444948410 100644 --- a/core/modules/ckeditor5/config/schema/ckeditor5.schema.yml +++ b/core/modules/ckeditor5/config/schema/ckeditor5.schema.yml @@ -30,9 +30,6 @@ editor.settings.ckeditor5: # must exist in here. CKEditor5EnabledConfigurablePlugins: [] -ckeditor5.plugin.*: - type: ignore - # Plugin \Drupal\ckeditor5\Plugin\CKEditor5Plugin\Language ckeditor5.plugin.ckeditor5_language: type: mapping -- GitLab From 25b3842a349990f780adfa4c4f8180b2a2b53e23 Mon Sep 17 00:00:00 2001 From: David Cameron <david@cadeyrn.us> Date: Fri, 11 Jul 2025 23:52:49 -0500 Subject: [PATCH 3/4] Removed the ckeditor5 test --- .../tests/src/Kernel/ConfigSchemaTest.php | 29 ------------------- 1 file changed, 29 deletions(-) delete mode 100644 core/modules/ckeditor5/tests/src/Kernel/ConfigSchemaTest.php diff --git a/core/modules/ckeditor5/tests/src/Kernel/ConfigSchemaTest.php b/core/modules/ckeditor5/tests/src/Kernel/ConfigSchemaTest.php deleted file mode 100644 index fb5b5fa47cae..000000000000 --- a/core/modules/ckeditor5/tests/src/Kernel/ConfigSchemaTest.php +++ /dev/null @@ -1,29 +0,0 @@ -<?php - -declare(strict_types=1); - -namespace Drupal\Tests\ckeditor5\Kernel; - -use Drupal\KernelTests\KernelTestBase; - -/** - * Tests CKEditor5 configuration schemas. - * - * @group ckeditor5 - */ -class ConfigSchemaTest extends KernelTestBase { - - /** - * {@inheritdoc} - */ - protected static $modules = ['ckeditor5']; - - /** - * Verifies the existence of fallback config schemas. - */ - public function testVerifySchemas(): void { - $storage = $this->container->get('config.storage.schema'); - $this->assertArrayHasKey('ckeditor5.plugin.*', $storage->read('ckeditor5.schema')); - } - -} -- GitLab From c03435807b6515ed5713af80163d781e7b05049a Mon Sep 17 00:00:00 2001 From: David Cameron <david@cadeyrn.us> Date: Sat, 12 Jul 2025 00:37:16 -0500 Subject: [PATCH 4/4] Added missing assertion for condition.plugin.* --- .../Drupal/KernelTests/Config/Schema/FallbackSchemaTest.php | 1 + 1 file changed, 1 insertion(+) diff --git a/core/tests/Drupal/KernelTests/Config/Schema/FallbackSchemaTest.php b/core/tests/Drupal/KernelTests/Config/Schema/FallbackSchemaTest.php index 56c12de4650f..4bdc31d14927 100644 --- a/core/tests/Drupal/KernelTests/Config/Schema/FallbackSchemaTest.php +++ b/core/tests/Drupal/KernelTests/Config/Schema/FallbackSchemaTest.php @@ -18,6 +18,7 @@ class FallbackSchemaTest extends KernelTestBase { */ public function testVerifySchemas(): void { $storage = $this->container->get('config.storage.schema'); + $this->assertArrayHasKey('condition.plugin.*', $storage->read('core.data_types.schema')); $this->assertArrayHasKey('display_variant.plugin.*', $storage->read('core.data_types.schema')); $this->assertArrayHasKey('action.configuration.*', $storage->read('core.entity.schema')); } -- GitLab