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

Namespace was `LaravelLang\NativeLocaleNames\Native` renamed to `LaravelLang\NativeLocaleNames\LocaleNames`
Laravel-Lang · Nov 20, 2023 · e5f5bf4 · e5f5bf4
2 parents 6be8270 + e578436
commit e5f5bf4
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 22 deletions.
diff --git a/src/Native.php → src/LocaleNames.php b/src/Native.php → src/LocaleNames.php
@@ -21,10 +21,11 @@
 use LaravelLang\NativeLocaleNames\Enums\SortBy;
 use LaravelLang\NativeLocaleNames\Helpers\Arr;
 use LaravelLang\NativeLocaleNames\Helpers\Path;
+use LaravelLang\NativeLocaleNames\Services\Filesystem;
 
-class Native
+class LocaleNames
 {
-    protected static string $default = '_native';
+    public static string $default = '_native';
 
     public static function get(BackedEnum|string|null $locale = null, SortBy $sortBy = SortBy::Value): array
     {
@@ -42,7 +43,7 @@ protected static function forLocale(string $locale, SortBy $sortBy): array
 
     protected static function load(string $path): array
     {
-        return Arr::file($path);
+        return Filesystem::load($path);
     }
 
     protected static function path(string $locale): bool|string

diff --git a/tests/Datasets/Locales.php b/tests/Datasets/Locales.php
@@ -15,7 +15,7 @@
 
 declare(strict_types=1);
 
-use LaravelLang\Locales\Enums\Locale;
+use LaravelLang\LocaleList\Locale;
 
 dataset('locales-string', fn () => Locale::values());
 dataset('locales-enum', fn () => Locale::cases());

diff --git a/tests/Helpers/assets.php b/tests/Helpers/assets.php
@@ -15,7 +15,7 @@
 
 declare(strict_types=1);
 
-use LaravelLang\Locales\Enums\Locale;
+use LaravelLang\LocaleList\Locale;
 use LaravelLang\NativeLocaleNames\Enums\SortBy;
 use LaravelLang\NativeLocaleNames\Helpers\Arr;
 use PHPUnit\Framework\Assert;

diff --git a/tests/Helpers/native.php b/tests/Helpers/native.php
@@ -15,9 +15,10 @@
 
 declare(strict_types=1);
 
-use LaravelLang\NativeLocaleNames\Helpers\Arr;
+use LaravelLang\NativeLocaleNames\Helpers\Path;
+use LaravelLang\NativeLocaleNames\Services\Filesystem;
 
 function sourceLocale(string $locale): array
 {
-    return Arr::file(__DIR__ . '/../../locales/' . $locale . '/json.json');
+    return Filesystem::load(Path::resolve($locale));
 }
diff --git a/tests/Unit/EmptyTest.php b/tests/Unit/EmptyTest.php
@@ -15,11 +15,11 @@
 
 declare(strict_types=1);
 
-use LaravelLang\NativeLocaleNames\Native;
+use LaravelLang\NativeLocaleNames\LocaleNames;
 
 it('checks for empty values being passed')
     ->with('locales-empty')
-    ->expect(fn (?string $locale) => Native::get($locale))
+    ->expect(fn (?string $locale) => LocaleNames::get($locale))
     ->toBeSameCount()
     ->toBeCompileLocales()
     ->not->toBeEmpty();
diff --git a/tests/Unit/EnumTest.php b/tests/Unit/EnumTest.php
@@ -15,11 +15,11 @@
 
 declare(strict_types=1);
 
-use LaravelLang\Locales\Enums\Locale;
-use LaravelLang\NativeLocaleNames\Native;
+use LaravelLang\LocaleList\Locale;
+use LaravelLang\NativeLocaleNames\LocaleNames;
 
 it('checks if the enum matches the locale value', function (Locale $locale) {
-    expect(Native::get($locale))
+    expect(LocaleNames::get($locale))
         ->toBeSameCount()
         ->toBeLocale($locale)
         ->not->toBeEmpty();

diff --git a/tests/Unit/IncorrectTest.php b/tests/Unit/IncorrectTest.php
@@ -15,11 +15,11 @@
 
 declare(strict_types=1);
 
-use LaravelLang\NativeLocaleNames\Native;
+use LaravelLang\NativeLocaleNames\LocaleNames;
 
 it('checks for a match using the locale string value')
     ->with('locales-incorrect')
-    ->expect(fn (string $locale) => Native::get($locale))
+    ->expect(fn (string $locale) => LocaleNames::get($locale))
     ->toBeSameCount()
     ->toBeCompileLocales()
     ->not->toBeEmpty();
diff --git a/tests/Unit/NativeTest.php b/tests/Unit/NativeTest.php
@@ -16,10 +16,10 @@
 declare(strict_types=1);
 
 use LaravelLang\NativeLocaleNames\Helpers\Arr;
-use LaravelLang\NativeLocaleNames\Native;
+use LaravelLang\NativeLocaleNames\LocaleNames;
 
 it('should not be a clone of the English version')
-    ->expect(fn () => Native::get())
+    ->expect(fn () => LocaleNames::get())
     ->toBeSameCount()
     ->toBe(Arr::sort(sourceLocale('_native')))
     ->not->toBe(Arr::sort(sourceLocale('en')))

diff --git a/tests/Unit/SortTest.php b/tests/Unit/SortTest.php
@@ -16,24 +16,24 @@
 declare(strict_types=1);
 
 use LaravelLang\NativeLocaleNames\Enums\SortBy;
-use LaravelLang\NativeLocaleNames\Native;
+use LaravelLang\NativeLocaleNames\LocaleNames;
 
 it('checks default sorting', function (string $locale) {
-    expect(Native::get($locale))
+    expect(LocaleNames::get($locale))
         ->toBeSameCount()
         ->toBeLocale($locale)
         ->not->toBeEmpty();
 })->with('locales-string');
 
 it('checks sorting by key', function (string $locale) {
-    expect(Native::get($locale, SortBy::Key))
+    expect(LocaleNames::get($locale, SortBy::Key))
         ->toBeSameCount()
         ->toBeLocale($locale, SortBy::Key)
         ->not->toBeEmpty();
 })->with('locales-string');
 
 it('checks sorting by value', function (string $locale) {
-    expect(Native::get($locale, SortBy::Value))
+    expect(LocaleNames::get($locale, SortBy::Value))
         ->toBeSameCount()
         ->toBeLocale($locale, SortBy::Value)
         ->not->toBeEmpty();

diff --git a/tests/Unit/StringTest.php b/tests/Unit/StringTest.php
@@ -15,10 +15,10 @@
 
 declare(strict_types=1);
 
-use LaravelLang\NativeLocaleNames\Native;
+use LaravelLang\NativeLocaleNames\LocaleNames;
 
 it('checks for a match using the locale string value', function (string $locale) {
-    expect(Native::get($locale))
+    expect(LocaleNames::get($locale))
         ->toBeSameCount()
         ->toBeLocale($locale)
         ->not->toBeEmpty();