Keep BC w/ old Formatter class since it is likely used by 3rd party plugins. Move Numeric formatter to CoreVisualizations and do not mark w/ @api.

2 files changed, 45 insertions, 1 deletions

diff --git a/plugins/CoreVisualizations/Metrics/Formatter/Numeric.php b/plugins/CoreVisualizations/Metrics/Formatter/Numeric.php
new file mode 100644
index 0000000000..415dc40995
--- /dev/null
+++ b/plugins/CoreVisualizations/Metrics/Formatter/Numeric.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+namespace Piwik\Plugins\CoreVisualizations\Metrics\Formatter;
+
+use Piwik\Metrics\Formatter;
+
+/**
+ * A metrics formatter that prettifies metric values without returning string values.
+ * Results of this class can be converted to numeric values and processed further in
+ * some way.
+ */
+class Numeric extends Formatter
+{
+    public function getPrettyNumber($value, $precision = 0)
+    {
+        return round($value, $precision);
+    }
+
+    public function getPrettyTimeFromSeconds($numberOfSeconds, $displayTimeAsSentence = false, $round = false)
+    {
+        return $round ? (int)$numberOfSeconds : (float)$numberOfSeconds;
+    }
+
+    public function getPrettySizeFromBytes($size, $unit = null, $precision = 1)
+    {
+        list($size, $sizeUnit) = $this->getPrettySizeFromBytesWithUnit($size, $unit, $precision);
+        return $size;
+    }
+
+    public function getPrettyMoney($value, $idSite)
+    {
+        return $value;
+    }
+
+    public function getPrettyPercentFromQuotient($value)
+    {
+        return $value * 100;
+    }
+}
\ No newline at end of file
diff --git a/plugins/CoreVisualizations/Visualizations/Graph.php b/plugins/CoreVisualizations/Visualizations/Graph.php
index b3098b133a..3e87754817 100644
--- a/plugins/CoreVisualizations/Visualizations/Graph.php
+++ b/plugins/CoreVisualizations/Visualizations/Graph.php
@@ -10,7 +10,7 @@ namespace Piwik\Plugins\CoreVisualizations\Visualizations;
 
 use Piwik\DataTable;
 use Piwik\DataTable\Row;
-use Piwik\Metrics\Formatter\Numeric;
+use Piwik\Plugins\CoreVisualizations\Metrics\Formatter\Numeric;
 use Piwik\Piwik;
 use Piwik\Plugin\Visualization;