From 462efddfdf0fab1517b2945c813d27d26e82e69d Mon Sep 17 00:00:00 2001
From: Uwe Tews <uwe.tews@googlemail.com>
Date: Sat, 7 Oct 2017 08:22:00 +0200
Subject: [PATCH] Update for 3.1.32-dev-23

---
 tests/CleanUp.php                             |  42 ++---
 .../A_1/ProtectedFolderVars/cache/dummy.txt   |   1 +
 .../ProtectedFolderVars/templates_c/dummy.txt |   1 +
 .../A_2/UndefinedTemplateVar/cache/dummy.txt  |   1 +
 .../templates_c/dummy.txt                     |   1 +
 .../A_Core/AutoEscape/cache/dummy.txt         |   1 +
 .../A_Core/AutoEscape/templates_c/dummy.txt   |   1 +
 tests/UnitTests/A_Core/Filter/cache/dummy.txt |   1 +
 .../A_Core/Filter/templates_c/dummy.txt       |   1 +
 .../A_Core/GetterSetter/cache/dummy.txt       |   1 +
 .../A_Core/GetterSetter/templates_c/dummy.txt |   1 +
 .../A_Core/LoadPlugin/cache/dummy.txt         |   1 +
 .../A_Core/LoadPlugin/templates_c/dummy.txt   |   1 +
 .../A_Core/MuteExpectedErrors/cache/dummy.txt |   1 +
 .../MuteExpectedErrors/templates_c/dummy.txt  |   1 +
 .../A_Core/PluginTests/Shared/cache/dummy.txt |   1 +
 .../PluginTests/Shared/templates_c/dummy.txt  |   1 +
 .../A_Core/PluginTests/cache/dummy.txt        |   1 +
 .../A_Core/PluginTests/templates_c/dummy.txt  |   1 +
 .../UnitTests/A_Core/SmartyBC/cache/dummy.txt |   1 +
 .../A_Core/SmartyBC/templates_c/dummy.txt     |   1 +
 .../CacheModify/ModifiedSince/cache/dummy.txt |   1 +
 .../ModifiedSince/templates_c/dummy.txt       |   1 +
 .../CacheResourceTests/File/cache/dummy.txt   |   1 +
 .../File/templates_c/dummy.txt                |   1 +
 .../Memcache/templates_c/dummy.txt            |   1 +
 .../CacheResourceTests/Mysql/cache/dummy.txt  |   1 +
 .../Mysql/templates_c/dummy.txt               |   1 +
 .../Registered/templates_c/dummy.txt          |   1 +
 .../_shared/PHPunitplugins/dummy.txt          |   1 +
 .../_shared/templates/dummy.txt               |   1 +
 .../Compiler/CompilerPlugin/cache/dummy.txt   |   1 +
 .../CompilerPlugin/templates_c/dummy.txt      |   1 +
 .../Compiler/Delimiter/AutoLiteralTest.php    |  31 ++--
 .../Compiler/Delimiter/DelimiterTest.php      |  10 ++
 .../Compiler/Delimiter/UserLiteralTest.php    |  66 +++++++
 .../Compiler/Delimiter/cache/dummy.txt        |   1 +
 .../Delimiter/templates/autoliteral.tpl       |   1 +
 .../Delimiter/templates/autoliteralblock.tpl  |   1 +
 .../Delimiter/templates/userliteral.tpl       |   1 +
 .../Delimiter/templates/userliteral1.tpl      |   1 +
 .../Delimiter/templates/userliteral2.tpl      |   1 +
 .../Compiler/Delimiter/templates_c/dummy.txt  |   1 +
 .../defaultHandler/templates_c/dummy.txt      |   1 +
 .../file/templates_c/dummy.txt                |   1 +
 .../Ambiguous/CustomResourceAmbiguousTest.php |   2 +-
 .../Custom/Ambiguous/cache/dummy.txt          |   1 +
 .../Custom/Ambiguous/templates_c/dummy.txt    |   1 +
 .../DemoPluginExtendsAll/cache/dummy.txt      |   1 +
 .../templates_c/dummy.txt                     |   1 +
 .../Custom/DemoPluginMysql/cache/dummy.txt    |   1 +
 .../DemoPluginMysql/templates_c/dummy.txt     |   1 +
 .../DefaultHandler/cache/dummy.txt            |   1 +
 .../DefaultHandler/templates_c/dummy.txt      |   1 +
 .../ResourceTests/Eval/cache/dummy.txt        |   1 +
 .../ResourceTests/Eval/templates_c/dummy.txt  |   1 +
 .../ResourceTests/Extends/cache/dummy.txt     |   1 +
 .../Extends/templates_c/dummy.txt             |   1 +
 .../ResourceTests/File/cache/dummy.txt        |   1 +
 .../ResourceTests/File/templates_c/dummy.txt  |   1 +
 .../FileIncludePath/cache/dummy.txt           |   1 +
 .../FileIncludePath/templates_c/dummy.txt     |   1 +
 .../ResourceTests/FileIndexed/cache/dummy.txt |   1 +
 .../FileIndexed/templates_c/dummy.txt         |   1 +
 .../ResourceTests/Php/cache/dummy.txt         |   1 +
 .../ResourceTests/Php/templates_c/dummy.txt   |   1 +
 .../ResourceTests/Registered/cache/dummy.txt  |   1 +
 .../Registered/templates_c/dummy.txt          |   1 +
 .../ResourcePlugins/cache/dummy.txt           |   1 +
 .../ResourcePlugins/templates_c/dummy.txt     |   1 +
 .../ResourceTests/Stream/cache/dummy.txt      |   1 +
 .../Stream/templates_c/dummy.txt              |   1 +
 .../ResourceTests/String/cache/dummy.txt      |   1 +
 .../String/templates_c/dummy.txt              |   1 +
 tests/UnitTests/SecurityTests/cache/dummy.txt |   1 +
 .../SecurityTests/templates_c/dummy.txt       |   1 +
 .../SmartyMethodsTests/Append/cache/dummy.txt |   1 +
 .../Append/templates_c/dummy.txt              |   1 +
 .../AppendByRef/cache/dummy.txt               |   1 +
 .../AppendByRef/templates_c/dummy.txt         |   1 +
 .../SmartyMethodsTests/Assign/cache/dummy.txt |   1 +
 .../Assign/templates_c/dummy.txt              |   1 +
 .../AssignByRef/cache/dummy.txt               |   1 +
 .../AssignByRef/templates_c/dummy.txt         |   1 +
 .../AssignGlobal/cache/dummy.txt              |   1 +
 .../AssignGlobal/templates_c/dummy.txt        |   1 +
 .../ClearAllAssign/cache/dummy.txt            |   1 +
 .../ClearAllAssign/templates_c/dummy.txt      |   1 +
 .../ClearAssign/cache/dummy.txt               |   1 +
 .../ClearAssign/templates_c/dummy.txt         |   1 +
 .../ClearCompiledTemplate/cache/dummy.txt     |   1 +
 .../templates_c/dummy.txt                     |   1 +
 .../GetTemplateVars/cache/dummy.txt           |   1 +
 .../GetTemplateVars/templates_c/dummy.txt     |   1 +
 .../RegisterBlock/cache/dummy.txt             |   1 +
 .../RegisterBlock/templates_c/dummy.txt       |   1 +
 .../RegisterCompiler/cache/dummy.txt          |   1 +
 .../RegisterCompiler/templates_c/dummy.txt    |   1 +
 .../RegisterFunction/cache/dummy.txt          |   1 +
 .../RegisterFunction/templates_c/dummy.txt    |   1 +
 .../RegisterModifier/cache/dummy.txt          |   1 +
 .../RegisterModifier/templates_c/dummy.txt    |   1 +
 .../RegisterObject/cache/dummy.txt            |   1 +
 .../RegisterObject/templates_c/dummy.txt      |   1 +
 .../TemplateExist/cache/dummy.txt             |   1 +
 .../TemplateExist/templates_c/dummy.txt       |   1 +
 .../TemplateSource/Comments/cache/dummy.txt   |   1 +
 .../Comments/templates_c/dummy.txt            |   1 +
 .../TemplateSource/Spacing/cache/dummy.txt    |   1 +
 .../Spacing/templates_c/dummy.txt             |   1 +
 .../StaticClass/cache/dummy.txt               |   1 +
 .../StaticClass/templates_c/dummy.txt         |   1 +
 .../TagTests/Append/templates_c/dummy.txt     |   1 +
 .../TagTests/Append/templates_tmp/dummy.txt   |   1 +
 .../TagTests/Assign/templates_c/dummy.txt     |   1 +
 .../TagTests/Assign/templates_tmp/dummy.txt   |   1 +
 .../TagTests/BlockPlugin/cache/dummy.txt      |   1 +
 .../BlockPlugin/templates_c/dummy.txt         |   1 +
 .../TagTests/BockExtend/cache/dummy.txt       |   1 +
 .../TagTests/BockExtend/templates_c/dummy.txt |   1 +
 .../TagTests/Capture/cache/dummy.txt          |   1 +
 .../TagTests/Capture/templates_c/dummy.txt    |   1 +
 .../TagTests/Capture/templates_tmp/dummy.txt  |   1 +
 .../TagTests/CompilerPlugin/cache/dummy.txt   |   1 +
 .../CompilerPlugin/templates_c/dummy.txt      |   1 +
 .../TagTests/ConfigLoad/cache/dummy.txt       |   1 +
 .../TagTests/ConfigLoad/templates_c/dummy.txt |   1 +
 .../TagTests/Delimiter/cache/dummy.txt        |   1 +
 .../TagTests/Delimiter/templates_c/dummy.txt  |   1 +
 .../TagTests/Eval/cache/dummy.txt             |   1 +
 .../TagTests/Eval/templates_c/dummy.txt       |   1 +
 .../TagTests/For/cache/dummy.txt              |   1 +
 .../TagTests/For/templates_c/dummy.txt        |   1 +
 .../TagTests/Foreach/cache/dummy.txt          |   1 +
 .../TagTests/Foreach/templates_c/dummy.txt    |   1 +
 .../TagTests/Foreach/templates_tmp/dummy.txt  |   1 +
 .../TagTests/FunctionPlugin/cache/dummy.txt   |   1 +
 .../FunctionPlugin/templates_c/dummy.txt      |   1 +
 .../TagTests/If/CompileIfTest.php             | 145 ++++------------
 .../TagTests/If/cache/dummy.txt               |   1 +
 .../TagTests/If/templates_c/dummy.txt         |   1 +
 .../TagTests/If/templates_tmp/dummy.txt       |   1 +
 .../TagTests/Include/cache/dummy.txt          |   1 +
 .../TagTests/Include/templates_c/dummy.txt    |   1 +
 .../TagTests/IncludePhp/cache/dummy.txt       |   1 +
 .../TagTests/IncludePhp/templates_c/dummy.txt |   1 +
 .../TagTests/Insert/cache/dummy.txt           |   1 +
 .../TagTests/Insert/templates_c/dummy.txt     |   1 +
 .../TagTests/Literal/cache/dummy.txt          |   1 +
 .../TagTests/Literal/templates_c/dummy.txt    |   1 +
 .../TagTests/MakeNocache/cache/dummy.txt      |   1 +
 .../MakeNocache/templates_c/dummy.txt         |   1 +
 .../TagTests/Nocache/cache/dummy.txt          |   1 +
 .../TagTests/Nocache/templates_c/dummy.txt    |   1 +
 .../TagTests/Php/CompilePhpTest.php           |  40 ++++-
 .../PHP_ALLOW_asp_tpl_3/ea/3f/ab/dummy.txt    |   1 +
 .../PHP_ALLOW_php2_tpl_3/29/c4/f2/dummy.txt   |   1 +
 .../8b/3c/38/dummy.txt                        |   1 +
 .../db/b0/18/dummy.txt                        |   1 +
 .../PHP_ALLOW_php_tpl_3/cd/1a/7e/dummy.txt    |   1 +
 .../59/5e/e8/dummy.txt                        |   1 +
 .../9f/3e/92/dummy.txt                        |   1 +
 .../ac/c4/1a/dummy.txt                        |   1 +
 .../PHP_ALLOW_phptag_tpl_3/37/9e/e6/dummy.txt |   1 +
 .../PHP_ALLOW_script_tpl_3/06/ed/7e/dummy.txt |   1 +
 .../PHP_PASSTHRU_asp_tpl_0/ea/3f/ab/dummy.txt |   1 +
 .../29/c4/f2/dummy.txt                        |   1 +
 .../8b/3c/38/dummy.txt                        |   1 +
 .../db/b0/18/dummy.txt                        |   1 +
 .../PHP_PASSTHRU_php_tpl_0/cd/1a/7e/dummy.txt |   1 +
 .../06/ed/7e/dummy.txt                        |   1 +
 .../PHP_QUOTE_asp_tpl_1/ea/3f/ab/dummy.txt    |   1 +
 .../PHP_QUOTE_php2_tpl_1/29/c4/f2/dummy.txt   |   1 +
 .../8b/3c/38/dummy.txt                        |   1 +
 .../db/b0/18/dummy.txt                        |   1 +
 .../PHP_QUOTE_php_tpl_1/cd/1a/7e/dummy.txt    |   1 +
 .../PHP_QUOTE_script_tpl_1/06/ed/7e/dummy.txt |   1 +
 .../PHP_REMOVE_asp_tpl_2/ea/3f/ab/dummy.txt   |   1 +
 .../PHP_REMOVE_php2_tpl_2/29/c4/f2/dummy.txt  |   1 +
 .../8b/3c/38/dummy.txt                        |   1 +
 .../db/b0/18/dummy.txt                        |   1 +
 .../PHP_REMOVE_php_tpl_2/cd/1a/7e/dummy.txt   |   1 +
 .../06/ed/7e/dummy.txt                        |   1 +
 .../Php/cache/Tag_nocache/bc/55/66/dummy.txt  |   1 +
 .../TagTests/Php/templates/script.tpl         |   6 +-
 .../PHP_ALLOW_asp_tpl_3/5b/3f/86/dummy.txt    |   1 +
 .../PHP_ALLOW_php2_tpl_3/8e/21/07/dummy.txt   |   1 +
 .../ef/5c/4b/dummy.txt                        |   1 +
 .../6a/95/aa/dummy.txt                        |   1 +
 .../PHP_ALLOW_php_tpl_3/de/87/f4/dummy.txt    |   1 +
 .../56/75/8d/dummy.txt                        |   1 +
 .../fd/2a/b7/dummy.txt                        |   1 +
 .../26/72/1e/dummy.txt                        |   1 +
 .../PHP_ALLOW_phptag_tpl_3/c8/c7/c5/dummy.txt |   1 +
 .../PHP_ALLOW_script_tpl_3/41/7c/8a/dummy.txt |   1 +
 .../PHP_PASSTHRU_asp_tpl_0/5b/3f/86/dummy.txt |   1 +
 .../8e/21/07/dummy.txt                        |   1 +
 .../ef/5c/4b/dummy.txt                        |   1 +
 .../6a/95/aa/dummy.txt                        |   1 +
 .../PHP_PASSTHRU_php_tpl_0/de/87/f4/dummy.txt |   1 +
 .../41/7c/8a/dummy.txt                        |   1 +
 .../PHP_QUOTE_asp_tpl_1/5b/3f/86/dummy.txt    |   1 +
 .../PHP_QUOTE_php2_tpl_1/8e/21/07/dummy.txt   |   1 +
 .../ef/5c/4b/dummy.txt                        |   1 +
 .../6a/95/aa/dummy.txt                        |   1 +
 .../PHP_QUOTE_php_tpl_1/de/87/f4/dummy.txt    |   1 +
 .../PHP_QUOTE_script_tpl_1/41/7c/8a/dummy.txt |   1 +
 .../PHP_REMOVE_asp_tpl_2/5b/3f/86/dummy.txt   |   1 +
 .../PHP_REMOVE_php2_tpl_2/8e/21/07/dummy.txt  |   1 +
 .../ef/5c/4b/dummy.txt                        |   1 +
 .../6a/95/aa/dummy.txt                        |   1 +
 .../PHP_REMOVE_php_tpl_2/de/87/f4/dummy.txt   |   1 +
 .../41/7c/8a/dummy.txt                        |   1 +
 .../Tag_nocache/80/9d/fb/dummy.txt            |   1 +
 .../testPHPfooPlugin/ab/4c/1d/dummy.txt       |   1 +
 .../TagTests/PluginBlock/cache/dummy.txt      |   1 +
 .../PluginBlock/templates_c/dummy.txt         |   1 +
 .../TagTests/PluginFunction/cache/dummy.txt   |   1 +
 .../PluginFunction/templates_c/dummy.txt      |   1 +
 .../TagTests/PluginModifier/cache/dummy.txt   |   1 +
 .../PluginModifier/templates_c/dummy.txt      |   1 +
 .../TagTests/Section/cache/dummy.txt          |   1 +
 .../TagTests/Section/templates_c/dummy.txt    |   1 +
 .../TagTests/SetFilter/cache/dummy.txt        |   1 +
 .../TagTests/SetFilter/templates_c/dummy.txt  |   1 +
 .../TagTests/Strip/templates_c/dummy.txt      |   1 +
 .../TagTests/Strip/templates_tmp/dummy.txt    |   1 +
 .../TagTests/TemplateFunction/cache/dummy.txt |   1 +
 .../TemplateFunction/templates_c/dummy.txt    |   1 +
 .../TagTests/While/cache/dummy.txt            |   1 +
 .../TagTests/While/templates_c/dummy.txt      |   1 +
 .../TagTests/_Attributes/cache/dummy.txt      |   1 +
 .../_Attributes/templates_c/dummy.txt         |   1 +
 .../TagTests/_Error/cache/dummy.txt           |   1 +
 .../TagTests/_Error/templates_c/dummy.txt     |   1 +
 .../TagTests/_Print/cache/dummy.txt           |   1 +
 .../TagTests/_Print/templates_c/dummy.txt     |   1 +
 .../TagTests/break/cache/dummy.txt            |   1 +
 .../TagTests/break/templates_c/dummy.txt      |   1 +
 .../ValueTests/Array/cache/dummy.txt          |   1 +
 .../ValueTests/Array/templates_c/dummy.txt    |   1 +
 .../ValueTests/BoolenNull/cache/dummy.txt     |   1 +
 .../BoolenNull/templates_c/dummy.txt          |   1 +
 .../ValueTests/ConstantTests/cache/dummy.txt  |   1 +
 .../ConstantTests/templates_c/dummy.txt       |   1 +
 .../ValueTests/DoubleQuoted/cache/dummy.txt   |   1 +
 .../DoubleQuoted/templates_c/dummy.txt        |   1 +
 .../ValueTests/Math/cache/dummy.txt           |   1 +
 .../ValueTests/Math/templates_c/dummy.txt     |   1 +
 .../ValueTests/Modifier/ModifierTest.php      | 163 +++++-------------
 .../ValueTests/Modifier/cache/dummy.txt       |   1 +
 .../templates/testModifier_Default.tpl        |   1 +
 .../testModifier_RegisteredMethod.tpl         |   1 +
 .../testModifier_RegisteredStatic.tpl         |   1 +
 .../ValueTests/Modifier/templates_c/dummy.txt |   1 +
 .../Modifier/templates_tmp/dummy.txt          |   1 +
 .../ValueTests/Objects/cache/dummy.txt        |   1 +
 .../ValueTests/Objects/templates_c/dummy.txt  |   1 +
 .../ValueTests/PHPfunctions/cache/dummy.txt   |   1 +
 .../PHPfunctions/templates_c/dummy.txt        |   1 +
 .../ValueTests/SingleQouted/cache/dummy.txt   |   1 +
 .../SingleQouted/templates_c/dummy.txt        |   1 +
 .../Constant/cache/dummy.txt                  |   1 +
 .../Constant/templates_c/dummy.txt            |   1 +
 .../SmartySpecialVars/Cookie/cache/dummy.txt  |   1 +
 .../Cookie/templates_c/dummy.txt              |   1 +
 .../Delimiter/cache/dummy.txt                 |   1 +
 .../Delimiter/templates_c/dummy.txt           |   1 +
 .../SmartySpecialVars/Error/cache/dummy.txt   |   1 +
 .../Error/templates_c/dummy.txt               |   1 +
 .../SmartySpecialVars/Now/cache/dummy.txt     |   1 +
 .../Now/templates_c/dummy.txt                 |   1 +
 .../SmartySpecialVars/Post/cache/dummy.txt    |   1 +
 .../Post/templates_c/dummy.txt                |   1 +
 .../TemplateObject/cache/dummy.txt            |   1 +
 .../TemplateObject/templates_c/dummy.txt      |   1 +
 .../SmartySpecialVars/Version/cache/dummy.txt |   1 +
 .../Version/templates_c/dummy.txt             |   1 +
 .../Variables/Stream/cache/dummy.txt          |   1 +
 .../Variables/Stream/templates_c/dummy.txt    |   1 +
 .../VariableVariable/cache/dummy.txt          |   1 +
 .../VariableVariable/templates_c/dummy.txt    |   1 +
 .../TemplateSource/X_Scopes/cache/dummy.txt   |   1 +
 .../X_Scopes/templates_c/dummy.txt            |   1 +
 .../X_Scopes/templates_tmp/dummy.txt          |   1 +
 .../TemplateSource/Xml/cache/dummy.txt        |   1 +
 .../TemplateSource/Xml/templates_c/dummy.txt  |   1 +
 .../_Issues/327/cache/dummy.txt               |   1 +
 .../_Issues/327/templates_c/dummy.txt         |   1 +
 .../PHPunitplugins/block.dummyblock.php       |  23 +++
 290 files changed, 523 insertions(+), 285 deletions(-)
 create mode 100644 tests/UnitTests/Compiler/Delimiter/UserLiteralTest.php
 create mode 100644 tests/UnitTests/Compiler/Delimiter/templates/autoliteral.tpl
 create mode 100644 tests/UnitTests/Compiler/Delimiter/templates/autoliteralblock.tpl
 create mode 100644 tests/UnitTests/Compiler/Delimiter/templates/userliteral.tpl
 create mode 100644 tests/UnitTests/Compiler/Delimiter/templates/userliteral1.tpl
 create mode 100644 tests/UnitTests/Compiler/Delimiter/templates/userliteral2.tpl
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/Append/templates_tmp/dummy.txt
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/Assign/templates_tmp/dummy.txt
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/Capture/templates_tmp/dummy.txt
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/Foreach/templates_tmp/dummy.txt
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/If/templates_tmp/dummy.txt
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_ALLOW_asp_tpl_3/ea/3f/ab/dummy.txt
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_ALLOW_php2_tpl_3/29/c4/f2/dummy.txt
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_ALLOW_php_block_comment_tpl_3/8b/3c/38/dummy.txt
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_ALLOW_php_line_comment_tpl_3/db/b0/18/dummy.txt
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_ALLOW_php_tpl_3/cd/1a/7e/dummy.txt
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_ALLOW_phptag_block_comment_tpl_3/59/5e/e8/dummy.txt
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_ALLOW_phptag_line_comment_tpl_3/9f/3e/92/dummy.txt
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_ALLOW_phptag_literal_tpl_3/ac/c4/1a/dummy.txt
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_ALLOW_phptag_tpl_3/37/9e/e6/dummy.txt
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_ALLOW_script_tpl_3/06/ed/7e/dummy.txt
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_PASSTHRU_asp_tpl_0/ea/3f/ab/dummy.txt
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_PASSTHRU_php2_tpl_0/29/c4/f2/dummy.txt
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_PASSTHRU_php_block_comment_tpl_0/8b/3c/38/dummy.txt
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_PASSTHRU_php_line_comment_tpl_0/db/b0/18/dummy.txt
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_PASSTHRU_php_tpl_0/cd/1a/7e/dummy.txt
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_PASSTHRU_script_tpl_0/06/ed/7e/dummy.txt
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_QUOTE_asp_tpl_1/ea/3f/ab/dummy.txt
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_QUOTE_php2_tpl_1/29/c4/f2/dummy.txt
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_QUOTE_php_block_comment_tpl_1/8b/3c/38/dummy.txt
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_QUOTE_php_line_comment_tpl_1/db/b0/18/dummy.txt
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_QUOTE_php_tpl_1/cd/1a/7e/dummy.txt
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_QUOTE_script_tpl_1/06/ed/7e/dummy.txt
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_REMOVE_asp_tpl_2/ea/3f/ab/dummy.txt
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_REMOVE_php2_tpl_2/29/c4/f2/dummy.txt
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_REMOVE_php_block_comment_tpl_2/8b/3c/38/dummy.txt
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_REMOVE_php_line_comment_tpl_2/db/b0/18/dummy.txt
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_REMOVE_php_tpl_2/cd/1a/7e/dummy.txt
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_REMOVE_script_tpl_2/06/ed/7e/dummy.txt
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/Php/cache/Tag_nocache/bc/55/66/dummy.txt
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_ALLOW_asp_tpl_3/5b/3f/86/dummy.txt
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_ALLOW_php2_tpl_3/8e/21/07/dummy.txt
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_ALLOW_php_block_comment_tpl_3/ef/5c/4b/dummy.txt
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_ALLOW_php_line_comment_tpl_3/6a/95/aa/dummy.txt
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_ALLOW_php_tpl_3/de/87/f4/dummy.txt
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_ALLOW_phptag_block_comment_tpl_3/56/75/8d/dummy.txt
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_ALLOW_phptag_line_comment_tpl_3/fd/2a/b7/dummy.txt
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_ALLOW_phptag_literal_tpl_3/26/72/1e/dummy.txt
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_ALLOW_phptag_tpl_3/c8/c7/c5/dummy.txt
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_ALLOW_script_tpl_3/41/7c/8a/dummy.txt
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_PASSTHRU_asp_tpl_0/5b/3f/86/dummy.txt
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_PASSTHRU_php2_tpl_0/8e/21/07/dummy.txt
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_PASSTHRU_php_block_comment_tpl_0/ef/5c/4b/dummy.txt
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_PASSTHRU_php_line_comment_tpl_0/6a/95/aa/dummy.txt
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_PASSTHRU_php_tpl_0/de/87/f4/dummy.txt
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_PASSTHRU_script_tpl_0/41/7c/8a/dummy.txt
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_QUOTE_asp_tpl_1/5b/3f/86/dummy.txt
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_QUOTE_php2_tpl_1/8e/21/07/dummy.txt
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_QUOTE_php_block_comment_tpl_1/ef/5c/4b/dummy.txt
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_QUOTE_php_line_comment_tpl_1/6a/95/aa/dummy.txt
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_QUOTE_php_tpl_1/de/87/f4/dummy.txt
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_QUOTE_script_tpl_1/41/7c/8a/dummy.txt
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_REMOVE_asp_tpl_2/5b/3f/86/dummy.txt
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_REMOVE_php2_tpl_2/8e/21/07/dummy.txt
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_REMOVE_php_block_comment_tpl_2/ef/5c/4b/dummy.txt
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_REMOVE_php_line_comment_tpl_2/6a/95/aa/dummy.txt
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_REMOVE_php_tpl_2/de/87/f4/dummy.txt
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_REMOVE_script_tpl_2/41/7c/8a/dummy.txt
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/Php/templates_c/Tag_nocache/80/9d/fb/dummy.txt
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/Php/templates_c/testPHPfooPlugin/ab/4c/1d/dummy.txt
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/Strip/templates_tmp/dummy.txt
 create mode 100644 tests/UnitTests/TemplateSource/ValueTests/Modifier/templates/testModifier_Default.tpl
 create mode 100644 tests/UnitTests/TemplateSource/ValueTests/Modifier/templates/testModifier_RegisteredMethod.tpl
 create mode 100644 tests/UnitTests/TemplateSource/ValueTests/Modifier/templates/testModifier_RegisteredStatic.tpl
 create mode 100644 tests/UnitTests/TemplateSource/ValueTests/Modifier/templates_tmp/dummy.txt
 create mode 100644 tests/UnitTests/TemplateSource/X_Scopes/templates_tmp/dummy.txt
 create mode 100644 tests/UnitTests/__shared/PHPunitplugins/block.dummyblock.php

diff --git a/tests/CleanUp.php b/tests/CleanUp.php
index 3fe84a77..d03c0b67 100644
--- a/tests/CleanUp.php
+++ b/tests/CleanUp.php
@@ -3,29 +3,29 @@
 * This file is part of the Smarty PHPUnit tests.
 *
 */
-foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator(dirname(__FILE__), FilesystemIterator::SKIP_DOTS),
-                                       RecursiveIteratorIterator::CHILD_FIRST) as $path) {
+foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator(dirname(__FILE__), FilesystemIterator::SKIP_DOTS)) as $path)
+{
     $p = $path->getPathname();
-    if ((strpos($p, '\coverage') !== false) ||
-        ((strpos($p, '\templates_c') === false) && (strpos($p, '\cache\\') === false) &&
-            (strpos($p, '\templates_tmp') === false))
-    ) {
-        continue;
-    }
-    $p = $path->getPathname();
-    $i = 1;
-    //$path->isDir() && !$path->isLink() ? rmdir($path->getPathname()) : unlink($path->getPathname());
-    if ($path->isDir() && !$path->isLink()) {
-        if (strpos($p, '\templates_tmp') !== false) {
-            rmdir($path->getPathname());
-        } else {
-            touch($path->getPathname() . '/dummy.txt');
-        }
-    } else {
-        unlink($path->getPathname());
-        if (strpos($p, '\templates_tmp') === false) {
-            touch($path->getPath() . '/dummy.txt');
+    if ((strpos($p, '\templates_c') !== false) || (strpos($p, '\cache') !== false) ||
+        (strpos($p, '\templates_tmp') !== false)) {
+        $path2 = $path;
+       $pp = $path->getPath();
+        foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($path->getPath(). '\\', FilesystemIterator::SKIP_DOTS),
+                                               RecursiveIteratorIterator::CHILD_FIRST) as $path2) {
+            $p2 = $path2->getPathname();
+            if ((strpos($p2, '\templates_c\\') !== false) || (strpos($p2, '\cache\\') !== false) ||
+                (strpos($p2, '\templates_tmp\\') !== false)) {
+                if ($path2->isDir() && !$path2->isLink()) {
+                    rmdir($p2);
+                } else {
+                    unlink($p2);
+                }
+            }
         }
+        $name = $pp. '\dummy.txt';
+
+        file_put_contents($name,'dummy');
     }
 }
 
+
diff --git a/tests/UnitTests/A_1/ProtectedFolderVars/cache/dummy.txt b/tests/UnitTests/A_1/ProtectedFolderVars/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/A_1/ProtectedFolderVars/cache/dummy.txt
+++ b/tests/UnitTests/A_1/ProtectedFolderVars/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/A_1/ProtectedFolderVars/templates_c/dummy.txt b/tests/UnitTests/A_1/ProtectedFolderVars/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/A_1/ProtectedFolderVars/templates_c/dummy.txt
+++ b/tests/UnitTests/A_1/ProtectedFolderVars/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/A_2/UndefinedTemplateVar/cache/dummy.txt b/tests/UnitTests/A_2/UndefinedTemplateVar/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/A_2/UndefinedTemplateVar/cache/dummy.txt
+++ b/tests/UnitTests/A_2/UndefinedTemplateVar/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/A_2/UndefinedTemplateVar/templates_c/dummy.txt b/tests/UnitTests/A_2/UndefinedTemplateVar/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/A_2/UndefinedTemplateVar/templates_c/dummy.txt
+++ b/tests/UnitTests/A_2/UndefinedTemplateVar/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/A_Core/AutoEscape/cache/dummy.txt b/tests/UnitTests/A_Core/AutoEscape/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/A_Core/AutoEscape/cache/dummy.txt
+++ b/tests/UnitTests/A_Core/AutoEscape/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/A_Core/AutoEscape/templates_c/dummy.txt b/tests/UnitTests/A_Core/AutoEscape/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/A_Core/AutoEscape/templates_c/dummy.txt
+++ b/tests/UnitTests/A_Core/AutoEscape/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/A_Core/Filter/cache/dummy.txt b/tests/UnitTests/A_Core/Filter/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/A_Core/Filter/cache/dummy.txt
+++ b/tests/UnitTests/A_Core/Filter/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/A_Core/Filter/templates_c/dummy.txt b/tests/UnitTests/A_Core/Filter/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/A_Core/Filter/templates_c/dummy.txt
+++ b/tests/UnitTests/A_Core/Filter/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/A_Core/GetterSetter/cache/dummy.txt b/tests/UnitTests/A_Core/GetterSetter/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/A_Core/GetterSetter/cache/dummy.txt
+++ b/tests/UnitTests/A_Core/GetterSetter/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/A_Core/GetterSetter/templates_c/dummy.txt b/tests/UnitTests/A_Core/GetterSetter/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/A_Core/GetterSetter/templates_c/dummy.txt
+++ b/tests/UnitTests/A_Core/GetterSetter/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/A_Core/LoadPlugin/cache/dummy.txt b/tests/UnitTests/A_Core/LoadPlugin/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/A_Core/LoadPlugin/cache/dummy.txt
+++ b/tests/UnitTests/A_Core/LoadPlugin/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/A_Core/LoadPlugin/templates_c/dummy.txt b/tests/UnitTests/A_Core/LoadPlugin/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/A_Core/LoadPlugin/templates_c/dummy.txt
+++ b/tests/UnitTests/A_Core/LoadPlugin/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/A_Core/MuteExpectedErrors/cache/dummy.txt b/tests/UnitTests/A_Core/MuteExpectedErrors/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/A_Core/MuteExpectedErrors/cache/dummy.txt
+++ b/tests/UnitTests/A_Core/MuteExpectedErrors/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/A_Core/MuteExpectedErrors/templates_c/dummy.txt b/tests/UnitTests/A_Core/MuteExpectedErrors/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/A_Core/MuteExpectedErrors/templates_c/dummy.txt
+++ b/tests/UnitTests/A_Core/MuteExpectedErrors/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/A_Core/PluginTests/Shared/cache/dummy.txt b/tests/UnitTests/A_Core/PluginTests/Shared/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/A_Core/PluginTests/Shared/cache/dummy.txt
+++ b/tests/UnitTests/A_Core/PluginTests/Shared/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/A_Core/PluginTests/Shared/templates_c/dummy.txt b/tests/UnitTests/A_Core/PluginTests/Shared/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/A_Core/PluginTests/Shared/templates_c/dummy.txt
+++ b/tests/UnitTests/A_Core/PluginTests/Shared/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/A_Core/PluginTests/cache/dummy.txt b/tests/UnitTests/A_Core/PluginTests/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/A_Core/PluginTests/cache/dummy.txt
+++ b/tests/UnitTests/A_Core/PluginTests/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/A_Core/PluginTests/templates_c/dummy.txt b/tests/UnitTests/A_Core/PluginTests/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/A_Core/PluginTests/templates_c/dummy.txt
+++ b/tests/UnitTests/A_Core/PluginTests/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/A_Core/SmartyBC/cache/dummy.txt b/tests/UnitTests/A_Core/SmartyBC/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/A_Core/SmartyBC/cache/dummy.txt
+++ b/tests/UnitTests/A_Core/SmartyBC/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/A_Core/SmartyBC/templates_c/dummy.txt b/tests/UnitTests/A_Core/SmartyBC/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/A_Core/SmartyBC/templates_c/dummy.txt
+++ b/tests/UnitTests/A_Core/SmartyBC/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/CacheModify/ModifiedSince/cache/dummy.txt b/tests/UnitTests/CacheModify/ModifiedSince/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/CacheModify/ModifiedSince/cache/dummy.txt
+++ b/tests/UnitTests/CacheModify/ModifiedSince/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/CacheModify/ModifiedSince/templates_c/dummy.txt b/tests/UnitTests/CacheModify/ModifiedSince/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/CacheModify/ModifiedSince/templates_c/dummy.txt
+++ b/tests/UnitTests/CacheModify/ModifiedSince/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/CacheResourceTests/File/cache/dummy.txt b/tests/UnitTests/CacheResourceTests/File/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/CacheResourceTests/File/cache/dummy.txt
+++ b/tests/UnitTests/CacheResourceTests/File/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/CacheResourceTests/File/templates_c/dummy.txt b/tests/UnitTests/CacheResourceTests/File/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/CacheResourceTests/File/templates_c/dummy.txt
+++ b/tests/UnitTests/CacheResourceTests/File/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/CacheResourceTests/Memcache/templates_c/dummy.txt b/tests/UnitTests/CacheResourceTests/Memcache/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/CacheResourceTests/Memcache/templates_c/dummy.txt
+++ b/tests/UnitTests/CacheResourceTests/Memcache/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/CacheResourceTests/Mysql/cache/dummy.txt b/tests/UnitTests/CacheResourceTests/Mysql/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/CacheResourceTests/Mysql/cache/dummy.txt
+++ b/tests/UnitTests/CacheResourceTests/Mysql/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/CacheResourceTests/Mysql/templates_c/dummy.txt b/tests/UnitTests/CacheResourceTests/Mysql/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/CacheResourceTests/Mysql/templates_c/dummy.txt
+++ b/tests/UnitTests/CacheResourceTests/Mysql/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/CacheResourceTests/Registered/templates_c/dummy.txt b/tests/UnitTests/CacheResourceTests/Registered/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/CacheResourceTests/Registered/templates_c/dummy.txt
+++ b/tests/UnitTests/CacheResourceTests/Registered/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/CacheResourceTests/_shared/PHPunitplugins/dummy.txt b/tests/UnitTests/CacheResourceTests/_shared/PHPunitplugins/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/CacheResourceTests/_shared/PHPunitplugins/dummy.txt
+++ b/tests/UnitTests/CacheResourceTests/_shared/PHPunitplugins/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/CacheResourceTests/_shared/templates/dummy.txt b/tests/UnitTests/CacheResourceTests/_shared/templates/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/CacheResourceTests/_shared/templates/dummy.txt
+++ b/tests/UnitTests/CacheResourceTests/_shared/templates/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/Compiler/CompilerPlugin/cache/dummy.txt b/tests/UnitTests/Compiler/CompilerPlugin/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/Compiler/CompilerPlugin/cache/dummy.txt
+++ b/tests/UnitTests/Compiler/CompilerPlugin/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/Compiler/CompilerPlugin/templates_c/dummy.txt b/tests/UnitTests/Compiler/CompilerPlugin/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/Compiler/CompilerPlugin/templates_c/dummy.txt
+++ b/tests/UnitTests/Compiler/CompilerPlugin/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/Compiler/Delimiter/AutoLiteralTest.php b/tests/UnitTests/Compiler/Delimiter/AutoLiteralTest.php
index 1f5e31ea..fd65c53a 100644
--- a/tests/UnitTests/Compiler/Delimiter/AutoLiteralTest.php
+++ b/tests/UnitTests/Compiler/Delimiter/AutoLiteralTest.php
@@ -18,6 +18,7 @@ class AutoliteralTest extends PHPUnit_Smarty
     public function setUp()
     {
         $this->setUpSmarty(dirname(__FILE__));
+        $this->smarty->addPluginsDir("../../__shared/PHPunitplugins/");
     }
 
     public function testInit()
@@ -32,31 +33,27 @@ class AutoliteralTest extends PHPUnit_Smarty
     {
         $this->smarty->setAutoLiteral(true);
         $this->smarty->assign('i','foo');
-        $this->assertEquals('{ $i}foo', $this->smarty->fetch('eval:{ $i}{$i}'));
+        $this->assertEquals('{ $i}foo', $this->smarty->fetch('autoliteral.tpl'));
     }
 
     public function testSetAutoliteral2()
     {
         $this->smarty->setAutoLiteral(false);
+        $this->smarty->setCompileId(1);
         $this->smarty->assign('i','foo');
-        $this->assertEquals('foofoo', $this->smarty->fetch('eval:{ $i}{$i}'));
+        $this->assertEquals('foofoo', $this->smarty->fetch('autoliteral.tpl'));
     }
-    public function testSetAutoliteral3()
-    {
-        $this->smarty->setAutoLiteral(false);
-        $this->smarty->assign('i','foo');
-        $this->assertEquals('{{$i}foo', $this->smarty->fetch('eval:{{$i}{$i}'));
-    }
-    public function testSetAutoliteral4()
-    {
-        $this->smarty->setAutoLiteral(false);
-        $this->smarty->assign('i','foo');
-        $this->assertEquals('{{ $i}foo', $this->smarty->fetch('eval:{{ $i}{$i}'));
-    }
-    public function testSetAutoliteral5()
+
+    public function testSetAutoliteralBlock()
     {
         $this->smarty->setAutoLiteral(true);
-        $this->smarty->assign('i','foo');
-        $this->assertEquals('{ {{$i}foo', $this->smarty->fetch('eval:{ {{$i}{$i}'));
+        $this->assertEquals('{ dummyblock}foo{ /dummyblock}', $this->smarty->fetch('autoliteralblock.tpl'));
     }
+    public function testSetAutoliteralBlock1()
+    {
+        $this->smarty->setAutoLiteral(false);
+        $this->smarty->setCompileId(1);
+        $this->assertEquals('foo', $this->smarty->fetch('autoliteralblock.tpl'));
+    }
+
 }
diff --git a/tests/UnitTests/Compiler/Delimiter/DelimiterTest.php b/tests/UnitTests/Compiler/Delimiter/DelimiterTest.php
index a062f546..a469c270 100644
--- a/tests/UnitTests/Compiler/Delimiter/DelimiterTest.php
+++ b/tests/UnitTests/Compiler/Delimiter/DelimiterTest.php
@@ -35,6 +35,16 @@ class DelimiterTest extends PHPUnit_Smarty
         $tpl = $this->smarty->createTemplate('eval:<{* comment *}><{if true}><{"hello world"}><{/if}>');
         $this->assertEquals("hello world", $this->smarty->fetch($tpl));
     }
+    /**
+     * test <{ }> delimiter
+     */
+    public function testDelimiter10()
+    {
+        $this->smarty->left_delimiter = '<';
+        $this->smarty->right_delimiter = '>';
+        $tpl = $this->smarty->createTemplate('eval:<* comment *><if 1 < 2><"hello world"></if>');
+        $this->assertEquals("hello world", $this->smarty->fetch($tpl));
+    }
 
     /**
      * test <-{ }-> delimiter
diff --git a/tests/UnitTests/Compiler/Delimiter/UserLiteralTest.php b/tests/UnitTests/Compiler/Delimiter/UserLiteralTest.php
new file mode 100644
index 00000000..0e0b35cd
--- /dev/null
+++ b/tests/UnitTests/Compiler/Delimiter/UserLiteralTest.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Smarty PHPunit tests of delimiter
+ *
+ * @package PHPunit
+ * @author  Uwe Tews
+ */
+
+/**
+ * class for delimiter tests
+ *
+ * @runTestsInSeparateProcess
+ * @preserveGlobalState disabled
+ * @backupStaticAttributes enabled
+ */
+class UserliteralTest extends PHPUnit_Smarty
+{
+    public function setUp()
+    {
+        if (!property_exists('Smarty', 'literals')) {
+            $this->markTestSkipped('user literal support');
+        } else {
+            $this->setUpSmarty(dirname(__FILE__));
+        }
+    }
+
+    public function testInit()
+    {
+        $this->cleanDirs();
+    }
+
+    public function testUserLiteral()
+    {
+        $this->smarty->setAutoLiteral(true);
+        $this->assertEquals('{{ 1 }}', $this->smarty->fetch('userliteral.tpl'));
+    }
+    public function testUserLiteral1()
+    {
+        $this->smarty->setAutoLiteral(false);
+        $this->smarty->setCompileId(1);
+        $this->assertEquals('1', $this->smarty->fetch('userliteral.tpl'));
+    }
+    public function testUserLiteral2()
+    {
+        $this->smarty->setAutoLiteral(false);
+        $this->smarty->setLiterals(array('{{','}}'));
+        $this->assertEquals('{{1}}', $this->smarty->fetch('userliteral1.tpl'));
+    }
+    public function testUserLiteral3()
+    {
+        $this->smarty->setAutoLiteral(false);
+        $this->smarty->setLeftDelimiter('<-');
+        $this->smarty->setRightDelimiter('->');
+        $this->smarty->setLiterals(array('<--','-->'));
+        $this->assertEquals('1 <--1-->', $this->smarty->fetch('userliteral2.tpl'));
+    }
+    public function testUserLiteral4()
+    {
+        $this->smarty->setAutoLiteral(true);
+        $this->smarty->setLeftDelimiter('<-');
+        $this->smarty->setRightDelimiter('->');
+        $this->smarty->setCompileId(1);
+        $this->smarty->setLiterals(array('<--','-->'));
+        $this->assertEquals('<- 1 -> <--1-->', $this->smarty->fetch('userliteral2.tpl'));
+    }
+}
diff --git a/tests/UnitTests/Compiler/Delimiter/cache/dummy.txt b/tests/UnitTests/Compiler/Delimiter/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/Compiler/Delimiter/cache/dummy.txt
+++ b/tests/UnitTests/Compiler/Delimiter/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/Compiler/Delimiter/templates/autoliteral.tpl b/tests/UnitTests/Compiler/Delimiter/templates/autoliteral.tpl
new file mode 100644
index 00000000..9f580a8c
--- /dev/null
+++ b/tests/UnitTests/Compiler/Delimiter/templates/autoliteral.tpl
@@ -0,0 +1 @@
+{ $i}{$i}
\ No newline at end of file
diff --git a/tests/UnitTests/Compiler/Delimiter/templates/autoliteralblock.tpl b/tests/UnitTests/Compiler/Delimiter/templates/autoliteralblock.tpl
new file mode 100644
index 00000000..3e661c92
--- /dev/null
+++ b/tests/UnitTests/Compiler/Delimiter/templates/autoliteralblock.tpl
@@ -0,0 +1 @@
+{ dummyblock}foo{ /dummyblock}
\ No newline at end of file
diff --git a/tests/UnitTests/Compiler/Delimiter/templates/userliteral.tpl b/tests/UnitTests/Compiler/Delimiter/templates/userliteral.tpl
new file mode 100644
index 00000000..e7dbc1b7
--- /dev/null
+++ b/tests/UnitTests/Compiler/Delimiter/templates/userliteral.tpl
@@ -0,0 +1 @@
+{{ 1 }}
\ No newline at end of file
diff --git a/tests/UnitTests/Compiler/Delimiter/templates/userliteral1.tpl b/tests/UnitTests/Compiler/Delimiter/templates/userliteral1.tpl
new file mode 100644
index 00000000..5972cc7b
--- /dev/null
+++ b/tests/UnitTests/Compiler/Delimiter/templates/userliteral1.tpl
@@ -0,0 +1 @@
+{{1}}
\ No newline at end of file
diff --git a/tests/UnitTests/Compiler/Delimiter/templates/userliteral2.tpl b/tests/UnitTests/Compiler/Delimiter/templates/userliteral2.tpl
new file mode 100644
index 00000000..826660d0
--- /dev/null
+++ b/tests/UnitTests/Compiler/Delimiter/templates/userliteral2.tpl
@@ -0,0 +1 @@
+<- 1 -> <--1-->
\ No newline at end of file
diff --git a/tests/UnitTests/Compiler/Delimiter/templates_c/dummy.txt b/tests/UnitTests/Compiler/Delimiter/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/Compiler/Delimiter/templates_c/dummy.txt
+++ b/tests/UnitTests/Compiler/Delimiter/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/ConfigFileTests/defaultHandler/templates_c/dummy.txt b/tests/UnitTests/ConfigFileTests/defaultHandler/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/ConfigFileTests/defaultHandler/templates_c/dummy.txt
+++ b/tests/UnitTests/ConfigFileTests/defaultHandler/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/ConfigFileTests/file/templates_c/dummy.txt b/tests/UnitTests/ConfigFileTests/file/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/ConfigFileTests/file/templates_c/dummy.txt
+++ b/tests/UnitTests/ConfigFileTests/file/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/ResourceTests/Custom/Ambiguous/CustomResourceAmbiguousTest.php b/tests/UnitTests/ResourceTests/Custom/Ambiguous/CustomResourceAmbiguousTest.php
index b16af7dc..63b4bfe1 100644
--- a/tests/UnitTests/ResourceTests/Custom/Ambiguous/CustomResourceAmbiguousTest.php
+++ b/tests/UnitTests/ResourceTests/Custom/Ambiguous/CustomResourceAmbiguousTest.php
@@ -97,7 +97,7 @@ class CustomResourceAmbiguousTest extends PHPUnit_Smarty
 
     /**
      *
-     * @runInSeparateProcess
+     * @run InSeparateProcess
      * @preserveGlobalState disabled
      *
      */
diff --git a/tests/UnitTests/ResourceTests/Custom/Ambiguous/cache/dummy.txt b/tests/UnitTests/ResourceTests/Custom/Ambiguous/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/ResourceTests/Custom/Ambiguous/cache/dummy.txt
+++ b/tests/UnitTests/ResourceTests/Custom/Ambiguous/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/ResourceTests/Custom/Ambiguous/templates_c/dummy.txt b/tests/UnitTests/ResourceTests/Custom/Ambiguous/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/ResourceTests/Custom/Ambiguous/templates_c/dummy.txt
+++ b/tests/UnitTests/ResourceTests/Custom/Ambiguous/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/ResourceTests/Custom/DemoPluginExtendsAll/cache/dummy.txt b/tests/UnitTests/ResourceTests/Custom/DemoPluginExtendsAll/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/ResourceTests/Custom/DemoPluginExtendsAll/cache/dummy.txt
+++ b/tests/UnitTests/ResourceTests/Custom/DemoPluginExtendsAll/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/ResourceTests/Custom/DemoPluginExtendsAll/templates_c/dummy.txt b/tests/UnitTests/ResourceTests/Custom/DemoPluginExtendsAll/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/ResourceTests/Custom/DemoPluginExtendsAll/templates_c/dummy.txt
+++ b/tests/UnitTests/ResourceTests/Custom/DemoPluginExtendsAll/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/ResourceTests/Custom/DemoPluginMysql/cache/dummy.txt b/tests/UnitTests/ResourceTests/Custom/DemoPluginMysql/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/ResourceTests/Custom/DemoPluginMysql/cache/dummy.txt
+++ b/tests/UnitTests/ResourceTests/Custom/DemoPluginMysql/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/ResourceTests/Custom/DemoPluginMysql/templates_c/dummy.txt b/tests/UnitTests/ResourceTests/Custom/DemoPluginMysql/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/ResourceTests/Custom/DemoPluginMysql/templates_c/dummy.txt
+++ b/tests/UnitTests/ResourceTests/Custom/DemoPluginMysql/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/ResourceTests/DefaultHandler/cache/dummy.txt b/tests/UnitTests/ResourceTests/DefaultHandler/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/ResourceTests/DefaultHandler/cache/dummy.txt
+++ b/tests/UnitTests/ResourceTests/DefaultHandler/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/ResourceTests/DefaultHandler/templates_c/dummy.txt b/tests/UnitTests/ResourceTests/DefaultHandler/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/ResourceTests/DefaultHandler/templates_c/dummy.txt
+++ b/tests/UnitTests/ResourceTests/DefaultHandler/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/ResourceTests/Eval/cache/dummy.txt b/tests/UnitTests/ResourceTests/Eval/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/ResourceTests/Eval/cache/dummy.txt
+++ b/tests/UnitTests/ResourceTests/Eval/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/ResourceTests/Eval/templates_c/dummy.txt b/tests/UnitTests/ResourceTests/Eval/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/ResourceTests/Eval/templates_c/dummy.txt
+++ b/tests/UnitTests/ResourceTests/Eval/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/ResourceTests/Extends/cache/dummy.txt b/tests/UnitTests/ResourceTests/Extends/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/ResourceTests/Extends/cache/dummy.txt
+++ b/tests/UnitTests/ResourceTests/Extends/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/ResourceTests/Extends/templates_c/dummy.txt b/tests/UnitTests/ResourceTests/Extends/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/ResourceTests/Extends/templates_c/dummy.txt
+++ b/tests/UnitTests/ResourceTests/Extends/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/ResourceTests/File/cache/dummy.txt b/tests/UnitTests/ResourceTests/File/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/ResourceTests/File/cache/dummy.txt
+++ b/tests/UnitTests/ResourceTests/File/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/ResourceTests/File/templates_c/dummy.txt b/tests/UnitTests/ResourceTests/File/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/ResourceTests/File/templates_c/dummy.txt
+++ b/tests/UnitTests/ResourceTests/File/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/ResourceTests/FileIncludePath/cache/dummy.txt b/tests/UnitTests/ResourceTests/FileIncludePath/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/ResourceTests/FileIncludePath/cache/dummy.txt
+++ b/tests/UnitTests/ResourceTests/FileIncludePath/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/ResourceTests/FileIncludePath/templates_c/dummy.txt b/tests/UnitTests/ResourceTests/FileIncludePath/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/ResourceTests/FileIncludePath/templates_c/dummy.txt
+++ b/tests/UnitTests/ResourceTests/FileIncludePath/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/ResourceTests/FileIndexed/cache/dummy.txt b/tests/UnitTests/ResourceTests/FileIndexed/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/ResourceTests/FileIndexed/cache/dummy.txt
+++ b/tests/UnitTests/ResourceTests/FileIndexed/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/ResourceTests/FileIndexed/templates_c/dummy.txt b/tests/UnitTests/ResourceTests/FileIndexed/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/ResourceTests/FileIndexed/templates_c/dummy.txt
+++ b/tests/UnitTests/ResourceTests/FileIndexed/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/ResourceTests/Php/cache/dummy.txt b/tests/UnitTests/ResourceTests/Php/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/ResourceTests/Php/cache/dummy.txt
+++ b/tests/UnitTests/ResourceTests/Php/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/ResourceTests/Php/templates_c/dummy.txt b/tests/UnitTests/ResourceTests/Php/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/ResourceTests/Php/templates_c/dummy.txt
+++ b/tests/UnitTests/ResourceTests/Php/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/ResourceTests/Registered/cache/dummy.txt b/tests/UnitTests/ResourceTests/Registered/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/ResourceTests/Registered/cache/dummy.txt
+++ b/tests/UnitTests/ResourceTests/Registered/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/ResourceTests/Registered/templates_c/dummy.txt b/tests/UnitTests/ResourceTests/Registered/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/ResourceTests/Registered/templates_c/dummy.txt
+++ b/tests/UnitTests/ResourceTests/Registered/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/ResourceTests/ResourcePlugins/cache/dummy.txt b/tests/UnitTests/ResourceTests/ResourcePlugins/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/ResourceTests/ResourcePlugins/cache/dummy.txt
+++ b/tests/UnitTests/ResourceTests/ResourcePlugins/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/ResourceTests/ResourcePlugins/templates_c/dummy.txt b/tests/UnitTests/ResourceTests/ResourcePlugins/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/ResourceTests/ResourcePlugins/templates_c/dummy.txt
+++ b/tests/UnitTests/ResourceTests/ResourcePlugins/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/ResourceTests/Stream/cache/dummy.txt b/tests/UnitTests/ResourceTests/Stream/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/ResourceTests/Stream/cache/dummy.txt
+++ b/tests/UnitTests/ResourceTests/Stream/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/ResourceTests/Stream/templates_c/dummy.txt b/tests/UnitTests/ResourceTests/Stream/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/ResourceTests/Stream/templates_c/dummy.txt
+++ b/tests/UnitTests/ResourceTests/Stream/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/ResourceTests/String/cache/dummy.txt b/tests/UnitTests/ResourceTests/String/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/ResourceTests/String/cache/dummy.txt
+++ b/tests/UnitTests/ResourceTests/String/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/ResourceTests/String/templates_c/dummy.txt b/tests/UnitTests/ResourceTests/String/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/ResourceTests/String/templates_c/dummy.txt
+++ b/tests/UnitTests/ResourceTests/String/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/SecurityTests/cache/dummy.txt b/tests/UnitTests/SecurityTests/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/SecurityTests/cache/dummy.txt
+++ b/tests/UnitTests/SecurityTests/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/SecurityTests/templates_c/dummy.txt b/tests/UnitTests/SecurityTests/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/SecurityTests/templates_c/dummy.txt
+++ b/tests/UnitTests/SecurityTests/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/SmartyMethodsTests/Append/cache/dummy.txt b/tests/UnitTests/SmartyMethodsTests/Append/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/SmartyMethodsTests/Append/cache/dummy.txt
+++ b/tests/UnitTests/SmartyMethodsTests/Append/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/SmartyMethodsTests/Append/templates_c/dummy.txt b/tests/UnitTests/SmartyMethodsTests/Append/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/SmartyMethodsTests/Append/templates_c/dummy.txt
+++ b/tests/UnitTests/SmartyMethodsTests/Append/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/SmartyMethodsTests/AppendByRef/cache/dummy.txt b/tests/UnitTests/SmartyMethodsTests/AppendByRef/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/SmartyMethodsTests/AppendByRef/cache/dummy.txt
+++ b/tests/UnitTests/SmartyMethodsTests/AppendByRef/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/SmartyMethodsTests/AppendByRef/templates_c/dummy.txt b/tests/UnitTests/SmartyMethodsTests/AppendByRef/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/SmartyMethodsTests/AppendByRef/templates_c/dummy.txt
+++ b/tests/UnitTests/SmartyMethodsTests/AppendByRef/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/SmartyMethodsTests/Assign/cache/dummy.txt b/tests/UnitTests/SmartyMethodsTests/Assign/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/SmartyMethodsTests/Assign/cache/dummy.txt
+++ b/tests/UnitTests/SmartyMethodsTests/Assign/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/SmartyMethodsTests/Assign/templates_c/dummy.txt b/tests/UnitTests/SmartyMethodsTests/Assign/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/SmartyMethodsTests/Assign/templates_c/dummy.txt
+++ b/tests/UnitTests/SmartyMethodsTests/Assign/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/SmartyMethodsTests/AssignByRef/cache/dummy.txt b/tests/UnitTests/SmartyMethodsTests/AssignByRef/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/SmartyMethodsTests/AssignByRef/cache/dummy.txt
+++ b/tests/UnitTests/SmartyMethodsTests/AssignByRef/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/SmartyMethodsTests/AssignByRef/templates_c/dummy.txt b/tests/UnitTests/SmartyMethodsTests/AssignByRef/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/SmartyMethodsTests/AssignByRef/templates_c/dummy.txt
+++ b/tests/UnitTests/SmartyMethodsTests/AssignByRef/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/SmartyMethodsTests/AssignGlobal/cache/dummy.txt b/tests/UnitTests/SmartyMethodsTests/AssignGlobal/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/SmartyMethodsTests/AssignGlobal/cache/dummy.txt
+++ b/tests/UnitTests/SmartyMethodsTests/AssignGlobal/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/SmartyMethodsTests/AssignGlobal/templates_c/dummy.txt b/tests/UnitTests/SmartyMethodsTests/AssignGlobal/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/SmartyMethodsTests/AssignGlobal/templates_c/dummy.txt
+++ b/tests/UnitTests/SmartyMethodsTests/AssignGlobal/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/SmartyMethodsTests/ClearAllAssign/cache/dummy.txt b/tests/UnitTests/SmartyMethodsTests/ClearAllAssign/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/SmartyMethodsTests/ClearAllAssign/cache/dummy.txt
+++ b/tests/UnitTests/SmartyMethodsTests/ClearAllAssign/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/SmartyMethodsTests/ClearAllAssign/templates_c/dummy.txt b/tests/UnitTests/SmartyMethodsTests/ClearAllAssign/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/SmartyMethodsTests/ClearAllAssign/templates_c/dummy.txt
+++ b/tests/UnitTests/SmartyMethodsTests/ClearAllAssign/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/SmartyMethodsTests/ClearAssign/cache/dummy.txt b/tests/UnitTests/SmartyMethodsTests/ClearAssign/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/SmartyMethodsTests/ClearAssign/cache/dummy.txt
+++ b/tests/UnitTests/SmartyMethodsTests/ClearAssign/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/SmartyMethodsTests/ClearAssign/templates_c/dummy.txt b/tests/UnitTests/SmartyMethodsTests/ClearAssign/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/SmartyMethodsTests/ClearAssign/templates_c/dummy.txt
+++ b/tests/UnitTests/SmartyMethodsTests/ClearAssign/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/SmartyMethodsTests/ClearCompiledTemplate/cache/dummy.txt b/tests/UnitTests/SmartyMethodsTests/ClearCompiledTemplate/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/SmartyMethodsTests/ClearCompiledTemplate/cache/dummy.txt
+++ b/tests/UnitTests/SmartyMethodsTests/ClearCompiledTemplate/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/SmartyMethodsTests/ClearCompiledTemplate/templates_c/dummy.txt b/tests/UnitTests/SmartyMethodsTests/ClearCompiledTemplate/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/SmartyMethodsTests/ClearCompiledTemplate/templates_c/dummy.txt
+++ b/tests/UnitTests/SmartyMethodsTests/ClearCompiledTemplate/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/SmartyMethodsTests/GetTemplateVars/cache/dummy.txt b/tests/UnitTests/SmartyMethodsTests/GetTemplateVars/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/SmartyMethodsTests/GetTemplateVars/cache/dummy.txt
+++ b/tests/UnitTests/SmartyMethodsTests/GetTemplateVars/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/SmartyMethodsTests/GetTemplateVars/templates_c/dummy.txt b/tests/UnitTests/SmartyMethodsTests/GetTemplateVars/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/SmartyMethodsTests/GetTemplateVars/templates_c/dummy.txt
+++ b/tests/UnitTests/SmartyMethodsTests/GetTemplateVars/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/SmartyMethodsTests/RegisterBlock/cache/dummy.txt b/tests/UnitTests/SmartyMethodsTests/RegisterBlock/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/SmartyMethodsTests/RegisterBlock/cache/dummy.txt
+++ b/tests/UnitTests/SmartyMethodsTests/RegisterBlock/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/SmartyMethodsTests/RegisterBlock/templates_c/dummy.txt b/tests/UnitTests/SmartyMethodsTests/RegisterBlock/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/SmartyMethodsTests/RegisterBlock/templates_c/dummy.txt
+++ b/tests/UnitTests/SmartyMethodsTests/RegisterBlock/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/SmartyMethodsTests/RegisterCompiler/cache/dummy.txt b/tests/UnitTests/SmartyMethodsTests/RegisterCompiler/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/SmartyMethodsTests/RegisterCompiler/cache/dummy.txt
+++ b/tests/UnitTests/SmartyMethodsTests/RegisterCompiler/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/SmartyMethodsTests/RegisterCompiler/templates_c/dummy.txt b/tests/UnitTests/SmartyMethodsTests/RegisterCompiler/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/SmartyMethodsTests/RegisterCompiler/templates_c/dummy.txt
+++ b/tests/UnitTests/SmartyMethodsTests/RegisterCompiler/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/SmartyMethodsTests/RegisterFunction/cache/dummy.txt b/tests/UnitTests/SmartyMethodsTests/RegisterFunction/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/SmartyMethodsTests/RegisterFunction/cache/dummy.txt
+++ b/tests/UnitTests/SmartyMethodsTests/RegisterFunction/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/SmartyMethodsTests/RegisterFunction/templates_c/dummy.txt b/tests/UnitTests/SmartyMethodsTests/RegisterFunction/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/SmartyMethodsTests/RegisterFunction/templates_c/dummy.txt
+++ b/tests/UnitTests/SmartyMethodsTests/RegisterFunction/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/SmartyMethodsTests/RegisterModifier/cache/dummy.txt b/tests/UnitTests/SmartyMethodsTests/RegisterModifier/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/SmartyMethodsTests/RegisterModifier/cache/dummy.txt
+++ b/tests/UnitTests/SmartyMethodsTests/RegisterModifier/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/SmartyMethodsTests/RegisterModifier/templates_c/dummy.txt b/tests/UnitTests/SmartyMethodsTests/RegisterModifier/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/SmartyMethodsTests/RegisterModifier/templates_c/dummy.txt
+++ b/tests/UnitTests/SmartyMethodsTests/RegisterModifier/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/SmartyMethodsTests/RegisterObject/cache/dummy.txt b/tests/UnitTests/SmartyMethodsTests/RegisterObject/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/SmartyMethodsTests/RegisterObject/cache/dummy.txt
+++ b/tests/UnitTests/SmartyMethodsTests/RegisterObject/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/SmartyMethodsTests/RegisterObject/templates_c/dummy.txt b/tests/UnitTests/SmartyMethodsTests/RegisterObject/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/SmartyMethodsTests/RegisterObject/templates_c/dummy.txt
+++ b/tests/UnitTests/SmartyMethodsTests/RegisterObject/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/SmartyMethodsTests/TemplateExist/cache/dummy.txt b/tests/UnitTests/SmartyMethodsTests/TemplateExist/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/SmartyMethodsTests/TemplateExist/cache/dummy.txt
+++ b/tests/UnitTests/SmartyMethodsTests/TemplateExist/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/SmartyMethodsTests/TemplateExist/templates_c/dummy.txt b/tests/UnitTests/SmartyMethodsTests/TemplateExist/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/SmartyMethodsTests/TemplateExist/templates_c/dummy.txt
+++ b/tests/UnitTests/SmartyMethodsTests/TemplateExist/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/Comments/cache/dummy.txt b/tests/UnitTests/TemplateSource/Comments/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/Comments/cache/dummy.txt
+++ b/tests/UnitTests/TemplateSource/Comments/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/Comments/templates_c/dummy.txt b/tests/UnitTests/TemplateSource/Comments/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/Comments/templates_c/dummy.txt
+++ b/tests/UnitTests/TemplateSource/Comments/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/Spacing/cache/dummy.txt b/tests/UnitTests/TemplateSource/Spacing/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/Spacing/cache/dummy.txt
+++ b/tests/UnitTests/TemplateSource/Spacing/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/Spacing/templates_c/dummy.txt b/tests/UnitTests/TemplateSource/Spacing/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/Spacing/templates_c/dummy.txt
+++ b/tests/UnitTests/TemplateSource/Spacing/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/StaticClass/cache/dummy.txt b/tests/UnitTests/TemplateSource/StaticClass/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/StaticClass/cache/dummy.txt
+++ b/tests/UnitTests/TemplateSource/StaticClass/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/StaticClass/templates_c/dummy.txt b/tests/UnitTests/TemplateSource/StaticClass/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/StaticClass/templates_c/dummy.txt
+++ b/tests/UnitTests/TemplateSource/StaticClass/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Append/templates_c/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Append/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/TagTests/Append/templates_c/dummy.txt
+++ b/tests/UnitTests/TemplateSource/TagTests/Append/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Append/templates_tmp/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Append/templates_tmp/dummy.txt
new file mode 100644
index 00000000..2995a4d0
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Append/templates_tmp/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Assign/templates_c/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Assign/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/TagTests/Assign/templates_c/dummy.txt
+++ b/tests/UnitTests/TemplateSource/TagTests/Assign/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Assign/templates_tmp/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Assign/templates_tmp/dummy.txt
new file mode 100644
index 00000000..2995a4d0
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Assign/templates_tmp/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/cache/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/cache/dummy.txt
+++ b/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/templates_c/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/templates_c/dummy.txt
+++ b/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/BockExtend/cache/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/BockExtend/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/TagTests/BockExtend/cache/dummy.txt
+++ b/tests/UnitTests/TemplateSource/TagTests/BockExtend/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/BockExtend/templates_c/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/BockExtend/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/TagTests/BockExtend/templates_c/dummy.txt
+++ b/tests/UnitTests/TemplateSource/TagTests/BockExtend/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Capture/cache/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Capture/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/TagTests/Capture/cache/dummy.txt
+++ b/tests/UnitTests/TemplateSource/TagTests/Capture/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Capture/templates_c/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Capture/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/TagTests/Capture/templates_c/dummy.txt
+++ b/tests/UnitTests/TemplateSource/TagTests/Capture/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Capture/templates_tmp/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Capture/templates_tmp/dummy.txt
new file mode 100644
index 00000000..2995a4d0
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Capture/templates_tmp/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/CompilerPlugin/cache/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/CompilerPlugin/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/TagTests/CompilerPlugin/cache/dummy.txt
+++ b/tests/UnitTests/TemplateSource/TagTests/CompilerPlugin/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/CompilerPlugin/templates_c/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/CompilerPlugin/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/TagTests/CompilerPlugin/templates_c/dummy.txt
+++ b/tests/UnitTests/TemplateSource/TagTests/CompilerPlugin/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/ConfigLoad/cache/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/ConfigLoad/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/TagTests/ConfigLoad/cache/dummy.txt
+++ b/tests/UnitTests/TemplateSource/TagTests/ConfigLoad/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/ConfigLoad/templates_c/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/ConfigLoad/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/TagTests/ConfigLoad/templates_c/dummy.txt
+++ b/tests/UnitTests/TemplateSource/TagTests/ConfigLoad/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Delimiter/cache/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Delimiter/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/TagTests/Delimiter/cache/dummy.txt
+++ b/tests/UnitTests/TemplateSource/TagTests/Delimiter/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Delimiter/templates_c/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Delimiter/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/TagTests/Delimiter/templates_c/dummy.txt
+++ b/tests/UnitTests/TemplateSource/TagTests/Delimiter/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Eval/cache/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Eval/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/TagTests/Eval/cache/dummy.txt
+++ b/tests/UnitTests/TemplateSource/TagTests/Eval/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Eval/templates_c/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Eval/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/TagTests/Eval/templates_c/dummy.txt
+++ b/tests/UnitTests/TemplateSource/TagTests/Eval/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/For/cache/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/For/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/TagTests/For/cache/dummy.txt
+++ b/tests/UnitTests/TemplateSource/TagTests/For/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/For/templates_c/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/For/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/TagTests/For/templates_c/dummy.txt
+++ b/tests/UnitTests/TemplateSource/TagTests/For/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Foreach/cache/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Foreach/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/TagTests/Foreach/cache/dummy.txt
+++ b/tests/UnitTests/TemplateSource/TagTests/Foreach/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Foreach/templates_c/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Foreach/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/TagTests/Foreach/templates_c/dummy.txt
+++ b/tests/UnitTests/TemplateSource/TagTests/Foreach/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Foreach/templates_tmp/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Foreach/templates_tmp/dummy.txt
new file mode 100644
index 00000000..2995a4d0
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Foreach/templates_tmp/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/FunctionPlugin/cache/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/FunctionPlugin/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/TagTests/FunctionPlugin/cache/dummy.txt
+++ b/tests/UnitTests/TemplateSource/TagTests/FunctionPlugin/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/FunctionPlugin/templates_c/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/FunctionPlugin/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/TagTests/FunctionPlugin/templates_c/dummy.txt
+++ b/tests/UnitTests/TemplateSource/TagTests/FunctionPlugin/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/If/CompileIfTest.php b/tests/UnitTests/TemplateSource/TagTests/If/CompileIfTest.php
index 54c6e9d5..63232e12 100644
--- a/tests/UnitTests/TemplateSource/TagTests/If/CompileIfTest.php
+++ b/tests/UnitTests/TemplateSource/TagTests/If/CompileIfTest.php
@@ -37,12 +37,13 @@ class CompileIfTest extends PHPUnit_Smarty
      */
     public function testIf($code, $result, $testName, $testNumber)
     {
-        $file = "testIf_{$testNumber}.tpl";
+        $name = empty($testName) ? $testNumber : $testName;
+        $file = "testIf_{$name}.tpl";
         $this->makeTemplateFile($file, $code);
         $this->smarty->assignGlobal('file', $file);
         $this->smarty->assign('bar', 'buh');
         $this->assertEquals($this->strip($result), $this->strip($this->smarty->fetch($file)),
-                            "testIf - {$code} - {$testName}");
+                            "testIf - {$code} - {$name}");
     }
 
     /*
@@ -81,7 +82,31 @@ class CompileIfTest extends PHPUnit_Smarty
                      array('{$foo=\'foo\'}{$bar=\'bar\'}{if false}false{elseif $bar = "new_{$foo|default:\'\'}"}yes-{else}no{/if}{$bar}',
                            'yes-new_foo', '', $i ++),
                      array('{$foo=\'foo\'}{$bar=\'bar\'}{if false}false{elseif $bar[3] = "new_{$foo|default:\'\'}"}yes-{else}no{/if}{$bar[0]}-{$bar[3]}',
-                           'yes-bar-new_foo', '', $i ++),);
+                           'yes-bar-new_foo', '', $i ++),
+
+                     array('{$x=0}{if $x}yes{else}no{/if}', 'no', 'AssignVar', $i ++),
+                     array('{$x=0}{if $x++}yes{else}no{/if} {$x}', 'no 1', 'IncVar', $i ++),
+                     array('{$x=1}{if $x}yes{else}no{/if}', 'yes', 'SimpleVar', $i ++),
+                     array('{if $x=true}yes{else}no{/if}', 'yes', 'AssignTrue', $i ++),
+                     array('{if $x=false}yes{else}no{/if}', 'no', 'AssignFalse', $i ++),
+                     array('{if 3 ge strlen("foo")}yes{else}no{/if}', 'yes', 'CmpWithFunc', $i ++),
+                     array('{if isset($foo)}yes{else}no{/if}', 'no', 'NotIsset', $i ++),
+                     array('{$foo=1}{if isset($foo)}yes{else}no{/if}', 'yes', 'Isset', $i ++),
+                     array('{$foo=1}{if !isset($foo)}yes{else}no{/if}', 'no', 'IssetNegate', $i ++),
+                     array('{$foo=\'\'}{if empty($foo)}yes{else}no{/if}', 'yes', 'Empty', $i ++),
+                     array('{$foo=\'foo\'}{if empty($foo)}yes{else}no{/if}', 'no', 'NotEmpty', $i ++),
+                     array('{if 6 is div by 3}yes{else}no{/if}', 'yes', 'IsDivBy', $i ++),
+                     array('{if 6 is not div by 3}yes{else}no{/if}', 'no', 'IsNotDivBye', $i ++),
+                     array('{if 6 is even}yes{else}no{/if}', 'yes', 'IsEven', $i ++),
+                     array('{if 6 is not even}yes{else}no{/if}', 'no', 'IsNotEven', $i ++),
+                     array('{if 3 is odd}yes{else}no{/if}', 'yes', 'IsOdd', $i ++),
+                     array('{if 3 is not odd}yes{else}no{/if}', 'no', 'IsNotOdd', $i ++),
+                     array('{$foo=3}{if 3 is odd by $foo}yes{else}no{/if}', 'yes', 'IsOddByVar', $i ++),
+                     array('{$foo=3}{$bar=6}{if $bar is not odd by $foo}yes{else}no{/if}', 'yes', 'IsNotOddByVar', $i ++),
+                     array('{$foo=3}{$bar=3}{if 3+$bar is not odd by $foo}yes{else}no{/if}', 'yes', 'ExprIsNotOddByVar', $i ++),
+                     array('{$foo=2}{$bar=6}{if (3+$bar) is not odd by ($foo+1)}yes{else}no{/if}', 'no', 'ExprIsNotOddByExpr', $i ++),
+                     array('{if strlen("hello world") ===  11}yes{else}no{/if}', 'yes', 'FuncCmp', $i ++),
+         );
     }
 
     /**
@@ -321,117 +346,5 @@ class CompileIfTest extends PHPUnit_Smarty
         $this->assertEquals("yes", $this->smarty->fetch($tpl));
     }
 
-    public function testIfIsDivBy()
-    {
-        $tpl = $this->smarty->createTemplate('eval:{if 6 is div by 3}yes{else}no{/if}');
-        $this->assertEquals("yes", $this->smarty->fetch($tpl));
-    }
 
-    public function testIfIsNotDivBy()
-    {
-        $tpl = $this->smarty->createTemplate('eval:{if 6 is not div by 3}yes{else}no{/if}');
-        $this->assertEquals("no", $this->smarty->fetch($tpl));
-    }
-
-    public function testIfIsEven()
-    {
-        $tpl = $this->smarty->createTemplate('eval:{if 6 is even}yes{else}no{/if}');
-        $this->assertEquals("yes", $this->smarty->fetch($tpl));
-    }
-
-    public function testIfIsNotEven()
-    {
-        $tpl = $this->smarty->createTemplate('eval:{if 6 is not even}yes{else}no{/if}');
-        $this->assertEquals("no", $this->smarty->fetch($tpl));
-    }
-
-    public function testIfIsOdd()
-    {
-        $tpl = $this->smarty->createTemplate('eval:{if 3 is odd}yes{else}no{/if}');
-        $this->assertEquals("yes", $this->smarty->fetch($tpl));
-    }
-
-    public function testIfIsNotOdd()
-    {
-        $tpl = $this->smarty->createTemplate('eval:{if 3 is not odd}yes{else}no{/if}');
-        $this->assertEquals("no", $this->smarty->fetch($tpl));
-    }
-
-    public function testIfIsOddBy()
-    {
-        $tpl = $this->smarty->createTemplate('eval:{if 3 is odd by 3}yes{else}no{/if}');
-        $this->assertEquals("yes", $this->smarty->fetch($tpl));
-    }
-
-    public function testIfIsNotOddBy()
-    {
-        $tpl = $this->smarty->createTemplate('eval:{if 6 is odd by 3}yes{else}no{/if}');
-        $this->assertEquals("no", $this->smarty->fetch($tpl));
-    }
-
-    public function testIfIsEvenBy()
-    {
-        $tpl = $this->smarty->createTemplate('eval:{if 6 is even by 3}yes{else}no{/if}');
-        $this->assertEquals("yes", $this->smarty->fetch($tpl));
-    }
-
-    public function testIfIsNotEvenBy()
-    {
-        $tpl = $this->smarty->createTemplate('eval:{if 6 is not even by 3}yes{else}no{/if}');
-        $this->assertEquals("no", $this->smarty->fetch($tpl));
-    }
-
-    public function testIfFunc1()
-    {
-        $tpl = $this->smarty->createTemplate('eval:{if strlen("hello world") ==  11}yes{else}no{/if}');
-        $this->assertEquals("yes", $this->smarty->fetch($tpl));
-    }
-
-    public function testIfFunc2()
-    {
-        $tpl = $this->smarty->createTemplate('eval:{if 3 ge strlen("foo")}yes{else}no{/if}');
-        $this->assertEquals("yes", $this->smarty->fetch($tpl));
-    }
-
-    public function testIfFunc3()
-    {
-        $tpl = $this->smarty->createTemplate('eval:{if isset($foo)}yes{else}no{/if}');
-        $this->assertEquals("no", $this->smarty->fetch($tpl));
-    }
-
-    public function testIfFunc4()
-    {
-        $tpl = $this->smarty->createTemplate('eval:{assign var=foo value=1}{if isset($foo)}yes{else}no{/if}');
-        $this->assertEquals("yes", $this->smarty->fetch($tpl));
-    }
-
-    public function testIfStatement1()
-    {
-        $tpl = $this->smarty->createTemplate('eval:{if $x=true}yes{else}no{/if}');
-        $this->assertEquals("yes", $this->smarty->fetch($tpl));
-    }
-
-    public function testIfStatement2()
-    {
-        $tpl = $this->smarty->createTemplate('eval:{if $x=false}yes{else}no{/if}');
-        $this->assertEquals("no", $this->smarty->fetch($tpl));
-    }
-
-    public function testIfVariable1()
-    {
-        $tpl = $this->smarty->createTemplate('eval:{$x=1}{if $x}yes{else}no{/if}');
-        $this->assertEquals("yes", $this->smarty->fetch($tpl));
-    }
-
-    public function testIfVariable2()
-    {
-        $tpl = $this->smarty->createTemplate('eval:{$x=0}{if $x}yes{else}no{/if}');
-        $this->assertEquals("no", $this->smarty->fetch($tpl));
-    }
-
-    public function testIfVariableInc1()
-    {
-        $tpl = $this->smarty->createTemplate('eval:{$x=0}{if $x++}yes{else}no{/if} {$x}');
-        $this->assertEquals("no 1", $this->smarty->fetch($tpl));
-    }
-}
+ }
diff --git a/tests/UnitTests/TemplateSource/TagTests/If/cache/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/If/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/TagTests/If/cache/dummy.txt
+++ b/tests/UnitTests/TemplateSource/TagTests/If/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/If/templates_c/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/If/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/TagTests/If/templates_c/dummy.txt
+++ b/tests/UnitTests/TemplateSource/TagTests/If/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/If/templates_tmp/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/If/templates_tmp/dummy.txt
new file mode 100644
index 00000000..2995a4d0
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/If/templates_tmp/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Include/cache/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Include/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/TagTests/Include/cache/dummy.txt
+++ b/tests/UnitTests/TemplateSource/TagTests/Include/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Include/templates_c/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Include/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/TagTests/Include/templates_c/dummy.txt
+++ b/tests/UnitTests/TemplateSource/TagTests/Include/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/IncludePhp/cache/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/IncludePhp/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/TagTests/IncludePhp/cache/dummy.txt
+++ b/tests/UnitTests/TemplateSource/TagTests/IncludePhp/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/IncludePhp/templates_c/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/IncludePhp/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/TagTests/IncludePhp/templates_c/dummy.txt
+++ b/tests/UnitTests/TemplateSource/TagTests/IncludePhp/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Insert/cache/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Insert/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/TagTests/Insert/cache/dummy.txt
+++ b/tests/UnitTests/TemplateSource/TagTests/Insert/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Insert/templates_c/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Insert/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/TagTests/Insert/templates_c/dummy.txt
+++ b/tests/UnitTests/TemplateSource/TagTests/Insert/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Literal/cache/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Literal/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/TagTests/Literal/cache/dummy.txt
+++ b/tests/UnitTests/TemplateSource/TagTests/Literal/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Literal/templates_c/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Literal/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/TagTests/Literal/templates_c/dummy.txt
+++ b/tests/UnitTests/TemplateSource/TagTests/Literal/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/MakeNocache/cache/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/MakeNocache/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/TagTests/MakeNocache/cache/dummy.txt
+++ b/tests/UnitTests/TemplateSource/TagTests/MakeNocache/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/MakeNocache/templates_c/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/MakeNocache/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/TagTests/MakeNocache/templates_c/dummy.txt
+++ b/tests/UnitTests/TemplateSource/TagTests/MakeNocache/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Nocache/cache/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Nocache/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/TagTests/Nocache/cache/dummy.txt
+++ b/tests/UnitTests/TemplateSource/TagTests/Nocache/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Nocache/templates_c/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Nocache/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/TagTests/Nocache/templates_c/dummy.txt
+++ b/tests/UnitTests/TemplateSource/TagTests/Nocache/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/CompilePhpTest.php b/tests/UnitTests/TemplateSource/TagTests/Php/CompilePhpTest.php
index c41d455e..14ec820a 100644
--- a/tests/UnitTests/TemplateSource/TagTests/Php/CompilePhpTest.php
+++ b/tests/UnitTests/TemplateSource/TagTests/Php/CompilePhpTest.php
@@ -19,6 +19,8 @@ class CompilePhpTest extends PHPUnit_Smarty
     public function setUp()
     {
         $this->setUpSmarty(dirname(__FILE__));
+        $this->smarty->setUseSubDirs(true);
+        $this->smartyBC->setUseSubDirs(true);
         $this->smartyBC->disableSecurity();
         $this->smarty->disableSecurity();
         $this->smarty->setCompileId($this->getName());
@@ -42,7 +44,30 @@ class CompilePhpTest extends PHPUnit_Smarty
     {
         $result = str_replace("\r", '', $result);
         $this->smartyBC->php_handling = $phpHandling;
-        $this->smartyBC->compile_id = $testName;
+        $this->smartyBC->compile_id = $testName.$this->smartyBC->php_handling ;
+        $tpl = $this->smartyBC->createTemplate($templateFile);
+        if ($phpHandling == Smarty::PHP_PASSTHRU || $phpHandling == Smarty::PHP_QUOTE) {
+            $result = str_replace("\r", '', $tpl->source->getContent());
+        }
+        if ($phpHandling == Smarty::PHP_QUOTE) {
+            $result = preg_replace_callback('#(<\?(?:php|=)?)|(<%)|(<script\s+language\s*=\s*["\']?\s*php\s*["\']?\s*>)|(\?>)|(%>)|(<\/script>)#i', array($this, 'quote'), $result);
+        }
+        $content = $tpl->fetch();
+        $this->assertEquals($result, $content, $testName);
+    }   /**
+ * Test
+ * @runInSeparateProcess
+ * @preserveGlobalState disabled
+ * @dataProvider data
+ *
+ */
+    public function testPHPcaching($phpHandling, $templateFile, $result, $testName)
+    {
+        $result = str_replace("\r", '', $result);
+        $this->smartyBC->php_handling = $phpHandling;
+        $this->smartyBC->compile_id = $testName.$this->smartyBC->php_handling ;
+        $this->smartyBC->caching = true;
+        $this->smartyBC->force_cache = true;
         $tpl = $this->smartyBC->createTemplate($templateFile);
         if ($phpHandling == Smarty::PHP_PASSTHRU || $phpHandling == Smarty::PHP_QUOTE) {
             $result = str_replace("\r", '', $tpl->source->getContent());
@@ -71,16 +96,18 @@ class CompilePhpTest extends PHPUnit_Smarty
     {
         $this->smartyBC->caching = 1;
         $this->smartyBC->assign('foo', 'foo');
+        $this->smartyBC->compile_id = 'Tag nocache' ;
         $content = $this->smartyBC->fetch('phptag_nocache.tpl');
-        $this->assertEquals('-->foo<--', $content);
+        $this->assertEquals('-->foo<--', $content,'Tag nocache 1');
     }
 
     public function testPHP_Tag_Nocache2()
     {
         $this->smartyBC->caching = 1;
         $this->smartyBC->assign('foo', 'bar');
+        $this->smartyBC->compile_id = 'Tag nocache' ;
         $content = $this->smartyBC->fetch('phptag_nocache.tpl');
-        $this->assertEquals('-->bar<--', $content);
+        $this->assertEquals('-->bar<--', $content,'Tag nocache 2');
     }
     /**
      * test {php no cache}illegal option
@@ -99,7 +126,8 @@ class CompilePhpTest extends PHPUnit_Smarty
     public function testPHPfooPlugin()
     {
         $this->smarty->addPluginsDir("./PHPunitplugins/");
-        $this->assertEquals('phptest okay', $this->smarty->fetch('string:{phptest}'));
+        $this->smartyBC->compile_id = 'Tag nocache' ;
+        $this->assertEquals('phptest okay', $this->smarty->fetch('string:{phptest}'),'testPHPfooPlugin');
     }
 
     public function data()
@@ -140,7 +168,7 @@ echo \'?> \';
 echo \'<% \';
 echo \'%> \';
 %><--', 'PHP_ALLOW, \'asp.tpl\''),
-            array(Smarty::PHP_REMOVE, 'script.tpl', '--><--', 'PHP_REMOVE, \'script.tpl\''),
+            array(Smarty::PHP_REMOVE, 'script.tpl', '<br><br>', 'PHP_REMOVE, \'script.tpl\''),
             array(Smarty::PHP_PASSTHRU, 'script.tpl', '', 'PHP_PASSTHRU, \'script.tpl\''),
             array(Smarty::PHP_QUOTE, 'script.tpl', '', 'PHP_QUOTE, \'script.tpl\''),
             array(Smarty::PHP_ALLOW, 'phptag.tpl', '--> hello world {php} {/php} <--', 'PHP_ALLOW, \'phptag.tpl\''),
@@ -153,7 +181,7 @@ $foo = 3;
 { /php}<--', 'PHP_ALLOW, \'phptag_literal.tpl\''),
         );
         if (version_compare(phpversion(), '5.7.0', '<')) {
-            $data[] = array(Smarty::PHP_ALLOW, 'script.tpl', '--> hello world <script language=\'php\'> </script> <--', 'PHP_ALLOW, \'script.tpl\'');
+            $data[] = array(Smarty::PHP_ALLOW, 'script.tpl', '<br> This is a script <br> 5<br>', 'PHP_ALLOW, \'script.tpl\'');
         }
         return $data;
     }
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_ALLOW_asp_tpl_3/ea/3f/ab/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_ALLOW_asp_tpl_3/ea/3f/ab/dummy.txt
new file mode 100644
index 00000000..2995a4d0
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_ALLOW_asp_tpl_3/ea/3f/ab/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_ALLOW_php2_tpl_3/29/c4/f2/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_ALLOW_php2_tpl_3/29/c4/f2/dummy.txt
new file mode 100644
index 00000000..2995a4d0
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_ALLOW_php2_tpl_3/29/c4/f2/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_ALLOW_php_block_comment_tpl_3/8b/3c/38/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_ALLOW_php_block_comment_tpl_3/8b/3c/38/dummy.txt
new file mode 100644
index 00000000..2995a4d0
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_ALLOW_php_block_comment_tpl_3/8b/3c/38/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_ALLOW_php_line_comment_tpl_3/db/b0/18/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_ALLOW_php_line_comment_tpl_3/db/b0/18/dummy.txt
new file mode 100644
index 00000000..2995a4d0
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_ALLOW_php_line_comment_tpl_3/db/b0/18/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_ALLOW_php_tpl_3/cd/1a/7e/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_ALLOW_php_tpl_3/cd/1a/7e/dummy.txt
new file mode 100644
index 00000000..2995a4d0
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_ALLOW_php_tpl_3/cd/1a/7e/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_ALLOW_phptag_block_comment_tpl_3/59/5e/e8/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_ALLOW_phptag_block_comment_tpl_3/59/5e/e8/dummy.txt
new file mode 100644
index 00000000..2995a4d0
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_ALLOW_phptag_block_comment_tpl_3/59/5e/e8/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_ALLOW_phptag_line_comment_tpl_3/9f/3e/92/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_ALLOW_phptag_line_comment_tpl_3/9f/3e/92/dummy.txt
new file mode 100644
index 00000000..2995a4d0
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_ALLOW_phptag_line_comment_tpl_3/9f/3e/92/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_ALLOW_phptag_literal_tpl_3/ac/c4/1a/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_ALLOW_phptag_literal_tpl_3/ac/c4/1a/dummy.txt
new file mode 100644
index 00000000..2995a4d0
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_ALLOW_phptag_literal_tpl_3/ac/c4/1a/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_ALLOW_phptag_tpl_3/37/9e/e6/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_ALLOW_phptag_tpl_3/37/9e/e6/dummy.txt
new file mode 100644
index 00000000..2995a4d0
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_ALLOW_phptag_tpl_3/37/9e/e6/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_ALLOW_script_tpl_3/06/ed/7e/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_ALLOW_script_tpl_3/06/ed/7e/dummy.txt
new file mode 100644
index 00000000..2995a4d0
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_ALLOW_script_tpl_3/06/ed/7e/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_PASSTHRU_asp_tpl_0/ea/3f/ab/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_PASSTHRU_asp_tpl_0/ea/3f/ab/dummy.txt
new file mode 100644
index 00000000..2995a4d0
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_PASSTHRU_asp_tpl_0/ea/3f/ab/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_PASSTHRU_php2_tpl_0/29/c4/f2/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_PASSTHRU_php2_tpl_0/29/c4/f2/dummy.txt
new file mode 100644
index 00000000..2995a4d0
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_PASSTHRU_php2_tpl_0/29/c4/f2/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_PASSTHRU_php_block_comment_tpl_0/8b/3c/38/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_PASSTHRU_php_block_comment_tpl_0/8b/3c/38/dummy.txt
new file mode 100644
index 00000000..2995a4d0
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_PASSTHRU_php_block_comment_tpl_0/8b/3c/38/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_PASSTHRU_php_line_comment_tpl_0/db/b0/18/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_PASSTHRU_php_line_comment_tpl_0/db/b0/18/dummy.txt
new file mode 100644
index 00000000..2995a4d0
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_PASSTHRU_php_line_comment_tpl_0/db/b0/18/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_PASSTHRU_php_tpl_0/cd/1a/7e/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_PASSTHRU_php_tpl_0/cd/1a/7e/dummy.txt
new file mode 100644
index 00000000..2995a4d0
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_PASSTHRU_php_tpl_0/cd/1a/7e/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_PASSTHRU_script_tpl_0/06/ed/7e/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_PASSTHRU_script_tpl_0/06/ed/7e/dummy.txt
new file mode 100644
index 00000000..2995a4d0
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_PASSTHRU_script_tpl_0/06/ed/7e/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_QUOTE_asp_tpl_1/ea/3f/ab/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_QUOTE_asp_tpl_1/ea/3f/ab/dummy.txt
new file mode 100644
index 00000000..2995a4d0
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_QUOTE_asp_tpl_1/ea/3f/ab/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_QUOTE_php2_tpl_1/29/c4/f2/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_QUOTE_php2_tpl_1/29/c4/f2/dummy.txt
new file mode 100644
index 00000000..2995a4d0
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_QUOTE_php2_tpl_1/29/c4/f2/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_QUOTE_php_block_comment_tpl_1/8b/3c/38/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_QUOTE_php_block_comment_tpl_1/8b/3c/38/dummy.txt
new file mode 100644
index 00000000..2995a4d0
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_QUOTE_php_block_comment_tpl_1/8b/3c/38/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_QUOTE_php_line_comment_tpl_1/db/b0/18/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_QUOTE_php_line_comment_tpl_1/db/b0/18/dummy.txt
new file mode 100644
index 00000000..2995a4d0
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_QUOTE_php_line_comment_tpl_1/db/b0/18/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_QUOTE_php_tpl_1/cd/1a/7e/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_QUOTE_php_tpl_1/cd/1a/7e/dummy.txt
new file mode 100644
index 00000000..2995a4d0
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_QUOTE_php_tpl_1/cd/1a/7e/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_QUOTE_script_tpl_1/06/ed/7e/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_QUOTE_script_tpl_1/06/ed/7e/dummy.txt
new file mode 100644
index 00000000..2995a4d0
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_QUOTE_script_tpl_1/06/ed/7e/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_REMOVE_asp_tpl_2/ea/3f/ab/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_REMOVE_asp_tpl_2/ea/3f/ab/dummy.txt
new file mode 100644
index 00000000..2995a4d0
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_REMOVE_asp_tpl_2/ea/3f/ab/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_REMOVE_php2_tpl_2/29/c4/f2/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_REMOVE_php2_tpl_2/29/c4/f2/dummy.txt
new file mode 100644
index 00000000..2995a4d0
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_REMOVE_php2_tpl_2/29/c4/f2/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_REMOVE_php_block_comment_tpl_2/8b/3c/38/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_REMOVE_php_block_comment_tpl_2/8b/3c/38/dummy.txt
new file mode 100644
index 00000000..2995a4d0
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_REMOVE_php_block_comment_tpl_2/8b/3c/38/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_REMOVE_php_line_comment_tpl_2/db/b0/18/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_REMOVE_php_line_comment_tpl_2/db/b0/18/dummy.txt
new file mode 100644
index 00000000..2995a4d0
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_REMOVE_php_line_comment_tpl_2/db/b0/18/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_REMOVE_php_tpl_2/cd/1a/7e/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_REMOVE_php_tpl_2/cd/1a/7e/dummy.txt
new file mode 100644
index 00000000..2995a4d0
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_REMOVE_php_tpl_2/cd/1a/7e/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_REMOVE_script_tpl_2/06/ed/7e/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_REMOVE_script_tpl_2/06/ed/7e/dummy.txt
new file mode 100644
index 00000000..2995a4d0
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Php/cache/PHP_REMOVE_script_tpl_2/06/ed/7e/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/cache/Tag_nocache/bc/55/66/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Php/cache/Tag_nocache/bc/55/66/dummy.txt
new file mode 100644
index 00000000..2995a4d0
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Php/cache/Tag_nocache/bc/55/66/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/templates/script.tpl b/tests/UnitTests/TemplateSource/TagTests/Php/templates/script.tpl
index 0e832887..076e32dd 100644
--- a/tests/UnitTests/TemplateSource/TagTests/Php/templates/script.tpl
+++ b/tests/UnitTests/TemplateSource/TagTests/Php/templates/script.tpl
@@ -1,5 +1 @@
---><script language='php'>
-echo ' hello world ';
-echo '<script language=\'php\'> ';
-echo '</script> ';
-</script><--
\ No newline at end of file
+<br><script language='php'>echo ' This is a script <br> ';echo 2+3;</script><br>
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_ALLOW_asp_tpl_3/5b/3f/86/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_ALLOW_asp_tpl_3/5b/3f/86/dummy.txt
new file mode 100644
index 00000000..2995a4d0
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_ALLOW_asp_tpl_3/5b/3f/86/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_ALLOW_php2_tpl_3/8e/21/07/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_ALLOW_php2_tpl_3/8e/21/07/dummy.txt
new file mode 100644
index 00000000..2995a4d0
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_ALLOW_php2_tpl_3/8e/21/07/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_ALLOW_php_block_comment_tpl_3/ef/5c/4b/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_ALLOW_php_block_comment_tpl_3/ef/5c/4b/dummy.txt
new file mode 100644
index 00000000..2995a4d0
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_ALLOW_php_block_comment_tpl_3/ef/5c/4b/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_ALLOW_php_line_comment_tpl_3/6a/95/aa/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_ALLOW_php_line_comment_tpl_3/6a/95/aa/dummy.txt
new file mode 100644
index 00000000..2995a4d0
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_ALLOW_php_line_comment_tpl_3/6a/95/aa/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_ALLOW_php_tpl_3/de/87/f4/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_ALLOW_php_tpl_3/de/87/f4/dummy.txt
new file mode 100644
index 00000000..2995a4d0
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_ALLOW_php_tpl_3/de/87/f4/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_ALLOW_phptag_block_comment_tpl_3/56/75/8d/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_ALLOW_phptag_block_comment_tpl_3/56/75/8d/dummy.txt
new file mode 100644
index 00000000..2995a4d0
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_ALLOW_phptag_block_comment_tpl_3/56/75/8d/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_ALLOW_phptag_line_comment_tpl_3/fd/2a/b7/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_ALLOW_phptag_line_comment_tpl_3/fd/2a/b7/dummy.txt
new file mode 100644
index 00000000..2995a4d0
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_ALLOW_phptag_line_comment_tpl_3/fd/2a/b7/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_ALLOW_phptag_literal_tpl_3/26/72/1e/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_ALLOW_phptag_literal_tpl_3/26/72/1e/dummy.txt
new file mode 100644
index 00000000..2995a4d0
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_ALLOW_phptag_literal_tpl_3/26/72/1e/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_ALLOW_phptag_tpl_3/c8/c7/c5/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_ALLOW_phptag_tpl_3/c8/c7/c5/dummy.txt
new file mode 100644
index 00000000..2995a4d0
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_ALLOW_phptag_tpl_3/c8/c7/c5/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_ALLOW_script_tpl_3/41/7c/8a/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_ALLOW_script_tpl_3/41/7c/8a/dummy.txt
new file mode 100644
index 00000000..2995a4d0
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_ALLOW_script_tpl_3/41/7c/8a/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_PASSTHRU_asp_tpl_0/5b/3f/86/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_PASSTHRU_asp_tpl_0/5b/3f/86/dummy.txt
new file mode 100644
index 00000000..2995a4d0
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_PASSTHRU_asp_tpl_0/5b/3f/86/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_PASSTHRU_php2_tpl_0/8e/21/07/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_PASSTHRU_php2_tpl_0/8e/21/07/dummy.txt
new file mode 100644
index 00000000..2995a4d0
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_PASSTHRU_php2_tpl_0/8e/21/07/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_PASSTHRU_php_block_comment_tpl_0/ef/5c/4b/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_PASSTHRU_php_block_comment_tpl_0/ef/5c/4b/dummy.txt
new file mode 100644
index 00000000..2995a4d0
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_PASSTHRU_php_block_comment_tpl_0/ef/5c/4b/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_PASSTHRU_php_line_comment_tpl_0/6a/95/aa/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_PASSTHRU_php_line_comment_tpl_0/6a/95/aa/dummy.txt
new file mode 100644
index 00000000..2995a4d0
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_PASSTHRU_php_line_comment_tpl_0/6a/95/aa/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_PASSTHRU_php_tpl_0/de/87/f4/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_PASSTHRU_php_tpl_0/de/87/f4/dummy.txt
new file mode 100644
index 00000000..2995a4d0
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_PASSTHRU_php_tpl_0/de/87/f4/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_PASSTHRU_script_tpl_0/41/7c/8a/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_PASSTHRU_script_tpl_0/41/7c/8a/dummy.txt
new file mode 100644
index 00000000..2995a4d0
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_PASSTHRU_script_tpl_0/41/7c/8a/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_QUOTE_asp_tpl_1/5b/3f/86/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_QUOTE_asp_tpl_1/5b/3f/86/dummy.txt
new file mode 100644
index 00000000..2995a4d0
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_QUOTE_asp_tpl_1/5b/3f/86/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_QUOTE_php2_tpl_1/8e/21/07/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_QUOTE_php2_tpl_1/8e/21/07/dummy.txt
new file mode 100644
index 00000000..2995a4d0
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_QUOTE_php2_tpl_1/8e/21/07/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_QUOTE_php_block_comment_tpl_1/ef/5c/4b/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_QUOTE_php_block_comment_tpl_1/ef/5c/4b/dummy.txt
new file mode 100644
index 00000000..2995a4d0
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_QUOTE_php_block_comment_tpl_1/ef/5c/4b/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_QUOTE_php_line_comment_tpl_1/6a/95/aa/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_QUOTE_php_line_comment_tpl_1/6a/95/aa/dummy.txt
new file mode 100644
index 00000000..2995a4d0
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_QUOTE_php_line_comment_tpl_1/6a/95/aa/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_QUOTE_php_tpl_1/de/87/f4/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_QUOTE_php_tpl_1/de/87/f4/dummy.txt
new file mode 100644
index 00000000..2995a4d0
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_QUOTE_php_tpl_1/de/87/f4/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_QUOTE_script_tpl_1/41/7c/8a/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_QUOTE_script_tpl_1/41/7c/8a/dummy.txt
new file mode 100644
index 00000000..2995a4d0
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_QUOTE_script_tpl_1/41/7c/8a/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_REMOVE_asp_tpl_2/5b/3f/86/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_REMOVE_asp_tpl_2/5b/3f/86/dummy.txt
new file mode 100644
index 00000000..2995a4d0
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_REMOVE_asp_tpl_2/5b/3f/86/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_REMOVE_php2_tpl_2/8e/21/07/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_REMOVE_php2_tpl_2/8e/21/07/dummy.txt
new file mode 100644
index 00000000..2995a4d0
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_REMOVE_php2_tpl_2/8e/21/07/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_REMOVE_php_block_comment_tpl_2/ef/5c/4b/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_REMOVE_php_block_comment_tpl_2/ef/5c/4b/dummy.txt
new file mode 100644
index 00000000..2995a4d0
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_REMOVE_php_block_comment_tpl_2/ef/5c/4b/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_REMOVE_php_line_comment_tpl_2/6a/95/aa/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_REMOVE_php_line_comment_tpl_2/6a/95/aa/dummy.txt
new file mode 100644
index 00000000..2995a4d0
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_REMOVE_php_line_comment_tpl_2/6a/95/aa/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_REMOVE_php_tpl_2/de/87/f4/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_REMOVE_php_tpl_2/de/87/f4/dummy.txt
new file mode 100644
index 00000000..2995a4d0
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_REMOVE_php_tpl_2/de/87/f4/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_REMOVE_script_tpl_2/41/7c/8a/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_REMOVE_script_tpl_2/41/7c/8a/dummy.txt
new file mode 100644
index 00000000..2995a4d0
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/PHP_REMOVE_script_tpl_2/41/7c/8a/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/Tag_nocache/80/9d/fb/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/Tag_nocache/80/9d/fb/dummy.txt
new file mode 100644
index 00000000..2995a4d0
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/Tag_nocache/80/9d/fb/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/testPHPfooPlugin/ab/4c/1d/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/testPHPfooPlugin/ab/4c/1d/dummy.txt
new file mode 100644
index 00000000..2995a4d0
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/testPHPfooPlugin/ab/4c/1d/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/PluginBlock/cache/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/PluginBlock/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/TagTests/PluginBlock/cache/dummy.txt
+++ b/tests/UnitTests/TemplateSource/TagTests/PluginBlock/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/PluginBlock/templates_c/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/PluginBlock/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/TagTests/PluginBlock/templates_c/dummy.txt
+++ b/tests/UnitTests/TemplateSource/TagTests/PluginBlock/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/PluginFunction/cache/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/PluginFunction/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/TagTests/PluginFunction/cache/dummy.txt
+++ b/tests/UnitTests/TemplateSource/TagTests/PluginFunction/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/PluginFunction/templates_c/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/PluginFunction/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/TagTests/PluginFunction/templates_c/dummy.txt
+++ b/tests/UnitTests/TemplateSource/TagTests/PluginFunction/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/PluginModifier/cache/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/PluginModifier/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/TagTests/PluginModifier/cache/dummy.txt
+++ b/tests/UnitTests/TemplateSource/TagTests/PluginModifier/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/PluginModifier/templates_c/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/PluginModifier/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/TagTests/PluginModifier/templates_c/dummy.txt
+++ b/tests/UnitTests/TemplateSource/TagTests/PluginModifier/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Section/cache/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Section/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/TagTests/Section/cache/dummy.txt
+++ b/tests/UnitTests/TemplateSource/TagTests/Section/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Section/templates_c/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Section/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/TagTests/Section/templates_c/dummy.txt
+++ b/tests/UnitTests/TemplateSource/TagTests/Section/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/SetFilter/cache/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/SetFilter/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/TagTests/SetFilter/cache/dummy.txt
+++ b/tests/UnitTests/TemplateSource/TagTests/SetFilter/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/SetFilter/templates_c/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/SetFilter/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/TagTests/SetFilter/templates_c/dummy.txt
+++ b/tests/UnitTests/TemplateSource/TagTests/SetFilter/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Strip/templates_c/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Strip/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/TagTests/Strip/templates_c/dummy.txt
+++ b/tests/UnitTests/TemplateSource/TagTests/Strip/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Strip/templates_tmp/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/Strip/templates_tmp/dummy.txt
new file mode 100644
index 00000000..2995a4d0
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/Strip/templates_tmp/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/TemplateFunction/cache/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/TemplateFunction/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/TagTests/TemplateFunction/cache/dummy.txt
+++ b/tests/UnitTests/TemplateSource/TagTests/TemplateFunction/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/TemplateFunction/templates_c/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/TemplateFunction/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/TagTests/TemplateFunction/templates_c/dummy.txt
+++ b/tests/UnitTests/TemplateSource/TagTests/TemplateFunction/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/While/cache/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/While/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/TagTests/While/cache/dummy.txt
+++ b/tests/UnitTests/TemplateSource/TagTests/While/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/While/templates_c/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/While/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/TagTests/While/templates_c/dummy.txt
+++ b/tests/UnitTests/TemplateSource/TagTests/While/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/_Attributes/cache/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/_Attributes/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/TagTests/_Attributes/cache/dummy.txt
+++ b/tests/UnitTests/TemplateSource/TagTests/_Attributes/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/_Attributes/templates_c/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/_Attributes/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/TagTests/_Attributes/templates_c/dummy.txt
+++ b/tests/UnitTests/TemplateSource/TagTests/_Attributes/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/_Error/cache/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/_Error/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/TagTests/_Error/cache/dummy.txt
+++ b/tests/UnitTests/TemplateSource/TagTests/_Error/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/_Error/templates_c/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/_Error/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/TagTests/_Error/templates_c/dummy.txt
+++ b/tests/UnitTests/TemplateSource/TagTests/_Error/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/_Print/cache/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/_Print/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/TagTests/_Print/cache/dummy.txt
+++ b/tests/UnitTests/TemplateSource/TagTests/_Print/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/_Print/templates_c/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/_Print/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/TagTests/_Print/templates_c/dummy.txt
+++ b/tests/UnitTests/TemplateSource/TagTests/_Print/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/break/cache/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/break/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/TagTests/break/cache/dummy.txt
+++ b/tests/UnitTests/TemplateSource/TagTests/break/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/break/templates_c/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/break/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/TagTests/break/templates_c/dummy.txt
+++ b/tests/UnitTests/TemplateSource/TagTests/break/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/ValueTests/Array/cache/dummy.txt b/tests/UnitTests/TemplateSource/ValueTests/Array/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/ValueTests/Array/cache/dummy.txt
+++ b/tests/UnitTests/TemplateSource/ValueTests/Array/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/ValueTests/Array/templates_c/dummy.txt b/tests/UnitTests/TemplateSource/ValueTests/Array/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/ValueTests/Array/templates_c/dummy.txt
+++ b/tests/UnitTests/TemplateSource/ValueTests/Array/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/ValueTests/BoolenNull/cache/dummy.txt b/tests/UnitTests/TemplateSource/ValueTests/BoolenNull/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/ValueTests/BoolenNull/cache/dummy.txt
+++ b/tests/UnitTests/TemplateSource/ValueTests/BoolenNull/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/ValueTests/BoolenNull/templates_c/dummy.txt b/tests/UnitTests/TemplateSource/ValueTests/BoolenNull/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/ValueTests/BoolenNull/templates_c/dummy.txt
+++ b/tests/UnitTests/TemplateSource/ValueTests/BoolenNull/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/ValueTests/ConstantTests/cache/dummy.txt b/tests/UnitTests/TemplateSource/ValueTests/ConstantTests/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/ValueTests/ConstantTests/cache/dummy.txt
+++ b/tests/UnitTests/TemplateSource/ValueTests/ConstantTests/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/ValueTests/ConstantTests/templates_c/dummy.txt b/tests/UnitTests/TemplateSource/ValueTests/ConstantTests/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/ValueTests/ConstantTests/templates_c/dummy.txt
+++ b/tests/UnitTests/TemplateSource/ValueTests/ConstantTests/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/ValueTests/DoubleQuoted/cache/dummy.txt b/tests/UnitTests/TemplateSource/ValueTests/DoubleQuoted/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/ValueTests/DoubleQuoted/cache/dummy.txt
+++ b/tests/UnitTests/TemplateSource/ValueTests/DoubleQuoted/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/ValueTests/DoubleQuoted/templates_c/dummy.txt b/tests/UnitTests/TemplateSource/ValueTests/DoubleQuoted/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/ValueTests/DoubleQuoted/templates_c/dummy.txt
+++ b/tests/UnitTests/TemplateSource/ValueTests/DoubleQuoted/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/ValueTests/Math/cache/dummy.txt b/tests/UnitTests/TemplateSource/ValueTests/Math/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/ValueTests/Math/cache/dummy.txt
+++ b/tests/UnitTests/TemplateSource/ValueTests/Math/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/ValueTests/Math/templates_c/dummy.txt b/tests/UnitTests/TemplateSource/ValueTests/Math/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/ValueTests/Math/templates_c/dummy.txt
+++ b/tests/UnitTests/TemplateSource/ValueTests/Math/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/ValueTests/Modifier/ModifierTest.php b/tests/UnitTests/TemplateSource/ValueTests/Modifier/ModifierTest.php
index a719851a..54f657b7 100644
--- a/tests/UnitTests/TemplateSource/ValueTests/Modifier/ModifierTest.php
+++ b/tests/UnitTests/TemplateSource/ValueTests/Modifier/ModifierTest.php
@@ -18,7 +18,7 @@ class ModifierTest extends PHPUnit_Smarty
     public function setUp()
     {
         $this->setUpSmarty(dirname(__FILE__));
-        $this->smarty->enableSecurity();
+        $this->smarty->addTemplateDir("./templates_tmp");
     }
 
     public function testInit()
@@ -27,123 +27,51 @@ class ModifierTest extends PHPUnit_Smarty
     }
 
     /**
-     * test PHP function as modifier
-     */
-    public function testPHPFunctionModifier()
-    {
-        $this->smarty->security_policy->php_modifiers = array('strlen');
-        $tpl = $this->smarty->createTemplate('eval:{"hello world"|strlen}');
-        $this->assertEquals("11", $this->smarty->fetch($tpl));
-    }
-
-    public function testPHPFunctionModifier2()
-    {
-        $this->smarty->security_policy->php_modifiers = array('strlen');
-        $tpl = $this->smarty->createTemplate('eval:{assign var=foo value="hello world"}{$foo|strlen}');
-        $this->assertEquals("11", $this->smarty->fetch($tpl));
-    }
-
-    /**
-     * test plugin as modifier
-     */
-    public function testPluginModifier()
-    {
-        $tpl = $this->smarty->createTemplate('eval:{"hello world"|truncate:6}');
-        $this->assertEquals("hel...", $this->smarty->fetch($tpl));
-    }
-
-    /**
-     * test plugin as modifier with variable
-     */
-    public function testPluginModifierVar()
-    {
-        $tpl = $this->smarty->createTemplate('eval:{"hello world"|truncate:$foo}');
-        $tpl->assign('foo', 6);
-        $this->assertEquals("hel...", $this->smarty->fetch($tpl));
-    }
-
-    public function testPluginModifierVar2()
-    {
-        $tpl = $this->smarty->createTemplate('eval:{"hello world"|truncate:$foo:"   "}');
-        $tpl->assign('foo', 6);
-        $this->assertEquals("hel   ", $this->smarty->fetch($tpl));
-    }
-
-    public function testPluginModifierVar3()
-    {
-        $tpl = $this->smarty->createTemplate('eval:{"hello world"|truncate:$foo:$bar}');
-        $tpl->assign('foo', 6);
-        $tpl->assign('bar', '   ');
-        $this->assertEquals("hel   ", $this->smarty->fetch($tpl));
-    }
-
-    /**
-     * test modifier chaining
-     */
-    public function testModifierChaining()
-    {
-        $this->smarty->security_policy->php_modifiers = array('strlen');
-        $tpl = $this->smarty->createTemplate('eval:{"hello world"|truncate:6|strlen}');
-        $this->assertEquals("6", $this->smarty->fetch($tpl));
-    }
-
-    /**
-     * test modifier in {if}
-     */
-    public function testModifierInsideIf()
-    {
-        $this->smarty->security_policy->php_modifiers = array('strlen');
-        $tpl = $this->smarty->createTemplate('eval:{if "hello world"|truncate:6|strlen == 6}okay{/if}');
-        $this->assertEquals("okay", $this->smarty->fetch($tpl));
-    }
-
-    /**
-     * test modifier in expressions
-     */
-    public function testModifierInsideExpression()
-    {
-        $this->smarty->security_policy->php_modifiers = array('strlen');
-        $tpl = $this->smarty->createTemplate('eval:{"hello world"|truncate:6|strlen + ("hello world"|truncate:8|strlen)}');
-        $this->assertEquals("14", $this->smarty->fetch($tpl));
-    }
-
-    public function testModifierInsideExpression2()
-    {
-        $this->smarty->security_policy->php_modifiers = array('round');
-        $tpl = $this->smarty->createTemplate('eval:{1.1*7.1|round}');
-        $this->assertEquals("7.7", $this->smarty->fetch($tpl));
-    }
-
-    /**
-     * test modifier at plugin result
-     * @runInSeparateProcess
+     * Test modifier
+     *
+     * @not                 runInSeparateProcess
      * @preserveGlobalState disabled
+     * @dataProvider        dataTestModifier
      */
-    public function testModifierAtPluginResult()
+    public function testModifier($code, $result, $testName, $testNumber)
     {
-        $tpl = $this->smarty->createTemplate('eval:{counter|truncate:5 start=100000}');
-        $this->assertEquals("10...", $this->smarty->fetch($tpl));
+        $name = empty($testName) ? $testNumber : $testName;
+        $file = "testModifier_{$name}.tpl";
+        $this->makeTemplateFile($file, $code);
+        $this->smarty->assignGlobal('file', $file);
+        $this->smarty->assign('bar', 'buh');
+        $this->assertEquals($this->strip($result), $this->strip($this->smarty->fetch($file)),
+                            "testModifier - {$code} - {$name}");
     }
 
-    /**
-     * test unqouted string as modifier parameter
-     */
-    public function testModifierUnqoutedString()
+    /*
+      * Data provider für testModifier
+      */
+    public function dataTestModifier()
     {
-        $tpl = $this->smarty->createTemplate('eval:{"hello world"|replace:hello:xxxxx}');
-        $this->assertEquals("xxxxx world", $this->smarty->fetch($tpl));
+        $i = 1;
+        /*
+                    * Code
+                    * result
+                    * test name
+                    */
+        return array(array('{"hello world"|strlen}', '11', 'OnString', $i ++),
+                     array('{$foo ="hello world"}{$foo|strlen}', '11', 'OnVar', $i ++),
+                     array('{"hello world"|truncate:6}', 'hel...', 'TruncatePlugin', $i ++),
+                     array('{$foo=7}{"hello world"|truncate:$foo}', 'hell...', 'TruncatePluginLengthVar', $i ++),
+                     array('{$foo=10}{$bar=\'<>\'}{"hello world"|truncate:$foo:$bar}', 'hello<>', 'TruncatePluginAllVar', $i ++),
+                     array('{"hello world"|truncate:6|strlen}', '6', 'Chain', $i ++),
+                     array('{"hello world"|truncate:6:"xx"|cat:"Smarty"}', 'hellxxSmarty', 'ChainVar', $i ++),
+                     array('{"hello world"|truncate:6|strlen}', '6', 'Chain', $i ++),
+                     array('{if "hello world"|truncate:6|strlen == 6}okay{/if}', 'okay', 'InIF', $i ++),
+                     array('{"hello world"|truncate:6|strlen + ("hello world"|truncate:8|strlen)}', '14', 'Expression', $i ++),
+                     array('{1.1*7.1|round}', '7.7', 'InExpression', $i ++),
+                     array('{counter|truncate:5 start=100000}', '10...', 'PluginOutput', $i ++),
+       );
     }
 
-    /**
-     * test registered modifier function
-     */
-    public function testModifierRegisteredFunction()
-    {
-        $this->smarty->registerPlugin(Smarty::PLUGIN_MODIFIER, 'testmodifier', 'testmodifier');
-        $tpl = $this->smarty->createTemplate('eval:{$foo|testmodifier}');
-        $tpl->assign('foo', 2);
-        $this->assertEquals("mymodifier function 2", $this->smarty->fetch($tpl));
-    }
+
+
 
     /**
      * test registered modifier static class
@@ -151,9 +79,8 @@ class ModifierTest extends PHPUnit_Smarty
     public function testModifierRegisteredStaticClass()
     {
         $this->smarty->registerPlugin(Smarty::PLUGIN_MODIFIER, 'testmodifier', array('testmodifierclass', 'staticcall'));
-        $tpl = $this->smarty->createTemplate('eval:{$foo|testmodifier}');
-        $tpl->assign('foo', 1);
-        $this->assertEquals("mymodifier static 1", $this->smarty->fetch($tpl));
+        $this->smarty->assign('foo', 1);
+        $this->assertEquals("mymodifier static 1", $this->smarty->fetch('testModifier_RegisteredStatic.tpl'));
     }
 
     /**
@@ -163,9 +90,8 @@ class ModifierTest extends PHPUnit_Smarty
     {
         $obj = new testmodifierclass();
         $this->smarty->registerPlugin(Smarty::PLUGIN_MODIFIER, 'testmodifier', array($obj, 'method'));
-        $tpl = $this->smarty->createTemplate('eval:{$foo|testmodifier}');
-        $tpl->assign('foo', 3);
-        $this->assertEquals("mymodifier method 3", $this->smarty->fetch($tpl));
+        $this->smarty->assign('foo', 3);
+        $this->assertEquals("mymodifier method 3", $this->smarty->fetch('testModifier_RegisteredMethod.tpl'));
     }
 
     /**
@@ -184,9 +110,8 @@ class ModifierTest extends PHPUnit_Smarty
     public function testDefaultModifier()
     {
         $this->smarty->default_modifiers = array('escape');
-        $tpl = $this->smarty->createTemplate('eval:{$foo}{$foo nofilter}');
-        $tpl->assign('foo', '<bar>');
-        $this->assertEquals('&lt;bar&gt;<bar>', $this->smarty->fetch($tpl));
+        $this->smarty->assign('foo', '<bar>');
+        $this->assertEquals('&lt;bar&gt;<bar>', $this->smarty->fetch('testModifier_Default.tpl'));
     }
 }
 
diff --git a/tests/UnitTests/TemplateSource/ValueTests/Modifier/cache/dummy.txt b/tests/UnitTests/TemplateSource/ValueTests/Modifier/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/ValueTests/Modifier/cache/dummy.txt
+++ b/tests/UnitTests/TemplateSource/ValueTests/Modifier/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/ValueTests/Modifier/templates/testModifier_Default.tpl b/tests/UnitTests/TemplateSource/ValueTests/Modifier/templates/testModifier_Default.tpl
new file mode 100644
index 00000000..e5c4736d
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/ValueTests/Modifier/templates/testModifier_Default.tpl
@@ -0,0 +1 @@
+{$foo}{$foo nofilter}
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/ValueTests/Modifier/templates/testModifier_RegisteredMethod.tpl b/tests/UnitTests/TemplateSource/ValueTests/Modifier/templates/testModifier_RegisteredMethod.tpl
new file mode 100644
index 00000000..60ea1847
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/ValueTests/Modifier/templates/testModifier_RegisteredMethod.tpl
@@ -0,0 +1 @@
+{$foo|testmodifier}
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/ValueTests/Modifier/templates/testModifier_RegisteredStatic.tpl b/tests/UnitTests/TemplateSource/ValueTests/Modifier/templates/testModifier_RegisteredStatic.tpl
new file mode 100644
index 00000000..60ea1847
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/ValueTests/Modifier/templates/testModifier_RegisteredStatic.tpl
@@ -0,0 +1 @@
+{$foo|testmodifier}
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/ValueTests/Modifier/templates_c/dummy.txt b/tests/UnitTests/TemplateSource/ValueTests/Modifier/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/ValueTests/Modifier/templates_c/dummy.txt
+++ b/tests/UnitTests/TemplateSource/ValueTests/Modifier/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/ValueTests/Modifier/templates_tmp/dummy.txt b/tests/UnitTests/TemplateSource/ValueTests/Modifier/templates_tmp/dummy.txt
new file mode 100644
index 00000000..2995a4d0
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/ValueTests/Modifier/templates_tmp/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/ValueTests/Objects/cache/dummy.txt b/tests/UnitTests/TemplateSource/ValueTests/Objects/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/ValueTests/Objects/cache/dummy.txt
+++ b/tests/UnitTests/TemplateSource/ValueTests/Objects/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/ValueTests/Objects/templates_c/dummy.txt b/tests/UnitTests/TemplateSource/ValueTests/Objects/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/ValueTests/Objects/templates_c/dummy.txt
+++ b/tests/UnitTests/TemplateSource/ValueTests/Objects/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/ValueTests/PHPfunctions/cache/dummy.txt b/tests/UnitTests/TemplateSource/ValueTests/PHPfunctions/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/ValueTests/PHPfunctions/cache/dummy.txt
+++ b/tests/UnitTests/TemplateSource/ValueTests/PHPfunctions/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/ValueTests/PHPfunctions/templates_c/dummy.txt b/tests/UnitTests/TemplateSource/ValueTests/PHPfunctions/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/ValueTests/PHPfunctions/templates_c/dummy.txt
+++ b/tests/UnitTests/TemplateSource/ValueTests/PHPfunctions/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/ValueTests/SingleQouted/cache/dummy.txt b/tests/UnitTests/TemplateSource/ValueTests/SingleQouted/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/ValueTests/SingleQouted/cache/dummy.txt
+++ b/tests/UnitTests/TemplateSource/ValueTests/SingleQouted/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/ValueTests/SingleQouted/templates_c/dummy.txt b/tests/UnitTests/TemplateSource/ValueTests/SingleQouted/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/ValueTests/SingleQouted/templates_c/dummy.txt
+++ b/tests/UnitTests/TemplateSource/ValueTests/SingleQouted/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Constant/cache/dummy.txt b/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Constant/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Constant/cache/dummy.txt
+++ b/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Constant/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Constant/templates_c/dummy.txt b/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Constant/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Constant/templates_c/dummy.txt
+++ b/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Constant/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Cookie/cache/dummy.txt b/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Cookie/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Cookie/cache/dummy.txt
+++ b/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Cookie/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Cookie/templates_c/dummy.txt b/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Cookie/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Cookie/templates_c/dummy.txt
+++ b/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Cookie/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Delimiter/cache/dummy.txt b/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Delimiter/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Delimiter/cache/dummy.txt
+++ b/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Delimiter/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Delimiter/templates_c/dummy.txt b/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Delimiter/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Delimiter/templates_c/dummy.txt
+++ b/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Delimiter/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Error/cache/dummy.txt b/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Error/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Error/cache/dummy.txt
+++ b/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Error/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Error/templates_c/dummy.txt b/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Error/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Error/templates_c/dummy.txt
+++ b/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Error/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Now/cache/dummy.txt b/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Now/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Now/cache/dummy.txt
+++ b/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Now/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Now/templates_c/dummy.txt b/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Now/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Now/templates_c/dummy.txt
+++ b/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Now/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Post/cache/dummy.txt b/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Post/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Post/cache/dummy.txt
+++ b/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Post/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Post/templates_c/dummy.txt b/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Post/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Post/templates_c/dummy.txt
+++ b/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Post/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/TemplateObject/cache/dummy.txt b/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/TemplateObject/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/TemplateObject/cache/dummy.txt
+++ b/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/TemplateObject/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/TemplateObject/templates_c/dummy.txt b/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/TemplateObject/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/TemplateObject/templates_c/dummy.txt
+++ b/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/TemplateObject/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Version/cache/dummy.txt b/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Version/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Version/cache/dummy.txt
+++ b/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Version/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Version/templates_c/dummy.txt b/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Version/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Version/templates_c/dummy.txt
+++ b/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Version/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/ValueTests/Variables/Stream/cache/dummy.txt b/tests/UnitTests/TemplateSource/ValueTests/Variables/Stream/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/ValueTests/Variables/Stream/cache/dummy.txt
+++ b/tests/UnitTests/TemplateSource/ValueTests/Variables/Stream/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/ValueTests/Variables/Stream/templates_c/dummy.txt b/tests/UnitTests/TemplateSource/ValueTests/Variables/Stream/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/ValueTests/Variables/Stream/templates_c/dummy.txt
+++ b/tests/UnitTests/TemplateSource/ValueTests/Variables/Stream/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/ValueTests/Variables/VariableVariable/cache/dummy.txt b/tests/UnitTests/TemplateSource/ValueTests/Variables/VariableVariable/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/ValueTests/Variables/VariableVariable/cache/dummy.txt
+++ b/tests/UnitTests/TemplateSource/ValueTests/Variables/VariableVariable/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/ValueTests/Variables/VariableVariable/templates_c/dummy.txt b/tests/UnitTests/TemplateSource/ValueTests/Variables/VariableVariable/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/ValueTests/Variables/VariableVariable/templates_c/dummy.txt
+++ b/tests/UnitTests/TemplateSource/ValueTests/Variables/VariableVariable/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/X_Scopes/cache/dummy.txt b/tests/UnitTests/TemplateSource/X_Scopes/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/X_Scopes/cache/dummy.txt
+++ b/tests/UnitTests/TemplateSource/X_Scopes/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/X_Scopes/templates_c/dummy.txt b/tests/UnitTests/TemplateSource/X_Scopes/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/X_Scopes/templates_c/dummy.txt
+++ b/tests/UnitTests/TemplateSource/X_Scopes/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/X_Scopes/templates_tmp/dummy.txt b/tests/UnitTests/TemplateSource/X_Scopes/templates_tmp/dummy.txt
new file mode 100644
index 00000000..2995a4d0
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/X_Scopes/templates_tmp/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/Xml/cache/dummy.txt b/tests/UnitTests/TemplateSource/Xml/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/Xml/cache/dummy.txt
+++ b/tests/UnitTests/TemplateSource/Xml/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/Xml/templates_c/dummy.txt b/tests/UnitTests/TemplateSource/Xml/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/Xml/templates_c/dummy.txt
+++ b/tests/UnitTests/TemplateSource/Xml/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/_Issues/327/cache/dummy.txt b/tests/UnitTests/TemplateSource/_Issues/327/cache/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/_Issues/327/cache/dummy.txt
+++ b/tests/UnitTests/TemplateSource/_Issues/327/cache/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/_Issues/327/templates_c/dummy.txt b/tests/UnitTests/TemplateSource/_Issues/327/templates_c/dummy.txt
index e69de29b..2995a4d0 100644
--- a/tests/UnitTests/TemplateSource/_Issues/327/templates_c/dummy.txt
+++ b/tests/UnitTests/TemplateSource/_Issues/327/templates_c/dummy.txt
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/tests/UnitTests/__shared/PHPunitplugins/block.dummyblock.php b/tests/UnitTests/__shared/PHPunitplugins/block.dummyblock.php
new file mode 100644
index 00000000..7de4fa09
--- /dev/null
+++ b/tests/UnitTests/__shared/PHPunitplugins/block.dummyblock.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Smarty block plugin dummy for testing plugin functionallity
+ *
+ * @package    Smarty
+ * @subpackage PHPunitPlugin
+ */
+/**
+ * Smarty {dummyblock} {/dummyblock}
+ *
+ * @param $params
+ * @param $content
+ * @param $template
+ * @param $repeat
+ */
+function smarty_block_dummyblock($params, $content, $template, &$repeat)
+{
+    if (is_null($content)) {
+        return;
+    } else {
+        return $content;
+    }
+}