From 20ec870bf9fe3d367a6d74dbb4e3ffa13f063b4f Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 7 Jun 2021 17:18:06 -0600 Subject: [PATCH 1/2] Update PrettyNumber, fix deprecated warning --- app/Util/Lexer/PrettyNumber.php | 65 +++++++++++++++++---------------- 1 file changed, 33 insertions(+), 32 deletions(-) diff --git a/app/Util/Lexer/PrettyNumber.php b/app/Util/Lexer/PrettyNumber.php index faf267016..43daf7161 100644 --- a/app/Util/Lexer/PrettyNumber.php +++ b/app/Util/Lexer/PrettyNumber.php @@ -4,40 +4,41 @@ namespace App\Util\Lexer; class PrettyNumber { - public static function convert($number, $showDecimals = true) - { - if(!is_integer($number)) { - return $number; - } + public static function convert($number, $showDecimals = true) + { + if(!is_integer($number)) { + return $number; + } - $abbrevs = [12 => 'T', 9 => 'B', 6 => 'M', 3 => 'K', 0 => '']; - foreach ($abbrevs as $exponent => $abbrev) { - if(abs($number) >= pow(10, $exponent)) { - $display = $number / pow(10, $exponent); - $decimals = !$showDecimals ? 0 : ($exponent >= 3 && round($display) < 100) ? 1 : 0; - $number = number_format($display, $decimals).$abbrev; - break; - } - } + $abbrevs = [12 => 'T', 9 => 'B', 6 => 'M', 3 => 'K', 0 => '']; + foreach ($abbrevs as $exponent => $abbrev) { + if(abs($number) >= pow(10, $exponent)) { + $display = $number / pow(10, $exponent); + $decimals = ($exponent >= 3 && round($display) < 100) ? 1 : 0; + $decimals = !$showDecimals ? 0 : $decimals; + $number = number_format($display, $decimals).$abbrev; + break; + } + } - return $number; - } + return $number; + } - public static function size($expression, $kb = false) - { - if ($kb) { - $expression = $expression * 1024; - } - $size = intval($expression); - $precision = 0; - $short = true; - $units = $short ? - ['B', 'k', 'M', 'G', 'T', 'P', 'E', 'Z', 'Y'] : - ['B', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB']; - for ($i = 0; ($size / 1024) > 0.9; $i++, $size /= 1024) { - } - $res = round($size, $precision).$units[$i]; + public static function size($expression, $kb = false) + { + if ($kb) { + $expression = $expression * 1024; + } + $size = intval($expression); + $precision = 0; + $short = true; + $units = $short ? + ['B', 'k', 'M', 'G', 'T', 'P', 'E', 'Z', 'Y'] : + ['B', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB']; + for ($i = 0; ($size / 1024) > 0.9; $i++, $size /= 1024) { + } + $res = round($size, $precision).$units[$i]; - return $res; - } + return $res; + } } From 2d5a259e6fba618841c5cee570a7c434d8e766f6 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 7 Jun 2021 17:18:56 -0600 Subject: [PATCH 2/2] Update changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d0eea7dc1..58acd31bf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # Release Notes ## [Unreleased](https://github.com/pixelfed/pixelfed/compare/v0.11.0...dev) +### Updated +- Updated PrettyNumber, fix deprecated warning. ([20ec870b](https://github.com/pixelfed/pixelfed/commit/20ec870b)) ## [v0.11.0 (2021-06-01)](https://github.com/pixelfed/pixelfed/compare/v0.10.10...v0.11.0) ### Added