Merge branch 'develop'

acquia · May 2, 2023 · 8f6d7c6 · 8f6d7c6
2 parents d9562c0 + cf3d900
commit 8f6d7c6
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 41 deletions.
diff --git a/acms/acms.yml b/acms/acms.yml
@@ -101,16 +101,6 @@ questions:
  - no
  skip_on_value: false
  default_value: "no"
- gdpr_integration:
- dependencies:
- starter_kits: acquia_cms_enterprise_low_code || acquia_cms_community
- question: "Would you like to add GDPR functionality to the site (Yes/No) ?"
- allowed_values:
- options:
- - yes
- - no
- default_value: "no"
- skip_on_value: false
  install:
  nextjs_app:
  dependencies:

diff --git a/src/Cli.php b/src/Cli.php
@@ -177,7 +177,6 @@ public function alterModulesAndThemes(array &$starterKit, array $userInputValues
  $isContentModel = $userInputValues['content_model'] ?? '';
  $isDemoContent = $userInputValues['demo_content'] ?? '';
  $isDamIntegration = $userInputValues['dam_integration'] ?? '';
- $isGdprIntegration = $userInputValues['gdpr_integration'] ?? '';
  $contentModelModules = [
  'acquia_cms_article',
  'acquia_cms_page',
@@ -200,11 +199,6 @@ public function alterModulesAndThemes(array &$starterKit, array $userInputValues
  $starterKit['modules']['require'] = array_merge($starterKit['modules']['require'], ['acquia_cms_dam']);
  $starterKit['modules']['install'] = array_merge($starterKit['modules']['install'], ['acquia_cms_dam']);
  }
- if ($isGdprIntegration == "yes") {
- $gdprModules = ['gdpr', 'eu_cookie_compliance', 'gdpr_fields'];
- $starterKit['modules']['require'] = array_merge($starterKit['modules']['require'], $gdprModules);
- $starterKit['modules']['install'] = array_merge($starterKit['modules']['install'], $gdprModules);
- }
  $starterKit['modules']['require'] = array_unique($starterKit['modules']['require']);
  $starterKit['modules']['install'] = array_values(array_unique($starterKit['modules']['install']));
  return $starterKit;

diff --git a/tests/unit/CliTest.php b/tests/unit/CliTest.php
@@ -161,7 +161,6 @@ protected function getAcmsFileContents() :array {
  self::getContentModel(),
  self::getDemoContent(),
  self::getDamIntegration(),
- self::getGdprIntegration()
  ),
  "install" => array_merge(
  self::getNextjsApp(),
@@ -243,28 +242,6 @@ public static function getDamIntegration(): array {
  ];
  }
 
- /**
- * Returns the test data for dam_integration Question.
- *
- * @return array[]
- * Returns an array of question.
- */
- public static function getGdprIntegration(): array {
- return [
- 'gdpr_integration' => [
- 'dependencies' => [
- 'starter_kits' => 'acquia_cms_enterprise_low_code || acquia_cms_community',
- ],
- 'question' => "Would you like to add GDPR functionality to the site (Yes/No) ?",
- 'allowed_values' => [
- 'options' => ['yes', 'no'],
- ],
- 'skip_on_value' => FALSE,
- 'default_value' => 'no',
- ],
- ];
- }
-
  /**
  * Returns the test data for demo_content Question.
  *

diff --git a/tests/unit/Helpers/InstallerQuestionsTest.php b/tests/unit/Helpers/InstallerQuestionsTest.php
@@ -239,7 +239,6 @@ public function providerBundleBuild() :array {
  CliTest::getDemoContent(),
  CliTest::getContentModel(),
  CliTest::getDamIntegration(),
- CliTest::getGdprIntegration(),
  ),
  ],
  [
@@ -248,7 +247,6 @@ public function providerBundleBuild() :array {
  CliTest::getDemoContent(),
  CliTest::getContentModel(),
  CliTest::getDamIntegration(),
- CliTest::getGdprIntegration(),
  ),
  ],
  [