Converting to namespace: Period, Site

11 files changed, 38 insertions, 23 deletions

diff --git a/tests/PHPUnit/BaseFixture.php b/tests/PHPUnit/BaseFixture.php
index 82b1b956cc..d738f7ae90 100644
--- a/tests/PHPUnit/BaseFixture.php
+++ b/tests/PHPUnit/BaseFixture.php
@@ -8,6 +8,7 @@
 use Piwik\Config;
 use Piwik\Common;
 use Piwik\Access;
+use Piwik\Site;
 
 /**
  * Base type for all integration test fixtures. Integration test fixtures
@@ -71,7 +72,7 @@ abstract class Test_Piwik_BaseFixture extends PHPUnit_Framework_Assert
         );
 
         // Clear the memory Website cache
-        Piwik_Site::clearCache();
+        Site::clearCache();
 
         return $idSite;
     }
diff --git a/tests/PHPUnit/Benchmarks/ArchiveQueryBenchmark.php b/tests/PHPUnit/Benchmarks/ArchiveQueryBenchmark.php
index e6305563cf..f10f258943 100644
--- a/tests/PHPUnit/Benchmarks/ArchiveQueryBenchmark.php
+++ b/tests/PHPUnit/Benchmarks/ArchiveQueryBenchmark.php
@@ -5,6 +5,8 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
+use Piwik\Period;
+
 require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/BenchmarkTestCase.php';
 
 /**
@@ -36,7 +38,7 @@ class ArchiveQueryBenchmark extends BenchmarkTestCase
 
         Piwik_ArchiveProcessor_Rules::$archivingDisabledByTests = true;
         
-        $period = Piwik_Period::factory(self::$fixture->period, Piwik_Date::factory(self::$fixture->date));
+        $period = Period::factory(self::$fixture->period, Piwik_Date::factory(self::$fixture->date));
         $dateRange = $period->getDateStart().','.$period->getDateEnd();
         
         Piwik_VisitsSummary_API::getInstance()->get(self::$fixture->idSite, 'day', $dateRange);
diff --git a/tests/PHPUnit/Core/ArchiveProcessingTest.php b/tests/PHPUnit/Core/ArchiveProcessingTest.php
index a190983ce9..68ec9bb0f4 100644
--- a/tests/PHPUnit/Core/ArchiveProcessingTest.php
+++ b/tests/PHPUnit/Core/ArchiveProcessingTest.php
@@ -1,8 +1,10 @@
 <?php
 use Piwik\Config;
+use Piwik\Period;
 use Piwik\Piwik;
 use Piwik\Common;
 use Piwik\Access;
+use Piwik\Site;
 
 /**
  * Piwik - Open source web analytics
@@ -26,7 +28,7 @@ class ArchiveProcessingTest extends DatabaseTestCase
      * Creates a new website
      *
      * @param string $timezone
-     * @return Piwik_Site
+     * @return Site
      */
     private function _createWebsite($timezone = 'UTC')
     {
@@ -39,8 +41,8 @@ class ArchiveProcessingTest extends DatabaseTestCase
             $excludedQueryParameters = "",
             $timezone);
 
-        Piwik_Site::clearCache();
-        return new Piwik_Site($idSite);
+        Site::clearCache();
+        return new Site($idSite);
     }
 
     /**
@@ -55,7 +57,7 @@ class ArchiveProcessingTest extends DatabaseTestCase
     {
         $site = $this->_createWebsite($siteTimezone);
         $date = Piwik_Date::factory($dateLabel);
-        $period = Piwik_Period::factory($periodLabel, $date);
+        $period = Period::factory($periodLabel, $date);
         $segment = new Piwik_Segment('', $site->getId());
 
 
diff --git a/tests/PHPUnit/Core/PeriodTest.php b/tests/PHPUnit/Core/PeriodTest.php
index c7ab39662b..6021218214 100644
--- a/tests/PHPUnit/Core/PeriodTest.php
+++ b/tests/PHPUnit/Core/PeriodTest.php
@@ -5,6 +5,8 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
+use Piwik\Period;
+
 class PeriodTest extends PHPUnit_Framework_TestCase
 {
     /**
@@ -53,7 +55,7 @@ class PeriodTest extends PHPUnit_Framework_TestCase
      */
     public function testFactoryDay()
     {
-        $period = Piwik_Period::factory('day', Piwik_Date::today());
+        $period = Period::factory('day', Piwik_Date::today());
         $this->assertInstanceOf('Piwik_Period_Day', $period);
     }
 
@@ -63,7 +65,7 @@ class PeriodTest extends PHPUnit_Framework_TestCase
      */
     public function testFactoryMonth()
     {
-        $period = Piwik_Period::factory('month', Piwik_Date::today());
+        $period = Period::factory('month', Piwik_Date::today());
         $this->assertInstanceOf('Piwik_Period_Month', $period);
     }
 
@@ -73,7 +75,7 @@ class PeriodTest extends PHPUnit_Framework_TestCase
      */
     public function testFactoryWeek()
     {
-        $period = Piwik_Period::factory('week', Piwik_Date::today());
+        $period = Period::factory('week', Piwik_Date::today());
         $this->assertInstanceOf('Piwik_Period_Week', $period);
     }
 
@@ -83,7 +85,7 @@ class PeriodTest extends PHPUnit_Framework_TestCase
      */
     public function testFactoryYear()
     {
-        $period = Piwik_Period::factory('year', Piwik_Date::today());
+        $period = Period::factory('year', Piwik_Date::today());
         $this->assertInstanceOf('Piwik_Period_Year', $period);
     }
 
@@ -94,7 +96,7 @@ class PeriodTest extends PHPUnit_Framework_TestCase
     public function testFactoryInvalid()
     {
         try {
-            $period = Piwik_Period::factory('inValid', Piwik_Date::today());
+            $period = Period::factory('inValid', Piwik_Date::today());
         } catch (Exception $e) {
             return;
         }
diff --git a/tests/PHPUnit/DatabaseTestCase.php b/tests/PHPUnit/DatabaseTestCase.php
index edce58a99b..3c4fb971d0 100644
--- a/tests/PHPUnit/DatabaseTestCase.php
+++ b/tests/PHPUnit/DatabaseTestCase.php
@@ -7,6 +7,7 @@
  */
 use Piwik\Config;
 use Piwik\Piwik;
+use Piwik\Site;
 
 /**
  * Tests extending DatabaseTestCase are much slower to run: the setUp will
@@ -67,7 +68,7 @@ class DatabaseTestCase extends PHPUnit_Framework_TestCase
         Piwik_DataTable_Manager::getInstance()->deleteAll();
         Piwik_Option::getInstance()->clearCache();
         Piwik_PDFReports_API::$cache = array();
-        Piwik_Site::clearCache();
+        Site::clearCache();
         Piwik_Tracker_Cache::deleteTrackerCache();
         Config::getInstance()->clear();
         Piwik_DataAccess_ArchiveTableCreator::clear();
diff --git a/tests/PHPUnit/FakeAccess.php b/tests/PHPUnit/FakeAccess.php
index fa8a8b829f..0498531052 100644
--- a/tests/PHPUnit/FakeAccess.php
+++ b/tests/PHPUnit/FakeAccess.php
@@ -5,6 +5,8 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
+use Piwik\Site;
+
 /**
  * FakeAccess for UnitTests
  */
@@ -65,7 +67,7 @@ class FakeAccess
             $websitesAccess = Piwik_SitesManager_API::getInstance()->getAllSitesId();
         }
 
-        $idSites = Piwik_Site::getIdSitesFromIdSitesString($idSites);
+        $idSites = Site::getIdSitesFromIdSitesString($idSites);
         foreach ($idSites as $idsite) {
             if (!in_array($idsite, $websitesAccess)) {
                 throw new Exception("checkUserHasAdminAccess Fake exception // string not to be tested");
diff --git a/tests/PHPUnit/IntegrationTestCase.php b/tests/PHPUnit/IntegrationTestCase.php
index 961f8d02a5..15872d8463 100755
--- a/tests/PHPUnit/IntegrationTestCase.php
+++ b/tests/PHPUnit/IntegrationTestCase.php
@@ -9,6 +9,7 @@ use Piwik\Config;
 use Piwik\Piwik;
 use Piwik\Common;
 use Piwik\Access;
+use Piwik\Site;
 
 require_once PIWIK_INCLUDE_PATH . '/libs/PiwikTracker/PiwikTracker.php';
 
@@ -220,7 +221,7 @@ abstract class IntegrationTestCase extends PHPUnit_Framework_TestCase
         }
         Piwik_DataTable_Manager::getInstance()->deleteAll();
         Piwik_Option::getInstance()->clearCache();
-        Piwik_Site::clearCache();
+        Site::clearCache();
         Piwik_Tracker_Cache::deleteTrackerCache();
         Config::getInstance()->clear();
         Piwik_DataAccess_ArchiveTableCreator::clear();
diff --git a/tests/PHPUnit/Plugins/PDFReportsTest.php b/tests/PHPUnit/Plugins/PDFReportsTest.php
index ce5a7333f7..fcee880403 100644
--- a/tests/PHPUnit/Plugins/PDFReportsTest.php
+++ b/tests/PHPUnit/Plugins/PDFReportsTest.php
@@ -6,6 +6,7 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 use Piwik\Access;
+use Piwik\Site;
 
 require_once 'PDFReports/PDFReports.php';
 
@@ -356,7 +357,7 @@ class PDFReportsTest extends DatabaseTestCase
         $stubbedPDFReportsAPIClass->setValue($stubbedPDFReportsAPI);
 
         // initialize sites 1 and 2
-        Piwik_Site::$infoSites = array(
+        Site::$infoSites = array(
             1 => array('timezone' => 'Europe/Paris'),
             2 => array('timezone' => 'UTC-6.5'),
         );
diff --git a/tests/PHPUnit/Plugins/PrivacyManagerTest.php b/tests/PHPUnit/Plugins/PrivacyManagerTest.php
index 6dcc8821f9..08f12fe066 100755
--- a/tests/PHPUnit/Plugins/PrivacyManagerTest.php
+++ b/tests/PHPUnit/Plugins/PrivacyManagerTest.php
@@ -9,6 +9,7 @@ use Piwik\Archive;
 use Piwik\Config;
 use Piwik\Piwik;
 use Piwik\Common;
+use Piwik\Site;
 
 require_once 'PrivacyManager/PrivacyManager.php';
 
@@ -107,7 +108,7 @@ class PrivacyManagerTest extends IntegrationTestCase
         parent::tearDown();
         Piwik_DataTable_Manager::getInstance()->deleteAll();
         Piwik_Option::getInstance()->clearCache();
-        Piwik_Site::clearCache();
+        Site::clearCache();
         Piwik_Tracker_Cache::deleteTrackerCache();
         Piwik_DataAccess_ArchiveTableCreator::clear();
 
diff --git a/tests/PHPUnit/Plugins/SitesManagerTest.php b/tests/PHPUnit/Plugins/SitesManagerTest.php
index 05cfb24095..74d7ca265d 100644
--- a/tests/PHPUnit/Plugins/SitesManagerTest.php
+++ b/tests/PHPUnit/Plugins/SitesManagerTest.php
@@ -6,6 +6,7 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 use Piwik\Access;
+use Piwik\Site;
 
 class SitesManagerTest extends DatabaseTestCase
 {
@@ -89,9 +90,9 @@ class SitesManagerTest extends DatabaseTestCase
         $this->assertEquals($timezone, $siteInfo['timezone']);
         $this->assertEquals($currency, $siteInfo['currency']);
         $this->assertEquals($ecommerce, $siteInfo['ecommerce']);
-        $this->assertTrue(Piwik_Site::isEcommerceEnabledFor($idsite));
+        $this->assertTrue(Site::isEcommerceEnabledFor($idsite));
         $this->assertEquals($siteSearch, $siteInfo['sitesearch']);
-        $this->assertTrue(Piwik_Site::isSiteSearchEnabledFor($idsite));
+        $this->assertTrue(Site::isSiteSearchEnabledFor($idsite));
         $this->assertEquals($searchKeywordParameters, $siteInfo['sitesearch_keyword_parameters']);
         $this->assertEquals($searchCategoryParameters, $siteInfo['sitesearch_category_parameters']);
         $this->assertEquals($expectedExcludedQueryParameters, $siteInfo['excluded_parameters']);
@@ -868,7 +869,7 @@ class SitesManagerTest extends DatabaseTestCase
 
         // test that when not specified, defaults are set as expected  
         $idsite = Piwik_SitesManager_API::getInstance()->addSite("site1", array('http://example.org'));
-        $site = new Piwik_Site($idsite);
+        $site = new Site($idsite);
         $this->assertEquals('UTC', $site->getTimezone());
         $this->assertEquals('USD', $site->getCurrency());
         $this->assertEquals('', $site->getExcludedQueryParameters());
@@ -906,7 +907,7 @@ class SitesManagerTest extends DatabaseTestCase
         $idsite = Piwik_SitesManager_API::getInstance()->addSite("site1", array('http://example.org'), $ecommerce = 0,
             $siteSearch = 0, $searchKeywordParameters = 'test1,test2', $searchCategoryParameters = 'test2,test1',
             '', '', $newDefaultTimezone);
-        $site = new Piwik_Site($idsite);
+        $site = new Site($idsite);
         $this->assertEquals($newDefaultTimezone, $site->getTimezone());
         $this->assertEquals(date('Y-m-d'), $site->getCreationDate()->toString());
         $this->assertEquals($newDefaultCurrency, $site->getCurrency());
@@ -915,9 +916,9 @@ class SitesManagerTest extends DatabaseTestCase
         $this->assertEquals('test1,test2', $site->getSearchKeywordParameters());
         $this->assertEquals('test2,test1', $site->getSearchCategoryParameters());
         $this->assertFalse($site->isSiteSearchEnabled());
-        $this->assertFalse(Piwik_Site::isSiteSearchEnabledFor($idsite));
+        $this->assertFalse(Site::isSiteSearchEnabledFor($idsite));
         $this->assertFalse($site->isEcommerceEnabled());
-        $this->assertFalse(Piwik_Site::isEcommerceEnabledFor($idsite));
+        $this->assertFalse(Site::isEcommerceEnabledFor($idsite));
     }
 
     /**
diff --git a/tests/PHPUnit/proxy/piwik.php b/tests/PHPUnit/proxy/piwik.php
index b6ccd4711f..8c5fdb27e3 100755
--- a/tests/PHPUnit/proxy/piwik.php
+++ b/tests/PHPUnit/proxy/piwik.php
@@ -12,6 +12,7 @@
 // Wrapping the request inside ob_start() calls to ensure that the Test
 // calling us waits for the full request to process before unblocking
 use Piwik\Config;
+use Piwik\Site;
 
 ob_start();
 
@@ -38,7 +39,7 @@ Piwik_UserCountry_LocationProvider_GeoIp::$geoIPDatabaseDir = 'tests/lib/geoip-f
 Piwik_Tracker::setTestEnvironment();
 Piwik_DataTable_Manager::getInstance()->deleteAll();
 Piwik_Option::getInstance()->clearCache();
-Piwik_Site::clearCache();
+Site::clearCache();
 Piwik_Tracker_Cache::deleteTrackerCache();
 
 include PIWIK_INCLUDE_PATH . '/piwik.php';