diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '3.4' into 4.0

Browse Source 
* 3.4:
  Fix merge
This commit is contained in:
Nicolas Grekas 2018-02-12 19:00:17 +01:00
commit bc21af22d7
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php
View File

@ -327,7 +327,7 @@ EOF;
$code .= <<<EOF
\$requiredSchemes = $schemes;
if (!isset(\$requiredSchemes[\$context->getScheme()])) {
if (!in_array(\$this->context->getMethod(), array('HEAD', 'GET'))) {
if ('GET' !== \$canonicalMethod) {
\$allow[] = 'GET';
goto $gotoname;
}

4
src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher2.php
View File

@ -347,7 +347,7 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Tests\Fixtures\Redirec
$ret = array('_route' => 'secure');
$requiredSchemes = array ( 'https' => 0,);
if (!isset($requiredSchemes[$context->getScheme()])) {
if (!in_array($this->context->getMethod(), array('HEAD', 'GET'))) {
if ('GET' !== $canonicalMethod) {
$allow[] = 'GET';
goto not_secure;
}
@ -364,7 +364,7 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Tests\Fixtures\Redirec
$ret = array('_route' => 'nonsecure');
$requiredSchemes = array ( 'http' => 0,);
if (!isset($requiredSchemes[$context->getScheme()])) {
if (!in_array($this->context->getMethod(), array('HEAD', 'GET'))) {
if ('GET' !== $canonicalMethod) {
$allow[] = 'GET';
goto not_nonsecure;
}