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, 3 insertions, 2 deletions

diff --git a/plugins/VisitFrequency/Metrics/ReturningMetric.php b/plugins/VisitFrequency/Metrics/ReturningMetric.php
index 8a3f95b06c..6768523dad 100644
--- a/plugins/VisitFrequency/Metrics/ReturningMetric.php
+++ b/plugins/VisitFrequency/Metrics/ReturningMetric.php
@@ -8,6 +8,7 @@
 namespace Piwik\Plugins\VisitFrequency\Metrics;
 
 use Piwik\DataTable\Row;
+use Piwik\Metrics\Formatter;
 use Piwik\Piwik;
 use Piwik\Plugin\ProcessedMetric;
 
@@ -46,9 +47,9 @@ class ReturningMetric extends ProcessedMetric
         return Piwik::translate(self::$translations[$this->getName()]);
     }
 
-    public function format($value)
+    public function format($value, Formatter $formatter)
     {
-        return $this->wrapped->format($value);
+        return $this->wrapped->format($value, $formatter);
     }
 
     public function compute(Row $row)