Merge pull request #1400 from acquia/ACMS-sync-1.5.x

ACMS-000: Update module dependencies for 1.5.x

.github/workflows/acquia_cms_ci.workflow.yml

@@ -15,7 +15,7 @@ jobs:
       # Provide your package's name.
       ORCA_SUT_NAME: acquia/acquia_cms
       ORCA_SUT_BRANCH: 1.5.x
-      ORCA_VERSION: ^3.0
+      ORCA_VERSION: v3.26.0
       ORCA_PACKAGES_CONFIG_ALTER: ../acquia_cms/tests/packages_alter.yml
       ORCA_FIXTURE_PROJECT_TEMPLATE: acquia/drupal-recommended-project
       ORCA_ENABLE_NIGHTWATCH: "FALSE"
@@ -74,7 +74,7 @@ jobs:
       # Provide your package's name.
       ORCA_SUT_NAME: acquia/acquia_cms
       ORCA_SUT_BRANCH: 1.5.x
-      ORCA_VERSION: ^3.0
+      ORCA_VERSION: v3.26.0
       ORCA_PACKAGES_CONFIG_ALTER: ../acquia_cms/tests/packages_alter.yml
       ORCA_FIXTURE_PROJECT_TEMPLATE: acquia/drupal-recommended-project
       ORCA_ENABLE_NIGHTWATCH: "FALSE"
@@ -95,7 +95,7 @@ jobs:
     strategy:
       matrix:
         orca-job:
-          - ISOLATED_TEST_ON_CURRENT_DEV
+          - INTEGRATED_TEST_ON_PREVIOUS_MINOR
         #php-version: [ "8.1" ]
         acms_job:
           - integrated_php_unit_tests
@@ -135,6 +135,14 @@ jobs:
         run: ./tests/ci/install.sh
       - name: Before script
         run: ../orca/bin/ci/before_script.sh
+      - name: Cleanup orca_public tests
+        shell: bash
+        run: |
+          source ../orca/bin/ci/_includes.sh
+          FILES=$(grep -nr "orca_public" ${ORCA_FIXTURE_DIR}/docroot/modules/contrib | sed 's/\:.*//')
+          echo "${FILES}" | while read -r FILE; do
+            rm ${FILE}
+          done
       - name: Script
         run: ./tests/ci/script.sh
       - name: Before Cache

acquia_cms.info.yml

@@ -7,7 +7,7 @@ distribution:
   name: Acquia CMS
   install:
     theme: acquia_claro
-    finish_url: '/admin/tour'
+    finish_url: '/admin/tour/dashboard'
 install:
   - acquia_cms_article
   - acquia_cms_document

acquia_cms.profile

@@ -274,6 +274,22 @@ function install_acms_additional_modules() {
     $config = \Drupal::service('purge.purgers');
     $config->setPluginsEnabled(['cee22bc3fe' => 'acquia_purge']);
   }
+
+  // Some permissions for few roles is not getting added and
+  // causing issues. Temporary added below fix as a workaround.
+  // @todo We need to identify the root cause and fix it.
+  $roleStorage = \Drupal::entityTypeManager()->getStorage('user_role');
+  $roles = [
+    "site_builder",
+    "content_author",
+    "content_administrator",
+    "content_editor",
+  ];
+  foreach ($roles as $role) {
+    $roleObj = $roleStorage->load($role);
+    \Drupal::service('module_handler')->alter('content_model_role_presave', $roleObj);
+    $roleObj->save();
+  }
 }
 
 /**

composer.json

@@ -38,6 +38,9 @@
         "phpunit/phpunit": "~9.4.0 || ~9.5.0",
         "weitzman/drupal-test-traits": "^1.5"
     },
+    "conflict": {
+        "drupal/acquia_cms_common": "<1.7.1"
+    },
     "config": {
         "allow-plugins": {
             "composer/installers": true,
@@ -111,7 +114,13 @@
         "patchLevel": {
             "drupal/core": "-p2"
         },
-        "patches": {}
+        "patches": {
+            "drupal/core": {
+                "3313342 - [PHP 8.1] Deprecated function: strpos(): Passing null to parameter #1 LayoutBuilderUiCacheContext.php on line 28": "https://git.drupalcode.org/project/drupal/-/merge_requests/3143.patch",
+                "3328187 - PHP Deprecated: strpos(): Passing null to parameter #1 ($haystack) of type string is deprecated in docroot/core/lib/Drupal/Core/Mail/Plugin/Mail/PhpMail.php on line 112": "https://www.drupal.org/files/issues/2023-01-12/3328187-3-9.5.x.patch",
+                "REMOVE: Allow installation profile to be changed from Acquia CMS to minimal during config sync": "https://gist.githubusercontent.com/rajeshreeputra/ae198ea15a2584f00de3327067056fe0/raw/3d69baaa16bfcc7b2af41deef102eaebd4291906/profile-change-acms-to-minimal.patch"
+            }
+        }
     },
     "autoload": {
         "psr-4": {