Refactor class Piwik to \Piwik\Core\Piwik

58 files changed, 123 insertions, 38 deletions

diff --git a/core/API/DocumentationGenerator.php b/core/API/DocumentationGenerator.php
index bc3dcf8b01..f4a8cd387f 100644
--- a/core/API/DocumentationGenerator.php
+++ b/core/API/DocumentationGenerator.php
@@ -8,6 +8,7 @@
  * @category Piwik
  * @package Piwik
  */
+use Piwik\Core\Piwik;
 
 /**
  * @package Piwik
diff --git a/core/API/Request.php b/core/API/Request.php
index ac066be7c2..56d12ecba7 100644
--- a/core/API/Request.php
+++ b/core/API/Request.php
@@ -8,6 +8,7 @@
  * @category Piwik
  * @package Piwik
  */
+use Piwik\Core\Piwik;
 
 /**
  * An API request is the object used to make a call to the API and get the result.
diff --git a/core/API/ResponseBuilder.php b/core/API/ResponseBuilder.php
index d38a722b1e..bdac6a6488 100644
--- a/core/API/ResponseBuilder.php
+++ b/core/API/ResponseBuilder.php
@@ -8,6 +8,7 @@
  * @category Piwik
  * @package Piwik
  */
+use Piwik\Core\Piwik;
 
 /**
  * @package Piwik
diff --git a/core/Archive.php b/core/Archive.php
index 272d1e5322..9afd5870f1 100644
--- a/core/Archive.php
+++ b/core/Archive.php
@@ -8,6 +8,7 @@
  * @category Piwik
  * @package Piwik
  */
+use Piwik\Core\Piwik;
 
 /**
  * The archive object is used to query specific data for a day or a period of statistics for a given website.
diff --git a/core/ArchiveProcessor.php b/core/ArchiveProcessor.php
index 21f18e99de..bb42ca1b58 100644
--- a/core/ArchiveProcessor.php
+++ b/core/ArchiveProcessor.php
@@ -9,6 +9,7 @@
  * @package Piwik
  */
 use Piwik\Core\Config;
+use Piwik\Core\Piwik;
 
 /**
  * The ArchiveProcessor class is used by the Archive object to make sure the given Archive is processed and available in the DB.
diff --git a/core/ArchiveProcessor/Period.php b/core/ArchiveProcessor/Period.php
index e16cf8956d..8a25b5d385 100644
--- a/core/ArchiveProcessor/Period.php
+++ b/core/ArchiveProcessor/Period.php
@@ -8,6 +8,7 @@
  * @category Piwik
  * @package Piwik
  */
+use Piwik\Core\Piwik;
 
 /**
  * This class provides generic methods to archive data for a period (week / month / year).
diff --git a/core/ArchiveProcessor/Rules.php b/core/ArchiveProcessor/Rules.php
index 708ca72b9d..0d27b89059 100644
--- a/core/ArchiveProcessor/Rules.php
+++ b/core/ArchiveProcessor/Rules.php
@@ -9,6 +9,7 @@
  * @package Piwik
  */
 use Piwik\Core\Config;
+use Piwik\Core\Piwik;
 
 /**
  * This class contains Archiving rules/logic which are used in several places
diff --git a/core/AssetManager.php b/core/AssetManager.php
index 6f305bab08..87dee1a8d2 100644
--- a/core/AssetManager.php
+++ b/core/AssetManager.php
@@ -9,6 +9,7 @@
  * @package Piwik
  */
 use Piwik\Core\Config;
+use Piwik\Core\Piwik;
 
 /**
  * @see libs/jsmin/jsmin.php
diff --git a/core/CacheFile.php b/core/CacheFile.php
index 03bd0abedc..faa2b59405 100644
--- a/core/CacheFile.php
+++ b/core/CacheFile.php
@@ -8,6 +8,7 @@
  * @category Piwik
  * @package Piwik
  */
+use Piwik\Core\Piwik;
 
 /**
  * Code originally inspired from OpenX
diff --git a/core/Controller.php b/core/Controller.php
index 14dc7e5628..b2e4dfa295 100644
--- a/core/Controller.php
+++ b/core/Controller.php
@@ -9,6 +9,7 @@
  * @package Piwik
  */
 use Piwik\Core\Config;
+use Piwik\Core\Piwik;
 
 /**
  * Parent class of all plugins Controllers (located in /plugins/PluginName/Controller.php
diff --git a/core/Controller/Admin.php b/core/Controller/Admin.php
index 16b633a0e9..91341107f5 100644
--- a/core/Controller/Admin.php
+++ b/core/Controller/Admin.php
@@ -9,6 +9,7 @@
  * @package Piwik
  */
 use Piwik\Core\Config;
+use Piwik\Core\Piwik;
 
 /**
  * Parent class of all plugins Controllers with admin functions
diff --git a/core/DataAccess/ArchiveSelector.php b/core/DataAccess/ArchiveSelector.php
index b61a3a3330..299b292a49 100644
--- a/core/DataAccess/ArchiveSelector.php
+++ b/core/DataAccess/ArchiveSelector.php
@@ -8,6 +8,7 @@
  * @category Piwik
  * @package Piwik
  */
+use Piwik\Core\Piwik;
 
 /**
  * Data Access object used to query archives
diff --git a/core/DataAccess/ArchiveTableCreator.php b/core/DataAccess/ArchiveTableCreator.php
index 84d0cea3b2..d7c3446654 100644
--- a/core/DataAccess/ArchiveTableCreator.php
+++ b/core/DataAccess/ArchiveTableCreator.php
@@ -1,4 +1,6 @@
 <?php
+use Piwik\Core\Piwik;
+
 /**
  * Piwik - Open source web analytics
  *
diff --git a/core/DataAccess/ArchiveWriter.php b/core/DataAccess/ArchiveWriter.php
index 61c421b34f..167e3bcc92 100644
--- a/core/DataAccess/ArchiveWriter.php
+++ b/core/DataAccess/ArchiveWriter.php
@@ -9,6 +9,7 @@
  * @package Piwik
  */
 use Piwik\Core\Config;
+use Piwik\Core\Piwik;
 
 /**
  * This class is used to create a new Archive.
diff --git a/core/DataTable/Filter/AddColumnsProcessedMetricsGoal.php b/core/DataTable/Filter/AddColumnsProcessedMetricsGoal.php
index 167eea9a96..b2fd046254 100644
--- a/core/DataTable/Filter/AddColumnsProcessedMetricsGoal.php
+++ b/core/DataTable/Filter/AddColumnsProcessedMetricsGoal.php
@@ -8,6 +8,7 @@
  * @category Piwik
  * @package Piwik
  */
+use Piwik\Core\Piwik;
 
 /**
  * @package Piwik
diff --git a/core/DataTable/Filter/ColumnCallbackAddColumnPercentage.php b/core/DataTable/Filter/ColumnCallbackAddColumnPercentage.php
index 99284508e4..191f9146b3 100644
--- a/core/DataTable/Filter/ColumnCallbackAddColumnPercentage.php
+++ b/core/DataTable/Filter/ColumnCallbackAddColumnPercentage.php
@@ -8,6 +8,7 @@
  * @category Piwik
  * @package Piwik
  */
+use Piwik\Core\Piwik;
 
 /**
  * Add a new column to the table which is a percentage based on the value resulting
diff --git a/core/DataTable/Filter/ReplaceColumnNames.php b/core/DataTable/Filter/ReplaceColumnNames.php
index d955ca4de1..85fb633194 100644
--- a/core/DataTable/Filter/ReplaceColumnNames.php
+++ b/core/DataTable/Filter/ReplaceColumnNames.php
@@ -8,6 +8,7 @@
  * @category Piwik
  * @package Piwik
  */
+use Piwik\Core\Piwik;
 
 /**
  * This filter replaces column names using a mapping table that maps from the old name to the new name.
diff --git a/core/DataTable/Renderer.php b/core/DataTable/Renderer.php
index 12527f585b..74f4785e90 100644
--- a/core/DataTable/Renderer.php
+++ b/core/DataTable/Renderer.php
@@ -8,6 +8,7 @@
  * @category Piwik
  * @package Piwik
  */
+use Piwik\Core\Piwik;
 
 /**
  * A DataTable Renderer can produce an output given a DataTable object.
diff --git a/core/DataTable/Renderer/Csv.php b/core/DataTable/Renderer/Csv.php
index 1e61e62aef..ba8a248849 100644
--- a/core/DataTable/Renderer/Csv.php
+++ b/core/DataTable/Renderer/Csv.php
@@ -8,6 +8,7 @@
  * @category Piwik
  * @package Piwik
  */
+use Piwik\Core\Piwik;
 
 /**
  * CSV export
diff --git a/core/DataTable/Renderer/Json.php b/core/DataTable/Renderer/Json.php
index 286299acd6..bc973ea93a 100644
--- a/core/DataTable/Renderer/Json.php
+++ b/core/DataTable/Renderer/Json.php
@@ -8,6 +8,7 @@
  * @category Piwik
  * @package Piwik
  */
+use Piwik\Core\Piwik;
 
 /**
  * JSON export.
diff --git a/core/DataTable/Renderer/Php.php b/core/DataTable/Renderer/Php.php
index cd2e7659fb..1dc7ee501b 100644
--- a/core/DataTable/Renderer/Php.php
+++ b/core/DataTable/Renderer/Php.php
@@ -8,6 +8,7 @@
  * @category Piwik
  * @package Piwik
  */
+use Piwik\Core\Piwik;
 
 /**
  * Returns the equivalent PHP array for a given DataTable.
diff --git a/core/DataTable/Renderer/Xml.php b/core/DataTable/Renderer/Xml.php
index e04392bb02..adbe5e7206 100644
--- a/core/DataTable/Renderer/Xml.php
+++ b/core/DataTable/Renderer/Xml.php
@@ -8,6 +8,7 @@
  * @category Piwik
  * @package Piwik
  */
+use Piwik\Core\Piwik;
 
 /**
  * XML export of a given DataTable.
diff --git a/core/Db/Schema/Myisam.php b/core/Db/Schema/Myisam.php
index b65e50d9f6..248823e2d6 100644
--- a/core/Db/Schema/Myisam.php
+++ b/core/Db/Schema/Myisam.php
@@ -9,6 +9,7 @@
  * @package Piwik
  */
 use Piwik\Core\Config;
+use Piwik\Core\Piwik;
 
 /**
  * MySQL schema
diff --git a/core/ExceptionHandler.php b/core/ExceptionHandler.php
index b3dd6692fe..105caf9058 100644
--- a/core/ExceptionHandler.php
+++ b/core/ExceptionHandler.php
@@ -8,6 +8,7 @@
  * @category Piwik
  * @package Piwik
  */
+use Piwik\Core\Piwik;
 
 /**
  * Exception handler used to display nicely exceptions in Piwik
diff --git a/core/FrontController.php b/core/FrontController.php
index 3898033767..fb0df9b928 100644
--- a/core/FrontController.php
+++ b/core/FrontController.php
@@ -9,6 +9,7 @@
  * @package Piwik
  */
 use Piwik\Core\Config;
+use Piwik\Core\Piwik;
 
 /**
  * @see core/PluginsManager.php
@@ -273,7 +274,7 @@ class Piwik_FrontController
             Piwik_PluginsManager::getInstance()->installLoadedPlugins();
 
             // ensure the current Piwik URL is known for later use
-            if (method_exists('Piwik', 'getPiwikUrl')) {
+            if (method_exists('Piwik\Core\Piwik', 'getPiwikUrl')) {
                 $host = Piwik::getPiwikUrl();
             }
 
diff --git a/core/Http.php b/core/Http.php
index 5aa2712a9b..00cc73618a 100644
--- a/core/Http.php
+++ b/core/Http.php
@@ -9,6 +9,7 @@
  * @package Piwik
  */
 use Piwik\Core\Config;
+use Piwik\Core\Piwik;
 
 /**
  * Server-side http client to retrieve content from remote servers, and optionally save to a local file.
diff --git a/core/Log/Message.php b/core/Log/Message.php
index 5e8c428e64..f8ca15ba4c 100644
--- a/core/Log/Message.php
+++ b/core/Log/Message.php
@@ -8,6 +8,7 @@
  * @category Piwik
  * @package Piwik
  */
+use Piwik\Core\Piwik;
 
 /**
  * Class used to log a standard message event.
diff --git a/core/Mail.php b/core/Mail.php
index cadb830061..b907f4c63d 100644
--- a/core/Mail.php
+++ b/core/Mail.php
@@ -9,6 +9,7 @@
  * @package Piwik
  */
 use Piwik\Core\Config;
+use Piwik\Core\Piwik;
 
 /**
  * Class for sending mails, for more information see:
diff --git a/core/Menu/Admin.php b/core/Menu/Admin.php
index f85259811e..0ee8965a24 100644
--- a/core/Menu/Admin.php
+++ b/core/Menu/Admin.php
@@ -8,6 +8,7 @@
  * @category Piwik
  * @package Piwik_Menu
  */
+use Piwik\Core\Piwik;
 
 /**
  * @package Piwik_Menu
diff --git a/core/Metrics.php b/core/Metrics.php
index bd480c1578..4ba6759582 100644
--- a/core/Metrics.php
+++ b/core/Metrics.php
@@ -8,6 +8,7 @@
  * @category Piwik
  * @package Piwik
  */
+use Piwik\Core\Piwik;
 
 /**
  * This class holds the various mappings we use to internally store and manipulate metrics.
diff --git a/core/Period.php b/core/Period.php
index 20a5f9c84f..a086711e1f 100644
--- a/core/Period.php
+++ b/core/Period.php
@@ -8,6 +8,7 @@
  * @category Piwik
  * @package Piwik
  */
+use Piwik\Core\Piwik;
 
 /**
  * Creating a new Piwik_Period subclass:
diff --git a/core/Piwik.php b/core/Piwik.php
index 413b9e3daa..d33725d09f 100644
--- a/core/Piwik.php
+++ b/core/Piwik.php
@@ -8,7 +8,34 @@
  * @category Piwik
  * @package Piwik
  */
+namespace Piwik\Core;
+use Exception;
+use false;
+use Manifest;
 use Piwik\Core\Config;
+use Piwik_Access;
+use Piwik_Access_NoAccessException;
+use Piwik_AssetManager;
+use Piwik_Common;
+use Piwik_Db_Adapter;
+use Piwik_Db_Schema;
+use Piwik_Log_APICall;
+use Piwik_Log_Error;
+use Piwik_Log_Exception;
+use Piwik_Log_Formatter_ScreenFormatter;
+use Piwik_Log_Message;
+use Piwik_Plugin;
+use Piwik_PluginsManager;
+use Piwik_Session;
+use Piwik_Site;
+use Piwik_Tracker;
+use Piwik_Tracker_Cache;
+use Piwik_Tracker_Db;
+use Piwik_Tracker_GoalManager;
+use Piwik_Url;
+use Piwik_UsersManager_API;
+use Piwik_View;
+use Zend_Registry;
 
 /**
  * @see core/Translate.php
@@ -30,16 +57,16 @@ class Piwik
      * @var array
      */
     public static $idPeriods = array(
-        'day'   => 1,
-        'week'  => 2,
+        'day' => 1,
+        'week' => 2,
         'month' => 3,
-        'year'  => 4,
+        'year' => 4,
         'range' => 5,
     );
-    
+
     /**
      * @see getKnownSegmentsToArchive
-     * 
+     *
      * @var array
      */
     public static $cachedKnownSegmentsToArchive = null;
@@ -80,7 +107,7 @@ class Piwik
     public static function isSegmentationEnabled()
     {
         return !Piwik::isUserIsAnonymous()
-            || Config::getInstance()->General['anonymous_user_enable_use_segments_API'];
+        || Config::getInstance()->General['anonymous_user_enable_use_segments_API'];
     }
 
     /**
@@ -308,10 +335,10 @@ class Piwik
         $message = "Please check that the web server has enough permission to write to these files/directories:<br />";
 
         if (Piwik_Common::isWindows()) {
-            $message .= "On Windows, check that the folder is not read only and is writable. 
+            $message .= "On Windows, check that the folder is not read only and is writable.
 						You can try to execute:<br />";
         } else {
-            $message .= "For example, on a Linux server if your Apache httpd user 
+            $message .= "For example, on a Linux server if your Apache httpd user
 						is www-data, you can try to execute:<br />"
                 . "<code>chown -R www-data:www-data " . $path . "</code><br />";
         }
@@ -413,7 +440,7 @@ class Piwik
         }
 
         // The error message mentions chmod 777 in case users can't chown
-        $directoryMessage = "<p><b>Piwik couldn't write to some directories</b>.</p> 
+        $directoryMessage = "<p><b>Piwik couldn't write to some directories</b>.</p>
 							<p>Try to Execute the following commands on your server, to allow Write access on these directories:</p>"
             . "<blockquote>$directoryList</blockquote>"
             . "<p>If this doesn't work, you can try to create the directories with your FTP software, and set the CHMOD to 0755 (or 0777 if 0755 is not enough). To do so with your FTP software, right click on the directories then click permissions.</p>"
@@ -531,11 +558,11 @@ class Piwik
         $denyDirectPhp = "<Files ~ \"\\.(php|php4|php5|inc|tpl|in|twig)$\">\n" . $deny . "</Files>\n";
 
         $directoriesToProtect = array(
-            '/js'      => $allowAny,
-            '/libs'    => $denyDirectPhp . $allowStaticAssets,
-            '/vendor'    => $denyDirectPhp . $allowStaticAssets,
+            '/js' => $allowAny,
+            '/libs' => $denyDirectPhp . $allowStaticAssets,
+            '/vendor' => $denyDirectPhp . $allowStaticAssets,
             '/plugins' => $denyDirectPhp . $allowStaticAssets,
-            '/misc/user'  => $denyDirectPhp . $allowStaticAssets,
+            '/misc/user' => $denyDirectPhp . $allowStaticAssets,
         );
         foreach ($directoriesToProtect as $directoryToProtect => $content) {
             Piwik_Common::createHtAccess(PIWIK_INCLUDE_PATH . $directoryToProtect, $overwrite = true, $content);
@@ -683,10 +710,10 @@ class Piwik
         $autoAppendFile = ini_get('auto_append_file');
 
         return !empty($zlibOutputCompression) ||
-            !empty($outputHandler) ||
-            !empty($obHandlers) ||
-            !empty($autoPrependFile) ||
-            !empty($autoAppendFile);
+        !empty($outputHandler) ||
+        !empty($obHandlers) ||
+        !empty($autoPrependFile) ||
+        !empty($autoAppendFile);
     }
 
     /**
@@ -977,8 +1004,8 @@ class Piwik
         if (is_null(self::$shouldLog)) {
             self::$shouldLog = self::shouldLoggerLog();
             // It is possible that the logger is not setup:
-            // - Tracker request, and debug disabled, 
-            // - and some scheduled tasks call code that tries and log something  
+            // - Tracker request, and debug disabled,
+            // - and some scheduled tasks call code that tries and log something
             try {
                 Zend_Registry::get('logger_message');
             } catch (Exception $e) {
@@ -998,7 +1025,7 @@ class Piwik
     {
         try {
             $shouldLog = (Piwik_Common::isPhpCliMode()
-                || Config::getInstance()->log['log_only_when_cli'] == 0)
+                    || Config::getInstance()->log['log_only_when_cli'] == 0)
                 &&
                 (Config::getInstance()->log['log_only_when_debug_parameter'] == 0
                     || isset($_REQUEST['debug']));
@@ -1126,8 +1153,8 @@ class Piwik
             } else {
                 $existing = array('count' => 0, 'sumTimeMs' => 0);
             }
-            $new = array('count'     => $existing['count'] + 1,
-                         'sumTimeMs' => $existing['count'] + $query->getElapsedSecs() * 1000);
+            $new = array('count' => $existing['count'] + 1,
+                'sumTimeMs' => $existing['count'] + $query->getElapsedSecs() * 1000);
             $infoIndexedByQuery[$query->getQuery()] = $new;
         }
 
@@ -1851,10 +1878,10 @@ class Piwik
      */
     static public function getArrayFromApiParameter($columns)
     {
-        if(empty($columns)) {
+        if (empty($columns)) {
             return array();
         }
-        if(is_array($columns)) {
+        if (is_array($columns)) {
             return $columns;
         }
         $array = explode(',', $columns);
@@ -1873,9 +1900,9 @@ class Piwik
     static public function redirectToModule($newModule, $newAction = '', $parameters = array())
     {
         $newUrl = 'index.php' . Piwik_Url::getCurrentQueryStringWithParametersModified(
-            array('module' => $newModule, 'action' => $newAction)
+                array('module' => $newModule, 'action' => $newAction)
                 + $parameters
-        );
+            );
         Piwik_Url::redirectToUrl($newUrl);
     }
 
@@ -1952,10 +1979,10 @@ class Piwik
         $configAPI = Config::getInstance()->log;
 
         $aLoggers = array(
-            'logger_api_call'  => new Piwik_Log_APICall,
+            'logger_api_call' => new Piwik_Log_APICall,
             'logger_exception' => new Piwik_Log_Exception,
-            'logger_error'     => new Piwik_Log_Error,
-            'logger_message'   => new Piwik_Log_Message,
+            'logger_error' => new Piwik_Log_Error,
+            'logger_message' => new Piwik_Log_Message,
         );
 
         foreach ($configAPI as $loggerType => $aRecordTo) {
@@ -2192,9 +2219,9 @@ class Piwik
      * Batch insert into table from CSV (or other delimited) file.
      *
      * @param string $tableName  Name of table
-     * @param array  $fields     Field names
+     * @param array $fields     Field names
      * @param string $filePath   Path name of a file.
-     * @param array  $fileSpec   File specifications (delimiter, line terminator, etc)
+     * @param array $fileSpec   File specifications (delimiter, line terminator, etc)
      *
      * @throws Exception
      * @return bool  True if successful; false otherwise
@@ -2300,12 +2327,12 @@ class Piwik
 //				throw new Exception('');
 
                 $fileSpec = array(
-                    'delim'            => "\t",
-                    'quote'            => '"', // chr(34)
-                    'escape'           => '\\\\', // chr(92)
+                    'delim' => "\t",
+                    'quote' => '"', // chr(34)
+                    'escape' => '\\\\', // chr(92)
                     'escapespecial_cb' => create_function('$str', 'return str_replace(array(chr(92), chr(34)), array(chr(92).chr(92), chr(92).chr(34)), $str);'),
-                    'eol'              => "\r\n",
-                    'null'             => 'NULL',
+                    'eol' => "\r\n",
+                    'null' => 'NULL',
                 );
 
                 // hack for charset mismatch
@@ -2500,7 +2527,7 @@ class Piwik
     /**
      * Returns the option name of the option that stores the time the archive.php
      * script was last run.
-     * 
+     *
      * @param string $period
      * @param string $idSite
      * @return string
diff --git a/core/PluginsManager.php b/core/PluginsManager.php
index eaff33e2c7..b256d65c0b 100644
--- a/core/PluginsManager.php
+++ b/core/PluginsManager.php
@@ -9,6 +9,7 @@
  * @package Piwik
  */
 use Piwik\Core\Config;
+use Piwik\Core\Piwik;
 
 /**
  * @see core/Menu/Abstract.php
diff --git a/core/ReportRenderer.php b/core/ReportRenderer.php
index 1fd251dcb2..da27590652 100644
--- a/core/ReportRenderer.php
+++ b/core/ReportRenderer.php
@@ -8,6 +8,7 @@
  * @category Piwik
  * @package Piwik
  */
+use Piwik\Core\Piwik;
 
 /**
  * A Report Renderer produces user friendly renderings of any given Piwik report.
diff --git a/core/ReportRenderer/Html.php b/core/ReportRenderer/Html.php
index 7eecc497aa..0edf422dab 100644
--- a/core/ReportRenderer/Html.php
+++ b/core/ReportRenderer/Html.php
@@ -8,6 +8,7 @@
  * @category Piwik
  * @package Piwik_ReportRenderer
  */
+use Piwik\Core\Piwik;
 
 
 /**
diff --git a/core/Segment.php b/core/Segment.php
index 485e27f0f2..dd3654b767 100644
--- a/core/Segment.php
+++ b/core/Segment.php
@@ -8,6 +8,7 @@
  * @category Piwik
  * @package Piwik
  */
+use Piwik\Core\Piwik;
 
 /**
  *
diff --git a/core/Session.php b/core/Session.php
index a534a4aa50..f08df94c60 100644
--- a/core/Session.php
+++ b/core/Session.php
@@ -9,6 +9,7 @@
  * @package Piwik
  */
 use Piwik\Core\Config;
+use Piwik\Core\Piwik;
 
 /**
  * Session initialization.
diff --git a/core/Timer.php b/core/Timer.php
index e747c6d3bd..43edaa78ec 100644
--- a/core/Timer.php
+++ b/core/Timer.php
@@ -8,6 +8,7 @@
  * @category Piwik
  * @package Piwik
  */
+use Piwik\Core\Piwik;
 
 /**
  *
diff --git a/core/Tracker.php b/core/Tracker.php
index 3de00cdd32..fd8bb92bf5 100644
--- a/core/Tracker.php
+++ b/core/Tracker.php
@@ -9,6 +9,7 @@
  * @package Piwik
  */
 use Piwik\Core\Config;
+use Piwik\Core\Piwik;
 
 /**
  * Class used by the logging script piwik.php called by the javascript tag.
diff --git a/core/Tracker/Cache.php b/core/Tracker/Cache.php
index 5fd14f936f..eb0b90cd86 100644
--- a/core/Tracker/Cache.php
+++ b/core/Tracker/Cache.php
@@ -9,6 +9,7 @@
  * @package Piwik
  */
 use Piwik\Core\Config;
+use Piwik\Core\Piwik;
 
 /**
  * Simple cache mechanism used in Tracker to avoid requesting settings from mysql on every request
diff --git a/core/Twig.php b/core/Twig.php
index a3f69dbc7e..023653959b 100644
--- a/core/Twig.php
+++ b/core/Twig.php
@@ -8,6 +8,7 @@
  * @category Piwik
  * @package Piwik
  */
+use Piwik\Core\Piwik;
 
 
 /**
diff --git a/core/Updates/0.2.10.php b/core/Updates/0.2.10.php
index aece273630..2f2f289c9a 100644
--- a/core/Updates/0.2.10.php
+++ b/core/Updates/0.2.10.php
@@ -8,6 +8,7 @@
  * @category Piwik
  * @package Updates
  */
+use Piwik\Core\Piwik;
 
 /**
  * @package Updates
diff --git a/core/Updates/0.2.27.php b/core/Updates/0.2.27.php
index 052033e9bf..8aac68fe3a 100644
--- a/core/Updates/0.2.27.php
+++ b/core/Updates/0.2.27.php
@@ -8,6 +8,7 @@
  * @category Piwik
  * @package Updates
  */
+use Piwik\Core\Piwik;
 
 /**
  * @package Updates
diff --git a/core/Updates/0.2.33.php b/core/Updates/0.2.33.php
index 0ad0b04b1b..cdf7551092 100644
--- a/core/Updates/0.2.33.php
+++ b/core/Updates/0.2.33.php
@@ -8,6 +8,7 @@
  * @category Piwik
  * @package Updates
  */
+use Piwik\Core\Piwik;
 
 /**
  * @package Updates
diff --git a/core/Updates/0.2.34.php b/core/Updates/0.2.34.php
index cf52c90ff6..4af164a129 100644
--- a/core/Updates/0.2.34.php
+++ b/core/Updates/0.2.34.php
@@ -8,6 +8,7 @@
  * @category Piwik
  * @package Updates
  */
+use Piwik\Core\Piwik;
 
 /**
  * @package Updates
diff --git a/core/Updates/0.5.5.php b/core/Updates/0.5.5.php
index a2db73c613..923f14cd2f 100644
--- a/core/Updates/0.5.5.php
+++ b/core/Updates/0.5.5.php
@@ -8,6 +8,7 @@
  * @category Piwik
  * @package Updates
  */
+use Piwik\Core\Piwik;
 
 /**
  * @package Updates
diff --git a/core/Updates/0.6.2.php b/core/Updates/0.6.2.php
index 0273fe82c2..d00ed5c91c 100644
--- a/core/Updates/0.6.2.php
+++ b/core/Updates/0.6.2.php
@@ -8,6 +8,7 @@
  * @category Piwik
  * @package Updates
  */
+use Piwik\Core\Piwik;
 
 /**
  * @package Updates
diff --git a/core/Updates/0.9.1.php b/core/Updates/0.9.1.php
index 24e6c27c60..04658a23c5 100644
--- a/core/Updates/0.9.1.php
+++ b/core/Updates/0.9.1.php
@@ -8,6 +8,7 @@
  * @category Piwik
  * @package Updates
  */
+use Piwik\Core\Piwik;
 
 /**
  * @package Updates
diff --git a/core/Updates/1.1.php b/core/Updates/1.1.php
index eb740fd49b..cae7b1f407 100644
--- a/core/Updates/1.1.php
+++ b/core/Updates/1.1.php
@@ -9,6 +9,7 @@
  * @package Updates
  */
 use Piwik\Core\Config;
+use Piwik\Core\Piwik;
 
 /**
  * @package Updates
diff --git a/core/Url.php b/core/Url.php
index 7ae6b3f50b..b4eacdff83 100644
--- a/core/Url.php
+++ b/core/Url.php
@@ -9,6 +9,7 @@
  * @package Piwik
  */
 use Piwik\Core\Config;
+use Piwik\Core\Piwik;
 
 /**
  * Class to retrieve absolute URL or URI components of the current URL,
diff --git a/core/View.php b/core/View.php
index 682a0c01dd..ea4a43b8b3 100644
--- a/core/View.php
+++ b/core/View.php
@@ -9,6 +9,7 @@
  * @package Piwik
  */
 use Piwik\Core\Config;
+use Piwik\Core\Piwik;
 
 /**
  * Transition for pre-Piwik 0.4.4
diff --git a/core/ViewDataTable.php b/core/ViewDataTable.php
index 30116ad872..46eabeecc7 100644
--- a/core/ViewDataTable.php
+++ b/core/ViewDataTable.php
@@ -9,6 +9,7 @@
  * @package Piwik
  */
 use Piwik\Core\Config;
+use Piwik\Core\Piwik;
 
 /**
  * This class is used to load (from the API) and customize the output of a given DataTable.
diff --git a/core/ViewDataTable/GenerateGraphData.php b/core/ViewDataTable/GenerateGraphData.php
index 4a6dcb2bfc..eab6293b63 100644
--- a/core/ViewDataTable/GenerateGraphData.php
+++ b/core/ViewDataTable/GenerateGraphData.php
@@ -8,6 +8,7 @@
  * @category Piwik
  * @package Piwik
  */
+use Piwik\Core\Piwik;
 
 /**
  * Reads data from the API and prepares data to give to the renderer Piwik_Visualization_Chart.
diff --git a/core/ViewDataTable/GenerateGraphData/ChartEvolution.php b/core/ViewDataTable/GenerateGraphData/ChartEvolution.php
index 4249d7cca8..9237a5e427 100644
--- a/core/ViewDataTable/GenerateGraphData/ChartEvolution.php
+++ b/core/ViewDataTable/GenerateGraphData/ChartEvolution.php
@@ -8,6 +8,7 @@
  * @category Piwik
  * @package Piwik
  */
+use Piwik\Core\Piwik;
 
 /**
  * Piwik_ViewDataTable_GenerateGraphData for the Evolution graph (eg. Last 30 days visits) using Piwik_Visualization_Chart_Evolution
diff --git a/core/ViewDataTable/GenerateGraphHTML.php b/core/ViewDataTable/GenerateGraphHTML.php
index 201416c644..f7b580eb3d 100644
--- a/core/ViewDataTable/GenerateGraphHTML.php
+++ b/core/ViewDataTable/GenerateGraphHTML.php
@@ -8,6 +8,7 @@
  * @category Piwik
  * @package Piwik
  */
+use Piwik\Core\Piwik;
 
 /**
  * This class generates the HTML code to embed graphs in the page.
diff --git a/core/ViewDataTable/HtmlTable.php b/core/ViewDataTable/HtmlTable.php
index 5b47f7b5bc..08df07ffab 100644
--- a/core/ViewDataTable/HtmlTable.php
+++ b/core/ViewDataTable/HtmlTable.php
@@ -9,6 +9,7 @@
  * @package Piwik
  */
 use Piwik\Core\Config;
+use Piwik\Core\Piwik;
 
 /**
  * Outputs an AJAX Table for a given DataTable.
diff --git a/core/ViewDataTable/HtmlTable/Goals.php b/core/ViewDataTable/HtmlTable/Goals.php
index b116217d8d..21740d0905 100644
--- a/core/ViewDataTable/HtmlTable/Goals.php
+++ b/core/ViewDataTable/HtmlTable/Goals.php
@@ -8,6 +8,7 @@
  * @category Piwik
  * @package Piwik
  */
+use Piwik\Core\Piwik;
 
 /**
  * @package Piwik
diff --git a/core/Visualization/Chart.php b/core/Visualization/Chart.php
index 74d4bf1b52..4cf3de47db 100644
--- a/core/Visualization/Chart.php
+++ b/core/Visualization/Chart.php
@@ -8,6 +8,7 @@
  * @category Piwik
  * @package Piwik
  */
+use Piwik\Core\Piwik;
 
 /**
  * Generates the data in the Open Flash Chart format, from the given data.