Skip to content

Commit

Permalink
Merge pull request #344 from Laravel-Lang/16.x
Browse files Browse the repository at this point in the history
Bump `laravel-lang/locales` to 2.3
  • Loading branch information
andrey-helldar authored Dec 16, 2023
2 parents da85eab + 41af16e commit a50979b
Show file tree
Hide file tree
Showing 41 changed files with 42 additions and 42 deletions.
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion config/public.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

declare(strict_types=1);

use LaravelLang\Locales\Enums\Locale;
use LaravelLang\LocaleList\Locale;

return [
/*
Expand Down
2 changes: 1 addition & 1 deletion src/Console/Add.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/Console/Remove.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/Exceptions/BaseException.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

namespace LaravelLang\Publisher\Exceptions;

use LaravelLang\Locales\Enums\Locale;
use LaravelLang\LocaleList\Locale;
use RuntimeException;

class BaseException extends RuntimeException
Expand Down
2 changes: 1 addition & 1 deletion src/Exceptions/ProtectedLocaleException.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

namespace LaravelLang\Publisher\Exceptions;

use LaravelLang\Locales\Enums\Locale;
use LaravelLang\LocaleList\Locale;

class ProtectedLocaleException extends BaseException
{
Expand Down
2 changes: 1 addition & 1 deletion src/Exceptions/UnknownLocaleCodeException.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

namespace LaravelLang\Publisher\Exceptions;

use LaravelLang\Locales\Enums\Locale;
use LaravelLang\LocaleList\Locale;

class UnknownLocaleCodeException extends BaseException
{
Expand Down
2 changes: 1 addition & 1 deletion src/Helpers/Config.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/Processors/Remove.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
2 changes: 1 addition & 1 deletion tests/Concerns/Commands.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

namespace Tests\Concerns;

use LaravelLang\Locales\Enums\Locale;
use LaravelLang\LocaleList\Locale;

trait Commands
{
Expand Down
2 changes: 1 addition & 1 deletion tests/TestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion tests/Unit/Console/Decorated/DisabledDecorateTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/Unit/Console/Decorated/EnabledDecorateTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/Unit/Console/InlineOff/Add/Success/DefaultTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/Unit/Console/InlineOff/Add/Success/FallbackTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/Unit/Console/InlineOff/Add/WithoutParameterTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion tests/Unit/Console/InlineOff/Remove/ProtectedTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion tests/Unit/Console/InlineOff/Remove/SuccessTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion tests/Unit/Console/InlineOff/Reset/AcceptTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/Unit/Console/InlineOff/Reset/DeclineTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/Unit/Console/InlineOff/Update/EmptyDirectoryTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/Unit/Console/InlineOn/Add/Success/DefaultTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/Unit/Console/InlineOn/Add/Success/FallbackTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/Unit/Console/InlineOn/Add/WithoutParameterTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion tests/Unit/Console/InlineOn/Remove/ProtectedTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion tests/Unit/Console/InlineOn/Remove/SuccessTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion tests/Unit/Console/InlineOn/Reset/AcceptTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/Unit/Console/InlineOn/Reset/DeclineTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/Unit/Console/InlineOn/Update/EmptyDirectoryTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit a50979b

Please sign in to comment.