Refs #4059 Converting updates files to use namespaces

core/Filechecks.php

@@ -112,13 +112,14 @@ public static function getFileIntegrityInformation()
         $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;
 

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 @@ public function dispatch($module = null, $action = null, $parameters = null)
             throw new PluginDeactivatedException($module);
         }
 
-        $controllerClassName = $this->getClassNameController( $module );
+        $controllerClassName = $this->getClassNameController($module);
 
         // FrontController's autoloader
         if (!class_exists($controllerClassName, false)) {
@@ -115,15 +87,49 @@ public function dispatch($module = null, $action = null, $parameters = null)
         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));
 

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 @@
 /**
  * @package Updates
  */
-class Piwik_Updates_0_2_10 extends Updates
+class Updates_0_2_10 extends Updates
 {
     static function getSql($schema = 'Myisam')
     {

core/Updates/0.2.12.php

@@ -8,14 +8,17 @@
  * @category Piwik
  * @package Updates
  */
+
+namespace Piwik\Updates;
+
 use Piwik\Common;
 use Piwik\Updater;
 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')
     {

core/Updates/0.2.13.php

@@ -8,14 +8,17 @@
  * @category Piwik
  * @package Updates
  */
+
+namespace Piwik\Updates;
+
 use Piwik\Common;
 use Piwik\Updater;
 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')
     {

core/Updates/0.2.24.php

@@ -8,14 +8,17 @@
  * @category Piwik
  * @package Updates
  */
+
+namespace Piwik\Updates;
+
 use Piwik\Common;
 use Piwik\Updater;
 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')
     {

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 @@
 /**
  * @package Updates
  */
-class Piwik_Updates_0_2_27 extends Updates
+class Updates_0_2_27 extends Updates
 {
     static function getSql($schema = 'Myisam')
     {

core/Updates/0.2.32.php

@@ -8,14 +8,17 @@
  * @category Piwik
  * @package Updates
  */
+
+namespace Piwik\Updates;
+
 use Piwik\Common;
 use Piwik\Updater;
 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')
     {

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 @@
 /**
  * @package Updates
  */
-class Piwik_Updates_0_2_33 extends Updates
+class Updates_0_2_33 extends Updates
 {
     static function getSql($schema = 'Myisam')
     {

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 @@
 /**
  * @package Updates
  */
-class Piwik_Updates_0_2_34 extends Updates
+class Updates_0_2_34 extends Updates
 {
     static function update($schema = 'Myisam')
     {

core/Updates/0.2.35.php

@@ -8,14 +8,17 @@
  * @category Piwik
  * @package Updates
  */
+
+namespace Piwik\Updates;
+
 use Piwik\Common;
 use Piwik\Updater;
 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')
     {

core/Updates/0.2.37.php

@@ -8,14 +8,17 @@
  * @category Piwik
  * @package Updates
  */
+
+namespace Piwik\Updates;
+
 use Piwik\Common;
 use Piwik\Updater;
 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')
     {

core/Updates/0.4.1.php

@@ -8,14 +8,17 @@
  * @category Piwik
  * @package Updates
  */
+
+namespace Piwik\Updates;
+
 use Piwik\Common;
 use Piwik\Updater;
 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')
     {

core/Updates/0.4.2.php

@@ -8,14 +8,17 @@
  * @category Piwik
  * @package Updates
  */
+
+namespace Piwik\Updates;
+
 use Piwik\Common;
 use Piwik\Updater;
 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')
     {

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()
     {

core/Updates/0.4.php

@@ -8,14 +8,17 @@
  * @category Piwik
  * @package Updates
  */
+
+namespace Piwik\Updates;
+
 use Piwik\Common;
 use Piwik\Updater;
 use Piwik\Updates;
 
 /**
  * @package Updates
  */
-class Piwik_Updates_0_4 extends Updates
+class Updates_0_4 extends Updates
 {
     static function getSql($schema = 'Myisam')
     {