From 82a9b1b0a01dc20928d50134233e167f0116472d Mon Sep 17 00:00:00 2001 From: Thomas Steur Date: Thu, 11 Jan 2018 07:45:20 +1300 Subject: Further Piwik.org => Matomo.org replacements (#12415) * renaming more Piwik mentions * some more updates * fix some tests * support matomo partially as require string * fix tests * fix failing system test * fix tests * fix system test * fix test --- .../PHPUnit/Integration/ArchiveProcessingTest.php | 2 +- tests/PHPUnit/Integration/AssetManagerTest.php | 2 +- tests/PHPUnit/Integration/CronArchiveTest.php | 12 +- tests/PHPUnit/Integration/HttpTest.php | 2 +- tests/PHPUnit/Integration/Tracker/HandlerTest.php | 6 +- tests/PHPUnit/Integration/TrackerTest.php | 2 +- .../Integration/ViewDataTable/ManagerTest.php | 6 +- tests/PHPUnit/Integration/WidgetsListTest.php | 2 +- tests/PHPUnit/System/ArchiveWebTest.php | 2 +- tests/PHPUnit/System/EnvironmentValidationTest.php | 4 +- tests/PHPUnit/System/TrackerResponseTest.php | 4 +- ...est_ArchiveCronTest_archive_php_cron_output.txt | 191 +++++++++++---------- ...ortLogs__CorePluginsAdmin.getSystemSettings.xml | 20 +-- ...mportLogs__CorePluginsAdmin.getUserSettings.xml | 2 +- ...oVisits__CorePluginsAdmin.getSystemSettings.xml | 20 +-- ...TwoVisits__CorePluginsAdmin.getUserSettings.xml | 2 +- ...firstSite_lastN__API.getProcessedReport_day.xml | 2 +- ...rstSite_lastN__API.getProcessedReport_month.xml | 2 +- ...firstSite_lastN__API.getProcessedReport_day.xml | 2 +- ...rstSite_lastN__API.getProcessedReport_month.xml | 2 +- ...duledReports.generateReport_month.original.html | 2 +- ...duledReports.generateReport_month.original.html | 2 +- ...duledReports.generateReport_month.original.html | 2 +- ...erId_VisitorId__VisitsSummary.getUsers_year.xml | 2 +- ...rtMetadata__API.getAvailableMeasurableTypes.xml | 2 +- ...piGetReportMetadata__API.getGlossaryReports.xml | 6 +- ...etReportMetadata__API.getReportMetadata_day.xml | 6 +- ...apiGetReportMetadata__API.getWidgetMetadata.xml | 40 ++--- ...eduledReports.generateReport_week.original.html | 2 +- ...eduledReports.generateReport_week.original.html | 2 +- ...eduledReports.generateReport_week.original.html | 2 +- ...dIsLast__CorePluginsAdmin.getSystemSettings.xml | 20 +-- ...iodIsLast__CorePluginsAdmin.getUserSettings.xml | 2 +- ...noVisit__CorePluginsAdmin.getSystemSettings.xml | 20 +-- ...t_noVisit__CorePluginsAdmin.getUserSettings.xml | 2 +- ...ables__subtable__API.getProcessedReport_day.xml | 2 +- .../scripts/ExpectedMergeResultCore.js | 2 +- .../scripts/ExpectedMergeResultNonCore.js | 2 +- .../stylesheets/ExpectedMergeResult.css | 2 +- tests/PHPUnit/Unit/ConfigTest.php | 2 +- tests/PHPUnit/Unit/Tracker/ResponseTest.php | 8 +- 41 files changed, 209 insertions(+), 208 deletions(-) (limited to 'tests/PHPUnit') diff --git a/tests/PHPUnit/Integration/ArchiveProcessingTest.php b/tests/PHPUnit/Integration/ArchiveProcessingTest.php index 358528270f..e09a3bcfd0 100644 --- a/tests/PHPUnit/Integration/ArchiveProcessingTest.php +++ b/tests/PHPUnit/Integration/ArchiveProcessingTest.php @@ -338,7 +338,7 @@ class ArchiveProcessingTest extends IntegrationTestCase . ' The error Messages from MySQL were: ' . $didWeUseBulk . "\n\n Learn more how to enable LOAD LOCAL DATA INFILE see the Mysql doc (http://dev.mysql.com/doc/refman/5.0/en/load-data-local.html) " - . "\n or ask in this Piwik ticket (https://github.com/piwik/piwik/issues/3605)" + . "\n or ask in this Piwik ticket (https://github.com/matomo-org/piwik/issues/3605)" ); } return $didWeUseBulk; diff --git a/tests/PHPUnit/Integration/AssetManagerTest.php b/tests/PHPUnit/Integration/AssetManagerTest.php index 1dd88e7787..7ff300b909 100644 --- a/tests/PHPUnit/Integration/AssetManagerTest.php +++ b/tests/PHPUnit/Integration/AssetManagerTest.php @@ -468,7 +468,7 @@ class AssetManagerTest extends IntegrationTestCase $this->triggerGetMergedNonCoreJavaScript(); - $expectedContent = $this->adjustExpectedJsContent('/* Piwik Javascript - cb={{{CACHE-BUSTER-JS}}}*/' . "\n"); + $expectedContent = $this->adjustExpectedJsContent('/* Matomo Javascript - cb={{{CACHE-BUSTER-JS}}}*/' . "\n"); $this->validateExpectedContent($expectedContent); } diff --git a/tests/PHPUnit/Integration/CronArchiveTest.php b/tests/PHPUnit/Integration/CronArchiveTest.php index e8ab6d3bbe..c70a70a349 100644 --- a/tests/PHPUnit/Integration/CronArchiveTest.php +++ b/tests/PHPUnit/Integration/CronArchiveTest.php @@ -87,12 +87,12 @@ class CronArchiveTest extends IntegrationTestCase $expected = << Settings > General Settings. - See the doc at: https://piwik.org/docs/setup-auto-archiving/ -- Reports for today will be processed at most every %s seconds. You can change this value in Piwik UI > Settings > General Settings. +- If you execute this script at least once per hour (or more often) in a crontab, you may disable 'Browser trigger archiving' in Matomo UI > Settings > General Settings. + See the doc at: https://matomo.org/docs/setup-auto-archiving/ +- Reports for today will be processed at most every %s seconds. You can change this value in Matomo UI > Settings > General Settings. - Reports for the current week/month/year will be requested at most every %s seconds. - Will process all 1 websites - Limiting segment archiving to following segments: @@ -100,7 +100,7 @@ NOTES * actions>=2 --------------------------- START -Starting Piwik reports archiving... +Starting Matomo reports archiving... Will pre-process for website id = 1, period = day, date = last%s - pre-processing all visits - skipping segment archiving for 'actions>=4'. @@ -160,7 +160,7 @@ LOG; Will ignore websites and help finish a previous started queue instead. IDs: 1 --------------------------- START -Starting Piwik reports archiving... +Starting Matomo reports archiving... Will pre-process for website id = 1, period = day, date = last52 - pre-processing all visits LOG; diff --git a/tests/PHPUnit/Integration/HttpTest.php b/tests/PHPUnit/Integration/HttpTest.php index db4e370862..1e9a734dc7 100644 --- a/tests/PHPUnit/Integration/HttpTest.php +++ b/tests/PHPUnit/Integration/HttpTest.php @@ -258,7 +258,7 @@ class HttpTest extends \PHPUnit_Framework_TestCase */ public function testHttpsWorksWithValidCertificate($method) { - $result = Http::sendHttpRequestBy($method, 'https://builds.piwik.org/LATEST', 10); + $result = Http::sendHttpRequestBy($method, 'https://builds.matomo.org/LATEST', 10); $this->assertStringMatchesFormat('%d.%d.%d', $result); } diff --git a/tests/PHPUnit/Integration/Tracker/HandlerTest.php b/tests/PHPUnit/Integration/Tracker/HandlerTest.php index 812c341336..eb691a31b3 100644 --- a/tests/PHPUnit/Integration/Tracker/HandlerTest.php +++ b/tests/PHPUnit/Integration/Tracker/HandlerTest.php @@ -90,7 +90,7 @@ class HandlerTest extends IntegrationTestCase $this->handler->finish($this->tracker, $this->requestSet); $this->fail('An expected exception was not thrown'); } catch (Exception $e) { - $this->assertContains('Piwik would redirect you to this URL: ' . $_GET['redirecturl'], $e->getMessage()); + $this->assertContains('Matomo would redirect you to this URL: ' . $_GET['redirecturl'], $e->getMessage()); unset($_GET['redirecturl']); } } @@ -105,7 +105,7 @@ class HandlerTest extends IntegrationTestCase $this->handler->finish($this->tracker, $this->requestSet); $this->fail('An expected exception was not thrown'); } catch (Exception $e) { - $this->assertContains('Piwik would redirect you to this URL: http://piwik.net/', $e->getMessage()); + $this->assertContains('Matomo would redirect you to this URL: http://piwik.net/', $e->getMessage()); unset($_GET['redirecturl']); } } @@ -182,7 +182,7 @@ class HandlerTest extends IntegrationTestCase $this->handler->onException($this->tracker, $this->requestSet, $this->buildException()); $this->fail('An expected exception was not thrown'); } catch (Exception $e) { - $this->assertContains('Piwik would redirect you to this URL: ' . $_GET['redirecturl'], $e->getMessage()); + $this->assertContains('Matomo would redirect you to this URL: ' . $_GET['redirecturl'], $e->getMessage()); unset($_GET['redirecturl']); } } diff --git a/tests/PHPUnit/Integration/TrackerTest.php b/tests/PHPUnit/Integration/TrackerTest.php index 13b3821bc4..bf4b2a90f0 100644 --- a/tests/PHPUnit/Integration/TrackerTest.php +++ b/tests/PHPUnit/Integration/TrackerTest.php @@ -251,7 +251,7 @@ class TrackerTest extends IntegrationTestCase $response = $this->tracker->main($this->getDefaultHandler(), $requestSet); - $expected = "This resource is part of Piwik. Keep full control of your data with the leading free and open source digital analytics platform for web and mobile."; + $expected = "This resource is part of Matomo. Keep full control of your data with the leading free and open source digital analytics platform for web and mobile."; $this->assertEquals($expected, $response); } diff --git a/tests/PHPUnit/Integration/ViewDataTable/ManagerTest.php b/tests/PHPUnit/Integration/ViewDataTable/ManagerTest.php index e4bf7a23f6..06c4e6d3af 100644 --- a/tests/PHPUnit/Integration/ViewDataTable/ManagerTest.php +++ b/tests/PHPUnit/Integration/ViewDataTable/ManagerTest.php @@ -43,7 +43,7 @@ class ManagerTest extends IntegrationTestCase /** * @expectedException \Exception - * @expectedExceptionMessage Setting parameters translations is not allowed. Please report this bug to the Piwik team. + * @expectedExceptionMessage Setting parameters translations is not allowed. Please report this bug to the Matomo team. */ public function test_setViewDataTableParameters_inConfigProperty_shouldOnlyAllowOverridableParams() { @@ -60,7 +60,7 @@ class ManagerTest extends IntegrationTestCase /** * @expectedException \Exception - * @expectedExceptionMessage Setting parameters filters is not allowed. Please report this bug to the Piwik team. + * @expectedExceptionMessage Setting parameters filters is not allowed. Please report this bug to the Matomo team. */ public function test_setViewDataTableParameters_inConfigProperty_shouldOnlyAllowOverridableParams_bis() { @@ -77,7 +77,7 @@ class ManagerTest extends IntegrationTestCase /** * @expectedException \Exception - * @expectedExceptionMessage Setting parameters apiMethodToRequestDataTable is not allowed. Please report this bug to the Piwik team. + * @expectedExceptionMessage Setting parameters apiMethodToRequestDataTable is not allowed. Please report this bug to the Matomo team. */ public function test_setViewDataTableParameters_inRequestConfigProperty_shouldOnlyAllowOverridableParams() { diff --git a/tests/PHPUnit/Integration/WidgetsListTest.php b/tests/PHPUnit/Integration/WidgetsListTest.php index f4c335a037..f775b60dfa 100644 --- a/tests/PHPUnit/Integration/WidgetsListTest.php +++ b/tests/PHPUnit/Integration/WidgetsListTest.php @@ -49,7 +49,7 @@ class WidgetsListTest extends IntegrationTestCase 'Insights_WidgetCategory' => 2, 'ExampleUI_UiFramework' => 8, 'Referrers_Referrers' => 9, - 'About Piwik' => 10, + 'About Matomo' => 10, ); // number of main categories $this->assertEquals(count($numberOfWidgets), count($widgetsPerCategory)); diff --git a/tests/PHPUnit/System/ArchiveWebTest.php b/tests/PHPUnit/System/ArchiveWebTest.php index 745b12e0ec..196f8e1906 100644 --- a/tests/PHPUnit/System/ArchiveWebTest.php +++ b/tests/PHPUnit/System/ArchiveWebTest.php @@ -64,7 +64,7 @@ class ArchiveWebTest extends SystemTestCase private function assertWebArchivingDone($output, $checkArchivedSite = true) { - $this->assertContains('Starting Piwik reports archiving...', $output); + $this->assertContains('Starting Matomo reports archiving...', $output); if ($checkArchivedSite) { $this->assertContains('Archived website id = 1', $output); } diff --git a/tests/PHPUnit/System/EnvironmentValidationTest.php b/tests/PHPUnit/System/EnvironmentValidationTest.php index 2755455324..5c47714f4e 100644 --- a/tests/PHPUnit/System/EnvironmentValidationTest.php +++ b/tests/PHPUnit/System/EnvironmentValidationTest.php @@ -57,7 +57,7 @@ class EnvironmentValidationTest extends SystemTestCase $this->simulateAbsentConfigFile('config.ini.php'); $output = $this->triggerPiwikFrom('tracker'); - $this->assertContains('As Piwik is not installed yet, the Tracking API cannot proceed and will exit without error.', $output); + $this->assertContains('As Matomo is not installed yet, the Tracking API cannot proceed and will exit without error.', $output); } public function test_NoLocalConfigFile_TriggersError_inConsole() @@ -135,7 +135,7 @@ class EnvironmentValidationTest extends SystemTestCase private function assertInstallationProcessStarted($output) { - $this->assertContains('Piwik '. Version::VERSION .' › Installation', $output); + $this->assertContains('Matomo '. Version::VERSION .' › Installation', $output); } private function simulateAbsentConfigFile($fileName) diff --git a/tests/PHPUnit/System/TrackerResponseTest.php b/tests/PHPUnit/System/TrackerResponseTest.php index 98cd27baa0..a0c6c6021e 100755 --- a/tests/PHPUnit/System/TrackerResponseTest.php +++ b/tests/PHPUnit/System/TrackerResponseTest.php @@ -101,7 +101,7 @@ class TrackerResponseTest extends SystemTestCase $url = Fixture::getTrackerUrl(); $this->assertResponseCode(200, $url); - $expected = "This resource is part of Piwik. Keep full control of your data with the leading free and open source digital analytics platform for web and mobile."; + $expected = "This resource is part of Matomo. Keep full control of your data with the leading free and open source digital analytics platform for web and mobile."; $this->assertHttpResponseText($expected, $url); } @@ -110,7 +110,7 @@ class TrackerResponseTest extends SystemTestCase $url = Fixture::getTrackerUrl(); $this->assertResponseCode(400, $url . '?rec=1'); - $expected = "This resource is part of Piwik. Keep full control of your data with the leading free and open source digital analytics platform for web and mobile."; + $expected = "This resource is part of Matomo. Keep full control of your data with the leading free and open source digital analytics platform for web and mobile."; $this->assertHttpResponseText($expected, $url); } diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_archive_php_cron_output.txt b/tests/PHPUnit/System/expected/test_ArchiveCronTest_archive_php_cron_output.txt index a20f089dce..b271da4a4a 100644 --- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_archive_php_cron_output.txt +++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_archive_php_cron_output.txt @@ -1,104 +1,105 @@ ------------------------------------------------------- Using this 'archive.php' script is no longer recommended. -Please use '/path/to/php /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//console core:archive --url=http://localhost/tests/PHPUnit/proxy/index.php' instead. -To get help use '/path/to/php /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//console core:archive --help' -See also: http://piwik.org/docs/setup-auto-archiving/ +Please use '/path/to/php /home/travis/build/matomo-org/piwik/tests/PHPUnit/proxy/../../..//console core:archive --url=http://localhost/tests/PHPUnit/proxy/index.php' instead. +To get help use '/path/to/php /home/travis/build/matomo-org/piwik/tests/PHPUnit/proxy/../../..//console core:archive --help' +See also: https://matomo.org/docs/setup-auto-archiving/ If you cannot use the console because it requires CLI try 'php archive.php --url=http://your.piwik/path' ------------------------------------------------------- -INFO [2017-01-22 00:03:37] --------------------------- -INFO [2017-01-22 00:03:37] INIT -INFO [2017-01-22 00:03:37] Running Piwik 3.0.1 as Super User -INFO [2017-01-22 00:03:37] --------------------------- -INFO [2017-01-22 00:03:37] NOTES -INFO [2017-01-22 00:03:37] - If you execute this script at least once per hour (or more often) in a crontab, you may disable 'Browser trigger archiving' in Piwik UI > Settings > General Settings. -INFO [2017-01-22 00:03:37] See the doc at: http://piwik.org/docs/setup-auto-archiving/ -INFO [2017-01-22 00:03:37] - Reports for today will be processed at most every 150 seconds. You can change this value in Piwik UI > Settings > General Settings. -INFO [2017-01-22 00:03:37] - Reports for the current week/month/year will be requested at most every 3600 seconds. -INFO [2017-01-22 00:03:37] - Will invalidate archived reports for 2012-08-09 for following websites ids: 1 -INFO [2017-01-22 00:03:37] - Will invalidate archived reports for 2012-08-10 for following websites ids: 1 -INFO [2017-01-22 00:03:37] - Will invalidate archived reports for 2012-08-11 for following websites ids: 1 -INFO [2017-01-22 00:03:37] - Will invalidate archived reports for 2012-08-15 for following websites ids: 1,2,3 -INFO [2017-01-22 00:03:37] - Will invalidate archived reports for 2012-09-30 for following websites ids: 1 -INFO [2017-01-22 00:03:37] - Will invalidate archived reports for 2014-03-12 for following websites ids: 1,3 -INFO [2017-01-22 00:03:37] - Will invalidate archived reports for 2014-03-13 for following websites ids: 1,3 -INFO [2017-01-22 00:03:37] - Will process 3 other websites because some old data reports have been invalidated (eg. using the Log Import script or the InvalidateReports plugin) , IDs: 1, 2, 3 -INFO [2017-01-22 00:03:37] --------------------------- -INFO [2017-01-22 00:03:37] START -INFO [2017-01-22 00:03:37] Starting Piwik reports archiving... -INFO [2017-01-22 00:03:37] Old report was invalidated for website id 1 -INFO [2017-01-22 00:03:37] Will pre-process for website id = 1, period = day, date = last52 -INFO [2017-01-22 00:03:37] - pre-processing all visits -INFO [2017-01-22 00:03:39] - pre-processing segment 1/3 browserCode==IE -INFO [2017-01-22 00:03:39] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50 -INFO [2017-01-22 00:03:39] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50 -INFO [2017-01-22 00:03:44] Archived website id = 1, period = day, 3 segments, 0 visits in last 52 days, 0 visits today, Time elapsed: 6.567s -INFO [2017-01-22 00:03:44] Will pre-process for website id = 1, period = week, date = last260 -INFO [2017-01-22 00:03:44] - pre-processing all visits -INFO [2017-01-22 00:03:44] - pre-processing segment 1/3 browserCode==IE -INFO [2017-01-22 00:03:44] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50 -INFO [2017-01-22 00:05:14] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50 -INFO [2017-01-22 00:05:58] Archived website id = 1, period = week, 3 segments, 41 visits in last 260 weeks, 0 visits this week, Time elapsed: 134.312s -INFO [2017-01-22 00:05:58] Will pre-process for website id = 1, period = month, date = last52 -INFO [2017-01-22 00:05:58] - pre-processing all visits -INFO [2017-01-22 00:05:58] - pre-processing segment 1/3 browserCode==IE -INFO [2017-01-22 00:05:58] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50 -INFO [2017-01-22 00:06:10] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50 -INFO [2017-01-22 00:06:16] Archived website id = 1, period = month, 3 segments, 12 visits in last 52 months, 0 visits this month, Time elapsed: 17.904s -INFO [2017-01-22 00:06:16] Will pre-process for website id = 1, period = year, date = last7 -INFO [2017-01-22 00:06:16] - pre-processing all visits -INFO [2017-01-22 00:06:16] - pre-processing segment 1/3 browserCode==IE -INFO [2017-01-22 00:06:16] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50 -INFO [2017-01-22 00:06:23] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50 -INFO [2017-01-22 00:06:26] Archived website id = 1, period = year, 3 segments, 41 visits in last 7 years, 0 visits this year, Time elapsed: 10.251s -INFO [2017-01-22 00:06:26] Archived website id = 1, 16 API requests, Time elapsed: 169.041s [1/3 done] -INFO [2017-01-22 00:06:26] Old report was invalidated for website id 2 -INFO [2017-01-22 00:06:26] Will pre-process for website id = 2, period = day, date = last52 -INFO [2017-01-22 00:06:26] - pre-processing all visits -INFO [2017-01-22 00:06:28] Archived website id = 2, period = day, 0 segments, 0 visits in last 52 days, 0 visits today, Time elapsed: 1.963s -INFO [2017-01-22 00:06:28] Will pre-process for website id = 2, period = week, date = last260 -INFO [2017-01-22 00:06:28] - pre-processing all visits -INFO [2017-01-22 00:06:59] Archived website id = 2, period = week, 0 segments, 1 visits in last 260 weeks, 0 visits this week, Time elapsed: 31.146s -INFO [2017-01-22 00:06:59] Will pre-process for website id = 2, period = month, date = last52 -INFO [2017-01-22 00:06:59] - pre-processing all visits -INFO [2017-01-22 00:07:03] Archived website id = 2, period = month, 0 segments, 0 visits in last 52 months, 0 visits this month, Time elapsed: 4.273s -INFO [2017-01-22 00:07:03] Will pre-process for website id = 2, period = year, date = last7 -INFO [2017-01-22 00:07:03] - pre-processing all visits -INFO [2017-01-22 00:07:05] Archived website id = 2, period = year, 0 segments, 1 visits in last 7 years, 0 visits this year, Time elapsed: 1.745s -INFO [2017-01-22 00:07:05] Archived website id = 2, 4 API requests, Time elapsed: 39.131s [2/3 done] -INFO [2017-01-22 00:07:05] Old report was invalidated for website id 3 -INFO [2017-01-22 00:07:05] Will pre-process for website id = 3, period = day, date = last52 -INFO [2017-01-22 00:07:05] - pre-processing all visits -INFO [2017-01-22 00:07:07] Archived website id = 3, period = day, 0 segments, 0 visits in last 52 days, 0 visits today, Time elapsed: 1.947s -INFO [2017-01-22 00:07:07] Will pre-process for website id = 3, period = week, date = last260 -INFO [2017-01-22 00:07:07] - pre-processing all visits -INFO [2017-01-22 00:07:39] Archived website id = 3, period = week, 0 segments, 15 visits in last 260 weeks, 0 visits this week, Time elapsed: 31.604s -INFO [2017-01-22 00:07:39] Will pre-process for website id = 3, period = month, date = last52 -INFO [2017-01-22 00:07:39] - pre-processing all visits -INFO [2017-01-22 00:07:44] Archived website id = 3, period = month, 0 segments, 12 visits in last 52 months, 0 visits this month, Time elapsed: 4.779s -INFO [2017-01-22 00:07:44] Will pre-process for website id = 3, period = year, date = last7 -INFO [2017-01-22 00:07:44] - pre-processing all visits -INFO [2017-01-22 00:07:46] Archived website id = 3, period = year, 0 segments, 15 visits in last 7 years, 0 visits this year, Time elapsed: 2.549s -INFO [2017-01-22 00:07:46] Archived website id = 3, 4 API requests, Time elapsed: 40.884s [3/3 done] -INFO [2017-01-22 00:07:46] Done archiving! -INFO [2017-01-22 00:07:46] --------------------------- -INFO [2017-01-22 00:07:46] SUMMARY -INFO [2017-01-22 00:07:46] Total visits for today across archived websites: 0 -INFO [2017-01-22 00:07:46] Archived today's reports for 3 websites -INFO [2017-01-22 00:07:46] Archived week/month/year for 3 websites -INFO [2017-01-22 00:07:46] Skipped 0 websites -INFO [2017-01-22 00:07:46] - 0 skipped because no new visit since the last script execution -INFO [2017-01-22 00:07:46] - 0 skipped because existing daily reports are less than 150 seconds old -INFO [2017-01-22 00:07:46] - 0 skipped because existing week/month/year periods reports are less than 3600 seconds old -INFO [2017-01-22 00:07:46] Total API requests: 24 -INFO [2017-01-22 00:07:46] done: 3/3 100%, 0 vtoday, 3 wtoday, 3 wperiods, 24 req, 249195 ms, no error -INFO [2017-01-22 00:07:46] Time elapsed: 249.195s -INFO [2017-01-22 00:07:46] --------------------------- -INFO [2017-01-22 00:07:46] SCHEDULED TASKS -INFO [2017-01-22 00:07:46] Starting Scheduled tasks... -INFO [2017-01-22 00:07:46] done -INFO [2017-01-22 00:07:46] --------------------------- \ No newline at end of file +INFO [2018-01-09 22:42:32] --------------------------- +INFO [2018-01-09 22:42:32] INIT +INFO [2018-01-09 22:42:32] Running Matomo 3.3.0-b1 as Super User +INFO [2018-01-09 22:42:32] --------------------------- +INFO [2018-01-09 22:42:32] NOTES +INFO [2018-01-09 22:42:32] - If you execute this script at least once per hour (or more often) in a crontab, you may disable 'Browser trigger archiving' in Matomo UI > Settings > General Settings. +INFO [2018-01-09 22:42:32] See the doc at: https://matomo.org/docs/setup-auto-archiving/ +INFO [2018-01-09 22:42:32] - Reports for today will be processed at most every 150 seconds. You can change this value in Matomo UI > Settings > General Settings. +INFO [2018-01-09 22:42:32] - Reports for the current week/month/year will be requested at most every 3600 seconds. +INFO [2018-01-09 22:42:32] - Will invalidate archived reports for 2012-08-09 for following websites ids: 1 +INFO [2018-01-09 22:42:32] - Will invalidate archived reports for 2012-08-10 for following websites ids: 1 +INFO [2018-01-09 22:42:32] - Will invalidate archived reports for 2012-08-11 for following websites ids: 1 +INFO [2018-01-09 22:42:32] - Will invalidate archived reports for 2012-08-15 for following websites ids: 1,2,3 +INFO [2018-01-09 22:42:32] - Will invalidate archived reports for 2012-08-19 for following websites ids: 1 +INFO [2018-01-09 22:42:32] - Will invalidate archived reports for 2012-09-30 for following websites ids: 1 +INFO [2018-01-09 22:42:32] - Will invalidate archived reports for 2014-03-12 for following websites ids: 1,3 +INFO [2018-01-09 22:42:32] - Will invalidate archived reports for 2014-03-13 for following websites ids: 1,3 +INFO [2018-01-09 22:42:32] - Will process 3 other websites because some old data reports have been invalidated (eg. using the Log Import script or the InvalidateReports plugin) , IDs: 1, 2, 3 +INFO [2018-01-09 22:42:33] --------------------------- +INFO [2018-01-09 22:42:33] START +INFO [2018-01-09 22:42:33] Starting Matomo reports archiving... +INFO [2018-01-09 22:42:33] Old report was invalidated for website id 1 +INFO [2018-01-09 22:42:33] Will pre-process for website id = 1, period = day, date = last52 +INFO [2018-01-09 22:42:33] - pre-processing all visits +INFO [2018-01-09 22:42:35] - pre-processing segment 1/3 browserCode==IE +INFO [2018-01-09 22:42:35] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50 +INFO [2018-01-09 22:42:35] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50 +INFO [2018-01-09 22:42:40] Archived website id = 1, period = day, 3 segments, 0 visits in last 52 days, 0 visits today, Time elapsed: 7.147s +INFO [2018-01-09 22:42:40] Will pre-process for website id = 1, period = week, date = last260 +INFO [2018-01-09 22:42:40] - pre-processing all visits +INFO [2018-01-09 22:42:40] - pre-processing segment 1/3 browserCode==IE +INFO [2018-01-09 22:42:40] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50 +INFO [2018-01-09 22:44:15] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50 +INFO [2018-01-09 22:45:02] Archived website id = 1, period = week, 3 segments, 12 visits in last 260 weeks, 0 visits this week, Time elapsed: 142.765s +INFO [2018-01-09 22:45:02] Will pre-process for website id = 1, period = month, date = last52 +INFO [2018-01-09 22:45:02] - pre-processing all visits +INFO [2018-01-09 22:45:03] - pre-processing segment 1/3 browserCode==IE +INFO [2018-01-09 22:45:03] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50 +INFO [2018-01-09 22:45:14] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50 +INFO [2018-01-09 22:45:20] Archived website id = 1, period = month, 3 segments, 12 visits in last 52 months, 0 visits this month, Time elapsed: 17.817s +INFO [2018-01-09 22:45:20] Will pre-process for website id = 1, period = year, date = last7 +INFO [2018-01-09 22:45:20] - pre-processing all visits +INFO [2018-01-09 22:45:20] - pre-processing segment 1/3 browserCode==IE +INFO [2018-01-09 22:45:20] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50 +INFO [2018-01-09 22:45:41] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50 +INFO [2018-01-09 22:45:51] Archived website id = 1, period = year, 3 segments, 46 visits in last 7 years, 0 visits this year, Time elapsed: 30.356s +INFO [2018-01-09 22:45:51] Archived website id = 1, 16 API requests, Time elapsed: 198.094s [1/3 done] +INFO [2018-01-09 22:45:51] Old report was invalidated for website id 2 +INFO [2018-01-09 22:45:51] Will pre-process for website id = 2, period = day, date = last52 +INFO [2018-01-09 22:45:51] - pre-processing all visits +INFO [2018-01-09 22:45:53] Archived website id = 2, period = day, 0 segments, 0 visits in last 52 days, 0 visits today, Time elapsed: 2.067s +INFO [2018-01-09 22:45:53] Will pre-process for website id = 2, period = week, date = last260 +INFO [2018-01-09 22:45:53] - pre-processing all visits +INFO [2018-01-09 22:46:28] Archived website id = 2, period = week, 0 segments, 0 visits in last 260 weeks, 0 visits this week, Time elapsed: 34.977s +INFO [2018-01-09 22:46:28] Will pre-process for website id = 2, period = month, date = last52 +INFO [2018-01-09 22:46:28] - pre-processing all visits +INFO [2018-01-09 22:46:32] Archived website id = 2, period = month, 0 segments, 0 visits in last 52 months, 0 visits this month, Time elapsed: 4.380s +INFO [2018-01-09 22:46:32] Will pre-process for website id = 2, period = year, date = last7 +INFO [2018-01-09 22:46:32] - pre-processing all visits +INFO [2018-01-09 22:46:37] Archived website id = 2, period = year, 0 segments, 1 visits in last 7 years, 0 visits this year, Time elapsed: 5.078s +INFO [2018-01-09 22:46:37] Archived website id = 2, 4 API requests, Time elapsed: 46.506s [2/3 done] +INFO [2018-01-09 22:46:37] Old report was invalidated for website id 3 +INFO [2018-01-09 22:46:37] Will pre-process for website id = 3, period = day, date = last52 +INFO [2018-01-09 22:46:37] - pre-processing all visits +INFO [2018-01-09 22:46:39] Archived website id = 3, period = day, 0 segments, 0 visits in last 52 days, 0 visits today, Time elapsed: 2.056s +INFO [2018-01-09 22:46:39] Will pre-process for website id = 3, period = week, date = last260 +INFO [2018-01-09 22:46:39] - pre-processing all visits +INFO [2018-01-09 22:47:15] Archived website id = 3, period = week, 0 segments, 12 visits in last 260 weeks, 0 visits this week, Time elapsed: 35.840s +INFO [2018-01-09 22:47:15] Will pre-process for website id = 3, period = month, date = last52 +INFO [2018-01-09 22:47:15] - pre-processing all visits +INFO [2018-01-09 22:47:20] Archived website id = 3, period = month, 0 segments, 12 visits in last 52 months, 0 visits this month, Time elapsed: 4.767s +INFO [2018-01-09 22:47:20] Will pre-process for website id = 3, period = year, date = last7 +INFO [2018-01-09 22:47:20] - pre-processing all visits +INFO [2018-01-09 22:47:26] Archived website id = 3, period = year, 0 segments, 15 visits in last 7 years, 0 visits this year, Time elapsed: 6.206s +INFO [2018-01-09 22:47:26] Archived website id = 3, 4 API requests, Time elapsed: 48.873s [3/3 done] +INFO [2018-01-09 22:47:26] Done archiving! +INFO [2018-01-09 22:47:26] --------------------------- +INFO [2018-01-09 22:47:26] SUMMARY +INFO [2018-01-09 22:47:26] Total visits for today across archived websites: 0 +INFO [2018-01-09 22:47:26] Archived today's reports for 3 websites +INFO [2018-01-09 22:47:26] Archived week/month/year for 3 websites +INFO [2018-01-09 22:47:26] Skipped 0 websites +INFO [2018-01-09 22:47:26] - 0 skipped because no new visit since the last script execution +INFO [2018-01-09 22:47:26] - 0 skipped because existing daily reports are less than 150 seconds old +INFO [2018-01-09 22:47:26] - 0 skipped because existing week/month/year periods reports are less than 3600 seconds old +INFO [2018-01-09 22:47:26] Total API requests: 24 +INFO [2018-01-09 22:47:26] done: 3/3 100%, 0 vtoday, 3 wtoday, 3 wperiods, 24 req, 293679 ms, no error +INFO [2018-01-09 22:47:26] Time elapsed: 293.679s +INFO [2018-01-09 22:47:26] --------------------------- +INFO [2018-01-09 22:47:26] SCHEDULED TASKS +INFO [2018-01-09 22:47:26] Starting Scheduled tasks... +INFO [2018-01-09 22:47:26] done +INFO [2018-01-09 22:47:26] --------------------------- \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__CorePluginsAdmin.getSystemSettings.xml b/tests/PHPUnit/System/expected/test_ImportLogs__CorePluginsAdmin.getSystemSettings.xml index fa92d64f22..4edaf88364 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__CorePluginsAdmin.getSystemSettings.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__CorePluginsAdmin.getSystemSettings.xml @@ -20,7 +20,7 @@ Latest beta 2.X (Long Term Support version) - While our <a href='?module=Proxy&action=redirect&url=https://piwik.org/participate/development-process/' target='_blank'>development process</a> includes thousands of automated tests, Beta Testers play a key role in achieving the "No bug policy" in Piwik.<br/>If Piwik is a critical part of your business, we recommend you use the latest stable release. If you use the latest beta and you find a bug or have a suggestion, please <a href='?module=Proxy&action=redirect&url=https%3A%2F%2Fdeveloper.piwik.org%2Fguides%2Fcore-team-workflow%23influencing-piwik-development' target='_blank'>see here</a>.<br />LTS (Long Term Support) versions receive only security and bug fixes. + While our <a href='?module=Proxy&action=redirect&url=https://matomo.org/participate/development-process/' target='_blank'>development process</a> includes thousands of automated tests, Beta Testers play a key role in achieving the "No bug policy" in Piwik.<br/>If Piwik is a critical part of your business, we recommend you use the latest stable release. If you use the latest beta and you find a bug or have a suggestion, please <a href='?module=Proxy&action=redirect&url=https%3A%2F%2Fdeveloper.matomo.org%2Fguides%2Fcore-team-workflow%23influencing-piwik-development' target='_blank'>see here</a>.<br />LTS (Long Term Support) versions receive only security and bug fixes. Release channel @@ -156,7 +156,7 @@ Another line trackToPiwik - Send usage data to Piwik.org + Send usage data to Matomo.org 0 1 boolean @@ -164,10 +164,10 @@ Another line - If enabled, anonymized usage data will be sent to demo-anonymous.piwik.org and the tracked data can be viewed there (the data is public). The collected data is used to improve Piwik. Thank you for making Piwik better! + If enabled, anonymized usage data will be sent to demo-anonymous.matomo.org and the tracked data can be viewed there (the data is public). The collected data is used to improve Matomo. Thank you for making Matomo better! - Send anonmyized usage data to the creators of Piwik + Send anonmyized usage data to the creators of Matomo @@ -180,10 +180,10 @@ Another line - If specified, anonymized usage data will be sent to the specified site in this Piwik. + If specified, anonymized usage data will be sent to the specified site in this Matomo. - Send anonymize usage data to this Piwik + Send anonymize usage data to this Matomo @@ -204,19 +204,19 @@ Another line customSiteUrl - Piwik Url + Matomo Url string text - eg. http://example.com/piwik + eg. http://example.com/matomo - Send anonymize usage data to a custom Piwik + Send anonymize usage data to a custom Matomo @@ -230,7 +230,7 @@ Another line eg. "2" - If a URL and Site Id is specified, usage data will be sent to the custom Piwik instance. + If a URL and Site Id is specified, usage data will be sent to the custom Matomo instance. diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__CorePluginsAdmin.getUserSettings.xml b/tests/PHPUnit/System/expected/test_ImportLogs__CorePluginsAdmin.getUserSettings.xml index 385469b2df..8ce4b17685 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__CorePluginsAdmin.getUserSettings.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__CorePluginsAdmin.getUserSettings.xml @@ -65,7 +65,7 @@ userTrackingEnabled - Piwik usage tracking enabled + Matomo usage tracking enabled 1 1 boolean diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CorePluginsAdmin.getSystemSettings.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CorePluginsAdmin.getSystemSettings.xml index fa92d64f22..4edaf88364 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CorePluginsAdmin.getSystemSettings.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CorePluginsAdmin.getSystemSettings.xml @@ -20,7 +20,7 @@ Latest beta 2.X (Long Term Support version) - While our <a href='?module=Proxy&action=redirect&url=https://piwik.org/participate/development-process/' target='_blank'>development process</a> includes thousands of automated tests, Beta Testers play a key role in achieving the "No bug policy" in Piwik.<br/>If Piwik is a critical part of your business, we recommend you use the latest stable release. If you use the latest beta and you find a bug or have a suggestion, please <a href='?module=Proxy&action=redirect&url=https%3A%2F%2Fdeveloper.piwik.org%2Fguides%2Fcore-team-workflow%23influencing-piwik-development' target='_blank'>see here</a>.<br />LTS (Long Term Support) versions receive only security and bug fixes. + While our <a href='?module=Proxy&action=redirect&url=https://matomo.org/participate/development-process/' target='_blank'>development process</a> includes thousands of automated tests, Beta Testers play a key role in achieving the "No bug policy" in Piwik.<br/>If Piwik is a critical part of your business, we recommend you use the latest stable release. If you use the latest beta and you find a bug or have a suggestion, please <a href='?module=Proxy&action=redirect&url=https%3A%2F%2Fdeveloper.matomo.org%2Fguides%2Fcore-team-workflow%23influencing-piwik-development' target='_blank'>see here</a>.<br />LTS (Long Term Support) versions receive only security and bug fixes. Release channel @@ -156,7 +156,7 @@ Another line trackToPiwik - Send usage data to Piwik.org + Send usage data to Matomo.org 0 1 boolean @@ -164,10 +164,10 @@ Another line - If enabled, anonymized usage data will be sent to demo-anonymous.piwik.org and the tracked data can be viewed there (the data is public). The collected data is used to improve Piwik. Thank you for making Piwik better! + If enabled, anonymized usage data will be sent to demo-anonymous.matomo.org and the tracked data can be viewed there (the data is public). The collected data is used to improve Matomo. Thank you for making Matomo better! - Send anonmyized usage data to the creators of Piwik + Send anonmyized usage data to the creators of Matomo @@ -180,10 +180,10 @@ Another line - If specified, anonymized usage data will be sent to the specified site in this Piwik. + If specified, anonymized usage data will be sent to the specified site in this Matomo. - Send anonymize usage data to this Piwik + Send anonymize usage data to this Matomo @@ -204,19 +204,19 @@ Another line customSiteUrl - Piwik Url + Matomo Url string text - eg. http://example.com/piwik + eg. http://example.com/matomo - Send anonymize usage data to a custom Piwik + Send anonymize usage data to a custom Matomo @@ -230,7 +230,7 @@ Another line eg. "2" - If a URL and Site Id is specified, usage data will be sent to the custom Piwik instance. + If a URL and Site Id is specified, usage data will be sent to the custom Matomo instance. diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CorePluginsAdmin.getUserSettings.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CorePluginsAdmin.getUserSettings.xml index 385469b2df..8ce4b17685 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CorePluginsAdmin.getUserSettings.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CorePluginsAdmin.getUserSettings.xml @@ -65,7 +65,7 @@ userTrackingEnabled - Piwik usage tracking enabled + Matomo usage tracking enabled 1 1 boolean diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getSiteSearchKeywords_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getSiteSearchKeywords_firstSite_lastN__API.getProcessedReport_day.xml index 32180cf068..8b26d43ba3 100644 --- a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getSiteSearchKeywords_firstSite_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getSiteSearchKeywords_firstSite_lastN__API.getProcessedReport_day.xml @@ -9,7 +9,7 @@ Actions getSiteSearchKeywords Keyword - This report lists the Search Keywords that visitors searched for on your internal Search Engine.<br/><br/>Tracking searches that visitors make on your website is a very effective way to learn more about what your audience is looking for, it can help find ideas for new content, new Ecommerce products that potential customers might be searching for, and generally improve the visitors' experience on your website.<br/><br/><a href="https://piwik.org/docs/site-search/" rel="noreferrer" target="_blank">Learn more about Tracking how your visitors use your Search engine.</a> + This report lists the Search Keywords that visitors searched for on your internal Search Engine.<br/><br/>Tracking searches that visitors make on your website is a very effective way to learn more about what your audience is looking for, it can help find ideas for new content, new Ecommerce products that potential customers might be searching for, and generally improve the visitors' experience on your website.<br/><br/><a href="https://matomo.org/docs/site-search/" rel="noreferrer" target="_blank">Learn more about Tracking how your visitors use your Search engine.</a> Searches Search Results pages diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getSiteSearchKeywords_firstSite_lastN__API.getProcessedReport_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getSiteSearchKeywords_firstSite_lastN__API.getProcessedReport_month.xml index cc68783ae4..8377a9f040 100644 --- a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getSiteSearchKeywords_firstSite_lastN__API.getProcessedReport_month.xml +++ b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getSiteSearchKeywords_firstSite_lastN__API.getProcessedReport_month.xml @@ -9,7 +9,7 @@ Actions getSiteSearchKeywords Keyword - This report lists the Search Keywords that visitors searched for on your internal Search Engine.<br/><br/>Tracking searches that visitors make on your website is a very effective way to learn more about what your audience is looking for, it can help find ideas for new content, new Ecommerce products that potential customers might be searching for, and generally improve the visitors' experience on your website.<br/><br/><a href="https://piwik.org/docs/site-search/" rel="noreferrer" target="_blank">Learn more about Tracking how your visitors use your Search engine.</a> + This report lists the Search Keywords that visitors searched for on your internal Search Engine.<br/><br/>Tracking searches that visitors make on your website is a very effective way to learn more about what your audience is looking for, it can help find ideas for new content, new Ecommerce products that potential customers might be searching for, and generally improve the visitors' experience on your website.<br/><br/><a href="https://matomo.org/docs/site-search/" rel="noreferrer" target="_blank">Learn more about Tracking how your visitors use your Search engine.</a> Searches Search Results pages diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_day.xml index 7cdae8f702..aa7ced88fc 100644 --- a/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_day.xml @@ -9,7 +9,7 @@ CustomVariables getCustomVariables Custom Variable name - This report contains information about your Custom Variables. Click on a variable name to see the distribution of the values. <br /> For more information about Custom Variables in general, read the <a href="https://piwik.org/docs/custom-variables/" rel="noreferrer" target="_blank">Custom Variables documentation on piwik.org</a> + This report contains information about your Custom Variables. Click on a variable name to see the distribution of the values. <br /> For more information about Custom Variables in general, read the <a href="https://matomo.org/docs/custom-variables/" rel="noreferrer" target="_blank">Custom Variables documentation on piwik.org</a> Visits Unique visitors diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_month.xml index 2592d92de7..636bb3183d 100644 --- a/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_month.xml +++ b/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_month.xml @@ -9,7 +9,7 @@ CustomVariables getCustomVariables Custom Variable name - This report contains information about your Custom Variables. Click on a variable name to see the distribution of the values. <br /> For more information about Custom Variables in general, read the <a href="https://piwik.org/docs/custom-variables/" rel="noreferrer" target="_blank">Custom Variables documentation on piwik.org</a> + This report contains information about your Custom Variables. Click on a variable name to see the distribution of the values. <br /> For more information about Custom Variables in general, read the <a href="https://matomo.org/docs/custom-variables/" rel="noreferrer" target="_blank">Custom Variables documentation on piwik.org</a> Visits Actions diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_row_evolution_graph__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_row_evolution_graph__ScheduledReports.generateReport_month.original.html index bc0c63f737..806cd18d62 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_row_evolution_graph__ScheduledReports.generateReport_month.original.html +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_row_evolution_graph__ScheduledReports.generateReport_month.original.html @@ -60,7 +60,7 @@

Powered by - Piwik Analytics + Piwik Analytics
The leading open analytics platform that respects your privacy.

diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html index b3907eca2f..7c19110eeb 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html @@ -5627,7 +5627,7 @@

Powered by - Piwik Analytics + Piwik Analytics
The leading open analytics platform that respects your privacy.

diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html index ad317c6dd0..5ce1b71226 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html @@ -5347,7 +5347,7 @@

Powered by - Piwik Analytics + Piwik Analytics
The leading open analytics platform that respects your privacy.

diff --git a/tests/PHPUnit/System/expected/test_UserId_VisitorId__VisitsSummary.getUsers_year.xml b/tests/PHPUnit/System/expected/test_UserId_VisitorId__VisitsSummary.getUsers_year.xml index dc37118e2b..79ddb38231 100644 --- a/tests/PHPUnit/System/expected/test_UserId_VisitorId__VisitsSummary.getUsers_year.xml +++ b/tests/PHPUnit/System/expected/test_UserId_VisitorId__VisitsSummary.getUsers_year.xml @@ -1,6 +1,6 @@ - \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml index 60e6c15993..90df60e9d4 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml @@ -213,7 +213,7 @@ Ecommerce enabled - When enabled, the "Goals" report will have a new "Ecommerce" section.<br />Piwik allows for advanced Ecommerce Analytics tracking & reporting. Learn more about <a href='https://piwik.org/docs/ecommerce-analytics/' target='_blank'> Ecommerce Analytics</a>. + When enabled, the "Goals" report will have a new "Ecommerce" section.<br />Piwik allows for advanced Ecommerce Analytics tracking & reporting. Learn more about <a href='https://matomo.org/docs/ecommerce-analytics/' target='_blank'> Ecommerce Analytics</a>. diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryReports.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryReports.xml index 896ea015bc..f5645a049f 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryReports.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryReports.xml @@ -18,7 +18,7 @@ Campaigns (Referrers) - This report shows which campaigns led visitors to your website. <br /> For more information about tracking campaigns, read the <a href="https://piwik.org/docs/tracking-campaigns/" rel="noreferrer" target="_blank">campaigns documentation on piwik.org</a> + This report shows which campaigns led visitors to your website. <br /> For more information about tracking campaigns, read the <a href="https://matomo.org/docs/tracking-campaigns/" rel="noreferrer" target="_blank">campaigns documentation on piwik.org</a> City (Visitors) @@ -38,7 +38,7 @@ Custom Variables (Visitors) - This report contains information about your Custom Variables. Click on a variable name to see the distribution of the values. <br /> For more information about Custom Variables in general, read the <a href="https://piwik.org/docs/custom-variables/" rel="noreferrer" target="_blank">Custom Variables documentation on piwik.org</a> + This report contains information about your Custom Variables. Click on a variable name to see the distribution of the values. <br /> For more information about Custom Variables in general, read the <a href="https://matomo.org/docs/custom-variables/" rel="noreferrer" target="_blank">Custom Variables documentation on piwik.org</a> Downloads (Actions) @@ -114,7 +114,7 @@ Site Search Keywords (Actions) - This report lists the Search Keywords that visitors searched for on your internal Search Engine.<br/><br/>Tracking searches that visitors make on your website is a very effective way to learn more about what your audience is looking for, it can help find ideas for new content, new Ecommerce products that potential customers might be searching for, and generally improve the visitors' experience on your website.<br/><br/><a href="https://piwik.org/docs/site-search/" rel="noreferrer" target="_blank">Learn more about Tracking how your visitors use your Search engine.</a> + This report lists the Search Keywords that visitors searched for on your internal Search Engine.<br/><br/>Tracking searches that visitors make on your website is a very effective way to learn more about what your audience is looking for, it can help find ideas for new content, new Ecommerce products that potential customers might be searching for, and generally improve the visitors' experience on your website.<br/><br/><a href="https://matomo.org/docs/site-search/" rel="noreferrer" target="_blank">Learn more about Tracking how your visitors use your Search engine.</a> Social Networks (Referrers) diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml index 998faacdb8..0509ff030c 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml @@ -135,7 +135,7 @@ CustomVariables getCustomVariables Custom Variable name - This report contains information about your Custom Variables. Click on a variable name to see the distribution of the values. <br /> For more information about Custom Variables in general, read the <a href="https://piwik.org/docs/custom-variables/" rel="noreferrer" target="_blank">Custom Variables documentation on piwik.org</a> + This report contains information about your Custom Variables. Click on a variable name to see the distribution of the values. <br /> For more information about Custom Variables in general, read the <a href="https://matomo.org/docs/custom-variables/" rel="noreferrer" target="_blank">Custom Variables documentation on piwik.org</a> Visits Unique visitors @@ -1309,7 +1309,7 @@ Actions getSiteSearchKeywords Keyword - This report lists the Search Keywords that visitors searched for on your internal Search Engine.<br/><br/>Tracking searches that visitors make on your website is a very effective way to learn more about what your audience is looking for, it can help find ideas for new content, new Ecommerce products that potential customers might be searching for, and generally improve the visitors' experience on your website.<br/><br/><a href="https://piwik.org/docs/site-search/" rel="noreferrer" target="_blank">Learn more about Tracking how your visitors use your Search engine.</a> + This report lists the Search Keywords that visitors searched for on your internal Search Engine.<br/><br/>Tracking searches that visitors make on your website is a very effective way to learn more about what your audience is looking for, it can help find ideas for new content, new Ecommerce products that potential customers might be searching for, and generally improve the visitors' experience on your website.<br/><br/><a href="https://matomo.org/docs/site-search/" rel="noreferrer" target="_blank">Learn more about Tracking how your visitors use your Search engine.</a> Searches Search Results pages @@ -1843,7 +1843,7 @@ Referrers getCampaigns Campaign - This report shows which campaigns led visitors to your website. <br /> For more information about tracking campaigns, read the <a href="https://piwik.org/docs/tracking-campaigns/" rel="noreferrer" target="_blank">campaigns documentation on piwik.org</a> + This report shows which campaigns led visitors to your website. <br /> For more information about tracking campaigns, read the <a href="https://matomo.org/docs/tracking-campaigns/" rel="noreferrer" target="_blank">campaigns documentation on piwik.org</a> Visits Unique visitors diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml index 3bf0a56ac3..2292e958aa 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml @@ -3214,8 +3214,8 @@ Premium Features - About Piwik - About Piwik + About Matomo + About Matomo 99 @@ -3233,8 +3233,8 @@ Piwik Changelog - About Piwik - About Piwik + About Matomo + About Matomo 99 @@ -3252,8 +3252,8 @@ Example Widget Name - About Piwik - About Piwik + About Matomo + About Matomo 99 @@ -3309,8 +3309,8 @@ System Summary - About Piwik - About Piwik + About Matomo + About Matomo 99 @@ -3328,8 +3328,8 @@ Latest Marketplace Updates - About Piwik - About Piwik + About Matomo + About Matomo 99 @@ -3347,8 +3347,8 @@ Welcome! - About Piwik - About Piwik + About Matomo + About Matomo 99 @@ -3366,8 +3366,8 @@ Premium Features & Services for Piwik - About Piwik - About Piwik + About Matomo + About Matomo 99 @@ -3385,8 +3385,8 @@ Support Piwik! - About Piwik - About Piwik + About Matomo + About Matomo 99 @@ -3423,8 +3423,8 @@ Piwik.org Blog - About Piwik - About Piwik + About Matomo + About Matomo 99 @@ -3461,8 +3461,8 @@ System Check - About Piwik - About Piwik + About Matomo + About Matomo 99 diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_row_evolution_graph__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_row_evolution_graph__ScheduledReports.generateReport_week.original.html index 4302aed3be..1d3cdbb1c7 100644 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_row_evolution_graph__ScheduledReports.generateReport_week.original.html +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_row_evolution_graph__ScheduledReports.generateReport_week.original.html @@ -60,7 +60,7 @@

Powered by - Piwik Analytics + Piwik Analytics
The leading open analytics platform that respects your privacy.

diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html index 8a6c167ef7..74334d0e47 100644 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html @@ -7114,7 +7114,7 @@

Powered by - Piwik Analytics + Piwik Analytics
The leading open analytics platform that respects your privacy.

diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html index 552ff56ce2..1893834e50 100644 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html @@ -6750,7 +6750,7 @@

Powered by - Piwik Analytics + Piwik Analytics
The leading open analytics platform that respects your privacy.

diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CorePluginsAdmin.getSystemSettings.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CorePluginsAdmin.getSystemSettings.xml index fa92d64f22..4edaf88364 100644 --- a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CorePluginsAdmin.getSystemSettings.xml +++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CorePluginsAdmin.getSystemSettings.xml @@ -20,7 +20,7 @@ Latest beta 2.X (Long Term Support version) - While our <a href='?module=Proxy&action=redirect&url=https://piwik.org/participate/development-process/' target='_blank'>development process</a> includes thousands of automated tests, Beta Testers play a key role in achieving the "No bug policy" in Piwik.<br/>If Piwik is a critical part of your business, we recommend you use the latest stable release. If you use the latest beta and you find a bug or have a suggestion, please <a href='?module=Proxy&action=redirect&url=https%3A%2F%2Fdeveloper.piwik.org%2Fguides%2Fcore-team-workflow%23influencing-piwik-development' target='_blank'>see here</a>.<br />LTS (Long Term Support) versions receive only security and bug fixes. + While our <a href='?module=Proxy&action=redirect&url=https://matomo.org/participate/development-process/' target='_blank'>development process</a> includes thousands of automated tests, Beta Testers play a key role in achieving the "No bug policy" in Piwik.<br/>If Piwik is a critical part of your business, we recommend you use the latest stable release. If you use the latest beta and you find a bug or have a suggestion, please <a href='?module=Proxy&action=redirect&url=https%3A%2F%2Fdeveloper.matomo.org%2Fguides%2Fcore-team-workflow%23influencing-piwik-development' target='_blank'>see here</a>.<br />LTS (Long Term Support) versions receive only security and bug fixes. Release channel @@ -156,7 +156,7 @@ Another line trackToPiwik - Send usage data to Piwik.org + Send usage data to Matomo.org 0 1 boolean @@ -164,10 +164,10 @@ Another line - If enabled, anonymized usage data will be sent to demo-anonymous.piwik.org and the tracked data can be viewed there (the data is public). The collected data is used to improve Piwik. Thank you for making Piwik better! + If enabled, anonymized usage data will be sent to demo-anonymous.matomo.org and the tracked data can be viewed there (the data is public). The collected data is used to improve Matomo. Thank you for making Matomo better! - Send anonmyized usage data to the creators of Piwik + Send anonmyized usage data to the creators of Matomo @@ -180,10 +180,10 @@ Another line - If specified, anonymized usage data will be sent to the specified site in this Piwik. + If specified, anonymized usage data will be sent to the specified site in this Matomo. - Send anonymize usage data to this Piwik + Send anonymize usage data to this Matomo @@ -204,19 +204,19 @@ Another line customSiteUrl - Piwik Url + Matomo Url string text - eg. http://example.com/piwik + eg. http://example.com/matomo - Send anonymize usage data to a custom Piwik + Send anonymize usage data to a custom Matomo @@ -230,7 +230,7 @@ Another line eg. "2" - If a URL and Site Id is specified, usage data will be sent to the custom Piwik instance. + If a URL and Site Id is specified, usage data will be sent to the custom Matomo instance. diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CorePluginsAdmin.getUserSettings.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CorePluginsAdmin.getUserSettings.xml index 385469b2df..8ce4b17685 100644 --- a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CorePluginsAdmin.getUserSettings.xml +++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CorePluginsAdmin.getUserSettings.xml @@ -65,7 +65,7 @@ userTrackingEnabled - Piwik usage tracking enabled + Matomo usage tracking enabled 1 1 boolean diff --git a/tests/PHPUnit/System/expected/test_noVisit__CorePluginsAdmin.getSystemSettings.xml b/tests/PHPUnit/System/expected/test_noVisit__CorePluginsAdmin.getSystemSettings.xml index fa92d64f22..4edaf88364 100644 --- a/tests/PHPUnit/System/expected/test_noVisit__CorePluginsAdmin.getSystemSettings.xml +++ b/tests/PHPUnit/System/expected/test_noVisit__CorePluginsAdmin.getSystemSettings.xml @@ -20,7 +20,7 @@ Latest beta 2.X (Long Term Support version) - While our <a href='?module=Proxy&action=redirect&url=https://piwik.org/participate/development-process/' target='_blank'>development process</a> includes thousands of automated tests, Beta Testers play a key role in achieving the "No bug policy" in Piwik.<br/>If Piwik is a critical part of your business, we recommend you use the latest stable release. If you use the latest beta and you find a bug or have a suggestion, please <a href='?module=Proxy&action=redirect&url=https%3A%2F%2Fdeveloper.piwik.org%2Fguides%2Fcore-team-workflow%23influencing-piwik-development' target='_blank'>see here</a>.<br />LTS (Long Term Support) versions receive only security and bug fixes. + While our <a href='?module=Proxy&action=redirect&url=https://matomo.org/participate/development-process/' target='_blank'>development process</a> includes thousands of automated tests, Beta Testers play a key role in achieving the "No bug policy" in Piwik.<br/>If Piwik is a critical part of your business, we recommend you use the latest stable release. If you use the latest beta and you find a bug or have a suggestion, please <a href='?module=Proxy&action=redirect&url=https%3A%2F%2Fdeveloper.matomo.org%2Fguides%2Fcore-team-workflow%23influencing-piwik-development' target='_blank'>see here</a>.<br />LTS (Long Term Support) versions receive only security and bug fixes. Release channel @@ -156,7 +156,7 @@ Another line trackToPiwik - Send usage data to Piwik.org + Send usage data to Matomo.org 0 1 boolean @@ -164,10 +164,10 @@ Another line - If enabled, anonymized usage data will be sent to demo-anonymous.piwik.org and the tracked data can be viewed there (the data is public). The collected data is used to improve Piwik. Thank you for making Piwik better! + If enabled, anonymized usage data will be sent to demo-anonymous.matomo.org and the tracked data can be viewed there (the data is public). The collected data is used to improve Matomo. Thank you for making Matomo better! - Send anonmyized usage data to the creators of Piwik + Send anonmyized usage data to the creators of Matomo @@ -180,10 +180,10 @@ Another line - If specified, anonymized usage data will be sent to the specified site in this Piwik. + If specified, anonymized usage data will be sent to the specified site in this Matomo. - Send anonymize usage data to this Piwik + Send anonymize usage data to this Matomo @@ -204,19 +204,19 @@ Another line customSiteUrl - Piwik Url + Matomo Url string text - eg. http://example.com/piwik + eg. http://example.com/matomo - Send anonymize usage data to a custom Piwik + Send anonymize usage data to a custom Matomo @@ -230,7 +230,7 @@ Another line eg. "2" - If a URL and Site Id is specified, usage data will be sent to the custom Piwik instance. + If a URL and Site Id is specified, usage data will be sent to the custom Matomo instance. diff --git a/tests/PHPUnit/System/expected/test_noVisit__CorePluginsAdmin.getUserSettings.xml b/tests/PHPUnit/System/expected/test_noVisit__CorePluginsAdmin.getUserSettings.xml index 385469b2df..8ce4b17685 100644 --- a/tests/PHPUnit/System/expected/test_noVisit__CorePluginsAdmin.getUserSettings.xml +++ b/tests/PHPUnit/System/expected/test_noVisit__CorePluginsAdmin.getUserSettings.xml @@ -65,7 +65,7 @@ userTrackingEnabled - Piwik usage tracking enabled + Matomo usage tracking enabled 1 1 boolean diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml index 2e710b0d90..7c7cbee48d 100644 --- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml @@ -8,7 +8,7 @@ CustomVariables getCustomVariablesValuesFromNameId Custom Variable value - This report contains information about your Custom Variables. Click on a variable name to see the distribution of the values. <br /> For more information about Custom Variables in general, read the <a href="https://piwik.org/docs/custom-variables/" rel="noreferrer" target="_blank">Custom Variables documentation on piwik.org</a> + This report contains information about your Custom Variables. Click on a variable name to see the distribution of the values. <br /> For more information about Custom Variables in general, read the <a href="https://matomo.org/docs/custom-variables/" rel="noreferrer" target="_blank">Custom Variables documentation on piwik.org</a> 1 Visits diff --git a/tests/PHPUnit/Unit/AssetManager/scripts/ExpectedMergeResultCore.js b/tests/PHPUnit/Unit/AssetManager/scripts/ExpectedMergeResultCore.js index 823fc76cdb..08c20ce37a 100644 --- a/tests/PHPUnit/Unit/AssetManager/scripts/ExpectedMergeResultCore.js +++ b/tests/PHPUnit/Unit/AssetManager/scripts/ExpectedMergeResultCore.js @@ -1,4 +1,4 @@ -/* Piwik Javascript - cb={{{CACHE-BUSTER-JS}}}*/ +/* Matomo Javascript - cb={{{CACHE-BUSTER-JS}}}*/ if(typeof SimpleObject!=='object'){SimpleObject=(function(){var privateVar;function privateMethod(param){privateVar=param;} return{publicMethod:function(){privateMethod('val');}}}());} diff --git a/tests/PHPUnit/Unit/AssetManager/scripts/ExpectedMergeResultNonCore.js b/tests/PHPUnit/Unit/AssetManager/scripts/ExpectedMergeResultNonCore.js index f004dcc501..f1cf246932 100644 --- a/tests/PHPUnit/Unit/AssetManager/scripts/ExpectedMergeResultNonCore.js +++ b/tests/PHPUnit/Unit/AssetManager/scripts/ExpectedMergeResultNonCore.js @@ -1,3 +1,3 @@ -/* Piwik Javascript - cb={{{CACHE-BUSTER-JS}}}*/ +/* Matomo Javascript - cb={{{CACHE-BUSTER-JS}}}*/ alert('test'); \ No newline at end of file diff --git a/tests/PHPUnit/Unit/AssetManager/stylesheets/ExpectedMergeResult.css b/tests/PHPUnit/Unit/AssetManager/stylesheets/ExpectedMergeResult.css index 903190bb02..6637cea7b7 100644 --- a/tests/PHPUnit/Unit/AssetManager/stylesheets/ExpectedMergeResult.css +++ b/tests/PHPUnit/Unit/AssetManager/stylesheets/ExpectedMergeResult.css @@ -1,5 +1,5 @@ /* compile_me_once={{{CACHE-BUSTER-JS}}} */ -/* Piwik CSS file is compiled with Less. You may be interested in writing a custom Theme for Piwik! */ +/* Matomo CSS file is compiled with Less. You may be interested in writing a custom Theme for Matomo! */ #page #header { color:white; } #footer { color:red; } .box { diff --git a/tests/PHPUnit/Unit/ConfigTest.php b/tests/PHPUnit/Unit/ConfigTest.php index d92e1525b6..afea25a47a 100644 --- a/tests/PHPUnit/Unit/ConfigTest.php +++ b/tests/PHPUnit/Unit/ConfigTest.php @@ -148,7 +148,7 @@ class ConfigTest extends \PHPUnit_Framework_TestCase public function getDumpConfigData() { $header = "; DO NOT REMOVE THIS LINE\n" . - "; file automatically generated or modified by Piwik; you can manually override the default values in global.ini.php by redefining them in this file.\n"; + "; file automatically generated or modified by Matomo; you can manually override the default values in global.ini.php by redefining them in this file.\n"; return array( // Test name, array( diff --git a/tests/PHPUnit/Unit/Tracker/ResponseTest.php b/tests/PHPUnit/Unit/Tracker/ResponseTest.php index 597ee513db..8ef48ed394 100644 --- a/tests/PHPUnit/Unit/Tracker/ResponseTest.php +++ b/tests/PHPUnit/Unit/Tracker/ResponseTest.php @@ -65,7 +65,7 @@ class ResponseTest extends \PHPUnit_Framework_TestCase $content = $this->response->getOutput(); - $this->assertContains('Piwik › Error', $content); + $this->assertContains('Matomo › Error', $content); $this->assertContains('

My Custom Message', $content); } @@ -127,17 +127,17 @@ class ResponseTest extends \PHPUnit_Framework_TestCase $tracker->setCountOfLoggedRequests(0); $this->response->outputResponse($tracker); - $this->assertEquals("This resource is part of Piwik. Keep full control of your data with the leading free and open source digital analytics platform for web and mobile.", + $this->assertEquals("This resource is part of Matomo. Keep full control of your data with the leading free and open source digital analytics platform for web and mobile.", $this->response->getOutput()); } public function test_getMessageFromException_ShouldNotOutputAnyDetails_IfErrorContainsDbCredentials() { $message = $this->response->getMessageFromException(new Exception('Test Message', 1044)); - $this->assertStringStartsWith("Error while connecting to the Piwik database", $message); + $this->assertStringStartsWith("Error while connecting to the Matomo database", $message); $message = $this->response->getMessageFromException(new Exception('Test Message', 42000)); - $this->assertStringStartsWith("Error while connecting to the Piwik database", $message); + $this->assertStringStartsWith("Error while connecting to the Matomo database", $message); } public function test_getMessageFromException_ShouldReturnMessageAndTrace_InCaseIsCli() -- cgit v1.2.3