Refs #4059 Converting dozens of plugins/* classes to use Namespaces, \Piwik\Plugins\*

Added namespaces to functions.php files in the five plugins that had one
Work in progress

2 files changed, 18 insertions, 11 deletions

diff --git a/plugins/CoreUpdater/Controller.php b/plugins/CoreUpdater/Controller.php
index efc492417b..7cb89e9e30 100644
--- a/plugins/CoreUpdater/Controller.php
+++ b/plugins/CoreUpdater/Controller.php
@@ -6,14 +6,16 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  *
  * @category Piwik_Plugins
- * @package Piwik_CoreUpdater
+ * @package CoreUpdater
  */
+namespace Piwik\Plugins\CoreUpdater;
+
+use Exception;
 use Piwik\API\Request;
 use Piwik\ArchiveProcessor\Rules;
 use Piwik\Config;
 use Piwik\Piwik;
 use Piwik\Common;
-use Piwik\Controller;
 use Piwik\Http;
 use Piwik\Updater;
 use Piwik\View;
@@ -21,12 +23,15 @@ use Piwik\Version;
 use Piwik\UpdateCheck;
 use Piwik\Unzip;
 use Piwik\View\OneClickDone;
+use Piwik\Plugins\CoreUpdater\CoreUpdater;
+use Piwik\Plugins\LanguagesManager\LanguagesManager;
+use Updater_UpdateErrorException;
 
 /**
  *
- * @package Piwik_CoreUpdater
+ * @package CoreUpdater
  */
-class Piwik_CoreUpdater_Controller extends Controller
+class Controller extends \Piwik\Controller
 {
     const CONFIG_FILE_BACKUP = '/config/global.ini.auto-backup-before-update.php';
     const PATH_TO_EXTRACT_LATEST_VERSION = '/tmp/latest/';
@@ -232,7 +237,7 @@ class Piwik_CoreUpdater_Controller extends Controller
     {
         $language = Common::getRequestVar('language', '');
         if (!empty($language)) {
-            Piwik_LanguagesManager::setLanguageForSession($language);
+            LanguagesManager::setLanguageForSession($language);
         }
         $this->runUpdaterAndExit();
     }
@@ -240,7 +245,7 @@ class Piwik_CoreUpdater_Controller extends Controller
     protected function runUpdaterAndExit()
     {
         $updater = new Updater();
-        $componentsWithUpdateFile = Piwik_CoreUpdater::getComponentUpdates($updater);
+        $componentsWithUpdateFile = CoreUpdater::getComponentUpdates($updater);
         if (empty($componentsWithUpdateFile)) {
             Piwik::redirectToModule('CoreHome');
         }
diff --git a/plugins/CoreUpdater/CoreUpdater.php b/plugins/CoreUpdater/CoreUpdater.php
index 7e4d2497a5..20f3f5c0ae 100644
--- a/plugins/CoreUpdater/CoreUpdater.php
+++ b/plugins/CoreUpdater/CoreUpdater.php
@@ -6,21 +6,23 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  *
  * @category Piwik_Plugins
- * @package Piwik_CoreUpdater
+ * @package CoreUpdater
  */
+namespace Piwik\Plugins\CoreUpdater;
+
+use Exception;
 use Piwik\Piwik;
 use Piwik\Common;
 use Piwik\FrontController;
 use Piwik\Updater;
 use Piwik\Version;
 use Piwik\UpdateCheck;
-use Piwik\Plugin;
 
 /**
  *
- * @package Piwik_CoreUpdater
+ * @package CoreUpdater
  */
-class Piwik_CoreUpdater extends Plugin
+class CoreUpdater extends \Piwik\Plugin
 {
     /**
      * @see Piwik_Plugin::getListHooksRegistered
@@ -69,7 +71,7 @@ class Piwik_CoreUpdater extends Plugin
                 && $action == 'saveLanguage')
         ) {
             if (FrontController::shouldRethrowException()) {
-                throw new Exception("Piwik and/or some plugins have been upgraded to a new version. \n".
+                throw new Exception("Piwik and/or some plugins have been upgraded to a new version. \n" .
                     "--> Please run the update process first. See documentation: http://piwik.org/docs/update/ \n");
             } else {
                 Piwik::redirectToModule('CoreUpdater');