acquia · apathak18 · Dec 6, 2023 · Dec 7, 2023 · Dec 7, 2023 · Dec 8, 2023
diff --git a/.github/workflows/acquia_cms_ci.workflow.yml b/.github/workflows/acquia_cms_ci.workflow.yml
@@ -16,7 +16,7 @@ jobs:
       # Provide your package's name.
       ORCA_SUT_NAME: acquia/acquia_cms
       ORCA_SUT_BRANCH: develop
-      ORCA_VERSION: ^3
+      ORCA_VERSION: ^4
       ORCA_PACKAGES_CONFIG_ALTER: ../acquia_cms/tests/packages_alter.yml
       ORCA_FIXTURE_PROJECT_TEMPLATE: acquia/drupal-recommended-project
       ORCA_ENABLE_NIGHTWATCH: "FALSE"
@@ -45,7 +45,7 @@ jobs:
           node-version: 12.13.1
       - uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.2
+          php-version: 8.3
           #coverage: xdebug
       - name: Download ORCA
         run: |
@@ -81,7 +81,7 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
-          - "8.2"
+          - "8.3"
           # uncomment below once 8.3 have stable release.
           # - "8.3"
     steps:
@@ -112,7 +112,7 @@ jobs:
       # Provide your package's name.
       ORCA_SUT_NAME: acquia/acquia_cms
       ORCA_SUT_BRANCH: develop
-      ORCA_VERSION: ^3
+      ORCA_VERSION: ^4
       ORCA_PACKAGES_CONFIG_ALTER: ../acquia_cms/tests/packages_alter.yml
       ORCA_FIXTURE_PROJECT_TEMPLATE: acquia/drupal-recommended-project
       ORCA_ENABLE_NIGHTWATCH: "FALSE"
@@ -148,7 +148,7 @@ jobs:
           node-version: 12.13.1
       - uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.2
+          php-version: 8.3
           #coverage: xdebug
       - name: Setup MySQL
         run: |
@@ -246,9 +246,12 @@ jobs:
         orca-job:
           - ISOLATED_TEST_ON_NEXT_MINOR
         php-version:
-          - 8.1
-          - 8.2
+          # - 7.4
+          # - 8.1
+          # - 8.2
+          - 8.3
         orca-version:
+          #- ^3
           - ^4
     steps:
       - uses: actions/checkout@v3
@@ -317,7 +320,7 @@ jobs:
       # Set ORCA related environment variables.
       ORCA_SUT_NAME: acquia/acquia_cms
       ORCA_SUT_BRANCH: develop
-      ORCA_VERSION: ^3
+      ORCA_VERSION: ^4
       ORCA_PACKAGES_CONFIG_ALTER: ../acquia_cms/tests/packages_alter.yml
       ORCA_FIXTURE_PROJECT_TEMPLATE: acquia/drupal-recommended-project
       ORCA_ENABLE_NIGHTWATCH: "FALSE"
@@ -375,7 +378,7 @@ jobs:
           node-version: 12.13.1
       - uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.2
+          php-version: 8.3
           #coverage: xdebug
       - name: Download ORCA
         run: |
@@ -430,7 +433,7 @@ jobs:
       # Set ORCA related environment variables.
       ORCA_SUT_NAME: acquia/acquia_cms
       ORCA_SUT_BRANCH: develop
-      ORCA_VERSION: ^3
+      ORCA_VERSION: ^4
       ORCA_PACKAGES_CONFIG_ALTER: ../acquia_cms/tests/packages_alter.yml
       ORCA_FIXTURE_PROJECT_TEMPLATE: acquia/drupal-recommended-project
       ORCA_ENABLE_NIGHTWATCH: "FALSE"
@@ -465,7 +468,7 @@ jobs:
           node-version: 12.13.1
       - uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.2
+          php-version: 8.3
           #coverage: xdebug
       - name: Setup MySQL
         run: |
@@ -481,12 +484,10 @@ jobs:
           # Added below in CI to test acquia_cms on Drupal Core >=9.5.
           composer require "drupal/core:>=9.5" --no-update --no-install -d modules/acquia_cms_common
           sed -i 's/^core_version_requirement.*/core_version_requirement: ">=9.5"/' modules/acquia_cms_common/acquia_cms_common.info.yml
-
           if [ "${ORCA_JOB}" = "ISOLATED_TEST_ON_CURRENT" ]; then
-            # Update drupal/core patch as per Drupal Core version.
-            sed -i 's/2023-11-30\/3370946-pagetitle-backport-10-2-x.patch/2023-09-11\/3370946-page-title-backport-10-1-x.patch/g' modules/acquia_cms_common/composer.json
+          # Update drupal/core patch as per Drupal Core version.
+          sed -i 's/2023-11-30\/3370946-pagetitle-backport-10-2-x.patch/2023-09-11\/3370946-page-title-backport-10-1-x.patch/g' modules/acquia_cms_common/composer.json
           fi
-
           ./tests/ci/before_install.blt.sh
       - name: Install
         shell: 'script -q -e -c "bash {0}"'

diff --git a/composer.json b/composer.json
@@ -1,9 +1,8 @@
 {
     "name": "acquia/acquia_cms",
-    "type": "drupal-module",
     "description": "An implementation of Drupal 9 for running custom, low code websites on the Acquia platform.",
-    "homepage": "https://github.com/acquia/acquia_cms",
     "license": "GPL-2.0-or-later",
+    "type": "drupal-module",
     "authors": [
         {
             "name": "Michael Sherron",
@@ -16,6 +15,7 @@
             "role": "Maintainer"
         }
     ],
+    "homepage": "https://github.com/acquia/acquia_cms",
     "require": {
         "acquia/acquia-cms-starterkit": "^1.0",
         "drupal/acquia_claro": "^1.3",
@@ -39,133 +39,27 @@
         "mnsami/composer-custom-directory-installer": "^2.0"
     },
     "require-dev": {
-        "acquia/coding-standards": "^1.0",
-        "axelerant/drupal-quality-checker": "^1.1",
-        "drupal/core-composer-scaffold": "^9.0.0 || ^10",
-        "drupal/core-dev": "^9 || ^10",
-        "ergebnis/composer-normalize": "~2.15.0",
+        "acquia/coding-standards": "^1.0 || ^2.0",
+        "axelerant/drupal-quality-checker": "^1.3",
+        "drupal/core-composer-scaffold": "^10.2",
+        "drupal/core-dev": "^9 || ^10.2",
+        "ergebnis/composer-normalize": "~2.40.0",
         "mglaman/drupal-check": "^1.4",
         "oomphinc/composer-installers-extender": "^1.1 || ^2",
-        "phpspec/prophecy-phpunit": "^2.0",
-        "phpunit/phpunit": "~9.4.0 || ~9.5.0",
+        "phpspec/prophecy-phpunit": "^2",
+        "phpunit/phpunit": "^9.4 || ^10",
         "weitzman/drupal-test-traits": "^2"
     },
-    "config": {
-        "allow-plugins": {
-            "composer/installers": true,
-            "cweagans/composer-patches": true,
-            "dealerdirect/phpcodesniffer-composer-installer": true,
-            "drupal/core-composer-scaffold": true,
-            "ergebnis/composer-normalize": true,
-            "mnsami/composer-custom-directory-installer": true,
-            "oomphinc/composer-installers-extender": true,
-            "php-http/discovery": true,
-            "phpro/grumphp-shim": true,
-            "phpstan/extension-installer": true,
-            "webdriver-binary/binary-chromedriver": true,
-            "wikimedia/composer-merge-plugin": true
-        },
-        "preferred-install": {
-            "drupal/core": "dist"
-        },
-        "process-timeout": 0,
-        "sort-packages": true
-    },
-    "extra": {
-        "drupal-scaffold": {
-            "allowed-packages": [
-                "drupal/core"
-            ],
-            "file-mapping": {
-                "[project-root]/.editorconfig": false,
-                "[project-root]/.gitattributes": false,
-                "[web-root]/.csslintrc": false,
-                "[web-root]/INSTALL.txt": false,
-                "[web-root]/drush/drush.yml": "drush/drush.yml",
-                "[web-root]/example.gitignore": false,
-                "[web-root]/modules/README.txt": false,
-                "[web-root]/profiles/README.txt": false,
-                "[web-root]/robots.txt": false,
-                "[web-root]/sites/README.txt": false,
-                "[web-root]/sites/default/default.settings.php": {
-                    "append": "./patches/d9-acms-settings.patch"
-                },
-                "[web-root]/themes/README.txt": false,
-                "[web-root]/themes/contrib/cohesion-theme/templates/maintenance-page.html.twig": "./patches/maintenance-page.patch",
-                "[web-root]/web.config": false
-            },
-            "locations": {
-                "project-root": ".",
-                "web-root": "./docroot"
-            }
-        },
-        "enable-patching": true,
-        "installer-paths": {
-            "docroot/core": [
-                "type:drupal-core"
-            ],
-            "docroot/libraries/{$name}": [
-                "type:drupal-library",
-                "type:bower-asset",
-                "type:npm-asset",
-                "swagger-api/swagger-ui",
-                "nnnick/chartjs"
-            ],
-            "docroot/modules/contrib/{$name}": [
-                "type:drupal-module"
-            ],
-            "docroot/profiles/contrib/{$name}": [
-                "type:drupal-profile"
-            ],
-            "docroot/themes/contrib/{$name}": [
-                "type:drupal-theme"
-            ]
-        },
-        "installer-types": [
-            "bower-asset",
-            "npm-asset"
-        ],
-        "patchLevel": {
-            "drupal/core": "-p2"
-        },
-        "patches": {
-            "drupal/core": {
-                "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://git.drupalcode.org/project/drupal/-/merge_requests/3142.patch",
-                "Fix failing test for site studio due to missing file": "https://gist.githubusercontent.com/chandan-singh7929/978c8c3c8b6f1e2de23492e7e562c0c3/raw/f0e7770d94be862e5495ca25662a0a0d5672b785/bypass-library-version-core.patch"
-            },
-            "drupal/decoupled_router": {
-                "3111456 - Unable to resolve path on node in other language than default": "https://www.drupal.org/files/issues/2022-11-30/decouple_router-3111456-resolve-language-issue-58.patch",
-                "3176615 - RouteNotFoundException when a jsonapi individual route is not available": "https://www.drupal.org/files/issues/2023-04-26/route-not-found-exception.patch"
-            },
-            "drupal/simple_sitemap": {
-                "3398996 - Declare min PHP version": "https://gist.githubusercontent.com/apathak18/fe33a24fa2009bb8c9e14761b54f3668/raw/9e4178a957ec16fd58ba3fc7a0b0d527f28d9f77/support-lower-phpversion-simplesitemap.patch"
-            },
-            "drupal/subrequests": {
-                "3361224 - Fix Subrequests unit tests Deprecations": "https://git.drupalcode.org/project/subrequests/-/merge_requests/16.patch"
-            },
-            "mglaman/drupal-check": {
-                "Add custom rules to bypass check for buildForm": "https://github.com/mglaman/drupal-check/pull/286.patch"
-            }
-        }
-    },
-    "autoload": {
-        "psr-4": {
-            "Acquia\\Utility\\": "src/Utility"
-        },
-        "classmap": [
-            "src/Composer/ConfigureProject.php"
-        ]
-    },
     "repositories": {
         "chart.js": {
             "type": "package",
             "package": {
                 "name": "nnnick/chartjs",
-                "version": "v3.9.1",
                 "type": "drupal-library",
+                "version": "v3.9.1",
                 "dist": {
-                    "url": "https://github.com/chartjs/Chart.js/releases/download/v3.9.1/chart.js-3.9.1.tgz",
-                    "type": "tar"
+                    "type": "tar",
+                    "url": "https://github.com/chartjs/Chart.js/releases/download/v3.9.1/chart.js-3.9.1.tgz"
                 }
             }
         },
@@ -347,6 +241,112 @@
     },
     "minimum-stability": "dev",
     "prefer-stable": true,
+    "autoload": {
+        "psr-4": {
+            "Acquia\\Utility\\": "src/Utility"
+        },
+        "classmap": [
+            "src/Composer/ConfigureProject.php"
+        ]
+    },
+    "config": {
+        "allow-plugins": {
+            "composer/installers": true,
+            "cweagans/composer-patches": true,
+            "dealerdirect/phpcodesniffer-composer-installer": true,
+            "drupal/core-composer-scaffold": true,
+            "ergebnis/composer-normalize": true,
+            "mnsami/composer-custom-directory-installer": true,
+            "oomphinc/composer-installers-extender": true,
+            "php-http/discovery": true,
+            "phpro/grumphp-shim": true,
+            "phpstan/extension-installer": true,
+            "webdriver-binary/binary-chromedriver": true,
+            "wikimedia/composer-merge-plugin": true
+        },
+        "preferred-install": {
+            "drupal/core": "dist"
+        },
+        "process-timeout": 0,
+        "sort-packages": true
+    },
+    "extra": {
+        "drupal-scaffold": {
+            "allowed-packages": [
+                "drupal/core"
+            ],
+            "file-mapping": {
+                "[project-root]/.editorconfig": false,
+                "[project-root]/.gitattributes": false,
+                "[web-root]/.csslintrc": false,
+                "[web-root]/INSTALL.txt": false,
+                "[web-root]/drush/drush.yml": "drush/drush.yml",
+                "[web-root]/example.gitignore": false,
+                "[web-root]/modules/README.txt": false,
+                "[web-root]/profiles/README.txt": false,
+                "[web-root]/robots.txt": false,
+                "[web-root]/sites/README.txt": false,
+                "[web-root]/sites/default/default.settings.php": {
+                    "append": "./patches/d9-acms-settings.patch"
+                },
+                "[web-root]/themes/README.txt": false,
+                "[web-root]/themes/contrib/cohesion-theme/templates/maintenance-page.html.twig": "./patches/maintenance-page.patch",
+                "[web-root]/web.config": false
+            },
+            "locations": {
+                "project-root": ".",
+                "web-root": "./docroot"
+            }
+        },
+        "enable-patching": true,
+        "installer-paths": {
+            "docroot/core": [
+                "type:drupal-core"
+            ],
+            "docroot/libraries/{$name}": [
+                "type:drupal-library",
+                "type:bower-asset",
+                "type:npm-asset",
+                "swagger-api/swagger-ui",
+                "nnnick/chartjs"
+            ],
+            "docroot/modules/contrib/{$name}": [
+                "type:drupal-module"
+            ],
+            "docroot/profiles/contrib/{$name}": [
+                "type:drupal-profile"
+            ],
+            "docroot/themes/contrib/{$name}": [
+                "type:drupal-theme"
+            ]
+        },
+        "installer-types": [
+            "bower-asset",
+            "npm-asset"
+        ],
+        "patchLevel": {
+            "drupal/core": "-p2"
+        },
+        "patches": {
+            "drupal/core": {
+                "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://git.drupalcode.org/project/drupal/-/merge_requests/3142.patch",
+                "Fix failing test for site studio due to missing file": "https://gist.githubusercontent.com/chandan-singh7929/978c8c3c8b6f1e2de23492e7e562c0c3/raw/f0e7770d94be862e5495ca25662a0a0d5672b785/bypass-library-version-core.patch"
+            },
+            "drupal/decoupled_router": {
+                "3111456 - Unable to resolve path on node in other language than default": "https://www.drupal.org/files/issues/2022-11-30/decouple_router-3111456-resolve-language-issue-58.patch",
+                "3176615 - RouteNotFoundException when a jsonapi individual route is not available": "https://www.drupal.org/files/issues/2023-04-26/route-not-found-exception.patch"
+            },
+            "drupal/simple_sitemap": {
+                "3398996 - Declare min PHP version": "https://gist.githubusercontent.com/apathak18/fe33a24fa2009bb8c9e14761b54f3668/raw/9e4178a957ec16fd58ba3fc7a0b0d527f28d9f77/support-lower-phpversion-simplesitemap.patch"
+            },
+            "drupal/subrequests": {
+                "3361224 - Fix Subrequests unit tests Deprecations": "https://git.drupalcode.org/project/subrequests/-/merge_requests/16.patch"
+            },
+            "mglaman/drupal-check": {
+                "Add custom rules to bypass check for buildForm": "https://github.com/mglaman/drupal-check/pull/286.patch"
+            }
+        }
+    },
     "scripts": {
         "pre-update-cmd": [
             "@putenv COMPOSER_MEMORY_LIMIT=2G"