Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename PHP Events that contain Piwik to Matomo #16054

Merged
merged 1 commit into from
Jun 11, 2020
Merged

Rename PHP Events that contain Piwik to Matomo #16054

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion core/Tracker/TrackerCodeGenerator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}/";';

Expand Down
6 changes: 3 additions & 3 deletions tests/PHPUnit/Integration/Tracker/TrackerCodeGeneratorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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://';
});

Expand Down Expand Up @@ -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 ";
});

Expand Down Expand Up @@ -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;
});

Expand Down