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

The `withCountries` and `withCurrencies` options are now disabled by default
Laravel-Lang · Apr 6, 2024 · 35aa06e · 35aa06e
2 parents fdb9ea3 + 57311fa
commit 35aa06e
Show file tree

Hide file tree

Showing 11 changed files with 48 additions and 48 deletions.
diff --git a/src/Facades/Locales.php b/src/Facades/Locales.php
@@ -28,15 +28,15 @@
  * @method static bool isAvailable(string|Locale|null $locale)
  * @method static bool isInstalled(string|Locale|null $locale)
  * @method static bool isProtected(string|Locale|null $locale)
- * @method static Collection<LocaleData> available(bool $withCountries = true, bool $withCurrencies = true)
- * @method static Collection<LocaleData> installed(bool $withProtects = true, bool $withCountries = true, bool $withCurrencies = true)
- * @method static Collection<LocaleData> notInstalled(bool $withCountries = true, bool $withCurrencies = true)
- * @method static Collection<LocaleData> protects(bool $withCountries = true, bool $withCurrencies = true)
- * @method static LocaleData get(mixed $locale, bool $withCountry = true, bool $withCurrency = true)
- * @method static LocaleData getCurrent(bool $withCountry = true, bool $withCurrency = true)
- * @method static LocaleData getDefault(bool $withCountry = true, bool $withCurrency = true)
- * @method static LocaleData getFallback(bool $withCountry = true, bool $withCurrency = true)
- * @method static LocaleData info(mixed $locale, bool $withCountry = true, bool $withCurrency = true)
+ * @method static Collection<LocaleData> available(bool $withCountries = false, bool $withCurrencies = false)
+ * @method static Collection<LocaleData> installed(bool $withProtects = true, bool $withCountries = false, bool $withCurrencies = false)
+ * @method static Collection<LocaleData> notInstalled(bool $withCountries = false, bool $withCurrencies = false)
+ * @method static Collection<LocaleData> protects(bool $withCountries = false, bool $withCurrencies = false)
+ * @method static LocaleData get(mixed $locale, bool $withCountry = false, bool $withCurrency = false)
+ * @method static LocaleData getCurrent(bool $withCountry = false, bool $withCurrency = false)
+ * @method static LocaleData getDefault(bool $withCountry = false, bool $withCurrency = false)
+ * @method static LocaleData getFallback(bool $withCountry = false, bool $withCurrency = false)
+ * @method static LocaleData info(mixed $locale, bool $withCountry = false, bool $withCurrency = false)
  * @method static RawLocales raw()
  * @method static void set(mixed $locale)
  */

diff --git a/src/Services/Locales.php b/src/Services/Locales.php
@@ -43,7 +43,7 @@ public function raw(): RawLocales
         return $this->raw;
     }
 
-    public function available(bool $withCountries = true, bool $withCurrencies = true): Collection
+    public function available(bool $withCountries = false, bool $withCurrencies = false): Collection
     {
         return $this->registry(
             __METHOD__,
@@ -53,24 +53,24 @@ public function available(bool $withCountries = true, bool $withCurrencies = tru
 
     public function installed(
         bool $withProtects = true,
-        bool $withCountries = true,
-        bool $withCurrencies = true
+        bool $withCountries = false,
+        bool $withCurrencies = false
     ): Collection {
         return $this->registry(
             [__METHOD__, $withProtects],
             fn () => $this->mapLocales($this->raw->installed($withProtects), $withCountries, $withCurrencies)
         );
     }
 
-    public function notInstalled(bool $withCountries = true, bool $withCurrencies = true): Collection
+    public function notInstalled(bool $withCountries = false, bool $withCurrencies = false): Collection
     {
         return $this->registry(
             __METHOD__,
             fn () => $this->mapLocales($this->raw->notInstalled(), $withCountries, $withCurrencies)
         );
     }
 
-    public function protects(bool $withCountries = true, bool $withCurrencies = true): Collection
+    public function protects(bool $withCountries = false, bool $withCurrencies = false): Collection
     {
         return $this->registry(
             __METHOD__,
@@ -93,36 +93,36 @@ public function isProtected(Locale|string|null $locale): bool
         return $this->raw->isProtected($locale);
     }
 
-    public function get(mixed $locale, bool $withCountry = true, bool $withCurrency = true): LocaleData
+    public function get(mixed $locale, bool $withCountry = false, bool $withCurrency = false): LocaleData
     {
         return $this->registry(
             [__METHOD__, $locale, $this->appLocale()],
             fn () => $this->map($this->raw->get($locale), $withCountry, $withCurrency)
         );
     }
 
-    public function info(mixed $locale, bool $withCountry = true, bool $withCurrency = true): LocaleData
+    public function info(mixed $locale, bool $withCountry = false, bool $withCurrency = false): LocaleData
     {
         return $this->registry(
             [__METHOD__, $locale, $this->appLocale()],
             fn () => $this->map($this->raw->info($locale), $withCountry, $withCurrency)
         );
     }
 
-    public function getCurrent(bool $withCountry = true, bool $withCurrency = true): LocaleData
+    public function getCurrent(bool $withCountry = false, bool $withCurrency = false): LocaleData
     {
         return $this->getDefault($withCountry, $withCurrency);
     }
 
-    public function getDefault(bool $withCountry = true, bool $withCurrency = true): LocaleData
+    public function getDefault(bool $withCountry = false, bool $withCurrency = false): LocaleData
     {
         return $this->registry(
             [__METHOD__, $this->appLocale()],
             fn () => $this->map($this->raw->getDefault(), $withCountry, $withCurrency)
         );
     }
 
-    public function getFallback(bool $withCountry = true, bool $withCurrency = true): LocaleData
+    public function getFallback(bool $withCountry = false, bool $withCurrency = false): LocaleData
     {
         return $this->registry(
             [__METHOD__, $this->appLocale()],

diff --git a/tests/Unit/Data/LocalizedTest.php b/tests/Unit/Data/LocalizedTest.php
@@ -48,7 +48,7 @@
     $nativeCurrency    = CurrencyNames::get()->all();
     $localizedCurrency = CurrencyNames::get($locale)->all();
 
-    foreach (Locales::available() as $item) {
+    foreach (Locales::available(true, true) as $item) {
         // Locales
         expect($item->native)->toBe($nativeLocale[$item->code]);
         expect($item->localized)->toBe($localizedLocale[$item->code]);
@@ -87,7 +87,7 @@
     $nativeCountry    = CountryNames::get()->all();
     $localizedCountry = CountryNames::get($locale)->all();
 
-    foreach (Locales::available(withCurrencies: false) as $item) {
+    foreach (Locales::available(true) as $item) {
         // Locales
         expect($item->native)->toBe($nativeLocale[$item->code]);
         expect($item->localized)->toBe($localizedLocale[$item->code]);
@@ -122,7 +122,7 @@
     $nativeCurrency    = CurrencyNames::get()->all();
     $localizedCurrency = CurrencyNames::get($locale)->all();
 
-    foreach (Locales::available(withCountries: false) as $item) {
+    foreach (Locales::available(withCurrencies: true) as $item) {
         // Locales
         expect($item->native)->toBe($nativeLocale[$item->code]);
         expect($item->localized)->toBe($localizedLocale[$item->code]);
@@ -151,7 +151,7 @@
     $nativeLocale    = LocaleNames::get();
     $localizedLocale = LocaleNames::get($locale);
 
-    foreach (Locales::available(false, false) as $item) {
+    foreach (Locales::available() as $item) {
         expect($item->native)->toBe($nativeLocale[$item->code]);
         expect($item->localized)->toBe($localizedLocale[$item->code]);
 
@@ -180,7 +180,7 @@ function (
         expect(app()->getLocale())->toBe($forLocale);
         expect(Locales::getDefault()->code)->toBe($forLocale);
 
-        expect(Locales::info($locale))
+        expect(Locales::info($locale, true, true))
             // Locale
             ->code->toBe($locale)
             ->native->toBe($native)

diff --git a/tests/Unit/Facades/Locales/AvailableTest.php b/tests/Unit/Facades/Locales/AvailableTest.php
@@ -44,21 +44,21 @@
 })->with('incorrect-locales');
 
 it('checks for missing currency information')
-    ->expect(fn () => Locales::available(withCurrencies: false))
+    ->expect(fn () => Locales::available(true))
     ->each(fn (Expectation|LocaleData $item) => $item
         ->country->not->toBeNull()
         ->currency->toBeNull()
     );
 
 it('checks for missing country information')
-    ->expect(fn () => Locales::available(withCountries: false))
+    ->expect(fn () => Locales::available(withCurrencies: true))
     ->each(fn (Expectation|LocaleData $item) => $item
         ->country->toBeNull()
         ->currency->not->toBeNull()
     );
 
 it('checks for missing country and currency information')
-    ->expect(fn () => Locales::available(false, false))
+    ->expect(fn () => Locales::available())
     ->each(fn (Expectation|LocaleData $item) => $item
         ->country->toBeNull()
         ->currency->toBeNull()

diff --git a/tests/Unit/Facades/Locales/GetCurrentTest.php b/tests/Unit/Facades/Locales/GetCurrentTest.php
@@ -69,17 +69,17 @@
 });
 
 it('checks for missing currency information')
-    ->expect(fn () => Locales::getCurrent(withCurrency: false))
+    ->expect(fn () => Locales::getCurrent(true))
     ->country->not->toBeNull()
     ->currency->toBeNull();
 
 it('checks for missing country information')
-    ->expect(fn () => Locales::getCurrent(withCountry: false))
+    ->expect(fn () => Locales::getCurrent(withCurrency: true))
     ->country->toBeNull()
     ->currency->not->toBeNull();
 
 it('checks for missing country and currency information')
-    ->expect(fn () => Locales::getCurrent(false, false))
+    ->expect(fn () => Locales::getCurrent())
     ->country->toBeNull()
     ->currency->toBeNull();
 

diff --git a/tests/Unit/Facades/Locales/GetDefaultTest.php b/tests/Unit/Facades/Locales/GetDefaultTest.php
@@ -69,17 +69,17 @@
 });
 
 it('checks for missing currency information')
-    ->expect(fn () => Locales::getDefault(withCurrency: false))
+    ->expect(fn () => Locales::getDefault(true))
     ->country->not->toBeNull()
     ->currency->toBeNull();
 
 it('checks for missing country information')
-    ->expect(fn () => Locales::getDefault(withCountry: false))
+    ->expect(fn () => Locales::getDefault(withCurrency: true))
     ->country->toBeNull()
     ->currency->not->toBeNull();
 
 it('checks for missing country and currency information')
-    ->expect(fn () => Locales::getDefault(false, false))
+    ->expect(fn () => Locales::getDefault())
     ->country->toBeNull()
     ->currency->toBeNull();
 

diff --git a/tests/Unit/Facades/Locales/GetFallbackTest.php b/tests/Unit/Facades/Locales/GetFallbackTest.php
@@ -76,17 +76,17 @@
 })->with('aliased-locales');
 
 it('checks for missing currency information')
-    ->expect(fn () => Locales::getFallback(withCurrency: false))
+    ->expect(fn () => Locales::getFallback(true))
     ->country->not->toBeNull()
     ->currency->toBeNull();
 
 it('checks for missing country information')
-    ->expect(fn () => Locales::getFallback(withCountry: false))
+    ->expect(fn () => Locales::getFallback(withCurrency: true))
     ->country->toBeNull()
     ->currency->not->toBeNull();
 
 it('checks for missing country and currency information')
-    ->expect(fn () => Locales::getFallback(false, false))
+    ->expect(fn () => Locales::getFallback())
     ->country->toBeNull()
     ->currency->toBeNull();
 

diff --git a/tests/Unit/Facades/Locales/GetTest.php b/tests/Unit/Facades/Locales/GetTest.php
@@ -236,17 +236,17 @@ function () {
 })->with('locales');
 
 it('checks for missing currency information')
-    ->expect(fn () => Locales::get(Locale::Vietnamese, withCurrency: false))
+    ->expect(fn () => Locales::get(Locale::Vietnamese, true))
     ->country->not->toBeNull()
     ->currency->toBeNull();
 
 it('checks for missing country information')
-    ->expect(fn () => Locales::get(Locale::Vietnamese, withCountry: false))
+    ->expect(fn () => Locales::get(Locale::Vietnamese, withCurrency: true))
     ->country->toBeNull()
     ->currency->not->toBeNull();
 
 it('checks for missing country and currency information')
-    ->expect(fn () => Locales::get(Locale::Vietnamese, false, false))
+    ->expect(fn () => Locales::get(Locale::Vietnamese))
     ->country->toBeNull()
     ->currency->toBeNull();
 

diff --git a/tests/Unit/Facades/Locales/InstalledTest.php b/tests/Unit/Facades/Locales/InstalledTest.php
@@ -124,7 +124,7 @@
 
     setLocales(Locale::German, Locale::French);
 
-    expect(Locales::installed(withCurrencies: false))
+    expect(Locales::installed(withCountries: true))
         ->each(fn (Expectation|LocaleData $item) => $item
             ->country->not->toBeNull()
             ->currency->toBeNull()
@@ -136,7 +136,7 @@
 
     setLocales(Locale::German, Locale::French);
 
-    expect(Locales::installed(withCountries: false))
+    expect(Locales::installed(withCurrencies: true))
         ->each(fn (Expectation|LocaleData $item) => $item
             ->country->toBeNull()
             ->currency->not->toBeNull()
@@ -148,7 +148,7 @@
 
     setLocales(Locale::German, Locale::French);
 
-    expect(Locales::installed(withCountries: false, withCurrencies: false))
+    expect(Locales::installed())
         ->each(fn (Expectation|LocaleData $item) => $item
             ->country->toBeNull()
             ->currency->toBeNull()

diff --git a/tests/Unit/Facades/Locales/NotInstalledTest.php b/tests/Unit/Facades/Locales/NotInstalledTest.php
@@ -88,7 +88,7 @@
 
     setLocales(Locale::German, Locale::French);
 
-    expect(Locales::notInstalled(withCurrencies: false))
+    expect(Locales::notInstalled(true))
         ->each(fn (Expectation|LocaleData $item) => $item
             ->country->not->toBeNull()
             ->currency->toBeNull()
@@ -100,7 +100,7 @@
 
     setLocales(Locale::German, Locale::French);
 
-    expect(Locales::notInstalled(withCountries: false))
+    expect(Locales::notInstalled(withCurrencies: true))
         ->each(fn (Expectation|LocaleData $item) => $item
             ->country->toBeNull()
             ->currency->not->toBeNull()
@@ -112,7 +112,7 @@
 
     setLocales(Locale::German, Locale::French);
 
-    expect(Locales::notInstalled(withCountries: false, withCurrencies: false))
+    expect(Locales::notInstalled())
         ->each(fn (Expectation|LocaleData $item) => $item
             ->country->toBeNull()
             ->currency->toBeNull()

diff --git a/tests/Unit/Facades/Locales/ProtectsTest.php b/tests/Unit/Facades/Locales/ProtectsTest.php
@@ -94,7 +94,7 @@
 
     setLocales(Locale::German, Locale::French);
 
-    expect(Locales::protects(withCurrencies: false))
+    expect(Locales::protects(true))
         ->each(fn (Expectation|LocaleData $item) => $item
             ->country->not->toBeNull()
             ->currency->toBeNull()
@@ -106,7 +106,7 @@
 
     setLocales(Locale::German, Locale::French);
 
-    expect(Locales::protects(withCountries: false))
+    expect(Locales::protects(withCurrencies: true))
         ->each(fn (Expectation|LocaleData $item) => $item
             ->country->toBeNull()
             ->currency->not->toBeNull()
@@ -118,7 +118,7 @@
 
     setLocales(Locale::German, Locale::French);
 
-    expect(Locales::protects(withCountries: false, withCurrencies: false))
+    expect(Locales::protects())
         ->each(fn (Expectation|LocaleData $item) => $item
             ->country->toBeNull()
             ->currency->toBeNull()