BUG Fix invalid locale being set for domain mode

Fixes tractorcow-farm#419
tractorcow · Jun 6, 2018 · e02691a · e02691a
1 parent 353312e
commit e02691a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/src/Middleware/DetectLocaleMiddleware.php b/src/Middleware/DetectLocaleMiddleware.php
@@ -221,8 +221,10 @@ protected function getDomainLocale()
 
         // If the current domain has exactly one locale, the locale is non-ambiguous
         $locales = Locale::getCached()->filter('DomainID', $domainObj->ID);
-        if ($locales->count() === 1) {
-            return $locales->first();
+        /** @var Locale $localeObject */
+        $localeObject = $locales->first();
+        if ($localeObject) {
+            return $localeObject->getLocale();
         }
 
         return null;

diff --git a/src/State/FluentState.php b/src/State/FluentState.php
@@ -2,6 +2,7 @@
 
 namespace TractorCow\Fluent\State;
 
+use InvalidArgumentException;
 use SilverStripe\Core\Injector\Injectable;
 use SilverStripe\Core\Injector\Injector;
 
@@ -20,9 +21,9 @@ class FluentState
     protected $locale;
 
     /**
-     * Current domain
+     * Current domain, if set
      *
-     * @var string
+     * @var string|null
      */
     protected $domain;
 
@@ -58,14 +59,17 @@ public function getLocale()
      */
     public function setLocale($locale)
     {
+        if (empty($locale) || !is_string($locale)) {
+            throw new InvalidArgumentException("Invalid locale");
+        }
         $this->locale = $locale;
         return $this;
     }
 
     /**
      * Get the current domain code
      *
-     * @return string
+     * @return string|null
      */
     public function getDomain()
     {
@@ -75,11 +79,14 @@ public function getDomain()
     /**
      * Set the current domain code
      *
-     * @param string $domain
+     * @param string|null $domain
      * @return $this
      */
     public function setDomain($domain)
     {
+        if ($domain && !is_string($domain)) {
+            throw new InvalidArgumentException("Invalid domain");
+        }
         $this->domain = $domain;
         return $this;
     }