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: ['9.5', '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
@@ -46,16 +40,10 @@ jobs:
 
     strategy:
       matrix:
-        drupal_version: ['9.5', '10.0', '10.1', '10.2']
+        drupal_version: ['9.5', '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 +73,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

@@ -9,6 +9,36 @@
 use Drupal\filter\Entity\FilterFormat;
 use Drupal\Tests\ckeditor5\Kernel\SmartDefaultSettingsTest;
 
+// phpcs:ignoreFile
+
+if (version_compare(\Drupal::VERSION, '10.3', '<')) {
+  class CrossCompatibleUpgradePath extends SmartDefaultSettingsTest {
+    /**
+     * {@inheritdoc}
+     */
+    public function provider() {
+      return static::dataProvider();
+    }
+
+    public function parentProvider() {
+      return parent::provider();
+    }
+  }
+} else {
+  class CrossCompatibleUpgradePath extends SmartDefaultSettingsTest {
+    /**
+     * {@inheritdoc}
+     */
+    public static function provider() {
+      return static::dataProvider();
+    }
+
+    public function parentProvider() {
+      return parent::provider();
+    }
+  }
+}
+
 /**
  * @covers \Drupal\editor_advanced_image\Plugin\CKEditor4To5Upgrade\EditorAdvancedImage
  *
@@ -21,7 +51,7 @@
  *
  * @requires module ckeditor5
  */
-class UpgradePathTest extends SmartDefaultSettingsTest {
+class UpgradePathTest extends CrossCompatibleUpgradePath {
 
   /**
    * {@inheritdoc}
@@ -34,12 +64,16 @@ class UpgradePathTest extends SmartDefaultSettingsTest {
    * {@inheritdoc}
    */
   protected function setUp(): void {
-    parent::setUp();
-
     if (version_compare(\Drupal::VERSION, '10', '<')) {
       $this->markTestSkipped('Upgrade path will only run properly on Drupal 10+ because of config sorting.');
     }
 
+    if (version_compare(\Drupal::VERSION, '10.2', '>')) {
+      $this->markTestSkipped('Cannot run CKEditor4 upgrade path to CKEditor 5 on Drupal later than 10.2.');
+    }
+
+    parent::setUp();
+
     // Create test FilterFormat config entities: one per option to test in
     // isolation, plus one to test with the default configuration (class attr
     // enabled), plus one with ALL attributes enabled but with additional
@@ -133,9 +167,12 @@ protected function setUp(): void {
   }
 
   /**
-   * {@inheritdoc}
+   * The actual data provider implementation.
+   *
+   * @return \Generator
+   *   The test cases.
    */
-  public function provider() {
+  protected function dataProvider() {
     $expected_ckeditor5_toolbar = [
       'items' => [
         'bold',
@@ -295,7 +332,7 @@ public function provider() {
     ];
     sort($full_html_configuration['enabled_attributes']);
 
-    foreach (parent::provider() as $label => $case) {
+    foreach ($this->parentProvider() as $label => $case) {
       // The `editor_advanced_image_image` plugin settings will appear for every
       // upgraded text editor while editor_advanced_image is installed, as long
       // as it has the `DrupalImage` button enabled in CKEditor 4.