allow characters ? and / to remain unencoded in fragment, as per RFC

rodnaph · rodnaph · commit 01e0eb1c4c00 · 2015-09-14T10:10:08.000+01:00
diff --git a/src/Symfony/Component/Routing/Generator/UrlGenerator.php b/src/Symfony/Component/Routing/Generator/UrlGenerator.php
@@ -287,7 +287,8 @@ protected function doGenerate($variables, $defaults, $requirements, $tokens, $pa
         }
 
         if ($fragment) {
-            $url .= '#'.rawurlencode($fragment);
+            $validFragmentChars = array('%2F' => '/', '%3F' => '?');
+            $url .= '#'.strtr(rawurlencode($fragment), $validFragmentChars);
         }
 
         return $url;
diff --git a/src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php b/src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php
@@ -630,6 +630,14 @@ public function testFragmentsCanBeAppendedToUrls()
         $this->assertEquals('http://localhost/app.php/testing#frag%20ment', $url);
     }
 
+    public function testFragmentsDoNotEscapeValidCharacters()
+    {
+        $routes = $this->getRoutes('test', new Route('/testing'));
+        $url = $this->getGenerator($routes)->generate('test', array('_fragment' => '?/'), true);
+
+        $this->assertEquals('http://localhost/app.php/testing#?/', $url);
+    }
+
     protected function getGenerator(RouteCollection $routes, array $parameters = array(), $logger = null)
     {
         $context = new RequestContext('/app.php');

Original file line number	Diff line number	Diff line change
`@@ -287,7 +287,8 @@ protected function doGenerate($variables, $defaults, $requirements, $tokens, $pa`
`287`	`287`	`}`
`288`	`288`
`289`	`289`	`if ($fragment) {`
`290`		`- $url .= '#'.rawurlencode($fragment);`
	`290`	`+ $validFragmentChars = array('%2F' => '/', '%3F' => '?');`
	`291`	`+ $url .= '#'.strtr(rawurlencode($fragment), $validFragmentChars);`
`291`	`292`	`}`
`292`	`293`
`293`	`294`	`return $url;`
Original file line number	Diff line number	Diff line change
`@@ -630,6 +630,14 @@ public function testFragmentsCanBeAppendedToUrls()`
`630`	`630`	`$this->assertEquals('http://localhost/app.php/testing#frag%20ment', $url);`
`631`	`631`	`}`
`632`	`632`
	`633`	`+ public function testFragmentsDoNotEscapeValidCharacters()`
	`634`	`+ {`
	`635`	`+ $routes = $this->getRoutes('test', new Route('/testing'));`
	`636`	`+ $url = $this->getGenerator($routes)->generate('test', array('_fragment' => '?/'), true);`
	`637`	`+`
	`638`	`+ $this->assertEquals('http://localhost/app.php/testing#?/', $url);`
	`639`	`+ }`
	`640`	`+`
`633`	`641`	`protected function getGenerator(RouteCollection $routes, array $parameters = array(), $logger = null)`
`634`	`642`	`{`
`635`	`643`	`$context = new RequestContext('/app.php');`