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

diff --git a/core/Metrics.php b/core/Metrics.php
index 4614cf2d0d..009fa36151 100644
--- a/core/Metrics.php
+++ b/core/Metrics.php
@@ -10,6 +10,7 @@ namespace Piwik;
 
 use Piwik\Cache\LanguageAwareStaticCache;
 use Piwik\Cache\PluginAwareStaticCache;
+use Piwik\Metrics\Formatter;
 
 require_once PIWIK_INCLUDE_PATH . "/core/Piwik.php";
 
@@ -234,7 +235,7 @@ class Metrics
     {
         $nameToUnit = array(
             '_rate'   => '%',
-            'revenue' => MetricsFormatter::getCurrencySymbol($idSite),
+            'revenue' => Formatter::getCurrencySymbol($idSite),
             '_time_'  => 's'
         );