Move config stuff out of LocaleHandler

Author: ivanvermeyen

src/LocaleHandler.php

@@ -4,7 +4,6 @@
 
 use CodeZero\Localizer\Localizer;
 use Illuminate\Support\Facades\App;
-use Illuminate\Support\Facades\Config;
 
 class LocaleHandler
 {
@@ -22,23 +21,16 @@ class LocaleHandler
      */
     protected $supportedLocales;
 
-    /**
-     * Should the Localizer package be used?
-     *
-     * @var bool
-     */
-    protected $shouldUseLocalizer;
-
     /**
      * Create a new SetLocale instance.
      *
+     * @param array $supportedLocales
      * @param \CodeZero\Localizer\Localizer $localizer
      */
-    public function __construct(Localizer $localizer)
+    public function __construct(array $supportedLocales, Localizer $localizer = null)
     {
+        $this->supportedLocales = $supportedLocales;
         $this->localizer = $localizer;
-        $this->supportedLocales = Config::get('localized-routes.supported-locales', []);
-        $this->shouldUseLocalizer = Config::get('localized-routes.use_localizer', false);
     }
 
     /**
@@ -64,7 +56,7 @@ public function handleLocale($locale)
      */
     protected function detectLocales()
     {
-        if ( ! $this->shouldUseLocalizer) return false;
+        if ( ! $this->localizer) return false;
 
         $this->localizer->setSupportedLocales($this->supportedLocales);
 
@@ -80,7 +72,7 @@ protected function detectLocales()
      */
     protected function setLocale($locale)
     {
-        $this->shouldUseLocalizer
+        $this->localizer
             ? $this->localizer->store($locale)
             : App::setLocale($locale);
     }

src/LocalizedRoutesServiceProvider.php

@@ -4,6 +4,7 @@
 
 use CodeZero\LocalizedRoutes\Macros\UriTranslationMacro;
 use CodeZero\LocalizedRoutes\Macros\LocalizedRoutesMacro;
+use CodeZero\Localizer\Localizer;
 use Illuminate\Support\ServiceProvider;
 
 class LocalizedRoutesServiceProvider extends ServiceProvider
@@ -35,6 +36,7 @@ public function register()
     {
         $this->mergeConfig();
         $this->registerUrlGenerator();
+        $this->registerLocaleHandler();
     }
 
     /**
@@ -134,4 +136,20 @@ protected function requestRebinder()
             $app['url']->setRequest($request);
         };
     }
+
+    /**
+     * Register the LocaleHandler..
+     *
+     * @return void
+     */
+    protected function registerLocaleHandler()
+    {
+        $this->app->bind(LocaleHandler::class, function ($app) {
+            $supportedLocales = $app['config']->get('localized-routes.supported-locales', []);
+            $useLocalizer = $app['config']->get('localized-routes.use_localizer', false);
+            $localizer = $useLocalizer ? $app->make(Localizer::class) : null;
+
+            return new LocaleHandler($supportedLocales, $localizer);
+        });
+    }
 }