Merge branch 'develop'

acquia · Mar 14, 2023 · 53760e2 · 53760e2
2 parents 0c51487 + 1610f89
commit 53760e2
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 1 deletion.
diff --git a/acms/acms.yml b/acms/acms.yml
@@ -9,6 +9,7 @@ starter_kits:
  - acquia_cms_search
  - acquia_cms_tour
  - acquia_cms_toolbar
+ - mnsami/composer-custom-directory-installer
  install:
  - acquia_cms_site_studio
  - acquia_cms_page
@@ -30,6 +31,7 @@ starter_kits:
  - acquia_cms_search
  - acquia_cms_tour
  - acquia_cms_toolbar
+ - mnsami/composer-custom-directory-installer
  install:
  - acquia_cms_search
  - acquia_cms_tour
@@ -50,6 +52,7 @@ starter_kits:
  - acquia_cms_tour
  - acquia_cms_toolbar
  - consumer_image_styles
+ - mnsami/composer-custom-directory-installer
  install:
  - acquia_cms_headless_ui
  - acquia_cms_search

diff --git a/src/Helpers/Task/Steps/DownloadModules.php b/src/Helpers/Task/Steps/DownloadModules.php
@@ -47,6 +47,7 @@ public function __construct(Composer $composer, Cli $acquiaCmsCli) {
  public function execute(array $args = []) :int {
  $composerContents = $this->acquiaCmsCli->getRootComposer();
  $composerContents = json_decode($composerContents);
+ $composerContentsExtra = $composerContents->{'extra'};
  if (!isset($composerContents->require->{'drush/drush'})) {
  $this->composerCommand->prepare([
  "require",
@@ -67,7 +68,7 @@ public function execute(array $args = []) :int {
  "true",
  ])->run();
  }
- if (!isset($composerContents->{'extra.enable-patching'}) || (isset($composerContents->{'extra.enable-patching'}) && $composerContents->{'extra.enable-patching'} != "true")) {
+ if (!isset($composerContentsExtra->{'enable-patching'}) || (isset($composerContentsExtra->{'enable-patching'}) && !$composerContentsExtra->{'enable-patching'})) {
  $this->composerCommand->prepare([
  "config",
  "extra.enable-patching",
@@ -89,6 +90,37 @@ public function execute(array $args = []) :int {
  "true",
  ])->run();
  }
+ // Add nnnick/chartjs, swagger-api/swagger-ui library in installer paths.
+ $installerPathsLibrary = $composerContentsExtra->{'installer-paths'}->{'docroot/libraries/{$name}'};
+ if (!in_array('nnnick/chartjs', $installerPathsLibrary)) {
+ $this->composerCommand->prepare([
+ "config",
+ 'extra.installer-paths.docroot/libraries/{$name}',
+ '["nnnick/chartjs"]',
+ "--json",
+ "--merge",
+ ])->run();
+ }
+ if ($args['name'] == 'Acquia CMS Headless') {
+ if (!in_array('swagger-api/swagger-ui', $installerPathsLibrary)) {
+ $this->composerCommand->prepare([
+ "config",
+ 'extra.installer-paths.docroot/libraries/{$name}',
+ '["swagger-api/swagger-ui"]',
+ "--json",
+ "--merge",
+ ])->run();
+ }
+ }
+ // Add mnsami/composer-custom-directory-installer package.
+ if (!array_key_exists('mnsami/composer-custom-directory-installer', $allowedPlugins)) {
+ $this->composerCommand->prepare([
+ "config",
+ "--no-plugins",
+ "allow-plugins.mnsami/composer-custom-directory-installer",
+ "true",
+ ])->run();
+ }
  $packages = JsonParser::downloadPackages($packages);
  $inputArgument = array_merge(["require", "-W"], $packages);
  $this->composerCommand->prepare($inputArgument)->run();

diff --git a/tests/unit/CliTest.php b/tests/unit/CliTest.php
@@ -87,6 +87,7 @@ protected function getAcmsFileContents() :array {
  "acquia_cms_search",
  "acquia_cms_tour",
  "acquia_cms_toolbar",
+ "mnsami/composer-custom-directory-installer",
  ],
  "install" => [
  "acquia_cms_site_studio",
@@ -111,6 +112,7 @@ protected function getAcmsFileContents() :array {
  "acquia_cms_search",
  "acquia_cms_tour",
  "acquia_cms_toolbar",
+ "mnsami/composer-custom-directory-installer",
  ],
  "install" => [
  "acquia_cms_search",
@@ -134,6 +136,7 @@ protected function getAcmsFileContents() :array {
  "acquia_cms_tour",
  "acquia_cms_toolbar",
  "consumer_image_styles",
+ "mnsami/composer-custom-directory-installer",
  ],
  "install" => [
  "acquia_cms_headless_ui",