[Routing] Revert throwing 405 on missed slash/scheme redirections

symfony · Feb 25, 2018 · 8467b9c · 8467b9c
1 parent 48ee6df
commit 8467b9c
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 15 deletions.
diff --git a/Matcher/Dumper/PhpMatcherDumper.php b/Matcher/Dumper/PhpMatcherDumper.php
@@ -264,7 +264,6 @@ private function compileRoute(Route $route, $name, $supportsRedirections, $paren
             if ('/' === substr(\$pathinfo, -1)) {
                 // no-op
             } elseif (!in_array(\$this->context->getMethod(), array('HEAD', 'GET'))) {
-                \$allow[] = 'GET';
                 goto $gotoname;
             } else {
                 return \$this->redirect(\$rawPathinfo.'/', '$name');
@@ -283,7 +282,6 @@ private function compileRoute(Route $route, $name, $supportsRedirections, $paren
             \$requiredSchemes = $schemes;
             if (!isset(\$requiredSchemes[\$this->context->getScheme()])) {
                 if (!in_array(\$this->context->getMethod(), array('HEAD', 'GET'))) {
-                    \$allow[] = 'GET';
                     goto $gotoname;
                 }
 

diff --git a/Tests/Fixtures/dumper/url_matcher2.php b/Tests/Fixtures/dumper/url_matcher2.php
@@ -69,7 +69,6 @@ public function match($rawPathinfo)
                     if ('/' === substr($pathinfo, -1)) {
                         // no-op
                     } elseif (!in_array($this->context->getMethod(), array('HEAD', 'GET'))) {
-                        $allow[] = 'GET';
                         goto not_baz3;
                     } else {
                         return $this->redirect($rawPathinfo.'/', 'baz3');
@@ -86,7 +85,6 @@ public function match($rawPathinfo)
                 if ('/' === substr($pathinfo, -1)) {
                     // no-op
                 } elseif (!in_array($this->context->getMethod(), array('HEAD', 'GET'))) {
-                    $allow[] = 'GET';
                     goto not_baz4;
                 } else {
                     return $this->redirect($rawPathinfo.'/', 'baz4');
@@ -185,7 +183,6 @@ public function match($rawPathinfo)
                 if ('/' === substr($pathinfo, -1)) {
                     // no-op
                 } elseif (!in_array($this->context->getMethod(), array('HEAD', 'GET'))) {
-                    $allow[] = 'GET';
                     goto not_hey;
                 } else {
                     return $this->redirect($rawPathinfo.'/', 'hey');
@@ -337,7 +334,6 @@ public function match($rawPathinfo)
             $requiredSchemes = array (  'https' => 0,);
             if (!isset($requiredSchemes[$this->context->getScheme()])) {
                 if (!in_array($this->context->getMethod(), array('HEAD', 'GET'))) {
-                    $allow[] = 'GET';
                     goto not_secure;
                 }
 
@@ -353,7 +349,6 @@ public function match($rawPathinfo)
             $requiredSchemes = array (  'http' => 0,);
             if (!isset($requiredSchemes[$this->context->getScheme()])) {
                 if (!in_array($this->context->getMethod(), array('HEAD', 'GET'))) {
-                    $allow[] = 'GET';
                     goto not_nonsecure;
                 }
 

diff --git a/Tests/Matcher/DumpedRedirectableUrlMatcherTest.php b/Tests/Matcher/DumpedRedirectableUrlMatcherTest.php
@@ -19,14 +19,6 @@
 
 class DumpedRedirectableUrlMatcherTest extends RedirectableUrlMatcherTest
 {
-    /**
-     * @expectedException \Symfony\Component\Routing\Exception\MethodNotAllowedException
-     */
-    public function testRedirectWhenNoSlashForNonSafeMethod()
-    {
-        parent::testRedirectWhenNoSlashForNonSafeMethod();
-    }
-
     protected function getUrlMatcher(RouteCollection $routes, RequestContext $context = null)
     {
         static $i = 0;