Refactored all _runtime_* by merging them into the proper classes or by transforming them into Runtime Extensions.

This commit is contained in:
Simon Wisselink
2022-12-22 15:43:20 +01:00
parent cfd8c08d09
commit d88175de3e
41 changed files with 1571 additions and 1911 deletions

View File

@@ -71,7 +71,7 @@ abstract class Base
*
* @return boolean success
*/
abstract public function writeCachedContent(Smarty_Internal_Template $_template, $content);
abstract public function storeCachedContent(Smarty_Internal_Template $_template, $content);
/**
* Read cached template from cache
@@ -80,7 +80,7 @@ abstract class Base
*
* @return string content
*/
abstract public function readCachedContent(Smarty_Internal_Template $_template);
abstract public function retrieveCachedContent(Smarty_Internal_Template $_template);
/**
* Return cached content

View File

@@ -9,7 +9,7 @@ namespace Smarty\Cacheresource;
* @subpackage Cacher
*/
use Smarty\Cacheresource\Base;
use Smarty_Internal_Template;
/**
* Cache Handler API
@@ -171,7 +171,7 @@ abstract class Custom extends Base
*
* @return boolean success
*/
public function writeCachedContent(Smarty_Internal_Template $_template, $content)
public function storeCachedContent(Smarty_Internal_Template $_template, $content)
{
return $this->save(
$_template->cached->filepath,
@@ -190,7 +190,7 @@ abstract class Custom extends Base
*
* @return string|boolean content
*/
public function readCachedContent(Smarty_Internal_Template $_template)
public function retrieveCachedContent(Smarty_Internal_Template $_template)
{
$content = $_template->cached->content ?: null;
if ($content === null) {

View File

@@ -124,14 +124,9 @@ class File extends Base
* @return bool success
* @throws \SmartyException
*/
public function writeCachedContent(Smarty_Internal_Template $_template, $content)
public function storeCachedContent(Smarty_Internal_Template $_template, $content)
{
if ($_template->smarty->ext->_writeFile->writeFile(
$_template->cached->filepath,
$content,
$_template->smarty
) === true
) {
if ($_template->smarty->writeFile($_template->cached->filepath, $content) === true) {
if (function_exists('opcache_invalidate')
&& (!function_exists('ini_get') || strlen(ini_get('opcache.restrict_api'))) < 1
) {
@@ -156,7 +151,7 @@ class File extends Base
*
* @return string content
*/
public function readCachedContent(Smarty_Internal_Template $_template)
public function retrieveCachedContent(Smarty_Internal_Template $_template)
{
if (is_file($_template->cached->filepath)) {
return file_get_contents($_template->cached->filepath);
@@ -174,7 +169,7 @@ class File extends Base
*/
public function clearAll(Smarty $smarty, $exp_time = null)
{
return $smarty->ext->_cacheResourceFile->clear($smarty, null, null, null, $exp_time);
return $this->clear($smarty, null, null, null, $exp_time);
}
/**
@@ -190,7 +185,113 @@ class File extends Base
*/
public function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $exp_time)
{
return $smarty->ext->_cacheResourceFile->clear($smarty, $resource_name, $cache_id, $compile_id, $exp_time);
$_cache_id = isset($cache_id) ? preg_replace('![^\w\|]+!', '_', $cache_id) : null;
$_compile_id = isset($compile_id) ? preg_replace('![^\w]+!', '_', $compile_id) : null;
$_dir_sep = $smarty->use_sub_dirs ? '/' : '^';
$_compile_id_offset = $smarty->use_sub_dirs ? 3 : 0;
$_dir = $smarty->getCacheDir();
if ($_dir === '/') { //We should never want to delete this!
return 0;
}
$_dir_length = strlen($_dir);
if (isset($_cache_id)) {
$_cache_id_parts = explode('|', $_cache_id);
$_cache_id_parts_count = count($_cache_id_parts);
if ($smarty->use_sub_dirs) {
foreach ($_cache_id_parts as $id_part) {
$_dir .= $id_part . '/';
}
}
}
if (isset($resource_name)) {
$_save_stat = $smarty->caching;
$smarty->caching = \Smarty\Smarty::CACHING_LIFETIME_CURRENT;
$tpl = new $smarty->template_class($resource_name, $smarty);
$smarty->caching = $_save_stat;
// remove from template cache
$tpl->source; // have the template registered before unset()
if ($tpl->source->exists) {
$_resourcename_parts = basename(str_replace('^', '/', $tpl->cached->filepath));
} else {
return 0;
}
}
$_count = 0;
$_time = time();
if (file_exists($_dir)) {
$_cacheDirs = new RecursiveDirectoryIterator($_dir);
$_cache = new RecursiveIteratorIterator($_cacheDirs, RecursiveIteratorIterator::CHILD_FIRST);
foreach ($_cache as $_file) {
if (substr(basename($_file->getPathname()), 0, 1) === '.') {
continue;
}
$_filepath = (string)$_file;
// directory ?
if ($_file->isDir()) {
if (!$_cache->isDot()) {
// delete folder if empty
@rmdir($_file->getPathname());
}
} else {
// delete only php files
if (substr($_filepath, -4) !== '.php') {
continue;
}
$_parts = explode($_dir_sep, str_replace('\\', '/', substr($_filepath, $_dir_length)));
$_parts_count = count($_parts);
// check name
if (isset($resource_name)) {
if ($_parts[ $_parts_count - 1 ] !== $_resourcename_parts) {
continue;
}
}
// check compile id
if (isset($_compile_id) && (!isset($_parts[ $_parts_count - 2 - $_compile_id_offset ])
|| $_parts[ $_parts_count - 2 - $_compile_id_offset ] !== $_compile_id)
) {
continue;
}
// check cache id
if (isset($_cache_id)) {
// count of cache id parts
$_parts_count = (isset($_compile_id)) ? $_parts_count - 2 - $_compile_id_offset :
$_parts_count - 1 - $_compile_id_offset;
if ($_parts_count < $_cache_id_parts_count) {
continue;
}
for ($i = 0; $i < $_cache_id_parts_count; $i++) {
if ($_parts[ $i ] !== $_cache_id_parts[ $i ]) {
continue 2;
}
}
}
if (is_file($_filepath)) {
// expired ?
if (isset($exp_time)) {
if ($exp_time < 0) {
preg_match('#\'cache_lifetime\' =>\s*(\d*)#', file_get_contents($_filepath), $match);
if ($_time < (filemtime($_filepath) + $match[ 1 ])) {
continue;
}
} else {
if ($_time - filemtime($_filepath) < $exp_time) {
continue;
}
}
}
$_count += @unlink($_filepath) ? 1 : 0;
if (function_exists('opcache_invalidate')
&& (!function_exists('ini_get') || strlen(ini_get("opcache.restrict_api")) < 1)
) {
opcache_invalidate($_filepath, true);
} elseif (function_exists('apc_delete_file')) {
apc_delete_file($_filepath);
}
}
}
}
}
return $_count;
}
/**

View File

@@ -140,7 +140,7 @@ abstract class KeyValueStore extends Base
*
* @return boolean success
*/
public function writeCachedContent(Smarty_Internal_Template $_template, $content)
public function storeCachedContent(Smarty_Internal_Template $_template, $content)
{
$this->addMetaTimestamp($content);
return $this->write(array($_template->cached->filepath => $content), $_template->cache_lifetime);
@@ -153,7 +153,7 @@ abstract class KeyValueStore extends Base
*
* @return string|false content
*/
public function readCachedContent(Smarty_Internal_Template $_template)
public function retrieveCachedContent(Smarty_Internal_Template $_template)
{
$content = $_template->cached->content ? $_template->cached->content : null;
$timestamp = null;