diff --git a/composer.lock b/composer.lock index 7acfad782..b9b49bdf5 100644 --- a/composer.lock +++ b/composer.lock @@ -83,16 +83,16 @@ }, { "name": "acquia/cohesion", - "version": "8.0.3", + "version": "8.1.0", "source": { "type": "git", "url": "https://github.com/acquia/cohesion.git", - "reference": "74119675919a6284ca8f85e7777b8fbc18bc7124" + "reference": "491655f32ebec13f58c50f57783301086deaff5c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/acquia/cohesion/zipball/74119675919a6284ca8f85e7777b8fbc18bc7124", - "reference": "74119675919a6284ca8f85e7777b8fbc18bc7124", + "url": "https://api.github.com/repos/acquia/cohesion/zipball/491655f32ebec13f58c50f57783301086deaff5c", + "reference": "491655f32ebec13f58c50f57783301086deaff5c", "shasum": "" }, "require": { @@ -140,22 +140,22 @@ ], "description": "Site Studio", "support": { - "source": "https://github.com/acquia/cohesion/tree/8.0.3" + "source": "https://github.com/acquia/cohesion/tree/8.1.0" }, - "time": "2025-01-30T14:26:50+00:00" + "time": "2025-03-06T15:09:08+00:00" }, { "name": "acquia/cohesion-theme", - "version": "8.0.1", + "version": "8.1.0", "source": { "type": "git", "url": "https://github.com/acquia/cohesion-theme.git", - "reference": "7f1fa560f1d1c76ddcbffa4f94dea861b2577b04" + "reference": "04d3bbde7cacb942fb2c2451380dab9b7b9a0bdc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/acquia/cohesion-theme/zipball/7f1fa560f1d1c76ddcbffa4f94dea861b2577b04", - "reference": "7f1fa560f1d1c76ddcbffa4f94dea861b2577b04", + "url": "https://api.github.com/repos/acquia/cohesion-theme/zipball/04d3bbde7cacb942fb2c2451380dab9b7b9a0bdc", + "reference": "04d3bbde7cacb942fb2c2451380dab9b7b9a0bdc", "shasum": "" }, "type": "drupal-theme", @@ -173,9 +173,9 @@ "description": "Site Studio minimal theme", "support": { "issues": "https://github.com/acquia/cohesion-theme/issues", - "source": "https://github.com/acquia/cohesion-theme/tree/8.0.1" + "source": "https://github.com/acquia/cohesion-theme/tree/8.1.0" }, - "time": "2024-10-08T11:09:47+00:00" + "time": "2025-03-06T15:09:13+00:00" }, { "name": "acquia/drupal-environment-detector", @@ -2388,7 +2388,7 @@ "dist": { "type": "path", "url": "./modules/acquia_cms_common", - "reference": "36ebfe06447b4f28301a18995d197336fb6ce1f3" + "reference": "b2fe6b5717ef5c06a9a978b712bb12252d309a4f" }, "require": { "acquia/drupal-environment-detector": "^1.5", @@ -2592,7 +2592,7 @@ "dist": { "type": "path", "url": "./modules/acquia_cms_headless", - "reference": "a313e90445799a7a2b0a5b9c33ed8119e278e9ab" + "reference": "6174eb905b4fcda4e1dc7e11a0f315de07a031fa" }, "require": { "drupal/acquia_cms_tour": "2.x-dev", @@ -2826,11 +2826,11 @@ "dist": { "type": "path", "url": "./modules/acquia_cms_site_studio", - "reference": "503a345620760663e7cf5f88cba2a765d20ad33b" + "reference": "0532e6d390fccfb8447a84e37f39658d9a4fa0be" }, "require": { - "acquia/cohesion": "~7.4.0 || ~7.5.0 || ~8.0.0", - "acquia/cohesion-theme": "~7.4.0 || ~7.5.0 || ~8.0.0", + "acquia/cohesion": "~7.4.0 || ~7.5.0 || ~8.0.0 || ~8.1.0", + "acquia/cohesion-theme": "~7.4.0 || ~7.5.0 || ~8.0.0 || ~8.1.0", "drupal/acquia_cms_common": "^2.1.12 || ~3.2.12 || ^3.3.10", "drupal/collapsiblock": "^4.0", "drupal/node_revision_delete": "^2.0", @@ -8232,20 +8232,20 @@ }, { "name": "drupal/sitestudio_config_management", - "version": "1.2.0", + "version": "1.2.1", "source": { "type": "git", "url": "https://git.drupalcode.org/project/sitestudio_config_management.git", - "reference": "1.2.0" + "reference": "1.2.1" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/sitestudio_config_management-1.2.0.zip", - "reference": "1.2.0", - "shasum": "6bbd4da238d647a51e2d2c5d6d76b5dc58f2e0aa" + "url": "https://ftp.drupal.org/files/projects/sitestudio_config_management-1.2.1.zip", + "reference": "1.2.1", + "shasum": "dfb54c008147021088ebabe90b29d6d1c549c8b4" }, "require": { - "acquia/cohesion": "~7.4.0 || ~7.5.0 || ~8.0.0", + "acquia/cohesion": "^7.4.0 || ^8.0.0", "drupal/config_ignore": "^3.0", "drupal/config_split": "^2.0", "drupal/core": "^9 || ^10 || ^11", @@ -8257,8 +8257,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "1.2.0", - "datestamp": "1727197716", + "version": "1.2.1", + "datestamp": "1741288226", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" diff --git a/modules/acquia_cms_site_studio/composer.json b/modules/acquia_cms_site_studio/composer.json index 74b71d010..0704fb289 100644 --- a/modules/acquia_cms_site_studio/composer.json +++ b/modules/acquia_cms_site_studio/composer.json @@ -4,8 +4,8 @@ "license": "GPL-2.0-or-later", "type": "drupal-module", "require": { - "acquia/cohesion": "~7.4.0 || ~7.5.0 || ~8.0.0", - "acquia/cohesion-theme": "~7.4.0 || ~7.5.0 || ~8.0.0", + "acquia/cohesion": "~7.4.0 || ~7.5.0 || ~8.0.0 || ~8.1.0", + "acquia/cohesion-theme": "~7.4.0 || ~7.5.0 || ~8.0.0 || ~8.1.0", "drupal/acquia_cms_common": "^2.1.12 || ~3.2.12 || ^3.3.10", "drupal/collapsiblock": "^4.0", "drupal/node_revision_delete": "^2.0", diff --git a/modules/acquia_cms_site_studio/src/Form/AcquiaCmsSiteStudioSiteConfigureForm.php b/modules/acquia_cms_site_studio/src/Form/AcquiaCmsSiteStudioSiteConfigureForm.php index 923d5c5bf..186126b71 100644 --- a/modules/acquia_cms_site_studio/src/Form/AcquiaCmsSiteStudioSiteConfigureForm.php +++ b/modules/acquia_cms_site_studio/src/Form/AcquiaCmsSiteStudioSiteConfigureForm.php @@ -3,6 +3,7 @@ namespace Drupal\acquia_cms_site_studio\Form; use Drupal\Core\Config\ConfigFactoryInterface; +use Drupal\Core\Config\TypedConfigManagerInterface; use Drupal\Core\Form\ConfigFormBase; use Drupal\Core\Form\FormStateInterface; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -27,8 +28,8 @@ class AcquiaCmsSiteStudioSiteConfigureForm extends ConfigFormBase { * @param string $apiUrl * The Site Studio api url. */ - public function __construct(ConfigFactoryInterface $config_factory, string $apiUrl) { - parent::__construct($config_factory); + public function __construct(ConfigFactoryInterface $config_factory, string $apiUrl, TypedConfigManagerInterface $typed_config_manager) { + parent::__construct($config_factory, $typed_config_manager); $this->apiUrl = $apiUrl; } @@ -45,7 +46,8 @@ public function getFormId() { public static function create(ContainerInterface $container) { return new static( $container->get('config.factory'), - $container->get('cohesion.api.utils')->getAPIServerURL() + $container->get('cohesion.api.utils')->getAPIServerURL(), + $container->get("config.typed") ); }