Rename Archive\Invalidator to ArchiveInvalidator and Archive\Purger for ArchivePurger for clarity.

6 files changed, 14 insertions, 14 deletions

diff --git a/tests/PHPUnit/Integration/Archive/PurgerTest.php b/tests/PHPUnit/Integration/Archive/PurgerTest.php
index 4111a28ca9..ea0cec316e 100644
--- a/tests/PHPUnit/Integration/Archive/PurgerTest.php
+++ b/tests/PHPUnit/Integration/Archive/PurgerTest.php
@@ -7,7 +7,7 @@
  */
 namespace Piwik\Tests\Integration\Archive;
 
-use Piwik\Archive\Purger;
+use Piwik\Archive\ArchivePurger;
 use Piwik\Config;
 use Piwik\Date;
 use Piwik\Db;
@@ -25,7 +25,7 @@ class PurgerTest extends IntegrationTestCase
     public static $fixture;
 
     /**
-     * @var Purger
+     * @var ArchivePurger
      */
     private $archivePurger;
 
@@ -46,7 +46,7 @@ class PurgerTest extends IntegrationTestCase
         $this->january = self::$fixture->january;
         $this->february = self::$fixture->february;
 
-        $this->archivePurger = new Purger();
+        $this->archivePurger = new ArchivePurger();
         $this->archivePurger->setTodayDate(Date::factory('2015-02-27'));
         $this->archivePurger->setYesterdayDate(Date::factory('2015-02-26'));
         $this->archivePurger->setNow(Date::factory('2015-02-27 08:00:00')->getTimestamp());
diff --git a/tests/PHPUnit/Integration/CronArchiveTest.php b/tests/PHPUnit/Integration/CronArchiveTest.php
index 9397fe511c..c90e64a846 100644
--- a/tests/PHPUnit/Integration/CronArchiveTest.php
+++ b/tests/PHPUnit/Integration/CronArchiveTest.php
@@ -9,7 +9,7 @@
 namespace Piwik\Tests\Integration;
 
 use Piwik\CronArchive;
-use Piwik\Archive\Invalidator;
+use Piwik\Archive\ArchiveInvalidator;
 use Piwik\Date;
 use Piwik\Db;
 use Piwik\Plugins\CoreAdminHome\tests\Framework\Mock\API;
@@ -46,7 +46,7 @@ class CronArchiveTest extends IntegrationTestCase
 
     public function test_getColumnNamesFromTable()
     {
-        $ar = new Invalidator();
+        $ar = new ArchiveInvalidator();
         $ar->rememberToInvalidateArchivedReportsLater(1, Date::factory('2014-04-05'));
         $ar->rememberToInvalidateArchivedReportsLater(2, Date::factory('2014-04-05'));
         $ar->rememberToInvalidateArchivedReportsLater(2, Date::factory('2014-04-06'));
diff --git a/tests/PHPUnit/Integration/DataAccess/ArchiveInvalidatorTest.php b/tests/PHPUnit/Integration/DataAccess/ArchiveInvalidatorTest.php
index 24e178b153..7847abc202 100644
--- a/tests/PHPUnit/Integration/DataAccess/ArchiveInvalidatorTest.php
+++ b/tests/PHPUnit/Integration/DataAccess/ArchiveInvalidatorTest.php
@@ -11,17 +11,17 @@ namespace Piwik\Tests\Integration\DataAccess;
 use Piwik\Date;
 use Piwik\Option;
 use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
-use Piwik\Archive\Invalidator;
+use Piwik\Archive\ArchiveInvalidator;
 
 /**
  * @group Archiver
- * @group Invalidator
+ * @group ArchiveInvalidator
  * @group DataAccess
  */
 class ArchiveInvalidatorTest extends IntegrationTestCase
 {
     /**
-     * @var Invalidator
+     * @var ArchiveInvalidator
      */
     private $invalidator;
 
@@ -29,7 +29,7 @@ class ArchiveInvalidatorTest extends IntegrationTestCase
     {
         parent::setUp();
 
-        $this->invalidator = new Invalidator();
+        $this->invalidator = new ArchiveInvalidator();
     }
 
     public function test_rememberToInvalidateArchivedReportsLater_shouldCreateAnEntryInCaseThereIsNoneYet()
diff --git a/tests/PHPUnit/Integration/Tracker/VisitTest.php b/tests/PHPUnit/Integration/Tracker/VisitTest.php
index ed767b1ea0..919a918516 100644
--- a/tests/PHPUnit/Integration/Tracker/VisitTest.php
+++ b/tests/PHPUnit/Integration/Tracker/VisitTest.php
@@ -11,7 +11,7 @@ namespace Piwik\Tests\Integration\Tracker;
 use Piwik\Access;
 use Piwik\Cache;
 use Piwik\CacheId;
-use Piwik\Archive\Invalidator;
+use Piwik\Archive\ArchiveInvalidator;
 use Piwik\Date;
 use Piwik\Network\IPUtils;
 use Piwik\Plugin\Manager;
@@ -370,7 +370,7 @@ class VisitTest extends IntegrationTestCase
 
         $visit->handle();
 
-        $archive = new Invalidator();
+        $archive = new ArchiveInvalidator();
         $remembered = $archive->getRememberedArchivedReportsThatShouldBeInvalidated();
 
         $this->assertSame($expectedRemeberedArchivedReports, $remembered);
diff --git a/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysConversionsTest.php b/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysConversionsTest.php
index 3c1509f0c6..7e9a576b71 100755
--- a/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysConversionsTest.php
+++ b/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysConversionsTest.php
@@ -9,7 +9,7 @@ namespace Piwik\Tests\System;
 
 use Piwik\Archive;
 use Piwik\Cache;
-use Piwik\Archive\Invalidator;
+use Piwik\Archive\ArchiveInvalidator;
 use Piwik\Option;
 use Piwik\Plugins\Goals\Archiver;
 use Piwik\Segment;
@@ -172,7 +172,7 @@ class TwoVisitorsTwoWebsitesDifferentDaysConversionsTest extends SystemTestCase
         $this->assertEquals(array(self::$fixture->idSite1, self::$fixture->idSite2),
                             $cache->fetch('Archive.SiteIdsOfRememberedReportsInvalidated'));
 
-        $invalidator = new Invalidator();
+        $invalidator = new ArchiveInvalidator();
 
         self::$fixture->trackVisits();
 
diff --git a/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchVisitorTypeTest.php b/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchVisitorTypeTest.php
index 4a74c954bc..77bb4f8dac 100755
--- a/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchVisitorTypeTest.php
+++ b/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchVisitorTypeTest.php
@@ -8,7 +8,7 @@
 namespace Piwik\Tests\System;
 
 use Piwik\Common;
-use Piwik\Archive\Invalidator;
+use Piwik\Archive\ArchiveInvalidator;
 use Piwik\CronArchive\SitesToReprocessDistributedList;
 use Piwik\Db;
 use Piwik\Tests\Framework\TestCase\SystemTestCase;