From 34d861e32d902b89ffeabd4f3ffb1957c9a78e2b Mon Sep 17 00:00:00 2001 From: Stephen Cox Date: Thu, 12 Dec 2024 15:52:01 +0000 Subject: [PATCH 1/9] Declare Drupal 11 support, drop Drupal 9 support #394 --- localgov_directories.info.yml | 2 +- .../localgov_directories_db/localgov_directories_db.info.yml | 2 +- .../localgov_directories_location.info.yml | 2 +- .../localgov_directories_or/localgov_directories_or.info.yml | 2 +- .../localgov_directories_org/localgov_directories_org.info.yml | 2 +- .../localgov_directories_page.info.yml | 2 +- .../localgov_directories_promo_page.info.yml | 2 +- .../localgov_directories_venue.info.yml | 2 +- .../localgov_directories_venue_or.info.yml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/localgov_directories.info.yml b/localgov_directories.info.yml index ea7b1b2..19e1649 100644 --- a/localgov_directories.info.yml +++ b/localgov_directories.info.yml @@ -2,7 +2,7 @@ name: 'LocalGov Directories' type: module description: 'Provides a directory facets entity.' package: LocalGov Drupal -core_version_requirement: ^10.2 +core_version_requirement: ^10.2 || ^11 dependencies: - drupal:address - drupal:block diff --git a/modules/localgov_directories_db/localgov_directories_db.info.yml b/modules/localgov_directories_db/localgov_directories_db.info.yml index 7af5300..b447dce 100644 --- a/modules/localgov_directories_db/localgov_directories_db.info.yml +++ b/modules/localgov_directories_db/localgov_directories_db.info.yml @@ -1,6 +1,6 @@ name: 'LocalGov Directories Database' description: 'Installs initial SQL database index and configuration for Directories.' -core_version_requirement: ^9 || ^10 +core_version_requirement: ^10 || ^11 type: module package: LocalGov Drupal diff --git a/modules/localgov_directories_location/localgov_directories_location.info.yml b/modules/localgov_directories_location/localgov_directories_location.info.yml index 53dabc7..3dfa4fd 100644 --- a/modules/localgov_directories_location/localgov_directories_location.info.yml +++ b/modules/localgov_directories_location/localgov_directories_location.info.yml @@ -2,7 +2,7 @@ name: 'LocalGov Directories Location' type: module description: 'Provides location fields and functionality for directory entries.' package: LocalGov Drupal -core_version_requirement: ^9 || ^10 +core_version_requirement: ^10 || ^11 dependencies: - inline_entity_form:inline_entity_form - localgov_directories:localgov_directories diff --git a/modules/localgov_directories_or/localgov_directories_or.info.yml b/modules/localgov_directories_or/localgov_directories_or.info.yml index de887aa..04ca229 100644 --- a/modules/localgov_directories_or/localgov_directories_or.info.yml +++ b/modules/localgov_directories_or/localgov_directories_or.info.yml @@ -2,7 +2,7 @@ name: 'LocalGov Directories: Open Referral' type: module description: 'Adds mappings for Facets for Open Referral.' package: LocalGov Drupal (Experimental) -core_version_requirement: ^9 || ^10 +core_version_requirement: ^10 || ^11 dependencies: - localgov_directories:localgov_directories - localgov_openreferral:localgov_openreferral diff --git a/modules/localgov_directories_org/localgov_directories_org.info.yml b/modules/localgov_directories_org/localgov_directories_org.info.yml index c4bad54..54e4f14 100644 --- a/modules/localgov_directories_org/localgov_directories_org.info.yml +++ b/modules/localgov_directories_org/localgov_directories_org.info.yml @@ -2,7 +2,7 @@ name: 'LocalGov Directories Organisation' type: module description: 'Provides a standard organisation type for either as directory entry, or for other Open Referral compatible entries.' package: LocalGov Drupal -core_version_requirement: ^9 || ^10 +core_version_requirement: ^10 || ^11 dependencies: - field_group:field_group - localgov_directories:localgov_directories diff --git a/modules/localgov_directories_page/localgov_directories_page.info.yml b/modules/localgov_directories_page/localgov_directories_page.info.yml index 0ebb612..e2f0323 100644 --- a/modules/localgov_directories_page/localgov_directories_page.info.yml +++ b/modules/localgov_directories_page/localgov_directories_page.info.yml @@ -2,7 +2,7 @@ name: 'LocalGov Directories Page' type: module description: 'Provides a basic entry type for directory channels.' package: LocalGov Drupal -core_version_requirement: ^9 || ^10 +core_version_requirement: ^10 || ^11 dependencies: - drupal:link - address:address diff --git a/modules/localgov_directories_promo_page/localgov_directories_promo_page.info.yml b/modules/localgov_directories_promo_page/localgov_directories_promo_page.info.yml index 63149eb..9d3211f 100644 --- a/modules/localgov_directories_promo_page/localgov_directories_promo_page.info.yml +++ b/modules/localgov_directories_promo_page/localgov_directories_promo_page.info.yml @@ -2,7 +2,7 @@ name: 'LocalGov Directories Promo Page' type: module description: 'Provides a rich unstructured entry type for directory channels.' package: LocalGov Drupal -core_version_requirement: ^9 || ^10 +core_version_requirement: ^10 || ^11 dependencies: - drupal:link - address:address diff --git a/modules/localgov_directories_venue/localgov_directories_venue.info.yml b/modules/localgov_directories_venue/localgov_directories_venue.info.yml index 4884fff..47219d7 100644 --- a/modules/localgov_directories_venue/localgov_directories_venue.info.yml +++ b/modules/localgov_directories_venue/localgov_directories_venue.info.yml @@ -2,7 +2,7 @@ name: 'LocalGov Directories Venue' type: module description: 'Provides a standard venue type for directory channels.' package: LocalGov Drupal -core_version_requirement: ^9 || ^10 +core_version_requirement: ^10 || ^11 dependencies: - field_group:field_group - localgov_directories:localgov_directories diff --git a/modules/localgov_directories_venue_or/localgov_directories_venue_or.info.yml b/modules/localgov_directories_venue_or/localgov_directories_venue_or.info.yml index a92b0eb..be3b115 100644 --- a/modules/localgov_directories_venue_or/localgov_directories_venue_or.info.yml +++ b/modules/localgov_directories_venue_or/localgov_directories_venue_or.info.yml @@ -2,7 +2,7 @@ name: 'LocalGov Directories: Venue - Open Referral' type: module description: 'EXPERIMENTAL - Make venue directory entries Open Referral services, give existing Venues an Organization.' package: LocalGov Drupal (Experimental) -core_version_requirement: ^9 || ^10 +core_version_requirement: ^10 || ^11 experimental: true dependencies: - localgov_directories:localgov_directories_venue From 7819e62cf76d75037ad1595bbb224e8fdd48562c Mon Sep 17 00:00:00 2001 From: Stephen Cox Date: Thu, 12 Dec 2024 15:52:57 +0000 Subject: [PATCH 2/9] Use Drupal 11 dev branches --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 001ed8d..b53fbf5 100644 --- a/composer.json +++ b/composer.json @@ -12,8 +12,8 @@ "drupal/search_api": "^1.29", "drupal/search_api_autocomplete": "^1.3", "drupal/search_api_location": "1.0.0-alpha4", - "localgovdrupal/localgov_core": "^2.12", - "localgovdrupal/localgov_geo": "^2.0" + "localgovdrupal/localgov_core": "dev-fix/2.x/246-drupal-11-support", + "localgovdrupal/localgov_geo": "dev-feature/drupal-11-support" }, "require-dev": { "localgovdrupal/localgov_services": "^2.1", From ce41d30ce43cb8b4e9081f3bf5078f830cd28ff8 Mon Sep 17 00:00:00 2001 From: Stephen Cox Date: Thu, 12 Dec 2024 16:13:10 +0000 Subject: [PATCH 3/9] Update composer dependencies for Drupal 11 support --- composer.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index b53fbf5..ff8098c 100644 --- a/composer.json +++ b/composer.json @@ -6,14 +6,14 @@ "license": "GPL-2.0-or-later", "minimum-stability": "dev", "require": { - "drupal/core": "^10.2", - "drupal/facets": "^2.0.7", - "drupal/pathauto": "^1.6", - "drupal/search_api": "^1.29", - "drupal/search_api_autocomplete": "^1.3", + "drupal/core": "^10.2 || ^11.0", + "drupal/facets": "^2.0.8", + "drupal/pathauto": "^1.13", + "drupal/search_api": "^1.35", + "drupal/search_api_autocomplete": "^1.9", "drupal/search_api_location": "1.0.0-alpha4", - "localgovdrupal/localgov_core": "dev-fix/2.x/246-drupal-11-support", - "localgovdrupal/localgov_geo": "dev-feature/drupal-11-support" + "localgovdrupal/localgov_core": "dev-fix/2.x/246-drupal-11-support as 2.13.11", + "localgovdrupal/localgov_geo": "dev-feature/drupal-11-support as 2.0.9" }, "require-dev": { "localgovdrupal/localgov_services": "^2.1", From 6b2a0ef7d184e33dc8681fd592ded4b8702fa1a7 Mon Sep 17 00:00:00 2001 From: Stephen Cox Date: Wed, 18 Dec 2024 13:47:16 +0000 Subject: [PATCH 4/9] Use D11 workflow branch --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index cb41278..f6acbfa 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,7 +11,7 @@ on: jobs: tests: - uses: localgovdrupal/localgov_shared_workflows/.github/workflows/test-module.yml@1.x + uses: localgovdrupal/localgov_shared_workflows/.github/workflows/test-module.yml@feature/1.x/d11-support with: project: 'localgovdrupal/localgov_directories' project_path: 'web/modules/contrib/localgov_directories' From 07ec8010e18ae4938216e8a7595b2402eacb95f1 Mon Sep 17 00:00:00 2001 From: Lee Mills Date: Wed, 1 Jan 2025 14:41:29 +0000 Subject: [PATCH 5/9] fix: remove setting no longer required for D11 and no replacement provided --- config/install/views.view.localgov_directory_channel.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/config/install/views.view.localgov_directory_channel.yml b/config/install/views.view.localgov_directory_channel.yml index f927c85..40bd6c0 100644 --- a/config/install/views.view.localgov_directory_channel.yml +++ b/config/install/views.view.localgov_directory_channel.yml @@ -236,7 +236,6 @@ display: default_argument_type: fixed default_argument_options: argument: '' - default_argument_skip_url: false summary_options: { } summary: sort_order: asc From 9693d8a84893caa4e4c2c0cc4a02b1947e8a5b96 Mon Sep 17 00:00:00 2001 From: Lee Mills Date: Tue, 21 Jan 2025 16:28:14 +0000 Subject: [PATCH 6/9] fix: localgov_geo now supports D11 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index ff8098c..fac598c 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,7 @@ "drupal/search_api_autocomplete": "^1.9", "drupal/search_api_location": "1.0.0-alpha4", "localgovdrupal/localgov_core": "dev-fix/2.x/246-drupal-11-support as 2.13.11", - "localgovdrupal/localgov_geo": "dev-feature/drupal-11-support as 2.0.9" + "localgovdrupal/localgov_geo": "^2.0" }, "require-dev": { "localgovdrupal/localgov_services": "^2.1", From 02f3f7f173444086308ca4999ff6fe48f063eac4 Mon Sep 17 00:00:00 2001 From: Lee Mills Date: Tue, 4 Feb 2025 10:16:09 +0000 Subject: [PATCH 7/9] fix: clean up now workflow is merged and remove core alias --- .github/workflows/test.yml | 2 +- composer.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f6acbfa..cb41278 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,7 +11,7 @@ on: jobs: tests: - uses: localgovdrupal/localgov_shared_workflows/.github/workflows/test-module.yml@feature/1.x/d11-support + uses: localgovdrupal/localgov_shared_workflows/.github/workflows/test-module.yml@1.x with: project: 'localgovdrupal/localgov_directories' project_path: 'web/modules/contrib/localgov_directories' diff --git a/composer.json b/composer.json index fac598c..cb2687b 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ "drupal/search_api": "^1.35", "drupal/search_api_autocomplete": "^1.9", "drupal/search_api_location": "1.0.0-alpha4", - "localgovdrupal/localgov_core": "dev-fix/2.x/246-drupal-11-support as 2.13.11", + "localgovdrupal/localgov_core": "^2.12", "localgovdrupal/localgov_geo": "^2.0" }, "require-dev": { From ac654d271a9d5447e5e92a37c66da21e73010f8a Mon Sep 17 00:00:00 2001 From: Lee Mills Date: Tue, 18 Feb 2025 16:37:42 +0000 Subject: [PATCH 8/9] fix: missing return type --- src/Plugin/Block/ChannelSearchBlock.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Plugin/Block/ChannelSearchBlock.php b/src/Plugin/Block/ChannelSearchBlock.php index e3f7fed..e7d5a2c 100644 --- a/src/Plugin/Block/ChannelSearchBlock.php +++ b/src/Plugin/Block/ChannelSearchBlock.php @@ -83,7 +83,7 @@ public function getDirEntryForm(NodeInterface $directory_entry): array { * * phpcs:disable Generic.CodeAnalysis.UselessOverridingMethod.Found */ - public function getSearchBlock(NodeInterface $node) { + public function getSearchBlock(NodeInterface $node): array { // phpcs:enable Generic.CodeAnalysis.UselessOverridingMethod.Found return parent::getSearchBlock($node); } From 5380df1ac9d9a75c425191fe087c794dd484d4ba Mon Sep 17 00:00:00 2001 From: Stephen Cox Date: Tue, 25 Feb 2025 13:34:13 +0000 Subject: [PATCH 9/9] Update module references --- composer.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index cb2687b..c7f3d5c 100644 --- a/composer.json +++ b/composer.json @@ -7,10 +7,10 @@ "minimum-stability": "dev", "require": { "drupal/core": "^10.2 || ^11.0", - "drupal/facets": "^2.0.8", - "drupal/pathauto": "^1.13", - "drupal/search_api": "^1.35", - "drupal/search_api_autocomplete": "^1.9", + "drupal/facets": "^2.0.7", + "drupal/pathauto": "^1.6", + "drupal/search_api": "^1.29", + "drupal/search_api_autocomplete": "^1.3", "drupal/search_api_location": "1.0.0-alpha4", "localgovdrupal/localgov_core": "^2.12", "localgovdrupal/localgov_geo": "^2.0"