Merge pull request #1448 from acquia/1.5.x-ci

ACMS-1661: Include plugin: 'php-http/discovery'.

acquia_cms.profile

@@ -161,7 +161,7 @@ function install_acms_send_heartbeat_event() {
  *   Returns an array of operations (If site is installed through UI).
  */
 function install_acms_site_studio_base() {
-  $batch = install_acms_site_studio_initialize();
+  $batch = _acquia_cms_site_studio_install_initialize();
   if (PHP_SAPI != "cli") {
     return $batch;
   }
@@ -178,7 +178,7 @@ function install_acms_site_studio_base() {
  * @throws Exception
  */
 function install_acms_site_studio_packages() {
-  site_studio_import_ui_kit();
+  _acquia_cms_site_studio_import_ui_kit();
   if (PHP_SAPI != "cli") {
     // When site is installed through UI, the profile installation tasks
     // expects the function to return an array of operations and then it calls

composer.json

@@ -26,6 +26,10 @@
         "drupal/acquia_cms_tour": "^1.3.0",
         "drush/drush": "^10 || ^11"
     },
+    "conflict": {
+        "drupal/acquia_cms_common": "<1.7.1",
+        "drupal/acquia_cms_site_studio": "<1.5.5"
+    },
     "require-dev": {
         "acquia/coding-standards": "^1.0",
         "axelerant/drupal-quality-checker": "^1.1",
@@ -38,9 +42,6 @@
         "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,
@@ -49,6 +50,7 @@
             "drupal/core-composer-scaffold": true,
             "ergebnis/composer-normalize": true,
             "oomphinc/composer-installers-extender": true,
+            "php-http/discovery": true,
             "phpro/grumphp-shim": true,
             "webdriver-binary/binary-chromedriver": true
         },