symfony
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Routing/Loader/YamlFileLoader.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Routing/Loader/YamlFileLoader.php
+5-1Lines changed: 5 additions & 1 deletion b/‎src/Symfony/Bundle/FrameworkBundle/Routing/Loader/YamlFileLoader.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Routing/Loader/YamlFileLoader.php
+5-1Lines changed: 5 additions & 1 deletion
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Resources/config/routing/template_and_redirect.yaml
Copy file name to clipboard
+4Lines changed: 4 additions & 0 deletions b/‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Resources/config/routing/template_and_redirect.yaml
Copy file name to clipboard
+4Lines changed: 4 additions & 0 deletions
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Resources/config/routing/with_controller_attribute.yaml
Copy file name to clipboard
+3-2Lines changed: 3 additions & 2 deletions b/‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Resources/config/routing/with_controller_attribute.yaml
Copy file name to clipboard
+3-2Lines changed: 3 additions & 2 deletions
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Tests/Routing/Loader/YamlFileLoaderTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/Routing/Loader/YamlFileLoaderTest.php
+10-5Lines changed: 10 additions & 5 deletions b/‎src/Symfony/Bundle/FrameworkBundle/Tests/Routing/Loader/YamlFileLoaderTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/Routing/Loader/YamlFileLoaderTest.php
+10-5Lines changed: 10 additions & 5 deletions
@@ -30,13 +30,17 @@ class YamlFileLoader extends BaseYamlFileLoader
 
     protected function validate($config, $name, $path)
     {
+        if (\count($types = array_intersect_key($config, self::$availableKeys)) > 1) {
+            throw new \InvalidArgumentException(sprintf('The routing file "%s" must not specify only one route type among "%s" keys for "%s".', str_replace('/', \DIRECTORY_SEPARATOR, $path), implode('", "', array_keys($types)), $name));
+        }
+
         foreach (self::$availableKeys as $routeType => $availableKeys) {
             if (!isset($config[$routeType])) {
                 continue;
             }
 
             if (isset($config['controller'])) {
-                throw new \InvalidArgumentException(sprintf('The routing file "%s" must not specify both the "controller" and the "%s" keys for "%s".', $path, $routeType, $name));
+                throw new \InvalidArgumentException(sprintf('The routing file "%s" must not specify both the "controller" and the "%s" keys for "%s".', str_replace('/', \DIRECTORY_SEPARATOR, $path), $routeType, $name));
             }
 
             // keys would be invalid for parent::validate(), but we use them below
 
@@ -0,0 +1,4 @@
+invalid_route:
+    path: '/path'
+    template: 'template.html.twig'
+    redirect_to_route: 'target_route'
@@ -1,3 +1,4 @@
-invalid:
-    temmplate: 'template.html.twig'
+invalid_route:
+    path: '/path'
+    template: 'template.html.twig'
     controller: 'SomeControllerClass'
@@ -12,7 +12,6 @@
 namespace Symfony\Bundle\FrameworkBundle\Tests\Routing\Loader;
 
 use Symfony\Bundle\FrameworkBundle\Routing\Loader\YamlFileLoader;
-use Symfony\Component\Config\FileLocator;
 use Symfony\Component\Config\Loader\LoaderInterface;
 
 class YamlFileLoaderTest extends AbstractLoaderTest
@@ -30,15 +29,21 @@ protected function getType(): string
     /**
      * @dataProvider getPathsToInvalidFiles
      */
-    public function testLoadThrowsExceptionWithInvalidFile($filePath)
+    public function testLoadThrowsExceptionWithInvalidFile(string $filePath, string $exception)
     {
-        $this->expectException('InvalidArgumentException');
-        $loader = new YamlFileLoader(new FileLocator([__DIR__.'/../Fixtures']));
+        $loader = $this->getLoader();
+
+        $message = sprintf($exception, __DIR__.'/../../Fixtures/Resources/config/routing/'.$filePath);
+
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage(str_replace('/', \DIRECTORY_SEPARATOR, $message));
+
         $loader->load($filePath);
     }
 
     public function getPathsToInvalidFiles()
     {
-        yield 'defining controller' => ['with_controller_attributes.yaml'];
+        yield 'defining controller' => ['with_controller_attribute.yaml', 'The routing file "%s" must not specify both the "controller" and the "template" keys for "invalid_route".'];
+        yield 'defining template and redirect' => ['template_and_redirect.yaml', 'The routing file "%s" must not specify only one route type among "template", "redirect_to_route" keys for "invalid_route".'];
     }
 }
Original file line number	Diff line number	Diff line change
`@@ -30,13 +30,17 @@ class YamlFileLoader extends BaseYamlFileLoader`
`30`	`30`
`31`	`31`	`protected function validate($config, $name, $path)`
`32`	`32`	`{`
	`33`	`+ if (\count($types = array_intersect_key($config, self::$availableKeys)) > 1) {`
	`34`	`+ throw new \InvalidArgumentException(sprintf('The routing file "%s" must not specify only one route type among "%s" keys for "%s".', str_replace('/', \DIRECTORY_SEPARATOR, $path), implode('", "', array_keys($types)), $name));`
	`35`	`+ }`
	`36`	`+`
`33`	`37`	`foreach (self::$availableKeys as $routeType => $availableKeys) {`
`34`	`38`	`if (!isset($config[$routeType])) {`
`35`	`39`	`continue;`
`36`	`40`	`}`
`37`	`41`
`38`	`42`	`if (isset($config['controller'])) {`
`39`		`- throw new \InvalidArgumentException(sprintf('The routing file "%s" must not specify both the "controller" and the "%s" keys for "%s".', $path, $routeType, $name));`
	`43`	`+ throw new \InvalidArgumentException(sprintf('The routing file "%s" must not specify both the "controller" and the "%s" keys for "%s".', str_replace('/', \DIRECTORY_SEPARATOR, $path), $routeType, $name));`
`40`	`44`	`}`
`41`	`45`
`42`	`46`	`// keys would be invalid for parent::validate(), but we use them below`