feat: use defaults for locale in Intl\Locale and Config (#40)

Author: ramsey

CHANGELOG.md

@@ -15,6 +15,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Add `UnableToFormatStringException` from which other formatting exceptions will descend.
 - Add `UnableToFormatDateTimeException` thrown when we're unable to format a date or time string.
 - Allow instantiation of `FormatPHP` without configuration or message collection instances; FormatPHP will use the system's default locale, in this case.
+  - Instantiation of `Intl\Locale` without a locale argument will default to the system default locale.
+  - Instantiation of `Config` without a locale argument will create an `Intl\Locale` using the system default locale.
 
 ### Changed
 

src/Config.php

@@ -23,6 +23,7 @@
 namespace FormatPHP;
 
 use FormatPHP\Extractor\IdInterpolator;
+use FormatPHP\Intl\Locale;
 use FormatPHP\Intl\LocaleInterface;
 
 /**
@@ -43,12 +44,12 @@ class Config implements ConfigInterface
      * @param array<string, callable(string):string> $defaultRichTextElements
      */
     public function __construct(
-        LocaleInterface $locale,
+        ?LocaleInterface $locale = null,
         ?LocaleInterface $defaultLocale = null,
         array $defaultRichTextElements = [],
         string $idInterpolatorPattern = IdInterpolator::DEFAULT_ID_INTERPOLATION_PATTERN
     ) {
-        $this->locale = $locale;
+        $this->locale = $locale ?? new Locale();
         $this->defaultLocale = $defaultLocale;
         $this->idInterpolatorPattern = $idInterpolatorPattern;
         $this->defaultRichTextElements = $defaultRichTextElements;

src/FormatPHP.php

@@ -27,11 +27,9 @@
 use Exception as PhpException;
 use FormatPHP\Intl\DateTimeFormat;
 use FormatPHP\Intl\DateTimeFormatOptions;
-use FormatPHP\Intl\Locale;
 use FormatPHP\Intl\MessageFormat;
 use FormatPHP\Util\MessageCleaner;
 use FormatPHP\Util\MessageRetriever;
-use Locale as PhpLocale;
 
 use function array_merge;
 use function gettype;
@@ -60,7 +58,7 @@ public function __construct(
         ?ConfigInterface $config = null,
         ?MessageCollection $messages = null
     ) {
-        $this->config = $config ?? new Config(new Locale(PhpLocale::getDefault()));
+        $this->config = $config ?? new Config();
         $this->messages = $messages ?? new MessageCollection();
         $this->messageFormat = new MessageFormat($this->config->getLocale());
     }

src/Intl/Locale.php

@@ -46,7 +46,7 @@
  */
 class Locale implements LocaleInterface
 {
-    private const UNDEFINED_LOCALE = 'und';
+    public const UNDEFINED_LOCALE = 'und';
 
     /**
      * PHP's canonicalization (through ICU) converts calendar values to those
@@ -121,9 +121,9 @@ class Locale implements LocaleInterface
     /**
      * @throws InvalidArgumentException
      */
-    public function __construct(string $locale, ?LocaleOptions $options = null)
+    public function __construct(?string $locale = null, ?LocaleOptions $options = null)
     {
-        if (strtolower($locale) === self::UNDEFINED_LOCALE) {
+        if ($locale === null || strtolower($locale) === self::UNDEFINED_LOCALE) {
             $locale = PhpLocale::getDefault();
         }
 

tests/ConfigTest.php

@@ -7,6 +7,7 @@
 use FormatPHP\Config;
 use FormatPHP\Extractor\IdInterpolator;
 use FormatPHP\Intl\Locale;
+use Locale as PhpLocale;
 
 class ConfigTest extends TestCase
 {
@@ -18,12 +19,24 @@ public function testInstanceConstruction(): void
             'em' => fn (string $text): string => '<em class="bar">' . $text . '</em>',
             'strong' => fn (string $text): string => '<strong class="foo">' . $text . '</strong>',
         ];
+        $idInterpolatorPattern = '[md5:contenthash:base64:16]';
 
-        $config = new Config($locale, $defaultLocale, $defaultRichTextElements);
+        $config = new Config($locale, $defaultLocale, $defaultRichTextElements, $idInterpolatorPattern);
 
         $this->assertSame($locale, $config->getLocale());
         $this->assertSame($defaultLocale, $config->getDefaultLocale());
         $this->assertSame($defaultRichTextElements, $config->getDefaultRichTextElements());
+        $this->assertSame($idInterpolatorPattern, $config->getIdInterpolatorPattern());
+    }
+
+    public function testConfigDefaults(): void
+    {
+        $systemLocale = new Locale(PhpLocale::getDefault());
+        $config = new Config();
+
+        $this->assertSame($systemLocale->toString(), $config->getLocale()->toString());
+        $this->assertNull($config->getDefaultLocale());
+        $this->assertSame([], $config->getDefaultRichTextElements());
         $this->assertSame(IdInterpolator::DEFAULT_ID_INTERPOLATION_PATTERN, $config->getIdInterpolatorPattern());
     }
 }

tests/Intl/LocaleTest.php

@@ -92,11 +92,19 @@ public function testLocaleWithOnlyLanguage(): void
     public function testLocaleWithUndefinedLocale(): void
     {
         $defaultLocale = new Locale(PhpLocale::getDefault());
-        $undefinedLocale = new Locale('und');
+        $undefinedLocale = new Locale(Locale::UNDEFINED_LOCALE);
 
         $this->assertSame($defaultLocale->toString(), $undefinedLocale->toString());
     }
 
+    public function testLocaleWithNoLocale(): void
+    {
+        $defaultLocale = new Locale(PhpLocale::getDefault());
+        $noLocale = new Locale();
+
+        $this->assertSame($defaultLocale->toString(), $noLocale->toString());
+    }
+
     public function testBaseNameWithMultipleVariants(): void
     {
         $locale = new Locale('en-US-variant1-variant2-variant3');