add official stable support for drupal 10.3 & 10.4

Author: WengerK

.github/workflows/ci.yml

@@ -11,16 +11,10 @@ jobs:
 
     strategy:
       matrix:
-        drupal_version: ['9.5', '10.0', '10.1', '10.2']
+        drupal_version: ['10.3', '10.4']
         module: ['editor_advanced_image']
         experimental: [ false ]
         include:
-          - drupal_version: '10.3'
-            module: 'editor_advanced_image'
-            experimental: true
-          - drupal_version: '10.4'
-            module: 'editor_advanced_image'
-            experimental: true
           - drupal_version: '10.5'
             module: 'editor_advanced_image'
             experimental: true
@@ -36,6 +30,10 @@ jobs:
         run: docker compose exec -T drupal wait-for-it drupal:80 -t 60
       - name: wait on Docker to be ready, especially MariaDB that takes many seconds to be up
         run: docker compose exec -T drupal wait-for-it db:3306 -t 60
+      - 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 CKEditor 4
+        run: docker compose exec -T drupal wait-for-it db:3306 -- ./vendor/bin/drush en ckeditor -y
       - name: Run unit tests
         run: docker compose -f docker-compose.yml exec -T -u www-data drupal phpunit --testdox --no-coverage --group=${{ matrix.module }} --exclude-group=${{ matrix.module }}_functional --configuration=/var/www/html/phpunit.xml
         continue-on-error: ${{ matrix.experimental }}
@@ -46,16 +44,10 @@ jobs:
 
     strategy:
       matrix:
-        drupal_version: ['9.5', '10.0', '10.1', '10.2']
+        drupal_version: ['10.3', '10.4']
         module: ['editor_advanced_image']
         experimental: [ false ]
         include:
-          - drupal_version: '10.3'
-            module: 'editor_advanced_image'
-            experimental: true
-          - drupal_version: '10.4'
-            module: 'editor_advanced_image'
-            experimental: true
           - drupal_version: '10.5'
             module: 'editor_advanced_image'
             experimental: true
@@ -85,7 +77,7 @@ jobs:
 
     strategy:
       matrix:
-        drupal_version: ['9.5']
+        drupal_version: ['10.3']
         module: ['editor_advanced_image']
         experimental: [ true ]
 

.gitlab-ci.yml

@@ -30,10 +30,10 @@ include:
 ################
 variables:
   # The 2.x branch of the module should run on 9.5 to maximum 10.2 but not upper.
-  CORE_PREVIOUS_STABLE: '10.0'
-  CORE_STABLE: '10.1'
-  CORE_NEXT_MINOR: '10.2'
-  CORE_SECURITY_PREVIOUS_MINOR: '10.1'
+  CORE_PREVIOUS_STABLE: '10.3'
+  CORE_STABLE: '10.4'
+  CORE_NEXT_MINOR: '10.5'
+  CORE_SECURITY_PREVIOUS_MINOR: '10.3'
   # The 2.x branch of the module requires PHP >=8.1, rather than core's >=7.4.
   CORE_PREVIOUS_PHP_MIN: '8.1'
   CORE_PHP_MAX: '8.2'
@@ -46,8 +46,8 @@ variables:
   OPT_IN_TEST_PREVIOUS_MINOR: '1'
   # Opt-in to testing previous Major (Drupal 9.5.x).
   OPT_IN_TEST_PREVIOUS_MAJOR: '1'
-  # Opt-int of testing next Minor (Drupal 10.x).
-  OPT_IN_TEST_NEXT_MINOR: '1'
+  # Opt-int of testing next Minor (Drupal 10.5).
+  OPT_IN_TEST_NEXT_MINOR: '0'
   # Opt-out of testing next Major (Drupal 11.x).
   OPT_IN_TEST_NEXT_MAJOR: '0'
 

CHANGELOG.md

@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 ### Added
 - fix support from 9.5.x to 10.2 maximum
+- add official stable support for drupal 10.3
+- add official stable support for drupal 10.4
 
 ### Removed
 - remove legacy version annotation on docker-compose.yml

editor_advanced_image.info.yml

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

tests/src/Kernel/CKEditor4To5Upgrade/UpgradePathTest.php

@@ -135,7 +135,7 @@ protected function setUp(): void {
   /**
    * {@inheritdoc}
    */
-  public function provider() {
+  public static function provider() {
     $expected_ckeditor5_toolbar = [
       'items' => [
         'bold',