Merge pull request #32 from ARCANEDEV/update-deferred_providers

Defer the providers properly

composer.json

@@ -39,7 +39,9 @@
     "extra": {
         "laravel": {
             "providers": [
-                "Arcanedev\\LaravelLang\\LaravelLangServiceProvider"
+                "Arcanedev\\LaravelLang\\LaravelLangServiceProvider",
+                "Arcanedev\\LaravelLang\\Providers\\DeferredServicesProvider",
+                "Arcanedev\\LaravelLang\\Providers\\TranslationServiceProvider"
             ]
         }
     }

src/LaravelLangServiceProvider.php

@@ -36,9 +36,6 @@ public function register(): void
 
         $this->registerConfig();
 
-        $this->app->registerDeferredProvider(Providers\DeferredServiceProvider::class);
-        $this->registerProvider(Providers\TranslationServiceProvider::class);
-
         $this->registerCommands([
             Commands\CheckCommand::class,
             Commands\PublishCommand::class,

src/Providers/DeferredServiceProvider.php → src/Providers/DeferredServicesProvider.php

@@ -11,7 +11,7 @@
  * @package  Arcanedev\LaravelLang\Providers
  * @author   ARCANEDEV <[email protected]>
  */
-class DeferredServiceProvider extends ServiceProvider implements DeferrableProvider
+class DeferredServicesProvider extends ServiceProvider implements DeferrableProvider
 {
     /* -----------------------------------------------------------------
      |  Main Methods

src/Providers/TranslationServiceProvider.php

@@ -23,13 +23,11 @@ class TranslationServiceProvider extends ServiceProvider
     protected function registerLoader()
     {
         $this->app->singleton('translation.loader', function(Application $app) {
-            $config = $app['config'];
-
             return new FileLoader(
                 $app['files'],
                 $app->langPath(),
-                $config->get('laravel-lang.vendor', ''),
-                $config->get('laravel-lang.locales', [])
+                $app['config']->get('laravel-lang.vendor', ''),
+                $app['config']->get('laravel-lang.locales', [])
             );
         });
     }

tests/Providers/DeferredServiceProviderTest.php

@@ -1,6 +1,6 @@
 <?php namespace Arcanedev\LaravelLang\Tests\Providers;
 
-use Arcanedev\LaravelLang\Providers\DeferredServiceProvider;
+use Arcanedev\LaravelLang\Providers\DeferredServicesProvider;
 use Arcanedev\LaravelLang\Tests\TestCase;
 
 /**
@@ -16,7 +16,7 @@ class DeferredServiceProviderTest extends TestCase
      | -----------------------------------------------------------------
      */
 
-    /** @var  \Arcanedev\LaravelLang\Providers\DeferredServiceProvider */
+    /** @var  \Arcanedev\LaravelLang\Providers\DeferredServicesProvider */
     protected $provider;
 
     /* -----------------------------------------------------------------
@@ -28,7 +28,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $this->provider = $this->app->getProvider(DeferredServiceProvider::class);
+        $this->provider = $this->app->getProvider(DeferredServicesProvider::class);
     }
 
     /* -----------------------------------------------------------------
@@ -43,7 +43,7 @@ public function it_can_be_instantiated()
             \Illuminate\Support\ServiceProvider::class,
             \Illuminate\Contracts\Support\DeferrableProvider::class,
             \Arcanedev\Support\Providers\ServiceProvider::class,
-            \Arcanedev\LaravelLang\Providers\DeferredServiceProvider::class,
+            \Arcanedev\LaravelLang\Providers\DeferredServicesProvider::class,
         ];
 
         foreach ($expectations as $expected) {

tests/TestCase.php

@@ -44,6 +44,8 @@ protected function getPackageProviders($app)
     {
         return [
             \Arcanedev\LaravelLang\LaravelLangServiceProvider::class,
+            \Arcanedev\LaravelLang\Providers\DeferredServicesProvider::class,
+            \Arcanedev\LaravelLang\Providers\TranslationServiceProvider::class,
         ];
     }