minor #18257 [Routing] Don't needlessly execute strtr's as they are fairly expensive (arjenm)
This PR was merged into the 2.7 branch.
Discussion
----------
[Routing] Don't needlessly execute strtr's as they are fairly expensive
| Q | A
| ------------- | ---
| Branch? | 2.7
| Bug fix? | refactor
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | see discussion in #18230
| License | MIT
| Doc PR | see #18230
As requested in #18230 this is a new version of the prevention of using strtr's. I've posted some performance-numbers in that PR as well.
Commits
-------
b3da6a1
[Routing] Don't needlessly execute strtr's as they are fairly expensive
This commit is contained in:
commit
f03dc6eec5
|
@ -75,6 +75,11 @@ class UrlGenerator implements UrlGeneratorInterface, ConfigurableRequirementsInt
|
||||||
'%7C' => '|',
|
'%7C' => '|',
|
||||||
);
|
);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var string This regexp matches all characters that are not or should not be encoded by rawurlencode (see list in array above).
|
||||||
|
*/
|
||||||
|
private $urlEncodingSkipRegexp = '#[^-.~a-zA-Z0-9_/@:;,=+!*|]#';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructor.
|
* Constructor.
|
||||||
*
|
*
|
||||||
|
@ -182,19 +187,21 @@ class UrlGenerator implements UrlGeneratorInterface, ConfigurableRequirementsInt
|
||||||
|
|
||||||
if ('' === $url) {
|
if ('' === $url) {
|
||||||
$url = '/';
|
$url = '/';
|
||||||
|
} else if (preg_match($this->urlEncodingSkipRegexp, $url)) {
|
||||||
|
// the contexts base URL is already encoded (see Symfony\Component\HttpFoundation\Request)
|
||||||
|
$url = strtr(rawurlencode($url), $this->decodedChars);
|
||||||
}
|
}
|
||||||
|
|
||||||
// the contexts base URL is already encoded (see Symfony\Component\HttpFoundation\Request)
|
|
||||||
$url = strtr(rawurlencode($url), $this->decodedChars);
|
|
||||||
|
|
||||||
// the path segments "." and ".." are interpreted as relative reference when resolving a URI; see http://tools.ietf.org/html/rfc3986#section-3.3
|
// the path segments "." and ".." are interpreted as relative reference when resolving a URI; see http://tools.ietf.org/html/rfc3986#section-3.3
|
||||||
// so we need to encode them as they are not used for this purpose here
|
// so we need to encode them as they are not used for this purpose here
|
||||||
// otherwise we would generate a URI that, when followed by a user agent (e.g. browser), does not match this route
|
// otherwise we would generate a URI that, when followed by a user agent (e.g. browser), does not match this route
|
||||||
$url = strtr($url, array('/../' => '/%2E%2E/', '/./' => '/%2E/'));
|
if(false !== strpos($url, '/.')) {
|
||||||
if ('/..' === substr($url, -3)) {
|
$url = strtr($url, array('/../' => '/%2E%2E/', '/./' => '/%2E/'));
|
||||||
$url = substr($url, 0, -2).'%2E%2E';
|
if ('/..' === substr($url, -3)) {
|
||||||
} elseif ('/.' === substr($url, -2)) {
|
$url = substr($url, 0, -2).'%2E%2E';
|
||||||
$url = substr($url, 0, -1).'%2E';
|
} elseif ('/.' === substr($url, -2)) {
|
||||||
|
$url = substr($url, 0, -1).'%2E';
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$schemeAuthority = '';
|
$schemeAuthority = '';
|
||||||
|
@ -268,7 +275,7 @@ class UrlGenerator implements UrlGeneratorInterface, ConfigurableRequirementsInt
|
||||||
if ($extra && $query = http_build_query($extra, '', '&')) {
|
if ($extra && $query = http_build_query($extra, '', '&')) {
|
||||||
// "/" and "?" can be left decoded for better user experience, see
|
// "/" and "?" can be left decoded for better user experience, see
|
||||||
// http://tools.ietf.org/html/rfc3986#section-3.4
|
// http://tools.ietf.org/html/rfc3986#section-3.4
|
||||||
$url .= '?'.strtr($query, array('%2F' => '/'));
|
$url .= '?'.(false === strpos($query, '%2F') ? $query : strtr($query, array('%2F' => '/')));
|
||||||
}
|
}
|
||||||
|
|
||||||
return $url;
|
return $url;
|
||||||
|
|
Reference in New Issue