From 719996dc07b9f7817b0d33b038c93f5d2b50f247 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sun, 9 Jun 2019 21:42:43 +0200 Subject: [PATCH] load locale with invalid country code --- Localization/Localization.php | 4 +++- tests/Localization/LocalizationTest.php | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Localization/Localization.php b/Localization/Localization.php index 50a28bb28..de352338e 100644 --- a/Localization/Localization.php +++ b/Localization/Localization.php @@ -162,7 +162,9 @@ class Localization throw new InvalidEnumValue($langCode); } - if ($countryCode !== '*' && !\file_exists(__DIR__ . '/../Localization/Defaults/Definitions/' . $langCode . '_' . $countryCode . '.json')) { + if ($countryCode !== '*' + && !\file_exists(__DIR__ . '/../Localization/Defaults/Definitions/' . $langCode . '_' . $countryCode . '.json') + ) { $countryCode = '*'; } diff --git a/tests/Localization/LocalizationTest.php b/tests/Localization/LocalizationTest.php index c57d698a3..43267ce99 100644 --- a/tests/Localization/LocalizationTest.php +++ b/tests/Localization/LocalizationTest.php @@ -151,6 +151,9 @@ class LocalizationTest extends \PHPUnit\Framework\TestCase $localization->loadFromLanguage(ISO639x1Enum::_AA); self::assertEquals(ISO4217CharEnum::_USD, $localization->getCurrency()); + + $localization->loadFromLanguage(ISO639x1Enum::_AA, 'ABC'); + self::assertEquals(ISO4217CharEnum::_USD, $localization->getCurrency()); } public function testInvalidLocalizationLoading() : void