Merge with Master + fix build + Namespaces conquest check

5 files changed, 23 insertions, 13 deletions

diff --git a/plugins/MobileMessaging/MobileMessaging.php b/plugins/MobileMessaging/MobileMessaging.php
index a7e845a0c2..fecec9de43 100644
--- a/plugins/MobileMessaging/MobileMessaging.php
+++ b/plugins/MobileMessaging/MobileMessaging.php
@@ -14,8 +14,8 @@ use Piwik\Piwik;
 use Piwik\Plugins\MobileMessaging\API as MobileMessagingAPI;
 use Piwik\View;
 use Piwik\Plugins\API\API;
-use Piwik_MobileMessaging_ReportRenderer_Exception;
-use Piwik_MobileMessaging_ReportRenderer_Sms;
+use Piwik\Plugins\MobileMessaging\ReportRenderer\ReportRendererException;
+use Piwik\Plugins\MobileMessaging\ReportRenderer\Sms;
 use Piwik\Plugins\PDFReports\API as PDFReportsAPI;
 
 /**
@@ -167,9 +167,9 @@ class MobileMessaging extends \Piwik\Plugin
     {
         if (self::manageEvent($info)) {
             if (\Piwik\PluginsManager::getInstance()->isPluginActivated('MultiSites')) {
-                $reportRenderer = new Piwik_MobileMessaging_ReportRenderer_Sms();
+                $reportRenderer = new Sms();
             } else {
-                $reportRenderer = new Piwik_MobileMessaging_ReportRenderer_Exception(
+                $reportRenderer = new ReportRendererException(
                     Piwik_Translate('MobileMessaging_MultiSites_Must_Be_Activated')
                 );
             }
diff --git a/plugins/MobileMessaging/ReportRenderer/Exception.php b/plugins/MobileMessaging/ReportRenderer/ReportRendererException.php
index cc5b137a38..338dce98f6 100644
--- a/plugins/MobileMessaging/ReportRenderer/Exception.php
+++ b/plugins/MobileMessaging/ReportRenderer/ReportRendererException.php
@@ -8,13 +8,16 @@
  * @category Piwik_Plugins
  * @package Piwik_MobileMessaging_ReportRenderer
  */
+namespace Piwik\Plugins\MobileMessaging\ReportRenderer;
+
 use Piwik\ReportRenderer;
+use Piwik\Plugins\MobileMessaging\ReportRenderer\Sms;
 
 /**
  *
  * @package Piwik_MobileMessaging_ReportRenderer
  */
-class Piwik_MobileMessaging_ReportRenderer_Exception extends ReportRenderer
+class ReportRendererException extends ReportRenderer
 {
     private $rendering = "";
 
@@ -32,7 +35,7 @@ class Piwik_MobileMessaging_ReportRenderer_Exception extends ReportRenderer
     {
         return ReportRenderer::writeFile(
             $filename,
-            Piwik_MobileMessaging_ReportRenderer_Sms::SMS_FILE_EXTENSION,
+            Sms::SMS_FILE_EXTENSION,
             $this->rendering
         );
     }
@@ -41,8 +44,8 @@ class Piwik_MobileMessaging_ReportRenderer_Exception extends ReportRenderer
     {
         ReportRenderer::sendToBrowser(
             $filename,
-            Piwik_MobileMessaging_ReportRenderer_Sms::SMS_FILE_EXTENSION,
-            Piwik_MobileMessaging_ReportRenderer_Sms::SMS_CONTENT_TYPE,
+            Sms::SMS_FILE_EXTENSION,
+            Sms::SMS_CONTENT_TYPE,
             $this->rendering
         );
     }
@@ -50,7 +53,7 @@ class Piwik_MobileMessaging_ReportRenderer_Exception extends ReportRenderer
     public function sendToBrowserInline($filename)
     {
         ReportRenderer::inlineToBrowser(
-            Piwik_MobileMessaging_ReportRenderer_Sms::SMS_CONTENT_TYPE,
+            Sms::SMS_CONTENT_TYPE,
             $this->rendering
         );
     }
diff --git a/plugins/MobileMessaging/ReportRenderer/Sms.php b/plugins/MobileMessaging/ReportRenderer/Sms.php
index 2bd3239bdb..6d7abbf71c 100644
--- a/plugins/MobileMessaging/ReportRenderer/Sms.php
+++ b/plugins/MobileMessaging/ReportRenderer/Sms.php
@@ -8,6 +8,8 @@
  * @category Piwik_Plugins
  * @package Piwik_MobileMessaging_ReportRenderer
  */
+namespace Piwik\Plugins\MobileMessaging\ReportRenderer;
+
 use Piwik\Common;
 use Piwik\Plugins\MultiSites\API;
 use Piwik\View;
@@ -18,7 +20,7 @@ use Piwik\Site;
  *
  * @package Piwik_MobileMessaging_ReportRenderer
  */
-class Piwik_MobileMessaging_ReportRenderer_Sms extends ReportRenderer
+class Sms extends ReportRenderer
 {
     const FLOAT_REGEXP = '/[-+]?[0-9]*[\.,]?[0-9]+/';
     const SMS_CONTENT_TYPE = 'text/plain';
diff --git a/plugins/MobileMessaging/SMSProvider/Clockwork.php b/plugins/MobileMessaging/SMSProvider/Clockwork.php
index 817220afb0..da0b07ba1e 100644
--- a/plugins/MobileMessaging/SMSProvider/Clockwork.php
+++ b/plugins/MobileMessaging/SMSProvider/Clockwork.php
@@ -9,6 +9,9 @@
  * @package SMSProvider
  */
 
+namespace Piwik\Plugins\MobileMessaging\SMSProvider;
+
+use Exception;
 use Piwik\Http;
 use Piwik\Plugins\MobileMessaging\APIException;
 use Piwik\Plugins\MobileMessaging\SMSProvider;
@@ -18,7 +21,7 @@ require_once PIWIK_INCLUDE_PATH . "/plugins/MobileMessaging/APIException.php";
  *
  * @package SMSProvider
  */
-class Piwik_MobileMessaging_SMSProvider_Clockwork extends SMSProvider
+class Clockwork extends SMSProvider
 {
     const SOCKET_TIMEOUT = 15;
 
@@ -85,7 +88,7 @@ class Piwik_MobileMessaging_SMSProvider_Clockwork extends SMSProvider
                 $acceptLanguage = false,
                 $acceptInvalidSslCertificate = true
             );
-        } catch(Exception $e) {
+        } catch (Exception $e) {
             $result = self::ERROR_STRING . " " . $e->getMessage();
         }
 
diff --git a/plugins/MobileMessaging/SMSProvider/StubbedProvider.php b/plugins/MobileMessaging/SMSProvider/StubbedProvider.php
index 56f7d8c0f5..33a4339f8b 100644
--- a/plugins/MobileMessaging/SMSProvider/StubbedProvider.php
+++ b/plugins/MobileMessaging/SMSProvider/StubbedProvider.php
@@ -8,6 +8,8 @@
  * @category Piwik_Plugins
  * @package SMSProvider
  */
+namespace Piwik\Plugins\MobileMessaging\SMSProvider;
+
 use Piwik\Plugins\MobileMessaging\SMSProvider;
 
 /**
@@ -15,7 +17,7 @@ use Piwik\Plugins\MobileMessaging\SMSProvider;
  *
  * @package SMSProvider
  */
-class Piwik_MobileMessaging_SMSProvider_StubbedProvider extends SMSProvider
+class StubbedProvider extends SMSProvider
 {
 
     public function verifyCredential($apiKey)