[TwigBundle] Normalize names of templates and enable cache found templates file names

linniksa · fabpot · commit 22aba900d4af · 2011-01-18T07:45:52.000+01:00
diff --git a/src/Symfony/Bundle/TwigBundle/Loader/FilesystemLoader.php b/src/Symfony/Bundle/TwigBundle/Loader/FilesystemLoader.php
@@ -52,15 +52,15 @@ public function setPaths($paths)
 
     protected function findTemplate($name)
     {
-        list($tpl, $options) = $this->nameParser->parse($name);
-
         // normalize name
-        $tpl = preg_replace('#/{2,}#', '/', strtr($tpl, '\\', '/'));
+        $name = str_replace(':/' , ':', preg_replace('#/{2,}#', '/', strtr($name, '\\', '/')));
 
-        if (isset($this->cache[$tpl])) {
-            return $this->cache[$tpl];
+        if (isset($this->cache[$name])) {
+            return $this->cache[$name];
         }
 
+        list($tpl, $options) = $this->nameParser->parse($name);
+
         $this->validateName($tpl);
         $this->validateName($options['bundle']);
         $this->validateName($options['controller']);
@@ -80,7 +80,7 @@ protected function findTemplate($name)
                     $this->logger->info(sprintf('Loaded template file "%s"', $file));
                 }
 
-                return $file;
+                return $this->cache[$name] = $file;
             }
 
             if (null !== $this->logger) {

Original file line number	Diff line number	Diff line change
`@@ -52,15 +52,15 @@ public function setPaths($paths)`
`52`	`52`
`53`	`53`	`protected function findTemplate($name)`
`54`	`54`	`{`
`55`		`- list($tpl, $options) = $this->nameParser->parse($name);`
`56`		`-`
`57`	`55`	`// normalize name`
`58`		`- $tpl = preg_replace('#/{2,}#', '/', strtr($tpl, '\\', '/'));`
	`56`	`+ $name = str_replace(':/' , ':', preg_replace('#/{2,}#', '/', strtr($name, '\\', '/')));`
`59`	`57`
`60`		`- if (isset($this->cache[$tpl])) {`
`61`		`- return $this->cache[$tpl];`
	`58`	`+ if (isset($this->cache[$name])) {`
	`59`	`+ return $this->cache[$name];`
`62`	`60`	`}`
`63`	`61`
	`62`	`+ list($tpl, $options) = $this->nameParser->parse($name);`
	`63`	`+`
`64`	`64`	`$this->validateName($tpl);`
`65`	`65`	`$this->validateName($options['bundle']);`
`66`	`66`	`$this->validateName($options['controller']);`
`@@ -80,7 +80,7 @@ protected function findTemplate($name)`
`80`	`80`	`$this->logger->info(sprintf('Loaded template file "%s"', $file));`
`81`	`81`	`}`
`82`	`82`
`83`		`- return $file;`
	`83`	`+ return $this->cache[$name] = $file;`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`if (null !== $this->logger) {`