Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[10.x] Add a Number utility class #48845

Merged
merged 21 commits into from
Nov 15, 2023
+339 −0
Merged

[10.x] Add a Number utility class #48845

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
b5fb4a9
Create a new Number utility class
caendesilva Oct 28, 2023
fb0e6ce
Add a `Number::bytesToHuman()` helper
caendesilva Oct 28, 2023
66655b4
Add a `Number::toHuman()` helper
caendesilva Oct 29, 2023
8290812
Use lowercase `k` for kilobytes
caendesilva Oct 30, 2023
21ed5e0
Update Support package to suggest `ext-intl`
caendesilva Nov 1, 2023
d59942b
Throw if extension is not installed when using NumberFormatter wrapper
caendesilva Nov 1, 2023
8151a80
Add a `Number::toCurrency()` helper
caendesilva Nov 1, 2023
9a2704f
Make Number helper locale parameters null and default to App locale
caendesilva Nov 4, 2023
d2adff7
Add a `Number::format()` helper
caendesilva Nov 4, 2023
692f0e4
Fix number tests
caendesilva Nov 4, 2023
cd6117b
Add a `Number::toPercent()` helper
caendesilva Nov 4, 2023
fa8e3b8
Rename Number toHuman helper to spellout
caendesilva Nov 9, 2023
4b69ee5
Create new `Number::toHuman()` helper
caendesilva Nov 9, 2023
3f2fc5f
Change toHuman implementation to better match Rails version
caendesilva Nov 9, 2023
31285d1
Update toHuman helper to better handle extreme numbers
caendesilva Nov 9, 2023
ec8ba4b
Clean up toHuman helper
caendesilva Nov 9, 2023
6d3a6c2
formatting
taylorotwell Nov 15, 2023
47da238
formatting
taylorotwell Nov 15, 2023
79be940
formatting
taylorotwell Nov 15, 2023
5ff420d
formatting
taylorotwell Nov 15, 2023
cf1bc44
formatting
taylorotwell Nov 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Illuminate/Support/Number.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public static function toHuman($number, $locale = 'en')
*/
public static function bytesToHuman($bytes, $precision = 2)
{
$units = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
$units = ['B', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
Copy link
Contributor Author

@caendesilva caendesilva Nov 1, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There has been some discussion whether we should use kB or KB.

It's worth noting that Rails uses KB. https://api.rubyonrails.org/classes/ActionView/Helpers/NumberHelper.html


for ($i = 0; ($bytes / 1024) > 0.9 && ($i < count($units) - 1); $i++) {
$bytes /= 1024;
Expand Down
8 changes: 4 additions & 4 deletions tests/Support/SupportNumberTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ public function testBytesToHuman()
{
$this->assertSame('0 B', Number::bytesToHuman(0));
$this->assertSame('1 B', Number::bytesToHuman(1));
$this->assertSame('1 KB', Number::bytesToHuman(1024));
$this->assertSame('2 KB', Number::bytesToHuman(2048));
$this->assertSame('1.23 KB', Number::bytesToHuman(1264));
$this->assertSame('1.234 KB', Number::bytesToHuman(1264, 3));
$this->assertSame('1 kB', Number::bytesToHuman(1024));
$this->assertSame('2 kB', Number::bytesToHuman(2048));
$this->assertSame('1.23 kB', Number::bytesToHuman(1264));
$this->assertSame('1.234 kB', Number::bytesToHuman(1264, 3));
$this->assertSame('5 GB', Number::bytesToHuman(1024 * 1024 * 1024 * 5));
$this->assertSame('10 TB', Number::bytesToHuman((1024 ** 4) * 10));
$this->assertSame('10 PB', Number::bytesToHuman((1024 ** 5) * 10));
Expand Down
Loading