--- 3247795-47.patch 2022-03-23 01:17:41.000000000 +0530 +++ 3247795-51.patch 2022-03-23 01:35:29.000000000 +0530 @@ -21,10 +21,10 @@ /** diff --git a/core/modules/ckeditor5/tests/src/Kernel/SmartDefaultSettingsTest.php b/core/modules/ckeditor5/tests/src/Kernel/SmartDefaultSettingsTest.php -index 02fa4cd0f1..06d2188501 100644 +index b12170a8c5..dfe0dd5c04 100644 --- a/core/modules/ckeditor5/tests/src/Kernel/SmartDefaultSettingsTest.php +++ b/core/modules/ckeditor5/tests/src/Kernel/SmartDefaultSettingsTest.php -@@ -133,7 +133,7 @@ protected function setUp(): void { +@@ -158,7 +158,7 @@ protected function setUp(): void { $basic_html_editor_with_media_embed->setSettings($settings); $basic_html_editor_with_media_embed->save(); @@ -33,7 +33,7 @@ $basic_html_format_with_any_data_attr = $basic_html_format; $basic_html_format_with_any_data_attr['name'] .= ' (with any data-* attribute on images)'; $basic_html_format_with_any_data_attr['format'] = 'basic_html_with_any_data_attr'; -@@ -431,7 +431,16 @@ public function provider() { +@@ -456,7 +456,16 @@ public function provider() { $basic_html_test_case, [ 'expected_messages' => [ @@ -51,7 +51,7 @@ ], ] ); -@@ -446,13 +455,13 @@ public function provider() { +@@ -471,13 +480,13 @@ public function provider() { 'plugins' => [ 'ckeditor5_sourceEditing' => [ 'allowed_tags' => [ @@ -67,7 +67,7 @@ ], ]); -@@ -466,13 +475,13 @@ public function provider() { +@@ -491,13 +500,13 @@ public function provider() { 'plugins' => [ 'ckeditor5_sourceEditing' => [ 'allowed_tags' => [ @@ -83,7 +83,7 @@ ], ]); -@@ -483,10 +492,10 @@ public function provider() { +@@ -508,10 +517,10 @@ public function provider() { 'toolbar' => $basic_html_test_case['expected_ckeditor5_settings']['toolbar'], 'plugins' => [ 'ckeditor5_sourceEditing' => [ @@ -96,7 +96,7 @@ ], 'ckeditor5_heading' => [ 'enabled_headings' => [ -@@ -503,7 +512,7 @@ public function provider() { +@@ -528,7 +537,7 @@ public function provider() { 'expected_fundamental_compatibility_violations' => $basic_html_test_case['expected_fundamental_compatibility_violations'], 'expected_messages' => array_merge( $basic_html_test_case['expected_messages'], @@ -105,8 +105,8 @@ ), ]; -@@ -519,7 +528,14 @@ public function provider() { - ] +@@ -596,7 +605,14 @@ public function provider() { + array_slice($basic_html_test_case['expected_ckeditor5_settings']['toolbar']['items'], -1) ), ], - 'plugins' => $basic_html_test_case['expected_ckeditor5_settings']['plugins'], @@ -121,16 +121,16 @@ ], 'expected_superset' => implode(' ', [ // Note that aligning left and right is being added, on top of what the -@@ -549,7 +565,7 @@ public function provider() { +@@ -622,7 +638,7 @@ public function provider() { [ - 'The following plugins were enabled to support specific attributes that are allowed by this text format: Alignment ( for tag: <p> to support: class with value(s): text-align-center, text-align-justify).', + 'The following plugins were enabled to support specific attributes that are allowed by this text format: Align center ( for tag: <p> to support: class with value(s): text-align-center), Justify ( for tag: <p> to support: class with value(s): text-align-justify).', - 'This format\'s HTML filters includes plugins that support the following tags, but not some of their attributes. To ensure these attributes remain supported by this text format, the following were added to the Source Editing plugin\'s Manually editable HTML tags: <a hreflang> <blockquote cite> <ul type> <ol start type> <h2 id> <h3 id> <h4 id> <h5 id> <h6 id>.', + 'This format\'s HTML filters includes plugins that support the following tags, but not some of their attributes. To ensure these attributes remain supported by this text format, the following were added to the Source Editing plugin\'s Manually editable HTML tags: <a hreflang> <blockquote cite> <ul type> <ol start type> <h2 id> <h3 id> <h4 id> <h5 id> <h6 id> <img loading>.', ]), ]; -@@ -564,12 +580,19 @@ public function provider() { +@@ -637,12 +653,19 @@ public function provider() { array_slice($basic_html_test_case['expected_ckeditor5_settings']['toolbar']['items'], 10), ), ], @@ -152,7 +152,7 @@ ]), ]; -@@ -582,7 +605,7 @@ public function provider() { +@@ -655,7 +678,7 @@ public function provider() { 'ckeditor5_sourceEditing' => [ 'allowed_tags' => array_merge( $basic_html_test_case['expected_ckeditor5_settings']['plugins']['ckeditor5_sourceEditing']['allowed_tags'], @@ -161,7 +161,7 @@ ), ], ] + $basic_html_test_case['expected_ckeditor5_settings']['plugins'], -@@ -591,7 +614,7 @@ public function provider() { +@@ -664,7 +687,7 @@ public function provider() { 'expected_fundamental_compatibility_violations' => $basic_html_test_case['expected_fundamental_compatibility_violations'], 'expected_messages' => array_merge($basic_html_test_case['expected_messages'], [ @@ -171,7 +171,7 @@ ]; diff --git a/core/modules/editor/editor.module b/core/modules/editor/editor.module -index 726b3ab456..abf12cdfbc 100644 +index f95dd8bfd0..039fafb4e0 100644 --- a/core/modules/editor/editor.module +++ b/core/modules/editor/editor.module @@ -182,6 +182,64 @@ function editor_form_filter_format_form_alter(&$form, FormStateInterface $form_s