merged branch Seldaek/urlgen (PR symfony#1573)

fabpot · fabpot · commit c061b4576b4a · 2011-07-07T11:08:08.000+02:00
Commits ------- ac1448f [Routing] Revert to rawurlencode + whitelisting of '/' Discussion ---------- [Routing] Revert to rawurlencode + whitelisting of '/' After more discussion on 761724a - sorry you merged too fast for once ;)
diff --git a/src/Symfony/Component/Routing/Generator/UrlGenerator.php b/src/Symfony/Component/Routing/Generator/UrlGenerator.php
@@ -28,11 +28,8 @@
 class UrlGenerator implements UrlGeneratorInterface
 {
     protected $context;
-    protected $escapedChars = array(
-        '%' => '%25',
-        '+' => '%2B',
-        '#' => '%23',
-        '?' => '%3F',
+    protected $decodedChars = array(
+        '%2F' => '/',
     );
 
     private $routes;
@@ -131,7 +128,7 @@ protected function doGenerate($variables, $defaults, $requirements, $tokens, $pa
                     }
 
                     if (!$isEmpty || !$optional) {
-                        $url = $token[1].strtr($tparams[$token[3]], $this->escapedChars).$url;
+                        $url = $token[1].strtr(rawurlencode($tparams[$token[3]]), $this->decodedChars).$url;
                     }
 
                     $optional = false;

Original file line number	Diff line number	Diff line change
`@@ -28,11 +28,8 @@`
`28`	`28`	`class UrlGenerator implements UrlGeneratorInterface`
`29`	`29`	`{`
`30`	`30`	`protected $context;`
`31`		`- protected $escapedChars = array(`
`32`		`- '%' => '%25',`
`33`		`- '+' => '%2B',`
`34`		`- '#' => '%23',`
`35`		`- '?' => '%3F',`
	`31`	`+ protected $decodedChars = array(`
	`32`	`+ '%2F' => '/',`
`36`	`33`	`);`
`37`	`34`
`38`	`35`	`private $routes;`
`@@ -131,7 +128,7 @@ protected function doGenerate($variables, $defaults, $requirements, $tokens, $pa`
`131`	`128`	`}`
`132`	`129`
`133`	`130`	`if (!$isEmpty \|\| !$optional) {`
`134`		`- $url = $token[1].strtr($tparams[$token[3]], $this->escapedChars).$url;`
	`131`	`+ $url = $token[1].strtr(rawurlencode($tparams[$token[3]]), $this->decodedChars).$url;`
`135`	`132`	`}`
`136`	`133`
`137`	`134`	`$optional = false;`