From 1a0b15f8e10df1237f9323c13affa719e3583a6d Mon Sep 17 00:00:00 2001
From: Chris Kankiewicz <Chris@ChrisKankiewicz.com>
Date: Mon, 28 Jul 2025 14:06:03 -0700
Subject: [PATCH] Removed deprecated Google and Motomo analytics configuration
 options

---
 app/config/app.php                         | 26 ----------------------
 app/views/components/analytics/google.twig | 11 ---------
 app/views/components/analytics/matomo.twig | 15 -------------
 app/views/layouts/app.twig                 | 10 ---------
 tests/.env                                 |  5 -----
 5 files changed, 67 deletions(-)
 delete mode 100644 app/views/components/analytics/google.twig
 delete mode 100644 app/views/components/analytics/matomo.twig

diff --git a/app/config/app.php b/app/config/app.php
index 96bda0b..71aedee 100644
--- a/app/config/app.php
+++ b/app/config/app.php
@@ -86,32 +86,6 @@ return [
      */
     'zip_compress' => env('ZIP_COMPRESS', false),
 
-    /**
-     * DEPRECATED: Will be removed in a future release.
-     *
-     * Your Google analytics tracking ID.
-     *
-     * Expected format: 'UA-123456789-0'
-     * Default value: false
-     */
-    'google_analytics_id' => env('GOOGLE_ANALYTICS_ID', false),
-
-    /**
-     * DEPRECATED: Will be removed in a future release.
-     *
-     * Your Matomo analytics URL.
-     *
-     *  Default value: false
-     */
-    'matomo_analytics_url' => env('MATOMO_ANALYTICS_URL', false),
-
-    /**
-     * Your Matomo analytics site ID.
-     *
-     * Default value: false
-     */
-    'matomo_analytics_site_id' => env('MATOMO_ANALYTICS_SITE_ID', false),
-
     /**
      * Sorting order of files and folders.
      *
diff --git a/app/views/components/analytics/google.twig b/app/views/components/analytics/google.twig
deleted file mode 100644
index 37cc488..0000000
--- a/app/views/components/analytics/google.twig
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- Global site tag (gtag.js) - Google Analytics -->
-<script async src="https://www.googletagmanager.com/gtag/js?id={{ config("google_analytics_id") }}"></script>
-<script>
-    window.dataLayer = window.dataLayer || [];
-    function gtag(){dataLayer.push(arguments);}
-    gtag('js', new Date());
-
-    {% if config('google_analytics_id', false) %}
-        gtag('config', '{{ config("google_analytics_id") }}');
-    {% endif %}
-</script>
diff --git a/app/views/components/analytics/matomo.twig b/app/views/components/analytics/matomo.twig
deleted file mode 100644
index 0780e2f..0000000
--- a/app/views/components/analytics/matomo.twig
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- Matomo -->
-<script type="text/javascript">
-  var _paq = window._paq = window._paq || [];
-  /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
-  _paq.push(['trackPageView']);
-  _paq.push(['enableLinkTracking']);
-  (function() {
-    var u="{{ config('matomo_analytics_url') }}/";
-    _paq.push(['setTrackerUrl', u+'matomo.php']);
-    _paq.push(['setSiteId', '{{ config("matomo_analytics_site_id") }}']);
-    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-    g.type='text/javascript'; g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
-  })();
-</script>
-<!-- End Matomo Code -->
diff --git a/app/views/layouts/app.twig b/app/views/layouts/app.twig
index 1da7c91..bc9418c 100644
--- a/app/views/layouts/app.twig
+++ b/app/views/layouts/app.twig
@@ -12,16 +12,6 @@
 
 {{ analytics() | raw }}
 
-{# NOTE: To be removed in a future release #}
-{% if config('google_analytics_id', false) %}
-    {% include 'components/analytics/google.twig' %}
-{% endif %}
-
-{# NOTE: To be removed in a future release #}
-{% if config('matomo_analytics_url', false) and config('matomo_analytics_site_id', false) %}
-    {% include 'components/analytics/matomo.twig' %}
-{% endif %}
-
 <title>{{ title }} &bull; {{ config('site_title') }}</title>
 
 <div class="{{ theme }}" x-data="application" x-effect="storeThemeCookie($store.theme)" :class="{ 'dark': $store.theme === 'dark' }">
diff --git a/tests/.env b/tests/.env
index 4f3a136..0f5b150 100644
--- a/tests/.env
+++ b/tests/.env
@@ -5,11 +5,6 @@ DISPLAY_READMES=true
 READMES_FIRST=false
 ZIP_DOWNLOADS=true
 
-GOOGLE_ANALYTICS_ID=false
-
-MATOMO_ANALYTICS_URL=false
-MATOMO_ANALYTICS_SITE_ID=false
-
 SORT_ORDER=type
 REVERSE_SORT=false