Skip to content

Commit

Permalink
Merge pull request #167 from Laravel-Lang/11.1-split
Browse files Browse the repository at this point in the history
Fixes
  • Loading branch information
Andrey Helldar authored Dec 1, 2021
2 parents 4da6929 + 0ef36c0 commit 61706ca
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 10 deletions.
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": "*",
Expand Down
6 changes: 0 additions & 6 deletions config/private.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,7 @@

declare(strict_types=1);

use LaravelLang\Lang\Publisher\Provider as LaravelLang;

return [
'plugins' => [
LaravelLang::class,
],

'path' => [
'base' => base_path('vendor'),

Expand Down
1 change: 1 addition & 0 deletions config/public.php
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@
*/

'plugins' => [
// \LaravelLang\Lang\Provider::class,
// \LaravelLang\HttpStatuses\Provider::class,
],
];
6 changes: 5 additions & 1 deletion tests/TestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 61706ca

Please sign in to comment.