geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-15 20:06:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

bug #1785 Faster filesystem loader master (fabpot)

Browse Source 
This PR was merged into the 2.0-dev branch.

Discussion
----------

Faster filesystem loader master

We need to keep calling `findTemplate()` for all methods to keep BC.

Commits
-------

3da99ce removed BC break in filesystem loader
638eedb Revert "removed an unneeded protected method"
This commit is contained in:
Fabien Potencier
2015-08-22 17:48:43 +02:00
parent 3a62bb3f49 3da99ce98b
commit 34666ee7c2
1 changed files with 51 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Twig/Loader/Filesystem.php
+51 -31
View File
@@ -150,37 +150,11 @@ class Twig_Loader_Filesystem implements Twig_LoaderInterface
return true;
}
if (isset($this->errorCache[$name])) {
try {
return false !== $this->findTemplate($name, false);
} catch (Twig_Error_Loader $exception) {
return false;
}
$this->validateName($name);
list($namespace, $shortname) = $this->parseName($name);
if (!isset($this->paths[$namespace])) {
$this->errorCache[$name] = sprintf('There are no registered paths for namespace "%s".', $namespace);
return false;
}
foreach ($this->paths[$namespace] as $path) {
if (is_file($path.'/'.$shortname)) {
if (false !== $realpath = realpath($path.'/'.$shortname)) {
$this->cache[$name] = $realpath;
return true;
}
$this->cache[$name] = $path.'/'.$shortname;
return true;
}
}
$this->errorCache[$name] = sprintf('Unable to find template "%s" (looked into: %s).', $name, implode(', ', $this->paths[$namespace]));
return false;
}
/**
@@ -191,14 +165,60 @@ class Twig_Loader_Filesystem implements Twig_LoaderInterface
return filemtime($this->findTemplate($name)) <= $time;
}
protected function findTemplate($name)
/**
* Checks if the template can be found.
*
* @param string $name The template name
* @param Boolean $throw Whether to throw an exception when an error occurs
*
* @return string|false The template name or false
*/
protected function findTemplate($name, $throw = true)
{
$name = $this->normalizeName($name);
if ($this->exists($name)) {
if (isset($this->cache[$name])) {
return $this->cache[$name];
}
if (isset($this->errorCache[$name])) {
if (!$throw) {
return false;
}
throw new Twig_Error_Loader($this->errorCache[$name]);
}
$this->validateName($name);
list($namespace, $shortname) = $this->parseName($name);
if (!isset($this->paths[$namespace])) {
$this->errorCache[$name] = sprintf('There are no registered paths for namespace "%s".', $namespace);
if (!$throw) {
return false;
}
throw new Twig_Error_Loader($this->errorCache[$name]);
}
foreach ($this->paths[$namespace] as $path) {
if (is_file($path.'/'.$shortname)) {
if (false !== $realpath = realpath($path.'/'.$shortname)) {
return $this->cache[$name] = $realpath;
}
return $this->cache[$name] = $path.'/'.$shortname;
}
}
$this->errorCache[$name] = sprintf('Unable to find template "%s" (looked into: %s).', $name, implode(', ', $this->paths[$namespace]));
if (!$throw) {
return false;
}
throw new Twig_Error_Loader($this->errorCache[$name]);
}