Skip to content

Commit 55b1b21

Browse files
committed
Register the translationSP conditionally, thus removing the hard dependency
1 parent be2f072 commit 55b1b21

3 files changed

Lines changed: 5 additions & 3 deletions

File tree

Providers/AsgardServiceProvider.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,15 @@
22

33
use Illuminate\Foundation\AliasLoader;
44
use Illuminate\Support\ServiceProvider;
5+
use Modules\Translation\Providers\TranslationServiceProvider;
56

67
class AsgardServiceProvider extends ServiceProvider
78
{
89
public function register()
910
{
11+
if (class_exists(TranslationServiceProvider::class)) {
12+
$this->app->register(TranslationServiceProvider::class);
13+
}
1014
$this->app->register('Pingpong\Modules\ModulesServiceProvider');
1115

1216
$loader = AliasLoader::getInstance();

composer.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@
3030
"dimsav/laravel-translatable": "~5.0",
3131
"mcamara/laravel-localization": "~1.0",
3232
"floatingpoint/stylist": "~0.1",
33-
"maatwebsite/laravel-sidebar": "~2.0",
34-
"asgardcms/translation-module": "~1.0"
33+
"maatwebsite/laravel-sidebar": "~2.0"
3534
},
3635
"require-dev": {
3736
"phpunit/phpunit": "~4.0",

module.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
"active": 1,
99
"order": 0,
1010
"providers": [
11-
"Modules\\Translation\\Providers\\TranslationServiceProvider",
1211
"Modules\\Core\\Providers\\CoreServiceProvider",
1312
"Modules\\Core\\Providers\\AssetServiceProvider",
1413
"Collective\\Html\\HtmlServiceProvider",

0 commit comments

Comments
 (0)