apply review feedback

matomo-org · Nov 8, 2024 · 979da07 · 979da07
1 parent cfb1bdc
commit 979da07
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 19 deletions.
diff --git a/core/Updates/5.2.0-b6.php b/core/Updates/5.2.0-b6.php
@@ -31,17 +31,17 @@ public function __construct(MigrationFactory $factory)
 
     public function getMigrations(Updater $updater)
     {
-        $beginOfCurrentYear = '01-01-' . Date::now()->toString('Y');
+        $startOfCurrentYear = '01-01-' . Date::now()->toString('Y');
 
         $commandToExecute = sprintf(
             './console core:invalidate-report-data --dates=%s,today --plugin=Actions.Actions_hits',
-            $beginOfCurrentYear
+            $startOfCurrentYear
         );
 
         $migrations = [
-            new CustomMigration(function () use ($beginOfCurrentYear) {
+            new CustomMigration(function () use ($startOfCurrentYear) {
                 $invalidator = StaticContainer::get(ArchiveInvalidator::class);
-                $invalidator->scheduleReArchiving('all', 'Actions', 'Actions_hits', Date::factory($beginOfCurrentYear));
+                $invalidator->scheduleReArchiving('all', 'Actions', 'Actions_hits', Date::factory($startOfCurrentYear));
             }, $commandToExecute)
         ];
 

diff --git a/plugins/Actions/Reports/Get.php b/plugins/Actions/Reports/Get.php
@@ -33,7 +33,7 @@ protected function init()
             'nb_uniq_outlinks',
             'nb_searches',
             'nb_keywords',
-            'hits'
+            'hits',
         );
     }
 }
diff --git a/...rWithItems_schedrep_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf b/...rWithItems_schedrep_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf
diff --git a/plugins/MultiSites/Dashboard.php b/plugins/MultiSites/Dashboard.php
@@ -304,14 +304,14 @@ private function makeSitesFlatAndApplyGenericFilters(DataTable $table, $request)
         unset($request['filter_limit']);
 
         // filter_sort_column does not work correctly is a bug in MultiSites.getAll
-        $filterSprtColumnMapping = [
+        $filterSortColumnMapping = [
             'nb_pageviews' => 'Actions_nb_pageviews',
             'hits' => 'Actions_hits',
             'revenue' => 'Goal_revenue',
         ];
 
-        if (!empty($request['filter_sort_column']) && array_key_exists($request['filter_sort_column'], $filterSprtColumnMapping)) {
-            $request['filter_sort_column'] = $filterSprtColumnMapping[$request['filter_sort_column']];
+        if (!empty($request['filter_sort_column']) && array_key_exists($request['filter_sort_column'], $filterSortColumnMapping)) {
+            $request['filter_sort_column'] = $filterSortColumnMapping[$request['filter_sort_column']];
         }
 
         // make sure no limit filter is applied, we will do this manually

diff --git a/plugins/MultiSites/MultiSites.php b/plugins/MultiSites/MultiSites.php
@@ -19,9 +19,9 @@ class MultiSites extends \Piwik\Plugin
     public function registerEvents()
     {
         return array(
-            'AssetManager.getStylesheetFiles' => 'getStylesheetFiles',
+            'AssetManager.getStylesheetFiles'        => 'getStylesheetFiles',
             'Translate.getClientSideTranslationKeys' => 'getClientSideTranslationKeys',
-            'Metrics.getDefaultMetricTranslations'  => 'addMetricTranslations',
+            'Metrics.getDefaultMetricTranslations'   => 'addMetricTranslations',
             'API.getPagesComparisonsDisabledFor'     => 'getPagesComparisonsDisabledFor',
         );
     }
@@ -38,7 +38,7 @@ public function addMetricTranslations(&$translations)
             'visits_evolution'    => Piwik::translate('General_ColumnNbVisits') . $appendix,
             'actions_evolution'   => Piwik::translate('General_ColumnNbActions') . $appendix,
             'pageviews_evolution' => Piwik::translate('General_ColumnPageviews') . $appendix,
-            'hits_evolution' => Piwik::translate('General_ColumnHits') . $appendix,
+            'hits_evolution'      => Piwik::translate('General_ColumnHits') . $appendix,
             'revenue_evolution'   => Piwik::translate('General_ColumnRevenue') . $appendix,
             'nb_conversions_evolution' => Piwik::translate('Goals_ColumnConversions') . $appendix,
             'orders_evolution'         => Piwik::translate('General_EcommerceOrders') . $appendix,

diff --git a/...ins/MultiSites/tests/UI/expected-screenshots/AllWebsitesDashboard_dashboard.png b/...ins/MultiSites/tests/UI/expected-screenshots/AllWebsitesDashboard_dashboard.png
diff --git a/...tiSites/tests/UI/expected-screenshots/AllWebsitesDashboard_evolution_change.png b/...tiSites/tests/UI/expected-screenshots/AllWebsitesDashboard_evolution_change.png
diff --git a/...ns/MultiSites/tests/UI/expected-screenshots/AllWebsitesDashboard_no_revenue.png b/...ns/MultiSites/tests/UI/expected-screenshots/AllWebsitesDashboard_no_revenue.png
diff --git a/...MultiSites/tests/UI/expected-screenshots/AllWebsitesDashboard_no_sparklines.png b/...MultiSites/tests/UI/expected-screenshots/AllWebsitesDashboard_no_sparklines.png
diff --git a/...erentDays_schedrep_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf b/...erentDays_schedrep_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf