From b78b2add5d351ed32e89b8b861ef53316d6b225f Mon Sep 17 00:00:00 2001 From: Frank Hochmuth Date: Fri, 16 Oct 2026 01:34:01 +0200 Subject: [PATCH] Update to Smarty 5.8.5 --- .dist/phpstan.neon.dist | 8 ++-- CHANGELOG.md | 2 +- .../{smarty-5.8.4 => smarty-5.8.5}/AGENTS.md | 0 .../CHANGELOG.md | 4 ++ .../CONTRIBUTING.md | 0 .../{smarty-5.8.4 => smarty-5.8.5}/LICENSE | 0 .../{smarty-5.8.4 => smarty-5.8.5}/Makefile | 0 .../{smarty-5.8.4 => smarty-5.8.5}/README.md | 0 .../SECURITY.md | 5 +- .../{smarty-5.8.4 => smarty-5.8.5}/TODO.txt | 0 .../composer.json | 0 .../libs/Smarty.class.php | 0 .../{smarty-5.8.4 => smarty-5.8.5}/mkdocs.yml | 0 .../run-tests-for-all-php-versions.sh | 7 +-- .../run-tests.sh | 5 +- .../src/BlockHandler/Base.php | 0 .../BlockHandler/BlockHandlerInterface.php | 0 .../src/BlockHandler/BlockPluginWrapper.php | 0 .../src/BlockHandler/TextFormat.php | 0 .../src/Cacheresource/Base.php | 0 .../src/Cacheresource/Custom.php | 0 .../src/Cacheresource/File.php | 0 .../src/Cacheresource/KeyValueStore.php | 0 .../src/Compile/AttributeCompiler.php | 0 .../src/Compile/Base.php | 0 .../src/Compile/BlockCompiler.php | 0 .../src/Compile/CompilerInterface.php | 0 .../Compile/DefaultHandlerBlockCompiler.php | 0 .../DefaultHandlerFunctionCallCompiler.php | 0 .../src/Compile/FunctionCallCompiler.php | 0 .../src/Compile/Modifier/BCPluginWrapper.php | 0 .../src/Compile/Modifier/Base.php | 0 .../Compile/Modifier/CatModifierCompiler.php | 0 .../CountCharactersModifierCompiler.php | 0 .../CountParagraphsModifierCompiler.php | 0 .../CountSentencesModifierCompiler.php | 0 .../Modifier/CountWordsModifierCompiler.php | 0 .../Modifier/DefaultModifierCompiler.php | 0 .../Modifier/EmptyModifierCompiler.php | 0 .../Modifier/EscapeModifierCompiler.php | 0 .../Modifier/FromCharsetModifierCompiler.php | 0 .../Modifier/IndentModifierCompiler.php | 0 .../Modifier/IsArrayModifierCompiler.php | 0 .../Modifier/IssetModifierCompiler.php | 0 .../Modifier/JsonEncodeModifierCompiler.php | 0 .../Modifier/LowerModifierCompiler.php | 0 .../Modifier/ModifierCompilerInterface.php | 0 .../Modifier/Nl2brModifierCompiler.php | 0 .../Modifier/NoPrintModifierCompiler.php | 0 .../Compile/Modifier/RawModifierCompiler.php | 0 .../Modifier/RoundModifierCompiler.php | 0 .../Modifier/StrRepeatModifierCompiler.php | 0 .../Modifier/StringFormatModifierCompiler.php | 0 .../Modifier/StripModifierCompiler.php | 0 .../Modifier/StripTagsModifierCompiler.php | 0 .../Modifier/StrlenModifierCompiler.php | 0 .../Modifier/SubstrModifierCompiler.php | 0 .../Modifier/ToCharsetModifierCompiler.php | 0 .../Modifier/UnescapeModifierCompiler.php | 0 .../Modifier/UpperModifierCompiler.php | 0 .../Modifier/WordWrapModifierCompiler.php | 0 .../src/Compile/ModifierCompiler.php | 0 .../src/Compile/ObjectMethodBlockCompiler.php | 0 .../src/Compile/ObjectMethodCallCompiler.php | 0 .../src/Compile/PrintExpressionCompiler.php | 0 .../src/Compile/SpecialVariableCompiler.php | 0 .../src/Compile/Tag/Append.php | 0 .../src/Compile/Tag/Assign.php | 0 .../src/Compile/Tag/BCPluginWrapper.php | 0 .../src/Compile/Tag/Block.php | 0 .../src/Compile/Tag/BlockClose.php | 0 .../src/Compile/Tag/BreakTag.php | 0 .../src/Compile/Tag/Call.php | 0 .../src/Compile/Tag/Capture.php | 0 .../src/Compile/Tag/CaptureClose.php | 0 .../src/Compile/Tag/ConfigLoad.php | 0 .../src/Compile/Tag/ContinueTag.php | 0 .../src/Compile/Tag/Debug.php | 0 .../src/Compile/Tag/ElseIfTag.php | 0 .../src/Compile/Tag/ElseTag.php | 0 .../src/Compile/Tag/EvalTag.php | 0 .../src/Compile/Tag/ExtendsTag.php | 0 .../src/Compile/Tag/ForClose.php | 0 .../src/Compile/Tag/ForElse.php | 0 .../src/Compile/Tag/ForTag.php | 0 .../src/Compile/Tag/ForeachClose.php | 0 .../src/Compile/Tag/ForeachElse.php | 0 .../src/Compile/Tag/ForeachSection.php | 0 .../src/Compile/Tag/ForeachTag.php | 0 .../src/Compile/Tag/FunctionClose.php | 0 .../src/Compile/Tag/FunctionTag.php | 0 .../src/Compile/Tag/IfClose.php | 0 .../src/Compile/Tag/IfTag.php | 0 .../src/Compile/Tag/IncludeTag.php | 0 .../src/Compile/Tag/Inheritance.php | 0 .../src/Compile/Tag/Ldelim.php | 0 .../src/Compile/Tag/Nocache.php | 0 .../src/Compile/Tag/NocacheClose.php | 0 .../src/Compile/Tag/Rdelim.php | 0 .../src/Compile/Tag/Section.php | 0 .../src/Compile/Tag/SectionClose.php | 0 .../src/Compile/Tag/SectionElse.php | 0 .../src/Compile/Tag/Setfilter.php | 0 .../src/Compile/Tag/SetfilterClose.php | 0 .../src/Compile/Tag/WhileClose.php | 0 .../src/Compile/Tag/WhileTag.php | 0 .../src/Compiler/BaseCompiler.php | 0 .../src/Compiler/CodeFrame.php | 0 .../src/Compiler/Configfile.php | 0 .../src/Compiler/Template.php | 0 .../src/CompilerException.php | 0 .../src/Data.php | 0 .../src/Debug.php | 0 .../src/ErrorHandler.php | 0 .../src/Exception.php | 0 .../src/Extension/BCPluginsAdapter.php | 0 .../src/Extension/Base.php | 0 .../src/Extension/CallbackWrapper.php | 0 .../src/Extension/CoreExtension.php | 0 .../src/Extension/DefaultExtension.php | 0 .../src/Extension/ExtensionInterface.php | 0 .../src/Filter/FilterInterface.php | 0 .../src/Filter/FilterPluginWrapper.php | 0 .../src/Filter/Output/TrimWhitespace.php | 0 .../src/FunctionHandler/AttributeBase.php | 0 .../AttributeFunctionHandlerInterface.php | 0 .../src/FunctionHandler/BCPluginWrapper.php | 0 .../src/FunctionHandler/Base.php | 0 .../src/FunctionHandler/Count.php | 0 .../src/FunctionHandler/Counter.php | 0 .../src/FunctionHandler/Cycle.php | 0 .../src/FunctionHandler/Fetch.php | 0 .../FunctionHandlerInterface.php | 0 .../src/FunctionHandler/HtmlBase.php | 0 .../src/FunctionHandler/HtmlCheckboxes.php | 0 .../src/FunctionHandler/HtmlImage.php | 0 .../src/FunctionHandler/HtmlOptions.php | 0 .../src/FunctionHandler/HtmlRadios.php | 0 .../src/FunctionHandler/HtmlSelectDate.php | 0 .../src/FunctionHandler/HtmlSelectTime.php | 0 .../src/FunctionHandler/HtmlTable.php | 0 .../src/FunctionHandler/Mailto.php | 0 .../src/FunctionHandler/Math.php | 0 .../src/Lexer/ConfigfileLexer.php | 0 .../src/Lexer/ConfigfileLexer.plex | 0 .../src/Lexer/TemplateLexer.php | 0 .../src/Lexer/TemplateLexer.plex | 0 .../src/ParseTree/Base.php | 0 .../src/ParseTree/Code.php | 0 .../src/ParseTree/Dq.php | 0 .../src/ParseTree/DqContent.php | 0 .../src/ParseTree/Tag.php | 0 .../src/ParseTree/Template.php | 0 .../src/ParseTree/Text.php | 0 .../src/Parser/ConfigfileParser.php | 0 .../src/Parser/ConfigfileParser.y | 0 .../src/Parser/TemplateParser.php | 0 .../src/Parser/TemplateParser.y | 0 .../src/Resource/BasePlugin.php | 0 .../src/Resource/CustomPlugin.php | 0 .../src/Resource/ExtendsPlugin.php | 0 .../src/Resource/FilePlugin.php | 0 .../src/Resource/RecompiledPlugin.php | 0 .../src/Resource/StreamPlugin.php | 0 .../src/Resource/StringEval.php | 0 .../src/Resource/StringPlugin.php | 0 .../src/Runtime/Block.php | 0 .../src/Runtime/CaptureRuntime.php | 0 .../Runtime/DefaultPluginHandlerRuntime.php | 0 .../src/Runtime/ForeachRuntime.php | 0 .../src/Runtime/InheritanceRuntime.php | 0 .../src/Runtime/TplFunctionRuntime.php | 0 .../src/Security.php | 0 .../src/Smarty.php | 2 +- .../src/Template.php | 2 +- .../src/Template/Cached.php | 46 +++++++++++++------ .../src/Template/Compiled.php | 0 .../src/Template/Config.php | 0 .../src/Template/GeneratedPhpFile.php | 0 .../src/Template/Source.php | 0 .../src/TemplateBase.php | 0 .../src/TestInstall.php | 0 .../src/UndefinedVariable.php | 0 .../src/Variable.php | 0 .../src/debug.tpl | 0 .../src/functions.php | 0 186 files changed, 54 insertions(+), 27 deletions(-) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/AGENTS.md (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/CHANGELOG.md (99%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/CONTRIBUTING.md (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/LICENSE (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/Makefile (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/README.md (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/SECURITY.md (63%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/TODO.txt (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/composer.json (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/libs/Smarty.class.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/mkdocs.yml (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/run-tests-for-all-php-versions.sh (70%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/run-tests.sh (61%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/BlockHandler/Base.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/BlockHandler/BlockHandlerInterface.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/BlockHandler/BlockPluginWrapper.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/BlockHandler/TextFormat.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Cacheresource/Base.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Cacheresource/Custom.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Cacheresource/File.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Cacheresource/KeyValueStore.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/AttributeCompiler.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/Base.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/BlockCompiler.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/CompilerInterface.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/DefaultHandlerBlockCompiler.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/DefaultHandlerFunctionCallCompiler.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/FunctionCallCompiler.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/Modifier/BCPluginWrapper.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/Modifier/Base.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/Modifier/CatModifierCompiler.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/Modifier/CountCharactersModifierCompiler.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/Modifier/CountParagraphsModifierCompiler.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/Modifier/CountSentencesModifierCompiler.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/Modifier/CountWordsModifierCompiler.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/Modifier/DefaultModifierCompiler.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/Modifier/EmptyModifierCompiler.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/Modifier/EscapeModifierCompiler.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/Modifier/FromCharsetModifierCompiler.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/Modifier/IndentModifierCompiler.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/Modifier/IsArrayModifierCompiler.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/Modifier/IssetModifierCompiler.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/Modifier/JsonEncodeModifierCompiler.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/Modifier/LowerModifierCompiler.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/Modifier/ModifierCompilerInterface.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/Modifier/Nl2brModifierCompiler.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/Modifier/NoPrintModifierCompiler.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/Modifier/RawModifierCompiler.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/Modifier/RoundModifierCompiler.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/Modifier/StrRepeatModifierCompiler.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/Modifier/StringFormatModifierCompiler.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/Modifier/StripModifierCompiler.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/Modifier/StripTagsModifierCompiler.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/Modifier/StrlenModifierCompiler.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/Modifier/SubstrModifierCompiler.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/Modifier/ToCharsetModifierCompiler.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/Modifier/UnescapeModifierCompiler.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/Modifier/UpperModifierCompiler.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/Modifier/WordWrapModifierCompiler.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/ModifierCompiler.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/ObjectMethodBlockCompiler.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/ObjectMethodCallCompiler.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/PrintExpressionCompiler.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/SpecialVariableCompiler.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/Tag/Append.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/Tag/Assign.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/Tag/BCPluginWrapper.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/Tag/Block.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/Tag/BlockClose.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/Tag/BreakTag.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/Tag/Call.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/Tag/Capture.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/Tag/CaptureClose.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/Tag/ConfigLoad.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/Tag/ContinueTag.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/Tag/Debug.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/Tag/ElseIfTag.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/Tag/ElseTag.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/Tag/EvalTag.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/Tag/ExtendsTag.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/Tag/ForClose.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/Tag/ForElse.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/Tag/ForTag.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/Tag/ForeachClose.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/Tag/ForeachElse.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/Tag/ForeachSection.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/Tag/ForeachTag.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/Tag/FunctionClose.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/Tag/FunctionTag.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/Tag/IfClose.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/Tag/IfTag.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/Tag/IncludeTag.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/Tag/Inheritance.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/Tag/Ldelim.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/Tag/Nocache.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/Tag/NocacheClose.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/Tag/Rdelim.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/Tag/Section.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/Tag/SectionClose.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/Tag/SectionElse.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/Tag/Setfilter.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/Tag/SetfilterClose.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/Tag/WhileClose.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compile/Tag/WhileTag.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compiler/BaseCompiler.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compiler/CodeFrame.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compiler/Configfile.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Compiler/Template.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/CompilerException.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Data.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Debug.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/ErrorHandler.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Exception.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Extension/BCPluginsAdapter.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Extension/Base.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Extension/CallbackWrapper.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Extension/CoreExtension.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Extension/DefaultExtension.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Extension/ExtensionInterface.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Filter/FilterInterface.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Filter/FilterPluginWrapper.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Filter/Output/TrimWhitespace.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/FunctionHandler/AttributeBase.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/FunctionHandler/AttributeFunctionHandlerInterface.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/FunctionHandler/BCPluginWrapper.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/FunctionHandler/Base.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/FunctionHandler/Count.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/FunctionHandler/Counter.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/FunctionHandler/Cycle.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/FunctionHandler/Fetch.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/FunctionHandler/FunctionHandlerInterface.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/FunctionHandler/HtmlBase.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/FunctionHandler/HtmlCheckboxes.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/FunctionHandler/HtmlImage.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/FunctionHandler/HtmlOptions.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/FunctionHandler/HtmlRadios.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/FunctionHandler/HtmlSelectDate.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/FunctionHandler/HtmlSelectTime.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/FunctionHandler/HtmlTable.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/FunctionHandler/Mailto.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/FunctionHandler/Math.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Lexer/ConfigfileLexer.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Lexer/ConfigfileLexer.plex (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Lexer/TemplateLexer.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Lexer/TemplateLexer.plex (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/ParseTree/Base.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/ParseTree/Code.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/ParseTree/Dq.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/ParseTree/DqContent.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/ParseTree/Tag.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/ParseTree/Template.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/ParseTree/Text.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Parser/ConfigfileParser.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Parser/ConfigfileParser.y (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Parser/TemplateParser.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Parser/TemplateParser.y (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Resource/BasePlugin.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Resource/CustomPlugin.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Resource/ExtendsPlugin.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Resource/FilePlugin.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Resource/RecompiledPlugin.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Resource/StreamPlugin.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Resource/StringEval.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Resource/StringPlugin.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Runtime/Block.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Runtime/CaptureRuntime.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Runtime/DefaultPluginHandlerRuntime.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Runtime/ForeachRuntime.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Runtime/InheritanceRuntime.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Runtime/TplFunctionRuntime.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Security.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Smarty.php (99%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Template.php (99%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Template/Cached.php (87%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Template/Compiled.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Template/Config.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Template/GeneratedPhpFile.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Template/Source.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/TemplateBase.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/TestInstall.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/UndefinedVariable.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/Variable.php (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/debug.tpl (100%) rename fp-includes/{smarty-5.8.4 => smarty-5.8.5}/src/functions.php (100%) diff --git a/.dist/phpstan.neon.dist b/.dist/phpstan.neon.dist index 161ba3203..f9f373744 100644 --- a/.dist/phpstan.neon.dist +++ b/.dist/phpstan.neon.dist @@ -52,12 +52,12 @@ parameters: # Scan for type resolution, but do not analyze scanDirectories: - - ../fp-includes/smarty-5.8.4/src + - ../fp-includes/smarty-5.8.5/src - ../fp-includes/fp-smartyplugins excludePaths: analyse: - - ../fp-includes/smarty-5.8.4/** + - ../fp-includes/smarty-5.8.5/** - ../fp-content/compile/** - ../fp-content/cache/** - ../.setup.php (?) @@ -70,12 +70,12 @@ parameters: # Ignore error “does not accept null” only in Smarty core - message: '#Property .* does not accept null#' paths: - - ../fp-includes/smarty-5.8.4/src/*.php + - ../fp-includes/smarty-5.8.5/src/*.php # Ignore error “Call to undefined method” only in Smarty core - message: '#Call to an undefined method Smarty_Internal_.*::.*#' paths: - - ../fp-includes/smarty-5.8.4/src/.*\.php + - ../fp-includes/smarty-5.8.5/src/.*\.php checkMissingVarTagTypehint: false reportUnmatchedIgnoredErrors: false diff --git a/CHANGELOG.md b/CHANGELOG.md index 05aec690a..b3fc2253b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ - Added "Location Migration Mode" ([#897](https://github.com/flatpressblog/flatpress/pull/897)) - The PHP code is now fully compliant with PHPStan Level 5 ([#893](https://github.com/flatpressblog/flatpress/pull/893), [#894](https://github.com/flatpressblog/flatpress/pull/894)) - Template engine Smarty: - - Updated to version 5.8.4 with PHP 8.5 support ([#932](https://github.com/flatpressblog/flatpress/pull/932)) + - Updated to version 5.8.5 with PHP 8.5 support ([#932](https://github.com/flatpressblog/flatpress/pull/932)) - New core helpers: ``date_iso8601($timestamp, $offset = null)`` and ``date_id_to_iso8601($id, $offset = null)``. ([#856](https://github.com/flatpressblog/flatpress/pull/856)) - RSS and Atom feeds and the Categories widget use the Smarty block cache instead of having to go through the Smarty compiler every time. ([#864](https://github.com/flatpressblog/flatpress/pull/864)) - If APCu is available, the Smarty cache fragments are stored in the APCu cache instead of on disk. ([#865](https://github.com/flatpressblog/flatpress/pull/865)) diff --git a/fp-includes/smarty-5.8.4/AGENTS.md b/fp-includes/smarty-5.8.5/AGENTS.md similarity index 100% rename from fp-includes/smarty-5.8.4/AGENTS.md rename to fp-includes/smarty-5.8.5/AGENTS.md diff --git a/fp-includes/smarty-5.8.4/CHANGELOG.md b/fp-includes/smarty-5.8.5/CHANGELOG.md similarity index 99% rename from fp-includes/smarty-5.8.4/CHANGELOG.md rename to fp-includes/smarty-5.8.5/CHANGELOG.md index 6a048d068..7b945ce97 100644 --- a/fp-includes/smarty-5.8.4/CHANGELOG.md +++ b/fp-includes/smarty-5.8.5/CHANGELOG.md @@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [5.8.5] - 2026-10-04 +- Security: prevent attacker-controlled template output from forging a nocache marker that injects raw PHP into the generated cache file when a template is rendered through the `extends:`/inheritance path + + ## [5.8.4] - 2026-06-29 - Fixed a `TypeError` on PHP 8 when `Security::$static_classes` was set to a non-array value (e.g. the string `'none'`) to disable static class access; any non-array value now cleanly denies access. Use `Security::$static_classes = null` to disable access to all static classes. - Security: the built-in `stream:` resource type now validates the nested stream wrapper against the security policy, so a template such as `stream:php://filter/...` can no longer bypass `Security::$streams` (including `Security::$streams = null`) to read local files (CWE-22) diff --git a/fp-includes/smarty-5.8.4/CONTRIBUTING.md b/fp-includes/smarty-5.8.5/CONTRIBUTING.md similarity index 100% rename from fp-includes/smarty-5.8.4/CONTRIBUTING.md rename to fp-includes/smarty-5.8.5/CONTRIBUTING.md diff --git a/fp-includes/smarty-5.8.4/LICENSE b/fp-includes/smarty-5.8.5/LICENSE similarity index 100% rename from fp-includes/smarty-5.8.4/LICENSE rename to fp-includes/smarty-5.8.5/LICENSE diff --git a/fp-includes/smarty-5.8.4/Makefile b/fp-includes/smarty-5.8.5/Makefile similarity index 100% rename from fp-includes/smarty-5.8.4/Makefile rename to fp-includes/smarty-5.8.5/Makefile diff --git a/fp-includes/smarty-5.8.4/README.md b/fp-includes/smarty-5.8.5/README.md similarity index 100% rename from fp-includes/smarty-5.8.4/README.md rename to fp-includes/smarty-5.8.5/README.md diff --git a/fp-includes/smarty-5.8.4/SECURITY.md b/fp-includes/smarty-5.8.5/SECURITY.md similarity index 63% rename from fp-includes/smarty-5.8.4/SECURITY.md rename to fp-includes/smarty-5.8.5/SECURITY.md index 9685c254f..704f59c1d 100644 --- a/fp-includes/smarty-5.8.4/SECURITY.md +++ b/fp-includes/smarty-5.8.5/SECURITY.md @@ -12,9 +12,8 @@ Smarty currently supports the latest minor version of Smarty 4 and Smarty 5. ## Reporting a Vulnerability -If you have discovered a security issue with Smarty, please contact us at mail [at] simonwisselink.nl. Do not -disclose your findings publicly and **PLEASE** do not file an Issue (because that would disclose your findings -publicly.) +If you have discovered a security issue with Smarty, please open a [new security advisory](https://github.com/smarty-php/smarty/security/advisories/new). +Do not disclose your findings publicly and **PLEASE** do not file an Issue (because that would disclose your findings publicly.) We will try to confirm the vulnerability and develop a fix if appropriate. When we release the fix, we will publish a security release. Please let us know if you want to be credited. diff --git a/fp-includes/smarty-5.8.4/TODO.txt b/fp-includes/smarty-5.8.5/TODO.txt similarity index 100% rename from fp-includes/smarty-5.8.4/TODO.txt rename to fp-includes/smarty-5.8.5/TODO.txt diff --git a/fp-includes/smarty-5.8.4/composer.json b/fp-includes/smarty-5.8.5/composer.json similarity index 100% rename from fp-includes/smarty-5.8.4/composer.json rename to fp-includes/smarty-5.8.5/composer.json diff --git a/fp-includes/smarty-5.8.4/libs/Smarty.class.php b/fp-includes/smarty-5.8.5/libs/Smarty.class.php similarity index 100% rename from fp-includes/smarty-5.8.4/libs/Smarty.class.php rename to fp-includes/smarty-5.8.5/libs/Smarty.class.php diff --git a/fp-includes/smarty-5.8.4/mkdocs.yml b/fp-includes/smarty-5.8.5/mkdocs.yml similarity index 100% rename from fp-includes/smarty-5.8.4/mkdocs.yml rename to fp-includes/smarty-5.8.5/mkdocs.yml diff --git a/fp-includes/smarty-5.8.4/run-tests-for-all-php-versions.sh b/fp-includes/smarty-5.8.5/run-tests-for-all-php-versions.sh similarity index 70% rename from fp-includes/smarty-5.8.4/run-tests-for-all-php-versions.sh rename to fp-includes/smarty-5.8.5/run-tests-for-all-php-versions.sh index e873baac6..5c5f84b4d 100644 --- a/fp-includes/smarty-5.8.4/run-tests-for-all-php-versions.sh +++ b/fp-includes/smarty-5.8.5/run-tests-for-all-php-versions.sh @@ -12,6 +12,7 @@ $COMPOSE_CMD run --rm php73 ./run-tests.sh $@ && \ $COMPOSE_CMD run --rm php74 ./run-tests.sh $@ && \ $COMPOSE_CMD run --rm php80 ./run-tests.sh $@ && \ $COMPOSE_CMD run --rm php81 ./run-tests.sh $@ && \ -$COMPOSE_CMD run --rm php82 ./run-tests.sh $@ -$COMPOSE_CMD run --rm php83 ./run-tests.sh $@ -$COMPOSE_CMD run --rm php84 ./run-tests.sh $@ +$COMPOSE_CMD run --rm php82 ./run-tests.sh $@ && \ +$COMPOSE_CMD run --rm php83 ./run-tests.sh $@ && \ +$COMPOSE_CMD run --rm php84 ./run-tests.sh $@ && \ +$COMPOSE_CMD run --rm php85 ./run-tests.sh $@ diff --git a/fp-includes/smarty-5.8.4/run-tests.sh b/fp-includes/smarty-5.8.5/run-tests.sh similarity index 61% rename from fp-includes/smarty-5.8.4/run-tests.sh rename to fp-includes/smarty-5.8.5/run-tests.sh index 1990a07f1..f5e9005af 100644 --- a/fp-includes/smarty-5.8.4/run-tests.sh +++ b/fp-includes/smarty-5.8.5/run-tests.sh @@ -6,5 +6,8 @@ # - ./run-tests.sh --exclude-group slow composer update --quiet -#php -r 'echo "\nPHP version " . phpversion() . ". ";' +echo '------------------------------------------------------------' +php -v +echo '------------------------------------------------------------' php ./vendor/phpunit/phpunit/phpunit $@ +echo \ No newline at end of file diff --git a/fp-includes/smarty-5.8.4/src/BlockHandler/Base.php b/fp-includes/smarty-5.8.5/src/BlockHandler/Base.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/BlockHandler/Base.php rename to fp-includes/smarty-5.8.5/src/BlockHandler/Base.php diff --git a/fp-includes/smarty-5.8.4/src/BlockHandler/BlockHandlerInterface.php b/fp-includes/smarty-5.8.5/src/BlockHandler/BlockHandlerInterface.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/BlockHandler/BlockHandlerInterface.php rename to fp-includes/smarty-5.8.5/src/BlockHandler/BlockHandlerInterface.php diff --git a/fp-includes/smarty-5.8.4/src/BlockHandler/BlockPluginWrapper.php b/fp-includes/smarty-5.8.5/src/BlockHandler/BlockPluginWrapper.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/BlockHandler/BlockPluginWrapper.php rename to fp-includes/smarty-5.8.5/src/BlockHandler/BlockPluginWrapper.php diff --git a/fp-includes/smarty-5.8.4/src/BlockHandler/TextFormat.php b/fp-includes/smarty-5.8.5/src/BlockHandler/TextFormat.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/BlockHandler/TextFormat.php rename to fp-includes/smarty-5.8.5/src/BlockHandler/TextFormat.php diff --git a/fp-includes/smarty-5.8.4/src/Cacheresource/Base.php b/fp-includes/smarty-5.8.5/src/Cacheresource/Base.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Cacheresource/Base.php rename to fp-includes/smarty-5.8.5/src/Cacheresource/Base.php diff --git a/fp-includes/smarty-5.8.4/src/Cacheresource/Custom.php b/fp-includes/smarty-5.8.5/src/Cacheresource/Custom.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Cacheresource/Custom.php rename to fp-includes/smarty-5.8.5/src/Cacheresource/Custom.php diff --git a/fp-includes/smarty-5.8.4/src/Cacheresource/File.php b/fp-includes/smarty-5.8.5/src/Cacheresource/File.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Cacheresource/File.php rename to fp-includes/smarty-5.8.5/src/Cacheresource/File.php diff --git a/fp-includes/smarty-5.8.4/src/Cacheresource/KeyValueStore.php b/fp-includes/smarty-5.8.5/src/Cacheresource/KeyValueStore.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Cacheresource/KeyValueStore.php rename to fp-includes/smarty-5.8.5/src/Cacheresource/KeyValueStore.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/AttributeCompiler.php b/fp-includes/smarty-5.8.5/src/Compile/AttributeCompiler.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/AttributeCompiler.php rename to fp-includes/smarty-5.8.5/src/Compile/AttributeCompiler.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/Base.php b/fp-includes/smarty-5.8.5/src/Compile/Base.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/Base.php rename to fp-includes/smarty-5.8.5/src/Compile/Base.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/BlockCompiler.php b/fp-includes/smarty-5.8.5/src/Compile/BlockCompiler.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/BlockCompiler.php rename to fp-includes/smarty-5.8.5/src/Compile/BlockCompiler.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/CompilerInterface.php b/fp-includes/smarty-5.8.5/src/Compile/CompilerInterface.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/CompilerInterface.php rename to fp-includes/smarty-5.8.5/src/Compile/CompilerInterface.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/DefaultHandlerBlockCompiler.php b/fp-includes/smarty-5.8.5/src/Compile/DefaultHandlerBlockCompiler.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/DefaultHandlerBlockCompiler.php rename to fp-includes/smarty-5.8.5/src/Compile/DefaultHandlerBlockCompiler.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/DefaultHandlerFunctionCallCompiler.php b/fp-includes/smarty-5.8.5/src/Compile/DefaultHandlerFunctionCallCompiler.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/DefaultHandlerFunctionCallCompiler.php rename to fp-includes/smarty-5.8.5/src/Compile/DefaultHandlerFunctionCallCompiler.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/FunctionCallCompiler.php b/fp-includes/smarty-5.8.5/src/Compile/FunctionCallCompiler.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/FunctionCallCompiler.php rename to fp-includes/smarty-5.8.5/src/Compile/FunctionCallCompiler.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/Modifier/BCPluginWrapper.php b/fp-includes/smarty-5.8.5/src/Compile/Modifier/BCPluginWrapper.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/Modifier/BCPluginWrapper.php rename to fp-includes/smarty-5.8.5/src/Compile/Modifier/BCPluginWrapper.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/Modifier/Base.php b/fp-includes/smarty-5.8.5/src/Compile/Modifier/Base.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/Modifier/Base.php rename to fp-includes/smarty-5.8.5/src/Compile/Modifier/Base.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/Modifier/CatModifierCompiler.php b/fp-includes/smarty-5.8.5/src/Compile/Modifier/CatModifierCompiler.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/Modifier/CatModifierCompiler.php rename to fp-includes/smarty-5.8.5/src/Compile/Modifier/CatModifierCompiler.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/Modifier/CountCharactersModifierCompiler.php b/fp-includes/smarty-5.8.5/src/Compile/Modifier/CountCharactersModifierCompiler.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/Modifier/CountCharactersModifierCompiler.php rename to fp-includes/smarty-5.8.5/src/Compile/Modifier/CountCharactersModifierCompiler.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/Modifier/CountParagraphsModifierCompiler.php b/fp-includes/smarty-5.8.5/src/Compile/Modifier/CountParagraphsModifierCompiler.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/Modifier/CountParagraphsModifierCompiler.php rename to fp-includes/smarty-5.8.5/src/Compile/Modifier/CountParagraphsModifierCompiler.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/Modifier/CountSentencesModifierCompiler.php b/fp-includes/smarty-5.8.5/src/Compile/Modifier/CountSentencesModifierCompiler.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/Modifier/CountSentencesModifierCompiler.php rename to fp-includes/smarty-5.8.5/src/Compile/Modifier/CountSentencesModifierCompiler.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/Modifier/CountWordsModifierCompiler.php b/fp-includes/smarty-5.8.5/src/Compile/Modifier/CountWordsModifierCompiler.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/Modifier/CountWordsModifierCompiler.php rename to fp-includes/smarty-5.8.5/src/Compile/Modifier/CountWordsModifierCompiler.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/Modifier/DefaultModifierCompiler.php b/fp-includes/smarty-5.8.5/src/Compile/Modifier/DefaultModifierCompiler.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/Modifier/DefaultModifierCompiler.php rename to fp-includes/smarty-5.8.5/src/Compile/Modifier/DefaultModifierCompiler.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/Modifier/EmptyModifierCompiler.php b/fp-includes/smarty-5.8.5/src/Compile/Modifier/EmptyModifierCompiler.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/Modifier/EmptyModifierCompiler.php rename to fp-includes/smarty-5.8.5/src/Compile/Modifier/EmptyModifierCompiler.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/Modifier/EscapeModifierCompiler.php b/fp-includes/smarty-5.8.5/src/Compile/Modifier/EscapeModifierCompiler.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/Modifier/EscapeModifierCompiler.php rename to fp-includes/smarty-5.8.5/src/Compile/Modifier/EscapeModifierCompiler.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/Modifier/FromCharsetModifierCompiler.php b/fp-includes/smarty-5.8.5/src/Compile/Modifier/FromCharsetModifierCompiler.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/Modifier/FromCharsetModifierCompiler.php rename to fp-includes/smarty-5.8.5/src/Compile/Modifier/FromCharsetModifierCompiler.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/Modifier/IndentModifierCompiler.php b/fp-includes/smarty-5.8.5/src/Compile/Modifier/IndentModifierCompiler.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/Modifier/IndentModifierCompiler.php rename to fp-includes/smarty-5.8.5/src/Compile/Modifier/IndentModifierCompiler.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/Modifier/IsArrayModifierCompiler.php b/fp-includes/smarty-5.8.5/src/Compile/Modifier/IsArrayModifierCompiler.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/Modifier/IsArrayModifierCompiler.php rename to fp-includes/smarty-5.8.5/src/Compile/Modifier/IsArrayModifierCompiler.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/Modifier/IssetModifierCompiler.php b/fp-includes/smarty-5.8.5/src/Compile/Modifier/IssetModifierCompiler.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/Modifier/IssetModifierCompiler.php rename to fp-includes/smarty-5.8.5/src/Compile/Modifier/IssetModifierCompiler.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/Modifier/JsonEncodeModifierCompiler.php b/fp-includes/smarty-5.8.5/src/Compile/Modifier/JsonEncodeModifierCompiler.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/Modifier/JsonEncodeModifierCompiler.php rename to fp-includes/smarty-5.8.5/src/Compile/Modifier/JsonEncodeModifierCompiler.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/Modifier/LowerModifierCompiler.php b/fp-includes/smarty-5.8.5/src/Compile/Modifier/LowerModifierCompiler.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/Modifier/LowerModifierCompiler.php rename to fp-includes/smarty-5.8.5/src/Compile/Modifier/LowerModifierCompiler.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/Modifier/ModifierCompilerInterface.php b/fp-includes/smarty-5.8.5/src/Compile/Modifier/ModifierCompilerInterface.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/Modifier/ModifierCompilerInterface.php rename to fp-includes/smarty-5.8.5/src/Compile/Modifier/ModifierCompilerInterface.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/Modifier/Nl2brModifierCompiler.php b/fp-includes/smarty-5.8.5/src/Compile/Modifier/Nl2brModifierCompiler.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/Modifier/Nl2brModifierCompiler.php rename to fp-includes/smarty-5.8.5/src/Compile/Modifier/Nl2brModifierCompiler.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/Modifier/NoPrintModifierCompiler.php b/fp-includes/smarty-5.8.5/src/Compile/Modifier/NoPrintModifierCompiler.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/Modifier/NoPrintModifierCompiler.php rename to fp-includes/smarty-5.8.5/src/Compile/Modifier/NoPrintModifierCompiler.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/Modifier/RawModifierCompiler.php b/fp-includes/smarty-5.8.5/src/Compile/Modifier/RawModifierCompiler.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/Modifier/RawModifierCompiler.php rename to fp-includes/smarty-5.8.5/src/Compile/Modifier/RawModifierCompiler.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/Modifier/RoundModifierCompiler.php b/fp-includes/smarty-5.8.5/src/Compile/Modifier/RoundModifierCompiler.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/Modifier/RoundModifierCompiler.php rename to fp-includes/smarty-5.8.5/src/Compile/Modifier/RoundModifierCompiler.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/Modifier/StrRepeatModifierCompiler.php b/fp-includes/smarty-5.8.5/src/Compile/Modifier/StrRepeatModifierCompiler.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/Modifier/StrRepeatModifierCompiler.php rename to fp-includes/smarty-5.8.5/src/Compile/Modifier/StrRepeatModifierCompiler.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/Modifier/StringFormatModifierCompiler.php b/fp-includes/smarty-5.8.5/src/Compile/Modifier/StringFormatModifierCompiler.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/Modifier/StringFormatModifierCompiler.php rename to fp-includes/smarty-5.8.5/src/Compile/Modifier/StringFormatModifierCompiler.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/Modifier/StripModifierCompiler.php b/fp-includes/smarty-5.8.5/src/Compile/Modifier/StripModifierCompiler.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/Modifier/StripModifierCompiler.php rename to fp-includes/smarty-5.8.5/src/Compile/Modifier/StripModifierCompiler.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/Modifier/StripTagsModifierCompiler.php b/fp-includes/smarty-5.8.5/src/Compile/Modifier/StripTagsModifierCompiler.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/Modifier/StripTagsModifierCompiler.php rename to fp-includes/smarty-5.8.5/src/Compile/Modifier/StripTagsModifierCompiler.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/Modifier/StrlenModifierCompiler.php b/fp-includes/smarty-5.8.5/src/Compile/Modifier/StrlenModifierCompiler.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/Modifier/StrlenModifierCompiler.php rename to fp-includes/smarty-5.8.5/src/Compile/Modifier/StrlenModifierCompiler.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/Modifier/SubstrModifierCompiler.php b/fp-includes/smarty-5.8.5/src/Compile/Modifier/SubstrModifierCompiler.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/Modifier/SubstrModifierCompiler.php rename to fp-includes/smarty-5.8.5/src/Compile/Modifier/SubstrModifierCompiler.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/Modifier/ToCharsetModifierCompiler.php b/fp-includes/smarty-5.8.5/src/Compile/Modifier/ToCharsetModifierCompiler.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/Modifier/ToCharsetModifierCompiler.php rename to fp-includes/smarty-5.8.5/src/Compile/Modifier/ToCharsetModifierCompiler.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/Modifier/UnescapeModifierCompiler.php b/fp-includes/smarty-5.8.5/src/Compile/Modifier/UnescapeModifierCompiler.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/Modifier/UnescapeModifierCompiler.php rename to fp-includes/smarty-5.8.5/src/Compile/Modifier/UnescapeModifierCompiler.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/Modifier/UpperModifierCompiler.php b/fp-includes/smarty-5.8.5/src/Compile/Modifier/UpperModifierCompiler.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/Modifier/UpperModifierCompiler.php rename to fp-includes/smarty-5.8.5/src/Compile/Modifier/UpperModifierCompiler.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/Modifier/WordWrapModifierCompiler.php b/fp-includes/smarty-5.8.5/src/Compile/Modifier/WordWrapModifierCompiler.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/Modifier/WordWrapModifierCompiler.php rename to fp-includes/smarty-5.8.5/src/Compile/Modifier/WordWrapModifierCompiler.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/ModifierCompiler.php b/fp-includes/smarty-5.8.5/src/Compile/ModifierCompiler.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/ModifierCompiler.php rename to fp-includes/smarty-5.8.5/src/Compile/ModifierCompiler.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/ObjectMethodBlockCompiler.php b/fp-includes/smarty-5.8.5/src/Compile/ObjectMethodBlockCompiler.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/ObjectMethodBlockCompiler.php rename to fp-includes/smarty-5.8.5/src/Compile/ObjectMethodBlockCompiler.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/ObjectMethodCallCompiler.php b/fp-includes/smarty-5.8.5/src/Compile/ObjectMethodCallCompiler.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/ObjectMethodCallCompiler.php rename to fp-includes/smarty-5.8.5/src/Compile/ObjectMethodCallCompiler.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/PrintExpressionCompiler.php b/fp-includes/smarty-5.8.5/src/Compile/PrintExpressionCompiler.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/PrintExpressionCompiler.php rename to fp-includes/smarty-5.8.5/src/Compile/PrintExpressionCompiler.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/SpecialVariableCompiler.php b/fp-includes/smarty-5.8.5/src/Compile/SpecialVariableCompiler.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/SpecialVariableCompiler.php rename to fp-includes/smarty-5.8.5/src/Compile/SpecialVariableCompiler.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/Tag/Append.php b/fp-includes/smarty-5.8.5/src/Compile/Tag/Append.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/Tag/Append.php rename to fp-includes/smarty-5.8.5/src/Compile/Tag/Append.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/Tag/Assign.php b/fp-includes/smarty-5.8.5/src/Compile/Tag/Assign.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/Tag/Assign.php rename to fp-includes/smarty-5.8.5/src/Compile/Tag/Assign.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/Tag/BCPluginWrapper.php b/fp-includes/smarty-5.8.5/src/Compile/Tag/BCPluginWrapper.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/Tag/BCPluginWrapper.php rename to fp-includes/smarty-5.8.5/src/Compile/Tag/BCPluginWrapper.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/Tag/Block.php b/fp-includes/smarty-5.8.5/src/Compile/Tag/Block.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/Tag/Block.php rename to fp-includes/smarty-5.8.5/src/Compile/Tag/Block.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/Tag/BlockClose.php b/fp-includes/smarty-5.8.5/src/Compile/Tag/BlockClose.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/Tag/BlockClose.php rename to fp-includes/smarty-5.8.5/src/Compile/Tag/BlockClose.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/Tag/BreakTag.php b/fp-includes/smarty-5.8.5/src/Compile/Tag/BreakTag.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/Tag/BreakTag.php rename to fp-includes/smarty-5.8.5/src/Compile/Tag/BreakTag.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/Tag/Call.php b/fp-includes/smarty-5.8.5/src/Compile/Tag/Call.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/Tag/Call.php rename to fp-includes/smarty-5.8.5/src/Compile/Tag/Call.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/Tag/Capture.php b/fp-includes/smarty-5.8.5/src/Compile/Tag/Capture.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/Tag/Capture.php rename to fp-includes/smarty-5.8.5/src/Compile/Tag/Capture.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/Tag/CaptureClose.php b/fp-includes/smarty-5.8.5/src/Compile/Tag/CaptureClose.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/Tag/CaptureClose.php rename to fp-includes/smarty-5.8.5/src/Compile/Tag/CaptureClose.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/Tag/ConfigLoad.php b/fp-includes/smarty-5.8.5/src/Compile/Tag/ConfigLoad.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/Tag/ConfigLoad.php rename to fp-includes/smarty-5.8.5/src/Compile/Tag/ConfigLoad.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/Tag/ContinueTag.php b/fp-includes/smarty-5.8.5/src/Compile/Tag/ContinueTag.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/Tag/ContinueTag.php rename to fp-includes/smarty-5.8.5/src/Compile/Tag/ContinueTag.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/Tag/Debug.php b/fp-includes/smarty-5.8.5/src/Compile/Tag/Debug.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/Tag/Debug.php rename to fp-includes/smarty-5.8.5/src/Compile/Tag/Debug.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/Tag/ElseIfTag.php b/fp-includes/smarty-5.8.5/src/Compile/Tag/ElseIfTag.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/Tag/ElseIfTag.php rename to fp-includes/smarty-5.8.5/src/Compile/Tag/ElseIfTag.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/Tag/ElseTag.php b/fp-includes/smarty-5.8.5/src/Compile/Tag/ElseTag.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/Tag/ElseTag.php rename to fp-includes/smarty-5.8.5/src/Compile/Tag/ElseTag.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/Tag/EvalTag.php b/fp-includes/smarty-5.8.5/src/Compile/Tag/EvalTag.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/Tag/EvalTag.php rename to fp-includes/smarty-5.8.5/src/Compile/Tag/EvalTag.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/Tag/ExtendsTag.php b/fp-includes/smarty-5.8.5/src/Compile/Tag/ExtendsTag.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/Tag/ExtendsTag.php rename to fp-includes/smarty-5.8.5/src/Compile/Tag/ExtendsTag.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/Tag/ForClose.php b/fp-includes/smarty-5.8.5/src/Compile/Tag/ForClose.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/Tag/ForClose.php rename to fp-includes/smarty-5.8.5/src/Compile/Tag/ForClose.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/Tag/ForElse.php b/fp-includes/smarty-5.8.5/src/Compile/Tag/ForElse.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/Tag/ForElse.php rename to fp-includes/smarty-5.8.5/src/Compile/Tag/ForElse.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/Tag/ForTag.php b/fp-includes/smarty-5.8.5/src/Compile/Tag/ForTag.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/Tag/ForTag.php rename to fp-includes/smarty-5.8.5/src/Compile/Tag/ForTag.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/Tag/ForeachClose.php b/fp-includes/smarty-5.8.5/src/Compile/Tag/ForeachClose.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/Tag/ForeachClose.php rename to fp-includes/smarty-5.8.5/src/Compile/Tag/ForeachClose.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/Tag/ForeachElse.php b/fp-includes/smarty-5.8.5/src/Compile/Tag/ForeachElse.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/Tag/ForeachElse.php rename to fp-includes/smarty-5.8.5/src/Compile/Tag/ForeachElse.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/Tag/ForeachSection.php b/fp-includes/smarty-5.8.5/src/Compile/Tag/ForeachSection.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/Tag/ForeachSection.php rename to fp-includes/smarty-5.8.5/src/Compile/Tag/ForeachSection.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/Tag/ForeachTag.php b/fp-includes/smarty-5.8.5/src/Compile/Tag/ForeachTag.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/Tag/ForeachTag.php rename to fp-includes/smarty-5.8.5/src/Compile/Tag/ForeachTag.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/Tag/FunctionClose.php b/fp-includes/smarty-5.8.5/src/Compile/Tag/FunctionClose.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/Tag/FunctionClose.php rename to fp-includes/smarty-5.8.5/src/Compile/Tag/FunctionClose.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/Tag/FunctionTag.php b/fp-includes/smarty-5.8.5/src/Compile/Tag/FunctionTag.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/Tag/FunctionTag.php rename to fp-includes/smarty-5.8.5/src/Compile/Tag/FunctionTag.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/Tag/IfClose.php b/fp-includes/smarty-5.8.5/src/Compile/Tag/IfClose.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/Tag/IfClose.php rename to fp-includes/smarty-5.8.5/src/Compile/Tag/IfClose.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/Tag/IfTag.php b/fp-includes/smarty-5.8.5/src/Compile/Tag/IfTag.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/Tag/IfTag.php rename to fp-includes/smarty-5.8.5/src/Compile/Tag/IfTag.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/Tag/IncludeTag.php b/fp-includes/smarty-5.8.5/src/Compile/Tag/IncludeTag.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/Tag/IncludeTag.php rename to fp-includes/smarty-5.8.5/src/Compile/Tag/IncludeTag.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/Tag/Inheritance.php b/fp-includes/smarty-5.8.5/src/Compile/Tag/Inheritance.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/Tag/Inheritance.php rename to fp-includes/smarty-5.8.5/src/Compile/Tag/Inheritance.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/Tag/Ldelim.php b/fp-includes/smarty-5.8.5/src/Compile/Tag/Ldelim.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/Tag/Ldelim.php rename to fp-includes/smarty-5.8.5/src/Compile/Tag/Ldelim.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/Tag/Nocache.php b/fp-includes/smarty-5.8.5/src/Compile/Tag/Nocache.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/Tag/Nocache.php rename to fp-includes/smarty-5.8.5/src/Compile/Tag/Nocache.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/Tag/NocacheClose.php b/fp-includes/smarty-5.8.5/src/Compile/Tag/NocacheClose.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/Tag/NocacheClose.php rename to fp-includes/smarty-5.8.5/src/Compile/Tag/NocacheClose.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/Tag/Rdelim.php b/fp-includes/smarty-5.8.5/src/Compile/Tag/Rdelim.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/Tag/Rdelim.php rename to fp-includes/smarty-5.8.5/src/Compile/Tag/Rdelim.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/Tag/Section.php b/fp-includes/smarty-5.8.5/src/Compile/Tag/Section.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/Tag/Section.php rename to fp-includes/smarty-5.8.5/src/Compile/Tag/Section.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/Tag/SectionClose.php b/fp-includes/smarty-5.8.5/src/Compile/Tag/SectionClose.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/Tag/SectionClose.php rename to fp-includes/smarty-5.8.5/src/Compile/Tag/SectionClose.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/Tag/SectionElse.php b/fp-includes/smarty-5.8.5/src/Compile/Tag/SectionElse.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/Tag/SectionElse.php rename to fp-includes/smarty-5.8.5/src/Compile/Tag/SectionElse.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/Tag/Setfilter.php b/fp-includes/smarty-5.8.5/src/Compile/Tag/Setfilter.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/Tag/Setfilter.php rename to fp-includes/smarty-5.8.5/src/Compile/Tag/Setfilter.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/Tag/SetfilterClose.php b/fp-includes/smarty-5.8.5/src/Compile/Tag/SetfilterClose.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/Tag/SetfilterClose.php rename to fp-includes/smarty-5.8.5/src/Compile/Tag/SetfilterClose.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/Tag/WhileClose.php b/fp-includes/smarty-5.8.5/src/Compile/Tag/WhileClose.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/Tag/WhileClose.php rename to fp-includes/smarty-5.8.5/src/Compile/Tag/WhileClose.php diff --git a/fp-includes/smarty-5.8.4/src/Compile/Tag/WhileTag.php b/fp-includes/smarty-5.8.5/src/Compile/Tag/WhileTag.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compile/Tag/WhileTag.php rename to fp-includes/smarty-5.8.5/src/Compile/Tag/WhileTag.php diff --git a/fp-includes/smarty-5.8.4/src/Compiler/BaseCompiler.php b/fp-includes/smarty-5.8.5/src/Compiler/BaseCompiler.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compiler/BaseCompiler.php rename to fp-includes/smarty-5.8.5/src/Compiler/BaseCompiler.php diff --git a/fp-includes/smarty-5.8.4/src/Compiler/CodeFrame.php b/fp-includes/smarty-5.8.5/src/Compiler/CodeFrame.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compiler/CodeFrame.php rename to fp-includes/smarty-5.8.5/src/Compiler/CodeFrame.php diff --git a/fp-includes/smarty-5.8.4/src/Compiler/Configfile.php b/fp-includes/smarty-5.8.5/src/Compiler/Configfile.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compiler/Configfile.php rename to fp-includes/smarty-5.8.5/src/Compiler/Configfile.php diff --git a/fp-includes/smarty-5.8.4/src/Compiler/Template.php b/fp-includes/smarty-5.8.5/src/Compiler/Template.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Compiler/Template.php rename to fp-includes/smarty-5.8.5/src/Compiler/Template.php diff --git a/fp-includes/smarty-5.8.4/src/CompilerException.php b/fp-includes/smarty-5.8.5/src/CompilerException.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/CompilerException.php rename to fp-includes/smarty-5.8.5/src/CompilerException.php diff --git a/fp-includes/smarty-5.8.4/src/Data.php b/fp-includes/smarty-5.8.5/src/Data.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Data.php rename to fp-includes/smarty-5.8.5/src/Data.php diff --git a/fp-includes/smarty-5.8.4/src/Debug.php b/fp-includes/smarty-5.8.5/src/Debug.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Debug.php rename to fp-includes/smarty-5.8.5/src/Debug.php diff --git a/fp-includes/smarty-5.8.4/src/ErrorHandler.php b/fp-includes/smarty-5.8.5/src/ErrorHandler.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/ErrorHandler.php rename to fp-includes/smarty-5.8.5/src/ErrorHandler.php diff --git a/fp-includes/smarty-5.8.4/src/Exception.php b/fp-includes/smarty-5.8.5/src/Exception.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Exception.php rename to fp-includes/smarty-5.8.5/src/Exception.php diff --git a/fp-includes/smarty-5.8.4/src/Extension/BCPluginsAdapter.php b/fp-includes/smarty-5.8.5/src/Extension/BCPluginsAdapter.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Extension/BCPluginsAdapter.php rename to fp-includes/smarty-5.8.5/src/Extension/BCPluginsAdapter.php diff --git a/fp-includes/smarty-5.8.4/src/Extension/Base.php b/fp-includes/smarty-5.8.5/src/Extension/Base.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Extension/Base.php rename to fp-includes/smarty-5.8.5/src/Extension/Base.php diff --git a/fp-includes/smarty-5.8.4/src/Extension/CallbackWrapper.php b/fp-includes/smarty-5.8.5/src/Extension/CallbackWrapper.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Extension/CallbackWrapper.php rename to fp-includes/smarty-5.8.5/src/Extension/CallbackWrapper.php diff --git a/fp-includes/smarty-5.8.4/src/Extension/CoreExtension.php b/fp-includes/smarty-5.8.5/src/Extension/CoreExtension.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Extension/CoreExtension.php rename to fp-includes/smarty-5.8.5/src/Extension/CoreExtension.php diff --git a/fp-includes/smarty-5.8.4/src/Extension/DefaultExtension.php b/fp-includes/smarty-5.8.5/src/Extension/DefaultExtension.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Extension/DefaultExtension.php rename to fp-includes/smarty-5.8.5/src/Extension/DefaultExtension.php diff --git a/fp-includes/smarty-5.8.4/src/Extension/ExtensionInterface.php b/fp-includes/smarty-5.8.5/src/Extension/ExtensionInterface.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Extension/ExtensionInterface.php rename to fp-includes/smarty-5.8.5/src/Extension/ExtensionInterface.php diff --git a/fp-includes/smarty-5.8.4/src/Filter/FilterInterface.php b/fp-includes/smarty-5.8.5/src/Filter/FilterInterface.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Filter/FilterInterface.php rename to fp-includes/smarty-5.8.5/src/Filter/FilterInterface.php diff --git a/fp-includes/smarty-5.8.4/src/Filter/FilterPluginWrapper.php b/fp-includes/smarty-5.8.5/src/Filter/FilterPluginWrapper.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Filter/FilterPluginWrapper.php rename to fp-includes/smarty-5.8.5/src/Filter/FilterPluginWrapper.php diff --git a/fp-includes/smarty-5.8.4/src/Filter/Output/TrimWhitespace.php b/fp-includes/smarty-5.8.5/src/Filter/Output/TrimWhitespace.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Filter/Output/TrimWhitespace.php rename to fp-includes/smarty-5.8.5/src/Filter/Output/TrimWhitespace.php diff --git a/fp-includes/smarty-5.8.4/src/FunctionHandler/AttributeBase.php b/fp-includes/smarty-5.8.5/src/FunctionHandler/AttributeBase.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/FunctionHandler/AttributeBase.php rename to fp-includes/smarty-5.8.5/src/FunctionHandler/AttributeBase.php diff --git a/fp-includes/smarty-5.8.4/src/FunctionHandler/AttributeFunctionHandlerInterface.php b/fp-includes/smarty-5.8.5/src/FunctionHandler/AttributeFunctionHandlerInterface.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/FunctionHandler/AttributeFunctionHandlerInterface.php rename to fp-includes/smarty-5.8.5/src/FunctionHandler/AttributeFunctionHandlerInterface.php diff --git a/fp-includes/smarty-5.8.4/src/FunctionHandler/BCPluginWrapper.php b/fp-includes/smarty-5.8.5/src/FunctionHandler/BCPluginWrapper.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/FunctionHandler/BCPluginWrapper.php rename to fp-includes/smarty-5.8.5/src/FunctionHandler/BCPluginWrapper.php diff --git a/fp-includes/smarty-5.8.4/src/FunctionHandler/Base.php b/fp-includes/smarty-5.8.5/src/FunctionHandler/Base.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/FunctionHandler/Base.php rename to fp-includes/smarty-5.8.5/src/FunctionHandler/Base.php diff --git a/fp-includes/smarty-5.8.4/src/FunctionHandler/Count.php b/fp-includes/smarty-5.8.5/src/FunctionHandler/Count.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/FunctionHandler/Count.php rename to fp-includes/smarty-5.8.5/src/FunctionHandler/Count.php diff --git a/fp-includes/smarty-5.8.4/src/FunctionHandler/Counter.php b/fp-includes/smarty-5.8.5/src/FunctionHandler/Counter.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/FunctionHandler/Counter.php rename to fp-includes/smarty-5.8.5/src/FunctionHandler/Counter.php diff --git a/fp-includes/smarty-5.8.4/src/FunctionHandler/Cycle.php b/fp-includes/smarty-5.8.5/src/FunctionHandler/Cycle.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/FunctionHandler/Cycle.php rename to fp-includes/smarty-5.8.5/src/FunctionHandler/Cycle.php diff --git a/fp-includes/smarty-5.8.4/src/FunctionHandler/Fetch.php b/fp-includes/smarty-5.8.5/src/FunctionHandler/Fetch.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/FunctionHandler/Fetch.php rename to fp-includes/smarty-5.8.5/src/FunctionHandler/Fetch.php diff --git a/fp-includes/smarty-5.8.4/src/FunctionHandler/FunctionHandlerInterface.php b/fp-includes/smarty-5.8.5/src/FunctionHandler/FunctionHandlerInterface.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/FunctionHandler/FunctionHandlerInterface.php rename to fp-includes/smarty-5.8.5/src/FunctionHandler/FunctionHandlerInterface.php diff --git a/fp-includes/smarty-5.8.4/src/FunctionHandler/HtmlBase.php b/fp-includes/smarty-5.8.5/src/FunctionHandler/HtmlBase.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/FunctionHandler/HtmlBase.php rename to fp-includes/smarty-5.8.5/src/FunctionHandler/HtmlBase.php diff --git a/fp-includes/smarty-5.8.4/src/FunctionHandler/HtmlCheckboxes.php b/fp-includes/smarty-5.8.5/src/FunctionHandler/HtmlCheckboxes.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/FunctionHandler/HtmlCheckboxes.php rename to fp-includes/smarty-5.8.5/src/FunctionHandler/HtmlCheckboxes.php diff --git a/fp-includes/smarty-5.8.4/src/FunctionHandler/HtmlImage.php b/fp-includes/smarty-5.8.5/src/FunctionHandler/HtmlImage.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/FunctionHandler/HtmlImage.php rename to fp-includes/smarty-5.8.5/src/FunctionHandler/HtmlImage.php diff --git a/fp-includes/smarty-5.8.4/src/FunctionHandler/HtmlOptions.php b/fp-includes/smarty-5.8.5/src/FunctionHandler/HtmlOptions.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/FunctionHandler/HtmlOptions.php rename to fp-includes/smarty-5.8.5/src/FunctionHandler/HtmlOptions.php diff --git a/fp-includes/smarty-5.8.4/src/FunctionHandler/HtmlRadios.php b/fp-includes/smarty-5.8.5/src/FunctionHandler/HtmlRadios.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/FunctionHandler/HtmlRadios.php rename to fp-includes/smarty-5.8.5/src/FunctionHandler/HtmlRadios.php diff --git a/fp-includes/smarty-5.8.4/src/FunctionHandler/HtmlSelectDate.php b/fp-includes/smarty-5.8.5/src/FunctionHandler/HtmlSelectDate.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/FunctionHandler/HtmlSelectDate.php rename to fp-includes/smarty-5.8.5/src/FunctionHandler/HtmlSelectDate.php diff --git a/fp-includes/smarty-5.8.4/src/FunctionHandler/HtmlSelectTime.php b/fp-includes/smarty-5.8.5/src/FunctionHandler/HtmlSelectTime.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/FunctionHandler/HtmlSelectTime.php rename to fp-includes/smarty-5.8.5/src/FunctionHandler/HtmlSelectTime.php diff --git a/fp-includes/smarty-5.8.4/src/FunctionHandler/HtmlTable.php b/fp-includes/smarty-5.8.5/src/FunctionHandler/HtmlTable.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/FunctionHandler/HtmlTable.php rename to fp-includes/smarty-5.8.5/src/FunctionHandler/HtmlTable.php diff --git a/fp-includes/smarty-5.8.4/src/FunctionHandler/Mailto.php b/fp-includes/smarty-5.8.5/src/FunctionHandler/Mailto.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/FunctionHandler/Mailto.php rename to fp-includes/smarty-5.8.5/src/FunctionHandler/Mailto.php diff --git a/fp-includes/smarty-5.8.4/src/FunctionHandler/Math.php b/fp-includes/smarty-5.8.5/src/FunctionHandler/Math.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/FunctionHandler/Math.php rename to fp-includes/smarty-5.8.5/src/FunctionHandler/Math.php diff --git a/fp-includes/smarty-5.8.4/src/Lexer/ConfigfileLexer.php b/fp-includes/smarty-5.8.5/src/Lexer/ConfigfileLexer.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Lexer/ConfigfileLexer.php rename to fp-includes/smarty-5.8.5/src/Lexer/ConfigfileLexer.php diff --git a/fp-includes/smarty-5.8.4/src/Lexer/ConfigfileLexer.plex b/fp-includes/smarty-5.8.5/src/Lexer/ConfigfileLexer.plex similarity index 100% rename from fp-includes/smarty-5.8.4/src/Lexer/ConfigfileLexer.plex rename to fp-includes/smarty-5.8.5/src/Lexer/ConfigfileLexer.plex diff --git a/fp-includes/smarty-5.8.4/src/Lexer/TemplateLexer.php b/fp-includes/smarty-5.8.5/src/Lexer/TemplateLexer.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Lexer/TemplateLexer.php rename to fp-includes/smarty-5.8.5/src/Lexer/TemplateLexer.php diff --git a/fp-includes/smarty-5.8.4/src/Lexer/TemplateLexer.plex b/fp-includes/smarty-5.8.5/src/Lexer/TemplateLexer.plex similarity index 100% rename from fp-includes/smarty-5.8.4/src/Lexer/TemplateLexer.plex rename to fp-includes/smarty-5.8.5/src/Lexer/TemplateLexer.plex diff --git a/fp-includes/smarty-5.8.4/src/ParseTree/Base.php b/fp-includes/smarty-5.8.5/src/ParseTree/Base.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/ParseTree/Base.php rename to fp-includes/smarty-5.8.5/src/ParseTree/Base.php diff --git a/fp-includes/smarty-5.8.4/src/ParseTree/Code.php b/fp-includes/smarty-5.8.5/src/ParseTree/Code.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/ParseTree/Code.php rename to fp-includes/smarty-5.8.5/src/ParseTree/Code.php diff --git a/fp-includes/smarty-5.8.4/src/ParseTree/Dq.php b/fp-includes/smarty-5.8.5/src/ParseTree/Dq.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/ParseTree/Dq.php rename to fp-includes/smarty-5.8.5/src/ParseTree/Dq.php diff --git a/fp-includes/smarty-5.8.4/src/ParseTree/DqContent.php b/fp-includes/smarty-5.8.5/src/ParseTree/DqContent.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/ParseTree/DqContent.php rename to fp-includes/smarty-5.8.5/src/ParseTree/DqContent.php diff --git a/fp-includes/smarty-5.8.4/src/ParseTree/Tag.php b/fp-includes/smarty-5.8.5/src/ParseTree/Tag.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/ParseTree/Tag.php rename to fp-includes/smarty-5.8.5/src/ParseTree/Tag.php diff --git a/fp-includes/smarty-5.8.4/src/ParseTree/Template.php b/fp-includes/smarty-5.8.5/src/ParseTree/Template.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/ParseTree/Template.php rename to fp-includes/smarty-5.8.5/src/ParseTree/Template.php diff --git a/fp-includes/smarty-5.8.4/src/ParseTree/Text.php b/fp-includes/smarty-5.8.5/src/ParseTree/Text.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/ParseTree/Text.php rename to fp-includes/smarty-5.8.5/src/ParseTree/Text.php diff --git a/fp-includes/smarty-5.8.4/src/Parser/ConfigfileParser.php b/fp-includes/smarty-5.8.5/src/Parser/ConfigfileParser.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Parser/ConfigfileParser.php rename to fp-includes/smarty-5.8.5/src/Parser/ConfigfileParser.php diff --git a/fp-includes/smarty-5.8.4/src/Parser/ConfigfileParser.y b/fp-includes/smarty-5.8.5/src/Parser/ConfigfileParser.y similarity index 100% rename from fp-includes/smarty-5.8.4/src/Parser/ConfigfileParser.y rename to fp-includes/smarty-5.8.5/src/Parser/ConfigfileParser.y diff --git a/fp-includes/smarty-5.8.4/src/Parser/TemplateParser.php b/fp-includes/smarty-5.8.5/src/Parser/TemplateParser.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Parser/TemplateParser.php rename to fp-includes/smarty-5.8.5/src/Parser/TemplateParser.php diff --git a/fp-includes/smarty-5.8.4/src/Parser/TemplateParser.y b/fp-includes/smarty-5.8.5/src/Parser/TemplateParser.y similarity index 100% rename from fp-includes/smarty-5.8.4/src/Parser/TemplateParser.y rename to fp-includes/smarty-5.8.5/src/Parser/TemplateParser.y diff --git a/fp-includes/smarty-5.8.4/src/Resource/BasePlugin.php b/fp-includes/smarty-5.8.5/src/Resource/BasePlugin.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Resource/BasePlugin.php rename to fp-includes/smarty-5.8.5/src/Resource/BasePlugin.php diff --git a/fp-includes/smarty-5.8.4/src/Resource/CustomPlugin.php b/fp-includes/smarty-5.8.5/src/Resource/CustomPlugin.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Resource/CustomPlugin.php rename to fp-includes/smarty-5.8.5/src/Resource/CustomPlugin.php diff --git a/fp-includes/smarty-5.8.4/src/Resource/ExtendsPlugin.php b/fp-includes/smarty-5.8.5/src/Resource/ExtendsPlugin.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Resource/ExtendsPlugin.php rename to fp-includes/smarty-5.8.5/src/Resource/ExtendsPlugin.php diff --git a/fp-includes/smarty-5.8.4/src/Resource/FilePlugin.php b/fp-includes/smarty-5.8.5/src/Resource/FilePlugin.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Resource/FilePlugin.php rename to fp-includes/smarty-5.8.5/src/Resource/FilePlugin.php diff --git a/fp-includes/smarty-5.8.4/src/Resource/RecompiledPlugin.php b/fp-includes/smarty-5.8.5/src/Resource/RecompiledPlugin.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Resource/RecompiledPlugin.php rename to fp-includes/smarty-5.8.5/src/Resource/RecompiledPlugin.php diff --git a/fp-includes/smarty-5.8.4/src/Resource/StreamPlugin.php b/fp-includes/smarty-5.8.5/src/Resource/StreamPlugin.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Resource/StreamPlugin.php rename to fp-includes/smarty-5.8.5/src/Resource/StreamPlugin.php diff --git a/fp-includes/smarty-5.8.4/src/Resource/StringEval.php b/fp-includes/smarty-5.8.5/src/Resource/StringEval.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Resource/StringEval.php rename to fp-includes/smarty-5.8.5/src/Resource/StringEval.php diff --git a/fp-includes/smarty-5.8.4/src/Resource/StringPlugin.php b/fp-includes/smarty-5.8.5/src/Resource/StringPlugin.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Resource/StringPlugin.php rename to fp-includes/smarty-5.8.5/src/Resource/StringPlugin.php diff --git a/fp-includes/smarty-5.8.4/src/Runtime/Block.php b/fp-includes/smarty-5.8.5/src/Runtime/Block.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Runtime/Block.php rename to fp-includes/smarty-5.8.5/src/Runtime/Block.php diff --git a/fp-includes/smarty-5.8.4/src/Runtime/CaptureRuntime.php b/fp-includes/smarty-5.8.5/src/Runtime/CaptureRuntime.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Runtime/CaptureRuntime.php rename to fp-includes/smarty-5.8.5/src/Runtime/CaptureRuntime.php diff --git a/fp-includes/smarty-5.8.4/src/Runtime/DefaultPluginHandlerRuntime.php b/fp-includes/smarty-5.8.5/src/Runtime/DefaultPluginHandlerRuntime.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Runtime/DefaultPluginHandlerRuntime.php rename to fp-includes/smarty-5.8.5/src/Runtime/DefaultPluginHandlerRuntime.php diff --git a/fp-includes/smarty-5.8.4/src/Runtime/ForeachRuntime.php b/fp-includes/smarty-5.8.5/src/Runtime/ForeachRuntime.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Runtime/ForeachRuntime.php rename to fp-includes/smarty-5.8.5/src/Runtime/ForeachRuntime.php diff --git a/fp-includes/smarty-5.8.4/src/Runtime/InheritanceRuntime.php b/fp-includes/smarty-5.8.5/src/Runtime/InheritanceRuntime.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Runtime/InheritanceRuntime.php rename to fp-includes/smarty-5.8.5/src/Runtime/InheritanceRuntime.php diff --git a/fp-includes/smarty-5.8.4/src/Runtime/TplFunctionRuntime.php b/fp-includes/smarty-5.8.5/src/Runtime/TplFunctionRuntime.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Runtime/TplFunctionRuntime.php rename to fp-includes/smarty-5.8.5/src/Runtime/TplFunctionRuntime.php diff --git a/fp-includes/smarty-5.8.4/src/Security.php b/fp-includes/smarty-5.8.5/src/Security.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Security.php rename to fp-includes/smarty-5.8.5/src/Security.php diff --git a/fp-includes/smarty-5.8.4/src/Smarty.php b/fp-includes/smarty-5.8.5/src/Smarty.php similarity index 99% rename from fp-includes/smarty-5.8.4/src/Smarty.php rename to fp-includes/smarty-5.8.5/src/Smarty.php index 729f33b14..d2ba4fabe 100644 --- a/fp-includes/smarty-5.8.4/src/Smarty.php +++ b/fp-includes/smarty-5.8.5/src/Smarty.php @@ -54,7 +54,7 @@ class Smarty extends \Smarty\TemplateBase { /** * smarty version */ - const SMARTY_VERSION = '5.8.4'; + const SMARTY_VERSION = '5.8.5'; /** * define caching modes diff --git a/fp-includes/smarty-5.8.4/src/Template.php b/fp-includes/smarty-5.8.5/src/Template.php similarity index 99% rename from fp-includes/smarty-5.8.4/src/Template.php rename to fp-includes/smarty-5.8.5/src/Template.php index 5a8363a54..04c3115cf 100644 --- a/fp-includes/smarty-5.8.4/src/Template.php +++ b/fp-includes/smarty-5.8.5/src/Template.php @@ -535,7 +535,7 @@ public function setLeftDelimiter($left_delimiter) */ public function getRightDelimiter() { - return $this->right_delimiter ?? $this->getSmarty()->getRightDelimiter();; + return $this->right_delimiter ?? $this->getSmarty()->getRightDelimiter(); } /** diff --git a/fp-includes/smarty-5.8.4/src/Template/Cached.php b/fp-includes/smarty-5.8.5/src/Template/Cached.php similarity index 87% rename from fp-includes/smarty-5.8.4/src/Template/Cached.php rename to fp-includes/smarty-5.8.5/src/Template/Cached.php index 78635db06..780599c0a 100644 --- a/fp-includes/smarty-5.8.4/src/Template/Cached.php +++ b/fp-includes/smarty-5.8.5/src/Template/Cached.php @@ -300,22 +300,42 @@ private function removeNoCacheHash(Template $_template, $no_output_filter) { $php_pattern = '/(<%|%>|<\?php|<\?|\?>|)/'; $content = ob_get_clean(); $hash_array = $this->hashes; - $hash_array[$_template->getCompiled()->nocache_hash] = true; - $hash_array = array_keys($hash_array); - $nocache_hash = '(' . implode('|', $hash_array) . ')'; + // Only fold in the top-level nocache hash when it is actually set. A template + // compiled through the inheritance/component path produces a top-level unifunc + // that never restores its nocache_hash, leaving it null here. Using that null as + // an array offset is deprecated (PHP 8.1+), and an empty hash would produce an + // empty alternative "(realhash|)" in the pattern below, letting attacker-controlled + // output forge a nocache marker whose raw content is copied verbatim into the cache + // file (skipping PHP-tag neutralization) and executed as PHP on the next include + // (CWE-94 code injection). + if ((string) $_template->getCompiled()->nocache_hash !== '') { + $hash_array[$_template->getCompiled()->nocache_hash] = true; + } + // Defensive: never allow an empty hash (hence an empty regex alternative). + $hash_array = array_filter(array_keys($hash_array), function ($hash) { + return (string) $hash !== ''; + }); $_template->getCached()->setNocacheCode(false); - // get text between non-cached items - $cache_split = - preg_split( + if ($hash_array === []) { + // No known nocache hashes: there is no legitimate nocache content to extract, + // so treat the whole buffer as ordinary output (PHP tags are neutralized below). + $cache_split = [$content]; + $cache_parts = []; + } else { + $nocache_hash = '(' . implode('|', $hash_array) . ')'; + // get text between non-cached items + $cache_split = + preg_split( + "!/\*%%SmartyNocache:{$nocache_hash}%%\*\/(.+?)/\*/%%SmartyNocache:{$nocache_hash}%%\*/!s", + $content + ); + // get non-cached items + preg_match_all( "!/\*%%SmartyNocache:{$nocache_hash}%%\*\/(.+?)/\*/%%SmartyNocache:{$nocache_hash}%%\*/!s", - $content + $content, + $cache_parts ); - // get non-cached items - preg_match_all( - "!/\*%%SmartyNocache:{$nocache_hash}%%\*\/(.+?)/\*/%%SmartyNocache:{$nocache_hash}%%\*/!s", - $content, - $cache_parts - ); + } $content = ''; // loop over items, stitch back together foreach ($cache_split as $curr_idx => $curr_split) { diff --git a/fp-includes/smarty-5.8.4/src/Template/Compiled.php b/fp-includes/smarty-5.8.5/src/Template/Compiled.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Template/Compiled.php rename to fp-includes/smarty-5.8.5/src/Template/Compiled.php diff --git a/fp-includes/smarty-5.8.4/src/Template/Config.php b/fp-includes/smarty-5.8.5/src/Template/Config.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Template/Config.php rename to fp-includes/smarty-5.8.5/src/Template/Config.php diff --git a/fp-includes/smarty-5.8.4/src/Template/GeneratedPhpFile.php b/fp-includes/smarty-5.8.5/src/Template/GeneratedPhpFile.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Template/GeneratedPhpFile.php rename to fp-includes/smarty-5.8.5/src/Template/GeneratedPhpFile.php diff --git a/fp-includes/smarty-5.8.4/src/Template/Source.php b/fp-includes/smarty-5.8.5/src/Template/Source.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Template/Source.php rename to fp-includes/smarty-5.8.5/src/Template/Source.php diff --git a/fp-includes/smarty-5.8.4/src/TemplateBase.php b/fp-includes/smarty-5.8.5/src/TemplateBase.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/TemplateBase.php rename to fp-includes/smarty-5.8.5/src/TemplateBase.php diff --git a/fp-includes/smarty-5.8.4/src/TestInstall.php b/fp-includes/smarty-5.8.5/src/TestInstall.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/TestInstall.php rename to fp-includes/smarty-5.8.5/src/TestInstall.php diff --git a/fp-includes/smarty-5.8.4/src/UndefinedVariable.php b/fp-includes/smarty-5.8.5/src/UndefinedVariable.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/UndefinedVariable.php rename to fp-includes/smarty-5.8.5/src/UndefinedVariable.php diff --git a/fp-includes/smarty-5.8.4/src/Variable.php b/fp-includes/smarty-5.8.5/src/Variable.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/Variable.php rename to fp-includes/smarty-5.8.5/src/Variable.php diff --git a/fp-includes/smarty-5.8.4/src/debug.tpl b/fp-includes/smarty-5.8.5/src/debug.tpl similarity index 100% rename from fp-includes/smarty-5.8.4/src/debug.tpl rename to fp-includes/smarty-5.8.5/src/debug.tpl diff --git a/fp-includes/smarty-5.8.4/src/functions.php b/fp-includes/smarty-5.8.5/src/functions.php similarity index 100% rename from fp-includes/smarty-5.8.4/src/functions.php rename to fp-includes/smarty-5.8.5/src/functions.php