Verified Commit 03a0f1f2 authored by Alex Pott's avatar Alex Pott
Browse files

Issue #3273527 by joevagyok, Wim Leers: Upgrade path never configures the... 

Issue #3273527 by joevagyok, Wim Leers: Upgrade path never configures the ckeditor5_heading plugin to allow <h1>

(cherry picked from commit a1244cef)
parent a87055c1

core/modules/ckeditor5/src/Plugin/CKEditor4To5Upgrade/Core.php

+1 −1
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ public function computeCKEditor5PluginSubsetConfiguration(string $cke5_plugin_id 
        }

        // Otherwise, only enable headings that allowed by the restrictions.

        $configuration = [];

        foreach (range(2, 6) as $index) {

        foreach (range(1, 6) as $index) {

          // Merely checking the existence of the array key is sufficient; this

          // plugin does not set or need any additional attributes.

          // @see \Drupal\filter\Plugin\FilterInterface::getHTMLRestrictions()

core/modules/ckeditor5/tests/src/Kernel/SmartDefaultSettingsTest.php

+42 −0
Original line number Diff line number Diff line
@@ -126,6 +126,17 @@ protected function setUp(): void { 
      Yaml::parseFile('core/profiles/standard/config/install/editor.editor.basic_html.yml')

    )->save();



    $basic_html_format_with_h1 = $basic_html_format;

    $basic_html_format_with_h1['name'] .= ' (with <h1>)';

    $basic_html_format_with_h1['format'] = 'basic_html_with_h1';

    NestedArray::setValue($basic_html_format_with_h1, $allowed_html_parents, $current_value . ' <h1>');

    FilterFormat::create($basic_html_format_with_h1)->save();

    Editor::create(

      ['format' => 'basic_html_with_h1']

      +

      Yaml::parseFile('core/profiles/standard/config/install/editor.editor.basic_html.yml')

    )->save();



    $new_value = str_replace('<p>', '<p class="text-align-center text-align-justify">', $current_value);

    $basic_html_format_with_alignable_p = $basic_html_format;

    $basic_html_format_with_alignable_p['name'] .= ' (with alignable paragraph support)';
@@ -532,6 +543,37 @@ public function provider() { 
      ),

    ];



    yield "basic_html_with_h1 can be switched to CKEditor 5 without problems, heading configuration computed automatically" => [

      'format_id' => 'basic_html_with_h1',

      'filters_to_drop' => $basic_html_test_case['filters_to_drop'],

      'expected_ckeditor5_settings' => [

        'toolbar' => $basic_html_test_case['expected_ckeditor5_settings']['toolbar'],

        'plugins' => [

          'ckeditor5_sourceEditing' => [

            'allowed_tags' => $basic_html_test_case['expected_ckeditor5_settings']['plugins']['ckeditor5_sourceEditing']['allowed_tags'],

          ],

          'ckeditor5_heading' => [

            'enabled_headings' => [

              'heading1',

              'heading2',

              'heading3',

              'heading4',

              'heading5',

              'heading6',

            ],

          ],

          'ckeditor5_imageResize' => ['allow_resize' => TRUE],

          'ckeditor5_language' => $basic_html_test_case['expected_ckeditor5_settings']['plugins']['ckeditor5_language'],

        ],

      ],

      'expected_superset' => $basic_html_test_case['expected_superset'],

      'expected_fundamental_compatibility_violations' => $basic_html_test_case['expected_fundamental_compatibility_violations'],

      'expected_messages' => array_merge(

        $basic_html_test_case['expected_messages'],

        ['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 <em>Manually editable HTML tags</em>: &lt;a hreflang&gt; &lt;blockquote cite&gt; &lt;ul type&gt; &lt;ol start type&gt; &lt;h2 id&gt; &lt;h3 id&gt; &lt;h4 id&gt; &lt;h5 id&gt; &lt;h6 id&gt;.'],

      ),

    ];



    yield "basic_html_without_headings can be switched to CKEditor 5 without problems, heading configuration computed automatically" => [

      'format_id' => 'basic_html_without_headings',

      'filters_to_drop' => $basic_html_test_case['filters_to_drop'],