bug symfony#20001 [Routing] Fixed route generation with fragment defined as defaults (akovalyov)

fabpot · fabpot · commit 5832c9d58fd5 · 2016-09-21T11:12:23.000-07:00
This PR was merged into the 3.2-dev branch. Discussion ---------- [Routing] Fixed route generation with fragment defined as defaults | Q | A | ------------- | --- | Branch? | "master" | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | License | MIT As stated in https://symfony.com/blog/new-in-symfony-3-2-routing-improvements, it should support `_fragment` option as part of `_defaults` of route definition. Commits ------- 3c36596 [Routing] Fixed route generation with fragment defined as defaults
diff --git a/src/Symfony/Component/Routing/Generator/UrlGenerator.php b/src/Symfony/Component/Routing/Generator/UrlGenerator.php
@@ -263,8 +263,15 @@ protected function doGenerate($variables, $defaults, $requirements, $tokens, $pa
         });
 
         // extract fragment
-        $fragment = isset($extra['_fragment']) ? $extra['_fragment'] : '';
-        unset($extra['_fragment']);
+        $fragment = '';
+        if (isset($defaults['_fragment'])) {
+            $fragment = $defaults['_fragment'];
+        }
+
+        if (isset($extra['_fragment'])) {
+            $fragment = $extra['_fragment'];
+            unset($extra['_fragment']);
+        }
 
         if ($extra && $query = http_build_query($extra, '', '&', PHP_QUERY_RFC3986)) {
             // "/" and "?" can be left decoded for better user experience, see
diff --git a/src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php b/src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php
@@ -662,6 +662,14 @@ public function testFragmentsDoNotEscapeValidCharacters()
         $this->assertEquals('/app.php/testing#?/', $url);
     }
 
+    public function testFragmentsCanBeDefinedAsDefaults()
+    {
+        $routes = $this->getRoutes('test', new Route('/testing', array('_fragment' => 'fragment')));
+        $url = $this->getGenerator($routes)->generate('test', array(), UrlGeneratorInterface::ABSOLUTE_PATH);
+
+        $this->assertEquals('/app.php/testing#fragment', $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
`@@ -662,6 +662,14 @@ public function testFragmentsDoNotEscapeValidCharacters()`
`662`	`662`	`$this->assertEquals('/app.php/testing#?/', $url);`
`663`	`663`	`}`
`664`	`664`
	`665`	`+ public function testFragmentsCanBeDefinedAsDefaults()`
	`666`	`+ {`
	`667`	`+ $routes = $this->getRoutes('test', new Route('/testing', array('_fragment' => 'fragment')));`
	`668`	`+ $url = $this->getGenerator($routes)->generate('test', array(), UrlGeneratorInterface::ABSOLUTE_PATH);`
	`669`	`+`
	`670`	`+ $this->assertEquals('/app.php/testing#fragment', $url);`
	`671`	`+ }`
	`672`	`+`
`665`	`673`	`protected function getGenerator(RouteCollection $routes, array $parameters = array(), $logger = null)`
`666`	`674`	`{`
`667`	`675`	`$context = new RequestContext('/app.php');`