Refs #4059 Converting updates files to use namespaces

63 files changed, 292 insertions, 103 deletions

diff --git a/core/Filechecks.php b/core/Filechecks.php
index 1ccb648d19..d85c246c52 100644
--- a/core/Filechecks.php
+++ b/core/Filechecks.php
@@ -112,13 +112,14 @@ class Filechecks
         $messages[] = true;
 
         $manifest = PIWIK_INCLUDE_PATH . '/config/manifest.inc.php';
-        if (!file_exists($manifest)) {
-            $suffix = " If you are deploying Piwik from Git, this message is normal.";
-            $messages[] = Piwik_Translate('General_WarningFileIntegrityNoManifest') . $suffix;
-            return $messages;
+        if (file_exists($manifest)) {
+            require_once $manifest;
         }
 
-        require_once $manifest;
+        if(!class_exists('\\Piwik\\Manifest')){
+            $messages[] = Piwik_Translate('General_WarningFileIntegrityNoManifest') . " If you are deploying Piwik from Git, this message is normal.";
+            return $messages;
+        }
 
         $files = \Piwik\Manifest::$files;
 
diff --git a/core/FrontController.php b/core/FrontController.php
index b4b91d625b..7f93fd444b 100644
--- a/core/FrontController.php
+++ b/core/FrontController.php
@@ -37,36 +37,8 @@ class FrontController
 
     private static $instance = null;
 
-    /**
-     * returns singleton
-     *
-     * @return \Piwik\FrontController
-     */
-    public static function getInstance()
+    protected function prepareDispatch($module, $action, $parameters)
     {
-        if (self::$instance == null) {
-            self::$instance = new self;
-        }
-        return self::$instance;
-    }
-
-    /**
-     * Dispatches the request to the right plugin and executes the requested action on the plugin controller.
-     *
-     * @throws Exception|\Piwik\PluginDeactivatedException in case the plugin doesn't exist, the action doesn't exist, there is not enough permission, etc.
-     *
-     * @param string $module
-     * @param string $action
-     * @param array $parameters
-     * @return void|mixed  The returned value of the calls, often nothing as the module print but don't return data
-     * @see fetchDispatch()
-     */
-    public function dispatch($module = null, $action = null, $parameters = null)
-    {
-        if (self::$enableDispatch === false) {
-            return;
-        }
-
         if (is_null($module)) {
             $defaultModule = 'CoreHome';
             $module = Common::getRequestVar('module', $defaultModule, 'string');
@@ -94,7 +66,7 @@ class FrontController
             throw new PluginDeactivatedException($module);
         }
 
-        $controllerClassName = $this->getClassNameController( $module );
+        $controllerClassName = $this->getClassNameController($module);
 
         // FrontController's autoloader
         if (!class_exists($controllerClassName, false)) {
@@ -115,15 +87,49 @@ class FrontController
         if (!is_callable(array($controller, $action))) {
             throw new Exception("Action '$action' not found in the controller '$controllerClassName'.");
         }
+        return array($module, $action, $parameters, $controller);
+    }
+
+    /**
+     * returns singleton
+     *
+     * @return \Piwik\FrontController
+     */
+    public static function getInstance()
+    {
+        if (self::$instance == null) {
+            self::$instance = new self;
+        }
+        return self::$instance;
+    }
+
+    /**
+     * Dispatches the request to the right plugin and executes the requested action on the plugin controller.
+     *
+     * @throws Exception|\Piwik\PluginDeactivatedException in case the plugin doesn't exist, the action doesn't exist, there is not enough permission, etc.
+     *
+     * @param string $module
+     * @param string $action
+     * @param array $parameters
+     * @return void|mixed  The returned value of the calls, often nothing as the module print but don't return data
+     * @see fetchDispatch()
+     */
+    public function dispatch($module = null, $action = null, $parameters = null)
+    {
+        if (self::$enableDispatch === false) {
+            return;
+        }
+
+        // list($module, $action, $parameters, $controller)
+        $params = $this->prepareDispatch($module, $action, $parameters);
 
         // Generic hook that plugins can use to modify any input to the function,
         // or even change the plugin being called
-        $params = array($controller, $action, $parameters);
         Piwik_PostEvent('Request.dispatch', $params);
         Piwik_PostEvent(sprintf('Controller.%s.%s', $module, $action), array($parameters));
 
         try {
-            $result = call_user_func_array(array($params[0], $params[1]), $params[2]);
+            $result = call_user_func_array(array($params[3], $params[1]), $params[2]);
             Piwik_PostEvent(sprintf('Controller.%s.%s.end', $module, $action), array(&$result, $parameters));
             Piwik_PostEvent('Request.dispatch.end', array(&$result, $parameters));
 
diff --git a/core/Updates/0.2.10.php b/core/Updates/0.2.10.php
index a378dccd51..6d4a571889 100644
--- a/core/Updates/0.2.10.php
+++ b/core/Updates/0.2.10.php
@@ -8,6 +8,9 @@
  * @category Piwik
  * @package Updates
  */
+
+namespace Piwik\Updates;
+
 use Piwik\Common;
 use Piwik\Filesystem;
 use Piwik\Updater;
@@ -16,7 +19,7 @@ use Piwik\Updates;
 /**
  * @package Updates
  */
-class Piwik_Updates_0_2_10 extends Updates
+class Updates_0_2_10 extends Updates
 {
     static function getSql($schema = 'Myisam')
     {
diff --git a/core/Updates/0.2.12.php b/core/Updates/0.2.12.php
index fc7d81df47..2037906faa 100644
--- a/core/Updates/0.2.12.php
+++ b/core/Updates/0.2.12.php
@@ -8,6 +8,9 @@
  * @category Piwik
  * @package Updates
  */
+
+namespace Piwik\Updates;
+
 use Piwik\Common;
 use Piwik\Updater;
 use Piwik\Updates;
@@ -15,7 +18,7 @@ use Piwik\Updates;
 /**
  * @package Updates
  */
-class Piwik_Updates_0_2_12 extends Updates
+class Updates_0_2_12 extends Updates
 {
     static function getSql($schema = 'Myisam')
     {
diff --git a/core/Updates/0.2.13.php b/core/Updates/0.2.13.php
index 3b0b91f261..eec859af6d 100644
--- a/core/Updates/0.2.13.php
+++ b/core/Updates/0.2.13.php
@@ -8,6 +8,9 @@
  * @category Piwik
  * @package Updates
  */
+
+namespace Piwik\Updates;
+
 use Piwik\Common;
 use Piwik\Updater;
 use Piwik\Updates;
@@ -15,7 +18,7 @@ use Piwik\Updates;
 /**
  * @package Updates
  */
-class Piwik_Updates_0_2_13 extends Updates
+class Updates_0_2_13 extends Updates
 {
     static function getSql($schema = 'Myisam')
     {
diff --git a/core/Updates/0.2.24.php b/core/Updates/0.2.24.php
index f1b23721e6..0da8e388ec 100644
--- a/core/Updates/0.2.24.php
+++ b/core/Updates/0.2.24.php
@@ -8,6 +8,9 @@
  * @category Piwik
  * @package Updates
  */
+
+namespace Piwik\Updates;
+
 use Piwik\Common;
 use Piwik\Updater;
 use Piwik\Updates;
@@ -15,7 +18,7 @@ use Piwik\Updates;
 /**
  * @package Updates
  */
-class Piwik_Updates_0_2_24 extends Updates
+class Updates_0_2_24 extends Updates
 {
     static function getSql($schema = 'Myisam')
     {
diff --git a/core/Updates/0.2.27.php b/core/Updates/0.2.27.php
index 5bd9c939c6..55accb705a 100644
--- a/core/Updates/0.2.27.php
+++ b/core/Updates/0.2.27.php
@@ -8,6 +8,9 @@
  * @category Piwik
  * @package Updates
  */
+
+namespace Piwik\Updates;
+
 use Piwik\Common;
 use Piwik\DbHelper;
 use Piwik\Updater;
@@ -16,7 +19,7 @@ use Piwik\Updates;
 /**
  * @package Updates
  */
-class Piwik_Updates_0_2_27 extends Updates
+class Updates_0_2_27 extends Updates
 {
     static function getSql($schema = 'Myisam')
     {
diff --git a/core/Updates/0.2.32.php b/core/Updates/0.2.32.php
index 2ebb93c343..4e4257bbbc 100644
--- a/core/Updates/0.2.32.php
+++ b/core/Updates/0.2.32.php
@@ -8,6 +8,9 @@
  * @category Piwik
  * @package Updates
  */
+
+namespace Piwik\Updates;
+
 use Piwik\Common;
 use Piwik\Updater;
 use Piwik\Updates;
@@ -15,7 +18,7 @@ use Piwik\Updates;
 /**
  * @package Updates
  */
-class Piwik_Updates_0_2_32 extends Updates
+class Updates_0_2_32 extends Updates
 {
     static function getSql($schema = 'Myisam')
     {
diff --git a/core/Updates/0.2.33.php b/core/Updates/0.2.33.php
index 839d98ccae..8d3a328cd2 100644
--- a/core/Updates/0.2.33.php
+++ b/core/Updates/0.2.33.php
@@ -8,6 +8,9 @@
  * @category Piwik
  * @package Updates
  */
+
+namespace Piwik\Updates;
+
 use Piwik\Common;
 use Piwik\DbHelper;
 use Piwik\Updater;
@@ -16,7 +19,7 @@ use Piwik\Updates;
 /**
  * @package Updates
  */
-class Piwik_Updates_0_2_33 extends Updates
+class Updates_0_2_33 extends Updates
 {
     static function getSql($schema = 'Myisam')
     {
diff --git a/core/Updates/0.2.34.php b/core/Updates/0.2.34.php
index 5ad44f5268..15d824d61f 100644
--- a/core/Updates/0.2.34.php
+++ b/core/Updates/0.2.34.php
@@ -8,6 +8,9 @@
  * @category Piwik
  * @package Updates
  */
+
+namespace Piwik\Updates;
+
 use Piwik\Piwik;
 use Piwik\Plugins\SitesManager\API;
 use Piwik\Tracker\Cache;
@@ -16,7 +19,7 @@ use Piwik\Updates;
 /**
  * @package Updates
  */
-class Piwik_Updates_0_2_34 extends Updates
+class Updates_0_2_34 extends Updates
 {
     static function update($schema = 'Myisam')
     {
diff --git a/core/Updates/0.2.35.php b/core/Updates/0.2.35.php
index dba6e79da7..397af6024c 100644
--- a/core/Updates/0.2.35.php
+++ b/core/Updates/0.2.35.php
@@ -8,6 +8,9 @@
  * @category Piwik
  * @package Updates
  */
+
+namespace Piwik\Updates;
+
 use Piwik\Common;
 use Piwik\Updater;
 use Piwik\Updates;
@@ -15,7 +18,7 @@ use Piwik\Updates;
 /**
  * @package Updates
  */
-class Piwik_Updates_0_2_35 extends Updates
+class Updates_0_2_35 extends Updates
 {
     static function getSql($schema = 'Myisam')
     {
diff --git a/core/Updates/0.2.37.php b/core/Updates/0.2.37.php
index fa129fc550..7c961e3039 100644
--- a/core/Updates/0.2.37.php
+++ b/core/Updates/0.2.37.php
@@ -8,6 +8,9 @@
  * @category Piwik
  * @package Updates
  */
+
+namespace Piwik\Updates;
+
 use Piwik\Common;
 use Piwik\Updater;
 use Piwik\Updates;
@@ -15,7 +18,7 @@ use Piwik\Updates;
 /**
  * @package Updates
  */
-class Piwik_Updates_0_2_37 extends Updates
+class Updates_0_2_37 extends Updates
 {
     static function getSql($schema = 'Myisam')
     {
diff --git a/core/Updates/0.4.1.php b/core/Updates/0.4.1.php
index a74421a722..4a1231f7d1 100644
--- a/core/Updates/0.4.1.php
+++ b/core/Updates/0.4.1.php
@@ -8,6 +8,9 @@
  * @category Piwik
  * @package Updates
  */
+
+namespace Piwik\Updates;
+
 use Piwik\Common;
 use Piwik\Updater;
 use Piwik\Updates;
@@ -15,7 +18,7 @@ use Piwik\Updates;
 /**
  * @package Updates
  */
-class Piwik_Updates_0_4_1 extends Updates
+class Updates_0_4_1 extends Updates
 {
     static function getSql($schema = 'Myisam')
     {
diff --git a/core/Updates/0.4.2.php b/core/Updates/0.4.2.php
index c9660a0e03..363976a980 100644
--- a/core/Updates/0.4.2.php
+++ b/core/Updates/0.4.2.php
@@ -8,6 +8,9 @@
  * @category Piwik
  * @package Updates
  */
+
+namespace Piwik\Updates;
+
 use Piwik\Common;
 use Piwik\Updater;
 use Piwik\Updates;
@@ -15,7 +18,7 @@ use Piwik\Updates;
 /**
  * @package Updates
  */
-class Piwik_Updates_0_4_2 extends Updates
+class Updates_0_4_2 extends Updates
 {
     static function getSql($schema = 'Myisam')
     {
diff --git a/core/Updates/0.4.4.php b/core/Updates/0.4.4.php
index 5c783c9ac9..80f03d4ec5 100644
--- a/core/Updates/0.4.4.php
+++ b/core/Updates/0.4.4.php
@@ -8,12 +8,15 @@
  * @category Piwik
  * @package Updates
  */
+
+namespace Piwik\Updates;
+
 use Piwik\Updates;
 
 /**
  * @package Updates
  */
-class Piwik_Updates_0_4_4 extends Updates
+class Updates_0_4_4 extends Updates
 {
     static function update()
     {
diff --git a/core/Updates/0.4.php b/core/Updates/0.4.php
index 82c7b928da..0e903c131b 100644
--- a/core/Updates/0.4.php
+++ b/core/Updates/0.4.php
@@ -8,6 +8,9 @@
  * @category Piwik
  * @package Updates
  */
+
+namespace Piwik\Updates;
+
 use Piwik\Common;
 use Piwik\Updater;
 use Piwik\Updates;
@@ -15,7 +18,7 @@ use Piwik\Updates;
 /**
  * @package Updates
  */
-class Piwik_Updates_0_4 extends Updates
+class Updates_0_4 extends Updates
 {
     static function getSql($schema = 'Myisam')
     {
diff --git a/core/Updates/0.5.4.php b/core/Updates/0.5.4.php
index 9168a1ad5e..f041a10732 100644
--- a/core/Updates/0.5.4.php
+++ b/core/Updates/0.5.4.php
@@ -8,6 +8,9 @@
  * @category Piwik
  * @package Updates
  */
+
+namespace Piwik\Updates;
+
 use Piwik\Config;
 use Piwik\Common;
 use Piwik\Updater;
@@ -16,7 +19,7 @@ use Piwik\Updates;
 /**
  * @package Updates
  */
-class Piwik_Updates_0_5_4 extends Updates
+class Updates_0_5_4 extends Updates
 {
     static function getSql($schema = 'Myisam')
     {
diff --git a/core/Updates/0.5.5.php b/core/Updates/0.5.5.php
index 53a7e11609..fbfae51882 100644
--- a/core/Updates/0.5.5.php
+++ b/core/Updates/0.5.5.php
@@ -8,6 +8,9 @@
  * @category Piwik
  * @package Updates
  */
+
+namespace Piwik\Updates;
+
 use Piwik\Common;
 use Piwik\DbHelper;
 use Piwik\Updater;
@@ -16,7 +19,7 @@ use Piwik\Updates;
 /**
  * @package Updates
  */
-class Piwik_Updates_0_5_5 extends Updates
+class Updates_0_5_5 extends Updates
 {
     static function getSql($schema = 'Myisam')
     {
diff --git a/core/Updates/0.5.php b/core/Updates/0.5.php
index 1a707809e1..3572a66a93 100644
--- a/core/Updates/0.5.php
+++ b/core/Updates/0.5.php
@@ -8,6 +8,9 @@
  * @category Piwik
  * @package Updates
  */
+
+namespace Piwik\Updates;
+
 use Piwik\Common;
 use Piwik\Updater;
 use Piwik\Updates;
@@ -15,7 +18,7 @@ use Piwik\Updates;
 /**
  * @package Updates
  */
-class Piwik_Updates_0_5 extends Updates
+class Updates_0_5 extends Updates
 {
     static function getSql($schema = 'Myisam')
     {
diff --git a/core/Updates/0.6-rc1.php b/core/Updates/0.6-rc1.php
index 1e2fa17ffe..2b2a37fe40 100644
--- a/core/Updates/0.6-rc1.php
+++ b/core/Updates/0.6-rc1.php
@@ -8,6 +8,9 @@
  * @category Piwik
  * @package Updates
  */
+
+namespace Piwik\Updates;
+
 use Piwik\Common;
 use Piwik\Updater;
 use Piwik\Updates;
@@ -15,7 +18,7 @@ use Piwik\Updates;
 /**
  * @package Updates
  */
-class Piwik_Updates_0_6_rc1 extends Updates
+class Updates_0_6_rc1 extends Updates
 {
     static function getSql($schema = 'Myisam')
     {
diff --git a/core/Updates/0.6.2.php b/core/Updates/0.6.2.php
index 0651f2f676..1264390d80 100644
--- a/core/Updates/0.6.2.php
+++ b/core/Updates/0.6.2.php
@@ -8,6 +8,9 @@
  * @category Piwik
  * @package Updates
  */
+
+namespace Piwik\Updates;
+
 use Piwik\Filesystem;
 use Piwik\Piwik;
 use Piwik\Plugins\SitesManager\API;
@@ -17,7 +20,7 @@ use Piwik\Updates;
 /**
  * @package Updates
  */
-class Piwik_Updates_0_6_2 extends Updates
+class Updates_0_6_2 extends Updates
 {
     static function update()
     {
diff --git a/core/Updates/0.6.3.php b/core/Updates/0.6.3.php
index db9d6d92e0..abcd433ad0 100644
--- a/core/Updates/0.6.3.php
+++ b/core/Updates/0.6.3.php
@@ -8,6 +8,9 @@
  * @category Piwik
  * @package Updates
  */
+
+namespace Piwik\Updates;
+
 use Piwik\Config;
 use Piwik\Common;
 use Piwik\Updater;
@@ -16,7 +19,7 @@ use Piwik\Updates;
 /**
  * @package Updates
  */
-class Piwik_Updates_0_6_3 extends Updates
+class Updates_0_6_3 extends Updates
 {
     static function getSql($schema = 'Myisam')
     {
diff --git a/core/Updates/0.7.php b/core/Updates/0.7.php
index 0cbcfb89f1..16b85ef37d 100644
--- a/core/Updates/0.7.php
+++ b/core/Updates/0.7.php
@@ -8,6 +8,9 @@
  * @category Piwik
  * @package Updates
  */
+
+namespace Piwik\Updates;
+
 use Piwik\Common;
 use Piwik\Updater;
 use Piwik\Updates;
@@ -15,7 +18,7 @@ use Piwik\Updates;
 /**
  * @package Updates
  */
-class Piwik_Updates_0_7 extends Updates
+class Updates_0_7 extends Updates
 {
     static function getSql($schema = 'Myisam')
     {
diff --git a/core/Updates/0.9.1.php b/core/Updates/0.9.1.php
index c50ca4843f..a1fa17e23b 100644
--- a/core/Updates/0.9.1.php
+++ b/core/Updates/0.9.1.php
@@ -8,6 +8,9 @@
  * @category Piwik
  * @package Updates
  */
+
+namespace Piwik\Updates;
+
 use Piwik\Common;
 use Piwik\SettingsServer;
 use Piwik\Updater;
@@ -16,7 +19,7 @@ use Piwik\Updates;
 /**
  * @package Updates
  */
-class Piwik_Updates_0_9_1 extends Updates
+class Updates_0_9_1 extends Updates
 {
     static function getSql($schema = 'Myisam')
     {
diff --git a/core/Updates/1.1.php b/core/Updates/1.1.php
index ee84f4b01c..26a3df6697 100644
--- a/core/Updates/1.1.php
+++ b/core/Updates/1.1.php
@@ -8,6 +8,9 @@
  * @category Piwik
  * @package Updates
  */
+
+namespace Piwik\Updates;
+
 use Piwik\Config;
 use Piwik\Piwik;
 use Piwik\Updates;
@@ -15,7 +18,7 @@ use Piwik\Updates;
 /**
  * @package Updates
  */
-class Piwik_Updates_1_1 extends Updates
+class Updates_1_1 extends Updates
 {
     static function update($schema = 'Myisam')
     {
diff --git a/core/Updates/1.10-b4.php b/core/Updates/1.10-b4.php
index ecf98b9d7c..0f4c2bc4c9 100755
--- a/core/Updates/1.10-b4.php
+++ b/core/Updates/1.10-b4.php
@@ -8,12 +8,15 @@
  * @category Piwik
  * @package Updates
  */
+
+namespace Piwik\Updates;
+
 use Piwik\Updates;
 
 /**
  * @package Updates
  */
-class Piwik_Updates_1_10_b4 extends Updates
+class Updates_1_10_b4 extends Updates
 {
     static function isMajorUpdate()
     {
diff --git a/core/Updates/1.10.1.php b/core/Updates/1.10.1.php
index f2649393b8..f21fad89c5 100755
--- a/core/Updates/1.10.1.php
+++ b/core/Updates/1.10.1.php
@@ -8,12 +8,15 @@
  * @category Piwik
  * @package Updates
  */
+
+namespace Piwik\Updates;
+
 use Piwik\Updates;
 
 /**
  * @package Updates
  */
-class Piwik_Updates_1_10_1 extends Updates
+class Updates_1_10_1 extends Updates
 {
     static function isMajorUpdate()
     {
diff --git a/core/Updates/1.10.2-b1.php b/core/Updates/1.10.2-b1.php
index 02df09fc16..129c5d49d5 100755
--- a/core/Updates/1.10.2-b1.php
+++ b/core/Updates/1.10.2-b1.php
@@ -8,6 +8,9 @@
  * @category Piwik
  * @package Updates
  */
+
+namespace Piwik\Updates;
+
 use Piwik\Common;
 use Piwik\Updater;
 use Piwik\Updates;
@@ -15,7 +18,7 @@ use Piwik\Updates;
 /**
  * @package Updates
  */
-class Piwik_Updates_1_10_2_b1 extends Updates
+class Updates_1_10_2_b1 extends Updates
 {
     static function getSql($schema = 'Myisam')
     {
diff --git a/core/Updates/1.10.2-b2.php b/core/Updates/1.10.2-b2.php
index b2ad85fb0e..d5f6ef460b 100644
--- a/core/Updates/1.10.2-b2.php
+++ b/core/Updates/1.10.2-b2.php
@@ -8,6 +8,9 @@
  * @category Piwik
  * @package Updates
  */
+
+namespace Piwik\Updates;
+
 use Piwik\Common;
 use Piwik\Updater;
 use Piwik\Updates;
@@ -15,7 +18,7 @@ use Piwik\Updates;
 /**
  * @package Updates
  */
-class Piwik_Updates_1_10_2_b2 extends Updates
+class Updates_1_10_2_b2 extends Updates
 {
     static function getSql($schema = 'Myisam')
     {
diff --git a/core/Updates/1.11-b1.php b/core/Updates/1.11-b1.php
index 82980a3c08..ebfc57e480 100644
--- a/core/Updates/1.11-b1.php
+++ b/core/Updates/1.11-b1.php
@@ -8,12 +8,15 @@
  * @category Piwik
  * @package Updates
  */
+
+namespace Piwik\Updates;
+
 use Piwik\Updates;
 
 /**
  * @package Updates
  */
-class Piwik_Updates_1_11_b1 extends Updates
+class Updates_1_11_b1 extends Updates
 {
     static function isMajorUpdate()
     {
diff --git a/core/Updates/1.12-b1.php b/core/Updates/1.12-b1.php
index 6e67fd5da0..e0c7b9a7fb 100644
--- a/core/Updates/1.12-b1.php
+++ b/core/Updates/1.12-b1.php
@@ -8,6 +8,9 @@
  * @category Piwik
  * @package Updates
  */
+
+namespace Piwik\Updates;
+
 use Piwik\Common;
 use Piwik\Updater;
 use Piwik\Updates;
@@ -15,7 +18,7 @@ use Piwik\Updates;
 /**
  * @package Updates
  */
-class Piwik_Updates_1_12_b1 extends Updates
+class Updates_1_12_b1 extends Updates
 {
     static function isMajorUpdate()
     {
diff --git a/core/Updates/1.12-b15.php b/core/Updates/1.12-b15.php
index 916af1f4c7..3c4b7f28b5 100644
--- a/core/Updates/1.12-b15.php
+++ b/core/Updates/1.12-b15.php
@@ -8,12 +8,15 @@
  * @category Piwik
  * @package Updates
  */
+
+namespace Piwik\Updates;
+
 use Piwik\Updates;
 
 /**
  * @package Updates
  */
-class Piwik_Updates_1_12_b15 extends Updates
+class Updates_1_12_b15 extends Updates
 {
     static function update()
     {
diff --git a/core/Updates/1.12-b16.php b/core/Updates/1.12-b16.php
index b7cdddc4ea..973107adc0 100644
--- a/core/Updates/1.12-b16.php
+++ b/core/Updates/1.12-b16.php
@@ -8,6 +8,9 @@
  * @category Piwik
  * @package Updates
  */
+
+namespace Piwik\Updates;
+
 use Piwik\Common;
 use Piwik\Updater;
 use Piwik\Updates;
@@ -15,7 +18,7 @@ use Piwik\Updates;
 /**
  * @package Updates
  */
-class Piwik_Updates_1_12_b16 extends Updates
+class Updates_1_12_b16 extends Updates
 {
     static function getSql($schema = 'Myisam')
     {
diff --git a/core/Updates/1.2-rc1.php b/core/Updates/1.2-rc1.php
index cd86d947f2..45c5250770 100644
--- a/core/Updates/1.2-rc1.php
+++ b/core/Updates/1.2-rc1.php
@@ -8,6 +8,9 @@
  * @category Piwik
  * @package Updates
  */
+
+namespace Piwik\Updates;
+
 use Piwik\Common;
 use Piwik\Updater;
 use Piwik\Updates;
@@ -15,7 +18,7 @@ use Piwik\Updates;
 /**
  * @package Updates
  */
-class Piwik_Updates_1_2_rc1 extends Updates
+class Updates_1_2_rc1 extends Updates
 {
     static function getSql($schema = 'Myisam')
     {
diff --git a/core/Updates/1.2-rc2.php b/core/Updates/1.2-rc2.php
index 681ee893fe..3fcbabb57b 100644
--- a/core/Updates/1.2-rc2.php
+++ b/core/Updates/1.2-rc2.php
@@ -8,12 +8,15 @@
  * @category Piwik
  * @package Updates
  */
+
+namespace Piwik\Updates;
+
 use Piwik\Updates;
 
 /**
  * @package Updates
  */
-class Piwik_Updates_1_2_rc2 extends Updates
+class Updates_1_2_rc2 extends Updates
 {
     static function update()
     {
diff --git a/core/Updates/1.2.3.php b/core/Updates/1.2.3.php
index 9c6d27ad7f..7f786e2d09 100644
--- a/core/Updates/1.2.3.php
+++ b/core/Updates/1.2.3.php
@@ -8,6 +8,9 @@
  * @category Piwik
  * @package Updates
  */
+
+namespace Piwik\Updates;
+
 use Piwik\Config;
 use Piwik\Common;
 use Piwik\Updater;
@@ -16,7 +19,7 @@ use Piwik\Updates;
 /**
  * @package Updates
  */
-class Piwik_Updates_1_2_3 extends Updates
+class Updates_1_2_3 extends Updates
 {
     static function getSql($schema = 'Myisam')
     {
diff --git a/core/Updates/1.2.5-rc1.php b/core/Updates/1.2.5-rc1.php
index f40242b59e..19e29173ee 100644
--- a/core/Updates/1.2.5-rc1.php
+++ b/core/Updates/1.2.5-rc1.php
@@ -8,6 +8,9 @@
  * @category Piwik
  * @package Updates
  */
+
+namespace Piwik\Updates;
+
 use Piwik\Common;
 use Piwik\Updater;
 use Piwik\Updates;
@@ -15,7 +18,7 @@ use Piwik\Updates;
 /**
  * @package Updates
  */
-class Piwik_Updates_1_2_5_rc1 extends Updates
+class Updates_1_2_5_rc1 extends Updates
 {
     static function getSql($schema = 'Myisam')
     {
diff --git a/core/Updates/1.2.5-rc7.php b/core/Updates/1.2.5-rc7.php
index 38a3883063..c828a01bca 100644
--- a/core/Updates/1.2.5-rc7.php
+++ b/core/Updates/1.2.5-rc7.php
@@ -8,6 +8,9 @@
  * @category Piwik
  * @package Updates
  */
+
+namespace Piwik\Updates;
+
 use Piwik\Common;
 use Piwik\Updater;
 use Piwik\Updates;
@@ -15,7 +18,7 @@ use Piwik\Updates;
 /**
  * @package Updates
  */
-class Piwik_Updates_1_2_5_rc7 extends Updates
+class Updates_1_2_5_rc7 extends Updates
 {
     static function getSql($schema = 'Myisam')
     {
diff --git a/core/Updates/1.4-rc1.php b/core/Updates/1.4-rc1.php
index b0e723357e..05a9e993c7 100644
--- a/core/Updates/1.4-rc1.php
+++ b/core/Updates/1.4-rc1.php
@@ -8,6 +8,9 @@
  * @category Piwik
  * @package Updates
  */
+
+namespace Piwik\Updates;
+
 use Piwik\Common;
 use Piwik\Updater;
 use Piwik\Updates;
@@ -15,15 +18,15 @@ use Piwik\Updates;
 /**
  * @package Updates
  */
-class Piwik_Updates_1_4_rc1 extends Updates
+class Updates_1_4_rc1 extends Updates
 {
     static function getSql($schema = 'Myisam')
     {
         return array(
-            'ALTER TABLE `' . Common::prefixTable('pdf') . '`
-		    	ADD COLUMN `format` VARCHAR(10)'                                                => false,
             'UPDATE `' . Common::prefixTable('pdf') . '`
-		    	SET format = "pdf"' => false,
+		    	SET format = "pdf"' => '42S22',
+            'ALTER TABLE `' . Common::prefixTable('pdf') . '`
+		    	ADD COLUMN `format` VARCHAR(10)' => '42S22',
         );
     }
 
diff --git a/core/Updates/1.4-rc2.php b/core/Updates/1.4-rc2.php
index 2689146890..053514047b 100644
--- a/core/Updates/1.4-rc2.php
+++ b/core/Updates/1.4-rc2.php
@@ -8,6 +8,9 @@
  * @category Piwik
  * @package Updates
  */
+
+namespace Piwik\Updates;
+
 use Piwik\Common;
 use Piwik\Updater;
 use Piwik\Updates;
@@ -15,7 +18,7 @@ use Piwik\Updates;
 /**
  * @package Updates
  */
-class Piwik_Updates_1_4_rc2 extends Updates
+class Updates_1_4_rc2 extends Updates
 {
     static function getSql($schema = 'Myisam')
     {
diff --git a/core/Updates/1.5-b1.php b/core/Updates/1.5-b1.php
index 61bf90f2c6..2933c978d3 100644
--- a/core/Updates/1.5-b1.php
+++ b/core/Updates/1.5-b1.php
@@ -8,6 +8,10 @@
  * @category Piwik
  * @package Updates
  */
+
+namespace Piwik\Updates;
+
+
 use Piwik\Common;
 use Piwik\Updater;
 use Piwik\Updates;
@@ -15,7 +19,7 @@ use Piwik\Updates;
 /**
  * @package Updates
  */
-class Piwik_Updates_1_5_b1 extends Updates
+class Updates_1_5_b1 extends Updates
 {
     static function getSql($schema = 'Myisam')
     {
diff --git a/core/Updates/1.5-b2.php b/core/Updates/1.5-b2.php
index 0ccf93285c..1359aaa24d 100644
--- a/core/Updates/1.5-b2.php
+++ b/core/Updates/1.5-b2.php
@@ -8,6 +8,9 @@
  * @category Piwik
  * @package Updates
  */
+
+namespace Piwik\Updates;
+
 use Piwik\Common;
 use Piwik\Updater;
 use Piwik\Updates;
@@ -15,7 +18,7 @@ use Piwik\Updates;
 /**
  * @package Updates
  */
-class Piwik_Updates_1_5_b2 extends Updates
+class Updates_1_5_b2 extends Updates
 {
     static function getSql($schema = 'Myisam')
     {
diff --git a/core/Updates/1.5-b3.php b/core/Updates/1.5-b3.php
index 908c2fbc6a..be7c73efc2 100644
--- a/core/Updates/1.5-b3.php
+++ b/core/Updates/1.5-b3.php
@@ -8,6 +8,9 @@
  * @category Piwik
  * @package Updates
  */
+
+namespace Piwik\Updates;
+
 use Piwik\Common;
 use Piwik\Updater;
 use Piwik\Updates;
@@ -15,7 +18,7 @@ use Piwik\Updates;
 /**
  * @package Updates
  */
-class Piwik_Updates_1_5_b3 extends Updates
+class Updates_1_5_b3 extends Updates
 {
     static function getSql($schema = 'Myisam')
     {
diff --git a/core/Updates/1.5-b4.php b/core/Updates/1.5-b4.php
index b7e62178cd..835a15db43 100644
--- a/core/Updates/1.5-b4.php
+++ b/core/Updates/1.5-b4.php
@@ -8,6 +8,9 @@
  * @category Piwik
  * @package Updates
  */
+
+namespace Piwik\Updates;
+
 use Piwik\Common;
 use Piwik\Updater;
 use Piwik\Updates;
@@ -15,7 +18,7 @@ use Piwik\Updates;
 /**
  * @package Updates
  */
-class Piwik_Updates_1_5_b4 extends Updates
+class Updates_1_5_b4 extends Updates
 {
     static function getSql($schema = 'Myisam')
     {
diff --git a/core/Updates/1.5-b5.php b/core/Updates/1.5-b5.php
index 8fa8c69102..7f85b0ff78 100644
--- a/core/Updates/1.5-b5.php
+++ b/core/Updates/1.5-b5.php
@@ -8,6 +8,9 @@
  * @category Piwik
  * @package Updates
  */
+
+namespace Piwik\Updates;
+
 use Piwik\Common;
 use Piwik\Updater;
 use Piwik\Updates;
@@ -15,7 +18,7 @@ use Piwik\Updates;
 /**
  * @package Updates
  */
-class Piwik_Updates_1_5_b5 extends Updates
+class Updates_1_5_b5 extends Updates
 {
     static function getSql($schema = 'Myisam')
     {
diff --git a/core/Updates/1.5-rc6.php b/core/Updates/1.5-rc6.php
index 0de1b76d18..10366e30bd 100644
--- a/core/Updates/1.5-rc6.php
+++ b/core/Updates/1.5-rc6.php
@@ -8,12 +8,15 @@
  * @category Piwik
  * @package Updates
  */
+
+namespace Piwik\Updates;
+
 use Piwik\Updates;
 
 /**
  * @package Updates
  */
-class Piwik_Updates_1_5_rc6 extends Updates
+class Updates_1_5_rc6 extends Updates
 {
     static function update()
     {
diff --git a/core/Updates/1.6-b1.php b/core/Updates/1.6-b1.php
index b0cff7f57d..ba3cd3b778 100644
--- a/core/Updates/1.6-b1.php
+++ b/core/Updates/1.6-b1.php
@@ -8,6 +8,9 @@
  * @category Piwik
  * @package Updates
  */
+
+namespace Piwik\Updates;
+
 use Piwik\Common;
 use Piwik\Updater;
 use Piwik\Updates;
@@ -15,7 +18,7 @@ use Piwik\Updates;
 /**
  * @package Updates
  */
-class Piwik_Updates_1_6_b1 extends Updates
+class Updates_1_6_b1 extends Updates
 {
     static function getSql($schema = 'Myisam')
     {
diff --git a/core/Updates/1.6-rc1.php b/core/Updates/1.6-rc1.php
index 2abd9983a9..3f900b3934 100644
--- a/core/Updates/1.6-rc1.php
+++ b/core/Updates/1.6-rc1.php
@@ -8,12 +8,15 @@
  * @category Piwik
  * @package Updates
  */
+
+namespace Piwik\Updates;
+
 use Piwik\Updates;
 
 /**
  * @package Updates
  */
-class Piwik_Updates_1_6_rc1 extends Updates
+class Updates_1_6_rc1 extends Updates
 {
     static function update()
     {
diff --git a/core/Updates/1.7-b1.php b/core/Updates/1.7-b1.php
index 7a9d5f00b3..6142722a71 100644
--- a/core/Updates/1.7-b1.php
+++ b/core/Updates/1.7-b1.php
@@ -8,6 +8,9 @@
  * @category Piwik
  * @package Updates
  */
+
+namespace Piwik\Updates;
+
 use Piwik\Common;
 use Piwik\Updater;
 use Piwik\Updates;
@@ -15,7 +18,7 @@ use Piwik\Updates;
 /**
  * @package Updates
  */
-class Piwik_Updates_1_7_b1 extends Updates
+class Updates_1_7_b1 extends Updates
 {
     static function getSql($schema = 'Myisam')
     {
diff --git a/core/Updates/1.7.2-rc5.php b/core/Updates/1.7.2-rc5.php
index 85848e0428..a00f1f7eb6 100644
--- a/core/Updates/1.7.2-rc5.php
+++ b/core/Updates/1.7.2-rc5.php
@@ -8,6 +8,9 @@
  * @category Piwik
  * @package Updates
  */
+
+namespace Piwik\Updates;
+
 use Piwik\Common;
 use Piwik\Updater;
 use Piwik\Updates;
@@ -15,7 +18,7 @@ use Piwik\Updates;
 /**
  * @package Updates
  */
-class Piwik_Updates_1_7_2_rc5 extends Updates
+class Updates_1_7_2_rc5 extends Updates
 {
     static function getSql($schema = 'Myisam')
     {
diff --git a/core/Updates/1.7.2-rc7.php b/core/Updates/1.7.2-rc7.php
index 42a3234d12..68c7b17d6d 100755
--- a/core/Updates/1.7.2-rc7.php
+++ b/core/Updates/1.7.2-rc7.php
@@ -8,6 +8,9 @@
  * @category Piwik
  * @package Updates
  */
+
+namespace Piwik\Updates;
+
 use Piwik\Common;
 use Piwik\Updater;
 use Piwik\Updates;
@@ -16,7 +19,7 @@ use Piwik\Db;
 /**
  * @package Updates
  */
-class Piwik_Updates_1_7_2_rc7 extends Updates
+class Updates_1_7_2_rc7 extends Updates
 {
     static function getSql($schema = 'Myisam')
     {
diff --git a/core/Updates/1.8.3-b1.php b/core/Updates/1.8.3-b1.php
index 0e539bea5d..e5dcb14980 100644
--- a/core/Updates/1.8.3-b1.php
+++ b/core/Updates/1.8.3-b1.php
@@ -8,6 +8,9 @@
  * @category Piwik‚
  * @package Updates
  */
+
+namespace Piwik\Updates;
+
 use Piwik\Common;
 use Piwik\Plugins\ScheduledReports\ScheduledReports;
 use Piwik\Updater;
@@ -17,7 +20,7 @@ use Piwik\Db;
 /**
  * @package Updates
  */
-class Piwik_Updates_1_8_3_b1 extends Updates
+class Updates_1_8_3_b1 extends Updates
 {
 
     static function getSql($schema = 'Myisam')
diff --git a/core/Updates/1.8.4-b1.php b/core/Updates/1.8.4-b1.php
index 01ab183671..ede4838e91 100644
--- a/core/Updates/1.8.4-b1.php
+++ b/core/Updates/1.8.4-b1.php
@@ -8,6 +8,9 @@
  * @category Piwik
  * @package Updates
  */
+
+namespace Piwik\Updates;
+
 use Piwik\Common;
 use Piwik\Updater;
 use Piwik\Updates;
@@ -15,7 +18,7 @@ use Piwik\Updates;
 /**
  * @package Updates
  */
-class Piwik_Updates_1_8_4_b1 extends Updates
+class Updates_1_8_4_b1 extends Updates
 {
 
     static function isMajorUpdate()
diff --git a/core/Updates/1.9-b16.php b/core/Updates/1.9-b16.php
index dcbecc25b1..63d4b2c981 100755
--- a/core/Updates/1.9-b16.php
+++ b/core/Updates/1.9-b16.php
@@ -8,6 +8,9 @@
  * @category Piwik
  * @package Updates
  */
+
+namespace Piwik\Updates;
+
 use Piwik\Common;
 use Piwik\Updater;
 use Piwik\Updates;
@@ -15,7 +18,7 @@ use Piwik\Updates;
 /**
  * @package Updates
  */
-class Piwik_Updates_1_9_b16 extends Updates
+class Updates_1_9_b16 extends Updates
 {
     static function isMajorUpdate()
     {
diff --git a/core/Updates/1.9-b19.php b/core/Updates/1.9-b19.php
index 8933e46c95..c372e3d56b 100755
--- a/core/Updates/1.9-b19.php
+++ b/core/Updates/1.9-b19.php
@@ -8,6 +8,9 @@
  * @category Piwik
  * @package Updates
  */
+
+namespace Piwik\Updates;
+
 use Piwik\Common;
 use Piwik\Updater;
 use Piwik\Updates;
@@ -15,7 +18,7 @@ use Piwik\Updates;
 /**
  * @package Updates
  */
-class Piwik_Updates_1_9_b19 extends Updates
+class Updates_1_9_b19 extends Updates
 {
     static function getSql($schema = 'Myisam')
     {
diff --git a/core/Updates/1.9-b9.php b/core/Updates/1.9-b9.php
index 1f2fd7f6a0..8801c24b21 100755
--- a/core/Updates/1.9-b9.php
+++ b/core/Updates/1.9-b9.php
@@ -8,6 +8,9 @@
  * @category Piwik
  * @package Updates
  */
+
+namespace Piwik\Updates;
+
 use Piwik\Common;
 use Piwik\Updater;
 use Piwik\Updates;
@@ -15,7 +18,7 @@ use Piwik\Updates;
 /**
  * @package Updates
  */
-class Piwik_Updates_1_9_b9 extends Updates
+class Updates_1_9_b9 extends Updates
 {
     static function isMajorUpdate()
     {
diff --git a/core/Updates/1.9.1-b2.php b/core/Updates/1.9.1-b2.php
index f6c5642154..fd80f0be11 100644
--- a/core/Updates/1.9.1-b2.php
+++ b/core/Updates/1.9.1-b2.php
@@ -8,6 +8,9 @@
  * @category Piwik
  * @package Updates
  */
+
+namespace Piwik\Updates;
+
 use Piwik\Common;
 use Piwik\Updater;
 use Piwik\Updates;
@@ -15,7 +18,7 @@ use Piwik\Updates;
 /**
  * @package Updates
  */
-class Piwik_Updates_1_9_1_b2 extends Updates
+class Updates_1_9_1_b2 extends Updates
 {
     static function getSql($schema = 'Myisam')
     {
diff --git a/core/Updates/1.9.3-b10.php b/core/Updates/1.9.3-b10.php
index c7dc2bb1f7..620d08f4e2 100755
--- a/core/Updates/1.9.3-b10.php
+++ b/core/Updates/1.9.3-b10.php
@@ -8,12 +8,15 @@
  * @category Piwik
  * @package Updates
  */
+
+namespace Piwik\Updates;
+
 use Piwik\Updates;
 
 /**
  * @package Updates
  */
-class Piwik_Updates_1_9_3_b10 extends Updates
+class Updates_1_9_3_b10 extends Updates
 {
     static function isMajorUpdate()
     {
diff --git a/core/Updates/1.9.3-b3.php b/core/Updates/1.9.3-b3.php
index 3b317e96ba..149af3bd0b 100644
--- a/core/Updates/1.9.3-b3.php
+++ b/core/Updates/1.9.3-b3.php
@@ -8,12 +8,15 @@
  * @category Piwik
  * @package Updates
  */
+
+namespace Piwik\Updates;
+
 use Piwik\Updates;
 
 /**
  * @package Updates
  */
-class Piwik_Updates_1_9_3_b3 extends Updates
+class Updates_1_9_3_b3 extends Updates
 {
     static function update()
     {
diff --git a/core/Updates/1.9.3-b8.php b/core/Updates/1.9.3-b8.php
index 19954482ba..b588855846 100755
--- a/core/Updates/1.9.3-b8.php
+++ b/core/Updates/1.9.3-b8.php
@@ -8,6 +8,9 @@
  * @category Piwik
  * @package Updates
  */
+
+namespace Piwik\Updates;
+
 use Piwik\Common;
 use Piwik\Updater;
 use Piwik\Updates;
@@ -15,7 +18,7 @@ use Piwik\Updates;
 /**
  * @package Updates
  */
-class Piwik_Updates_1_9_3_b8 extends Updates
+class Updates_1_9_3_b8 extends Updates
 {
     static function getSql($schema = 'Myisam')
     {
diff --git a/core/Updates/2.0-a12.php b/core/Updates/2.0-a12.php
index 0ab449639b..e29c1a1e0b 100644
--- a/core/Updates/2.0-a12.php
+++ b/core/Updates/2.0-a12.php
@@ -8,6 +8,8 @@
  * @category Piwik
  * @package Piwik
  */
+namespace Piwik\Updates;
+
 use Piwik\Common;
 use Piwik\Updater;
 use Piwik\Updates;
@@ -16,7 +18,7 @@ use Piwik\Db;
 /**
  * @package Updates
  */
-class Piwik_Updates_2_0_a12 extends Updates
+class Updates_2_0_a12 extends Updates
 {
     public static function getSql($schema = 'Myisam')
     {
diff --git a/core/Updates/2.0-a13.php b/core/Updates/2.0-a13.php
index bd6b070b4f..631fd8c67e 100644
--- a/core/Updates/2.0-a13.php
+++ b/core/Updates/2.0-a13.php
@@ -8,7 +8,10 @@
  * @category Piwik
  * @package Piwik
  */
+namespace Piwik\Updates;
+
 use Piwik\Common;
+use Piwik\Filesystem;
 use Piwik\Updater;
 use Piwik\Updates;
 use Piwik\Db;
@@ -16,7 +19,7 @@ use Piwik\Db;
 /**
  * @package Updates
  */
-class Piwik_Updates_2_0_a13 extends Updates
+class Updates_2_0_a13 extends Updates
 {
     public static function getSql($schema = 'Myisam')
     {
@@ -50,6 +53,7 @@ class Piwik_Updates_2_0_a13 extends Updates
         \Piwik\Option::getInstance()->delete('version_Referers');
 
         Updater::updateDatabase(__FILE__, self::getSql());
+
         // Deleting old plugins
         $obsoleteDirectories = array(
             PIWIK_INCLUDE_PATH . '/plugins/Referers',
@@ -61,8 +65,6 @@ class Piwik_Updates_2_0_a13 extends Updates
             }
         }
 
-        \Piwik\PluginsManager::getInstance()->deactivatePlugin('Referers');
-        \Piwik\PluginsManager::getInstance()->deactivatePlugin('PDFReports');
 
         try {
             \Piwik\PluginsManager::getInstance()->activatePlugin('Referrers');
diff --git a/core/Updates/2.0-a7.php b/core/Updates/2.0-a7.php
index 2391476d1b..1086997540 100644
--- a/core/Updates/2.0-a7.php
+++ b/core/Updates/2.0-a7.php
@@ -8,6 +8,9 @@
  * @category Piwik
  * @package Piwik
  */
+
+namespace Piwik\Updates;
+
 use Piwik\Common;
 use Piwik\Updater;
 use Piwik\Updates;
@@ -15,7 +18,7 @@ use Piwik\Updates;
 /**
  * @package Updates
  */
-class Piwik_Updates_2_0_a7 extends Updates
+class Updates_2_0_a7 extends Updates
 {
     static function getSql($schema = 'Myisam')
     {