Moving piwik settings specific getters to SettingsPiwik class

Adding MetricsFormatter class which knows how to format/display metrics (time, money, size, etc)

2 files changed, 12 insertions, 10 deletions

diff --git a/plugins/API/API.php b/plugins/API/API.php
index 19cade72f1..d95ba716fb 100644
--- a/plugins/API/API.php
+++ b/plugins/API/API.php
@@ -20,6 +20,7 @@ use Piwik\Date;
 use Piwik\Filesystem;
 use Piwik\Metrics;
 use Piwik\Piwik;
+use Piwik\SettingsPiwik;
 use Piwik\Tracker\GoalManager;
 use Piwik\Translate;
 use Piwik\Version;
@@ -289,7 +290,7 @@ class API
             $logo = 'misc/user/logo.png';
         }
         if (!$pathOnly) {
-            return Piwik::getPiwikUrl() . $logo;
+            return SettingsPiwik::getPiwikUrl() . $logo;
         }
         return Filesystem::getPathToPiwikRoot() . '/' . $logo;
     }
@@ -309,7 +310,7 @@ class API
             $logo = 'misc/user/logo-header.png';
         }
         if (!$pathOnly) {
-            return Piwik::getPiwikUrl() . $logo;
+            return SettingsPiwik::getPiwikUrl() . $logo;
         }
         return Filesystem::getPathToPiwikRoot() . '/' . $logo;
     }
@@ -330,7 +331,7 @@ class API
             $logo = 'misc/user/logo.svg';
         }
         if (!$pathOnly) {
-            return Piwik::getPiwikUrl() . $logo;
+            return SettingsPiwik::getPiwikUrl() . $logo;
         }
         return Filesystem::getPathToPiwikRoot() . '/' . $logo;
     }
diff --git a/plugins/API/ProcessedReport.php b/plugins/API/ProcessedReport.php
index 92e82aa275..6926595b6f 100644
--- a/plugins/API/ProcessedReport.php
+++ b/plugins/API/ProcessedReport.php
@@ -12,17 +12,18 @@ namespace Piwik\Plugins\API;
 
 use Exception;
 use Piwik\API\Request;
-use Piwik\DataTable\Simple;
+use Piwik\Common;
 use Piwik\DataTable\Row;
+use Piwik\DataTable\Simple;
+use Piwik\DataTable;
+use Piwik\Date;
 use Piwik\Metrics;
+use Piwik\MetricsFormatter;
 use Piwik\Period;
 use Piwik\Piwik;
-use Piwik\Common;
-use Piwik\Date;
-use Piwik\DataTable;
-use Piwik\Url;
-use Piwik\Timer;
 use Piwik\Site;
+use Piwik\Timer;
+use Piwik\Url;
 
 class ProcessedReport
 {
@@ -518,7 +519,7 @@ class ProcessedReport
                 // filter metrics according to metadata definition
                 if (isset($metadataColumns[$columnName])) {
                     // generate 'human readable' metric values
-                    $prettyValue = Piwik::getPrettyValue($idSite, $columnName, $columnValue, $htmlAllowed = false);
+                    $prettyValue = MetricsFormatter::getPrettyValue($idSite, $columnName, $columnValue, $htmlAllowed = false);
                     $enhancedRow->addColumn($columnName, $prettyValue);
                 } // For example the Maps Widget requires the raw metrics to do advanced datavis
                 elseif ($returnRawMetrics) {