[Routing] adds _fragment special option to url generation for document fragment

rodnaph · rodnaph · commit 6fc2bd590aaa · 2014-12-15T10:10:55.000Z
diff --git a/src/Symfony/Component/Routing/Generator/UrlGenerator.php b/src/Symfony/Component/Routing/Generator/UrlGenerator.php
@@ -276,14 +276,24 @@ protected function doGenerate($variables, $defaults, $requirements, $tokens, $pa
             $url = $schemeAuthority.$this->context->getBaseUrl().$url;
         }
 
-        // add a query string if needed
+        // extract unused parameters
         $extra = array_diff_key($parameters, $variables, $defaults);
+
+        // extract fragment
+        $fragment = isset($extra['_fragment']) ? $extra['_fragment'] : false;
+        unset($extra['_fragment']);
+
+        // add a query string if needed
         if ($extra && $query = http_build_query($extra, '', '&')) {
             // "/" and "?" can be left decoded for better user experience, see
             // http://tools.ietf.org/html/rfc3986#section-3.4
             $url .= '?'.strtr($query, array('%2F' => '/'));
         }
 
+        if ($fragment) {
+            $url .= '#'.rawurlencode($fragment);
+        }
+
         return $url;
     }
 
diff --git a/src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php b/src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php
@@ -649,6 +649,14 @@ public function provideRelativePaths()
         );
     }
 
+    public function testFragmentsCanBeAppendedToUrls()
+    {
+        $routes = $this->getRoutes('test', new Route('/testing'));
+        $url = $this->getGenerator($routes)->generate('test', array('_fragment' => 'frag ment'), true);
+
+        $this->assertEquals('http://localhost/app.php/testing#frag%20ment', $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
`@@ -649,6 +649,14 @@ public function provideRelativePaths()`
`649`	`649`	`);`
`650`	`650`	`}`
`651`	`651`
	`652`	`+ public function testFragmentsCanBeAppendedToUrls()`
	`653`	`+ {`
	`654`	`+ $routes = $this->getRoutes('test', new Route('/testing'));`
	`655`	`+ $url = $this->getGenerator($routes)->generate('test', array('_fragment' => 'frag ment'), true);`
	`656`	`+`
	`657`	`+ $this->assertEquals('http://localhost/app.php/testing#frag%20ment', $url);`
	`658`	`+ }`
	`659`	`+`
`652`	`660`	`protected function getGenerator(RouteCollection $routes, array $parameters = array(), $logger = null)`
`653`	`661`	`{`
`654`	`662`	`$context = new RequestContext('/app.php');`