Adding methods to access default locale

strata · Nov 18, 2021 · 43248fa · 43248fa
1 parent 07f5e0b
commit 43248fa
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 3 deletions.
diff --git a/src/Site.php b/src/Site.php
@@ -49,6 +49,24 @@ public function addDefaultLocale(string $locale, array $data = [], string $direc
  $this->defaultLocale = $locale;
  }
 
+ /**
+ * Whether a default locale is set
+ * @return bool
+ */
+ public function hasDefaultLocale(): bool
+ {
+ return (null !== $this->defaultLocale);
+ }
+
+ /**
+ * Return default locale, or null if not set
+ * @return string|null
+ */
+ public function getDefaultLocale(): ?string
+ {
+ return $this->defaultLocale;
+ }
+
  /**
  * Add RTF locale for this site
  * @param string $locale
@@ -138,6 +156,17 @@ public function getLocaleData(?string $name = null)
  return null;
  }
 
+ /**
+ * Whether a locale as the named data set
+ * @param string $name
+ * @return bool
+ * @throws InvalidLocaleException
+ */
+ public function hasLocaleData(string $name): bool
+ {
+ return (null !== $this->getLocaleData($name));
+ }
+
  /**
  * Return data values for all locales, optionally excluding data for the current locale
  *

diff --git a/tests/SiteTest.php b/tests/SiteTest.php
@@ -53,20 +53,25 @@ public function testTextDirection()
  public function testGetLocaleData()
  {
  $site = new Site();
- $site->addLocale('fr', ['siteId' => 1]);
- $site->addLocale('ja', ['siteId' => 2]);
+ $site->addLocale('fr', ['siteId' => 1, 'test' => 'one']);
+ $site->addLocale('ja', ['siteId' => 2, 'test' => 'two']);
  $site->addLocaleRtl('ar', ['siteId' => 3]);
 
  $site->setLocale('fr');
  $this->assertSame(1, $site->getLocaleData('siteId'));
  $this->assertSame(1, $site->siteId);
- $this->assertNull($site->getLocaleData('test'));
+ $this->assertTrue($site->hasLocaleData('test'));
+ $this->assertSame('one', $site->getLocaleData('test'));
 
  $site->setLocale('ja');
  $this->assertSame(2, $site->siteId);
+ $this->assertTrue($site->hasLocaleData('test'));
+ $this->assertSame('two', $site->getLocaleData('test'));
 
  $site->setLocale('ar');
  $this->assertSame(3, $site->siteId);
+ $this->assertFalse($site->hasLocaleData('test'));
+ $this->assertNull($site->getLocaleData('test'));
  }
 
  public function testGetData()
@@ -145,14 +150,22 @@ public function testDefaultLocale()
  {
  $site = new Site();
  $site->addLocale('en');
+ $this->assertFalse($site->hasDefaultLocale());
+
  $site->addDefaultLocale('fr');
+ $this->assertTrue($site->hasDefaultLocale());
+ $this->assertSame('fr', $site->getDefaultLocale());
 
  $this->assertSame('fr', $site->getLocale());
 
  // Still fr since once getLocale run sets to default locale
  $site->addLocale('ja');
  $site->addDefaultLocale('de');
+ $this->assertTrue($site->hasDefaultLocale());
  $this->assertSame('fr', $site->getLocale());
+
+ // But getDefaultLocale returns whatever is currently set
+ $this->assertSame('de', $site->getDefaultLocale());
  }
 
  public function testGetTextDirection()