Extract logic from middleware

Author: ivanvermeyen

src/LocaleHandler.php

@@ -0,0 +1,87 @@
+<?php
+
+namespace CodeZero\LocalizedRoutes;
+
+use CodeZero\Localizer\Localizer;
+use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Config;
+
+class LocaleHandler
+{
+    /**
+     * Localizer.
+     *
+     * @var \CodeZero\Localizer\Localizer
+     */
+    protected $localizer;
+
+    /**
+     * Supported locales.
+     *
+     * @var array
+     */
+    protected $supportedLocales;
+
+    /**
+     * Should the Localizer package be used?
+     *
+     * @var bool
+     */
+    protected $shouldUseLocalizer;
+
+    /**
+     * Create a new SetLocale instance.
+     *
+     * @param \CodeZero\Localizer\Localizer $localizer
+     */
+    public function __construct(Localizer $localizer)
+    {
+        $this->localizer = $localizer;
+        $this->supportedLocales = Config::get('localized-routes.supported-locales', []);
+        $this->shouldUseLocalizer = Config::get('localized-routes.use_localizer', false);
+    }
+
+    /**
+     * Detect and/or set the locale.
+     *
+     * @param string|null $locale
+     *
+     * @return void
+     */
+    public function handleLocale($locale)
+    {
+        $locale = $locale ?: $this->detectLocales();
+
+        if ($locale) {
+            $this->setLocale($locale);
+        }
+    }
+
+    /**
+     * Detect locales.
+     *
+     * @return string|false
+     */
+    protected function detectLocales()
+    {
+        if ( ! $this->shouldUseLocalizer) return false;
+
+        $this->localizer->setSupportedLocales($this->supportedLocales);
+
+        return $this->localizer->detect();
+    }
+
+    /**
+     * Set the locale.
+     *
+     * @param string $locale
+     *
+     * @return void
+     */
+    protected function setLocale($locale)
+    {
+        $this->shouldUseLocalizer
+            ? $this->localizer->store($locale)
+            : App::setLocale($locale);
+    }
+}

src/Middleware/SetLocale.php

@@ -3,29 +3,11 @@
 namespace CodeZero\LocalizedRoutes\Middleware;
 
 use Closure;
-use CodeZero\Localizer\Localizer;
+use CodeZero\LocalizedRoutes\LocaleHandler;
 use Illuminate\Support\Facades\App;
-use Illuminate\Support\Facades\Config;
 
 class SetLocale
 {
-    /**
-     * Localizer.
-     *
-     * @var \CodeZero\Localizer\Localizer
-     */
-    protected $localizer;
-
-    /**
-     * Create a new SetLocale instance.
-     *
-     * @param \CodeZero\Localizer\Localizer $localizer
-     */
-    public function __construct(Localizer $localizer)
-    {
-        $this->localizer = $localizer;
-    }
-
     /**
      * Handle an incoming request.
      *
@@ -40,42 +22,8 @@ public function handle($request, Closure $next)
         // If it is present, use this as the locale.
         $locale = $request->route()->getAction('localized-routes-locale');
 
-        if ( ! $locale && $this->shouldUseLocalizer()) {
-            $locale = $this->detectLocales();
-        }
-
-        if ($locale && $this->shouldUseLocalizer()) {
-            $this->localizer->store($locale);
-        }
-
-        if ($locale && ! $this->shouldUseLocalizer()) {
-            App::setLocale($locale);
-        }
+        App::make(LocaleHandler::class)->handleLocale($locale);
 
         return $next($request);
     }
-
-    /**
-     * Detect locales.
-     *
-     * @return string|false
-     */
-    public function detectLocales()
-    {
-        $supportedLocales = Config::get('localized-routes.supported-locales', []);
-
-        $this->localizer->setSupportedLocales($supportedLocales);
-
-        return $this->localizer->detect();
-    }
-
-    /**
-     * Check if the 'use_localizer' option is enabled.
-     *
-     * @return bool
-     */
-    protected function shouldUseLocalizer()
-    {
-        return Config::get('localized-routes.use_localizer', false);
-    }
 }