[FrameworkBundle] Fix a regression in handling absolute and namespaced template paths

jakzal · jakzal · commit fe1f5d2cae02 · 2016-03-03T07:42:35.000Z
diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/TemplateNameParser.php b/src/Symfony/Bundle/FrameworkBundle/Templating/TemplateNameParser.php
@@ -56,7 +56,7 @@ public function parse($name)
             throw new \RuntimeException(sprintf('Template name "%s" contains invalid characters.', $name));
         }
 
-        if (!preg_match('/^(?:([^:]*):)?(?:([^:]*):)?(.+)\.([^\.]+)\.([^\.]+)$/', $name, $matches)) {
+        if (!preg_match('/^(?:([^:]*):([^:]*):)?(.+)\.([^\.]+)\.([^\.]+)$/', $name, $matches) || $this->isAbsolute($name) || 0 === strpos($name, '@')) {
             return parent::parse($name);
         }
 
@@ -72,4 +72,9 @@ public function parse($name)
 
         return $this->cache[$name] = $template;
     }
+
+    private function isAbsolutePath($file)
+    {
+        return (bool) preg_match('#^(?:/|[a-zA-Z]:)#', $file);
+    }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/TemplateNameParserTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/TemplateNameParserTest.php
@@ -66,6 +66,12 @@ public function parseProvider()
             array('::index.html.php', '::index.html.php', 'views/index.html.php', new TemplateReference('', '', 'index', 'html', 'php')),
             array('index.html.php', '::index.html.php', 'views/index.html.php', new TemplateReference('', '', 'index', 'html', 'php')),
             array('FooBundle:Post:foo.bar.index.html.php', 'FooBundle:Post:foo.bar.index.html.php', '@FooBundle/Resources/views/Post/foo.bar.index.html.php', new TemplateReference('FooBundle', 'Post', 'foo.bar.index', 'html', 'php')),
+            array('@FooBundle/Resources/views/layout.html.twig', '@FooBundle/Resources/views/layout.html.twig', '@FooBundle/Resources/views/layout.html.twig', new BaseTemplateReference('@FooBundle/Resources/views/layout.html.twig', 'twig')),
+            array('@FooBundle/Foo/layout.html.twig', '@FooBundle/Foo/layout.html.twig', '@FooBundle/Foo/layout.html.twig', new BaseTemplateReference('@FooBundle/Foo/layout.html.twig', 'twig')),
+            array('/path/to/section/index.html.php', '/path/to/section/index.html.php', '/path/to/section/index.html.php', new BaseTemplateReference('/path/to/section/index.html.php', 'php')),
+            array('C:\\path\\to\\section\\name.html.php', 'C:path/to/section/name.html.php', 'C:path/to/section/name.html.php', new BaseTemplateReference('C:path/to/section/name.html.php', 'php')),
+            array('C:\\path\\to\\section\\name:foo.html.php', 'C:path/to/section/name:foo.html.php', 'C:path/to/section/name:foo.html.php', new BaseTemplateReference('C:path/to/section/name:foo.html.php', 'php')),
+            array('\\path\\to\\section\\name.html.php', '/path/to/section/name.html.php', '/path/to/section/name.html.php', new BaseTemplateReference('/path/to/section/name.html.php', 'php')),
             array('/path/to/section/name.php', '/path/to/section/name.php', '/path/to/section/name.php', new BaseTemplateReference('/path/to/section/name.php', 'php')),
             array('name.twig', 'name.twig', 'name.twig', new BaseTemplateReference('name.twig', 'twig')),
             array('name', 'name', 'name', new BaseTemplateReference('name')),

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public function parse($name)`
`56`	`56`	`throw new \RuntimeException(sprintf('Template name "%s" contains invalid characters.', $name));`
`57`	`57`	`}`
`58`	`58`
`59`		`- if (!preg_match('/^(?:([^:]):)?(?:([^:]):)?(.+)\.([^\.]+)\.([^\.]+)$/', $name, $matches)) {`
	`59`	`+ if (!preg_match('/^(?:([^:]):([^:]):)?(.+)\.([^\.]+)\.([^\.]+)$/', $name, $matches) \|\| $this->isAbsolute($name) \|\| 0 === strpos($name, '@')) {`
`60`	`60`	`return parent::parse($name);`
`61`	`61`	`}`
`62`	`62`
`@@ -72,4 +72,9 @@ public function parse($name)`
`72`	`72`
`73`	`73`	`return $this->cache[$name] = $template;`
`74`	`74`	`}`
	`75`	`+`
	`76`	`+ private function isAbsolutePath($file)`
	`77`	`+ {`
	`78`	`+ return (bool) preg_match('#^(?:/\|[a-zA-Z]:)#', $file);`
	`79`	`+ }`
`75`	`80`	`}`