Merge pull request #1912 from acquia/ACMS-4400

ACMS-4400: Update Acquia Drupal Starter Kit modules to support Drupal Core 11.1.0 version.
acquia · Jan 6, 2025 · ca42150 · ca42150
2 parents dc1ac52 + 2b2f10c
commit ca42150
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 50 deletions.
diff --git 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

diff --git a/composer.lock b/composer.lock
diff --git 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 = [
-      'language.entity.*',
       'cohesion_*',
+      'language.entity.*',
     ];
     $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',
-  ];
 }
 
 /**

diff --git a/modules/acquia_cms_common/acquia_cms_common.module b/modules/acquia_cms_common/acquia_cms_common.module
@@ -424,22 +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().
- */
-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.
  *

diff --git 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
@@ -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",

diff --git a/modules/acquia_cms_image/acquia_cms_image.install b/modules/acquia_cms_image/acquia_cms_image.install
@@ -6,7 +6,6 @@
  */
 
 use Drupal\acquia_cms_image\SiteLogo;
-use Drupal\Core\Installer\InstallerKernel;
 use Drupal\image\Entity\ImageStyle;
 
 /**
@@ -19,20 +18,6 @@ function acquia_cms_image_install($is_syncing) {
   }
 }
 
-/**
- * Implements hook_module_implements_alter().
- */
-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