Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

[Routing] Optimised dumped router matcher, prevent unneeded function calls. #21755

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 12 commits into from
Closed

[Routing] Optimised dumped router matcher, prevent unneeded function calls. #21755

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ea8c55a
Optimized dumped router matcher, prevent unneeded function calls.
frankdejonge Feb 24, 2017
0d69cfe
Fixed CS
frankdejonge Feb 24, 2017
0425f33
Flipped around special GET HEAD handling for less expensive method co…
frankdejonge Feb 25, 2017
56f2323
Corrected tests.
frankdejonge Feb 25, 2017
ef6ad3a
Use yoda statements.
frankdejonge Feb 27, 2017
44271e0
After filtering there's also a case where only one HTTP method is pre…
frankdejonge Feb 27, 2017
e4a9e1e
CS
frankdejonge Feb 27, 2017
2e180c6
Optimise schema check as well.
frankdejonge Feb 27, 2017
9d92c57
Added a test case which more clearly demonstrates the effect of the h…
frankdejonge Feb 27, 2017
f56cf9a
Yoda comparison.
frankdejonge Feb 28, 2017
bb68154
Renamed isLikeGetMethod to canonicalMethod.
frankdejonge Feb 28, 2017
4ab821b
It's scheme not schema.
frankdejonge Feb 28, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
It's scheme not schema.
  • Loading branch information
@frankdejonge
frankdejonge committed Feb 28, 2017
commit 4ab821bc5f3bbc8db4faff97bf19fee2f91d3ad8
4 changes: 2 additions & 2 deletions 4 src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ public function match(\$pathinfo)
\$context = \$this->context;
\$request = \$this->request;
\$requestMethod = \$canonicalMethod = \$context->getMethod();
\$schema = \$context->getScheme();
\$scheme = \$context->getScheme();

if ('HEAD' === \$requestMethod) {
\$canonicalMethod = 'GET';
Expand Down Expand Up @@ -337,7 +337,7 @@ private function compileRoute(Route $route, $name, $supportsRedirections, $paren
$schemes = str_replace("\n", '', var_export(array_flip($schemes), true));
$code .= <<<EOF
\$requiredSchemes = $schemes;
if (!isset(\$requiredSchemes[\$schema])) {
if (!isset(\$requiredSchemes[\$scheme])) {
return \$this->redirect(\$pathinfo, '$name', key(\$requiredSchemes));
}

Expand Down
2 changes: 1 addition & 1 deletion 2 src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher1.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public function match($pathinfo)
$context = $this->context;
$request = $this->request;
$requestMethod = $canonicalMethod = $context->getMethod();
$schema = $context->getScheme();
$scheme = $context->getScheme();

if ('HEAD' === $requestMethod) {
$canonicalMethod = 'GET';
Expand Down
6 changes: 3 additions & 3 deletions 6 src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher2.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public function match($pathinfo)
$context = $this->context;
$request = $this->request;
$requestMethod = $canonicalMethod = $context->getMethod();
$schema = $context->getScheme();
$scheme = $context->getScheme();

if ('HEAD' === $requestMethod) {
$canonicalMethod = 'GET';
Expand Down Expand Up @@ -330,7 +330,7 @@ public function match($pathinfo)
// secure
if ('/secure' === $pathinfo) {
$requiredSchemes = array ( 'https' => 0,);
if (!isset($requiredSchemes[$schema])) {
if (!isset($requiredSchemes[$scheme])) {
return $this->redirect($pathinfo, 'secure', key($requiredSchemes));
}

Expand All @@ -340,7 +340,7 @@ public function match($pathinfo)
// nonsecure
if ('/nonsecure' === $pathinfo) {
$requiredSchemes = array ( 'http' => 0,);
if (!isset($requiredSchemes[$schema])) {
if (!isset($requiredSchemes[$scheme])) {
return $this->redirect($pathinfo, 'nonsecure', key($requiredSchemes));
}

Expand Down
2 changes: 1 addition & 1 deletion 2 src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher3.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public function match($pathinfo)
$context = $this->context;
$request = $this->request;
$requestMethod = $canonicalMethod = $context->getMethod();
$schema = $context->getScheme();
$scheme = $context->getScheme();

if ('HEAD' === $requestMethod) {
$canonicalMethod = 'GET';
Expand Down
2 changes: 1 addition & 1 deletion 2 src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher4.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public function match($pathinfo)
$context = $this->context;
$request = $this->request;
$requestMethod = $canonicalMethod = $context->getMethod();
$schema = $context->getScheme();
$scheme = $context->getScheme();

if ('HEAD' === $requestMethod) {
$canonicalMethod = 'GET';
Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.