add subpattern name

behnoushnorouzi · behnoushnorouzi · commit 8358ca719c26 · 2018-06-08T12:13:53.000+02:00
diff --git a/src/Symfony/Bundle/TwigBundle/Loader/NativeFilesystemLoader.php b/src/Symfony/Bundle/TwigBundle/Loader/NativeFilesystemLoader.php
@@ -24,7 +24,7 @@ protected function findTemplate($template, $throw = true)
         try {
             return parent::findTemplate($template, $throw);
         } catch (LoaderError $e) {
-            if ('' === $template || '@' === $template[0] || !preg_match('/^([^:]*?)(?:Bundle)?:([^:]*+):(.+\.[^\.]+\.[^\.]+)$/', $template, $m)) {
+            if ('' === $template || '@' === $template[0] || !preg_match("/^(?P<bundlename>[^:]*?)(?:Bundle)?:(?P<path>[^:]*+):(?P<template>.+\.[^\.]+\.[^\.]+)$/", $template, $m)) {
                 throw $e;
             }
             if ('' !== $m[2]) {
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/Loader/NativeFilesystemLoaderTest.php b/src/Symfony/Bundle/TwigBundle/Tests/Loader/NativeFilesystemLoaderTest.php
@@ -7,14 +7,12 @@
 
 class NativeFilesystemLoaderTest extends TestCase
 {
-    const DS = DIRECTORY_SEPARATOR;
-
     public function testWithNativeNamespace()
     {
         $loader = new NativeFilesystemLoader(null, __DIR__.'/../');
         $loader->addPath('Fixtures/templates', 'Test');
 
-        $this->assertSame('Fixtures'.self::DS.'templates'.self::DS.'Foo'.self::DS.'index.html.twig', $loader->getCacheKey('@Test/Foo/index.html.twig'));
+        $this->assertSame('Fixtures'.DIRECTORY_SEPARATOR.'templates'.DIRECTORY_SEPARATOR.'Foo'.DIRECTORY_SEPARATOR.'index.html.twig', $loader->getCacheKey('@Test/Foo/index.html.twig'));
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ protected function findTemplate($template, $throw = true)`
`24`	`24`	`try {`
`25`	`25`	`return parent::findTemplate($template, $throw);`
`26`	`26`	`} catch (LoaderError $e) {`
`27`		`- if ('' === $template \|\| '@' === $template[0] \|\| !preg_match('/^([^:]?)(?:Bundle)?:([^:]+):(.+\.[^\.]+\.[^\.]+)$/', $template, $m)) {`
	`27`	`+ if ('' === $template \|\| '@' === $template[0] \|\| !preg_match("/^(?P<bundlename>[^:]?)(?:Bundle)?:(?P<path>[^:]+):(?P<template>.+\.[^\.]+\.[^\.]+)$/", $template, $m)) {`
`28`	`28`	`throw $e;`
`29`	`29`	`}`
`30`	`30`	`if ('' !== $m[2]) {`
Original file line number	Diff line number	Diff line change
`@@ -7,14 +7,12 @@`
`7`	`7`
`8`	`8`	`class NativeFilesystemLoaderTest extends TestCase`
`9`	`9`	`{`
`10`		`- const DS = DIRECTORY_SEPARATOR;`
`11`		`-`
`12`	`10`	`public function testWithNativeNamespace()`
`13`	`11`	`{`
`14`	`12`	`$loader = new NativeFilesystemLoader(null, __DIR__.'/../');`
`15`	`13`	`$loader->addPath('Fixtures/templates', 'Test');`
`16`	`14`
`17`		`- $this->assertSame('Fixtures'.self::DS.'templates'.self::DS.'Foo'.self::DS.'index.html.twig', $loader->getCacheKey('@Test/Foo/index.html.twig'));`
	`15`	`+ $this->assertSame('Fixtures'.DIRECTORY_SEPARATOR.'templates'.DIRECTORY_SEPARATOR.'Foo'.DIRECTORY_SEPARATOR.'index.html.twig', $loader->getCacheKey('@Test/Foo/index.html.twig'));`
`18`	`16`	`}`
`19`	`17`
`20`	`18`	`/**`