Make MetricsFormatter a class with instance methods and move Html related functionality to derived class. Use FOrmatter in Metric::format calls so Metrics do not have to be aware of context of formatting, and so Metric::format methods will have less code redundancy.

1 files changed, 5 insertions, 4 deletions

diff --git a/plugins/DBStats/Controller.php b/plugins/DBStats/Controller.php
index de36313264..1e8aad1311 100644
--- a/plugins/DBStats/Controller.php
+++ b/plugins/DBStats/Controller.php
@@ -8,7 +8,7 @@
  */
 namespace Piwik\Plugins\DBStats;
 
-use Piwik\MetricsFormatter;
+use Piwik\Metrics\Formatter;
 use Piwik\Piwik;
 use Piwik\Plugins\DBStats\Reports\GetAdminDataSummary;
 use Piwik\Plugins\DBStats\Reports\GetDatabaseUsageSummary;
@@ -42,9 +42,10 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
 
         list($siteCount, $userCount, $totalSpaceUsed) = API::getInstance()->getGeneralInformation();
 
-        $view->siteCount      = MetricsFormatter::getPrettyNumber($siteCount);
-        $view->userCount      = MetricsFormatter::getPrettyNumber($userCount);
-        $view->totalSpaceUsed = MetricsFormatter::getPrettySizeFromBytes($totalSpaceUsed);
+        $formatter = new Formatter();
+        $view->siteCount      = $formatter->getPrettyNumber($siteCount);
+        $view->userCount      = $formatter->getPrettyNumber($userCount);
+        $view->totalSpaceUsed = $formatter->getPrettySizeFromBytes($totalSpaceUsed);
 
         return $view->render();
     }