geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-16 12:26:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed two edge case bug in the filesystem loader

Browse Source 
* fixed caching when two templates have the same template name but a different namespace
* fixed the error message when a template has a namespace
This commit is contained in:
Fabien Potencier
2013-08-05 18:00:03 +02:00
parent 7c1ce36f87
commit f888818fd4
2 changed files with 34 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Twig/Loader/Filesystem.php
+4 -4
View File
@@ -179,14 +179,14 @@ class Twig_Loader_Filesystem implements Twig_LoaderInterface, Twig_ExistsLoaderI
$this->validateName($name);
$namespace = self::MAIN_NAMESPACE;
$shortname = $name;
if (isset($name[0]) && '@' == $name[0]) {
if (false === $pos = strpos($name, '/')) {
throw new Twig_Error_Loader(sprintf('Malformed namespaced template name "%s" (expecting "@namespace/template_name").', $name));
}
$namespace = substr($name, 1, $pos - 1);
$name = substr($name, $pos + 1);
$shortname = substr($name, $pos + 1);
}
if (!isset($this->paths[$namespace])) {
@@ -194,8 +194,8 @@ class Twig_Loader_Filesystem implements Twig_LoaderInterface, Twig_ExistsLoaderI
}
foreach ($this->paths[$namespace] as $path) {
if (is_file($path.'/'.$name)) {
return $this->cache[$name] = $path.'/'.$name;
if (is_file($path.'/'.$shortname)) {
return $this->cache[$name] = $path.'/'.$shortname;
}
}
test/Twig/Tests/Loader/FilesystemTest.php
+30
View File
@@ -94,4 +94,34 @@ class Twig_Tests_Loader_FilesystemTest extends PHPUnit_Framework_TestCase
$loader->addPath(sys_get_temp_dir(), 'named');
$this->assertEquals(array(Twig_Loader_Filesystem::MAIN_NAMESPACE, 'named'), $loader->getNamespaces());
}
public function testFindTemplateExceptionNamespace()
{
$basePath = dirname(__FILE__).'/Fixtures';
$loader = new Twig_Loader_Filesystem(array($basePath.'/normal'));
$loader->addPath($basePath.'/named', 'named');
try {
$loader->getSource('@named/nowhere.html');
} catch (Exception $e) {
$this->assertInstanceof('Twig_Error_Loader', $e);
$this->assertContains('Unable to find template "@named/nowhere.html"', $e->getMessage());
}
}
public function testFindTemplateWithCache()
{
$basePath = dirname(__FILE__).'/Fixtures';
$loader = new Twig_Loader_Filesystem(array($basePath.'/normal'));
$loader->addPath($basePath.'/named', 'named');
// prime the cache for index.html in the named namespace
$namedSource = $loader->getSource('@named/index.html');
$this->assertEquals("named path\n", $namedSource);
// get index.html from the main namespace
$this->assertEquals("path\n", $loader->getSource('index.html'));
}
}