Skip to content

Normalise currency codes in CurrencyHelper #41

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

Merged
TomK merged 1 commit into from
Jul 10, 2026
Merged

Normalise currency codes in CurrencyHelper #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions src/Currency/CurrencyHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ class CurrencyHelper
*/
public static function getCurrency($code, $default = null)
{
$code = $code ?: $default;
$code = strtoupper(trim((string)($code ?: $default)));
$className = sprintf('\Packaged\Rwd\Currency\Currencies\%sCurrency', $code);
if(class_exists($className))
{
return new $className();
}
else if($default !== null && $code !== $default)
else if($default !== null && $code !== strtoupper(trim((string)$default)))
{
return self::getCurrency($default);
}
Expand All @@ -36,6 +36,7 @@ public static function listAllCurrencies()
$c = new \ReflectionClass(CurrencyCode::class);
foreach($c->getConstants() as $code)
{
$code = strtoupper(trim((string)$code));
try
{
$currencies[$code] = self::getCurrency($code)->getName();
Expand Down
37 changes: 37 additions & 0 deletions tests/Currency/CurrencyTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
<?php
namespace Packaged\Tests\Rwd\Currency;

use Packaged\Rwd\Currency\Currencies\GBPCurrency;
use Packaged\Rwd\Currency\Currencies\USDCurrency;
use Packaged\Rwd\Currency\CurrencyHelper;
use PHPUnit\Framework\TestCase;

Expand All @@ -27,4 +29,39 @@ public function testCurrencyFormat()
self::assertEquals('¥123', $jpy->format(123));
self::assertEquals('-¥123', $jpy->format(-123));
}

public function testCodeIsNormalised()
{
self::assertInstanceOf(USDCurrency::class, CurrencyHelper::getCurrency('usd'));
self::assertInstanceOf(USDCurrency::class, CurrencyHelper::getCurrency('Usd'));
self::assertInstanceOf(USDCurrency::class, CurrencyHelper::getCurrency(' USD '));
self::assertInstanceOf(USDCurrency::class, CurrencyHelper::getCurrency("\tusd\n"));
}

public function testFallbackToDefault()
{
self::assertInstanceOf(GBPCurrency::class, CurrencyHelper::getCurrency('XXX', 'GBP'));
self::assertInstanceOf(GBPCurrency::class, CurrencyHelper::getCurrency('xxx', 'gbp'));
self::assertInstanceOf(GBPCurrency::class, CurrencyHelper::getCurrency(null, ' gbp '));
self::assertInstanceOf(GBPCurrency::class, CurrencyHelper::getCurrency('', 'GBP'));
}

public function testInvalidCodeThrows()
{
$this->expectException(\RuntimeException::class);
$this->expectExceptionMessage('XXX is not a supported currency');
CurrencyHelper::getCurrency('xxx');
}

public function testInvalidCodeAndDefaultThrows()
{
$this->expectException(\RuntimeException::class);
CurrencyHelper::getCurrency('xxx', 'xxx');
}

public function testNullCodeThrows()
{
$this->expectException(\RuntimeException::class);
CurrencyHelper::getCurrency(null);
}
}