Fixes PHP 8.2 deprecation warnings when calling round() with null f…

…irst parameter.
Pierre-Lannoy · Sep 14, 2023 · 9128ce7 · 9128ce7
1 parent b054195
commit 9128ce7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,11 @@ All notable changes to **Device Detector** are documented in this *changelog*.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and **Device Detector** adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [3.6.0] - Not Yet Released
+
+### Fixed
+- With PHP 8.2, in some edge cases, deprecation warnings may be triggered when viewing analytics.
+
 ## [3.5.0] - 2023-07-12
 
 ### Added

diff --git a/includes/features/class-analytics.php b/includes/features/class-analytics.php
@@ -1039,7 +1039,7 @@ public static function get_status_kpi_collection( $args = [] ) {
 						'ratio'       => null,
 						'variation'   => [
 							'raw'      => round( $data['kpi-index-' . $query] / 100, 6 ),
-							'percent'  => round( $data['kpi-index-' . $query], 2 ),
+							'percent'  => round( $data['kpi-index-' . $query] ?? 0, 2 ),
 							'permille' => round( $data['kpi-index-' . $query] * 10, 2 ),
 						],
 						'value'       => [
@@ -1058,7 +1058,7 @@ public static function get_status_kpi_collection( $args = [] ) {
 						'ratio'       => null,
 						'variation'   => [
 							'raw'      => round( $data['kpi-index-' . $query] / 100, 6 ),
-							'percent'  => round( $data['kpi-index-' . $query], 2 ),
+							'percent'  => round( $data['kpi-index-' . $query] ?? 0, 2 ),
 							'permille' => round( $data['kpi-index-' . $query] * 10, 2 ),
 						],
 						'value'       => [
@@ -1077,7 +1077,7 @@ public static function get_status_kpi_collection( $args = [] ) {
 						'ratio'       => null,
 						'variation'   => [
 							'raw'      => round( $data['kpi-index-' . $query] / 100, 6 ),
-							'percent'  => round( $data['kpi-index-' . $query], 2 ),
+							'percent'  => round( $data['kpi-index-' . $query] ?? 0, 2 ),
 							'permille' => round( $data['kpi-index-' . $query] * 10, 2 ),
 						],
 						'value'       => [
@@ -1095,12 +1095,12 @@ public static function get_status_kpi_collection( $args = [] ) {
 						'dimension'   => 'none',
 						'ratio'       => [
 							'raw'      => round( $data['kpi-main-' . $query] / 100, 6 ),
-							'percent'  => round( $data['kpi-main-' . $query], 2 ),
+							'percent'  => round( $data['kpi-main-' . $query] ?? 0, 2 ),
 							'permille' => round( $data['kpi-main-' . $query] * 10, 2 ),
 						],
 						'variation'   => [
 							'raw'      => round( $data['kpi-index-' . $query] / 100, 6 ),
-							'percent'  => round( $data['kpi-index-' . $query], 2 ),
+							'percent'  => round( $data['kpi-index-' . $query] ?? 0, 2 ),
 							'permille' => round( $data['kpi-index-' . $query] * 10, 2 ),
 						],
 						'value'       => [
@@ -1118,12 +1118,12 @@ public static function get_status_kpi_collection( $args = [] ) {
 						'dimension'   => 'none',
 						'ratio'       => [
 							'raw'      => round( $data['kpi-main-' . $query] / 100, 6 ),
-							'percent'  => round( $data['kpi-main-' . $query], 2 ),
+							'percent'  => round( $data['kpi-main-' . $query] ?? 0, 2 ),
 							'permille' => round( $data['kpi-main-' . $query] * 10, 2 ),
 						],
 						'variation'   => [
 							'raw'      => round( $data['kpi-index-' . $query] / 100, 6 ),
-							'percent'  => round( $data['kpi-index-' . $query], 2 ),
+							'percent'  => round( $data['kpi-index-' . $query] ?? 0, 2 ),
 							'permille' => round( $data['kpi-index-' . $query] * 10, 2 ),
 						],
 						'value'       => [
@@ -1141,12 +1141,12 @@ public static function get_status_kpi_collection( $args = [] ) {
 						'dimension'   => 'none',
 						'ratio'       => [
 							'raw'      => round( $data['kpi-main-' . $query] / 100, 6 ),
-							'percent'  => round( $data['kpi-main-' . $query], 2 ),
+							'percent'  => round( $data['kpi-main-' . $query] ?? 0, 2 ),
 							'permille' => round( $data['kpi-main-' . $query] * 10, 2 ),
 						],
 						'variation'   => [
 							'raw'      => round( $data['kpi-index-' . $query] / 100, 6 ),
-							'percent'  => round( $data['kpi-index-' . $query], 2 ),
+							'percent'  => round( $data['kpi-index-' . $query] ?? 0, 2 ),
 							'permille' => round( $data['kpi-index-' . $query] * 10, 2 ),
 						],
 						'value'       => [