Commit 41769241 authored by catch's avatar catch
Browse files

Issue #3250299 by daffie, longwave: [Symfony6] A number of CKEditor5 tests fail for Symfony 5.4

parent 507fc5fe

core/modules/ckeditor5/src/Plugin/Validation/Constraint/EnabledConfigurablePluginsConstraintValidator.php

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ public function validate($settings, Constraint $constraint) { 


      if (!isset($plugin_settings[$id]) || empty($plugin_settings[$id])) {

        $this->context->buildViolation($constraint->message)

          ->setParameter('%plugin_label', $definition->label())

          ->setParameter('%plugin_label', (string) $definition->label())

          ->setParameter('%plugin_id', $id)

          ->atPath("plugins.$id")

          ->addViolation();

core/modules/ckeditor5/src/Plugin/Validation/Constraint/FundamentalCompatibilityConstraintValidator.php

+3 −3
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ private function checkNoMarkupFilters(FilterFormatInterface $text_format, Fundam 
    );

    foreach ($markup_filters as $markup_filter) {

      $this->context->buildViolation($constraint->noMarkupFiltersMessage)

        ->setParameter('%filter_label', $markup_filter->getLabel())

        ->setParameter('%filter_label', (string) $markup_filter->getLabel())

        ->setParameter('%filter_plugin_id', $markup_filter->getPluginId())

        ->addViolation();

    }
@@ -111,7 +111,7 @@ private function checkHtmlRestrictionsAreCompatible(FilterFormatInterface $text_ 
    if (!empty($forbidden_minimum_tags)) {

      $offending_filter = static::findHtmlRestrictorFilterForbiddingTags($text_format, $minimum_tags);

      $this->context->buildViolation($constraint->forbiddenElementsMessage)

        ->setParameter('%filter_label', $offending_filter->getLabel())

        ->setParameter('%filter_label', (string) $offending_filter->getLabel())

        ->setParameter('%filter_plugin_id', $offending_filter->getPluginId())

        ->addViolation();

    }
@@ -122,7 +122,7 @@ private function checkHtmlRestrictionsAreCompatible(FilterFormatInterface $text_ 
    if (!empty($not_allowed_minimum_tags)) {

      $offending_filter = static::findHtmlRestrictorFilterNotAllowingTags($text_format, $minimum_tags);

      $this->context->buildViolation($constraint->nonAllowedElementsMessage)

        ->setParameter('%filter_label', $offending_filter->getLabel())

        ->setParameter('%filter_label', (string) $offending_filter->getLabel())

        ->setParameter('%filter_plugin_id', $offending_filter->getPluginId())

        ->addViolation();

    }

core/modules/ckeditor5/src/Plugin/Validation/Constraint/ToolbarItemConditionsMetConstraintValidator.php

+4 −4
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ public function validate($toolbar_item, Constraint $constraint) { 
          $image_upload_settings = $text_editor->getImageUploadSettings();

          if (!isset($image_upload_settings['status']) || (bool) $image_upload_settings['status'] !== TRUE) {

            $this->context->buildViolation($constraint->imageUploadStatusRequiredMessage)

              ->setParameter('%toolbar_item', $toolbar_item_label)

              ->setParameter('%toolbar_item', (string) $toolbar_item_label)

              ->setInvalidValue($toolbar_item)

              ->addViolation();

          }
@@ -74,8 +74,8 @@ public function validate($toolbar_item, Constraint $constraint) { 
              ? $filters->get($required_value)->getLabel()

              : $required_value;

            $this->context->buildViolation($constraint->filterRequiredMessage)

              ->setParameter('%toolbar_item', $toolbar_item_label)

              ->setParameter('%filter', $filter_label)

              ->setParameter('%toolbar_item', (string) $toolbar_item_label)

              ->setParameter('%filter', (string) $filter_label)

              ->setInvalidValue($toolbar_item)

              ->addViolation();

          }
@@ -101,7 +101,7 @@ public function validate($toolbar_item, Constraint $constraint) { 
              $parameter = '%plugins';

            }

            $this->context->buildViolation($message)

              ->setParameter('%toolbar_item', $toolbar_item_label)

              ->setParameter('%toolbar_item', (string) $toolbar_item_label)

              ->setParameter($parameter, implode(', ', $missing_plugin_labels))

              ->setInvalidValue($toolbar_item)

              ->addViolation();