symfony
diff --git a/‎src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherTrait.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherTrait.php
+6-10Lines changed: 6 additions & 10 deletions b/‎src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherTrait.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherTrait.php
+6-10Lines changed: 6 additions & 10 deletions
diff --git a/‎src/Symfony/Component/Routing/Matcher/UrlMatcher.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Routing/Matcher/UrlMatcher.php
+4-8Lines changed: 4 additions & 8 deletions b/‎src/Symfony/Component/Routing/Matcher/UrlMatcher.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Routing/Matcher/UrlMatcher.php
+4-8Lines changed: 4 additions & 8 deletions
diff --git a/‎src/Symfony/Component/Routing/Tests/Matcher/UrlMatcherTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Routing/Tests/Matcher/UrlMatcherTest.php
+1Lines changed: 1 addition & 0 deletions b/‎src/Symfony/Component/Routing/Tests/Matcher/UrlMatcherTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Routing/Tests/Matcher/UrlMatcherTest.php
+1Lines changed: 1 addition & 0 deletions
@@ -39,7 +39,7 @@ public function match($pathinfo)
             throw new MethodNotAllowedException(array_keys($allow));
         }
         if (!$this instanceof RedirectableUrlMatcherInterface) {
-            throw new ResourceNotFoundException();
+            throw new ResourceNotFoundException(sprintf('No routes found for "%s".', $pathinfo));
         }
         if (!\in_array($this->context->getMethod(), ['HEAD', 'GET'], true)) {
             // no-op
@@ -64,7 +64,7 @@ public function match($pathinfo)
             }
         }
 
-        throw new ResourceNotFoundException();
+        throw new ResourceNotFoundException(sprintf('No routes found for "%s".', $pathinfo));
     }
 
     private function doMatch(string $pathinfo, array &$allow = [], array &$allowSchemes = []): array
@@ -107,10 +107,8 @@ private function doMatch(string $pathinfo, array &$allow = [], array &$allowSche
             }
 
             $hasRequiredScheme = !$requiredSchemes || isset($requiredSchemes[$context->getScheme()]);
-            if ($requiredMethods && !isset($requiredMethods[$canonicalMethod]) && !isset($requiredMethods[$requestMethod])) {
-                if ($hasRequiredScheme) {
-                    $allow += $requiredMethods;
-                }
+            if ($hasRequiredScheme && $requiredMethods && !isset($requiredMethods[$canonicalMethod]) && !isset($requiredMethods[$requestMethod])) {
+                $allow += $requiredMethods;
                 continue;
             }
             if (!$hasRequiredScheme) {
@@ -154,10 +152,8 @@ private function doMatch(string $pathinfo, array &$allow = [], array &$allowSche
                     }
 
                     $hasRequiredScheme = !$requiredSchemes || isset($requiredSchemes[$context->getScheme()]);
-                    if ($requiredMethods && !isset($requiredMethods[$canonicalMethod]) && !isset($requiredMethods[$requestMethod])) {
-                        if ($hasRequiredScheme) {
-                            $allow += $requiredMethods;
-                        }
+                    if ($hasRequiredScheme && $requiredMethods && !isset($requiredMethods[$canonicalMethod]) && !isset($requiredMethods[$requestMethod])) {
+                        $allow += $requiredMethods;
                         continue;
                     }
                     if (!$hasRequiredScheme) {
 
@@ -88,7 +88,7 @@ public function match($pathinfo)
             return $ret;
         }
 
-        if ('/' === $pathinfo && !$this->allow) {
+        if ('/' === $pathinfo && !$this->allow && !$this->allowSchemes) {
             throw new NoConfigurationException();
         }
 
@@ -186,14 +186,10 @@ protected function matchCollection($pathinfo, RouteCollection $routes)
             }
 
             $hasRequiredScheme = !$route->getSchemes() || $route->hasScheme($this->context->getScheme());
-            if ($requiredMethods) {
-                if (!\in_array($method, $requiredMethods)) {
-                    if ($hasRequiredScheme) {
-                        $this->allow = array_merge($this->allow, $requiredMethods);
-                    }
+            if ($hasRequiredScheme && $requiredMethods && !\in_array($method, $requiredMethods)) {
+                $this->allow = array_merge($this->allow, $requiredMethods);
 
-                    continue;
-                }
+                continue;
             }
 
             if (!$hasRequiredScheme) {
 
@@ -582,6 +582,7 @@ public function testNestedCollections()
 
     /**
      * @expectedException \Symfony\Component\Routing\Exception\ResourceNotFoundException
+     * @expectedExceptionMessage No routes found for "/".
      */
     public function testSchemeAndMethodMismatch()
     {
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public function match($pathinfo)`
`39`	`39`	`throw new MethodNotAllowedException(array_keys($allow));`
`40`	`40`	`}`
`41`	`41`	`if (!$this instanceof RedirectableUrlMatcherInterface) {`
`42`		`- throw new ResourceNotFoundException();`
	`42`	`+ throw new ResourceNotFoundException(sprintf('No routes found for "%s".', $pathinfo));`
`43`	`43`	`}`
`44`	`44`	`if (!\in_array($this->context->getMethod(), ['HEAD', 'GET'], true)) {`
`45`	`45`	`// no-op`
`@@ -64,7 +64,7 @@ public function match($pathinfo)`
`64`	`64`	`}`
`65`	`65`	`}`
`66`	`66`
`67`		`- throw new ResourceNotFoundException();`
	`67`	`+ throw new ResourceNotFoundException(sprintf('No routes found for "%s".', $pathinfo));`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`private function doMatch(string $pathinfo, array &$allow = [], array &$allowSchemes = []): array`
`@@ -107,10 +107,8 @@ private function doMatch(string $pathinfo, array &$allow = [], array &$allowSche`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`$hasRequiredScheme = !$requiredSchemes \|\| isset($requiredSchemes[$context->getScheme()]);`
`110`		`- if ($requiredMethods && !isset($requiredMethods[$canonicalMethod]) && !isset($requiredMethods[$requestMethod])) {`
`111`		`- if ($hasRequiredScheme) {`
`112`		`- $allow += $requiredMethods;`
`113`		`- }`
	`110`	`+ if ($hasRequiredScheme && $requiredMethods && !isset($requiredMethods[$canonicalMethod]) && !isset($requiredMethods[$requestMethod])) {`
	`111`	`+ $allow += $requiredMethods;`
`114`	`112`	`continue;`
`115`	`113`	`}`
`116`	`114`	`if (!$hasRequiredScheme) {`
`@@ -154,10 +152,8 @@ private function doMatch(string $pathinfo, array &$allow = [], array &$allowSche`
`154`	`152`	`}`
`155`	`153`
`156`	`154`	`$hasRequiredScheme = !$requiredSchemes \|\| isset($requiredSchemes[$context->getScheme()]);`
`157`		`- if ($requiredMethods && !isset($requiredMethods[$canonicalMethod]) && !isset($requiredMethods[$requestMethod])) {`
`158`		`- if ($hasRequiredScheme) {`
`159`		`- $allow += $requiredMethods;`
`160`		`- }`
	`155`	`+ if ($hasRequiredScheme && $requiredMethods && !isset($requiredMethods[$canonicalMethod]) && !isset($requiredMethods[$requestMethod])) {`
	`156`	`+ $allow += $requiredMethods;`
`161`	`157`	`continue;`
`162`	`158`	`}`
`163`	`159`	`if (!$hasRequiredScheme) {`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ public function match($pathinfo)`
`88`	`88`	`return $ret;`
`89`	`89`	`}`
`90`	`90`
`91`		`- if ('/' === $pathinfo && !$this->allow) {`
	`91`	`+ if ('/' === $pathinfo && !$this->allow && !$this->allowSchemes) {`
`92`	`92`	`throw new NoConfigurationException();`
`93`	`93`	`}`
`94`	`94`
`@@ -186,14 +186,10 @@ protected function matchCollection($pathinfo, RouteCollection $routes)`
`186`	`186`	`}`
`187`	`187`
`188`	`188`	`$hasRequiredScheme = !$route->getSchemes() \|\| $route->hasScheme($this->context->getScheme());`
`189`		`- if ($requiredMethods) {`
`190`		`- if (!\in_array($method, $requiredMethods)) {`
`191`		`- if ($hasRequiredScheme) {`
`192`		`- $this->allow = array_merge($this->allow, $requiredMethods);`
`193`		`- }`
	`189`	`+ if ($hasRequiredScheme && $requiredMethods && !\in_array($method, $requiredMethods)) {`
	`190`	`+ $this->allow = array_merge($this->allow, $requiredMethods);`
`194`	`191`
`195`		`- continue;`
`196`		`- }`
	`192`	`+ continue;`
`197`	`193`	`}`
`198`	`194`
`199`	`195`	`if (!$hasRequiredScheme) {`
Original file line number	Diff line number	Diff line change
`@@ -582,6 +582,7 @@ public function testNestedCollections()`
`582`	`582`
`583`	`583`	`/**`
`584`	`584`	`* @expectedException \Symfony\Component\Routing\Exception\ResourceNotFoundException`
	`585`	`+ * @expectedExceptionMessage No routes found for "/".`
`585`	`586`	`*/`
`586`	`587`	`public function testSchemeAndMethodMismatch()`
`587`	`588`	`{`