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

4 files changed, 53 insertions, 46 deletions

diff --git a/plugins/CustomVariables/API.php b/plugins/CustomVariables/API.php
index fb3e88456e..21bdca1f55 100644
--- a/plugins/CustomVariables/API.php
+++ b/plugins/CustomVariables/API.php
@@ -6,25 +6,28 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  *
  * @category Piwik_Plugins
- * @package Piwik_CustomVariables
+ * @package CustomVariables
  */
+namespace Piwik\Plugins\CustomVariables;
+
 use Piwik\Archive;
 use Piwik\Metrics;
 use Piwik\Date;
 use Piwik\DataTable;
 use Piwik\Tracker\Action;
+use Piwik\Plugins\CustomVariables\Archiver;
 
 /**
  * The Custom Variables API lets you access reports for your <a href='http://piwik.org/docs/custom-variables/' target='_blank'>Custom Variables</a> names and values.
  *
- * @package Piwik_CustomVariables
+ * @package CustomVariables
  */
-class Piwik_CustomVariables_API
+class API
 {
     static private $instance = null;
 
     /**
-     * @return Piwik_CustomVariables_API
+     * @return \Piwik\Plugins\CustomVariables\API
      */
     static public function getInstance()
     {
@@ -46,7 +49,7 @@ class Piwik_CustomVariables_API
      */
     protected function getDataTable($idSite, $period, $date, $segment, $expanded, $idSubtable)
     {
-        $dataTable = Archive::getDataTableFromArchive(Piwik_CustomVariables_Archiver::CUSTOM_VARIABLE_RECORD_NAME, $idSite, $period, $date, $segment, $expanded, $idSubtable);
+        $dataTable = Archive::getDataTableFromArchive(Archiver::CUSTOM_VARIABLE_RECORD_NAME, $idSite, $period, $date, $segment, $expanded, $idSubtable);
         $dataTable->filter('Sort', array(Metrics::INDEX_NB_ACTIONS, 'desc', $naturalSort = false, $expanded));
         $dataTable->queueFilter('ReplaceColumnNames');
         $dataTable->queueFilter('ColumnDelete', 'nb_uniq_visitors');
@@ -111,7 +114,7 @@ class Piwik_CustomVariables_API
             $dataTable->renameColumn('price_viewed', 'price');
         }
         $dataTable->queueFilter('ColumnCallbackReplace', array('label', create_function('$label', '
-			return $label == Piwik_CustomVariables_Archiver::LABEL_CUSTOM_VALUE_NOT_DEFINED
+			return $label == \\Piwik\\Plugins\\CustomVariables\\Archiver::LABEL_CUSTOM_VALUE_NOT_DEFINED
 				? "' . Piwik_Translate('General_NotDefined', Piwik_Translate('CustomVariables_ColumnCustomVariableValue')) . '"
 				: $label;')));
         return $dataTable;
diff --git a/plugins/CustomVariables/Archiver.php b/plugins/CustomVariables/Archiver.php
index e26bb0a254..d4d3cb7884 100644
--- a/plugins/CustomVariables/Archiver.php
+++ b/plugins/CustomVariables/Archiver.php
@@ -1,24 +1,27 @@
 <?php
+/**
+ * Piwik - Open source web analytics
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ * @category Piwik_Plugins
+ * @package CustomVariables
+ */
+namespace Piwik\Plugins\CustomVariables;
+
 use Piwik\Common;
 use Piwik\Config;
 use Piwik\DataAccess\LogAggregator;
 use Piwik\Metrics;
 use Piwik\DataArray;
+use Piwik\Plugins\CustomVariables\API;
 use Piwik\Tracker;
 use Piwik\PluginsArchiver;
 use Piwik\Tracker\GoalManager;
 
-/**
- * Piwik - Open source web analytics
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- * @category Piwik_Plugins
- * @package Piwik_CustomVariables
- */
 
-class Piwik_CustomVariables_Archiver extends PluginsArchiver
+class Archiver extends PluginsArchiver
 {
     const LABEL_CUSTOM_VALUE_NOT_DEFINED = "Value not defined";
     const CUSTOM_VARIABLE_RECORD_NAME = 'CustomVariables_valueByName';
@@ -71,8 +74,8 @@ class Piwik_CustomVariables_Archiver extends PluginsArchiver
         // then we also query the "Product page view" price which was possibly recorded.
         $additionalSelects = false;
         // FIXMEA
-        if (in_array($slot, array(3,4,5))) {
-            $additionalSelects = array( $this->getSelectAveragePrice() );
+        if (in_array($slot, array(3, 4, 5))) {
+            $additionalSelects = array($this->getSelectAveragePrice());
         }
         $query = $this->getLogAggregator()->queryActionsByDimension($dimensions, $where, $additionalSelects);
         $this->aggregateFromActions($query, $keyField, $valueField);
@@ -106,7 +109,6 @@ class Piwik_CustomVariables_Archiver extends PluginsArchiver
         return self::LABEL_CUSTOM_VALUE_NOT_DEFINED;
     }
 
-
     protected function aggregateFromActions($query, $keyField, $valueField)
     {
         while ($row = $query->fetch()) {
@@ -171,10 +173,9 @@ class Piwik_CustomVariables_Archiver extends PluginsArchiver
 
     protected static function isReservedKey($key)
     {
-        return in_array($key, Piwik_CustomVariables_API::getReservedCustomVariableKeys());
+        return in_array($key, API::getReservedCustomVariableKeys());
     }
 
-
     protected function aggregateFromConversions($query, $keyField, $valueField)
     {
         if ($query === false) {
@@ -190,7 +191,7 @@ class Piwik_CustomVariables_Archiver extends PluginsArchiver
 
     protected function removeVisitsMetricsFromActionsAggregate()
     {
-        $dataArray = &$this->dataArray->getDataArray();
+        $dataArray = & $this->dataArray->getDataArray();
         foreach ($dataArray as $key => &$row) {
             if (!self::isReservedKey($key)
                 && DataArray::isRowActions($row)
diff --git a/plugins/CustomVariables/Controller.php b/plugins/CustomVariables/Controller.php
index 5607e2c630..da88d4e66e 100644
--- a/plugins/CustomVariables/Controller.php
+++ b/plugins/CustomVariables/Controller.php
@@ -6,16 +6,17 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  *
  * @category Piwik_Plugins
- * @package Piwik_CustomVariables
+ * @package CustomVariables
  */
-use Piwik\Controller;
+namespace Piwik\Plugins\CustomVariables;
+
 use Piwik\ViewDataTable;
 use Piwik\View;
 
 /**
- * @package Piwik_CustomVariables
+ * @package CustomVariables
  */
-class Piwik_CustomVariables_Controller extends Controller
+class Controller extends \Piwik\Controller
 {
     public function index($fetch = false)
     {
diff --git a/plugins/CustomVariables/CustomVariables.php b/plugins/CustomVariables/CustomVariables.php
index 30ebb6b580..45bc3fa14b 100644
--- a/plugins/CustomVariables/CustomVariables.php
+++ b/plugins/CustomVariables/CustomVariables.php
@@ -6,17 +6,19 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  *
  * @category Piwik_Plugins
- * @package Piwik_CustomVariables
+ * @package CustomVariables
  */
+namespace Piwik\Plugins\CustomVariables;
+
 use Piwik\ArchiveProcessor;
+use Piwik\Plugins\CustomVariables\Archiver;
 use Piwik\Tracker;
-use Piwik\Plugin;
 use Piwik\WidgetsList;
 
 /**
- * @package Piwik_CustomVariables
+ * @package CustomVariables
  */
-class Piwik_CustomVariables extends Plugin
+class CustomVariables extends \Piwik\Plugin
 {
     public function getInformation()
     {
@@ -137,16 +139,16 @@ class Piwik_CustomVariables extends Plugin
      */
     public function archiveDay(ArchiveProcessor\Day $archiveProcessor)
     {
-        $archiving = new Piwik_CustomVariables_Archiver($archiveProcessor);
-        if($archiving->shouldArchive()) {
+        $archiving = new Archiver($archiveProcessor);
+        if ($archiving->shouldArchive()) {
             $archiving->archiveDay();
         }
     }
 
     public function archivePeriod(ArchiveProcessor\Period $archiveProcessor)
     {
-        $archiving = new Piwik_CustomVariables_Archiver($archiveProcessor);
-        if($archiving->shouldArchive()) {
+        $archiving = new Archiver($archiveProcessor);
+        if ($archiving->shouldArchive()) {
             $archiving->archivePeriod();
         }
     }
@@ -164,26 +166,26 @@ class Piwik_CustomVariables extends Plugin
             array('<a target="_blank" href="http://piwik.org/docs/custom-variables/">', '</a>'));
 
         return array(
-            'columns_to_display' => array('label', 'nb_actions', 'nb_visits'),
-            'filter_sort_column' => 'nb_actions',
-            'filter_sort_order' => 'desc',
-            'show_goals' => true,
+            'columns_to_display'         => array('label', 'nb_actions', 'nb_visits'),
+            'filter_sort_column'         => 'nb_actions',
+            'filter_sort_order'          => 'desc',
+            'show_goals'                 => true,
             'subtable_controller_action' => 'getCustomVariablesValuesFromNameId',
-            'translations' => array('label' => Piwik_Translate('CustomVariables_ColumnCustomVariableName')),
-            'show_footer_message' => $footerMessage
+            'translations'               => array('label' => Piwik_Translate('CustomVariables_ColumnCustomVariableName')),
+            'show_footer_message'        => $footerMessage
         );
     }
 
     private function getDisplayPropertiesForGetCustomVariablesValuesFromNameId()
     {
         return array(
-            'columns_to_display' => array('label', 'nb_actions', 'nb_visits'),
-            'filter_sort_column' => 'nb_actions',
-            'filter_sort_order' => 'desc',
-            'show_goals' => true,
-            'show_search' => false,
+            'columns_to_display'          => array('label', 'nb_actions', 'nb_visits'),
+            'filter_sort_column'          => 'nb_actions',
+            'filter_sort_order'           => 'desc',
+            'show_goals'                  => true,
+            'show_search'                 => false,
             'show_exclude_low_population' => false,
-            'translations' => array('label' => Piwik_Translate('CustomVariables_ColumnCustomVariableValue'))
+            'translations'                => array('label' => Piwik_Translate('CustomVariables_ColumnCustomVariableValue'))
         );
     }
 }