Use rebranded components (#15253)

9 files changed, 24 insertions, 25 deletions

diff --git a/tests/PHPUnit/Fixtures/FewVisitsWithSetVisitorId.php b/tests/PHPUnit/Fixtures/FewVisitsWithSetVisitorId.php
index b182324bb6..f678ff0e56 100644
--- a/tests/PHPUnit/Fixtures/FewVisitsWithSetVisitorId.php
+++ b/tests/PHPUnit/Fixtures/FewVisitsWithSetVisitorId.php
@@ -9,9 +9,8 @@ namespace Piwik\Tests\Fixtures;
 
 use Piwik\Date;
 use Piwik\Plugins\Goals\API;
-use Piwik\Tracker\Visit;
 use Piwik\Tests\Framework\Fixture;
-use PiwikTracker;
+use MatomoTracker;
 use Exception;
 
 /**
@@ -193,7 +192,7 @@ class FewVisitsWithSetVisitorId extends Fixture
 
     }
 
-    private function settingInvalidVisitorIdShouldThrow(PiwikTracker $t)
+    private function settingInvalidVisitorIdShouldThrow(MatomoTracker $t)
     {
         try {
             $t->setVisitorId('test');
@@ -215,7 +214,7 @@ class FewVisitsWithSetVisitorId extends Fixture
         }
     }
 
-    private function settingInvalidUserIdShouldThrow(PiwikTracker $t)
+    private function settingInvalidUserIdShouldThrow(MatomoTracker $t)
     {
         try {
             $t->setUserId('');
diff --git a/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php b/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php
index 39f5129cdd..a34fd1f3c4 100644
--- a/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php
+++ b/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php
@@ -129,13 +129,13 @@ class ManyVisitsWithGeoIP extends Fixture
 
     /**
      * Insert a new visit into the database.
-     * @param \PiwikTracker $t          The tracker to record the visits on
+     * @param \MatomoTracker $t          The tracker to record the visits on
      * @param int $fixtureCounter       Number of times this fixture has been run 
      * @param int $visitorCounter       Visitor counter within this execution of the fixture
      * @param boolean $doBulk           Should this visit be left for bulk insert later, or processed now?
      * @param array $params             Other params as required to set up the visit
      */
-    protected function trackVisit(\PiwikTracker $t, $fixtureCounter, $visitorCounter, $doBulk, array $params)
+    protected function trackVisit(\MatomoTracker $t, $fixtureCounter, $visitorCounter, $doBulk, array $params)
     {
         $setIp = isset($params['setIp']) && $params['setIp'];
 
diff --git a/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIPAndEcommerce.php b/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIPAndEcommerce.php
index db094351a5..cb9e24c543 100644
--- a/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIPAndEcommerce.php
+++ b/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIPAndEcommerce.php
@@ -12,13 +12,13 @@ class ManyVisitsWithGeoIPAndEcommerce extends ManyVisitsWithGeoIP
 {
     /**
      * Insert a new visit into the database.
-     * @param \PiwikTracker $t          The tracker to record the visits on
+     * @param \MatomoTracker $t          The tracker to record the visits on
      * @param int $fixtureCounter       Number of times this fixture has been run
      * @param int $visitorCounter       Visitor counter within this execution of the fixture
      * @param boolean $doBulk           Should this visit be left for bulk insert later, or processed now?
      * @param array $params             Other params as required to set up the visit
      */
-    protected function trackVisit(\PiwikTracker $t, $fixtureCounter, $visitorCounter, $doBulk, array $params)
+    protected function trackVisit(\MatomoTracker $t, $fixtureCounter, $visitorCounter, $doBulk, array $params)
     {
         parent::trackVisit($t, $fixtureCounter, $visitorCounter, $doBulk, $params);
 
diff --git a/tests/PHPUnit/Fixtures/ManyVisitsWithMockLocationProvider.php b/tests/PHPUnit/Fixtures/ManyVisitsWithMockLocationProvider.php
index 887f542d7c..78f77c134e 100644
--- a/tests/PHPUnit/Fixtures/ManyVisitsWithMockLocationProvider.php
+++ b/tests/PHPUnit/Fixtures/ManyVisitsWithMockLocationProvider.php
@@ -138,7 +138,7 @@ class ManyVisitsWithMockLocationProvider extends Fixture
         $this->trackOrders($t);
     }
 
-    private function trackActions(\PiwikTracker $t, &$visitorCounter, $actionType, $userAgents, $resolutions,
+    private function trackActions(\MatomoTracker $t, &$visitorCounter, $actionType, $userAgents, $resolutions,
                                   $referrers = null, $customVars = null)
     {
         for ($i = 0; $i != 5; ++$i, ++$visitorCounter) {
@@ -207,7 +207,7 @@ class ManyVisitsWithMockLocationProvider extends Fixture
         }
     }
 
-    private function trackAction(\PiwikTracker $t, $actionType, $visitorCounter, $actionNum)
+    private function trackAction(\MatomoTracker $t, $actionType, $visitorCounter, $actionNum)
     {
         if ($actionType == 'pageview') {
             self::checkResponse($t->doTrackPageView(
diff --git a/tests/PHPUnit/Fixtures/OneVisitorTwoVisits.php b/tests/PHPUnit/Fixtures/OneVisitorTwoVisits.php
index ed4a717aa8..a4945fcaba 100644
--- a/tests/PHPUnit/Fixtures/OneVisitorTwoVisits.php
+++ b/tests/PHPUnit/Fixtures/OneVisitorTwoVisits.php
@@ -192,7 +192,7 @@ class OneVisitorTwoVisits extends Fixture
         $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(1)->getDatetime());
         $t->setUrl('http://example.org/store/purchase.htm');
         $t->setUrlReferrer('http://search.yahoo.com/search?p=purchase');
-        // Temporary, until we implement 1st party cookies in PiwikTracker
+        // Temporary, until we implement 1st party cookies in MatomoTracker
         $t->DEBUG_APPEND_URL = '&_idvc=2';
 
         // Goal Tracking URL matching, testing custom referrer including keyword
diff --git a/tests/PHPUnit/Fixtures/SomeVisitsCustomVariablesCampaignsNotHeuristics.php b/tests/PHPUnit/Fixtures/SomeVisitsCustomVariablesCampaignsNotHeuristics.php
index d8bd02903f..22c2ff5c20 100644
--- a/tests/PHPUnit/Fixtures/SomeVisitsCustomVariablesCampaignsNotHeuristics.php
+++ b/tests/PHPUnit/Fixtures/SomeVisitsCustomVariablesCampaignsNotHeuristics.php
@@ -11,7 +11,7 @@ use Piwik\Date;
 use Piwik\Plugins\Goals\API;
 use Piwik\Tests\Framework\Fixture;
 use Piwik\Tests\Framework\TestingEnvironmentVariables;
-use PiwikTracker;
+use MatomoTracker;
 
 /**
  * Add one site and track many visits with custom variables & campaign IDs and
@@ -211,7 +211,7 @@ class SomeVisitsCustomVariablesCampaignsNotHeuristics extends Fixture
     private function getFirstPartyCookieDomainHash()
     {
         $host = \Piwik\Url::getHost();
-        $cookiePath = PiwikTracker::DEFAULT_COOKIE_PATH;
+        $cookiePath = MatomoTracker::DEFAULT_COOKIE_PATH;
         return substr(sha1( $host . $cookiePath), 0, 4);
     }
 
@@ -219,7 +219,7 @@ class SomeVisitsCustomVariablesCampaignsNotHeuristics extends Fixture
      * Test setting/getting the first party cookie via the PHP Tracking Client
      * @param $t
      */
-    private function testFirstPartyCookies(PiwikTracker $t)
+    private function testFirstPartyCookies(MatomoTracker $t)
     {
         $domainHash = $this->getFirstPartyCookieDomainHash();
         $idCookieName = '_pk_id_1_' . $domainHash;
diff --git a/tests/PHPUnit/Fixtures/SomeVisitsManyPageviewsWithTransitions.php b/tests/PHPUnit/Fixtures/SomeVisitsManyPageviewsWithTransitions.php
index 3a91bf6a91..21f011f75c 100644
--- a/tests/PHPUnit/Fixtures/SomeVisitsManyPageviewsWithTransitions.php
+++ b/tests/PHPUnit/Fixtures/SomeVisitsManyPageviewsWithTransitions.php
@@ -9,7 +9,7 @@ namespace Piwik\Tests\Fixtures;
 
 use Piwik\Date;
 use Piwik\Tests\Framework\Fixture;
-use PiwikTracker;
+use MatomoTracker;
 
 /**
  * Adds one site and tracks a couple visits with many pageviews. The
@@ -137,7 +137,7 @@ class SomeVisitsManyPageviewsWithTransitions extends Fixture
         $prefix = $prefixes[$this->prefixCounter % 4];
         $this->prefixCounter = $this->prefixCounter + 1;
 
-        /** @var $visit PiwikTracker */
+        /** @var $visit MatomoTracker */
         $visit->setUrl($prefix . 'example.org/' . $path);
         $visit->setForceVisitDateTime(Date::factory($dateTime)->addHour($timeOffset)->getDatetime());
 
diff --git a/tests/PHPUnit/Fixtures/ThreeVisitsWithCustomEvents.php b/tests/PHPUnit/Fixtures/ThreeVisitsWithCustomEvents.php
index 078a315078..0096500959 100644
--- a/tests/PHPUnit/Fixtures/ThreeVisitsWithCustomEvents.php
+++ b/tests/PHPUnit/Fixtures/ThreeVisitsWithCustomEvents.php
@@ -10,7 +10,7 @@ namespace Piwik\Tests\Fixtures;
 use Piwik\Date;
 use Piwik\Plugins\Goals\API as APIGoals;
 use Piwik\Tests\Framework\Fixture;
-use PiwikTracker;
+use MatomoTracker;
 
 /**
  * Tracks custom events
@@ -82,13 +82,13 @@ class ThreeVisitsWithCustomEvents extends Fixture
 
     }
 
-    private function moveTimeForward(PiwikTracker $vis, $minutes)
+    private function moveTimeForward(MatomoTracker $vis, $minutes)
     {
         $hour = $minutes / 60;
         return $vis->setForceVisitDateTime(Date::factory($this->dateTime)->addHour($hour)->getDatetime());
     }
 
-    protected function trackEventWithoutUrl(PiwikTracker $vis)
+    protected function trackEventWithoutUrl(MatomoTracker $vis)
     {
         $url = $vis->pageUrl;
         $vis->setUrl('');
@@ -108,7 +108,7 @@ class ThreeVisitsWithCustomEvents extends Fixture
         $vis->setUrl($url);
     }
 
-    protected function trackMusicPlaying(PiwikTracker $vis)
+    protected function trackMusicPlaying(MatomoTracker $vis)
     {
         $this->moveTimeForward($vis, 1);
         $this->setMusicEventCustomVar($vis);
@@ -129,7 +129,7 @@ class ThreeVisitsWithCustomEvents extends Fixture
         self::checkResponse($vis->doTrackEvent('Music', 'playEnd', 'La fiancée de l\'eau'));
     }
 
-    protected function trackMusicRatings(PiwikTracker $vis)
+    protected function trackMusicRatings(MatomoTracker $vis)
     {
         $this->moveTimeForward($vis, 5);
         $this->setMusicEventCustomVar($vis);
@@ -140,7 +140,7 @@ class ThreeVisitsWithCustomEvents extends Fixture
         self::checkResponse($vis->doTrackEvent('Music', 'rating', 'La fiancée de l\'eau', 10));
     }
 
-    protected function trackMovieWatchingIncludingInterval(PiwikTracker $vis)
+    protected function trackMovieWatchingIncludingInterval(MatomoTracker $vis)
     {
         // First a pageview so the time on page is tracked properly
         $this->moveTimeForward($vis, 30);
@@ -208,14 +208,14 @@ class ThreeVisitsWithCustomEvents extends Fixture
         self::checkResponse($vis->doTrackEvent('Movie', 'Purchase'));
     }
 
-    private function setMusicEventCustomVar(PiwikTracker $vis)
+    private function setMusicEventCustomVar(MatomoTracker $vis)
     {
         $vis->setCustomVariable($id = 1, $name = 'Page Scope Custom var', $value = 'should not appear in events report', $scope = 'page');
         $vis->setCustomVariable($id = 1, $name = 'album', $value = 'En attendant les caravanes...', $scope = 'event');
         $vis->setCustomVariable($id = 1, $name = 'genre', $value = 'World music', $scope = 'event');
     }
 
-    private function setMovieEventCustomVar(PiwikTracker $vis)
+    private function setMovieEventCustomVar(MatomoTracker $vis)
     {
         $vis->setCustomVariable($id = 1, $name = 'country', $value = '日本', $scope = 'event');
         $vis->setCustomVariable($id = 2, $name = 'genre', $value = 'Greatest animated films', $scope = 'event');
diff --git a/tests/PHPUnit/Fixtures/TwoSitesTwoVisitorsDifferentDays.php b/tests/PHPUnit/Fixtures/TwoSitesTwoVisitorsDifferentDays.php
index 1f6afab1b8..ba89314897 100644
--- a/tests/PHPUnit/Fixtures/TwoSitesTwoVisitorsDifferentDays.php
+++ b/tests/PHPUnit/Fixtures/TwoSitesTwoVisitorsDifferentDays.php
@@ -132,7 +132,7 @@ class TwoSitesTwoVisitorsDifferentDays extends Fixture
 
             $visitorB->setForceVisitDateTime(Date::factory($dateTime)->addHour($hoursOffset)->getDatetime());
             // visitor_returning is set to 1 only when visit count more than 1
-            // Temporary, until we implement 1st party cookies in PiwikTracker
+            // Temporary, until we implement 1st party cookies in MatomoTracker
             $visitorB->DEBUG_APPEND_URL .= '&_idvc=2&_viewts=' . Date::factory($dateTime)->getTimestamp();
 
             $protocol = (0 === $days % 2) ? 'http' : 'https';