support only CKEditor 5 and Drupal 10.x (dropping legacy CK4 & Drupal…

… 9.x)

.github/workflows/ci.yml

@@ -11,7 +11,7 @@ jobs:
 
     strategy:
       matrix:
-        drupal_version: ['9.5', '10.0', '10.1', '10.2']
+        drupal_version: ['10.0', '10.1', '10.2', '11.0']
         module: ['editor_advanced_image']
 
     steps:
@@ -34,7 +34,7 @@ jobs:
 
     strategy:
       matrix:
-        drupal_version: ['9.5', '10.0', '10.1', '10.2']
+        drupal_version: ['10.0', '10.1', '10.2']
         module: ['editor_advanced_image']
 
     steps:
@@ -61,7 +61,7 @@ jobs:
 
     strategy:
       matrix:
-        drupal_version: ['9.5']
+        drupal_version: ['10.2']
         module: ['editor_advanced_image']
 
     steps:
@@ -74,7 +74,7 @@ jobs:
       - name: Up a persistent Docker Container
         run: docker compose -f docker-compose.yml up -d drupal
       - name: Add upgrade status dependency
-        run: docker compose exec -T drupal wait-for-it db:3306 -- composer require --dev drupal/upgrade_status --no-interaction
+        run: docker compose exec -T drupal wait-for-it db:3306 -- composer require --dev drupal/upgrade_status --no-interaction --with-all-dependencies
       - name: Bootstrap Drupal
         run: docker compose -f docker-compose.yml exec -T -u www-data drupal drush site-install standard --db-url="mysql://drupal:drupal@db/drupal" -y
       - name: Enable upgrade status

.gitlab-ci.yml

@@ -31,10 +31,13 @@ include:
 variables:
   # Opt in to testing current minor against max supported PHP version.
   OPT_IN_TEST_MAX_PHP: '1'
-  # Opt in to testing previous (Drupal 10.1.x).
+  # Opt in to testing previous & next minor (Drupal 10.0.x and 10.2.x).
   OPT_IN_TEST_PREVIOUS_MINOR: '1'
-  # The 4.x branch of the CDN module requires PHP >=8.1, rather than core's >=7.4.
+  OPT_IN_TEST_NEXT_MINOR: '1'
+  # The 3.x branch of the CDN module requires Drupal 10.x minimum.
   CORE_PREVIOUS_PHP_MIN: '8.1'
+  # Opt in to testing $CORE_MAJOR_DEVELOPMENT (currently Drupal 11).
+  OPT_IN_TEST_NEXT_MAJOR: '1'
 
 # This module wants to strictly comply with Drupal's coding standards.
 phpcs:

CHANGELOG.md

@@ -5,6 +5,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Removed
+- drop support of drupal 9.x
+- drop support of CKEditor 4.x
+
+### Added
+- add official support of drupal 11
 
 ## [2.3.0] - 2024-04-08
 ### Fixed

CONTRIBUTING.md

@@ -24,7 +24,7 @@ First of all, you need to have the following tools installed globally
 on your environment:
 
   * drush
-  * Latest dev release of Drupal 8.x/9.x/10.x.
+  * Latest dev release of Drupal 8.x/9.x/10.x/11.x.
   * docker
   * docker compose
 

Dockerfile

@@ -2,11 +2,7 @@ ARG BASE_IMAGE_TAG=10.1
 FROM wengerk/drupal-for-contrib:${BASE_IMAGE_TAG}
 
 # Disable deprecation notice as CKEditor4 module will throw an exception until we remove support of Drupal 9.
-ENV SYMFONY_DEPRECATIONS_HELPER=disabled
-
-# Install drupal/ckeditor (CKEditor 4) as we keep supporting CK4 & CK5.
-ENV COMPOSER_ALLOW_SUPERUSER=1
-RUN COMPOSER_MEMORY_LIMIT=-1 composer require "drupal/ckeditor"
+# ENV SYMFONY_DEPRECATIONS_HELPER=disabled
 
 # Register the Drupal and DrupalPractice Standard with PHPCS.
 RUN ./vendor/bin/phpcs --config-set installed_paths \

composer.json

@@ -29,8 +29,7 @@
   },
   "license": "GPL-2.0-or-later",
   "require-dev": {
-    "drupal/coder": "^8.3.1",
-    "drupal/ckeditor": "^1.0"
+    "drupal/coder": "^8.3.1"
   },
   "config": {
     "allow-plugins": {

editor_advanced_image.info.yml

@@ -1,8 +1,10 @@
 name: 'Editor Advanced Image'
 type: module
 description: 'Enhances the inline-image Dialog in D8 CKEditor.'
-core_version_requirement: ^9.5 || ^10
+core_version_requirement: ^10 || ^11
+
 package: CKEditor
 
 dependencies:
   - drupal:editor
+  - drupal:ckeditor5

editor_advanced_image.libraries.yml

@@ -1,13 +1,3 @@
-editor_advanced_image:
-  version: VERSION
-  js:
-    js/editor_advanced_image.js: {}
-  dependencies:
-    - core/drupal
-    - core/drupal.announce
-    - core/jquery
-    - core/once
-
 ckeditor5:
   version: VERSION
   js: