Merge branch 'hotfix/633'

Close #633

Author: weierophinney

docs/book/v3/cookbook/setting-locale-without-routing-parameter.md

@@ -40,9 +40,17 @@ class SetLocaleMiddleware implements MiddlewareInterface
 {
     private $helper;
 
-    public function __construct(UrlHelper $helper)
+    private $defaultLocale;
+    private $fallbackLocale = 'en_US';
+
+    const REGEX_LOCALE = '#^/(?P<locale>[a-z]{2,3}|[a-z]{2}[-_][a-zA-Z]{2})(?:/|$)#';
+
+    public function __construct(UrlHelper $helper, string $defaultLocale = null)
     {
         $this->helper = $helper;
+        if ($defaultLocale) {
+            $this->defaultLocale = $defaultLocale;
+        }
     }
 
     public function process(ServerRequestInterface $request, RequestHandlerInterface $handler) : ResponseInterface
@@ -51,17 +59,19 @@ class SetLocaleMiddleware implements MiddlewareInterface
 
         $path = $uri->getPath();
 
-        if (! preg_match('#^/(?P<locale>[a-z]{2,3}([-_][a-zA-Z]{2}|))/#', $path, $matches)) {
-            Locale::setDefault('de_DE');
+        if (! preg_match(self::REGEX_LOCALE, $path, $matches)) {
+            Locale::setDefault($this->defaultLocale ?: $this->fallbackLocale);
             return $handler->handle($request);
         }
 
         $locale = $matches['locale'];
         Locale::setDefault(Locale::canonicalize($locale));
         $this->helper->setBasePath($locale);
 
+        $path = substr($path, strlen($locale) + 1);
+
         return $handler->handle($request->withUri(
-            $uri->withPath(substr($path, 3))
+            $uri->withPath($path ?: '/')
         ));
     }
 }
@@ -77,12 +87,24 @@ namespace App\I18n;
 use Psr\Container\ContainerInterface;
 use Zend\Expressive\Helper\UrlHelper;
 
+/**
+ * Configuration for setting a default locale should look like the following:
+ *
+ * <code>
+ * 'i18n' => [
+ *     'default_locale' => 'de_DE',
+ * ]
+ * </code>
+ */
 class SetLocaleMiddlewareFactory
 {
     public function __invoke(ContainerInterface $container)
     {
+        $config = $container->has('config') ? $container->get('config') : [];
+        
         return new SetLocaleMiddleware(
-            $container->get(UrlHelper::class)
+            $container->get(UrlHelper::class),
+            $config['i18n']['default_locale'] ?? null
         );
     }
 }