decodes some special chars in a URL query

dawehner · dawehner · commit c6c528c40e44 · 2014-10-14T00:39:56.000+02:00
diff --git a/src/Symfony/Component/Routing/Generator/UrlGenerator.php b/src/Symfony/Component/Routing/Generator/UrlGenerator.php
@@ -279,6 +279,7 @@ protected function doGenerate($variables, $defaults, $requirements, $tokens, $pa
         // add a query string if needed
         $extra = array_diff_key($parameters, $variables, $defaults);
         if ($extra && $query = http_build_query($extra, '', '&')) {
+            $query = strtr($query, $this->decodedChars);
             $url .= '?'.$query;
         }
 
diff --git a/src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php b/src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php
@@ -331,7 +331,7 @@ public function testUrlEncoding()
         $routes = $this->getRoutes('test', new Route("/$chars/{varpath}", array(), array('varpath' => '.+')));
         $this->assertSame('/app.php/@:%5B%5D/%28%29*%27%22%20+,;-._~%26%24%3C%3E|%7B%7D%25%5C%5E%60!%3Ffoo=bar%23id'
            .'/@:%5B%5D/%28%29*%27%22%20+,;-._~%26%24%3C%3E|%7B%7D%25%5C%5E%60!%3Ffoo=bar%23id'
-           .'?query=%40%3A%5B%5D%2F%28%29%2A%27%22+%2B%2C%3B-._%7E%26%24%3C%3E%7C%7B%7D%25%5C%5E%60%21%3Ffoo%3Dbar%23id',
+           .'?query=@:%5B%5D/%28%29*%27%22++,;-._%7E%26%24%3C%3E|%7B%7D%25%5C%5E%60!%3Ffoo=bar%23id',
             $this->getGenerator($routes)->generate('test', array(
                 'varpath' => $chars,
                 'query' => $chars,

Original file line number	Diff line number	Diff line change
`@@ -279,6 +279,7 @@ protected function doGenerate($variables, $defaults, $requirements, $tokens, $pa`
`279`	`279`	`// add a query string if needed`
`280`	`280`	`$extra = array_diff_key($parameters, $variables, $defaults);`
`281`	`281`	`if ($extra && $query = http_build_query($extra, '', '&')) {`
	`282`	`+ $query = strtr($query, $this->decodedChars);`
`282`	`283`	`$url .= '?'.$query;`
`283`	`284`	`}`
`284`	`285`