From eea028e73580d3ebbee86d74b6ce35f729d204d7 Mon Sep 17 00:00:00 2001 From: Caen De Silva Date: Mon, 5 Dec 2022 21:48:03 +0100 Subject: [PATCH 1/5] Update TranslationServiceProvider to extend the Illuminate TranslationServiceProvider --- .../Framework/Providers/TranslationServiceProvider.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/framework/src/Framework/Providers/TranslationServiceProvider.php b/packages/framework/src/Framework/Providers/TranslationServiceProvider.php index 235d036df02..9561bf7a9fd 100644 --- a/packages/framework/src/Framework/Providers/TranslationServiceProvider.php +++ b/packages/framework/src/Framework/Providers/TranslationServiceProvider.php @@ -4,16 +4,18 @@ namespace Hyde\Framework\Providers; +use Illuminate\Translation\TranslationServiceProvider as IlluminateTranslationServiceProvider; + use function config; -use Illuminate\Contracts\Support\DeferrableProvider; -use Illuminate\Support\ServiceProvider; use function is_dir; use function lang_path; -class TranslationServiceProvider extends ServiceProvider implements DeferrableProvider +class TranslationServiceProvider extends IlluminateTranslationServiceProvider { public function register(): void { + parent::register(); + if (! is_dir(lang_path())) { $this->app->useLangPath(__DIR__.'/../../../resources/lang'); } From fc88613ff78fa539fd529545c8fae44bae5ab21b Mon Sep 17 00:00:00 2001 From: Caen De Silva Date: Mon, 5 Dec 2022 21:48:30 +0100 Subject: [PATCH 2/5] Remove Illuminate TranslationServiceProvider from app.php config --- config/app.php | 1 - 1 file changed, 1 deletion(-) diff --git a/config/app.php b/config/app.php index b5a8266add2..13029c77e86 100644 --- a/config/app.php +++ b/config/app.php @@ -78,7 +78,6 @@ 'providers' => [ App\Providers\AppServiceProvider::class, - Illuminate\Translation\TranslationServiceProvider::class, Illuminate\Validation\ValidationServiceProvider::class, Hyde\Framework\HydeServiceProvider::class, ], From e279afbf72c1b95fe5d5e49ef1eb0a67d3a25cf8 Mon Sep 17 00:00:00 2001 From: Caen De Silva Date: Mon, 5 Dec 2022 21:51:33 +0100 Subject: [PATCH 3/5] Register translation provider in app config so it's easier for users to swap out --- config/app.php | 1 + packages/framework/src/Framework/HydeServiceProvider.php | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/config/app.php b/config/app.php index 13029c77e86..5c236cc68b1 100644 --- a/config/app.php +++ b/config/app.php @@ -80,6 +80,7 @@ App\Providers\AppServiceProvider::class, Illuminate\Validation\ValidationServiceProvider::class, Hyde\Framework\HydeServiceProvider::class, + Hyde\Framework\Providers\TranslationServiceProvider::class ], /* diff --git a/packages/framework/src/Framework/HydeServiceProvider.php b/packages/framework/src/Framework/HydeServiceProvider.php index 8f89ecadffd..f177f1d2351 100644 --- a/packages/framework/src/Framework/HydeServiceProvider.php +++ b/packages/framework/src/Framework/HydeServiceProvider.php @@ -115,6 +115,5 @@ protected function registerModuleServiceProviders(): void $this->app->register(SessionServiceProvider::class); $this->app->register(HydeConsoleServiceProvider::class); $this->app->register(DataCollectionServiceProvider::class); - $this->app->register(TranslationServiceProvider::class); } } From 8cbd822e36428e762b6501e1bdd0ea3709592707 Mon Sep 17 00:00:00 2001 From: Caen De Silva Date: Mon, 5 Dec 2022 21:51:50 +0100 Subject: [PATCH 4/5] Reorder service providers in config --- config/app.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/app.php b/config/app.php index 5c236cc68b1..98fda3e316c 100644 --- a/config/app.php +++ b/config/app.php @@ -78,9 +78,9 @@ 'providers' => [ App\Providers\AppServiceProvider::class, - Illuminate\Validation\ValidationServiceProvider::class, Hyde\Framework\HydeServiceProvider::class, - Hyde\Framework\Providers\TranslationServiceProvider::class + Hyde\Framework\Providers\TranslationServiceProvider::class, + Illuminate\Validation\ValidationServiceProvider::class, ], /* From 429ad2962005659a8ce833f990a5759904bbc144 Mon Sep 17 00:00:00 2001 From: StyleCI Bot Date: Mon, 5 Dec 2022 20:52:38 +0000 Subject: [PATCH 5/5] Apply fixes from StyleCI --- packages/framework/src/Framework/HydeServiceProvider.php | 1 - .../src/Framework/Providers/TranslationServiceProvider.php | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/framework/src/Framework/HydeServiceProvider.php b/packages/framework/src/Framework/HydeServiceProvider.php index f177f1d2351..48541b98027 100644 --- a/packages/framework/src/Framework/HydeServiceProvider.php +++ b/packages/framework/src/Framework/HydeServiceProvider.php @@ -9,7 +9,6 @@ use Hyde\Framework\Concerns\RegistersFileLocations; use Hyde\Framework\Features\DataCollections\DataCollectionServiceProvider; use Hyde\Framework\Features\Session\SessionServiceProvider; -use Hyde\Framework\Providers\TranslationServiceProvider; use Hyde\Framework\Services\AssetService; use Hyde\Framework\Services\YamlConfigurationService; use Hyde\Framework\Views\Components\LinkComponent; diff --git a/packages/framework/src/Framework/Providers/TranslationServiceProvider.php b/packages/framework/src/Framework/Providers/TranslationServiceProvider.php index 9561bf7a9fd..b6d450e939d 100644 --- a/packages/framework/src/Framework/Providers/TranslationServiceProvider.php +++ b/packages/framework/src/Framework/Providers/TranslationServiceProvider.php @@ -4,9 +4,8 @@ namespace Hyde\Framework\Providers; -use Illuminate\Translation\TranslationServiceProvider as IlluminateTranslationServiceProvider; - use function config; +use Illuminate\Translation\TranslationServiceProvider as IlluminateTranslationServiceProvider; use function is_dir; use function lang_path;