From 234c070f83fac6264624447414fff2abfafc1edd Mon Sep 17 00:00:00 2001 From: Stanislav Kutasevits Date: Mon, 4 May 2026 15:55:33 +0300 Subject: [PATCH 1/4] #200 updating ckeditor -> ckeditor5 --- CHANGELOG.md | 1 + os2forms.info.yml | 1 - os2forms.install | 28 ++++++++++++++++++++++++++++ 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ff239913..ad28bc57 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ before starting to add changes. Use example [placed in the end of the page](#exa ## [Unreleased] +- Updating ckeditor -> ckeditor5. - [PR-322](https://github.com/OS2Forms/os2forms/pull/322) Update Digital Post handler error messages. - [PR-320](https://github.com/OS2Forms/os2forms/pull/320) diff --git a/os2forms.info.yml b/os2forms.info.yml index d08e8e9c..d7e530d0 100644 --- a/os2forms.info.yml +++ b/os2forms.info.yml @@ -5,7 +5,6 @@ package: OS2Forms core_version_requirement: ^9 || ^10 dependencies: - - 'drupal:ckeditor' - 'drupal:editor' - 'drupal:entity_print' - 'drupal:eu_cookie_compliance' diff --git a/os2forms.install b/os2forms.install index b6085142..b1a1f56b 100644 --- a/os2forms.install +++ b/os2forms.install @@ -8,6 +8,7 @@ use Composer\InstalledVersions; use Drupal\field\Entity\FieldConfig; use Drupal\field\Entity\FieldStorageConfig; +use Drupal\filter\Entity\FilterFormat; use Drupal\taxonomy\Entity\Term; use Symfony\Component\Yaml\Yaml; @@ -237,3 +238,30 @@ function os2forms_update_103001() { function os2forms_update_103002() { \Drupal::service('module_installer')->install(['os2web_key']); } + +/** + * Implements hook_update_N(). + * + * Updating ckeditor -> ckeditor5. + */ +function os2forms_update_103003() { + \Drupal::service('module_installer')->install(['ckeditor5']); + + $editor_storage = \Drupal::entityTypeManager()->getStorage('editor'); + /** @var \Drupal\ckeditor5\SmartDefaultSettings $smart_defaults */ + $smart_defaults = \Drupal::service('ckeditor5.smart_default_settings'); + + foreach (FilterFormat::loadMultiple() as $format) { + /** @var \Drupal\editor\EditorInterface $editor */ + $editor = $editor_storage->load($format->id()); + if (!$editor || $editor->getEditor() !== 'ckeditor') { + continue; + } + + [$new_editor, $messages] = $smart_defaults + ->computeSmartDefaultSettings($editor, $format); + $new_editor->save(); + } + + \Drupal::service('module_installer')->uninstall(['ckeditor']); +} From 10bca3287a55e84d100e938080448c66ba50595e Mon Sep 17 00:00:00 2001 From: Stanislav Kutasevits Date: Mon, 4 May 2026 15:57:32 +0300 Subject: [PATCH 2/4] #200 adding PR link into readme --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ad28bc57..1f722099 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,8 @@ before starting to add changes. Use example [placed in the end of the page](#exa ## [Unreleased] -- Updating ckeditor -> ckeditor5. +- [PR-326](https://github.com/OS2Forms/os2forms/pull/326) + Updating ckeditor -> ckeditor5. - [PR-322](https://github.com/OS2Forms/os2forms/pull/322) Update Digital Post handler error messages. - [PR-320](https://github.com/OS2Forms/os2forms/pull/320) From 8178f877308ee38f3ac5fcf2e75f7723cb630896 Mon Sep 17 00:00:00 2001 From: Stanislav Kutasevits Date: Mon, 4 May 2026 16:11:57 +0300 Subject: [PATCH 3/4] #200 ignoring empty var --- os2forms.install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/os2forms.install b/os2forms.install index b1a1f56b..7fd27fc4 100644 --- a/os2forms.install +++ b/os2forms.install @@ -258,7 +258,7 @@ function os2forms_update_103003() { continue; } - [$new_editor, $messages] = $smart_defaults + [$new_editor, ] = $smart_defaults ->computeSmartDefaultSettings($editor, $format); $new_editor->save(); } From 72e4cad00d589b11361b39307dc23d83589bb5ad Mon Sep 17 00:00:00 2001 From: Stanislav Kutasevits Date: Mon, 4 May 2026 16:15:06 +0300 Subject: [PATCH 4/4] #200 ignoring empty var --- os2forms.install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/os2forms.install b/os2forms.install index 7fd27fc4..9d1becee 100644 --- a/os2forms.install +++ b/os2forms.install @@ -258,7 +258,7 @@ function os2forms_update_103003() { continue; } - [$new_editor, ] = $smart_defaults + [$new_editor] = $smart_defaults ->computeSmartDefaultSettings($editor, $format); $new_editor->save(); }