Refactor class Piwik_Common to \Piwik\Core\Common

Notice that auto refactoring has created a nested namespace. Not sure this is what we want - so we might have to edit those nested namespaces afterwards (I think they don't look so good)

2 files changed, 11 insertions, 11 deletions

diff --git a/plugins/CoreUpdater/Controller.php b/plugins/CoreUpdater/Controller.php
index 3d4040a6a5..8744d4e651 100644
--- a/plugins/CoreUpdater/Controller.php
+++ b/plugins/CoreUpdater/Controller.php
@@ -10,7 +10,7 @@
  */
 use Piwik\Core\Config;
 use Piwik\Core\Piwik;
-use Piwik\Core\Piwik_Common;
+use Piwik\Core\Common;
 
 /**
  *
@@ -93,8 +93,8 @@ class Piwik_CoreUpdater_Controller extends Piwik_Controller
         Piwik::checkUserIsSuperUser();
 
         $view = new Piwik_View('@CoreUpdater/oneClickResults');
-        $view->coreError = Piwik_Common::getRequestVar('error', '', 'string', $_POST);
-        $view->feedbackMessages = safe_unserialize(Piwik_Common::unsanitizeInputValue(Piwik_Common::getRequestVar('messages', '', 'string', $_POST)));
+        $view->coreError = Common::getRequestVar('error', '', 'string', $_POST);
+        $view->feedbackMessages = safe_unserialize(Common::unsanitizeInputValue(Common::getRequestVar('messages', '', 'string', $_POST)));
         echo $view->render();
     }
 
@@ -220,7 +220,7 @@ class Piwik_CoreUpdater_Controller extends Piwik_Controller
 
     public function index()
     {
-        $language = Piwik_Common::getRequestVar('language', '');
+        $language = Common::getRequestVar('language', '');
         if (!empty($language)) {
             Piwik_LanguagesManager::setLanguageForSession($language);
         }
@@ -237,14 +237,14 @@ class Piwik_CoreUpdater_Controller extends Piwik_Controller
 
         Piwik::setMaxExecutionTime(0);
 
-        $cli = Piwik_Common::isPhpCliMode() ? '_cli' : '';
+        $cli = Common::isPhpCliMode() ? '_cli' : '';
         $welcomeTemplate = '@CoreUpdater/runUpdaterAndExit_welcome' . $cli;
         $doneTemplate = '@CoreUpdater/runUpdaterAndExit_done' . $cli;
         $viewWelcome = new Piwik_View($welcomeTemplate);
         $viewDone = new Piwik_View($doneTemplate);
 
         $sqlQueries = $updater->getSqlQueriesToExecute();
-        if (Piwik_Common::isPhpCliMode()) {
+        if (Common::isPhpCliMode()) {
             $this->doWelcomeUpdates($viewWelcome, $componentsWithUpdateFile);
             echo $viewWelcome->render();
 
@@ -253,7 +253,7 @@ class Piwik_CoreUpdater_Controller extends Piwik_Controller
                 echo $viewDone->render();
             }
         } else {
-            if (Piwik_Common::getRequestVar('updateCorePlugins', 0, 'integer') == 1) {
+            if (Common::getRequestVar('updateCorePlugins', 0, 'integer') == 1) {
                 $this->warningMessages = array();
                 $this->doExecuteUpdates($viewDone, $updater, $componentsWithUpdateFile);
 
@@ -274,7 +274,7 @@ class Piwik_CoreUpdater_Controller extends Piwik_Controller
     private function doWelcomeUpdates($view, $componentsWithUpdateFile)
     {
         $view->new_piwik_version = Piwik_Version::VERSION;
-        $view->commandUpgradePiwik = "<br /><code>php " . Piwik_Common::getPathToPiwikRoot() . "/index.php  -- \"module=CoreUpdater\" </code>";
+        $view->commandUpgradePiwik = "<br /><code>php " . Common::getPathToPiwikRoot() . "/index.php  -- \"module=CoreUpdater\" </code>";
         $pluginNamesToUpdate = array();
         $coreToUpdate = false;
 
diff --git a/plugins/CoreUpdater/CoreUpdater.php b/plugins/CoreUpdater/CoreUpdater.php
index 72d5269000..6f14121fba 100644
--- a/plugins/CoreUpdater/CoreUpdater.php
+++ b/plugins/CoreUpdater/CoreUpdater.php
@@ -9,7 +9,7 @@
  * @package Piwik_CoreUpdater
  */
 use Piwik\Core\Piwik;
-use Piwik\Core\Piwik_Common;
+use Piwik\Core\Common;
 
 /**
  *
@@ -47,8 +47,8 @@ class Piwik_CoreUpdater extends Piwik_Plugin
 
     public function dispatch()
     {
-        $module = Piwik_Common::getRequestVar('module', '', 'string');
-        $action = Piwik_Common::getRequestVar('action', '', 'string');
+        $module = Common::getRequestVar('module', '', 'string');
+        $action = Common::getRequestVar('action', '', 'string');
 
         $updater = new Piwik_Updater();
         $updater->addComponentToCheck('core', Piwik_Version::VERSION);