symfony
diff --git a/‎src/Symfony/Component/Routing/CHANGELOG.md
Copy file name to clipboardExpand all lines: src/Symfony/Component/Routing/CHANGELOG.md
+5Lines changed: 5 additions & 0 deletions b/‎src/Symfony/Component/Routing/CHANGELOG.md
Copy file name to clipboardExpand all lines: src/Symfony/Component/Routing/CHANGELOG.md
+5Lines changed: 5 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Routing/Generator/UrlGenerator.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Routing/Generator/UrlGenerator.php
+12-3Lines changed: 12 additions & 3 deletions b/‎src/Symfony/Component/Routing/Generator/UrlGenerator.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Routing/Generator/UrlGenerator.php
+12-3Lines changed: 12 additions & 3 deletions
diff --git a/‎src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php
+6Lines changed: 6 additions & 0 deletions b/‎src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php
+6Lines changed: 6 additions & 0 deletions
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+5.3.0
+-----
+
+ * already encoded chars are not decoded nor double-encoded anymore when generating URLs
+
 5.2.0
 -----
 
 
@@ -212,10 +212,19 @@ protected function doGenerate(array $variables, array $defaults, array $requirem
 
         if ('' === $url) {
             $url = '/';
-        }
+        } else {
+            // the contexts base URL is already encoded (see Symfony\Component\HttpFoundation\Request)
+            $urlParts = preg_split('/((?:%[0-9a-fA-F]{2})++)/', $url, -1, \PREG_SPLIT_DELIM_CAPTURE);
+            $url = '';
+
+            foreach ($urlParts as $i => $part) {
+                if (0 === $i % 2) {
+                    $part = strtr(rawurlencode($part), $this->decodedChars);
+                }
 
-        // the contexts base URL is already encoded (see Symfony\Component\HttpFoundation\Request)
-        $url = strtr(rawurlencode($url), $this->decodedChars);
+                $url .= $part;
+            }
+        }
 
         // 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
 
@@ -467,6 +467,12 @@ public function testEncodingOfRelativePathSegments()
         $this->assertSame('/app.php/a./.a/a../..a/...', $this->getGenerator($routes)->generate('test'));
     }
 
+    public function testEncodingOfSlashInPath()
+    {
+        $routes = $this->getRoutes('test', new Route('/dir/{path}/dir2', [], ['path' => '.+']));
+        $this->assertSame('/app.php/dir/foo/bar%2Fbaz/dir2', $this->getGenerator($routes)->generate('test', ['path' => 'foo/bar%2Fbaz']));
+    }
+
     public function testAdjacentVariables()
     {
         $routes = $this->getRoutes('test', new Route('/{x}{y}{z}.{_format}', ['z' => 'default-z', '_format' => 'html'], ['y' => '\d+']));
Original file line number	Diff line number	Diff line change
`@@ -467,6 +467,12 @@ public function testEncodingOfRelativePathSegments()`
`467`	`467`	`$this->assertSame('/app.php/a./.a/a../..a/...', $this->getGenerator($routes)->generate('test'));`
`468`	`468`	`}`
`469`	`469`
	`470`	`+ public function testEncodingOfSlashInPath()`
	`471`	`+ {`
	`472`	`+ $routes = $this->getRoutes('test', new Route('/dir/{path}/dir2', [], ['path' => '.+']));`
	`473`	`+ $this->assertSame('/app.php/dir/foo/bar%2Fbaz/dir2', $this->getGenerator($routes)->generate('test', ['path' => 'foo/bar%2Fbaz']));`
	`474`	`+ }`
	`475`	`+`
`470`	`476`	`public function testAdjacentVariables()`
`471`	`477`	`{`
`472`	`478`	`$routes = $this->getRoutes('test', new Route('/{x}{y}{z}.{_format}', ['z' => 'default-z', '_format' => 'html'], ['y' => '\d+']));`