treat fragment after resolving query string params

xabbuh · xabbuh · commit 7475aa8a4824 · 2016-06-17T16:10:03.000+02:00
diff --git a/src/Symfony/Component/Routing/Generator/UrlGenerator.php b/src/Symfony/Component/Routing/Generator/UrlGenerator.php
@@ -257,18 +257,15 @@ protected function doGenerate($variables, $defaults, $requirements, $tokens, $pa
             $url = $schemeAuthority.$this->context->getBaseUrl().$url;
         }
 
-        // extract unused parameters
-        $extra = array_diff_key($parameters, $variables, $defaults);
-
-        // extract fragment
-        $fragment = isset($extra['_fragment']) ? $extra['_fragment'] : '';
-        unset($extra['_fragment']);
-
         // add a query string if needed
         $extra = array_udiff_assoc(array_diff_key($parameters, $variables), $defaults, function ($a, $b) {
             return $a == $b ? 0 : 1;
         });
 
+        // extract fragment
+        $fragment = isset($extra['_fragment']) ? $extra['_fragment'] : '';
+        unset($extra['_fragment']);
+
         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
