diff options
| author | Altamash Shaikh <altu9594@gmail.com> | 2022-02-04 12:23:22 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-04 12:23:22 +0300 |
| commit | b132cac81a6b1f812b03701e3051245b9720a807 (patch) | |
| tree | 5bd5a41f0f813fa60df355d1ee2094f5b5cca42a | |
| parent | ced3374d92deddfa7766a514e6ac541b5d510dce (diff) | |
Fixed round fatal error in php8 (#18732)
* Fixed round fatal error in php8 ,#DEV-2577
* Simplified logic for rounding
| -rw-r--r-- | core/Columns/Dimension.php | 5 | ||||
| -rw-r--r-- | core/Plugin/ArchivedMetric.php | 5 | ||||
| -rw-r--r-- | core/Plugin/ComputedMetric.php | 5 |
3 files changed, 3 insertions, 12 deletions
diff --git a/core/Columns/Dimension.php b/core/Columns/Dimension.php index fd5c50860b..c4ad3d9c8d 100644 --- a/core/Columns/Dimension.php +++ b/core/Columns/Dimension.php @@ -456,10 +456,7 @@ abstract class Dimension case Dimension::TYPE_DURATION_S: return $formatter->getPrettyTimeFromSeconds($value, $displayAsSentence = false); case Dimension::TYPE_DURATION_MS: - $val = number_format($value / 1000, 2); - if ($val > 60) { - $val = round($val); - } + $val = round(($value / 1000), ($value / 1000) > 60 ? 0 : 2); return $formatter->getPrettyTimeFromSeconds($val, $displayAsSentence = true); case Dimension::TYPE_PERCENT: return $formatter->getPrettyPercentFromQuotient($value); diff --git a/core/Plugin/ArchivedMetric.php b/core/Plugin/ArchivedMetric.php index c55d2fde5e..20dff6953d 100644 --- a/core/Plugin/ArchivedMetric.php +++ b/core/Plugin/ArchivedMetric.php @@ -147,10 +147,7 @@ class ArchivedMetric extends Metric case Dimension::TYPE_DURATION_S: return $formatter->getPrettyTimeFromSeconds($value, $displayAsSentence = true); case Dimension::TYPE_DURATION_MS: - $val = number_format($value / 1000, 2); - if ($val > 60) { - $val = round($val); - } + $val = round(($value / 1000), ($value / 1000) > 60 ? 0 : 2); return $formatter->getPrettyTimeFromSeconds($val, $displayAsSentence = true); case Dimension::TYPE_PERCENT: return $formatter->getPrettyPercentFromQuotient($value); diff --git a/core/Plugin/ComputedMetric.php b/core/Plugin/ComputedMetric.php index e0daa970f9..2039555d62 100644 --- a/core/Plugin/ComputedMetric.php +++ b/core/Plugin/ComputedMetric.php @@ -167,10 +167,7 @@ class ComputedMetric extends ProcessedMetric case Dimension::TYPE_DURATION_S: return $formatter->getPrettyTimeFromSeconds(round($value), $displayAsSentence = true); case Dimension::TYPE_DURATION_MS: - $val = number_format($value / 1000, 2); - if ($val > 60) { - $val = round($val); - } + $val = round(($value / 1000), ($value / 1000) > 60 ? 0 : 2); return $formatter->getPrettyTimeFromSeconds($val, $displayAsSentence = true); case Dimension::TYPE_PERCENT: return $formatter->getPrettyPercentFromQuotient($value); |