Commit 9bfe11cf authored by Sascha Grossenbacher's avatar Sascha Grossenbacher Committed by Sascha Grossenbacher
Browse files

Issue #3270096 by Berdir: Fix compatibility with allowed formats 8.x-1.4

parent 720652e6

src/FieldTrait.php

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ trait FieldTrait { 
    $default_test_format = \Drupal::config('ww_publish.settings')->get('default_text_format');

    if ($field_definition instanceof FieldConfigInterface) {

      $allowed_formats_setting = $field_definition->getThirdPartySettings('allowed_formats');

      $allowed_formats_setting = isset($allowed_formats_setting['allowed_formats']) && \is_array($allowed_formats_setting['allowed_formats']) ? $allowed_formats_setting['allowed_formats'] : $allowed_formats_setting;

      $allowed_formats_setting = array_filter($allowed_formats_setting);

      if ($allowed_formats_setting && !isset($allowed_formats_setting[$default_test_format])) {

        $default_test_format = \reset($allowed_formats_setting);

tests/src/Kernel/WwPublishImportTest.php

+1 −2
Original line number Diff line number Diff line
@@ -103,8 +103,7 @@ class WwPublishImportTest extends WwPublishTestBase { 
      'bundle' => 'article',

    ]);

    $subtitle_field->setThirdPartySetting('ww_publish', 'content_station_identifier', 'intro');

    $subtitle_field->setThirdPartySetting('allowed_formats', 'basic_html', 'basic_html');

    $subtitle_field->setThirdPartySetting('allowed_formats', 'full_html', '');

    $subtitle_field->setThirdPartySetting('allowed_formats', 'allowed_formats', ['basic_html']);

    $subtitle_field->save();



    $vocabulary = Vocabulary::create([