Merge pull request #42 from Laravel-Lang/2.x

Typing error fixed
Laravel-Lang · Jun 22, 2024 · e9a62ae · e9a62ae
2 parents 704485c + 871db9a
commit e9a62ae
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/Services/RawLocales.php b/src/Services/RawLocales.php
@@ -91,7 +91,7 @@ public function isAvailable(Locale|LocaleData|string|null $locale): bool
             || $this->inArray($this->fromAlias($locale), $locales);
     }
 
-    public function isInstalled(Locale|string|null $locale): bool
+    public function isInstalled(Locale|LocaleData|string|null $locale): bool
     {
         return $this->registry([__METHOD__, $locale], function () use ($locale) {
             $locales = $this->installed();
@@ -101,7 +101,7 @@ public function isInstalled(Locale|string|null $locale): bool
         });
     }
 
-    public function isProtected(Locale|string|null $locale): bool
+    public function isProtected(Locale|LocaleData|string|null $locale): bool
     {
         return $this->registry([__METHOD__, $locale], function () use ($locale) {
             $locales = $this->protects();
@@ -170,7 +170,7 @@ public function info(mixed $locale): string
         });
     }
 
-    protected function inArray(Locale|string|null $locale, array $haystack): bool
+    protected function inArray(Locale|LocaleData|string|null $locale, array $haystack): bool
     {
         $locale = Resolver::toString($locale);
 

diff --git a/src/Services/Resolver.php b/src/Services/Resolver.php
@@ -40,8 +40,12 @@ public static function fromMixed(mixed $locale): ?string
         return static::toString((string) $locale);
     }
 
-    public static function toString(Locale|string|null $locale): ?string
+    public static function toString(Locale|LocaleData|string|null $locale): ?string
     {
+        if ($locale instanceof LocaleData) {
+            return $locale->locale->value;
+        }
+
         return $locale?->value ?? $locale;
     }
 }