makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[feature/twig] Going back to Twig's handling of cache file names for now

Browse source 
My method was not working correctly, will work on it more later.

PHPBB3-11598
This commit is contained in:
Nathaniel Guse 2013-06-25 19:24:32 -05:00
parent 7a9aec5fda
commit 6c771a38de
2 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
phpBB/includes/template/twig/environment.php
View file

@ -45,15 +45,27 @@ class phpbb_template_twig_environment extends Twig_Environment
* *
* @return string The cache file name * @return string The cache file name
*/ */
public function getCacheFilename($name) public function ignoregetCacheFilename($name)
{ {
if (false === $this->cache) { if (false === $this->cache) {
return false; return false;
} }
// @todo
$file_path = $this->getLoader()->getCacheKey($name);
foreach ($this->getLoader()->getNamespaces() as $namespace)
{
foreach ($this->getLoader()->getPaths($namespace) as $path)
{
if (strpos($file_path, $path) === 0)
{
//return $this->getCache() . '/' . preg_replace('#[^a-zA-Z0-9_/]#', '_', $namespace . '/' . $name) . '.php';
}
}
}
// @todo correct cache file name handling // We probably should never get here under normal circumstances
return $this->getCache() . '/' . preg_replace('#[^a-zA-Z0-9_/]#', '_', $name) . '.php'; return $this->getCache() . '/' . preg_replace('#[^a-zA-Z0-9_/]#', '_', $name) . '.php';
return $this->getCache() . '/' . preg_replace('#[^a-zA-Z0-9_/]#', '_', $name) . '_' . md5($this->getLoader()->getCacheKey($name)) . '.php';
} }
/** /**

2
tests/template/template_test_case.php
View file

@ -82,7 +82,7 @@ class phpbb_template_template_test_case extends phpbb_test_case
protected function tearDown() protected function tearDown()
{ {
$this->template->clear_cache(); //$this->template->clear_cache();
} }
protected function run_template($file, array $vars, array $block_vars, array $destroy, $expected) protected function run_template($file, array $vars, array $block_vars, array $destroy, $expected)