Simplify the code.

yii-tools · Apr 18, 2023 · ff3ca76 · ff3ca76
1 parent 4b3602a
commit ff3ca76
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 15 deletions.
diff --git a/src/Locale.php b/src/Locale.php
@@ -47,17 +47,6 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
             $this->setLocale($language);
         }
 
-        if ($path === '/') {
-            $request = $request->withUri($uri->withPath('/'));
-        }
-
-        if (
-            ($path === "/$this->defaultLanguage" || $path === "/$this->defaultLanguage/") &&
-            $request->getMethod() === Method::GET
-        ) {
-            return $handler->handle($request->withUri($uri->withPath('/')));
-        }
-
         if ($language === $this->defaultLanguage) {
             $this->urlGenerator->setDefaultArgument($this->localeArgument, '');
             $request = $request->withUri($uri->withPath($this->getUrlPathWithLanguage($path, $language)));
@@ -117,6 +106,11 @@ private function getLanguage(string $path): string
      */
     private function getUrlPathWithLanguage(string $path, string $language): string
     {
+
+        if ($path === "/$language" || $path === '') {
+            return "/$language/";
+        }
+
         if (str_contains($path, "/$language")) {
             return $path;
         }

diff --git a/tests/Locale/MiddlewareTest.php b/tests/Locale/MiddlewareTest.php
@@ -106,7 +106,7 @@ public function testProcessRedirectWithPathRootLanguage(): void
 
         $this->assertInstanceOf(ResponseInterface::class, $response);
         $this->assertSame(302, $response->getStatusCode());
-        $this->assertSame('/', $response->getHeaderLine('Location'));
+        $this->assertSame('/en/', $response->getHeaderLine('Location'));
         $this->assertSame('en', $this->translator->getLocale());
     }
 
@@ -135,7 +135,7 @@ public function testProcessRedirectWithPathRootLanguageWithMethodPost(): void
 
         $this->assertInstanceOf(ResponseInterface::class, $response);
         $this->assertSame(302, $response->getStatusCode());
-        $this->assertSame('/en', $response->getHeaderLine('Location'));
+        $this->assertSame('/en/', $response->getHeaderLine('Location'));
         $this->assertSame('en', $this->translator->getLocale());
     }
 
@@ -147,7 +147,7 @@ public function testProcessReturnsResponseInterface(): void
         $response = $locale->process($this->request, $this->handler);
 
         $this->assertSame(302, $response->getStatusCode());
-        $this->assertSame('/en', $response->getHeaderLine('Location'));
+        $this->assertSame('/en/', $response->getHeaderLine('Location'));
         $this->assertSame('en', $this->translator->getLocale());
     }
 
@@ -257,7 +257,7 @@ public function testWithDefaultLocale(): void
         $response = $locale->process($this->request, $this->handler);
 
         $this->assertSame(302, $response->getStatusCode());
-        $this->assertSame('/ru', $response->getHeaderLine('Location'));
+        $this->assertSame('/ru/', $response->getHeaderLine('Location'));
         $this->assertSame('ru', $this->translator->getLocale());
     }