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
@@ -42,7 +42,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
@@ -67,7 +67,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
@@ -110,10 +110,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;
             }
 
@@ -158,10 +156,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) {
 
@@ -89,7 +89,7 @@ public function match($pathinfo)
             return $ret;
         }
 
-        if ('/' === $pathinfo && !$this->allow) {
+        if ('/' === $pathinfo && !$this->allow && !$this->allowSchemes) {
             throw new NoConfigurationException();
         }
 
@@ -187,14 +187,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) {
 
@@ -727,6 +727,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
`@@ -42,7 +42,7 @@ public function match($pathinfo)`
`42`	`42`	`throw new MethodNotAllowedException(array_keys($allow));`
`43`	`43`	`}`
`44`	`44`	`if (!$this instanceof RedirectableUrlMatcherInterface) {`
`45`		`- throw new ResourceNotFoundException();`
	`45`	`+ throw new ResourceNotFoundException(sprintf('No routes found for "%s".', $pathinfo));`
`46`	`46`	`}`
`47`	`47`	`if (!\in_array($this->context->getMethod(), ['HEAD', 'GET'], true)) {`
`48`	`48`	`// no-op`
`@@ -67,7 +67,7 @@ public function match($pathinfo)`
`67`	`67`	`}`
`68`	`68`	`}`
`69`	`69`
`70`		`- throw new ResourceNotFoundException();`
	`70`	`+ throw new ResourceNotFoundException(sprintf('No routes found for "%s".', $pathinfo));`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`private function doMatch(string $pathinfo, array &$allow = [], array &$allowSchemes = []): array`
`@@ -110,10 +110,8 @@ private function doMatch(string $pathinfo, array &$allow = [], array &$allowSche`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`$hasRequiredScheme = !$requiredSchemes \|\| isset($requiredSchemes[$context->getScheme()]);`
`113`		`- if ($requiredMethods && !isset($requiredMethods[$canonicalMethod]) && !isset($requiredMethods[$requestMethod])) {`
`114`		`- if ($hasRequiredScheme) {`
`115`		`- $allow += $requiredMethods;`
`116`		`- }`
	`113`	`+ if ($hasRequiredScheme && $requiredMethods && !isset($requiredMethods[$canonicalMethod]) && !isset($requiredMethods[$requestMethod])) {`
	`114`	`+ $allow += $requiredMethods;`
`117`	`115`	`continue;`
`118`	`116`	`}`
`119`	`117`
`@@ -158,10 +156,8 @@ private function doMatch(string $pathinfo, array &$allow = [], array &$allowSche`
`158`	`156`	`}`
`159`	`157`
`160`	`158`	`$hasRequiredScheme = !$requiredSchemes \|\| isset($requiredSchemes[$context->getScheme()]);`
`161`		`- if ($requiredMethods && !isset($requiredMethods[$canonicalMethod]) && !isset($requiredMethods[$requestMethod])) {`
`162`		`- if ($hasRequiredScheme) {`
`163`		`- $allow += $requiredMethods;`
`164`		`- }`
	`159`	`+ if ($hasRequiredScheme && $requiredMethods && !isset($requiredMethods[$canonicalMethod]) && !isset($requiredMethods[$requestMethod])) {`
	`160`	`+ $allow += $requiredMethods;`
`165`	`161`	`continue;`
`166`	`162`	`}`
`167`	`163`	`if (!$hasRequiredScheme) {`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ public function match($pathinfo)`
`89`	`89`	`return $ret;`
`90`	`90`	`}`
`91`	`91`
`92`		`- if ('/' === $pathinfo && !$this->allow) {`
	`92`	`+ if ('/' === $pathinfo && !$this->allow && !$this->allowSchemes) {`
`93`	`93`	`throw new NoConfigurationException();`
`94`	`94`	`}`
`95`	`95`
`@@ -187,14 +187,10 @@ protected function matchCollection($pathinfo, RouteCollection $routes)`
`187`	`187`	`}`
`188`	`188`
`189`	`189`	`$hasRequiredScheme = !$route->getSchemes() \|\| $route->hasScheme($this->context->getScheme());`
`190`		`- if ($requiredMethods) {`
`191`		`- if (!\in_array($method, $requiredMethods)) {`
`192`		`- if ($hasRequiredScheme) {`
`193`		`- $this->allow = array_merge($this->allow, $requiredMethods);`
`194`		`- }`
	`190`	`+ if ($hasRequiredScheme && $requiredMethods && !\in_array($method, $requiredMethods)) {`
	`191`	`+ $this->allow = array_merge($this->allow, $requiredMethods);`
`195`	`192`
`196`		`- continue;`
`197`		`- }`
	`193`	`+ continue;`
`198`	`194`	`}`
`199`	`195`
`200`	`196`	`if (!$hasRequiredScheme) {`
Original file line number	Diff line number	Diff line change
`@@ -727,6 +727,7 @@ public function testNestedCollections()`
`727`	`727`
`728`	`728`	`/**`
`729`	`729`	`* @expectedException \Symfony\Component\Routing\Exception\ResourceNotFoundException`
	`730`	`+ * @expectedExceptionMessage No routes found for "/".`
`730`	`731`	`*/`
`731`	`732`	`public function testSchemeAndMethodMismatch()`
`732`	`733`	`{`