From 6cd1a2e967e2ce06e0c69a30b646fcc0ae6e27a6 Mon Sep 17 00:00:00 2001
From: Stefan Giehl <stefan@matomo.org>
Date: Wed, 14 Sep 2022 10:35:02 +0200
Subject: Fix number formatting for visit frequency sparklines (#19727)

* remove unneeded number formatting

* apply PSR12 code formatting

* updates expected test files
---
 plugins/VisitFrequency/Reports/Get.php | 53 +++++++++-------------------------
 1 file changed, 13 insertions(+), 40 deletions(-)

(limited to 'plugins/VisitFrequency')

diff --git a/plugins/VisitFrequency/Reports/Get.php b/plugins/VisitFrequency/Reports/Get.php
index 124c7b4e8b..58f5e7b923 100644
--- a/plugins/VisitFrequency/Reports/Get.php
+++ b/plugins/VisitFrequency/Reports/Get.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Matomo - free/libre analytics platform
  *
@@ -6,10 +7,9 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  *
  */
+
 namespace Piwik\Plugins\VisitFrequency\Reports;
 
-use Piwik\DataTable;
-use Piwik\NumberFormatter;
 use Piwik\Piwik;
 use Piwik\Plugin\ViewDataTable;
 use Piwik\Plugins\CoreHome\Columns\Metrics\ActionsPerVisit;
@@ -30,15 +30,15 @@ class Get extends \Piwik\Plugin\Report
         $this->categoryId    = 'General_Actions';
         $this->name          = Piwik::translate('VisitFrequency_ColumnReturningVisits');
         $this->documentation = Piwik::translate('VisitFrequency_VisitFrequencyReportDocumentation');
-        $this->processedMetrics = array(
+        $this->processedMetrics = [
             new ReturningMetric(new AverageTimeOnSite(), API::RETURNING_COLUMN_SUFFIX),
             new ReturningMetric(new ActionsPerVisit(), API::RETURNING_COLUMN_SUFFIX),
             new ReturningMetric(new BounceRate(), API::RETURNING_COLUMN_SUFFIX),
             new ReturningMetric(new AverageTimeOnSite(), API::NEW_COLUMN_SUFFIX),
             new ReturningMetric(new ActionsPerVisit(), API::NEW_COLUMN_SUFFIX),
             new ReturningMetric(new BounceRate(), API::NEW_COLUMN_SUFFIX)
-        );
-        $this->metrics       = array(
+        ];
+        $this->metrics       = [
             'nb_visits_returning',
             'nb_actions_returning',
             'nb_uniq_visitors_returning',
@@ -50,7 +50,7 @@ class Get extends \Piwik\Plugin\Report
             'nb_uniq_visitors_new',
             'nb_users_new',
             'max_actions_new',
-        );
+        ];
         $this->order = 40;
         $this->subcategoryId = 'VisitorInterest_Engagement';
     }
@@ -79,50 +79,24 @@ class Get extends \Piwik\Plugin\Report
             $view->requestConfig->apiMethodToRequestDataTable = 'VisitFrequency.get';
             $this->addSparklineColumns($view);
             $view->config->addTranslations($this->getSparklineTranslations());
-
-            $numberFormatter = NumberFormatter::getInstance();
-            $view->config->filters[] = function (DataTable $table) use ($numberFormatter) {
-                $firstRow = $table->getFirstRow();
-                if ($firstRow) {
-                    $value = $firstRow->getColumn('nb_visits_returning');
-                    if (false !== $value) {
-                        $firstRow->setColumn('nb_visits_returning', $numberFormatter->formatNumber($value));
-                    }
-
-                    $value = $firstRow->getColumn('nb_actions_returning');
-                    if (false !== $value) {
-                        $firstRow->setColumn('nb_actions_returning', $numberFormatter->formatNumber($value));
-                    }
-
-                    $value = $firstRow->getColumn('nb_actions_per_visit_returning');
-                    if (false !== $value) {
-                        $firstRow->setColumn('nb_actions_per_visit_returning', $numberFormatter->formatNumber($value, 1));
-                    }
-
-                    $value = $firstRow->getColumn('bounce_rate_returning');
-                    if (false !== $value) {
-                        $firstRow->setColumn('bounce_rate_returning', $numberFormatter->formatNumber($value, $precision = 1));
-                    }
-                }
-            };
         }
     }
 
     private function getSparklineTranslations()
     {
-        $translations = array(
+        $translations = [
             'nb_visits_returning' => 'ReturnVisits',
             'nb_actions_returning' => 'ReturnActions',
             'nb_actions_per_visit_returning' => 'ReturnAvgActions',
             'avg_time_on_site_returning' => 'ReturnAverageVisitDuration',
             'bounce_rate_returning' => 'ReturnBounceRate',
-            
+
             'nb_visits_new' => 'NewVisits',
             'nb_actions_new' => 'NewActions',
             'nb_actions_per_visit_new' => 'NewAvgActions',
             'avg_time_on_site_new' => 'NewAverageVisitDuration',
             'bounce_rate_new' => 'NewBounceRate',
-        );
+        ];
 
         foreach ($translations as $metric => $key) {
             $translations[$metric] = Piwik::translate('VisitFrequency_' . $key);
@@ -133,20 +107,19 @@ class Get extends \Piwik\Plugin\Report
 
     private function addSparklineColumns(Sparklines $view)
     {
-        $metrics = array(
+        $metrics = [
             'nb_visits',
             'avg_time_on_site',
             'nb_actions_per_visit',
             'bounce_rate',
             'nb_actions'
-        );
+        ];
 
         $i = 1;
         foreach ($metrics as $metric) {
-            foreach (array('_returning', '_new') as $suffix) {
-                $view->config->addSparklineMetric(array($metric . $suffix), $i++);
+            foreach (['_returning', '_new'] as $suffix) {
+                $view->config->addSparklineMetric([$metric . $suffix], $i++);
             }
         }
-
     }
 }
-- 
cgit v1.2.3