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

rodnaph · rodnaph · commit f97fb0744173 · 2015-09-14T09:43:26.000+01:00
diff --git a/src/Symfony/Component/Routing/Generator/UrlGenerator.php b/src/Symfony/Component/Routing/Generator/UrlGenerator.php
@@ -291,7 +291,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
@@ -657,6 +657,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
`@@ -291,7 +291,8 @@ protected function doGenerate($variables, $defaults, $requirements, $tokens, $pa`
`291`	`291`	`}`
`292`	`292`
`293`	`293`	`if ($fragment) {`
`294`		`- $url .= '#'.rawurlencode($fragment);`
	`294`	`+ $validFragmentChars = array('%2F' => '/', '%3F' => '?');`
	`295`	`+ $url .= '#'.strtr(rawurlencode($fragment), $validFragmentChars);`
`295`	`296`	`}`
`296`	`297`
`297`	`298`	`return $url;`
Original file line number	Diff line number	Diff line change
`@@ -657,6 +657,14 @@ public function testFragmentsCanBeAppendedToUrls()`
`657`	`657`	`$this->assertEquals('http://localhost/app.php/testing#frag%20ment', $url);`
`658`	`658`	`}`
`659`	`659`
	`660`	`+ public function testFragmentsDoNotEscapeValidCharacters()`
	`661`	`+ {`
	`662`	`+ $routes = $this->getRoutes('test', new Route('/testing'));`
	`663`	`+ $url = $this->getGenerator($routes)->generate('test', array('_fragment' => '?/'), true);`
	`664`	`+`
	`665`	`+ $this->assertEquals('http://localhost/app.php/testing#?/', $url);`
	`666`	`+ }`
	`667`	`+`
`660`	`668`	`protected function getGenerator(RouteCollection $routes, array $parameters = array(), $logger = null)`
`661`	`669`	`{`
`662`	`670`	`$context = new RequestContext('/app.php');`