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

Feature/support scaled percentages #54049

Closed
wants to merge 2 commits into from
Closed

Feature/support scaled percentages #54049

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
260eff9
Add support for scaled return values
muscle-hamster Dec 31, 2024
6d4dfbf
Add tests for changes to percentage method
muscle-hamster Dec 31, 2024
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
7 changes: 6 additions & 1 deletion src/Illuminate/Support/Number.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,10 @@ public static function spellOrdinal(int|float $number, ?string $locale = null)
* @param int $precision
* @param int|null $maxPrecision
* @param string|null $locale
* @param bool $scaled
* @return string|false
*/
public static function percentage(int|float $number, int $precision = 0, ?int $maxPrecision = null, ?string $locale = null)
public static function percentage(int|float $number, int $precision = 0, ?int $maxPrecision = null, ?string $locale = null, bool $scaled = false)
{
static::ensureIntlExtensionIsInstalled();

Expand All @@ -129,6 +130,10 @@ public static function percentage(int|float $number, int $precision = 0, ?int $m
$formatter->setAttribute(NumberFormatter::FRACTION_DIGITS, $precision);
}

if ($scaled) {
return $formatter->format($number);
}

return $formatter->format($number / 100);
Comment on lines +133 to 137
Copy link
Contributor

@shaedrich shaedrich Dec 31, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

We could do the following instead, in case, we want to do something with the formatted output or the like in the future:

Suggested change
if ($scaled) {
return $formatter->format($number);
}
return $formatter->format($number / 100);
if (! $scaled) {
$number /= 1000;
}
return $formatter->format($number);

Copy link
Author

Choose a reason for hiding this comment

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

This was close to my original implementation but breaks backward compatibility. I do like this much better though. Should I refactor and point to the master branch instead of 11.x?

}

Expand Down
6 changes: 6 additions & 0 deletions tests/Support/SupportNumberTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,12 @@ public function testToPercent()
$this->assertSame('0.00%', Number::percentage(0, precision: 2));
$this->assertSame('0.12%', Number::percentage(0.12345, precision: 2));
$this->assertSame('0.1235%', Number::percentage(0.12345, precision: 4));

$this->assertSame('12.34%', Number::percentage(0.12345, precision: 2, scaled: true));
$this->assertSame('12.3450%', Number::percentage(0.12345, precision: 4, scaled: true));
$this->assertSame('0.1235%', Number::percentage(0.12345, precision: 4, scaled: false));
$this->assertSame('12%', Number::percentage(0.12345, scaled: true));
$this->assertSame('0%', Number::percentage(0.12345, scaled: false));
}

#[RequiresPhpExtension('intl')]
Expand Down
Loading