From 8ab29babfb6c3ea37367ddbc99b2a171c6007dcb Mon Sep 17 00:00:00 2001 From: Stephen Cox Date: Wed, 9 Apr 2025 15:53:42 +0100 Subject: [PATCH 1/8] Relax composer restrictions --- composer.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index e812a6e..163745e 100644 --- a/composer.json +++ b/composer.json @@ -23,17 +23,17 @@ "drupal/metatag": "^2.0.2", "drupal/redirect": "^1.9", "drupal/responsive_preview": "^2.1", - "localgovdrupal/localgov_blogs": "^1.0.0-beta3", + "localgovdrupal/localgov_blogs": "^1.0@beta", "localgovdrupal/localgov_core": "^2.12", "localgovdrupal/localgov_directories": "^3.1", "localgovdrupal/localgov_events": "^3.0", "localgovdrupal/localgov_microsites_group": "^4.0", "localgovdrupal/localgov_microsites_base": "^2.0", - "localgovdrupal/localgov_microsites_colour_picker_fields": "^1.0.0-beta1", + "localgovdrupal/localgov_microsites_colour_picker_fields": "^1.0@beta", "localgovdrupal/localgov_news": "^2.3", - "localgovdrupal/localgov_page": "^1.0.0-beta2", - "localgovdrupal/localgov_claro": "^2.1.0", - "localgovdrupal/localgov_sa11y": "^1.0.0-beta1", + "localgovdrupal/localgov_page": "^1.0@beta", + "localgovdrupal/localgov_claro": "^2.1", + "localgovdrupal/localgov_sa11y": "^1.0@beta", "drupal/require_login": "^3.0" }, "minimum-stability": "dev", From 117e540edc7c8b07cf46e1e5616aaa6b2e1feca3 Mon Sep 17 00:00:00 2001 From: Stephen Cox Date: Wed, 9 Apr 2025 16:12:42 +0100 Subject: [PATCH 2/8] Declare Drupal 11 support --- composer.json | 2 +- localgov_microsites.info.yml | 2 +- .../localgov_microsites_media.info.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 163745e..46c388a 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ "php": ">=8.1", "drupal/admin_toolbar": "^3.1", "drupal/autosave_form": "^1.3", - "drupal/core": "^10.0", + "drupal/core": "^10.0 || ^11.0", "drupal/default_content": "^2.0@alpha", "drupal/domain_path": "^1.2", "drupal/gin": "^3.0@RC", diff --git a/localgov_microsites.info.yml b/localgov_microsites.info.yml index abc3ee3..5f2eab4 100644 --- a/localgov_microsites.info.yml +++ b/localgov_microsites.info.yml @@ -1,7 +1,7 @@ name: LocalGov Drupal Microsites type: profile description: 'Install LocalGov Drupal Microsites.' -core_version_requirement: ^9 || ^10 +core_version_requirement: ^10 || ^11 install: # Core diff --git a/modules/localgov_microsites_media/localgov_microsites_media.info.yml b/modules/localgov_microsites_media/localgov_microsites_media.info.yml index 9bfaf72..dee5ff0 100644 --- a/modules/localgov_microsites_media/localgov_microsites_media.info.yml +++ b/modules/localgov_microsites_media/localgov_microsites_media.info.yml @@ -2,7 +2,7 @@ name: LocalGov Microsites Media description: LocalGov Media configuration required for Microsites profile. package: LocalGov Drupal type: module -core_version_requirement: ^8.8 || ^9 || ^10 +core_version_requirement: ^10 || ^11 dependencies: - drupal:editor From 97b86a7506dc22642ba1bc8b820ec77b0c891688 Mon Sep 17 00:00:00 2001 From: Stephen Cox Date: Fri, 23 May 2025 15:50:48 +0100 Subject: [PATCH 3/8] Use Drupal 11 branch of localgov_microsites_group module --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 46c388a..3e91add 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,7 @@ "localgovdrupal/localgov_core": "^2.12", "localgovdrupal/localgov_directories": "^3.1", "localgovdrupal/localgov_events": "^3.0", - "localgovdrupal/localgov_microsites_group": "^4.0", + "localgovdrupal/localgov_microsites_group": "dev-feature/4.x/496-drupal-11", "localgovdrupal/localgov_microsites_base": "^2.0", "localgovdrupal/localgov_microsites_colour_picker_fields": "^1.0@beta", "localgovdrupal/localgov_news": "^2.3", From d9865a4641c7ed91db183c7333884cf72aede888 Mon Sep 17 00:00:00 2001 From: Stephen Cox Date: Fri, 23 May 2025 15:57:38 +0100 Subject: [PATCH 4/8] Use Composer alias for localgovdrupal/localgov_microsites_group --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 3e91add..b0541bd 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,7 @@ "localgovdrupal/localgov_core": "^2.12", "localgovdrupal/localgov_directories": "^3.1", "localgovdrupal/localgov_events": "^3.0", - "localgovdrupal/localgov_microsites_group": "dev-feature/4.x/496-drupal-11", + "localgovdrupal/localgov_microsites_group": "dev-feature/4.x/496-drupal-11 as 4.1.0", "localgovdrupal/localgov_microsites_base": "^2.0", "localgovdrupal/localgov_microsites_colour_picker_fields": "^1.0@beta", "localgovdrupal/localgov_news": "^2.3", From d7eb6a5ca4b86a169841018ef133645c0540244b Mon Sep 17 00:00:00 2001 From: Stephen Cox Date: Fri, 23 May 2025 16:03:18 +0100 Subject: [PATCH 5/8] Temp Composer alias for localgovdrupal/localgov_microsites_base --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index b0541bd..773222c 100644 --- a/composer.json +++ b/composer.json @@ -28,7 +28,7 @@ "localgovdrupal/localgov_directories": "^3.1", "localgovdrupal/localgov_events": "^3.0", "localgovdrupal/localgov_microsites_group": "dev-feature/4.x/496-drupal-11 as 4.1.0", - "localgovdrupal/localgov_microsites_base": "^2.0", + "localgovdrupal/localgov_microsites_base": "dev-temp/drupal-11", "localgovdrupal/localgov_microsites_colour_picker_fields": "^1.0@beta", "localgovdrupal/localgov_news": "^2.3", "localgovdrupal/localgov_page": "^1.0@beta", From c957aeb2a3218d4f5416502a9d365167e6e2019c Mon Sep 17 00:00:00 2001 From: Stephen Cox Date: Fri, 23 May 2025 16:43:19 +0100 Subject: [PATCH 6/8] Patch Domain Path for to remove unused constructor from DomainPathAliasManager class --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 773222c..5e86a74 100644 --- a/composer.json +++ b/composer.json @@ -50,7 +50,8 @@ "patches": { "drupal/domain_path": { "https://github.com/localgovdrupal/localgov_microsites/pull/175#issuecomment-1172879196": "https://raw.githubusercontent.com/localgovdrupal/localgov_microsites/995261d0909065e3124fba3fc0dce3e823aefa1d/patches/domain_path.146-url-aliases.patch", - "https://github.com/localgovdrupal/localgov_microsites_group/issues/326": "https://raw.githubusercontent.com/localgovdrupal/localgov_microsites/4cbdbe6ae3c3e95e7d2ed15d918c66805ad8e7f1/patches/localgov_microsites_group_326.domain_path_pathauto.unserializable.patch" + "https://github.com/localgovdrupal/localgov_microsites_group/issues/326": "https://raw.githubusercontent.com/localgovdrupal/localgov_microsites/4cbdbe6ae3c3e95e7d2ed15d918c66805ad8e7f1/patches/localgov_microsites_group_326.domain_path_pathauto.unserializable.patch", + "Remove unused constructor from DomainPathAliasManager class #3526307": "https://www.drupal.org/files/issues/2025-05-23/3526307-3.patch" } } } From 5223ee6c2c63d6157341a6ec0e8ab9bfe0fd57f8 Mon Sep 17 00:00:00 2001 From: Stephen Cox Date: Fri, 23 May 2025 16:48:12 +0100 Subject: [PATCH 7/8] Added version to profile to prevent fatal error --- localgov_microsites.info.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/localgov_microsites.info.yml b/localgov_microsites.info.yml index 5f2eab4..be32a67 100644 --- a/localgov_microsites.info.yml +++ b/localgov_microsites.info.yml @@ -2,6 +2,7 @@ name: LocalGov Drupal Microsites type: profile description: 'Install LocalGov Drupal Microsites.' core_version_requirement: ^10 || ^11 +version: 4.x install: # Core From fcc19d206400c244bfe03277a5ff02dbe29e620b Mon Sep 17 00:00:00 2001 From: Stephen Cox Date: Thu, 29 May 2025 16:51:30 +0100 Subject: [PATCH 8/8] Updated workflow and dependencies for Drupal 11 --- .github/workflows/test.yml | 4 +++- composer.json | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a39cd80..6e6cbaf 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -4,14 +4,16 @@ on: push: branches: - '4.x' + - '4.1.x' pull_request: branches: - '4.x' + - '4.1.x' workflow_dispatch: jobs: tests: - uses: localgovdrupal/localgov_shared_workflows/.github/workflows/test-microsites.yml@1.x + uses: localgovdrupal/localgov_shared_workflows/.github/workflows/test-microsites.yml@1.x-d11 with: project: 'localgovdrupal/localgov_microsites' project_path: 'web/profiles/contrib/localgov_microsites' diff --git a/composer.json b/composer.json index 5e86a74..3639a99 100644 --- a/composer.json +++ b/composer.json @@ -27,8 +27,8 @@ "localgovdrupal/localgov_core": "^2.12", "localgovdrupal/localgov_directories": "^3.1", "localgovdrupal/localgov_events": "^3.0", - "localgovdrupal/localgov_microsites_group": "dev-feature/4.x/496-drupal-11 as 4.1.0", - "localgovdrupal/localgov_microsites_base": "dev-temp/drupal-11", + "localgovdrupal/localgov_microsites_group": "4.1.x-dev", + "localgovdrupal/localgov_microsites_base": "^2.0", "localgovdrupal/localgov_microsites_colour_picker_fields": "^1.0@beta", "localgovdrupal/localgov_news": "^2.3", "localgovdrupal/localgov_page": "^1.0@beta",