Issue #47: Support drupal/core:^11

.github/workflows/ci.yaml

@@ -12,6 +12,12 @@ jobs:
       fail-fast: true
       matrix:
         php: [8.1, 8.2, 8.3]
+        drupal-constraint: ['^10.3', '^11.0']
+        exclude:
+          - php: 8.1
+            drupal-constraint: '^11.0'
+          - php: 8.2
+            drupal-constraint: '^11.0'
 
     steps:
       - uses: actions/checkout@v4
@@ -51,11 +57,16 @@ jobs:
           docker-compose exec -T web php --version
           docker-compose exec -T web php --info | grep xdebug.mode || true
 
+      - name: Prepare composer.json
+        run: |
+          set -x
+
+          # Require a specific Drupal core version.
+          docker-compose exec -T web composer require --no-update --dev drupal/core:${{ matrix.drupal-constraint }}
+
       - name: Composer install
         run: |
-          docker-compose exec -T web composer config --json "extra.patches" '{"drupal/group": {"Using a translatable string as a category for field type is deprecated - https://www.drupal.org/project/group/issues/3458530": "https://www.drupal.org/files/issues/2024-07-02/group-translate-string-as-category-is-deprecated_0.patch"}}'
-          docker-compose exec -T web composer config allow-plugins.cweagans/composer-patches true
-          docker-compose exec -T web composer require --dev cweagans/composer-patches
+          docker-compose exec -T web composer install --no-interaction
 
       - name: PhpCS
         run: |
@@ -67,9 +78,9 @@ jobs:
 
       - name: PhpUnit
         run: |
-          docker-compose exec -T web ./vendor/bin/phpunit -vvv --debug
+          docker-compose exec -T web ./vendor/bin/phpunit
 
       - name: PhpUnit - groupmedia 3
         run: |
           docker-compose exec -T web composer require --dev drupal/groupmedia:^3 -W
-          docker-compose exec -T web ./vendor/bin/phpunit -vvv --debug --testsuite "Collabora Online Group"
+          docker-compose exec -T web ./vendor/bin/phpunit --testsuite "Collabora Online Group"

.gitlab-ci.yml

@@ -35,15 +35,18 @@ phpunit:
     - !reference [.setup-webserver]
     - !reference [.simpletest-db]
     - $CI_PROJECT_DIR/vendor/bin/run drupal:settings-setup --skip-permissions-setup
-    - $CI_PROJECT_DIR/vendor/bin/run drupal:site-install --database-scheme=mysql --database-name=$MYSQL_DATABASE --database-host=database --database-user=$MYSQL_USER --database-password=$MYSQL_PASSWORD --database-port=
+    - "$CI_PROJECT_DIR/vendor/bin/run drupal:site-install \
+      --database-scheme=mysql \
+      --database-name=$MYSQL_DATABASE \
+      --database-host=database \
+      --database-user=$MYSQL_USER \
+      --database-password=$MYSQL_PASSWORD \
+      --database-port="
     - drush -y config-set collabora_online.settings cool.wopi_base $DTT_BASE_URL
     - rm /var/www/html/web # Remove symlink to allow .setup-webserver to be re-executed.
 
 variables:
   DTT_BASE_URL: $SIMPLETEST_BASE_URL
   DTT_MINK_DRIVER_ARGS: $MINK_DRIVER_ARGS_WEBDRIVER
   _SHOW_ENVIRONMENT_VARIABLES: '1'
-
-composer:
-  variables:
-    DRUPAL_CORE: $CORE_PREVIOUS_STABLE
+  OPT_IN_TEST_PREVIOUS_MAJOR: '1'

collabora_online.info.yml

@@ -7,4 +7,4 @@ dependencies:
   - key:key
 
 type: module
-core_version_requirement: ^10
+core_version_requirement: ^10 || ^11

composer.json

@@ -14,15 +14,15 @@
         "drupal/key": "^1.19",
         "firebase/php-jwt": "^6.10",
         "phpseclib/phpseclib": "^3.0",
-        "symfony/error-handler": "^6.4|^7.1"
+        "symfony/error-handler": "^6.4 || ^7.1"
     },
     "require-dev": {
         "composer/installers": "^2",
-        "drupal/core-composer-scaffold": "^10.3.6",
-        "drupal/core-dev": "^10.3.6",
-        "drupal/core-recommended": "^10.3.6",
+        "drupal/core-composer-scaffold": "^10.4 || ^11.1",
+        "drupal/core-dev": "^10.3 || ^11.0",
+        "drupal/core-recommended": "^10.3 || ^11.0",
         "drupal/groupmedia": "^3 || ^4",
-        "drush/drush": "^12.4",
+        "drush/drush": "^12.4 || ^13.3",
         "openeuropa/task-runner-drupal-project-symlink": "^1.0.0-beta6",
         "openeuropa/task-runner": "^2@alpha",
         "php-parallel-lint/php-parallel-lint": "^1.2",

docker-compose.yml

@@ -1,7 +1,7 @@
 version: '2'
 services:
   web:
-    image: fpfis/httpd-php-dev:8.2
+    image: fpfis/httpd-php-dev:8.3
     working_dir: /var/www/html
     ports:
       - "8080:8080"

modules/collabora_online_group/collabora_online_group.info.yml

@@ -6,4 +6,4 @@ dependencies:
   - groupmedia:groupmedia
 
 type: module
-core_version_requirement: ^10
+core_version_requirement: ^10 || ^11

modules/collabora_online_group/tests/src/Functional/GroupMediaViewsTest.php

@@ -42,6 +42,15 @@ class GroupMediaViewsTest extends BrowserTestBase {
     'views',
   ];
 
+  /**
+   * {@inheritdoc}
+   */
+  protected static $configSchemaCheckerExclusions = [
+    // Suppress a schema error from groupmedia default config.
+    // See https://www.drupal.org/project/groupmedia/issues/3491778.
+    'views.view.group_media',
+  ];
+
   /**
    * {@inheritdoc}
    */

tests/modules/collabora_online_test/collabora_online_test.info.yml

@@ -2,6 +2,6 @@ name: 'Collabora Online Test module'
 type: module
 description: 'Provides configuration for tests and for the local demo site.'
 package: Testing
-core_version_requirement: ^10
+core_version_requirement: ^10 || ^11
 dependencies:
   - collabora_online:collabora_online