Merge pull request #1877 from acquia/ACMS-4210-1

ACMS-4210: Removing google_analytics.
acquia · Sep 19, 2024 · 64751cb · 64751cb
2 parents f0a6bef + b062904
commit 64751cb
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 268 deletions.
diff --git a/composer.json b/composer.json
@@ -27,7 +27,6 @@
         "drupal/acquia_cms_tour": "dev-develop",
         "drupal/consumer_image_styles": "^4.0",
         "drupal/gin": "^3.0@RC",
-        "drupal/google_analytics": "dev-3430780-automated-drupal-11",
         "drupal/google_tag": "^2.0",
         "drupal/honeypot": "^2.1",
         "drupal/recaptcha": "^3.2",
@@ -237,10 +236,6 @@
             "type": "vcs",
             "url": "https://git.drupalcode.org/issue/consumer_image_styles-3429496.git"
         },
-        "google_analytics": {
-            "type": "vcs",
-            "url": "https://git.drupalcode.org/issue/google_analytics-3430780.git"
-        },
         "config_filter": {
             "type": "vcs",
             "url": "https://git.drupalcode.org/issue/config_filter-3428542.git"

diff --git a/composer.lock b/composer.lock
diff --git a/modules/acquia_cms_tour/composer.json b/modules/acquia_cms_tour/composer.json
@@ -9,7 +9,6 @@
     },
     "require-dev": {
         "drupal/acquia_cms_place": "^1",
-        "drupal/google_analytics": "dev-3430780-automated-drupal-11",
         "drupal/recaptcha": "^3"
     },
     "config": {

diff --git a/modules/acquia_cms_tour/src/Controller/DashboardController.php b/modules/acquia_cms_tour/src/Controller/DashboardController.php
@@ -226,7 +226,7 @@ public function content() {
       $form['help_text'] = [
         '#type' => 'markup',
         '#markup' => $this->t("<i><h3>It seems like you have installed minimal Acquia CMS, which does not have any specific configurations. You are all set. Once you enable any of the modules supported by the wizard, they should start appearing here.
-        (ex. google_analytics, gecoder, recaptcha, cohesion etc.).</h3></i>"),
+        (ex. gecoder, recaptcha, cohesion etc.).</h3></i>"),
       ];
     }
     $form['check_total']['#value'] = $total;

diff --git a/modules/acquia_cms_tour/src/Plugin/AcquiaCmsTour/GoogleAnalyticsForm.php b/modules/acquia_cms_tour/src/Plugin/AcquiaCmsTour/GoogleAnalyticsForm.php
diff --git a/modules/acquia_cms_tour/tests/src/Functional/GoogleAnalyticsTest.php b/modules/acquia_cms_tour/tests/src/Functional/GoogleAnalyticsTest.php
diff --git a/modules/acquia_cms_tour/tests/src/Kernel/AcquiaTourDashboardTest.php b/modules/acquia_cms_tour/tests/src/Kernel/AcquiaTourDashboardTest.php
@@ -43,7 +43,6 @@ class AcquiaTourDashboardTest extends KernelTestBase {
   public function testAcquiaCmsTourPlugin() {
     $expected_plugin_order = [
       'geocoder',
-      'google_analytics',
       'google_tag',
       'recaptcha',
     ];