From 0ef36c0a332d95fe7b105ac15023a45aaa2bd9f1 Mon Sep 17 00:00:00 2001 From: Andrey Helldar Date: Wed, 1 Dec 2021 19:25:28 +0300 Subject: [PATCH] Fixes --- composer.json | 6 +++--- config/private.php | 6 ------ config/public.php | 1 + tests/TestCase.php | 6 +++++- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/composer.json b/composer.json index 88213232..8133e329 100644 --- a/composer.json +++ b/composer.json @@ -43,13 +43,13 @@ "dragon-code/support": "^5.2", "illuminate/console": "^7.0|^8.0|^9.0", "illuminate/contracts": "^7.0|^8.0|^9.0", - "illuminate/support": "^7.0|^8.0|^9.0", - "laravel-lang/lang": "^10.1.11" + "illuminate/support": "^7.0|^8.0|^9.0" }, "require-dev": { "orchestra/testbench": "^5.0|^6.0|^7.0", "phpunit/phpunit": "^9.4", - "symfony/var-dumper": "^5.0|^6.0" + "symfony/var-dumper": "^5.0|^6.0", + "laravel-lang/lang": "^10.1.11" }, "conflict": { "andrey-helldar/laravel-lang-publisher": "*", diff --git a/config/private.php b/config/private.php index b012714c..1c87a65a 100644 --- a/config/private.php +++ b/config/private.php @@ -17,13 +17,7 @@ declare(strict_types=1); -use LaravelLang\Lang\Publisher\Provider as LaravelLang; - return [ - 'plugins' => [ - LaravelLang::class, - ], - 'path' => [ 'base' => base_path('vendor'), diff --git a/config/public.php b/config/public.php index 36b76c43..1c74a117 100644 --- a/config/public.php +++ b/config/public.php @@ -75,6 +75,7 @@ */ 'plugins' => [ + // \LaravelLang\Lang\Provider::class, // \LaravelLang\HttpStatuses\Provider::class, ], ]; diff --git a/tests/TestCase.php b/tests/TestCase.php index 83a0ae0a..bde22745 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -22,6 +22,7 @@ use DragonCode\Support\Facades\Helpers\Arr; use DragonCode\Support\Facades\Helpers\Filesystem\Directory; use Illuminate\Support\Facades\File; +use LaravelLang\Lang\ServiceProvider as LangServiceProvider; use LaravelLang\Publisher\Concerns\Has; use LaravelLang\Publisher\Concerns\Paths; use LaravelLang\Publisher\Constants\Config; @@ -74,7 +75,10 @@ protected function setUp(): void protected function getPackageProviders($app): array { - return [ServiceProvider::class]; + return [ + ServiceProvider::class, + LangServiceProvider::class, + ]; } protected function getEnvironmentSetUp($app)