Merge pull request #103 from kokspflanze/feature/default_locale

Don't redirect to default locale
basz · Mar 21, 2019 · bf7a75e · bf7a75e
2 parents 2a8a0a6 + e6d494d
commit bf7a75e
Show file tree

Hide file tree

Showing 2 changed files with 85 additions and 2 deletions.
diff --git a/src/SlmLocale/Strategy/UriPathStrategy.php b/src/SlmLocale/Strategy/UriPathStrategy.php
@@ -53,6 +53,8 @@ class UriPathStrategy extends AbstractStrategy
     protected $aliases;
     protected $redirect_to_canonical;
     protected $sl;
+    /** @var string|null */
+    protected $default;
     /**
      * @var SimpleRouteStack
      */
@@ -74,6 +76,9 @@ public function setOptions(array $options = [])
         if (array_key_exists('redirect_to_canonical', $options)) {
             $this->redirect_to_canonical = (bool) $options['redirect_to_canonical'];
         }
+        if (array_key_exists('default', $options)) {
+            $this->default = (string) $options['default'];
+        }
     }
 
     protected function redirectWhenFound()
@@ -124,7 +129,7 @@ public function found(LocaleEvent $event)
         }
 
         $locale = $event->getLocale();
-        if (null === $locale) {
+        if (null === $locale || (null !== $this->default && $locale === $this->default)) {
             return;
         }
 
@@ -196,7 +201,13 @@ public function assemble(LocaleEvent $event)
         // Remove first part
         array_shift($parts);
 
-        $path = $base . '/' . $locale . '/' . implode('/', $parts);
+        if ($locale === $this->default) {
+            $locale = '';
+        } else {
+            $locale .= '/';
+        }
+
+        $path = $base . '/' . $locale . implode('/', $parts);
         $uri->setPath($path);
 
         return $uri;

diff --git a/tests/SlmLocaleTest/Strategy/UriPathStrategyTest.php b/tests/SlmLocaleTest/Strategy/UriPathStrategyTest.php
@@ -225,6 +225,42 @@ public function testFoundSetsBaseUrl()
         $this->assertEquals($expected, $actual);
     }
 
+    public function testFoundSetsBaseUrlWithDefault()
+    {
+        $request = new HttpRequest();
+        $request->setUri('http://example.com/');
+
+        $this->event->setLocale('en');
+        $this->event->setRequest($request);
+        $this->event->setResponse(new HttpResponse());
+
+        $this->strategy->setOptions([
+            'default' => 'en',
+        ]);
+        $this->strategy->found($this->event);
+
+        $actual   = $this->router->getBaseUrl();
+        $this->assertNull($actual);
+    }
+
+    public function testFoundSetsBaseUrlWithDefaultNotMatch()
+    {
+        $request = new HttpRequest();
+        $request->setUri('http://example.com/fr');
+
+        $this->event->setLocale('fr');
+        $this->event->setRequest($request);
+        $this->event->setResponse(new HttpResponse());
+
+        $this->strategy->setOptions([
+            'default' => 'en',
+        ]);
+        $this->strategy->found($this->event);
+
+        $actual   = $this->router->getBaseUrl();
+        $this->assertSame('/fr', $actual);
+    }
+
     public function testFoundAppendsExistingBaseUrl()
     {
         $this->router->setBaseUrl('/some/deep/installation/path');
@@ -348,6 +384,42 @@ public function testAssembleWorksWithAliasesToo()
         $this->assertEquals($expected, $actual);
     }
 
+    public function testAssembleWithDefault()
+    {
+        $uri = new Uri('/nl/foo/bar/baz');
+
+        $this->event->setLocale('en');
+        $this->event->setUri($uri);
+
+        $this->strategy->setOptions([
+            'default' => 'en',
+        ]);
+        $this->strategy->assemble($this->event);
+
+        $expected = '/foo/bar/baz';
+        $actual   = $this->event->getUri()->getPath();
+
+        $this->assertSame($expected, $actual);
+    }
+
+    public function testAssembleWithDefaultNotMatching()
+    {
+        $uri = new Uri('/nl/foo/bar/baz');
+
+        $this->event->setLocale('en');
+        $this->event->setUri($uri);
+
+        $this->strategy->setOptions([
+            'default' => 'fr',
+        ]);
+        $this->strategy->assemble($this->event);
+
+        $expected = '/en/foo/bar/baz';
+        $actual   = $this->event->getUri()->getPath();
+
+        $this->assertSame($expected, $actual);
+    }
+
     protected function getPluginManager($console = false)
     {
         $sl = new ServiceManager();