From c62829a464fefcea4883dede695c147406e61267 Mon Sep 17 00:00:00 2001 From: rajeshreeputra Date: Fri, 27 Dec 2024 13:36:21 +0530 Subject: [PATCH 1/6] ACMS-4400: Update Acquia Drupal Starter Kit modules to support Drupal Core 11.1.0 version. --- modules/acquia_cms_common/acquia_cms_common.module | 2 ++ modules/acquia_cms_image/acquia_cms_image.install | 2 ++ 2 files changed, 4 insertions(+) diff --git a/modules/acquia_cms_common/acquia_cms_common.module b/modules/acquia_cms_common/acquia_cms_common.module index 308ddb835..94cfe68b7 100644 --- a/modules/acquia_cms_common/acquia_cms_common.module +++ b/modules/acquia_cms_common/acquia_cms_common.module @@ -13,6 +13,7 @@ use Drupal\acquia_cms_common\Facade\WorkflowFacade; use Drupal\Component\Utility\DeprecationHelper; use Drupal\Core\Breadcrumb\Breadcrumb; use Drupal\Core\Form\FormStateInterface; +use Drupal\Core\Hook\Attribute\LegacyHook; use Drupal\Core\Installer\InstallerKernel; use Drupal\Core\Routing\RouteMatchInterface; use Drupal\editor\Entity\Editor; @@ -427,6 +428,7 @@ function acquia_cms_common_preprocess_maintenance_page(array &$variables) { /** * Implements hook_module_implements_alter(). */ +#[LegacyHook] function acquia_cms_common_module_implements_alter(array &$implementations, string $hook): void { // Prevent installation of site studio package on module install // during site installation from other modules, this causes issue. diff --git a/modules/acquia_cms_image/acquia_cms_image.install b/modules/acquia_cms_image/acquia_cms_image.install index 8f4b9c462..71b620d27 100644 --- a/modules/acquia_cms_image/acquia_cms_image.install +++ b/modules/acquia_cms_image/acquia_cms_image.install @@ -6,6 +6,7 @@ */ use Drupal\acquia_cms_image\SiteLogo; +use Drupal\Core\Hook\Attribute\LegacyHook; use Drupal\Core\Installer\InstallerKernel; use Drupal\image\Entity\ImageStyle; @@ -22,6 +23,7 @@ function acquia_cms_image_install($is_syncing) { /** * Implements hook_module_implements_alter(). */ +#[LegacyHook] function acquia_cms_image_module_implements_alter(array &$implementations, string $hook) : void { if ($hook === 'modules_installed') { // Unset default_content import during site install, From ec3350c6af76564d9447b68e07fa23a7c0420524 Mon Sep 17 00:00:00 2001 From: rajeshreeputra Date: Fri, 27 Dec 2024 19:47:04 +0530 Subject: [PATCH 2/6] ACMS-4400: Execute test with current drupal core. --- .github/workflows/acquia_cms_ci.workflow.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/acquia_cms_ci.workflow.yml b/.github/workflows/acquia_cms_ci.workflow.yml index 0e9d91c72..4aca4b6bc 100644 --- a/.github/workflows/acquia_cms_ci.workflow.yml +++ b/.github/workflows/acquia_cms_ci.workflow.yml @@ -128,8 +128,8 @@ jobs: matrix: orca-job: - INTEGRATED_TEST_ON_LATEST_LTS - - INTEGRATED_TEST_ON_PREVIOUS_MINOR -# - ISOLATED_TEST_ON_CURRENT +# - INTEGRATED_TEST_ON_PREVIOUS_MINOR + - ISOLATED_TEST_ON_CURRENT acms_job: - integrated_php_unit_tests - integrated_existing_site_tests @@ -226,8 +226,8 @@ jobs: matrix: orca-job: - INTEGRATED_TEST_ON_LATEST_LTS - - INTEGRATED_TEST_ON_PREVIOUS_MINOR -# - ISOLATED_TEST_ON_CURRENT +# - INTEGRATED_TEST_ON_PREVIOUS_MINOR + - ISOLATED_TEST_ON_CURRENT #php-version: [ "8.1" ] modules: - acquia_cms_article @@ -325,16 +325,16 @@ jobs: matrix: orca-job: - INTEGRATED_TEST_ON_LATEST_LTS - - INTEGRATED_TEST_ON_PREVIOUS_MINOR -# - ISOLATED_TEST_ON_CURRENT +# - INTEGRATED_TEST_ON_PREVIOUS_MINOR + - ISOLATED_TEST_ON_CURRENT php-version: - 8.1 - 8.3 exclude: - - php-version: 8.1 - orca-job: INTEGRATED_TEST_ON_PREVIOUS_MINOR # - php-version: 8.1 -# orca-job: ISOLATED_TEST_ON_CURRENT +# orca-job: INTEGRATED_TEST_ON_PREVIOUS_MINOR + - php-version: 8.1 + orca-job: ISOLATED_TEST_ON_CURRENT steps: - uses: actions/checkout@v4 - name: Use Node.js 20.x From 8e6875bcd2e105c86d9a17294a82155fc1ea61fb Mon Sep 17 00:00:00 2001 From: rajeshreeputra Date: Thu, 2 Jan 2025 10:28:38 +0530 Subject: [PATCH 3/6] ACMS-4400: Fix failing headless test by adding common dependency. --- composer.lock | 9 +++++---- modules/acquia_cms_headless/acquia_cms_headless.info.yml | 1 + modules/acquia_cms_headless/composer.json | 1 + 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/composer.lock b/composer.lock index 8f57c4670..4a55c2782 100644 --- a/composer.lock +++ b/composer.lock @@ -2594,9 +2594,10 @@ "dist": { "type": "path", "url": "./modules/acquia_cms_headless", - "reference": "8245e857382cd2bb9662e785cacef4ae455af944" + "reference": "32891b690ca77f8f8021bc1775c54945a10385b8" }, "require": { + "drupal/acquia_cms_common": "^1.9 || ^2.1 || ^3.1", "drupal/acquia_cms_tour": "^2.1.8", "drupal/jsonapi_extras": "^3.26", "drupal/jsonapi_menu_items": "^1.2", @@ -2789,7 +2790,7 @@ "dist": { "type": "path", "url": "./modules/acquia_cms_search", - "reference": "faafd17dc48f421e1d12d1ec0c76d810f4b85bca" + "reference": "1c79f423c14b34efc2eed155a6cf8bf1404a7347" }, "require": { "cweagans/composer-patches": "^1.7", @@ -2921,7 +2922,7 @@ "dist": { "type": "path", "url": "./modules/acquia_cms_toolbar", - "reference": "d6cd7d13ed41934d7654920ccb8a751972a28be6" + "reference": "be6fe88d08fdf50135d62a79fc3217b69bc6aa6b" }, "require": { "acquia/drupal-environment-detector": "^1.5", @@ -2950,7 +2951,7 @@ "dist": { "type": "path", "url": "./modules/acquia_cms_tour", - "reference": "f4cea1338093f3bd87095843583036f0bf289ecf" + "reference": "2dc8408687738551fc43e34939381eca3d905c56" }, "require": { "drupal/checklistapi": "^2.1" diff --git a/modules/acquia_cms_headless/acquia_cms_headless.info.yml b/modules/acquia_cms_headless/acquia_cms_headless.info.yml index 927f095da..c3fb91b9f 100644 --- a/modules/acquia_cms_headless/acquia_cms_headless.info.yml +++ b/modules/acquia_cms_headless/acquia_cms_headless.info.yml @@ -4,6 +4,7 @@ type: module description: 'Provides functionality for Progressively Decoupled and Purely Headless sites using Node and Next JS.' core_version_requirement: ^10 || ^11 dependencies: + - acquia_cms_common:acquia_cms_common - acquia_cms_tour:acquia_cms_tour - consumers:consumers - jsonapi_extras:jsonapi_extras diff --git a/modules/acquia_cms_headless/composer.json b/modules/acquia_cms_headless/composer.json index 749078b69..a1454b938 100644 --- a/modules/acquia_cms_headless/composer.json +++ b/modules/acquia_cms_headless/composer.json @@ -4,6 +4,7 @@ "license": "GPL-2.0-or-later", "type": "drupal-module", "require": { + "drupal/acquia_cms_common": "^1.9 || ^2.1 || ^3.1", "drupal/acquia_cms_tour": "^2.1.8", "drupal/jsonapi_extras": "^3.26", "drupal/jsonapi_menu_items": "^1.2", From 96b57f4a42e6dd24efc5c140a26eecf350a3a56e Mon Sep 17 00:00:00 2001 From: rajeshreeputra Date: Sat, 4 Jan 2025 12:20:01 +0530 Subject: [PATCH 4/6] ACMS-4400: Remove the config_ignore schema alteration from Common module. --- modules/acquia_cms_common/acquia_cms_common.install | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/modules/acquia_cms_common/acquia_cms_common.install b/modules/acquia_cms_common/acquia_cms_common.install index a4edc1219..cc2337a68 100644 --- a/modules/acquia_cms_common/acquia_cms_common.install +++ b/modules/acquia_cms_common/acquia_cms_common.install @@ -42,12 +42,11 @@ function acquia_cms_common_install($is_syncing) { $config = \Drupal::configFactory()->getEditable('config_ignore.settings'); $existing_ignore_config = $config->get('ignored_config_entities'); $new_ignore_config = [ + 'cohesion*', 'language.entity.*', - 'cohesion_*', ]; $updated_ignore_config = array_unique(array_merge($existing_ignore_config, $new_ignore_config)); $config->set('ignored_config_entities', $updated_ignore_config); - $config->set('enable_export_filtering', TRUE); $config->save(TRUE); if ($module_handler->moduleExists('page_cache')) { @@ -122,10 +121,6 @@ function acquia_cms_common_config_schema_info_alter(&$definitions) { $definitions['entity_clone.settings']['mapping']['form_settings']['mapping']['redirect'] = $schemaMapping; $definitions['entity_clone.settings']['mapping']['form_settings']['mapping']['search_api_task'] = $schemaMapping; } - $definitions['config_ignore.settings']['mapping']['enable_export_filtering'] = [ - 'type' => 'boolean', - 'label' => 'Enable export filtering', - ]; } /** From b7bb633ded2e3af7621d89726239369b42c8c67c Mon Sep 17 00:00:00 2001 From: rajeshreeputra Date: Sat, 4 Jan 2025 12:18:00 +0530 Subject: [PATCH 5/6] ACMS-4400: Remove hook_module_implements_alter from image. --- .../acquia_cms_image/acquia_cms_image.install | 17 ----------------- .../content/file/Acquia CMS.png | Bin 27577 -> 0 bytes 2 files changed, 17 deletions(-) delete mode 100644 modules/acquia_cms_image/content/file/Acquia CMS.png diff --git a/modules/acquia_cms_image/acquia_cms_image.install b/modules/acquia_cms_image/acquia_cms_image.install index 71b620d27..6ad91889f 100644 --- a/modules/acquia_cms_image/acquia_cms_image.install +++ b/modules/acquia_cms_image/acquia_cms_image.install @@ -6,8 +6,6 @@ */ use Drupal\acquia_cms_image\SiteLogo; -use Drupal\Core\Hook\Attribute\LegacyHook; -use Drupal\Core\Installer\InstallerKernel; use Drupal\image\Entity\ImageStyle; /** @@ -20,21 +18,6 @@ function acquia_cms_image_install($is_syncing) { } } -/** - * Implements hook_module_implements_alter(). - */ -#[LegacyHook] -function acquia_cms_image_module_implements_alter(array &$implementations, string $hook) : void { - if ($hook === 'modules_installed') { - // Unset default_content import during site install, - // will do it later post install to avoid any error. - // @see acquia_cms_import_default_content install task. - if (InstallerKernel::installationAttempted()) { - unset($implementations['default_content']); - } - } -} - /** * Update image style to use 'Focal point scale and crop' effect. */ diff --git a/modules/acquia_cms_image/content/file/Acquia CMS.png b/modules/acquia_cms_image/content/file/Acquia CMS.png deleted file mode 100644 index e079bbacdc1bab03e7e9ee2439d2971f6a351e98..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 27577 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%0DV${^Lq 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 From 2b2f10c0828c9945d3067b7093a99b62fb8dc9aa Mon Sep 17 00:00:00 2001 From: rajeshreeputra Date: Mon, 6 Jan 2025 12:31:56 +0530 Subject: [PATCH 6/6] ACMS-4400: Remove hook_module_implements_alter from common module. --- .../acquia_cms_common.install | 2 +- .../acquia_cms_common/acquia_cms_common.module | 18 ------------------ 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/modules/acquia_cms_common/acquia_cms_common.install b/modules/acquia_cms_common/acquia_cms_common.install index cc2337a68..04ac0f7b5 100644 --- a/modules/acquia_cms_common/acquia_cms_common.install +++ b/modules/acquia_cms_common/acquia_cms_common.install @@ -42,7 +42,7 @@ function acquia_cms_common_install($is_syncing) { $config = \Drupal::configFactory()->getEditable('config_ignore.settings'); $existing_ignore_config = $config->get('ignored_config_entities'); $new_ignore_config = [ - 'cohesion*', + 'cohesion_*', 'language.entity.*', ]; $updated_ignore_config = array_unique(array_merge($existing_ignore_config, $new_ignore_config)); diff --git a/modules/acquia_cms_common/acquia_cms_common.module b/modules/acquia_cms_common/acquia_cms_common.module index 94cfe68b7..dfb758bb9 100644 --- a/modules/acquia_cms_common/acquia_cms_common.module +++ b/modules/acquia_cms_common/acquia_cms_common.module @@ -13,7 +13,6 @@ use Drupal\acquia_cms_common\Facade\WorkflowFacade; use Drupal\Component\Utility\DeprecationHelper; use Drupal\Core\Breadcrumb\Breadcrumb; use Drupal\Core\Form\FormStateInterface; -use Drupal\Core\Hook\Attribute\LegacyHook; use Drupal\Core\Installer\InstallerKernel; use Drupal\Core\Routing\RouteMatchInterface; use Drupal\editor\Entity\Editor; @@ -425,23 +424,6 @@ function acquia_cms_common_preprocess_maintenance_page(array &$variables) { $variables['install_page_logo_path'] = '/' . $acquia_cms_path . '/acquia_cms.png'; } -/** - * Implements hook_module_implements_alter(). - */ -#[LegacyHook] -function acquia_cms_common_module_implements_alter(array &$implementations, string $hook): void { - // Prevent installation of site studio package on module install - // during site installation from other modules, this causes issue. - if ($hook == 'modules_installed') { - // The Site studio configurations should not be imported during config - // synchronizations. - // @todo revert below condition check, after ACO-2516 is released. - if (InstallerKernel::installationAttempted() || \Drupal::service('config.installer')->isSyncing()) { - unset($implementations['cohesion_sync']); - } - } -} - /** * Function to rewrite filtered_html & full_html configurations. *