Refs #4059 Work in progress: Conversion to use Namespaces: Period*, Metrics, Segment, SegmentExpression, PluginsManager.

Removed some deprecated code.

4 files changed, 26 insertions, 22 deletions

diff --git a/plugins/DBStats/API.php b/plugins/DBStats/API.php
index 0c4a4d1e53..46b3666c02 100644
--- a/plugins/DBStats/API.php
+++ b/plugins/DBStats/API.php
@@ -10,6 +10,7 @@
  */
 use Piwik\Piwik;
 use Piwik\Common;
+use Piwik\DataTable;
 
 /**
  * @see plugins/DBStats/MySQLMetadataProvider.php
@@ -100,7 +101,7 @@ class Piwik_DBStats_API
      * This function will group tracker tables, numeric archive tables, blob archive tables
      * and other tables together so only four rows are shown.
      *
-     * @return Piwik_DataTable A datatable with three columns: 'data_size', 'index_size', 'row_count'.
+     * @return DataTable A datatable with three columns: 'data_size', 'index_size', 'row_count'.
      */
     public function getDatabaseUsageSummary()
     {
@@ -130,13 +131,13 @@ class Piwik_DBStats_API
             $rowToAddTo['row_count'] += $status['Rows'];
         }
 
-        return Piwik_DataTable::makeFromIndexedArray($rows);
+        return DataTable::makeFromIndexedArray($rows);
     }
 
     /**
      * Returns a datatable describing how much space is taken up by each log table.
      *
-     * @return Piwik_DataTable A datatable with three columns: 'data_size', 'index_size', 'row_count'.
+     * @return DataTable A datatable with three columns: 'data_size', 'index_size', 'row_count'.
      */
     public function getTrackerDataSummary()
     {
@@ -148,7 +149,7 @@ class Piwik_DBStats_API
      * Returns a datatable describing how much space is taken up by each numeric
      * archive table.
      *
-     * @return Piwik_DataTable A datatable with three columns: 'data_size', 'index_size', 'row_count'.
+     * @return DataTable A datatable with three columns: 'data_size', 'index_size', 'row_count'.
      */
     public function getMetricDataSummary()
     {
@@ -160,7 +161,7 @@ class Piwik_DBStats_API
      * Returns a datatable describing how much space is taken up by each numeric
      * archive table, grouped by year.
      *
-     * @return Piwik_DataTable A datatable with three columns: 'data_size', 'index_size', 'row_count'.
+     * @return DataTable A datatable with three columns: 'data_size', 'index_size', 'row_count'.
      */
     public function getMetricDataSummaryByYear()
     {
@@ -178,7 +179,7 @@ class Piwik_DBStats_API
      * Returns a datatable describing how much space is taken up by each blob
      * archive table.
      *
-     * @return Piwik_DataTable A datatable with three columns: 'data_size', 'index_size', 'row_count'.
+     * @return DataTable A datatable with three columns: 'data_size', 'index_size', 'row_count'.
      */
     public function getReportDataSummary()
     {
@@ -190,7 +191,7 @@ class Piwik_DBStats_API
      * Returns a datatable describing how much space is taken up by each blob
      * archive table, grouped by year.
      *
-     * @return Piwik_DataTable A datatable with three columns: 'data_size', 'index_size', 'row_count'.
+     * @return DataTable A datatable with three columns: 'data_size', 'index_size', 'row_count'.
      */
     public function getReportDataSummaryByYear()
     {
@@ -210,7 +211,7 @@ class Piwik_DBStats_API
      * An 'admin' table is a table that is not central to analytics functionality.
      * So any table that isn't an archive table or a log table is an 'admin' table.
      *
-     * @return Piwik_DataTable A datatable with three columns: 'data_size', 'index_size', 'row_count'.
+     * @return DataTable A datatable with three columns: 'data_size', 'index_size', 'row_count'.
      */
     public function getAdminDataSummary()
     {
@@ -226,7 +227,7 @@ class Piwik_DBStats_API
      *
      * @param bool $forceCache false to use the cached result, true to run the queries again and
      *                         cache the result.
-     * @return Piwik_DataTable A datatable with three columns: 'data_size', 'index_size', 'row_count'.
+     * @return DataTable A datatable with three columns: 'data_size', 'index_size', 'row_count'.
      */
     public function getIndividualReportsSummary($forceCache = false)
     {
@@ -242,7 +243,7 @@ class Piwik_DBStats_API
      *
      * @param bool $forceCache false to use the cached result, true to run the queries again and
      *                         cache the result.
-     * @return Piwik_DataTable A datatable with three columns: 'data_size', 'index_size', 'row_count'.
+     * @return DataTable A datatable with three columns: 'data_size', 'index_size', 'row_count'.
      */
     public function getIndividualMetricsSummary($forceCache = false)
     {
@@ -254,11 +255,11 @@ class Piwik_DBStats_API
      * Returns a datatable representation of a set of table statuses.
      *
      * @param array $statuses The table statuses to summarize.
-     * @return Piwik_DataTable
+     * @return DataTable
      */
     private function getTablesSummary($statuses)
     {
-        $dataTable = new Piwik_DataTable();
+        $dataTable = new DataTable();
         foreach ($statuses as $status) {
             $dataTable->addRowFromSimpleArray(array(
                                                    'label'      => $status['Name'],
diff --git a/plugins/DBStats/Controller.php b/plugins/DBStats/Controller.php
index caf2241e14..7596dc4106 100644
--- a/plugins/DBStats/Controller.php
+++ b/plugins/DBStats/Controller.php
@@ -313,7 +313,7 @@ class Piwik_DBStats_Controller extends Piwik_Controller_Admin
             }
         }
 
-        $getPrettySize = array('Piwik', 'getPrettySizeFromBytes');
+        $getPrettySize = '\Piwik\Piwik::getPrettySizeFromBytes';
         $params = $fixedMemoryUnit === false ? array() : array($fixedMemoryUnit);
         $view->queueFilter(
             'ColumnCallbackReplace', array($sizeColumns, $getPrettySize, $params), $runPrettySizeFilterBeforeGeneric);
@@ -324,8 +324,7 @@ class Piwik_DBStats_Controller extends Piwik_Controller_Admin
             $view->queueFilter('ColumnCallbackReplace', array($sizeColumns, $replaceSpaces));
         }
 
-        $getPrettyNumber = array('Piwik', 'getPrettyNumber');
-        $view->queueFilter('ColumnCallbackReplace', array(array('row_count'), $getPrettyNumber));
+        $view->queueFilter('ColumnCallbackReplace', array(array('row_count'), '\Piwik\Piwik::getPrettyNumber'));
 
         return $view;
     }
diff --git a/plugins/DBStats/DBStats.php b/plugins/DBStats/DBStats.php
index fd649d5b1e..770e00f0ed 100644
--- a/plugins/DBStats/DBStats.php
+++ b/plugins/DBStats/DBStats.php
@@ -9,12 +9,14 @@
  * @package Piwik_DBStats
  */
 use Piwik\Piwik;
+use Piwik\Date;
+use Piwik\Plugin;
 
 /**
  *
  * @package Piwik_DBStats
  */
-class Piwik_DBStats extends Piwik_Plugin
+class Piwik_DBStats extends Plugin
 {
     const TIME_OF_LAST_TASK_RUN_OPTION = 'dbstats_time_of_last_cache_task_run';
 
@@ -63,7 +65,7 @@ class Piwik_DBStats extends Piwik_Plugin
         $api->getIndividualReportsSummary(true);
         $api->getIndividualMetricsSummary(true);
 
-        $now = Piwik_Date::now()->getLocalized("%longYear%, %shortMonth% %day%");
+        $now = Date::now()->getLocalized("%longYear%, %shortMonth% %day%");
         Piwik_SetOption(self::TIME_OF_LAST_TASK_RUN_OPTION, $now);
     }
 
diff --git a/plugins/DBStats/MySQLMetadataProvider.php b/plugins/DBStats/MySQLMetadataProvider.php
index 9641d2d788..c7701e6023 100755
--- a/plugins/DBStats/MySQLMetadataProvider.php
+++ b/plugins/DBStats/MySQLMetadataProvider.php
@@ -10,6 +10,8 @@
  */
 use Piwik\Piwik;
 use Piwik\Common;
+use Piwik\Config;
+use Piwik\DataTable;
 
 /**
  * Utility class that provides general information about databases, including the size of
@@ -175,7 +177,7 @@ class Piwik_DBStats_MySQLMetadataProvider
      *
      * @param bool $forceCache false to use the cached result, true to run the queries again and
      *                         cache the result.
-     * @return Piwik_DataTable
+     * @return DataTable
      */
     public function getRowCountsAndSizeByBlobName($forceCache = false)
     {
@@ -194,7 +196,7 @@ class Piwik_DBStats_MySQLMetadataProvider
      *
      * @param bool $forceCache false to use the cached result, true to run the queries again and
      *                         cache the result.
-     * @return Piwik_DataTable
+     * @return DataTable
      */
     public function getRowCountsAndSizeByMetricName($forceCache = false)
     {
@@ -216,20 +218,20 @@ class Piwik_DBStats_MySQLMetadataProvider
 
         $cols = array_merge(array('row_count'), $otherDataTableColumns);
 
-        $dataTable = new Piwik_DataTable();
+        $dataTable = new DataTable();
         foreach ($statuses as $status) {
             $dataTableOptionName = $this->getCachedOptionName($status['Name'], 'byArchiveName');
 
             // if option exists && !$forceCache, use the cached data, otherwise create the
             $cachedData = Piwik_GetOption($dataTableOptionName);
             if ($cachedData !== false && !$forceCache) {
-                $table = new Piwik_DataTable();
+                $table = new DataTable();
                 $table->addRowsFromSerializedArray($cachedData);
             } else {
                 // otherwise, create data table & cache it
                 $sql = "SELECT name as 'label', COUNT(*) as 'row_count'$extraCols FROM {$status['Name']} GROUP BY name";
 
-                $table = new Piwik_DataTable();
+                $table = new DataTable();
                 $table->addRowsFromSimpleArray(Piwik_FetchAll($sql));
 
                 $reduceArchiveRowName = array($this, 'reduceArchiveRowName');