Skip to content

Fix static analysis warnings for isDot() and remove deprecated APC support #1164

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wisskid merged 3 commits into from
Jan 8, 2026
Merged

Fix static analysis warnings for isDot() and remove deprecated APC support #1164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
262a4d5
Fix static analysis warnings for isDot()
h-marumoto Jan 7, 2026
8435e15
Remove deprecated APC support
h-marumoto Jan 7, 2026
019c48f
Remove redundant isDot() check and fix static analysis warnings
h-marumoto Jan 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions src/Cacheresource/File.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,6 @@ public function storeCachedContent(Template $_template, $content)
&& (!function_exists('ini_get') || strlen(ini_get('opcache.restrict_api'))) < 1
) {
opcache_invalidate($_template->getCached()->filepath, true);
} elseif (function_exists('apc_compile_file')) {
apc_compile_file($_template->getCached()->filepath);
}
$cached = $_template->getCached();
$cached->timestamp = $cached->exists = is_file($cached->filepath);
Expand Down Expand Up @@ -223,10 +221,8 @@ public function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $e
$_filepath = (string)$_file;
// directory ?
if ($_file->isDir()) {
if (!$_cache->isDot()) {
// delete folder if empty
@rmdir($_file->getPathname());
}
// delete folder if empty
@rmdir($_file->getPathname());
} else {
// delete only php files
if (substr($_filepath, -4) !== '.php') {
Expand Down Expand Up @@ -279,8 +275,6 @@ public function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $e
&& (!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);
}
}
}
Expand Down
8 changes: 2 additions & 6 deletions src/Smarty.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1344,10 +1344,8 @@ public function clearCompiledTemplate($resource_name = null, $compile_id = null,
}
$_filepath = (string)$_file;
if ($_file->isDir()) {
if (!$_compile->isDot()) {
// delete folder if empty
@rmdir($_file->getPathname());
}
// delete folder if empty
@rmdir($_file->getPathname());
} else {
// delete only php files
if (substr($_filepath, -4) !== '.php') {
Expand Down Expand Up @@ -1385,8 +1383,6 @@ public function clearCompiledTemplate($resource_name = null, $compile_id = null,
&& (!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);
}
}
}
Expand Down
2 changes: 0 additions & 2 deletions src/Template/Compiled.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,8 +251,6 @@ private function loadCompiledTemplate(Template $_smarty_tpl, bool $invalidateCac
&& (!function_exists('ini_get') || strlen(ini_get("opcache.restrict_api")) < 1)
) {
opcache_invalidate($this->filepath, true);
} elseif (function_exists('apc_compile_file')) {
apc_compile_file($this->filepath);
}
}
if (defined('HHVM_VERSION')) {
Expand Down
6 changes: 2 additions & 4 deletions tests/PHPUnit_Smarty.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,10 +291,8 @@ public function cleanDir($dir)
}
// directory ?
if ($file->isDir()) {
if (!$ri->isDot()) {
// delete folder if empty
@rmdir($file->getPathname());
}
// delete folder if empty
@rmdir($file->getPathname());
} else {
unlink($file->getPathname());
}
Expand Down
31 changes: 0 additions & 31 deletions tests/UnitTests/CacheResourceTests/Apc/CacheResourceCustomApcTest.php
View file
Open in desktop

This file was deleted.

33 changes: 0 additions & 33 deletions tests/UnitTests/CacheResourceTests/_shared/PHPunitplugins/cacheresource.apctest.php
View file
Open in desktop

This file was deleted.

73 changes: 0 additions & 73 deletions tests/UnitTests/__shared/cacheresources/cacheresource.apc.php
View file
Open in desktop

This file was deleted.