From af1f06db89f5b7aef7d38d7fccfe61a60455def2 Mon Sep 17 00:00:00 2001
From: sgiehl <stefan@matomo.org>
Date: Fri, 7 Feb 2020 08:57:53 +0100
Subject: [PATCH] remove old events

---
 CHANGELOG.md                                           |  8 +++-----
 plugins/CustomJsTracker/TrackerUpdater.php             | 10 ----------
 .../TrackingCode/PluginTrackerFiles.php                |  5 -----
 3 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7f8abc98811..9fe04b3c03b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,11 +32,9 @@ The Product Changelog at **[matomo.org/changelog](https://matomo.org/changelog)*
 * The deprecated Platform API class `\Piwik\DeviceDetectorFactory` has been removed. Use `\Piwik\DeviceDetector\DeviceDetectorFactory` instead
 * The JavaScript tracker now uses `sendBeacon` by default if supported by the browser. You can disable this by calling the tracker method `disableAlwaysUseSendBeacon`. As a result, callback parameters won't work anymore and a tracking request might not appear in the developer tools.
 * The console option `--piwik-domain` has been removed. Use `--matomo-domain` instead
-* The core plugin `CustomPiwikJs` was renamed `CustomJsTracker`
-
-### Deprecations
-* The event `CustomPiwikJs.piwikJsChanged` has been deprecated. Use `CustomJsTracker.trackerJsChanged` instead
-* The event `CustomPiwikJs.shouldAddTrackerFile` has been deprecated. Use `CustomJsTracker.shouldAddTrackerFile` instead
+* The core plugin `CustomPiwikJs` was renamed to `CustomJsTracker`
+* The event `CustomPiwikJs.piwikJsChanged` has been renamed. Use `CustomJsTracker.trackerJsChanged` instead
+* The event `CustomPiwikJs.shouldAddTrackerFile` has been renamed. Use `CustomJsTracker.shouldAddTrackerFile` instead
 
 ## Matomo 3.13.1
 
diff --git a/plugins/CustomJsTracker/TrackerUpdater.php b/plugins/CustomJsTracker/TrackerUpdater.php
index 19b63f50e67..c301862b90f 100644
--- a/plugins/CustomJsTracker/TrackerUpdater.php
+++ b/plugins/CustomJsTracker/TrackerUpdater.php
@@ -140,11 +140,6 @@ public function update()
                  * @param string $absolutePath The path to the new piwik.js file.
                  */
                 Piwik::postEvent('CustomJsTracker.trackerJsChanged', [$savedFile]);
-
-                /**
-                 * @todo remove in Matomo 5. For BC only
-                 */
-                Piwik::postEvent('CustomPiwikJs.piwikJsChanged', [$savedFile]);
             }
 
         }
@@ -163,11 +158,6 @@ private function updateAlternative($fromFile, $toFile, $newContent)
                 $savedFiles = $file->save($newContent);
                 foreach ($savedFiles as $savedFile) {
                     Piwik::postEvent('CustomJsTracker.trackerJsChanged', [$savedFile]);
-
-                    /**
-                     * @todo remove in Matomo 5. For BC only
-                     */
-                    Piwik::postEvent('CustomPiwikJs.piwikJsChanged', [$savedFile]);
                 }
             }
         }
diff --git a/plugins/CustomJsTracker/TrackingCode/PluginTrackerFiles.php b/plugins/CustomJsTracker/TrackingCode/PluginTrackerFiles.php
index 7e403b39a23..e062a735167 100644
--- a/plugins/CustomJsTracker/TrackingCode/PluginTrackerFiles.php
+++ b/plugins/CustomJsTracker/TrackingCode/PluginTrackerFiles.php
@@ -94,11 +94,6 @@ protected function shouldIncludeFile($pluginName)
          */
         Piwik::postEvent('CustomJsTracker.shouldAddTrackerFile', array(&$shouldAddFile, $pluginName));
 
-        /**
-         * @todo remove in Matomo 5. For BC only
-         */
-        Piwik::postEvent('CustomPiwikJs.shouldAddTrackerFile', array(&$shouldAddFile, $pluginName));
-
         return $shouldAddFile;
     }