ImageGraph now requests and processes raw metrics

Author: nathangavin

plugins/ImageGraph/API.php

@@ -425,6 +425,7 @@ public function get(
                     'hideMetricsDoc' => false,
                     'idSubtable' => $idSubtable,
                     'showRawMetrics' => false,
+                    'format_metrics' => 0,
                 ];
                 /** @var array $processedReport */
                 $processedReport = Request::processRequest('API.getProcessedReport', $parameters);
@@ -470,8 +471,7 @@ public function get(
                     }
                     $i++;
                 }
-            } else // if the report has no dimension we have multiple reports each with only one row within the reportData
-            {
+            } else { // if the report has no dimension we have multiple reports each with only one row within the reportData
                 /** @var DataTable[] $periodsData */
                 $periodsData = array_values($reportData->getDataTables());
                 $periodsCount = count($periodsData);
@@ -592,9 +592,13 @@ private function setFilterTruncate(int $default): void
         $_GET['filter_truncate'] = PiwikRequest::fromRequest()->getIntegerParameter('filter_truncate', $default);
     }
 
-    private static function parseOrdinateValue($ordinateValue)
+    private static function parseOrdinateValue($ordinateValue): float
     {
-        $ordinateValue = @str_replace(',', '.', $ordinateValue);
+        if (is_int($ordinateValue) || is_float($ordinateValue)) {
+            return (float) $ordinateValue;
+        }
+
+        $ordinateValue = @str_replace(',', '.', (string) $ordinateValue);
 
         // convert hh:mm:ss formatted time values to number of seconds
         if (preg_match('/([0-9]{1,2}):([0-9]{1,2}):([0-9]{1,2}(\.[0-9]{2})?)/', $ordinateValue, $matches)) {
@@ -606,7 +610,13 @@ private static function parseOrdinateValue($ordinateValue)
         }
 
         // OK, only numbers from here please (strip out currency sign)
-        return preg_replace('/[^0-9.]/', '', $ordinateValue);
+        $ordinateValue = preg_replace('/[^0-9.]/', '', $ordinateValue);
+
+        if ($ordinateValue === null || $ordinateValue === '' || $ordinateValue === '.') {
+            return 0.0;
+        }
+
+        return is_numeric($ordinateValue) ? (float) $ordinateValue : 0.0;
     }
 
     private static function getFontPath(string $font): string

plugins/ImageGraph/tests/Unit/APITest.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace Piwik\Plugins\ImageGraph\tests\Unit;
+
+use Piwik\Plugins\ImageGraph\API;
+use ReflectionMethod;
+
+/**
+ * @group ImageGraph
+ * @group APITest
+ */
+class APITest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @dataProvider getOrdinateValuesToParse
+     */
+    public function testParseOrdinateValueReturnsFloat($value, float $expected): void
+    {
+        $method = new ReflectionMethod(API::class, 'parseOrdinateValue');
+
+        if (PHP_VERSION_ID < 80100) {
+            $method->setAccessible(true);
+        }
+
+        $actual = $method->invoke(null, $value);
+
+        $this->assertIsFloat($actual);
+        $this->assertSame($expected, $actual);
+    }
+
+    public function getOrdinateValuesToParse(): array
+    {
+        return [
+            [2.05, 2.05],
+            ['2.05', 2.05],
+            [205, 205.0],
+            ['01:02:03.50', 3723.5],
+            ['', 0.0],
+        ];
+    }
+}