symfony
diff --git a/‎src/Symfony/Component/Routing/Generator/UrlGenerator.php‎
Lines changed: 10 additions & 5 deletions b/‎src/Symfony/Component/Routing/Generator/UrlGenerator.php‎
Lines changed: 10 additions & 5 deletions
diff --git a/‎src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php‎
Lines changed: 12 additions & 0 deletions b/‎src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php‎
Lines changed: 12 additions & 0 deletions
@@ -221,11 +221,16 @@ protected function doGenerate(array $variables, array $defaults, array $requirem
         // the path segments "." and ".." are interpreted as relative reference when resolving a URI; see http://tools.ietf.org/html/rfc3986#section-3.3
         // so we need to encode them as they are not used for this purpose here
         // otherwise we would generate a URI that, when followed by a user agent (e.g. browser), does not match this route
-        $url = strtr($url, ['/../' => '/%2E%2E/', '/./' => '/%2E/']);
-        if (str_ends_with($url, '/..')) {
-            $url = substr($url, 0, -2).'%2E%2E';
-        } elseif (str_ends_with($url, '/.')) {
-            $url = substr($url, 0, -1).'%2E';
+        if (str_contains($url, '/.')) {
+            $segments = explode('/', $url);
+            foreach ($segments as $i => $segment) {
+                if ('.' === $segment) {
+                    $segments[$i] = '%2E';
+                } elseif ('..' === $segment) {
+                    $segments[$i] = '%2E%2E';
+                }
+            }
+            $url = implode('/', $segments);
         }
 
         $schemeAuthority = '';
 
@@ -505,6 +505,18 @@ public function testEncodingOfRelativePathSegments()
         $this->assertSame('/app.php/a./.a/a../..a/...', $this->getGenerator($routes)->generate('test'));
     }
 
+    public function testEncodingOfChainedRelativePathSegments()
+    {
+        $routes = $this->getRoutes('test', new Route('/foo/{path}/bar', [], ['path' => '.+']));
+        $this->assertSame('/app.php/foo/%2E%2E/%2E%2E/%2E%2E/bar', $this->getGenerator($routes)->generate('test', ['path' => '../../..']));
+        $this->assertSame('/app.php/foo/%2E/%2E/%2E/bar', $this->getGenerator($routes)->generate('test', ['path' => '././.']));
+        $this->assertSame('/app.php/foo/%2E%2E/%2E/%2E/%2E%2E/bar', $this->getGenerator($routes)->generate('test', ['path' => '../././..']));
+
+        $routes = $this->getRoutes('test', new Route('/foo/{path}', [], ['path' => '.+']));
+        $this->assertSame('/app.php/foo/%2E%2E/%2E%2E/%2E%2E', $this->getGenerator($routes)->generate('test', ['path' => '../../..']));
+        $this->assertSame('/app.php/foo/%2E/%2E/%2E', $this->getGenerator($routes)->generate('test', ['path' => '././.']));
+    }
+
     public function testEncodingOfSlashInPath()
     {
         $routes = $this->getRoutes('test', new Route('/dir/{path}/dir2', [], ['path' => '.+']));