[Routing] Fixed scheme redirecting for root path

twoleds · twoleds · commit a5784c2ec416 · 2018-08-03T09:58:40.000+02:00
diff --git a/Matcher/Dumper/PhpMatcherDumper.php b/Matcher/Dumper/PhpMatcherDumper.php
@@ -194,7 +194,7 @@ private function compileRoutes(RouteCollection $routes, bool $matchHost): string
         }
 
         // used to display the Welcome Page in apps that don't define a homepage
-        $code .= "        if ('/' === \$pathinfo && !\$allow) {\n";
+        $code .= "        if ('/' === \$pathinfo && !\$allow && !\$allowSchemes) {\n";
         $code .= "            throw new Symfony\Component\Routing\Exception\NoConfigurationException();\n";
         $code .= "        }\n";
 
diff --git a/Tests/Fixtures/dumper/url_matcher0.php b/Tests/Fixtures/dumper/url_matcher0.php
@@ -26,7 +26,7 @@ public function match($rawPathinfo)
             $canonicalMethod = 'GET';
         }
 
-        if ('/' === $pathinfo && !$allow) {
+        if ('/' === $pathinfo && !$allow && !$allowSchemes) {
             throw new Symfony\Component\Routing\Exception\NoConfigurationException();
         }
 
diff --git a/Tests/Fixtures/dumper/url_matcher1.php b/Tests/Fixtures/dumper/url_matcher1.php
@@ -238,7 +238,7 @@ public function match($rawPathinfo)
                 $offset += strlen($m);
             }
         }
-        if ('/' === $pathinfo && !$allow) {
+        if ('/' === $pathinfo && !$allow && !$allowSchemes) {
             throw new Symfony\Component\Routing\Exception\NoConfigurationException();
         }
 
diff --git a/Tests/Fixtures/dumper/url_matcher10.php b/Tests/Fixtures/dumper/url_matcher10.php
@@ -2821,7 +2821,7 @@ public function match($rawPathinfo)
                 $offset += strlen($m);
             }
         }
-        if ('/' === $pathinfo && !$allow) {
+        if ('/' === $pathinfo && !$allow && !$allowSchemes) {
             throw new Symfony\Component\Routing\Exception\NoConfigurationException();
         }
 
diff --git a/Tests/Fixtures/dumper/url_matcher11.php b/Tests/Fixtures/dumper/url_matcher11.php
@@ -142,7 +142,7 @@ private function doMatch(string $rawPathinfo, array &$allow = array(), array &$a
                 $offset += strlen($m);
             }
         }
-        if ('/' === $pathinfo && !$allow) {
+        if ('/' === $pathinfo && !$allow && !$allowSchemes) {
             throw new Symfony\Component\Routing\Exception\NoConfigurationException();
         }
 
diff --git a/Tests/Fixtures/dumper/url_matcher12.php b/Tests/Fixtures/dumper/url_matcher12.php
@@ -91,7 +91,7 @@ public function match($rawPathinfo)
                 $offset += strlen($m);
             }
         }
-        if ('/' === $pathinfo && !$allow) {
+        if ('/' === $pathinfo && !$allow && !$allowSchemes) {
             throw new Symfony\Component\Routing\Exception\NoConfigurationException();
         }
 
diff --git a/Tests/Fixtures/dumper/url_matcher13.php b/Tests/Fixtures/dumper/url_matcher13.php
@@ -60,7 +60,7 @@ public function match($rawPathinfo)
                 $offset += strlen($m);
             }
         }
-        if ('/' === $pathinfo && !$allow) {
+        if ('/' === $pathinfo && !$allow && !$allowSchemes) {
             throw new Symfony\Component\Routing\Exception\NoConfigurationException();
         }
 
diff --git a/Tests/Fixtures/dumper/url_matcher2.php b/Tests/Fixtures/dumper/url_matcher2.php
@@ -275,7 +275,7 @@ private function doMatch(string $rawPathinfo, array &$allow = array(), array &$a
                 $offset += strlen($m);
             }
         }
-        if ('/' === $pathinfo && !$allow) {
+        if ('/' === $pathinfo && !$allow && !$allowSchemes) {
             throw new Symfony\Component\Routing\Exception\NoConfigurationException();
         }
 
diff --git a/Tests/Fixtures/dumper/url_matcher3.php b/Tests/Fixtures/dumper/url_matcher3.php
@@ -103,7 +103,7 @@ public function match($rawPathinfo)
                 $offset += strlen($m);
             }
         }
-        if ('/' === $pathinfo && !$allow) {
+        if ('/' === $pathinfo && !$allow && !$allowSchemes) {
             throw new Symfony\Component\Routing\Exception\NoConfigurationException();
         }
 
diff --git a/Tests/Fixtures/dumper/url_matcher4.php b/Tests/Fixtures/dumper/url_matcher4.php
@@ -75,7 +75,7 @@ public function match($rawPathinfo)
                 return $ret;
         }
 
-        if ('/' === $pathinfo && !$allow) {
+        if ('/' === $pathinfo && !$allow && !$allowSchemes) {
             throw new Symfony\Component\Routing\Exception\NoConfigurationException();
         }
 
diff --git a/Tests/Fixtures/dumper/url_matcher5.php b/Tests/Fixtures/dumper/url_matcher5.php
@@ -145,7 +145,7 @@ private function doMatch(string $rawPathinfo, array &$allow = array(), array &$a
                 $offset += strlen($m);
             }
         }
-        if ('/' === $pathinfo && !$allow) {
+        if ('/' === $pathinfo && !$allow && !$allowSchemes) {
             throw new Symfony\Component\Routing\Exception\NoConfigurationException();
         }
 
diff --git a/Tests/Fixtures/dumper/url_matcher6.php b/Tests/Fixtures/dumper/url_matcher6.php
@@ -122,7 +122,7 @@ public function match($rawPathinfo)
                 $offset += strlen($m);
             }
         }
-        if ('/' === $pathinfo && !$allow) {
+        if ('/' === $pathinfo && !$allow && !$allowSchemes) {
             throw new Symfony\Component\Routing\Exception\NoConfigurationException();
         }
 
diff --git a/Tests/Fixtures/dumper/url_matcher7.php b/Tests/Fixtures/dumper/url_matcher7.php
@@ -157,7 +157,7 @@ private function doMatch(string $rawPathinfo, array &$allow = array(), array &$a
                 $offset += strlen($m);
             }
         }
-        if ('/' === $pathinfo && !$allow) {
+        if ('/' === $pathinfo && !$allow && !$allowSchemes) {
             throw new Symfony\Component\Routing\Exception\NoConfigurationException();
         }
 
diff --git a/Tests/Fixtures/dumper/url_matcher8.php b/Tests/Fixtures/dumper/url_matcher8.php
@@ -79,7 +79,7 @@ public function match($rawPathinfo)
                 $offset += strlen($m);
             }
         }
-        if ('/' === $pathinfo && !$allow) {
+        if ('/' === $pathinfo && !$allow && !$allowSchemes) {
             throw new Symfony\Component\Routing\Exception\NoConfigurationException();
         }
 
diff --git a/Tests/Fixtures/dumper/url_matcher9.php b/Tests/Fixtures/dumper/url_matcher9.php
@@ -44,7 +44,7 @@ public function match($rawPathinfo)
                 break;
         }
 
-        if ('/' === $pathinfo && !$allow) {
+        if ('/' === $pathinfo && !$allow && !$allowSchemes) {
             throw new Symfony\Component\Routing\Exception\NoConfigurationException();
         }
 
diff --git a/Tests/Matcher/RedirectableUrlMatcherTest.php b/Tests/Matcher/RedirectableUrlMatcherTest.php
@@ -93,6 +93,20 @@ public function testSchemeRedirectWithParams()
         $this->assertEquals(array('_route' => 'foo', 'bar' => 'baz', 'redirect' => 'value'), $matcher->match('/foo/baz'));
     }
 
+    public function testSchemeRedirectForRoot()
+    {
+        $coll = new RouteCollection();
+        $coll->add('foo', new Route('/', array(), array(), array(), '', array('https')));
+
+        $matcher = $this->getUrlMatcher($coll);
+        $matcher
+            ->expects($this->once())
+            ->method('redirect')
+            ->with('/', 'foo', 'https')
+            ->will($this->returnValue(array('redirect' => 'value')));
+        $this->assertEquals(array('_route' => 'foo', 'redirect' => 'value'), $matcher->match('/'));
+    }
+
     public function testSlashRedirectWithParams()
     {
         $coll = new RouteCollection();

Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,7 @@ private function compileRoutes(RouteCollection $routes, bool $matchHost): string`
`194`	`194`	`}`
`195`	`195`
`196`	`196`	`// used to display the Welcome Page in apps that don't define a homepage`
`197`		`- $code .= " if ('/' === \$pathinfo && !\$allow) {\n";`
	`197`	`+ $code .= " if ('/' === \$pathinfo && !\$allow && !\$allowSchemes) {\n";`
`198`	`198`	`$code .= " throw new Symfony\Component\Routing\Exception\NoConfigurationException();\n";`
`199`	`199`	`$code .= " }\n";`
`200`	`200`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public function match($rawPathinfo)`
`26`	`26`	`$canonicalMethod = 'GET';`
`27`	`27`	`}`
`28`	`28`
`29`		`- if ('/' === $pathinfo && !$allow) {`
	`29`	`+ if ('/' === $pathinfo && !$allow && !$allowSchemes) {`
`30`	`30`	`throw new Symfony\Component\Routing\Exception\NoConfigurationException();`
`31`	`31`	`}`
`32`	`32`
Original file line number	Diff line number	Diff line change
`@@ -238,7 +238,7 @@ public function match($rawPathinfo)`
`238`	`238`	`$offset += strlen($m);`
`239`	`239`	`}`
`240`	`240`	`}`
`241`		`- if ('/' === $pathinfo && !$allow) {`
	`241`	`+ if ('/' === $pathinfo && !$allow && !$allowSchemes) {`
`242`	`242`	`throw new Symfony\Component\Routing\Exception\NoConfigurationException();`
`243`	`243`	`}`
`244`	`244`
Original file line number	Diff line number	Diff line change
`@@ -2821,7 +2821,7 @@ public function match($rawPathinfo)`
`2821`	`2821`	`$offset += strlen($m);`
`2822`	`2822`	`}`
`2823`	`2823`	`}`
`2824`		`- if ('/' === $pathinfo && !$allow) {`
	`2824`	`+ if ('/' === $pathinfo && !$allow && !$allowSchemes) {`
`2825`	`2825`	`throw new Symfony\Component\Routing\Exception\NoConfigurationException();`
`2826`	`2826`	`}`
`2827`	`2827`
Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ private function doMatch(string $rawPathinfo, array &$allow = array(), array &$a`
`142`	`142`	`$offset += strlen($m);`
`143`	`143`	`}`
`144`	`144`	`}`
`145`		`- if ('/' === $pathinfo && !$allow) {`
	`145`	`+ if ('/' === $pathinfo && !$allow && !$allowSchemes) {`
`146`	`146`	`throw new Symfony\Component\Routing\Exception\NoConfigurationException();`
`147`	`147`	`}`
`148`	`148`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ public function match($rawPathinfo)`
`91`	`91`	`$offset += strlen($m);`
`92`	`92`	`}`
`93`	`93`	`}`
`94`		`- if ('/' === $pathinfo && !$allow) {`
	`94`	`+ if ('/' === $pathinfo && !$allow && !$allowSchemes) {`
`95`	`95`	`throw new Symfony\Component\Routing\Exception\NoConfigurationException();`
`96`	`96`	`}`
`97`	`97`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public function match($rawPathinfo)`
`60`	`60`	`$offset += strlen($m);`
`61`	`61`	`}`
`62`	`62`	`}`
`63`		`- if ('/' === $pathinfo && !$allow) {`
	`63`	`+ if ('/' === $pathinfo && !$allow && !$allowSchemes) {`
`64`	`64`	`throw new Symfony\Component\Routing\Exception\NoConfigurationException();`
`65`	`65`	`}`
`66`	`66`
Original file line number	Diff line number	Diff line change
`@@ -275,7 +275,7 @@ private function doMatch(string $rawPathinfo, array &$allow = array(), array &$a`
`275`	`275`	`$offset += strlen($m);`
`276`	`276`	`}`
`277`	`277`	`}`
`278`		`- if ('/' === $pathinfo && !$allow) {`
	`278`	`+ if ('/' === $pathinfo && !$allow && !$allowSchemes) {`
`279`	`279`	`throw new Symfony\Component\Routing\Exception\NoConfigurationException();`
`280`	`280`	`}`
`281`	`281`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ public function match($rawPathinfo)`
`103`	`103`	`$offset += strlen($m);`
`104`	`104`	`}`
`105`	`105`	`}`
`106`		`- if ('/' === $pathinfo && !$allow) {`
	`106`	`+ if ('/' === $pathinfo && !$allow && !$allowSchemes) {`
`107`	`107`	`throw new Symfony\Component\Routing\Exception\NoConfigurationException();`
`108`	`108`	`}`
`109`	`109`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ public function match($rawPathinfo)`
`75`	`75`	`return $ret;`
`76`	`76`	`}`
`77`	`77`
`78`		`- if ('/' === $pathinfo && !$allow) {`
	`78`	`+ if ('/' === $pathinfo && !$allow && !$allowSchemes) {`
`79`	`79`	`throw new Symfony\Component\Routing\Exception\NoConfigurationException();`
`80`	`80`	`}`
`81`	`81`