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, 6 insertions, 4 deletions

diff --git a/plugins/Actions/Reports/Base.php b/plugins/Actions/Reports/Base.php
index 9685ea5cf3..84870baba8 100644
--- a/plugins/Actions/Reports/Base.php
+++ b/plugins/Actions/Reports/Base.php
@@ -9,7 +9,7 @@
 namespace Piwik\Plugins\Actions\Reports;
 
 use Piwik\Common;
-use Piwik\MetricsFormatter;
+use Piwik\Metrics\Formatter;
 use Piwik\Piwik;
 use Piwik\Plugin\ViewDataTable;
 use Piwik\Plugins\Actions\Actions;
@@ -61,8 +61,10 @@ abstract class Base extends \Piwik\Plugin\Report
             'nb_visits'           => Piwik::translate('General_ColumnUniquePageviews')
         ));
 
+        $formatter = new Formatter();
+
         // add avg_generation_time tooltip
-        $tooltipCallback = function ($hits, $min, $max) {
+        $tooltipCallback = function ($hits, $min, $max) use ($formatter) {
             if (!$hits) {
                 return false;
             }
@@ -70,8 +72,8 @@ abstract class Base extends \Piwik\Plugin\Report
             return Piwik::translate("Actions_AvgGenerationTimeTooltip", array(
                 $hits,
                 "<br />",
-                MetricsFormatter::getPrettyTimeFromSeconds($min),
-                MetricsFormatter::getPrettyTimeFromSeconds($max)
+                $formatter->getPrettyTimeFromSeconds($min),
+                $formatter->getPrettyTimeFromSeconds($max)
             ));
         };
         $view->config->filters[] = array('ColumnCallbackAddMetadata',