Merge pull request #344 from Laravel-Lang/16.x

andrey-helldar · web-flow · commit a50979bb1c49 · 2023-12-16T19:33:46.000+03:00
Bump `laravel-lang/locales` to 2.3
diff --git a/composer.json b/composer.json
@@ -51,15 +51,15 @@
         "illuminate/collections": "^10.0",
         "illuminate/console": "^10.0",
         "illuminate/support": "^10.0",
-        "laravel-lang/locales": "^1.5.0",
+        "laravel-lang/locales": "^2.3",
         "league/commonmark": "^2.4.1",
         "league/config": "^1.2"
     },
     "require-dev": {
         "laravel-lang/json-fallback-hotfix": "^1.1",
         "orchestra/testbench": "^8.14",
         "phpunit/phpunit": "^10.4.2",
-        "symfony/var-dumper": "^6.3.6"
+        "symfony/var-dumper": "^6.3.6 || ^7.0"
     },
     "conflict": {
         "laravel-lang/attributes": "<2.0",
diff --git a/config/public.php b/config/public.php
@@ -15,7 +15,7 @@
 
 declare(strict_types=1);
 
-use LaravelLang\Locales\Enums\Locale;
+use LaravelLang\LocaleList\Locale;
 
 return [
     /*
diff --git a/src/Console/Add.php b/src/Console/Add.php
@@ -17,7 +17,7 @@
 
 namespace LaravelLang\Publisher\Console;
 
-use LaravelLang\Locales\Enums\Locale;
+use LaravelLang\LocaleList\Locale;
 use LaravelLang\Locales\Facades\Locales;
 use LaravelLang\Publisher\Exceptions\UnknownLocaleCodeException;
 use LaravelLang\Publisher\Processors\Add as AddProcessor;
diff --git a/src/Console/Remove.php b/src/Console/Remove.php
@@ -17,7 +17,7 @@
 
 namespace LaravelLang\Publisher\Console;
 
-use LaravelLang\Locales\Enums\Locale;
+use LaravelLang\LocaleList\Locale;
 use LaravelLang\Locales\Facades\Locales;
 use LaravelLang\Publisher\Exceptions\ProtectedLocaleException;
 use LaravelLang\Publisher\Exceptions\UnknownLocaleCodeException;
diff --git a/src/Exceptions/BaseException.php b/src/Exceptions/BaseException.php
@@ -17,7 +17,7 @@
 
 namespace LaravelLang\Publisher\Exceptions;
 
-use LaravelLang\Locales\Enums\Locale;
+use LaravelLang\LocaleList\Locale;
 use RuntimeException;
 
 class BaseException extends RuntimeException
diff --git a/src/Exceptions/ProtectedLocaleException.php b/src/Exceptions/ProtectedLocaleException.php
@@ -17,7 +17,7 @@
 
 namespace LaravelLang\Publisher\Exceptions;
 
-use LaravelLang\Locales\Enums\Locale;
+use LaravelLang\LocaleList\Locale;
 
 class ProtectedLocaleException extends BaseException
 {
diff --git a/src/Exceptions/UnknownLocaleCodeException.php b/src/Exceptions/UnknownLocaleCodeException.php
@@ -17,7 +17,7 @@
 
 namespace LaravelLang\Publisher\Exceptions;
 
-use LaravelLang\Locales\Enums\Locale;
+use LaravelLang\LocaleList\Locale;
 
 class UnknownLocaleCodeException extends BaseException
 {
diff --git a/src/Helpers/Config.php b/src/Helpers/Config.php
@@ -18,9 +18,9 @@
 namespace LaravelLang\Publisher\Helpers;
 
 use DragonCode\Contracts\Support\Stringable;
+use LaravelLang\LocaleList\Locale;
 use LaravelLang\Locales\Concerns\Aliases;
 use LaravelLang\Locales\Enums\Config as ConfigEnum;
-use LaravelLang\Locales\Enums\Locale;
 use LaravelLang\Publisher\Constants\Types;
 
 class Config
diff --git a/src/Processors/Remove.php b/src/Processors/Remove.php
@@ -22,7 +22,7 @@
 use DragonCode\Support\Facades\Filesystem\Path;
 use DragonCode\Support\Facades\Helpers\Arr;
 use DragonCode\Support\Facades\Helpers\Str;
-use LaravelLang\Locales\Enums\Locale;
+use LaravelLang\LocaleList\Locale;
 
 class Remove extends Processor
 {
diff --git a/tests/Concerns/Commands.php b/tests/Concerns/Commands.php
@@ -17,7 +17,7 @@
 
 namespace Tests\Concerns;
 
-use LaravelLang\Locales\Enums\Locale;
+use LaravelLang\LocaleList\Locale;
 
 trait Commands
 {
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -21,7 +21,7 @@
 use Illuminate\Support\Facades\App;
 use Illuminate\Translation\TranslationServiceProvider;
 use LaravelLang\JsonFallbackHotfix\TranslationServiceProvider as FixedTranslationServiceProvider;
-use LaravelLang\Locales\Enums\Locale;
+use LaravelLang\LocaleList\Locale;
 use LaravelLang\Locales\Facades\Locales;
 use LaravelLang\Locales\ServiceProvider as LocalesServiceProvider;
 use LaravelLang\Publisher\Helpers\Config;
diff --git a/tests/Unit/Console/Decorated/DisabledDecorateTest.php b/tests/Unit/Console/Decorated/DisabledDecorateTest.php
@@ -17,7 +17,7 @@
 
 namespace Tests\Unit\Console\Decorated;
 
-use LaravelLang\Locales\Enums\Locale;
+use LaravelLang\LocaleList\Locale;
 use Tests\Unit\Console\InlineOff\TestCase;
 
 class DisabledDecorateTest extends TestCase
diff --git a/tests/Unit/Console/Decorated/EnabledDecorateTest.php b/tests/Unit/Console/Decorated/EnabledDecorateTest.php
@@ -17,7 +17,7 @@
 
 namespace Tests\Unit\Console\Decorated;
 
-use LaravelLang\Locales\Enums\Locale;
+use LaravelLang\LocaleList\Locale;
 use Tests\Unit\Console\InlineOff\TestCase;
 
 class EnabledDecorateTest extends TestCase
diff --git a/tests/Unit/Console/InlineOff/Add/Success/DefaultTest.php b/tests/Unit/Console/InlineOff/Add/Success/DefaultTest.php
@@ -17,7 +17,7 @@
 
 namespace Tests\Unit\Console\InlineOff\Add\Success;
 
-use LaravelLang\Locales\Enums\Locale;
+use LaravelLang\LocaleList\Locale;
 use Tests\Unit\Console\InlineOff\TestCase;
 
 class DefaultTest extends TestCase
diff --git a/tests/Unit/Console/InlineOff/Add/Success/DefaultWithInstalledTest.php b/tests/Unit/Console/InlineOff/Add/Success/DefaultWithInstalledTest.php
@@ -17,7 +17,7 @@
 
 namespace Tests\Unit\Console\InlineOff\Add\Success;
 
-use LaravelLang\Locales\Enums\Locale;
+use LaravelLang\LocaleList\Locale;
 use Tests\Unit\Console\InlineOff\TestCase;
 
 class DefaultWithInstalledTest extends TestCase
diff --git a/tests/Unit/Console/InlineOff/Add/Success/FallbackTest.php b/tests/Unit/Console/InlineOff/Add/Success/FallbackTest.php
@@ -17,7 +17,7 @@
 
 namespace Tests\Unit\Console\InlineOff\Add\Success;
 
-use LaravelLang\Locales\Enums\Locale;
+use LaravelLang\LocaleList\Locale;
 use Tests\Unit\Console\InlineOff\TestCase;
 
 class FallbackTest extends TestCase
diff --git a/tests/Unit/Console/InlineOff/Add/Success/FallbackWithInstalledTest.php b/tests/Unit/Console/InlineOff/Add/Success/FallbackWithInstalledTest.php
@@ -17,7 +17,7 @@
 
 namespace Tests\Unit\Console\InlineOff\Add\Success;
 
-use LaravelLang\Locales\Enums\Locale;
+use LaravelLang\LocaleList\Locale;
 use Tests\Unit\Console\InlineOff\TestCase;
 
 class FallbackWithInstalledTest extends TestCase
diff --git a/tests/Unit/Console/InlineOff/Add/WithoutParameterTest.php b/tests/Unit/Console/InlineOff/Add/WithoutParameterTest.php
@@ -17,7 +17,7 @@
 
 namespace Tests\Unit\Console\InlineOff\Add;
 
-use LaravelLang\Locales\Enums\Locale;
+use LaravelLang\LocaleList\Locale;
 use LaravelLang\Locales\Facades\Locales;
 use Tests\Unit\Console\InlineOff\TestCase;
 
diff --git a/tests/Unit/Console/InlineOff/Remove/ProtectedTest.php b/tests/Unit/Console/InlineOff/Remove/ProtectedTest.php
@@ -17,7 +17,7 @@
 
 namespace Tests\Unit\Console\InlineOff\Remove;
 
-use LaravelLang\Locales\Enums\Locale;
+use LaravelLang\LocaleList\Locale;
 use LaravelLang\Publisher\Exceptions\ProtectedLocaleException;
 use Tests\Unit\Console\InlineOff\TestCase;
 
diff --git a/tests/Unit/Console/InlineOff/Remove/SuccessTest.php b/tests/Unit/Console/InlineOff/Remove/SuccessTest.php
@@ -17,7 +17,7 @@
 
 namespace Tests\Unit\Console\InlineOff\Remove;
 
-use LaravelLang\Locales\Enums\Locale;
+use LaravelLang\LocaleList\Locale;
 use LaravelLang\Locales\Facades\Locales;
 use Tests\Unit\Console\InlineOff\TestCase;
 
diff --git a/tests/Unit/Console/InlineOff/Remove/WithoutParameterTest.php b/tests/Unit/Console/InlineOff/Remove/WithoutParameterTest.php
@@ -17,7 +17,7 @@
 
 namespace Tests\Unit\Console\InlineOff\Remove;
 
-use LaravelLang\Locales\Enums\Locale;
+use LaravelLang\LocaleList\Locale;
 use LaravelLang\Locales\Facades\Locales;
 use Tests\Unit\Console\InlineOff\TestCase;
 
diff --git a/tests/Unit/Console/InlineOff/Reset/AcceptTest.php b/tests/Unit/Console/InlineOff/Reset/AcceptTest.php
@@ -17,7 +17,7 @@
 
 namespace Tests\Unit\Console\InlineOff\Reset;
 
-use LaravelLang\Locales\Enums\Locale;
+use LaravelLang\LocaleList\Locale;
 use Tests\Unit\Console\InlineOff\TestCase;
 
 class AcceptTest extends TestCase
diff --git a/tests/Unit/Console/InlineOff/Reset/DeclineTest.php b/tests/Unit/Console/InlineOff/Reset/DeclineTest.php
@@ -17,7 +17,7 @@
 
 namespace Tests\Unit\Console\InlineOff\Reset;
 
-use LaravelLang\Locales\Enums\Locale;
+use LaravelLang\LocaleList\Locale;
 use Tests\Unit\Console\InlineOff\TestCase;
 
 class DeclineTest extends TestCase
diff --git a/tests/Unit/Console/InlineOff/Update/EmptyDirectoryTest.php b/tests/Unit/Console/InlineOff/Update/EmptyDirectoryTest.php
@@ -19,7 +19,7 @@
 
 use DragonCode\Support\Facades\Filesystem\Directory;
 use DragonCode\Support\Facades\Filesystem\File;
-use LaravelLang\Locales\Enums\Locale;
+use LaravelLang\LocaleList\Locale;
 use Tests\Unit\Console\InlineOff\TestCase;
 
 class EmptyDirectoryTest extends TestCase
diff --git a/tests/Unit/Console/InlineOff/Update/Success/DefaultWithInstalledTest.php b/tests/Unit/Console/InlineOff/Update/Success/DefaultWithInstalledTest.php
@@ -18,7 +18,7 @@
 namespace Tests\Unit\Console\InlineOff\Update\Success;
 
 use DragonCode\Support\Facades\Filesystem\Directory;
-use LaravelLang\Locales\Enums\Locale;
+use LaravelLang\LocaleList\Locale;
 use Tests\Unit\Console\InlineOff\TestCase;
 
 class DefaultWithInstalledTest extends TestCase
diff --git a/tests/Unit/Console/InlineOff/Update/Success/FallbackWithInstalledTest.php b/tests/Unit/Console/InlineOff/Update/Success/FallbackWithInstalledTest.php
@@ -18,7 +18,7 @@
 namespace Tests\Unit\Console\InlineOff\Update\Success;
 
 use DragonCode\Support\Facades\Filesystem\Directory;
-use LaravelLang\Locales\Enums\Locale;
+use LaravelLang\LocaleList\Locale;
 use Tests\Unit\Console\InlineOff\TestCase;
 
 class FallbackWithInstalledTest extends TestCase
diff --git a/tests/Unit/Console/InlineOff/Update/Success/NestedAttributesTest.php b/tests/Unit/Console/InlineOff/Update/Success/NestedAttributesTest.php
@@ -16,7 +16,7 @@
 namespace Tests\Unit\Console\InlineOff\Update\Success;
 
 use DragonCode\Support\Facades\Filesystem\Directory;
-use LaravelLang\Locales\Enums\Locale;
+use LaravelLang\LocaleList\Locale;
 use Tests\Unit\Console\InlineOff\TestCase;
 
 class NestedAttributesTest extends TestCase
diff --git a/tests/Unit/Console/InlineOn/Add/Success/DefaultTest.php b/tests/Unit/Console/InlineOn/Add/Success/DefaultTest.php
@@ -17,7 +17,7 @@
 
 namespace Tests\Unit\Console\InlineOn\Add\Success;
 
-use LaravelLang\Locales\Enums\Locale;
+use LaravelLang\LocaleList\Locale;
 use Tests\Unit\Console\InlineOn\TestCase;
 
 class DefaultTest extends TestCase
diff --git a/tests/Unit/Console/InlineOn/Add/Success/DefaultWithInstalledTest.php b/tests/Unit/Console/InlineOn/Add/Success/DefaultWithInstalledTest.php
@@ -17,7 +17,7 @@
 
 namespace Tests\Unit\Console\InlineOn\Add\Success;
 
-use LaravelLang\Locales\Enums\Locale;
+use LaravelLang\LocaleList\Locale;
 use Tests\Unit\Console\InlineOn\TestCase;
 
 class DefaultWithInstalledTest extends TestCase
diff --git a/tests/Unit/Console/InlineOn/Add/Success/FallbackTest.php b/tests/Unit/Console/InlineOn/Add/Success/FallbackTest.php
@@ -17,7 +17,7 @@
 
 namespace Tests\Unit\Console\InlineOn\Add\Success;
 
-use LaravelLang\Locales\Enums\Locale;
+use LaravelLang\LocaleList\Locale;
 use Tests\Unit\Console\InlineOn\TestCase;
 
 class FallbackTest extends TestCase
diff --git a/tests/Unit/Console/InlineOn/Add/Success/FallbackWithInstalledTest.php b/tests/Unit/Console/InlineOn/Add/Success/FallbackWithInstalledTest.php
@@ -17,7 +17,7 @@
 
 namespace Tests\Unit\Console\InlineOn\Add\Success;
 
-use LaravelLang\Locales\Enums\Locale;
+use LaravelLang\LocaleList\Locale;
 use Tests\Unit\Console\InlineOn\TestCase;
 
 class FallbackWithInstalledTest extends TestCase
diff --git a/tests/Unit/Console/InlineOn/Add/WithoutParameterTest.php b/tests/Unit/Console/InlineOn/Add/WithoutParameterTest.php
@@ -17,7 +17,7 @@
 
 namespace Tests\Unit\Console\InlineOn\Add;
 
-use LaravelLang\Locales\Enums\Locale;
+use LaravelLang\LocaleList\Locale;
 use LaravelLang\Locales\Facades\Locales;
 use Tests\Unit\Console\InlineOn\TestCase;
 
diff --git a/tests/Unit/Console/InlineOn/Remove/ProtectedTest.php b/tests/Unit/Console/InlineOn/Remove/ProtectedTest.php
@@ -17,7 +17,7 @@
 
 namespace Tests\Unit\Console\InlineOn\Remove;
 
-use LaravelLang\Locales\Enums\Locale;
+use LaravelLang\LocaleList\Locale;
 use LaravelLang\Publisher\Exceptions\ProtectedLocaleException;
 use Tests\Unit\Console\InlineOn\TestCase;
 
diff --git a/tests/Unit/Console/InlineOn/Remove/SuccessTest.php b/tests/Unit/Console/InlineOn/Remove/SuccessTest.php
@@ -17,7 +17,7 @@
 
 namespace Tests\Unit\Console\InlineOn\Remove;
 
-use LaravelLang\Locales\Enums\Locale;
+use LaravelLang\LocaleList\Locale;
 use LaravelLang\Locales\Facades\Locales;
 use Tests\Unit\Console\InlineOn\TestCase;
 
diff --git a/tests/Unit/Console/InlineOn/Remove/WithoutParameterTest.php b/tests/Unit/Console/InlineOn/Remove/WithoutParameterTest.php
@@ -17,7 +17,7 @@
 
 namespace Tests\Unit\Console\InlineOn\Remove;
 
-use LaravelLang\Locales\Enums\Locale;
+use LaravelLang\LocaleList\Locale;
 use LaravelLang\Locales\Facades\Locales;
 use Tests\Unit\Console\InlineOn\TestCase;
 
diff --git a/tests/Unit/Console/InlineOn/Reset/AcceptTest.php b/tests/Unit/Console/InlineOn/Reset/AcceptTest.php
@@ -17,7 +17,7 @@
 
 namespace Tests\Unit\Console\InlineOn\Reset;
 
-use LaravelLang\Locales\Enums\Locale;
+use LaravelLang\LocaleList\Locale;
 use Tests\Unit\Console\InlineOn\TestCase;
 
 class AcceptTest extends TestCase
diff --git a/tests/Unit/Console/InlineOn/Reset/DeclineTest.php b/tests/Unit/Console/InlineOn/Reset/DeclineTest.php
@@ -17,7 +17,7 @@
 
 namespace Tests\Unit\Console\InlineOn\Reset;
 
-use LaravelLang\Locales\Enums\Locale;
+use LaravelLang\LocaleList\Locale;
 use Tests\Unit\Console\InlineOn\TestCase;
 
 class DeclineTest extends TestCase
diff --git a/tests/Unit/Console/InlineOn/Update/EmptyDirectoryTest.php b/tests/Unit/Console/InlineOn/Update/EmptyDirectoryTest.php
@@ -19,7 +19,7 @@
 
 use DragonCode\Support\Facades\Filesystem\Directory;
 use DragonCode\Support\Facades\Filesystem\File;
-use LaravelLang\Locales\Enums\Locale;
+use LaravelLang\LocaleList\Locale;
 use Tests\Unit\Console\InlineOn\TestCase;
 
 class EmptyDirectoryTest extends TestCase
diff --git a/tests/Unit/Console/InlineOn/Update/Success/DefaultWithInstalledTest.php b/tests/Unit/Console/InlineOn/Update/Success/DefaultWithInstalledTest.php
@@ -18,7 +18,7 @@
 namespace Tests\Unit\Console\InlineOn\Update\Success;
 
 use DragonCode\Support\Facades\Filesystem\Directory;
-use LaravelLang\Locales\Enums\Locale;
+use LaravelLang\LocaleList\Locale;
 use Tests\Unit\Console\InlineOn\TestCase;
 
 class DefaultWithInstalledTest extends TestCase
diff --git a/tests/Unit/Console/InlineOn/Update/Success/FallbackWithInstalledTest.php b/tests/Unit/Console/InlineOn/Update/Success/FallbackWithInstalledTest.php
@@ -18,7 +18,7 @@
 namespace Tests\Unit\Console\InlineOn\Update\Success;
 
 use DragonCode\Support\Facades\Filesystem\Directory;
-use LaravelLang\Locales\Enums\Locale;
+use LaravelLang\LocaleList\Locale;
 use Tests\Unit\Console\InlineOn\TestCase;
 
 class FallbackWithInstalledTest extends TestCase
diff --git a/tests/Unit/Console/InlineOn/Update/Success/NestedAttributesTest.php b/tests/Unit/Console/InlineOn/Update/Success/NestedAttributesTest.php
@@ -16,7 +16,7 @@
 namespace Tests\Unit\Console\InlineOn\Update\Success;
 
 use DragonCode\Support\Facades\Filesystem\Directory;
-use LaravelLang\Locales\Enums\Locale;
+use LaravelLang\LocaleList\Locale;
 use Tests\Unit\Console\InlineOn\TestCase;
 
 class NestedAttributesTest extends TestCase

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`
`18`	`18`	`namespace LaravelLang\Publisher\Exceptions;`
`19`	`19`
`20`		`-use LaravelLang\Locales\Enums\Locale;`
	`20`	`+use LaravelLang\LocaleList\Locale;`
`21`	`21`
`22`	`22`	`class ProtectedLocaleException extends BaseException`
`23`	`23`	`{`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`use DragonCode\Support\Facades\Filesystem\Path;`
`23`	`23`	`use DragonCode\Support\Facades\Helpers\Arr;`
`24`	`24`	`use DragonCode\Support\Facades\Helpers\Str;`
`25`		`-use LaravelLang\Locales\Enums\Locale;`
	`25`	`+use LaravelLang\LocaleList\Locale;`
`26`	`26`
`27`	`27`	`class Remove extends Processor`
`28`	`28`	`{`