From 4efa427a872ad51571d3d2b2c3122fafbf3386d2 Mon Sep 17 00:00:00 2001 From: Simon Wisselink Date: Wed, 27 Mar 2024 22:53:03 +0100 Subject: [PATCH] Fix missing and bogus use lines in src/Smarty.php. (#970) --- changelog/966.md | 1 + src/Smarty.php | 26 ++++++++++++++------------ 2 files changed, 15 insertions(+), 12 deletions(-) create mode 100644 changelog/966.md diff --git a/changelog/966.md b/changelog/966.md new file mode 100644 index 000000000..5332ce59c --- /dev/null +++ b/changelog/966.md @@ -0,0 +1 @@ +- Fix error in Smarty\Smarty::compileAllTemplates() by including missing FilesystemIterator class [#966](https://github.com/smarty-php/smarty/issues/966) \ No newline at end of file diff --git a/src/Smarty.php b/src/Smarty.php index 6925d4060..0f6ee0ce7 100644 --- a/src/Smarty.php +++ b/src/Smarty.php @@ -2,6 +2,7 @@ namespace Smarty; +use FilesystemIterator; use RecursiveDirectoryIterator; use RecursiveIteratorIterator; use Smarty\Cacheresource\File; @@ -12,11 +13,12 @@ use Smarty\Extension\DefaultExtension; use Smarty\Extension\ExtensionInterface; use Smarty\Filter\Output\TrimWhitespace; -use Smarty\Resource\BasePlugin; -use Smarty\Smarty\Runtime\CaptureRuntime; -use Smarty\Smarty\Runtime\ForeachRuntime; -use Smarty\Smarty\Runtime\InheritanceRuntime; -use Smarty\Smarty\Runtime\TplFunctionRuntime; +use Smarty\Runtime\CaptureRuntime; +use Smarty\Runtime\DefaultPluginHandlerRuntime; +use Smarty\Runtime\ForeachRuntime; +use Smarty\Runtime\InheritanceRuntime; +use Smarty\Runtime\TplFunctionRuntime; + /** * Project: Smarty: the PHP compiling template engine @@ -1755,15 +1757,15 @@ public function getRuntime(string $type) { // Lazy load runtimes when/if needed switch ($type) { case 'Capture': - return $this->runtimes[$type] = new \Smarty\Runtime\CaptureRuntime(); + return $this->runtimes[$type] = new CaptureRuntime(); case 'Foreach': - return $this->runtimes[$type] = new \Smarty\Runtime\ForeachRuntime(); + return $this->runtimes[$type] = new ForeachRuntime(); case 'Inheritance': - return $this->runtimes[$type] = new \Smarty\Runtime\InheritanceRuntime(); + return $this->runtimes[$type] = new InheritanceRuntime(); case 'TplFunction': - return $this->runtimes[$type] = new \Smarty\Runtime\TplFunctionRuntime(); + return $this->runtimes[$type] = new TplFunctionRuntime(); case 'DefaultPluginHandler': - return $this->runtimes[$type] = new \Smarty\Runtime\DefaultPluginHandlerRuntime( + return $this->runtimes[$type] = new DefaultPluginHandlerRuntime( $this->getDefaultPluginHandlerFunc() ); } @@ -2052,7 +2054,7 @@ public function unregisterFilter($type, $name) { * @param array|string $modifiers modifier or list of modifiers * to add * - * @return \Smarty|Template + * @return Smarty * @api Smarty::addDefaultModifiers() * */ @@ -2131,7 +2133,7 @@ public function fetch($template = null, $cache_id = null, $compile_id = null) { * @throws \Smarty\Exception */ public function display($template = null, $cache_id = null, $compile_id = null) { - return $this->returnOrCreateTemplate($template, $cache_id, $compile_id)->display(); + $this->returnOrCreateTemplate($template, $cache_id, $compile_id)->display(); } /**