Rename PHP Events that contain Piwik to Matomo (#16054)

matomo-org · Jun 11, 2020 · 192ba70 · 192ba70
1 parent 0834bbd
commit 192ba70
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -61,6 +61,7 @@ The Product Changelog at **[matomo.org/changelog](https://matomo.org/changelog)*
 * The following deprecated API method `Live.getLastVisitsForVisitor` has been removed. Use `Live.getVisitorProfile` instead.
 * The following deprecated API method `Live.getLastVisits` has been removed. Use `Live.getLastVisitsDetails` instead.
 * The deperecated event `LanguageManager.getAvailableLanguages` has been removed. Use `LanguagesManager.getAvailableLanguages` instead.
+* The PHP event `Piwik.getJavascriptCode` has been renamed to `Tracker.getJavascriptCode`.
 * The controller action `Proxy.redirect` has been removed. Instead link to the URL directly in HTML and set an attribute `rel="noreferrer noopener"`  
 * The API response format `php` has been removed.
 * GeoIP Legacy support has been fully removed. Users of GeoIP Legacy need to set up a new location provider like GeoIP2, otherwise the default location provider will be used.

diff --git a/core/Tracker/TrackerCodeGenerator.php b/core/Tracker/TrackerCodeGenerator.php
@@ -181,7 +181,7 @@ public function generate(
          *                         domain is different from the normal domain.
          * @param array $parameters The parameters supplied to `TrackerCodeGenerator::generate()`.
          */
-        Piwik::postEvent('Piwik.getJavascriptCode', array(&$codeImpl, $parameters));
+        Piwik::postEvent('Tracker.getJavascriptCode', array(&$codeImpl, $parameters));
 
         $setTrackerUrl = 'var u="' . $codeImpl['protocol'] . '{$piwikUrl}/";';
 

diff --git a/tests/PHPUnit/Integration/Tracker/TrackerCodeGeneratorTest.php b/tests/PHPUnit/Integration/Tracker/TrackerCodeGeneratorTest.php
@@ -103,7 +103,7 @@ public function testJavascriptTrackingCode_withAllOptionsAndProtocolOverwrite()
     {
         $generator = new TrackerCodeGenerator();
 
-        Piwik::addAction('Piwik.getJavascriptCode', function (&$codeImpl) {
+        Piwik::addAction('Tracker.getJavascriptCode', function (&$codeImpl) {
             $codeImpl['protocol'] = 'https://';
         });
 
@@ -150,7 +150,7 @@ public function testJavascriptTrackingCode_withAllOptionsAndOptionsBeforeTracker
     {
         $generator = new TrackerCodeGenerator();
 
-        Piwik::addAction('Piwik.getJavascriptCode', function (&$codeImpl) {
+        Piwik::addAction('Tracker.getJavascriptCode', function (&$codeImpl) {
             $codeImpl['optionsBeforeTrackerUrl'] .= "_paq.push(['setAPIUrl', 'http://localhost/statistics']);\n    ";
         });
 
@@ -198,7 +198,7 @@ public function testJavascriptTrackingCode_loadSync()
     {
         $generator = new TrackerCodeGenerator();
 
-        Piwik::addAction('Piwik.getJavascriptCode', function (&$codeImpl) {
+        Piwik::addAction('Tracker.getJavascriptCode', function (&$codeImpl) {
             $codeImpl['loadAsync'] = false;
         });