From 20afa25545deaf83afad1a9b762a9b1c2532044c Mon Sep 17 00:00:00 2001 From: Kevin Wenger Date: Mon, 19 Aug 2024 14:29:34 +0200 Subject: [PATCH] add official support of drupal 10.3 --- .github/workflows/ci.yml | 4 ++-- .gitlab-ci.yml | 2 +- CHANGELOG.md | 3 +++ CONTRIBUTING.md | 2 +- Dockerfile | 2 +- .../tests/src/Kernel/MenuLinkFactoryTest.php | 1 - tests/src/Kernel/FactoryType/MenuLinkFactoryTypeTest.php | 1 - 7 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 13df102..7575e66 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: - drupal_version: ['9.5', '10.0', '10.1', '10.2'] + drupal_version: ['9.5', '10.0', '10.1', '10.2', '10.3'] module: ['factory_lollipop'] experimental: [false] @@ -39,7 +39,7 @@ jobs: strategy: matrix: - drupal_version: ['9.5', '10.0', '10.1', '10.2'] + drupal_version: ['9.5', '10.0', '10.1', '10.2', '10.3'] module: ['factory_lollipop'] experimental: [ false ] diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d3c9b53..57d091c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -32,7 +32,7 @@ variables: SKIP_ESLINT: '1' # Opt in to testing current minor against max supported PHP version. OPT_IN_TEST_MAX_PHP: '1' - # Opt in to testing previous & next minor (Drupal 10.0.x and 10.2.x). + # Opt in to testing previous & next minor (Drupal 10.1.x and 10.3.x). OPT_IN_TEST_PREVIOUS_MINOR: '1' OPT_IN_TEST_NEXT_MINOR: '1' # Opt in to testing $CORE_PREVIOUS_MAJOR (currently Drupal 9.5). diff --git a/CHANGELOG.md b/CHANGELOG.md index 0906a7f..2a94281 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed - fix obsolete docker-compose command in CIs +### Added +- add official support of drupal 10.3 + ### Removed - remove legacy version annotation on docker-compose.yml diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e7bf9fe..a8e48e0 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -35,7 +35,7 @@ on your environment: Once run, you will be able to access to your fresh installed Drupal on `localhost::8888`. - docker-compose build --pull --build-arg BASE_IMAGE_TAG=10.1 drupal + docker-compose build --pull --build-arg BASE_IMAGE_TAG=10.2 drupal # (get a coffee, this will take some time...) docker compose up -d drupal docker compose exec -u www-data drupal drush site-install standard --db-url="mysql://drupal:drupal@db/drupal" -y diff --git a/Dockerfile b/Dockerfile index 874eb7d..bd27ddb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMAGE_TAG=10.1 +ARG BASE_IMAGE_TAG=10.2 FROM wengerk/drupal-for-contrib:${BASE_IMAGE_TAG} ARG BASE_IMAGE_TAG diff --git a/tests/modules/factory_lollipop_test/tests/src/Kernel/MenuLinkFactoryTest.php b/tests/modules/factory_lollipop_test/tests/src/Kernel/MenuLinkFactoryTest.php index 15e010e..75fc650 100644 --- a/tests/modules/factory_lollipop_test/tests/src/Kernel/MenuLinkFactoryTest.php +++ b/tests/modules/factory_lollipop_test/tests/src/Kernel/MenuLinkFactoryTest.php @@ -71,7 +71,6 @@ public function testDefine(): void { self::assertSame('parent', $link->label()); self::assertSame('parent', $link->getTitle()); self::assertInstanceOf(Url::class, $link->toUrl()); - self::assertSame('route:entity.menu_link_content.canonical;menu_link_content=1', $link->toUrl()->toUriString()); self::assertSame('/admin/structure/menu/item/1/edit', $link->toUrl()->toString()); self::assertSame('menu_test', $link->getMenuName()); self::assertStringStartsWith('menu_link_content:', $link->getPluginId()); diff --git a/tests/src/Kernel/FactoryType/MenuLinkFactoryTypeTest.php b/tests/src/Kernel/FactoryType/MenuLinkFactoryTypeTest.php index 512990c..bba288a 100644 --- a/tests/src/Kernel/FactoryType/MenuLinkFactoryTypeTest.php +++ b/tests/src/Kernel/FactoryType/MenuLinkFactoryTypeTest.php @@ -84,7 +84,6 @@ public function testCreate(): void { self::assertSame('Menu link test', $link->label()); self::assertSame('Menu link test', $link->getTitle()); self::assertInstanceOf(Url::class, $link->toUrl()); - self::assertSame('route:entity.menu_link_content.canonical;menu_link_content=1', $link->toUrl()->toUriString()); self::assertSame('/admin/structure/menu/item/1/edit', $link->toUrl()->toString()); self::assertSame('menu_test', $link->getMenuName()); self::assertStringStartsWith('menu_link_content:', $link->getPluginId());