WIP

Update composer packages cache key to trigger refresh on lexer

.github/workflows/cd.yml

@@ -1,60 +0,0 @@
-on:
-  push:
-    tags:
-      - '*'
-
-name: CD
-
-jobs:
-  release:
-    if: ${{ startsWith(github.ref_name, '5.') }}
-    runs-on: ubuntu-latest
-
-    env:
-      PHP_EXTENSIONS: dom, json, libxml, mbstring, pdo_sqlite, soap, xml, xmlwriter
-
-    steps:
-        - name: checkout code
-          uses: actions/checkout@v3
-
-        - name: Install PHP with extensions
-          uses: shivammathur/setup-php@v2
-          with:
-            php-version: 8.1
-            extensions: ${{ env.PHP_EXTENSIONS }}
-
-        - name: Install dependencies
-          uses: php-actions/composer@v6
-
-        - name: Run make
-          run: make
-
-        - name: create release assets
-          run: |
-            mkdir release
-            git archive release
-            cd release
-            make
-            cd ..
-            tar -cvzf release.tar.gz release
-
-        - name: create release
-          uses: actions/create-release@v1
-          id: create_release
-          with:
-            draft: false
-            prerelease: false
-            release_name: ${{ steps.version.outputs.version }}
-            tag_name: ${{ github.ref }}
-          env:
-            GITHUB_TOKEN: ${{ github.token }}
-
-        - name: upload artifacts
-          uses: actions/upload-release-asset@v1
-          env:
-            GITHUB_TOKEN: ${{ github.token }}
-          with:
-            upload_url: ${{ steps.create_release.outputs.upload_url }}
-            asset_path: ./release.tar.gz
-            asset_name: release.tar.gz
-            asset_content_type: application/gzip

.github/workflows/ci.yml

@@ -67,15 +67,15 @@ jobs:
       uses: actions/cache@v3
       with:
         path: vendor
-        key: smartyv5-${{ runner.os }}-php-${{ matrix.php-version }}-${{ hashFiles('**/composer.lock') }}
+        key: v5r2-${{ runner.os }}-php-${{ matrix.php-version }}-${{ hashFiles('**/composer.lock') }}
         restore-keys: |
-          smartyv5-${{ runner.os }}-php-${{ matrix.php-version }}-
+          v5r1-${{ runner.os }}-php-${{ matrix.php-version }}-
 
     - name: Install dependencies
       uses: php-actions/composer@v6
 
     - name: Run make
-      run: make
+      run: make -B
 
     - name: Run tests with phpunit
       run: php ./vendor/phpunit/phpunit/phpunit

.gitignore

@@ -5,7 +5,3 @@ phpunit*
 .phpunit.result.cache
 /vendor/*
 /composer.lock
-/src/Lexer/ConfigfileLexer.php
-/src/Lexer/TemplateLexer.php
-/src/Parser/ConfigfileParser.php
-/src/Parser/TemplateParser.php

CHANGELOG.md

@@ -52,6 +52,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Removed direct access to `$smarty->cache_dir`. Use `$smarty->setCacheDir()`.
 - Removed `$smarty->loadPlugin()`, use `$smarty->registerPlugin()` instead.
 - Removed `$smarty->appendByRef()` and `$smarty->assignByRef()`.
+- Removed `$smarty->use_sub_dirs`. Cached files are now automatically stored in subdirs for maximum performance.
 
 ### Fixed
 - `$smarty->muteUndefinedOrNullWarnings()` now also mutes PHP7 notices for undefined array indexes [#736](https://github.com/smarty-php/smarty/issues/736)

TODO.txt

@@ -5,6 +5,11 @@
 - review ->(step|total|first|last|do_else|key|show|iteration|index)
 - review ->tpl_vars, ->config_vars, ->value
 
+- Re-introduce merge_compiled_includes and the {include inline} attribute?
+
+## Beatify output
+- strip <?php and ?> tags from generated output
+
 ## Review public static vars
 - such as _CHARSET and _IS_WINDOWS
 
@@ -18,17 +23,10 @@
 - Consider phasing out $smarty.block.child as this reverses the inheritance hierarchy and might cause infinite loops
   when combined with $smarty.block.parent
 
-## Output buffering
-- Fix ob_ output buffering commands being scattered around the codebase
-
-## Event handlers
-- startRenderCallbacks/endRenderCallbacks should be moved to a central eventdispatcher instead of being (un)registered on templates
 
 ## Plugin system
 - fix template security checks in one place in compiler
 
-## Beatify output
-- compiled templates could be proper classes, possibly using [nette/php-generator](https://packagist.org/packages/nette/php-generator)
 
 ## Documentation
 - beautify and review docs, possibly using [

composer.json

@@ -31,7 +31,8 @@
     },
     "require": {
         "php": "^7.2 || ^8.0",
-        "symfony/polyfill-mbstring": "^1.27"
+        "symfony/polyfill-mbstring": "^1.27",
+        "nette/php-generator": "^3.6"
     },
     "autoload": {
         "psr-4" : {
@@ -48,12 +49,6 @@
     },
     "require-dev": {
         "phpunit/phpunit": "^8.5 || ^7.5",
-        "smarty/smarty-lexer": "^4.0.1"
-    },
-    "repositories": [
-        {
-            "type": "vcs",
-            "url": "https://github.com/smarty-php/smarty-lexer"
-        }
-    ]
+        "smarty/smarty-lexer": "dev-master"
+    }
 }

demo/index.php

@@ -6,7 +6,7 @@
  */
 
 $smarty = new \Smarty\Smarty;
-//$smarty->force_compile = true;
+
 $smarty->debugging = true;
 $smarty->caching = true;
 $smarty->cache_lifetime = 120;

src/Cacheresource/Base.php

@@ -7,18 +7,8 @@ use Smarty\Smarty;
 use Smarty\Template;
 use Smarty\Template\Cached;
 
-/**
- * Smarty Internal Plugin
- *
-
-
- */
-
 /**
  * Cache Handler API
- *
-
-
  * @author     Rodney Rehm
  */
 abstract class Base
@@ -48,14 +38,12 @@ abstract class Base
 	 *
 	 * @param Template $_template template object
 	 * @param Cached|null $cached cached object
-	 * @param boolean $update flag if called because cache update
 	 *
 	 * @return boolean true or false if the cached content does not exist
 	 */
     abstract public function process(
 	    Template $_template,
-	    Cached   $cached = null,
-	             $update = false
+	    Cached   $cached = null
     );
 
     /**
@@ -77,25 +65,6 @@ abstract class Base
      */
     abstract public function retrieveCachedContent(Template $_template);
 
-	/**
-	 * Return cached content
-	 *
-	 * @param Template $_template template object
-	 *
-	 * @return null|string
-	 * @throws Exception
-	 */
-    public function getCachedContent(Template $_template)
-    {
-        if ($this->process($_template)) {
-            ob_start();
-            $unifunc = $_template->getCached()->unifunc;
-            $unifunc($_template);
-            return ob_get_clean();
-        }
-        return null;
-    }
-
     /**
      * Empty cache
      *

src/Cacheresource/Custom.php

@@ -9,6 +9,7 @@ namespace Smarty\Cacheresource;
 
  */
 
+use Smarty\Exception;
 use Smarty\Smarty;
 use Smarty\Template;
 use Smarty\Template\Cached;
@@ -124,23 +125,13 @@ abstract class Custom extends Base
             $cached->content,
             $timestamp
         );
-        $cached->timestamp = isset($timestamp) ? $timestamp : false;
+        $cached->timestamp = $timestamp ?? false;
         $cached->exists = !!$cached->timestamp;
     }
 
-	/**
-	 * Read the cached template and process the header
-	 *
-	 * @param Template $_smarty_tpl do not change variable name, is used by compiled template
-	 * @param Cached|null $cached cached object
-	 * @param boolean $update flag if called because cache update
-	 *
-	 * @return boolean                 true or false if the cached content does not exist
-	 */
     public function process(
 	    Template               $_smarty_tpl,
-	    \Smarty\Template\Cached $cached = null,
-	                           $update = false
+	    \Smarty\Template\Cached $cached = null
     ) {
         if (!$cached) {
             $cached = $_smarty_tpl->getCached();

src/Cacheresource/File.php

@@ -4,6 +4,7 @@ namespace Smarty\Cacheresource;
 
 use RecursiveDirectoryIterator;
 use RecursiveIteratorIterator;
+use Smarty\Exception;
 use Smarty\Smarty;
 use Smarty\Template;
 use Smarty\Template\Cached;
@@ -35,7 +36,7 @@ class File extends Base
     {
         $source = $_template->getSource();
         $smarty = $_template->getSmarty();
-        $_compile_dir_sep = $smarty->use_sub_dirs ? DIRECTORY_SEPARATOR : '^';
+
         $_filepath = sha1($source->uid . $smarty->_joined_template_dir);
         $cached->filepath = $smarty->getCacheDir();
         if (isset($_template->cache_id)) {
@@ -46,23 +47,19 @@ class File extends Base
                                      ),
                                      array(
                                          '_',
-                                         $_compile_dir_sep
+                                         DIRECTORY_SEPARATOR
                                      ),
-                                     $_template->cache_id
-                                 ) . $_compile_dir_sep;
+		                            $_template->cache_id
+                                 ) . DIRECTORY_SEPARATOR;
         }
         if (isset($_template->compile_id)) {
-            $cached->filepath .= preg_replace('![^\w]+!', '_', $_template->compile_id) . $_compile_dir_sep;
-        }
-        // if use_sub_dirs, break file into directories
-        if ($smarty->use_sub_dirs) {
-            $cached->filepath .= $_filepath[ 0 ] . $_filepath[ 1 ] . DIRECTORY_SEPARATOR . $_filepath[ 2 ] .
-                                 $_filepath[ 3 ] .
-                                 DIRECTORY_SEPARATOR .
-                                 $_filepath[ 4 ] . $_filepath[ 5 ] . DIRECTORY_SEPARATOR;
+            $cached->filepath .= preg_replace('![^\w]+!', '_', $_template->compile_id) . DIRECTORY_SEPARATOR;
         }
+        // break file into directories
+        $cached->filepath .= $_filepath[0] . $_filepath[1] . DIRECTORY_SEPARATOR;
+
         $cached->filepath .= $_filepath;
-        $basename = $source->handler->getBasename($source);
+        $basename = $source->getBasename();
         if (!empty($basename)) {
             $cached->filepath .= '.' . $basename;
         }
@@ -91,27 +88,11 @@ class File extends Base
         }
     }
 
-	/**
-	 * Read the cached template and process its header
-	 *
-	 * @param Template $_smarty_tpl do not change variable name, is used by compiled template
-	 * @param Cached|null $cached cached object
-	 * @param bool $update flag if called because cache update
-	 *
-	 * @return boolean true or false if the cached content does not exist
-	 */
     public function process(
 	    Template $_smarty_tpl,
-	    Cached   $cached = null,
-	             $update = false
+	    Cached   $cached = null
     ) {
-        $_smarty_tpl->getCached()->valid = false;
-        if ($update && defined('HHVM_VERSION')) {
-            eval('?>' . file_get_contents($_smarty_tpl->getCached()->filepath));
-            return true;
-        } else {
-            return @include $_smarty_tpl->getCached()->filepath;
-        }
+	    return @include $_smarty_tpl->getCached()->filepath;
     }
 
     /**
@@ -186,8 +167,7 @@ class File extends Base
     {
 	    $_cache_id = isset($cache_id) ? preg_replace('![^\w\|]+!', '_', $cache_id) : null;
 	    $_compile_id = isset($compile_id) ? preg_replace('![^\w]+!', '_', $compile_id) : null;
-	    $_dir_sep = $smarty->use_sub_dirs ? '/' : '^';
-	    $_compile_id_offset = $smarty->use_sub_dirs ? 3 : 0;
+	    $_compile_id_offset = 1;
 	    $_dir = $smarty->getCacheDir();
 	    if ($_dir === '/') { //We should never want to delete this!
 		    return 0;
@@ -196,10 +176,8 @@ class File extends Base
 	    if (isset($_cache_id)) {
 		    $_cache_id_parts = explode('|', $_cache_id);
 		    $_cache_id_parts_count = count($_cache_id_parts);
-		    if ($smarty->use_sub_dirs) {
-			    foreach ($_cache_id_parts as $id_part) {
-				    $_dir .= $id_part . '/';
-			    }
+		    foreach ($_cache_id_parts as $id_part) {
+			    $_dir .= $id_part . DIRECTORY_SEPARATOR;
 		    }
 	    }
 	    if (isset($resource_name)) {
@@ -235,7 +213,7 @@ class File extends Base
 				    if (substr($_filepath, -4) !== '.php') {
 					    continue;
 				    }
-				    $_parts = explode($_dir_sep, str_replace('\\', '/', substr($_filepath, $_dir_length)));
+				    $_parts = explode(DIRECTORY_SEPARATOR, str_replace('\\', '/', substr($_filepath, $_dir_length)));
 				    $_parts_count = count($_parts);
 				    // check name
 				    if (isset($resource_name)) {

src/Cacheresource/KeyValueStore.php

@@ -2,6 +2,7 @@
 
 namespace Smarty\Cacheresource;
 
+use Smarty\Exception;
 use Smarty\Smarty;
 use Smarty\Template;
 use Smarty\Template\Cached;
@@ -92,19 +93,9 @@ abstract class KeyValueStore extends Base
         $cached->exists = !!$cached->timestamp;
     }
 
-	/**
-	 * Read the cached template and process the header
-	 *
-	 * @param Template $_smarty_tpl do not change variable name, is used by compiled template
-	 * @param Cached|null $cached cached object
-	 * @param boolean $update flag if called because cache update
-	 *
-	 * @return boolean                 true or false if the cached content does not exist
-	 */
     public function process(
 	    Template $_smarty_tpl,
-	    Cached   $cached = null,
-	             $update = false
+	    Cached   $cached = null
     ) {
         if (!$cached) {
             $cached = $_smarty_tpl->getCached();

src/CodeFrame/Base.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace Smarty\CodeFrame;
+
+abstract class Base {
+
+	abstract public function renderContent(\Smarty\Template $_smarty_tpl): void;
+}

src/CodeFrame/Cached.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace Smarty\CodeFrame;
+
+abstract class Cached extends Base {
+
+	// @TODO move
+	public function isFresh(\Smarty\Template $template): bool {
+
+		$properties = $this->getProperties();
+
+		// on cache resources other than file check version stored in cache code
+		if (\Smarty\Smarty::SMARTY_VERSION !== $properties['version']) {
+			return false;
+		}
+
+		if ($template->getSmarty()->getCompileCheck() === \Smarty\Smarty::COMPILECHECK_ON) {
+			if (!$this->checkFileDependencies($properties['file_dependency'], $template)) {
+				return false;
+			}
+		}
+
+		// CACHING_LIFETIME_SAVED cache expiry has to be validated here since otherwise we'd define the unifunc
+		if ($template->caching === \Smarty\Smarty::CACHING_LIFETIME_SAVED && $properties['cache_lifetime'] >= 0
+			&& (time() > ($this->timestamp + $properties['cache_lifetime']))
+		) {
+			return false;
+		}
+
+		return true;
+	}
+}

src/CodeFrame/Compiled.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace Smarty\CodeFrame;
+
+abstract class Compiled extends Base {
+
+}

src/Compile/Tag/ExtendsTag.php

@@ -100,21 +100,10 @@ class ExtendsTag extends Inheritance {
 	 * @throws \Smarty\Exception
 	 */
 	private function compileEndChild(\Smarty\Compiler\Template $compiler, $template = null) {
-		$inlineUids = '';
-		if (isset($template) && $compiler->getSmarty()->merge_compiled_includes) {
-			$code = $compiler->compileTag('include', [$template, ['scope' => 'parent']]);
-
-			// @TODO this relies on the generated code to have a certain format and is sure to break someday
-			if (preg_match('/(,\s*\'[a-z0-9]+\',\s*\'content.*\')/', $code, $match)) {
-				$inlineUids = $match[1];
-			}
-		}
 		$compiler->getParser()->template_postfix[] = new \Smarty\ParseTree\Tag(
 			$compiler->getParser(),
 			'<?php $_smarty_tpl->getInheritance()->endChild($_smarty_tpl' .
-			(isset($template) ?
-				", {$template}{$inlineUids}" :
-				'') . ");\n?>"
+			(isset($template) ?	", {$template}" : '') . ");\n?>"
 		);
 	}
 

src/Compile/Tag/FunctionClose.php

@@ -41,8 +41,6 @@ class FunctionClose extends Base {
 		$_attr = $saved_data[0];
 		$_name = trim($_attr['name'], '\'"');
 		$parentCompiler = $compiler->getParentCompiler();
-		$parentCompiler->tpl_function[$_name]['compiled_filepath'] =
-			$parentCompiler->getTemplate()->getCompiled()->filepath;
 		$parentCompiler->tpl_function[$_name]['uid'] = $compiler->getTemplate()->getSource()->uid;
 		$_parameter = $_attr;
 		unset($_parameter['name']);

src/Compile/Tag/IncludeTag.php

@@ -100,11 +100,6 @@ class IncludeTag extends Base {
 					$fullResourceName = $match[1] . $fullResourceName . $match[1];
 				}
 			}
-			if (empty($match[5])) {
-				$variable_template = true;
-			}
-		} else {
-			$variable_template = true;
 		}
 		// scope setup
 		$_scope = isset($_attr['scope']) ? $this->convertScope($_attr['scope']) : 0;
@@ -118,16 +113,6 @@ class IncludeTag extends Base {
 			$_caching = \Smarty\Template::CACHING_NOCACHE_CODE;
 		}
 
-		// flag if included template code should be merged into caller
-		$merge_compiled_includes = ($compiler->getSmarty()->merge_compiled_includes || $_attr['inline'] === true) &&
-			!$compiler->getTemplate()->getSource()->handler->recompiled;
-		if ($merge_compiled_includes) {
-			// variable template name ?
-			if ($variable_template) {
-				$merge_compiled_includes = false;
-			}
-		}
-
 		/*
 		* if the {include} tag provides individual parameter for caching or compile_id
 		* the subtemplate must not be included into the common cache file and is treated like
@@ -157,10 +142,6 @@ class IncludeTag extends Base {
 			$_cache_id = '$_smarty_tpl->cache_id';
 		}
 
-		// if subtemplate will be called in nocache mode do not merge
-		if ($compiler->getTemplate()->caching && $call_nocache) {
-			$merge_compiled_includes = false;
-		}
 		// assign attribute
 		if (isset($_attr['assign'])) {
 			// output will be stored in a smarty variable instead of being displayed
@@ -175,30 +156,7 @@ class IncludeTag extends Base {
 			}
 		}
 		$has_compiled_template = false;
-		if ($merge_compiled_includes) {
-			$c_id = $compiler->getTemplate()->compile_id;
-			// we must observe different compile_id and caching
-			$t_hash = sha1($c_id . ($_caching ? '--caching' : '--nocaching'));
 
-			$compiler->getSmarty()->setAllowAmbiguousResources(true);
-			$tpl = $compiler->getSmarty()->createTemplate(
-				trim($fullResourceName, '"\''),
-				$compiler->getTemplate()->cache_id,
-				$c_id,
-				$compiler->getTemplate(),
-				$_caching
-			);
-
-			$uid = $tpl->getSource()->type . $tpl->getSource()->uid;
-			if (!isset($compiler->getParentCompiler()->mergedSubTemplatesData[$uid][$t_hash])) {
-				$has_compiled_template = $this->compileInlineTemplate($compiler, $tpl, $t_hash);
-			} else {
-				$has_compiled_template = true;
-			}
-
-			$compiler->getSmarty()->setAllowAmbiguousResources(false);
-
-		}
 		// delete {include} standard attributes
 		unset($_attr['file'], $_attr['assign'], $_attr['cache_id'], $_attr['cache_lifetime'], $_attr['nocache'], $_attr['caching'], $_attr['scope'], $_attr['inline']);
 		// remaining attributes must be assigned as smarty variable
@@ -211,27 +169,6 @@ class IncludeTag extends Base {
 			}
 			$_vars = 'array(' . join(',', $_pairs) . ')';
 		}
-		if ($has_compiled_template && !$call_nocache) {
-			$_output = "<?php\n";
-			if (!empty($_attr) && $_caching === \Smarty\Template::CACHING_NOCACHE_CODE && $compiler->getTemplate()->caching) {
-				$_vars_nc = "foreach ($_vars as \$ik => \$iv) {\n";
-				$_vars_nc .= "\$_smarty_tpl->assign(\$ik, \$iv);\n";
-				$_vars_nc .= "}\n";
-				$_output .= substr($compiler->processNocacheCode('<?php ' . $_vars_nc . "?>\n"), 6, -3);
-			}
-			if (isset($_assign)) {
-				$_output .= "ob_start();\n";
-			}
-			$_output .= "\$_smarty_tpl->renderSubTemplate({$fullResourceName}, {$_cache_id}, \$_smarty_tpl->compile_id, " .
-				"{$_caching}, {$_cache_lifetime}, {$_vars}, " .
-				"'{$compiler->getParentCompiler()->mergedSubTemplatesData[$uid][$t_hash]['uid']}', " .
-				"'{$compiler->getParentCompiler()->mergedSubTemplatesData[$uid][$t_hash]['func']}', (int) {$_scope});\n";
-			if (isset($_assign)) {
-				$_output .= "\$_smarty_tpl->assign({$_assign}, ob_get_clean(), false, {$_scope});\n";
-			}
-			$_output .= "?>";
-			return $_output;
-		}
 		if ($call_nocache) {
 			$compiler->tag_nocache = true;
 		}
@@ -241,7 +178,7 @@ class IncludeTag extends Base {
 			$_output .= "ob_start();\n";
 		}
 		$_output .= "\$_smarty_tpl->renderSubTemplate({$fullResourceName}, $_cache_id, \$_smarty_tpl->compile_id, " .
-			"$_caching, $_cache_lifetime, $_vars, null, null, (int) {$_scope});\n";
+			"$_caching, $_cache_lifetime, $_vars, (int) {$_scope});\n";
 		if (isset($_assign)) {
 			$_output .= "\$_smarty_tpl->assign({$_assign}, ob_get_clean(), false, {$_scope});\n";
 		}
@@ -249,69 +186,4 @@ class IncludeTag extends Base {
 		return $_output;
 	}
 
-	/**
-	 * Compile inline sub template
-	 *
-	 * @param \Smarty\Compiler\Template $compiler
-	 * @param \Smarty\Template $tpl
-	 * @param string $t_hash
-	 *
-	 * @return bool
-	 * @throws \Exception
-	 * @throws \Smarty\Exception
-	 */
-	private function compileInlineTemplate(
-		Template $compiler,
-		\Smarty\Template $tpl,
-		         $t_hash
-	) {
-		$tplSource = $tpl->getSource();
-		$uid = $tplSource->type . $tplSource->uid;
-		if ($tplSource->exists) {
-			$compiler->getParentCompiler()->mergedSubTemplatesData[$uid][$t_hash]['uid'] = $tplSource->uid;
-			$tpl->getCompiled(true)->nocache_hash = $compiler->getParentCompiler()->getTemplate()->getCompiled()->nocache_hash;
-			// save unique function name
-			$compiler->getParentCompiler()->mergedSubTemplatesData[$uid][$t_hash]['func'] =
-			$tpl->getCompiled()->unifunc = 'content_' . str_replace(['.', ','], '_', uniqid('', true));
-			// make sure whole chain gets compiled
-			$tpl->mustCompile = true;
-			$compiler->getParentCompiler()->mergedSubTemplatesData[$uid][$t_hash]['nocache_hash'] =
-				$tpl->getCompiled()->nocache_hash;
-			if ($tplSource->type === 'file') {
-				$sourceInfo = $tplSource->filepath;
-			} else {
-				$basename = $tplSource->handler->getBasename($tplSource);
-				$sourceInfo = $tplSource->type . ':' .
-					($basename ? $basename : $tplSource->name);
-			}
-			// get compiled code
-			$compiled_code = "<?php\n\n";
-			$compiled_code .= $compiler->cStyleComment(" Start inline template \"{$sourceInfo}\" =============================") . "\n";
-			$compiled_code .= "function {$tpl->getCompiled()->unifunc} (\\Smarty\\Template \$_smarty_tpl) {\n";
-			$compiled_code .= "?>\n" . $tpl->getCompiler()->compileTemplateSource($tpl, $compiler->getParentCompiler());
-			$compiled_code .= "<?php\n";
-			$compiled_code .= "}\n?>\n";
-			$compiled_code .= $tpl->getSmarty()->runPostFilters($tpl->getCompiler()->blockOrFunctionCode, $tpl);
-			$compiled_code .= "<?php\n\n";
-			$compiled_code .= $compiler->cStyleComment(" End inline template \"{$sourceInfo}\" =============================") . "\n";
-			$compiled_code .= '?>';
-
-//			unset($tpl->compiler); // @TODO removed this.
-
-			if ($tpl->getCompiled()->getNocacheCode()) {
-				// replace nocache_hash
-				$compiled_code =
-					str_replace(
-						"{$tpl->getCompiled()->nocache_hash}",
-						$compiler->getTemplate()->getCompiled()->nocache_hash,
-						$compiled_code
-					);
-				$compiler->getTemplate()->getCompiled()->setNocacheCode(true);
-			}
-			$compiler->getParentCompiler()->mergedSubTemplatesCode[$tpl->getCompiled()->unifunc] = $compiled_code;
-			return true;
-		} else {
-			return false;
-		}
-	}
 }

src/Compiler/CodeFrame.php

@@ -2,6 +2,7 @@
 
 namespace Smarty\Compiler;
 
+use Nette\PhpGenerator\Dumper;
 use Smarty\Exception;
 
 /**
@@ -32,7 +33,6 @@ class CodeFrame
 	 * @param string $content optional template content
 	 * @param string $functions compiled template function and block code
 	 * @param bool $cache flag for cache file
-	 * @param Template|null $compiler
 	 *
 	 * @return string
 	 * @throws Exception
@@ -40,76 +40,122 @@ class CodeFrame
     public function create(
         $content = '',
         $functions = '',
-        $cache = false,
-        \Smarty\Compiler\Template $compiler = null
+        $cache = false
     ) {
-        // build property code
-        $properties[ 'version' ] = \Smarty\Smarty::SMARTY_VERSION;
-        $properties[ 'unifunc' ] = 'content_' . str_replace(array('.', ','), '_', uniqid('', true));
-        if (!$cache) {
-            $properties[ 'has_nocache_code' ] = $this->_template->getCompiled()->getNocacheCode();
-            $properties[ 'file_dependency' ] = $this->_template->getCompiled()->file_dependency;
-            $properties[ 'includes' ] = $this->_template->getCompiled()->includes;
-        } else {
-            $properties[ 'has_nocache_code' ] = $this->_template->getCached()->getNocacheCode();
-            $properties[ 'file_dependency' ] = $this->_template->getCached()->file_dependency;
-            $properties[ 'cache_lifetime' ] = $this->_template->cache_lifetime;
-        }
-        $output = sprintf(
-			"<?php\n/* Smarty version %s, created on %s\n  from '%s' */\n\n",
-            $properties[ 'version' ],
-	        date("Y-m-d H:i:s"),
-	        str_replace('*/', '* /', $this->_template->getSource()->filepath)
-        );
-        $output .= "/* @var \\Smarty\\Template \$_smarty_tpl */\n";
-        $dec = "\$_smarty_tpl->isFresh(" . var_export($properties, true) . ',' . ($cache ? 'true' : 'false') . ')';
-        $output .= "if ({$dec}) {\n";
-        $output .= "function {$properties['unifunc']} (\\Smarty\\Template \$_smarty_tpl) {\n";
-        if (!$cache && !empty($compiler->tpl_function)) {
+
+	    $properties = [];
+
+	    $properties['version'] = \Smarty\Smarty::SMARTY_VERSION;
+	    $properties['codeFrameClass'] = '__CodeFrame_' . str_replace(array('.', ','), '_', uniqid('', true));
+	    if (!$cache) {
+		    $properties[ 'has_nocache_code' ] = $this->_template->getCompiled()->getNocacheCode();
+		    $properties[ 'file_dependency' ] = $this->_template->getCompiled()->file_dependency;
+		    $properties[ 'includes' ] = $this->_template->getCompiled()->includes;
+	    } else {
+		    $properties[ 'file_dependency' ] = $this->_template->getCached()->file_dependency;
+		    $properties[ 'cache_lifetime' ] = $this->_template->cache_lifetime;
+	    }
+
+	    $file = new \Nette\PhpGenerator\PhpFile;
+	    $file->addComment('This file is auto-generated.');
+	    $file->addComment($functions); //@TODO
+	    $output = (string) $file;
+
+	    $dumper = new Dumper;
+
+	    $output .= 'if (!class_exists(' . $dumper->dump($properties['codeFrameClass']) . ')) {' . "\n";
+	    $output .= $this->generateCodeFrameClass($properties['codeFrameClass'], $cache, $content);
+		$output .= "}\n";
+		$output .= 'return ' . $dumper->dump($properties) . ";\n";
+
+        return $output;
+    }
+
+	private function revertPHPTags(string $content) {
+
+		static $PHPSTART = '<' . '?php';
+		static $PHPEND = '?' . '>';
+
+		//\<\?\php echo "    <br>hello world";\?\>
+		if (substr($content, 0, 5) === $PHPSTART
+			&& substr($content, -3) === $PHPEND . "\n"
+		) {
+			return substr($content, 5, -3);
+		}
+
+		if (false) {
+		// remove unneeded PHP tags
+		if (preg_match('/\s*\?>[\n]?<\?php\s*/', $content)) {
+			$curr_split = preg_split(
+				'/\s*\?>[\n]?<\?php\s*/',
+				$content
+			);
+			preg_match_all(
+				'/\s*\?>[\n]?<\?php\s*/',
+				$content,
+				$curr_parts
+			);
+			$content = '';
+			foreach ($curr_split as $idx => $curr_output) {
+				$content .= $curr_output;
+				if (isset($curr_parts[ 0 ][ $idx ])) {
+					$content .= "\n";
+				}
+			}
+		}
+		if (preg_match('/\?>\s*$/', $content)) {
+			$curr_split = preg_split(
+				'/\?>\s*$/',
+				$content
+			);
+			$content = '';
+			foreach ($curr_split as $idx => $curr_output) {
+				$content .= $curr_output;
+			}
+		}
+		}
+
+		return $PHPEND . $content . $PHPSTART;
+	}
+
+	/**
+	 * @param $codeFrameClass
+	 * @param bool $cache
+	 * @param string $content
+	 *
+	 * @return string
+	 */
+	private function generateCodeFrameClass($codeFrameClass, bool $cache, string $content): string {
+		$class = new \Nette\PhpGenerator\ClassType($codeFrameClass);
+		$class
+			->setExtends($cache ? \Smarty\CodeFrame\Cached::class : \Smarty\CodeFrame\Compiled::class)
+			->addComment(sprintf(
+				"Created on %s from '%s'",
+				date("Y-m-d H:i:s"),
+				str_replace('*/', '* /', $this->_template->getSource()->filepath)
+			));
+
+		/*           @TODO
+		 * if (!$cache && !empty($compiler->tpl_function)) {
             $output .= '$_smarty_tpl->getSmarty()->getRuntime(\'TplFunction\')->registerTplFunctions($_smarty_tpl, ';
             $output .= var_export($compiler->tpl_function, true);
             $output .= ");\n";
         }
-        if ($cache && $this->_template->getSmarty()->hasRuntime('TplFunction')) {
+		 if ($cache && $this->_template->getSmarty()->hasRuntime('TplFunction')) {
 			if ($tplfunctions = $this->_template->getSmarty()->getRuntime('TplFunction')->getTplFunction($this->_template)) {
 				$output .= "\$_smarty_tpl->getSmarty()->getRuntime('TplFunction')->registerTplFunctions(\$_smarty_tpl, " .
 					var_export($tplfunctions, true) . ");\n";
 			}
         }
-        $output .= "?>";
-        $output .= $content;
-        $output .= "<?php }\n?>";
-        $output .= $functions;
-        $output .= "<?php }\n";
-        // remove unneeded PHP tags
-        if (preg_match('/\s*\?>[\n]?<\?php\s*/', $output)) {
-            $curr_split = preg_split(
-                '/\s*\?>[\n]?<\?php\s*/',
-                $output
-            );
-            preg_match_all(
-                '/\s*\?>[\n]?<\?php\s*/',
-                $output,
-                $curr_parts
-            );
-            $output = '';
-            foreach ($curr_split as $idx => $curr_output) {
-                $output .= $curr_output;
-                if (isset($curr_parts[ 0 ][ $idx ])) {
-                    $output .= "\n";
-                }
-            }
-        }
-        if (preg_match('/\?>\s*$/', $output)) {
-            $curr_split = preg_split(
-                '/\?>\s*$/',
-                $output
-            );
-            $output = '';
-            foreach ($curr_split as $idx => $curr_output) {
-                $output .= $curr_output;
-            }
-        }
-        return $output;
-    }
+*/
+		$method = $class->addMethod('renderContent');
+		$method->setPublic()
+			->addParameter('_smarty_tpl')->setType(\Smarty\Template::class);
+
+		$method->setReturnType('void') // method return type
+		->setBody($this->revertPHPTags($content));
+
+		return (new CompactPrinter())->printClass($class);
+	}
+
 }

src/Compiler/CompactPrinter.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace Smarty\Compiler;
+
+class CompactPrinter extends \Nette\PhpGenerator\Printer {
+	protected $indentation = "";
+	protected $linesBetweenProperties = 0;
+	protected $linesBetweenMethods = 0;
+	protected $returnTypeColon = ': ';
+}

src/Compiler/Configfile.php

@@ -10,6 +10,7 @@
  */
 
 namespace Smarty\Compiler;
+use Smarty\Exception;
 use Smarty\Lexer\ConfigfileLexer;
 use Smarty\Parser\ConfigfileParser;
 use Smarty\Smarty;
@@ -72,6 +73,22 @@ class Configfile extends BaseCompiler {
 		$this->config_data['vars'] = [];
 	}
 
+	/**
+	 * Method to compile a Smarty template
+	 *
+	 * @param \Smarty\Template $template template object to compile
+	 *
+	 * @return string code
+	 * @throws Exception
+	 */
+	public function compileTemplate(\Smarty\Template $template) {
+		return $template->createCodeFrame(
+			$this->compileTemplateSource($template),
+			'',
+			false
+		);
+	}
+
 	/**
 	 * Method to compile Smarty config source.
 	 *
@@ -80,7 +97,7 @@ class Configfile extends BaseCompiler {
 	 * @return bool true if compiling succeeded, false if it failed
 	 * @throws \Smarty\Exception
 	 */
-	public function compileTemplate(Template $template) {
+	private function compileTemplateSource(Template $template) {
 		$this->template = $template;
 		$this->template->getCompiled()->file_dependency[$this->template->getSource()->uid] =
 			[
@@ -133,16 +150,10 @@ class Configfile extends BaseCompiler {
 		if ($this->smarty->debugging) {
 			$this->smarty->getDebug()->end_compile($this->template);
 		}
-		// template header code
-		$template_header = sprintf(
-			"<?php /* Smarty version %s, created on %s\n         compiled from '%s' */ ?>\n",
-			\Smarty\Smarty::SMARTY_VERSION,
-			date("Y-m-d H:i:s"),
-			str_replace('*/', '* /', $this->template->getSource()->filepath)
-		);
+
 		$code = '<?php $_smarty_tpl->parent->assignConfigVars(' .
 			var_export($this->config_data, true) . ', $_smarty_tpl->getValue("sections")); ?>';
-		return $template_header . $this->template->createCodeFrame($code);
+		return $code;
 	}
 
 	/**

src/Compiler/Template.php

@@ -93,20 +93,6 @@ class Template extends BaseCompiler {
 	 */
 	private $template = null;
 
-	/**
-	 * merged included sub template data
-	 *
-	 * @var array
-	 */
-	public $mergedSubTemplatesData = [];
-
-	/**
-	 * merged sub template code
-	 *
-	 * @var array
-	 */
-	public $mergedSubTemplatesCode = [];
-
 	/**
 	 * source line offset for error messages
 	 *
@@ -352,16 +338,14 @@ class Template extends BaseCompiler {
 	 *
 	 * @param \Smarty\Template $template template object to compile
 	 *
-	 * @return bool true if compiling succeeded, false if it failed
+	 * @return string code
 	 * @throws Exception
 	 */
 	public function compileTemplate(\Smarty\Template $template) {
 		return $template->createCodeFrame(
 			$this->compileTemplateSource($template),
-			$this->smarty->runPostFilters($this->blockOrFunctionCode, $this->template) .
-			join('', $this->mergedSubTemplatesCode),
-			false,
-			$this
+			$this->smarty->runPostFilters($this->blockOrFunctionCode, $this->template),
+			false
 		);
 	}
 
@@ -400,7 +384,7 @@ class Template extends BaseCompiler {
 			$this->has_variable_string = false;
 			$this->prefix_code = [];
 			// add file dependency
-			if ($this->smarty->merge_compiled_includes || $this->template->getSource()->handler->checkTimestamps()) {
+			if ($this->template->getSource()->handler->checkTimestamps()) {
 				$this->parent_compiler->getTemplate()->getCompiled()->file_dependency[$this->template->getSource()->uid] =
 					[
 						$this->template->getSource()->filepath,

src/Data.php

@@ -459,7 +459,7 @@ class Data
 		$template->caching = Smarty::CACHING_OFF;
 		$template->assign('sections', (array) $sections ?? []);
 		// trigger a call to $this->assignConfigVars
-		$template->getCompiled(true)->render($template);
+		$template->getCompiled()->fetch();
 		return $this;
 	}
 

src/Debug.php

@@ -203,8 +203,6 @@ class Debug extends Data
         $debObj = new \Smarty\Smarty();
         // copy the working dirs from application
         $debObj->setCompileDir($smarty->getCompileDir());
-        $debObj->force_compile = false;
-        $debObj->compile_check = \Smarty::COMPILECHECK_ON;
         $debObj->security_policy = null;
         $debObj->debugging = false;
         $debObj->debugging_ctrl = 'NONE';
@@ -214,8 +212,7 @@ class Debug extends Data
         $debObj->registered_filters = array();
         $debObj->escape_html = true;
         $debObj->caching = \Smarty::CACHING_OFF;
-        $debObj->compile_id = null;
-        $debObj->cache_id = null;
+
         // prepare information of assigned variables
         $ptr = $this->get_debug_vars($obj);
         $_assigned_vars = $ptr->tpl_vars;

src/Lexer/ConfigfileLexer.php

@@ -0,0 +1,707 @@
+<?php
+
+namespace Smarty\Lexer;
+
+/**
+* Smarty Internal Plugin ConfigfileLexer
+*
+* This is the lexer to break the config file source into tokens 
+* @package Smarty
+* @subpackage Config
+* @author Uwe Tews 
+*/
+/**
+* ConfigfileLexer
+*
+* This is the config file lexer.
+* It is generated from the ConfigfileLexer.plex file
+*
+* @package Smarty
+* @subpackage Compiler
+* @author Uwe Tews
+*/
+class ConfigfileLexer
+{
+    /**
+     * Source
+     *
+     * @var string
+     */
+    public $data;
+      /**
+      * Source length
+      *
+      * @var int
+      */
+     public $dataLength = null;
+   /**
+     * byte counter
+     *
+     * @var int
+     */
+    public $counter;
+    /**
+     * token number
+     *
+     * @var int
+     */
+    public $token;
+    /**
+     * token value
+     *
+     * @var string
+     */
+    public $value;
+    /**
+     * current line
+     *
+     * @var int
+     */
+    public $line;
+    /**
+     * state number
+     *
+     * @var int
+     */
+    public $state = 1;
+    /**
+     * Smarty object
+     *
+     * @var Smarty
+     */
+    public $smarty = null;
+    /**
+     * compiler object
+     *
+     * @var \Smarty\Compiler\Configfile
+     */
+    private $compiler = null;
+    /**
+     * copy of config_booleanize
+     *
+     * @var bool
+     */
+    private $configBooleanize = false;
+    /**
+     * trace file
+     *
+     * @var resource
+     */
+    public $yyTraceFILE;
+    /**
+     * trace prompt
+     *
+     * @var string
+     */
+    public $yyTracePrompt;
+    /**
+     * state names
+     *
+     * @var array
+     */
+    public $state_name = array(1 => 'START', 2 => 'VALUE', 3 => 'NAKED_STRING_VALUE', 4 => 'COMMENT', 5 => 'SECTION', 6 => 'TRIPPLE');
+
+    /**
+     * storage for assembled token patterns
+     *
+     * @var string
+     */
+    private $yy_global_pattern1 = null;
+    private $yy_global_pattern2 = null;
+    private $yy_global_pattern3 = null;
+    private $yy_global_pattern4 = null;
+    private $yy_global_pattern5 = null;
+    private $yy_global_pattern6 = null;
+
+    /**
+     * token names
+     *
+     * @var array
+     */
+    public $smarty_token_names = array(        // Text for parser error messages
+    );
+
+    /**
+     * constructor
+     *
+     * @param   string                             $data template source
+     * @param \Smarty\Compiler\Configfile $compiler
+     */
+    public function __construct($data, \Smarty\Compiler\Configfile $compiler)
+    {
+        $this->data = $data . "\n"; //now all lines are \n-terminated
+        $this->dataLength = strlen($data);
+        $this->counter = 0;
+        if (preg_match('/^\xEF\xBB\xBF/', $this->data, $match)) {
+            $this->counter += strlen($match[0]);
+        }
+        $this->line = 1;
+        $this->compiler = $compiler;
+        $this->smarty = $compiler->smarty;
+        $this->configBooleanize = $this->smarty->config_booleanize;
+    }
+
+   public function replace ($input) {
+        return $input;
+   }
+
+    public function PrintTrace()
+    {
+        $this->yyTraceFILE = fopen('php://output', 'w');
+        $this->yyTracePrompt = '<br>';
+    }
+
+
+
+    private $_yy_state = 1;
+    private $_yy_stack = array();
+
+    public function yylex()
+    {
+        return $this->{'yylex' . $this->_yy_state}();
+    }
+
+    public function yypushstate($state)
+    {
+        if ($this->yyTraceFILE) {
+             fprintf($this->yyTraceFILE, "%sState push %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
+        }
+        array_push($this->_yy_stack, $this->_yy_state);
+        $this->_yy_state = $state;
+        if ($this->yyTraceFILE) {
+             fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
+        }
+    }
+
+    public function yypopstate()
+    {
+       if ($this->yyTraceFILE) {
+             fprintf($this->yyTraceFILE, "%sState pop %s\n", $this->yyTracePrompt,  isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
+        }
+       $this->_yy_state = array_pop($this->_yy_stack);
+        if ($this->yyTraceFILE) {
+             fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
+        }
+
+    }
+
+    public function yybegin($state)
+    {
+       $this->_yy_state = $state;
+        if ($this->yyTraceFILE) {
+             fprintf($this->yyTraceFILE, "%sState set %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
+        }
+    }
+
+
+
+
+    public function yylex1()
+    {
+        if (!isset($this->yy_global_pattern1)) {
+            $this->yy_global_pattern1 = $this->replace("/\G(#|;)|\G(\\[)|\G(\\])|\G(=)|\G([ \t\r]+)|\G(\n)|\G([0-9]*[a-zA-Z_]\\w*)|\G([\S\s])/isS");
+        }
+        if (!isset($this->dataLength)) {
+            $this->dataLength = strlen($this->data);
+        }
+        if ($this->counter >=  $this->dataLength) {
+            return false; // end of input
+        }
+        
+        do {
+            if (preg_match($this->yy_global_pattern1,$this->data, $yymatches, 0, $this->counter)) {
+                if (!isset($yymatches[ 0 ][1])) {
+                   $yymatches = preg_grep("/(.|\s)+/", $yymatches);
+                } else {
+                    $yymatches = array_filter($yymatches);
+                }
+                if (empty($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' .
+                        ' an empty string.  Input "' . substr($this->data,
+                        $this->counter, 5) . '... state START');
+                }
+                next($yymatches); // skip global match
+                $this->token = key($yymatches); // token number
+                $this->value = current($yymatches); // token value
+                $r = $this->{'yy_r1_' . $this->token}();
+                if ($r === null) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    // accept this token
+                    return true;
+                } elseif ($r === true) {
+                    // we have changed state
+                    // process this token in the new state
+                    return $this->yylex();
+                } elseif ($r === false) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    if ($this->counter >=  $this->dataLength) {
+                        return false; // end of input
+                    }
+                    // skip this token
+                    continue;
+                }            } else {
+                throw new Exception('Unexpected input at line' . $this->line .
+                    ': ' . $this->data[$this->counter]);
+            }
+            break;
+        } while (true);
+
+    } // end function
+
+
+    const START = 1;
+    public function yy_r1_1()
+    {
+
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_COMMENTSTART;
+    $this->yypushstate(self::COMMENT);
+    }
+    public function yy_r1_2()
+    {
+
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_OPENB;
+    $this->yypushstate(self::SECTION);
+    }
+    public function yy_r1_3()
+    {
+
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_CLOSEB;
+    }
+    public function yy_r1_4()
+    {
+
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_EQUAL;
+    $this->yypushstate(self::VALUE);
+    }
+    public function yy_r1_5()
+    {
+
+    return false;
+    }
+    public function yy_r1_6()
+    {
+
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_NEWLINE;
+    }
+    public function yy_r1_7()
+    {
+
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_ID;
+    }
+    public function yy_r1_8()
+    {
+
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_OTHER;
+    }
+
+
+
+    public function yylex2()
+    {
+        if (!isset($this->yy_global_pattern2)) {
+            $this->yy_global_pattern2 = $this->replace("/\G([ \t\r]+)|\G(\\d+\\.\\d+(?=[ \t\r]*[\n#;]))|\G(\\d+(?=[ \t\r]*[\n#;]))|\G(\"\"\")|\G('[^'\\\\]*(?:\\\\.[^'\\\\]*)*'(?=[ \t\r]*[\n#;]))|\G(\"[^\"\\\\]*(?:\\\\.[^\"\\\\]*)*\"(?=[ \t\r]*[\n#;]))|\G([a-zA-Z]+(?=[ \t\r]*[\n#;]))|\G([^\n]+?(?=[ \t\r]*\n))|\G(\n)/isS");
+        }
+        if (!isset($this->dataLength)) {
+            $this->dataLength = strlen($this->data);
+        }
+        if ($this->counter >=  $this->dataLength) {
+            return false; // end of input
+        }
+        
+        do {
+            if (preg_match($this->yy_global_pattern2,$this->data, $yymatches, 0, $this->counter)) {
+                if (!isset($yymatches[ 0 ][1])) {
+                   $yymatches = preg_grep("/(.|\s)+/", $yymatches);
+                } else {
+                    $yymatches = array_filter($yymatches);
+                }
+                if (empty($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' .
+                        ' an empty string.  Input "' . substr($this->data,
+                        $this->counter, 5) . '... state VALUE');
+                }
+                next($yymatches); // skip global match
+                $this->token = key($yymatches); // token number
+                $this->value = current($yymatches); // token value
+                $r = $this->{'yy_r2_' . $this->token}();
+                if ($r === null) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    // accept this token
+                    return true;
+                } elseif ($r === true) {
+                    // we have changed state
+                    // process this token in the new state
+                    return $this->yylex();
+                } elseif ($r === false) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    if ($this->counter >=  $this->dataLength) {
+                        return false; // end of input
+                    }
+                    // skip this token
+                    continue;
+                }            } else {
+                throw new Exception('Unexpected input at line' . $this->line .
+                    ': ' . $this->data[$this->counter]);
+            }
+            break;
+        } while (true);
+
+    } // end function
+
+
+    const VALUE = 2;
+    public function yy_r2_1()
+    {
+
+    return false;
+    }
+    public function yy_r2_2()
+    {
+
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_FLOAT;
+    $this->yypopstate();
+    }
+    public function yy_r2_3()
+    {
+
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_INT;
+    $this->yypopstate();
+    }
+    public function yy_r2_4()
+    {
+
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_TRIPPLE_QUOTES;
+    $this->yypushstate(self::TRIPPLE);
+    }
+    public function yy_r2_5()
+    {
+
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_SINGLE_QUOTED_STRING;
+    $this->yypopstate();
+    }
+    public function yy_r2_6()
+    {
+
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_DOUBLE_QUOTED_STRING;
+    $this->yypopstate();
+    }
+    public function yy_r2_7()
+    {
+
+    if (!$this->configBooleanize || !in_array(strtolower($this->value), array('true', 'false', 'on', 'off', 'yes', 'no')) ) {
+        $this->yypopstate();
+        $this->yypushstate(self::NAKED_STRING_VALUE);
+        return true; //reprocess in new state
+    } else {
+        $this->token = \Smarty\Parser\ConfigfileParser::TPC_BOOL;
+        $this->yypopstate();
+    }
+    }
+    public function yy_r2_8()
+    {
+
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_NAKED_STRING;
+    $this->yypopstate();
+    }
+    public function yy_r2_9()
+    {
+
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_NAKED_STRING;
+    $this->value = '';
+    $this->yypopstate();
+    }
+
+
+
+    public function yylex3()
+    {
+        if (!isset($this->yy_global_pattern3)) {
+            $this->yy_global_pattern3 = $this->replace("/\G([^\n]+?(?=[ \t\r]*\n))/isS");
+        }
+        if (!isset($this->dataLength)) {
+            $this->dataLength = strlen($this->data);
+        }
+        if ($this->counter >=  $this->dataLength) {
+            return false; // end of input
+        }
+        
+        do {
+            if (preg_match($this->yy_global_pattern3,$this->data, $yymatches, 0, $this->counter)) {
+                if (!isset($yymatches[ 0 ][1])) {
+                   $yymatches = preg_grep("/(.|\s)+/", $yymatches);
+                } else {
+                    $yymatches = array_filter($yymatches);
+                }
+                if (empty($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' .
+                        ' an empty string.  Input "' . substr($this->data,
+                        $this->counter, 5) . '... state NAKED_STRING_VALUE');
+                }
+                next($yymatches); // skip global match
+                $this->token = key($yymatches); // token number
+                $this->value = current($yymatches); // token value
+                $r = $this->{'yy_r3_' . $this->token}();
+                if ($r === null) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    // accept this token
+                    return true;
+                } elseif ($r === true) {
+                    // we have changed state
+                    // process this token in the new state
+                    return $this->yylex();
+                } elseif ($r === false) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    if ($this->counter >=  $this->dataLength) {
+                        return false; // end of input
+                    }
+                    // skip this token
+                    continue;
+                }            } else {
+                throw new Exception('Unexpected input at line' . $this->line .
+                    ': ' . $this->data[$this->counter]);
+            }
+            break;
+        } while (true);
+
+    } // end function
+
+
+    const NAKED_STRING_VALUE = 3;
+    public function yy_r3_1()
+    {
+
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_NAKED_STRING;
+    $this->yypopstate();
+    }
+
+
+
+    public function yylex4()
+    {
+        if (!isset($this->yy_global_pattern4)) {
+            $this->yy_global_pattern4 = $this->replace("/\G([ \t\r]+)|\G([^\n]+?(?=[ \t\r]*\n))|\G(\n)/isS");
+        }
+        if (!isset($this->dataLength)) {
+            $this->dataLength = strlen($this->data);
+        }
+        if ($this->counter >=  $this->dataLength) {
+            return false; // end of input
+        }
+        
+        do {
+            if (preg_match($this->yy_global_pattern4,$this->data, $yymatches, 0, $this->counter)) {
+                if (!isset($yymatches[ 0 ][1])) {
+                   $yymatches = preg_grep("/(.|\s)+/", $yymatches);
+                } else {
+                    $yymatches = array_filter($yymatches);
+                }
+                if (empty($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' .
+                        ' an empty string.  Input "' . substr($this->data,
+                        $this->counter, 5) . '... state COMMENT');
+                }
+                next($yymatches); // skip global match
+                $this->token = key($yymatches); // token number
+                $this->value = current($yymatches); // token value
+                $r = $this->{'yy_r4_' . $this->token}();
+                if ($r === null) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    // accept this token
+                    return true;
+                } elseif ($r === true) {
+                    // we have changed state
+                    // process this token in the new state
+                    return $this->yylex();
+                } elseif ($r === false) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    if ($this->counter >=  $this->dataLength) {
+                        return false; // end of input
+                    }
+                    // skip this token
+                    continue;
+                }            } else {
+                throw new Exception('Unexpected input at line' . $this->line .
+                    ': ' . $this->data[$this->counter]);
+            }
+            break;
+        } while (true);
+
+    } // end function
+
+
+    const COMMENT = 4;
+    public function yy_r4_1()
+    {
+
+    return false;
+    }
+    public function yy_r4_2()
+    {
+
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_NAKED_STRING;
+    }
+    public function yy_r4_3()
+    {
+
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_NEWLINE;
+    $this->yypopstate();
+    }
+
+
+
+    public function yylex5()
+    {
+        if (!isset($this->yy_global_pattern5)) {
+            $this->yy_global_pattern5 = $this->replace("/\G(\\.)|\G(.*?(?=[\.=[\]\r\n]))/isS");
+        }
+        if (!isset($this->dataLength)) {
+            $this->dataLength = strlen($this->data);
+        }
+        if ($this->counter >=  $this->dataLength) {
+            return false; // end of input
+        }
+        
+        do {
+            if (preg_match($this->yy_global_pattern5,$this->data, $yymatches, 0, $this->counter)) {
+                if (!isset($yymatches[ 0 ][1])) {
+                   $yymatches = preg_grep("/(.|\s)+/", $yymatches);
+                } else {
+                    $yymatches = array_filter($yymatches);
+                }
+                if (empty($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' .
+                        ' an empty string.  Input "' . substr($this->data,
+                        $this->counter, 5) . '... state SECTION');
+                }
+                next($yymatches); // skip global match
+                $this->token = key($yymatches); // token number
+                $this->value = current($yymatches); // token value
+                $r = $this->{'yy_r5_' . $this->token}();
+                if ($r === null) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    // accept this token
+                    return true;
+                } elseif ($r === true) {
+                    // we have changed state
+                    // process this token in the new state
+                    return $this->yylex();
+                } elseif ($r === false) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    if ($this->counter >=  $this->dataLength) {
+                        return false; // end of input
+                    }
+                    // skip this token
+                    continue;
+                }            } else {
+                throw new Exception('Unexpected input at line' . $this->line .
+                    ': ' . $this->data[$this->counter]);
+            }
+            break;
+        } while (true);
+
+    } // end function
+
+
+    const SECTION = 5;
+    public function yy_r5_1()
+    {
+
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_DOT;
+    }
+    public function yy_r5_2()
+    {
+
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_SECTION;
+    $this->yypopstate();
+    }
+
+
+    public function yylex6()
+    {
+        if (!isset($this->yy_global_pattern6)) {
+            $this->yy_global_pattern6 = $this->replace("/\G(\"\"\"(?=[ \t\r]*[\n#;]))|\G([\S\s])/isS");
+        }
+        if (!isset($this->dataLength)) {
+            $this->dataLength = strlen($this->data);
+        }
+        if ($this->counter >=  $this->dataLength) {
+            return false; // end of input
+        }
+        
+        do {
+            if (preg_match($this->yy_global_pattern6,$this->data, $yymatches, 0, $this->counter)) {
+                if (!isset($yymatches[ 0 ][1])) {
+                   $yymatches = preg_grep("/(.|\s)+/", $yymatches);
+                } else {
+                    $yymatches = array_filter($yymatches);
+                }
+                if (empty($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' .
+                        ' an empty string.  Input "' . substr($this->data,
+                        $this->counter, 5) . '... state TRIPPLE');
+                }
+                next($yymatches); // skip global match
+                $this->token = key($yymatches); // token number
+                $this->value = current($yymatches); // token value
+                $r = $this->{'yy_r6_' . $this->token}();
+                if ($r === null) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    // accept this token
+                    return true;
+                } elseif ($r === true) {
+                    // we have changed state
+                    // process this token in the new state
+                    return $this->yylex();
+                } elseif ($r === false) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    if ($this->counter >=  $this->dataLength) {
+                        return false; // end of input
+                    }
+                    // skip this token
+                    continue;
+                }            } else {
+                throw new Exception('Unexpected input at line' . $this->line .
+                    ': ' . $this->data[$this->counter]);
+            }
+            break;
+        } while (true);
+
+    } // end function
+
+
+    const TRIPPLE = 6;
+    public function yy_r6_1()
+    {
+
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_TRIPPLE_QUOTES_END;
+    $this->yypopstate();
+    $this->yypushstate(self::START);
+    }
+    public function yy_r6_2()
+    {
+
+  $to = strlen($this->data);
+  preg_match("/\"\"\"[ \t\r]*[\n#;]/",$this->data,$match,PREG_OFFSET_CAPTURE,$this->counter);
+  if (isset($match[0][1])) {
+    $to = $match[0][1];
+  } else {
+    $this->compiler->trigger_config_file_error ('missing or misspelled literal closing tag');
+  }  
+  $this->value = substr($this->data,$this->counter,$to-$this->counter);
+  $this->token = \Smarty\Parser\ConfigfileParser::TPC_TRIPPLE_TEXT;
+    }
+
+
+}

src/Parser/ConfigfileParser.php

@@ -0,0 +1,972 @@
+<?php
+
+// line 12 "src/Parser/ConfigfileParser.y"
+
+
+namespace Smarty\Parser;
+
+use \Smarty\Lexer\ConfigfileLexer as Lexer;
+use \Smarty\Compiler\Configfile as Configfile;
+
+/**
+* Smarty Internal Plugin Configfileparse
+*
+* This is the config file parser.
+* It is generated from the ConfigfileParser.y file
+* @package Smarty
+* @subpackage Compiler
+* @author Uwe Tews
+*/
+class ConfigfileParser
+{
+// line 31 "src/Parser/ConfigfileParser.y"
+
+    /**
+     * result status
+     *
+     * @var bool
+     */
+    public $successful = true;
+    /**
+     * return value
+     *
+     * @var mixed
+     */
+    public $retvalue = 0;
+    /**
+     * @var
+     */
+    public $yymajor;
+    /**
+     * lexer object
+     *
+     * @var Lexer
+     */
+    private $lex;
+    /**
+     * internal error flag
+     *
+     * @var bool
+     */
+    private $internalError = false;
+    /**
+     * compiler object
+     *
+     * @var Configfile
+     */
+    public $compiler = null;
+    /**
+     * smarty object
+     *
+     * @var Smarty
+     */
+    public $smarty = null;
+    /**
+     * copy of config_overwrite property
+     *
+     * @var bool
+     */
+    private $configOverwrite = false;
+    /**
+     * copy of config_read_hidden property
+     *
+     * @var bool
+     */
+    private $configReadHidden = false;
+    /**
+     * helper map
+     *
+     * @var array
+     */
+    private static $escapes_single = array('\\' => '\\',
+                                           '\'' => '\'');
+
+    /**
+     * constructor
+     *
+     * @param Lexer      $lex
+     * @param Configfile $compiler
+     */
+    public function __construct(Lexer $lex, Configfile $compiler)
+    {
+        $this->lex = $lex;
+        $this->smarty = $compiler->getSmarty();
+        $this->compiler = $compiler;
+        $this->configOverwrite = $this->smarty->config_overwrite;
+        $this->configReadHidden = $this->smarty->config_read_hidden;
+    }
+
+    /**
+     * parse optional boolean keywords
+     *
+     * @param string $str
+     *
+     * @return bool
+     */
+    private function parse_bool($str)
+    {
+        $str = strtolower($str);
+        if (in_array($str, array('on', 'yes', 'true'))) {
+            $res = true;
+        } else {
+            $res = false;
+        }
+        return $res;
+    }
+
+    /**
+     * parse single quoted string
+     *  remove outer quotes
+     *  unescape inner quotes
+     *
+     * @param string $qstr
+     *
+     * @return string
+     */
+    private static function parse_single_quoted_string($qstr)
+    {
+        $escaped_string = substr($qstr, 1, strlen($qstr) - 2); //remove outer quotes
+
+        $ss = preg_split('/(\\\\.)/', $escaped_string, - 1, PREG_SPLIT_DELIM_CAPTURE);
+
+        $str = '';
+        foreach ($ss as $s) {
+            if (strlen($s) === 2 && $s[0] === '\\') {
+                if (isset(self::$escapes_single[$s[1]])) {
+                    $s = self::$escapes_single[$s[1]];
+                }
+            }
+            $str .= $s;
+        }
+        return $str;
+    }
+
+    /**
+     * parse double quoted string
+     *
+     * @param string $qstr
+     *
+     * @return string
+     */
+    private static function parse_double_quoted_string($qstr)
+    {
+        $inner_str = substr($qstr, 1, strlen($qstr) - 2);
+        return stripcslashes($inner_str);
+    }
+
+    /**
+     * parse triple quoted string
+     *
+     * @param string $qstr
+     *
+     * @return string
+     */
+    private static function parse_tripple_double_quoted_string($qstr)
+    {
+        return stripcslashes($qstr);
+    }
+
+    /**
+     * set a config variable in target array
+     *
+     * @param array $var
+     * @param array $target_array
+     */
+    private function set_var(array $var, array &$target_array)
+    {
+        $key = $var['key'];
+        $value = $var['value'];
+
+        if ($this->configOverwrite || !isset($target_array['vars'][$key])) {
+            $target_array['vars'][$key] = $value;
+        } else {
+            settype($target_array['vars'][$key], 'array');
+            $target_array['vars'][$key][] = $value;
+        }
+    }
+
+    /**
+     * add config variable to global vars
+     *
+     * @param array $vars
+     */
+    private function add_global_vars(array $vars)
+    {
+        if (!isset($this->compiler->config_data['vars'])) {
+            $this->compiler->config_data['vars'] = array();
+        }
+        foreach ($vars as $var) {
+            $this->set_var($var, $this->compiler->config_data);
+        }
+    }
+
+    /**
+     * add config variable to section
+     *
+     * @param string $section_name
+     * @param array  $vars
+     */
+    private function add_section_vars($section_name, array $vars)
+    {
+        if (!isset($this->compiler->config_data['sections'][$section_name]['vars'])) {
+            $this->compiler->config_data['sections'][$section_name]['vars'] = array();
+        }
+        foreach ($vars as $var) {
+            $this->set_var($var, $this->compiler->config_data['sections'][$section_name]);
+        }
+    }
+
+    const TPC_OPENB                          =  1;
+    const TPC_SECTION                        =  2;
+    const TPC_CLOSEB                         =  3;
+    const TPC_DOT                            =  4;
+    const TPC_ID                             =  5;
+    const TPC_EQUAL                          =  6;
+    const TPC_FLOAT                          =  7;
+    const TPC_INT                            =  8;
+    const TPC_BOOL                           =  9;
+    const TPC_SINGLE_QUOTED_STRING           = 10;
+    const TPC_DOUBLE_QUOTED_STRING           = 11;
+    const TPC_TRIPPLE_QUOTES                 = 12;
+    const TPC_TRIPPLE_TEXT                   = 13;
+    const TPC_TRIPPLE_QUOTES_END             = 14;
+    const TPC_NAKED_STRING                   = 15;
+    const TPC_OTHER                          = 16;
+    const TPC_NEWLINE                        = 17;
+    const TPC_COMMENTSTART                   = 18;
+    const YY_NO_ACTION = 60;
+    const YY_ACCEPT_ACTION = 59;
+    const YY_ERROR_ACTION = 58;
+
+    const YY_SZ_ACTTAB = 39;
+public static $yy_action = array(
+     24,   25,   26,   27,   28,   12,   15,   23,   31,   32,
+     59,    8,    9,    3,   21,   22,   33,   13,   33,   13,
+     14,   10,   18,   16,   30,   11,   17,   20,   34,    7,
+      5,    1,    2,   29,    4,   19,   52,   35,    6,
+    );
+    public static $yy_lookahead = array(
+      7,    8,    9,   10,   11,   12,    5,   27,   15,   16,
+     20,   21,   25,   23,   25,   26,   17,   18,   17,   18,
+      2,   25,    4,   13,   14,    1,   15,   24,   17,   22,
+      3,   23,   23,   14,    6,    2,   28,   17,    3,
+);
+    const YY_SHIFT_USE_DFLT = -8;
+    const YY_SHIFT_MAX = 19;
+    public static $yy_shift_ofst = array(
+     -8,    1,    1,    1,   -7,   -1,   -1,   24,   -8,   -8,
+     -8,   18,   10,   11,   27,   28,   19,   20,   33,   35,
+);
+    const YY_REDUCE_USE_DFLT = -21;
+    const YY_REDUCE_MAX = 10;
+    public static $yy_reduce_ofst = array(
+    -10,  -11,  -11,  -11,  -20,  -13,   -4,    3,    7,    8,
+      9,
+);
+    public static $yyExpectedTokens = array(
+         array(),
+         array(5, 17, 18, ),
+         array(5, 17, 18, ),
+         array(5, 17, 18, ),
+         array(7, 8, 9, 10, 11, 12, 15, 16, ),
+         array(17, 18, ),
+         array(17, 18, ),
+         array(1, ),
+         array(),
+         array(),
+         array(),
+         array(2, 4, ),
+         array(13, 14, ),
+         array(15, 17, ),
+         array(3, ),
+         array(6, ),
+         array(14, ),
+         array(17, ),
+         array(2, ),
+         array(3, ),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+);
+    public static $yy_default = array(
+     44,   40,   41,   37,   58,   58,   58,   36,   39,   44,
+     44,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+     38,   42,   43,   45,   46,   47,   48,   49,   50,   51,
+     52,   53,   54,   55,   56,   57,
+);
+    const YYNOCODE = 29;
+    const YYSTACKDEPTH = 100;
+    const YYNSTATE = 36;
+    const YYNRULE = 22;
+    const YYERRORSYMBOL = 19;
+    const YYERRSYMDT = 'yy0';
+    const YYFALLBACK = 0;
+    public static $yyFallback = array(
+    );
+    public function Trace($TraceFILE, $zTracePrompt)
+    {
+        if (!$TraceFILE) {
+            $zTracePrompt = 0;
+        } elseif (!$zTracePrompt) {
+            $TraceFILE = 0;
+        }
+        $this->yyTraceFILE = $TraceFILE;
+        $this->yyTracePrompt = $zTracePrompt;
+    }
+
+    public function PrintTrace()
+    {
+        $this->yyTraceFILE = fopen('php://output', 'w');
+        $this->yyTracePrompt = '<br>';
+    }
+
+    public $yyTraceFILE;
+    public $yyTracePrompt;
+    public $yyidx;                    /* Index of top element in stack */
+    public $yyerrcnt;                 /* Shifts left before out of the error */
+    public $yystack = array();  /* The parser's stack */
+
+    public $yyTokenName = array(
+  '$',             'OPENB',         'SECTION',       'CLOSEB',      
+  'DOT',           'ID',            'EQUAL',         'FLOAT',       
+  'INT',           'BOOL',          'SINGLE_QUOTED_STRING',  'DOUBLE_QUOTED_STRING',
+  'TRIPPLE_QUOTES',  'TRIPPLE_TEXT',  'TRIPPLE_QUOTES_END',  'NAKED_STRING',
+  'OTHER',         'NEWLINE',       'COMMENTSTART',  'error',       
+  'start',         'global_vars',   'sections',      'var_list',    
+  'section',       'newline',       'var',           'value',       
+    );
+
+    public static $yyRuleName = array(
+  'start ::= global_vars sections',
+  'global_vars ::= var_list',
+  'sections ::= sections section',
+  'sections ::=',
+  'section ::= OPENB SECTION CLOSEB newline var_list',
+  'section ::= OPENB DOT SECTION CLOSEB newline var_list',
+  'var_list ::= var_list newline',
+  'var_list ::= var_list var',
+  'var_list ::=',
+  'var ::= ID EQUAL value',
+  'value ::= FLOAT',
+  'value ::= INT',
+  'value ::= BOOL',
+  'value ::= SINGLE_QUOTED_STRING',
+  'value ::= DOUBLE_QUOTED_STRING',
+  'value ::= TRIPPLE_QUOTES TRIPPLE_TEXT TRIPPLE_QUOTES_END',
+  'value ::= TRIPPLE_QUOTES TRIPPLE_QUOTES_END',
+  'value ::= NAKED_STRING',
+  'value ::= OTHER',
+  'newline ::= NEWLINE',
+  'newline ::= COMMENTSTART NEWLINE',
+  'newline ::= COMMENTSTART NAKED_STRING NEWLINE',
+    );
+
+    public function tokenName($tokenType)
+    {
+        if ($tokenType === 0) {
+            return 'End of Input';
+        }
+        if ($tokenType > 0 && $tokenType < count($this->yyTokenName)) {
+            return $this->yyTokenName[$tokenType];
+        } else {
+            return 'Unknown';
+        }
+    }
+
+    public static function yy_destructor($yymajor, $yypminor)
+    {
+        switch ($yymajor) {
+            default:  break;   /* If no destructor action specified: do nothing */
+        }
+    }
+
+    public function yy_pop_parser_stack()
+    {
+        if (empty($this->yystack)) {
+            return;
+        }
+        $yytos = array_pop($this->yystack);
+        if ($this->yyTraceFILE && $this->yyidx >= 0) {
+            fwrite($this->yyTraceFILE,
+                $this->yyTracePrompt . 'Popping ' . $this->yyTokenName[$yytos->major] .
+                    "\n");
+        }
+        $yymajor = $yytos->major;
+        self::yy_destructor($yymajor, $yytos->minor);
+        $this->yyidx--;
+
+        return $yymajor;
+    }
+
+    public function __destruct()
+    {
+        while ($this->yystack !== Array()) {
+            $this->yy_pop_parser_stack();
+        }
+        if (is_resource($this->yyTraceFILE)) {
+            fclose($this->yyTraceFILE);
+        }
+    }
+
+    public function yy_get_expected_tokens($token)
+    {
+        static $res3 = array();
+        static $res4 = array();
+        $state = $this->yystack[$this->yyidx]->stateno;
+        $expected = self::$yyExpectedTokens[$state];
+        if (isset($res3[$state][$token])) {
+            if ($res3[$state][$token]) {
+                return $expected;
+            }
+        } else {
+            if ($res3[$state][$token] = in_array($token, self::$yyExpectedTokens[$state], true)) {
+                return $expected;
+            }
+        }
+        $stack = $this->yystack;
+        $yyidx = $this->yyidx;
+        do {
+            $yyact = $this->yy_find_shift_action($token);
+            if ($yyact >= self::YYNSTATE && $yyact < self::YYNSTATE + self::YYNRULE) {
+                // reduce action
+                $done = 0;
+                do {
+                    if ($done++ === 100) {
+                        $this->yyidx = $yyidx;
+                        $this->yystack = $stack;
+                        // too much recursion prevents proper detection
+                        // so give up
+                        return array_unique($expected);
+                    }
+                    $yyruleno = $yyact - self::YYNSTATE;
+                    $this->yyidx -= self::$yyRuleInfo[$yyruleno][1];
+                    $nextstate = $this->yy_find_reduce_action(
+                        $this->yystack[$this->yyidx]->stateno,
+                        self::$yyRuleInfo[$yyruleno][0]);
+                    if (isset(self::$yyExpectedTokens[$nextstate])) {
+                        $expected = array_merge($expected, self::$yyExpectedTokens[$nextstate]);
+                        if (isset($res4[$nextstate][$token])) {
+                            if ($res4[$nextstate][$token]) {
+                                $this->yyidx = $yyidx;
+                                $this->yystack = $stack;
+                                return array_unique($expected);
+                            }
+                        } else {
+                            if ($res4[$nextstate][$token] = in_array($token, self::$yyExpectedTokens[$nextstate], true)) {
+                                $this->yyidx = $yyidx;
+                                $this->yystack = $stack;
+                                return array_unique($expected);
+                            }
+                        }
+                    }
+                    if ($nextstate < self::YYNSTATE) {
+                        // we need to shift a non-terminal
+                        $this->yyidx++;
+                        $x = (object) ['stateno' => null, 'major' => null, 'minor' => null];
+                        $x->stateno = $nextstate;
+                        $x->major = self::$yyRuleInfo[$yyruleno][0];
+                        $this->yystack[$this->yyidx] = $x;
+                        continue 2;
+                    } elseif ($nextstate === self::YYNSTATE + self::YYNRULE + 1) {
+                        $this->yyidx = $yyidx;
+                        $this->yystack = $stack;
+                        // the last token was just ignored, we can't accept
+                        // by ignoring input, this is in essence ignoring a
+                        // syntax error!
+                        return array_unique($expected);
+                    } elseif ($nextstate === self::YY_NO_ACTION) {
+                        $this->yyidx = $yyidx;
+                        $this->yystack = $stack;
+                        // input accepted, but not shifted (I guess)
+                        return $expected;
+                    } else {
+                        $yyact = $nextstate;
+                    }
+                } while (true);
+            }
+            break;
+        } while (true);
+        $this->yyidx = $yyidx;
+        $this->yystack = $stack;
+
+        return array_unique($expected);
+    }
+
+    public function yy_is_expected_token($token)
+    {
+        static $res = array();
+        static $res2 = array();
+        if ($token === 0) {
+            return true; // 0 is not part of this
+        }
+        $state = $this->yystack[$this->yyidx]->stateno;
+        if (isset($res[$state][$token])) {
+            if ($res[$state][$token]) {
+                return true;
+            }
+        } else {
+            if ($res[$state][$token] = in_array($token, self::$yyExpectedTokens[$state], true)) {
+                return true;
+            }
+       }
+        $stack = $this->yystack;
+        $yyidx = $this->yyidx;
+        do {
+            $yyact = $this->yy_find_shift_action($token);
+            if ($yyact >= self::YYNSTATE && $yyact < self::YYNSTATE + self::YYNRULE) {
+                // reduce action
+                $done = 0;
+                do {
+                    if ($done++ === 100) {
+                        $this->yyidx = $yyidx;
+                        $this->yystack = $stack;
+                        // too much recursion prevents proper detection
+                        // so give up
+                        return true;
+                    }
+                    $yyruleno = $yyact - self::YYNSTATE;
+                    $this->yyidx -= self::$yyRuleInfo[$yyruleno][1];
+                    $nextstate = $this->yy_find_reduce_action(
+                        $this->yystack[$this->yyidx]->stateno,
+                        self::$yyRuleInfo[$yyruleno][0]);
+                    if (isset($res2[$nextstate][$token])) {
+                        if ($res2[$nextstate][$token]) {
+                            $this->yyidx = $yyidx;
+                            $this->yystack = $stack;
+                            return true;
+                        }
+                    } else {
+                        if ($res2[$nextstate][$token] = (isset(self::$yyExpectedTokens[$nextstate]) && in_array($token, self::$yyExpectedTokens[$nextstate], true))) {
+                            $this->yyidx = $yyidx;
+                            $this->yystack = $stack;
+                            return true;
+                        }
+                    }
+                    if ($nextstate < self::YYNSTATE) {
+                        // we need to shift a non-terminal
+                        $this->yyidx++;
+                        $x = (object) ['stateno' => null, 'major' => null, 'minor' => null];
+                        $x->stateno = $nextstate;
+                        $x->major = self::$yyRuleInfo[$yyruleno][0];
+                        $this->yystack[$this->yyidx] = $x;
+                        continue 2;
+                    } elseif ($nextstate === self::YYNSTATE + self::YYNRULE + 1) {
+                        $this->yyidx = $yyidx;
+                        $this->yystack = $stack;
+                        if (!$token) {
+                            // end of input: this is valid
+                            return true;
+                        }
+                        // the last token was just ignored, we can't accept
+                        // by ignoring input, this is in essence ignoring a
+                        // syntax error!
+                        return false;
+                    } elseif ($nextstate === self::YY_NO_ACTION) {
+                        $this->yyidx = $yyidx;
+                        $this->yystack = $stack;
+                        // input accepted, but not shifted (I guess)
+                        return true;
+                    } else {
+                        $yyact = $nextstate;
+                    }
+                } while (true);
+            }
+            break;
+        } while (true);
+        $this->yyidx = $yyidx;
+        $this->yystack = $stack;
+
+        return true;
+    }
+
+   public function yy_find_shift_action($iLookAhead)
+    {
+        $stateno = $this->yystack[$this->yyidx]->stateno;
+
+        /* if ($this->yyidx < 0) return self::YY_NO_ACTION;  */
+        if (!isset(self::$yy_shift_ofst[$stateno])) {
+            // no shift actions
+            return self::$yy_default[$stateno];
+        }
+        $i = self::$yy_shift_ofst[$stateno];
+        if ($i === self::YY_SHIFT_USE_DFLT) {
+            return self::$yy_default[$stateno];
+        }
+        if ($iLookAhead === self::YYNOCODE) {
+            return self::YY_NO_ACTION;
+        }
+        $i += $iLookAhead;
+        if ($i < 0 || $i >= self::YY_SZ_ACTTAB ||
+              self::$yy_lookahead[$i] != $iLookAhead) {
+            if (count(self::$yyFallback) && $iLookAhead < count(self::$yyFallback)
+                   && ($iFallback = self::$yyFallback[$iLookAhead]) != 0) {
+                if ($this->yyTraceFILE) {
+                    fwrite($this->yyTraceFILE, $this->yyTracePrompt . 'FALLBACK ' .
+                        $this->yyTokenName[$iLookAhead] . ' => ' .
+                        $this->yyTokenName[$iFallback] . "\n");
+                }
+
+                return $this->yy_find_shift_action($iFallback);
+            }
+
+            return self::$yy_default[$stateno];
+        } else {
+            return self::$yy_action[$i];
+        }
+    }
+
+    public function yy_find_reduce_action($stateno, $iLookAhead)
+    {
+        /* $stateno = $this->yystack[$this->yyidx]->stateno; */
+
+        if (!isset(self::$yy_reduce_ofst[$stateno])) {
+            return self::$yy_default[$stateno];
+        }
+        $i = self::$yy_reduce_ofst[$stateno];
+        if ($i === self::YY_REDUCE_USE_DFLT) {
+            return self::$yy_default[$stateno];
+        }
+        if ($iLookAhead === self::YYNOCODE) {
+            return self::YY_NO_ACTION;
+        }
+        $i += $iLookAhead;
+        if ($i < 0 || $i >= self::YY_SZ_ACTTAB ||
+              self::$yy_lookahead[$i] != $iLookAhead) {
+            return self::$yy_default[$stateno];
+        } else {
+            return self::$yy_action[$i];
+        }
+    }
+
+    public function yy_shift($yyNewState, $yyMajor, $yypMinor)
+    {
+        $this->yyidx++;
+        if ($this->yyidx >= self::YYSTACKDEPTH) {
+            $this->yyidx--;
+            if ($this->yyTraceFILE) {
+                fprintf($this->yyTraceFILE, "%sStack Overflow!\n", $this->yyTracePrompt);
+            }
+            while ($this->yyidx >= 0) {
+                $this->yy_pop_parser_stack();
+            }
+// line 245 "src/Parser/ConfigfileParser.y"
+
+            $this->internalError = true;
+            $this->compiler->trigger_config_file_error('Stack overflow in configfile parser');
+
+            return;
+        }
+        $yytos = (object) ['stateno' => null, 'major' => null, 'minor' => null];
+        $yytos->stateno = $yyNewState;
+        $yytos->major = $yyMajor;
+        $yytos->minor = $yypMinor;
+        $this->yystack[] = $yytos;
+        if ($this->yyTraceFILE && $this->yyidx > 0) {
+            fprintf($this->yyTraceFILE, "%sShift %d\n", $this->yyTracePrompt,
+                $yyNewState);
+            fprintf($this->yyTraceFILE, "%sStack:", $this->yyTracePrompt);
+            for ($i = 1; $i <= $this->yyidx; $i++) {
+                fprintf($this->yyTraceFILE, " %s",
+                    $this->yyTokenName[$this->yystack[$i]->major]);
+            }
+            fwrite($this->yyTraceFILE,"\n");
+        }
+    }
+
+    public static $yyRuleInfo = array(
+  array( 0 => 20, 1 => 2 ),
+  array( 0 => 21, 1 => 1 ),
+  array( 0 => 22, 1 => 2 ),
+  array( 0 => 22, 1 => 0 ),
+  array( 0 => 24, 1 => 5 ),
+  array( 0 => 24, 1 => 6 ),
+  array( 0 => 23, 1 => 2 ),
+  array( 0 => 23, 1 => 2 ),
+  array( 0 => 23, 1 => 0 ),
+  array( 0 => 26, 1 => 3 ),
+  array( 0 => 27, 1 => 1 ),
+  array( 0 => 27, 1 => 1 ),
+  array( 0 => 27, 1 => 1 ),
+  array( 0 => 27, 1 => 1 ),
+  array( 0 => 27, 1 => 1 ),
+  array( 0 => 27, 1 => 3 ),
+  array( 0 => 27, 1 => 2 ),
+  array( 0 => 27, 1 => 1 ),
+  array( 0 => 27, 1 => 1 ),
+  array( 0 => 25, 1 => 1 ),
+  array( 0 => 25, 1 => 2 ),
+  array( 0 => 25, 1 => 3 ),
+    );
+
+    public static $yyReduceMap = array(
+        0 => 0,
+        2 => 0,
+        3 => 0,
+        19 => 0,
+        20 => 0,
+        21 => 0,
+        1 => 1,
+        4 => 4,
+        5 => 5,
+        6 => 6,
+        7 => 7,
+        8 => 8,
+        9 => 9,
+        10 => 10,
+        11 => 11,
+        12 => 12,
+        13 => 13,
+        14 => 14,
+        15 => 15,
+        16 => 16,
+        17 => 17,
+        18 => 17,
+    );
+// line 251 "src/Parser/ConfigfileParser.y"
+    public function yy_r0(){
+    $this->_retvalue = null;
+    }
+// line 256 "src/Parser/ConfigfileParser.y"
+    public function yy_r1(){
+    $this->add_global_vars($this->yystack[$this->yyidx + 0]->minor);
+    $this->_retvalue = null;
+    }
+// line 270 "src/Parser/ConfigfileParser.y"
+    public function yy_r4(){
+    $this->add_section_vars($this->yystack[$this->yyidx + -3]->minor, $this->yystack[$this->yyidx + 0]->minor);
+    $this->_retvalue = null;
+    }
+// line 275 "src/Parser/ConfigfileParser.y"
+    public function yy_r5(){
+    if ($this->configReadHidden) {
+        $this->add_section_vars($this->yystack[$this->yyidx + -3]->minor, $this->yystack[$this->yyidx + 0]->minor);
+    }
+    $this->_retvalue = null;
+    }
+// line 283 "src/Parser/ConfigfileParser.y"
+    public function yy_r6(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor;
+    }
+// line 287 "src/Parser/ConfigfileParser.y"
+    public function yy_r7(){
+    $this->_retvalue = array_merge($this->yystack[$this->yyidx + -1]->minor, array($this->yystack[$this->yyidx + 0]->minor));
+    }
+// line 291 "src/Parser/ConfigfileParser.y"
+    public function yy_r8(){
+    $this->_retvalue = array();
+    }
+// line 297 "src/Parser/ConfigfileParser.y"
+    public function yy_r9(){
+    $this->_retvalue = array('key' => $this->yystack[$this->yyidx + -2]->minor, 'value' => $this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 302 "src/Parser/ConfigfileParser.y"
+    public function yy_r10(){
+    $this->_retvalue = (float) $this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 306 "src/Parser/ConfigfileParser.y"
+    public function yy_r11(){
+    $this->_retvalue = (int) $this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 310 "src/Parser/ConfigfileParser.y"
+    public function yy_r12(){
+    $this->_retvalue = $this->parse_bool($this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 314 "src/Parser/ConfigfileParser.y"
+    public function yy_r13(){
+    $this->_retvalue = self::parse_single_quoted_string($this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 318 "src/Parser/ConfigfileParser.y"
+    public function yy_r14(){
+    $this->_retvalue = self::parse_double_quoted_string($this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 322 "src/Parser/ConfigfileParser.y"
+    public function yy_r15(){
+    $this->_retvalue = self::parse_tripple_double_quoted_string($this->yystack[$this->yyidx + -1]->minor);
+    }
+// line 326 "src/Parser/ConfigfileParser.y"
+    public function yy_r16(){
+    $this->_retvalue = '';
+    }
+// line 330 "src/Parser/ConfigfileParser.y"
+    public function yy_r17(){
+    $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
+    }
+
+    private $_retvalue;
+
+    public function yy_reduce($yyruleno)
+    {
+        if ($this->yyTraceFILE && $yyruleno >= 0
+              && $yyruleno < count(self::$yyRuleName)) {
+            fprintf($this->yyTraceFILE, "%sReduce (%d) [%s].\n",
+                $this->yyTracePrompt, $yyruleno,
+                self::$yyRuleName[$yyruleno]);
+        }
+
+        $this->_retvalue = $yy_lefthand_side = null;
+        if (isset(self::$yyReduceMap[$yyruleno])) {
+            // call the action
+            $this->_retvalue = null;
+            $this->{'yy_r' . self::$yyReduceMap[$yyruleno]}();
+            $yy_lefthand_side = $this->_retvalue;
+        }
+        $yygoto = self::$yyRuleInfo[$yyruleno][0];
+        $yysize = self::$yyRuleInfo[$yyruleno][1];
+        $this->yyidx -= $yysize;
+        for ($i = $yysize; $i; $i--) {
+            // pop all of the right-hand side parameters
+            array_pop($this->yystack);
+        }
+        $yyact = $this->yy_find_reduce_action($this->yystack[$this->yyidx]->stateno, $yygoto);
+        if ($yyact < self::YYNSTATE) {
+            if (!$this->yyTraceFILE && $yysize) {
+                $this->yyidx++;
+                $x = (object) ['stateno' => null, 'major' => null, 'minor' => null];
+                $x->stateno = $yyact;
+                $x->major = $yygoto;
+                $x->minor = $yy_lefthand_side;
+                $this->yystack[$this->yyidx] = $x;
+            } else {
+                $this->yy_shift($yyact, $yygoto, $yy_lefthand_side);
+            }
+        } elseif ($yyact === self::YYNSTATE + self::YYNRULE + 1) {
+            $this->yy_accept();
+        }
+    }
+
+    public function yy_parse_failed()
+    {
+        if ($this->yyTraceFILE) {
+            fprintf($this->yyTraceFILE, "%sFail!\n", $this->yyTracePrompt);
+        } while ($this->yyidx >= 0) {
+            $this->yy_pop_parser_stack();
+        }
+    }
+
+    public function yy_syntax_error($yymajor, $TOKEN)
+    {
+// line 238 "src/Parser/ConfigfileParser.y"
+
+    $this->internalError = true;
+    $this->yymajor = $yymajor;
+    $this->compiler->trigger_config_file_error();
+    }
+
+    public function yy_accept()
+    {
+        if ($this->yyTraceFILE) {
+            fprintf($this->yyTraceFILE, "%sAccept!\n", $this->yyTracePrompt);
+        } while ($this->yyidx >= 0) {
+            $this->yy_pop_parser_stack();
+        }
+// line 231 "src/Parser/ConfigfileParser.y"
+
+    $this->successful = !$this->internalError;
+    $this->internalError = false;
+    $this->retvalue = $this->_retvalue;
+    }
+
+    public function doParse($yymajor, $yytokenvalue)
+    {
+        $yyerrorhit = 0;   /* True if yymajor has invoked an error */
+
+        if ($this->yyidx === null || $this->yyidx < 0) {
+            $this->yyidx = 0;
+            $this->yyerrcnt = -1;
+            $x = (object) ['stateno' => null, 'major' => null, 'minor' => null];
+            $x->stateno = 0;
+            $x->major = 0;
+            $this->yystack = array();
+            $this->yystack[] = $x;
+        }
+        $yyendofinput = ($yymajor==0);
+
+        if ($this->yyTraceFILE) {
+            fprintf($this->yyTraceFILE, "%sInput %s\n",
+                $this->yyTracePrompt, $this->yyTokenName[$yymajor]);
+        }
+
+        do {
+            $yyact = $this->yy_find_shift_action($yymajor);
+            if ($yymajor < self::YYERRORSYMBOL &&
+                  !$this->yy_is_expected_token($yymajor)) {
+                // force a syntax error
+                $yyact = self::YY_ERROR_ACTION;
+            }
+            if ($yyact < self::YYNSTATE) {
+                $this->yy_shift($yyact, $yymajor, $yytokenvalue);
+                $this->yyerrcnt--;
+                if ($yyendofinput && $this->yyidx >= 0) {
+                    $yymajor = 0;
+                } else {
+                    $yymajor = self::YYNOCODE;
+                }
+            } elseif ($yyact < self::YYNSTATE + self::YYNRULE) {
+                $this->yy_reduce($yyact - self::YYNSTATE);
+            } elseif ($yyact === self::YY_ERROR_ACTION) {
+                if ($this->yyTraceFILE) {
+                    fprintf($this->yyTraceFILE, "%sSyntax Error!\n",
+                        $this->yyTracePrompt);
+                }
+                if (self::YYERRORSYMBOL) {
+                    if ($this->yyerrcnt < 0) {
+                        $this->yy_syntax_error($yymajor, $yytokenvalue);
+                    }
+                    $yymx = $this->yystack[$this->yyidx]->major;
+                    if ($yymx === self::YYERRORSYMBOL || $yyerrorhit) {
+                        if ($this->yyTraceFILE) {
+                            fprintf($this->yyTraceFILE, "%sDiscard input token %s\n",
+                                $this->yyTracePrompt, $this->yyTokenName[$yymajor]);
+                        }
+                        $this->yy_destructor($yymajor, $yytokenvalue);
+                        $yymajor = self::YYNOCODE;
+                    } else {
+                        while ($this->yyidx >= 0 &&
+                                 $yymx !== self::YYERRORSYMBOL &&
+        ($yyact = $this->yy_find_shift_action(self::YYERRORSYMBOL)) >= self::YYNSTATE
+                              ){
+                            $this->yy_pop_parser_stack();
+                        }
+                        if ($this->yyidx < 0 || $yymajor==0) {
+                            $this->yy_destructor($yymajor, $yytokenvalue);
+                            $this->yy_parse_failed();
+                            $yymajor = self::YYNOCODE;
+                        } elseif ($yymx !== self::YYERRORSYMBOL) {
+                            $u2 = 0;
+                            $this->yy_shift($yyact, self::YYERRORSYMBOL, $u2);
+                        }
+                    }
+                    $this->yyerrcnt = 3;
+                    $yyerrorhit = 1;
+                } else {
+                    if ($this->yyerrcnt <= 0) {
+                        $this->yy_syntax_error($yymajor, $yytokenvalue);
+                    }
+                    $this->yyerrcnt = 3;
+                    $this->yy_destructor($yymajor, $yytokenvalue);
+                    if ($yyendofinput) {
+                        $this->yy_parse_failed();
+                    }
+                    $yymajor = self::YYNOCODE;
+                }
+            } else {
+                $this->yy_accept();
+                $yymajor = self::YYNOCODE;
+            }
+        } while ($yymajor !== self::YYNOCODE && $this->yyidx >= 0);
+    }
+}
+

src/Resource/BasePlugin.php

@@ -2,12 +2,14 @@
 
 namespace Smarty\Resource;
 
+use Smarty\Exception;
 use Smarty\Smarty;
+use Smarty\Template;
+use Smarty\Template\Source;
 
 /**
  * Smarty Resource Plugin
  * Base implementation for resource plugins
- * @method process(\Smarty\Template $_smarty_tpl)
  * @author     Rodney Rehm
  */
 abstract class BasePlugin
@@ -41,15 +43,25 @@ abstract class BasePlugin
 		return true;
     }
 
-    /**
-     * Load Resource Handler
-     *
-     * @param \Smarty $smarty smarty object
-     * @param string $type   name of the resource
-     *
-     * @return BasePlugin Resource Handler
-     *@throws \Smarty\Exception
-     */
+	/**
+	 * Check if resource must check time stamps when loading compiled or cached templates.
+	 * Resources like 'extends' which use source components my disable timestamp checks on own resource.
+	 * @return bool
+	 */
+	public function checkTimestamps()
+	{
+		return true;
+	}
+
+	/**
+	 * Load Resource Handler
+	 *
+	 * @param Smarty $smarty smarty object
+	 * @param string $type name of the resource
+	 *
+	 * @return BasePlugin Resource Handler
+	 * @throws Exception
+	 */
     public static function load(Smarty $smarty, $type)
     {
         // try smarty's cache
@@ -108,77 +120,50 @@ abstract class BasePlugin
         return array($name, $type);
     }
 
-    /**
-     * initialize Source Object for given resource
-     * wrapper for backward compatibility to versions < 3.1.22
-     * Either [$_template] or [$smarty, $template_resource] must be specified
-     *
-     * @param \Smarty\Template $_template         template object
-     * @param \Smarty                   $smarty            smarty object
-     * @param string                   $template_resource resource identifier
-     *
-     * @return \Smarty\Template\Source Source Object
-     * @throws \Smarty\Exception
-     */
-    public static function source(
-	    \Smarty\Template $_template = null,
-	    \Smarty\Smarty   $smarty = null,
-	                     $template_resource = null
-    ) {
-        return \Smarty\Template\Source::load($_template, $smarty, $template_resource);
-    }
-
     /**
      * Load template's source into current template object
      *
-     * @param \Smarty\Template\Source $source source object
+     * @param Source $source source object
      *
      * @return string                 template source
      * @throws \Smarty\Exception        if source cannot be loaded
      */
-    abstract public function getContent(\Smarty\Template\Source $source);
+    abstract public function getContent(Source $source);
 
-    /**
-     * populate Source Object with meta data from Resource
-     *
-     * @param \Smarty\Template\Source   $source    source object
-     * @param \Smarty\Template $_template template object
-     */
-    abstract public function populate(\Smarty\Template\Source $source, \Smarty\Template $_template = null);
+	/**
+	 * populate Source Object with metadata from Resource
+	 *
+	 * @param Source $source source object
+	 * @param Template|null $_template template object
+	 */
+    abstract public function populate(Source $source, \Smarty\Template $_template = null);
 
     /**
      * populate Source Object with timestamp and exists from Resource
      *
-     * @param \Smarty\Template\Source $source source object
+     * @param Source $source source object
      */
-    public function populateTimestamp(\Smarty\Template\Source $source)
+    public function populateTimestamp(Source $source)
     {
         // intentionally left blank
     }
 
-    /*
-     * Check if resource must check time stamps when when loading complied or cached templates.
-     * Resources like 'extends' which use source components my disable timestamp checks on own resource.
-     *
-     * @return bool
-     */
-    /**
-     * Determine basename for compiled filename
-     *
-     * @param \Smarty\Template\Source $source source object
-     *
-     * @return string                 resource's basename
-     */
-    public function getBasename(\Smarty\Template\Source $source)
-    {
-        return basename(preg_replace('![^\w]+!', '_', $source->name));
-    }
+	/*
+ * Check if resource must check time stamps when when loading complied or cached templates.
+ * Resources like 'extends' which use source components my disable timestamp checks on own resource.
+ *
+ * @return bool
+ */
+	/**
+	 * Determine basename for compiled filename
+	 *
+	 * @param \Smarty\Template\Source $source source object
+	 *
+	 * @return string                 resource's basename
+	 */
+	public function getBasename(\Smarty\Template\Source $source)
+	{
+		return basename(preg_replace('![^\w]+!', '_', $source->name));
+	}
 
-    /**
-     * @return bool
-     */
-    public function checkTimestamps()
-    {
-        return true;
-    }
 }

src/Resource/ExtendsPlugin.php

@@ -8,19 +8,9 @@ use Smarty\Template\Source;
 
 /**
  * Smarty Internal Plugin Resource Extends
- *
-
-
+ * Implements the file system as resource for Smarty which {extend}s a chain of template files templates
  * @author     Uwe Tews
  * @author     Rodney Rehm
- */
-
-/**
- * Smarty Internal Plugin Resource Extends
- * Implements the file system as resource for Smarty which {extend}s a chain of template files templates
- *
-
-
  */
 class ExtendsPlugin extends BasePlugin
 {

src/Resource/RecompiledPlugin.php

@@ -9,9 +9,7 @@
 
 namespace Smarty\Resource;
 
-use Smarty\Smarty;
 use Smarty\Template;
-use Smarty\Template\Compiled;
 
 /**
  * Smarty Resource Plugin
@@ -38,35 +36,6 @@ abstract class RecompiledPlugin extends BasePlugin {
 		return false;
 	}
 
-	/**
-	 * compile template from source
-	 *
-	 * @param Template $_smarty_tpl do not change variable name, is used by compiled template
-	 *
-	 * @throws Exception
-	 */
-	public function process(Template $_smarty_tpl) {
-		$compiled = $_smarty_tpl->getCompiled();
-		$compiled->file_dependency = [];
-		$compiled->includes = [];
-		$compiled->nocache_hash = null;
-		$compiled->unifunc = null;
-		$level = ob_get_level();
-		ob_start();
-		// call compiler
-		try {
-			eval('?>' . $_smarty_tpl->getCompiler()->compileTemplate($_smarty_tpl));
-		} catch (\Exception $e) {
-			while (ob_get_level() > $level) {
-				ob_end_clean();
-			}
-			throw $e;
-		}
-		ob_get_clean();
-		$compiled->timestamp = time();
-		$compiled->exists = true;
-	}
-
 	/*
 	   * Disable timestamp checks for recompiled resource.
 	   *

src/Runtime/CaptureRuntime.php

@@ -40,13 +40,6 @@ class CaptureRuntime {
 	 */
 	private $namedBuffer = [];
 
-	/**
-	 * Flag if callbacks are registered
-	 *
-	 * @var bool
-	 */
-	private $isRegistered = false;
-
 	/**
 	 * Open capture section
 	 *
@@ -56,9 +49,9 @@ class CaptureRuntime {
 	 * @param string $append variable name
 	 */
 	public function open(Template $_template, $buffer, $assign, $append) {
-		if (!$this->isRegistered) {
-			$this->register($_template);
-		}
+
+		$this->registerCallbacks($_template);
+
 		$this->captureStack[] = [
 			$buffer,
 			$assign,
@@ -73,7 +66,15 @@ class CaptureRuntime {
 	 *
 	 * @param \Smarty\Template $_template
 	 */
-	private function register(Template $_template) {
+	private function registerCallbacks(Template $_template) {
+
+		foreach ($_template->startRenderCallbacks as $callback) {
+			if (is_array($callback) && get_class($callback[0]) == self::class) {
+				// already registered
+				return;
+			}
+		}
+
 		$_template->startRenderCallbacks[] = [
 			$this,
 			'startRender',
@@ -83,7 +84,6 @@ class CaptureRuntime {
 			'endRender',
 		];
 		$this->startRender($_template);
-		$this->isRegistered = true;
 	}
 
 	/**

src/Runtime/InheritanceRuntime.php

@@ -85,8 +85,6 @@ class InheritanceRuntime {
 				ob_start();
 			}
 			++$this->inheritanceLevel;
-			//           $tpl->startRenderCallbacks[ 'inheritance' ] = array($this, 'subTemplateStart');
-			//           $tpl->endRenderCallbacks[ 'inheritance' ] = array($this, 'subTemplateEnd');
 		}
 		// if state was waiting for parent change state to parent
 		if ($this->state === 2) {
@@ -100,13 +98,11 @@ class InheritanceRuntime {
 	 *
 	 * @param \Smarty\Template $tpl
 	 * @param null|string $template optional name of inheritance parent template
-	 * @param null|string $uid uid of inline template
-	 * @param null|string $func function call name of inline template
 	 *
 	 * @throws \Exception
 	 * @throws \Smarty\Exception
 	 */
-	public function endChild(Template $tpl, $template = null, $uid = null, $func = null) {
+	public function endChild(Template $tpl, $template = null) {
 		--$this->inheritanceLevel;
 		if (!$this->inheritanceLevel) {
 			ob_end_clean();
@@ -118,10 +114,7 @@ class InheritanceRuntime {
 				$tpl->cache_id,
 				$tpl->compile_id,
 				$tpl->caching ? \Smarty\Template::CACHING_NOCACHE_CODE : 0,
-				$tpl->cache_lifetime,
-				[],
-				$uid,
-				$func
+				$tpl->cache_lifetime
 			);
 		}
 	}
@@ -151,7 +144,7 @@ class InheritanceRuntime {
 		while ($block->child && $block->child->child && $block->tplIndex <= $block->child->tplIndex) {
 			$block->child = $block->child->child;
 		}
-		$this->process($tpl, $block);
+		$this->processBlock($tpl, $block);
 	}
 
 	/**
@@ -163,7 +156,7 @@ class InheritanceRuntime {
 	 *
 	 * @throws Exception
 	 */
-	private function process(
+	private function processBlock(
 		Template              $tpl,
 		\Smarty\Runtime\Block $block,
 		\Smarty\Runtime\Block $parent = null
@@ -181,7 +174,7 @@ class InheritanceRuntime {
 		if ($block->callsChild || !isset($block->child) || ($block->child->hide && !isset($block->child->child))) {
 			$this->callBlock($block, $tpl);
 		} else {
-			$this->process($tpl, $block->child, $block);
+			$this->processBlock($tpl, $block->child, $block);
 		}
 		if ($block->prepend && isset($parent)) {
 			$this->callParent($tpl, $block, '{block prepend}');
@@ -191,7 +184,7 @@ class InheritanceRuntime {
 				) {
 					$this->callBlock($block, $tpl);
 				} else {
-					$this->process($tpl, $block->child, $block);
+					$this->processBlock($tpl, $block->child, $block);
 				}
 			}
 		}
@@ -209,7 +202,7 @@ class InheritanceRuntime {
 	 */
 	public function callChild(Template $tpl, \Smarty\Runtime\Block $block) {
 		if (isset($block->child)) {
-			$this->process($tpl, $block->child, $block);
+			$this->processBlock($tpl, $block->child, $block);
 		}
 	}
 

src/Runtime/TplFunctionRuntime.php

@@ -42,13 +42,6 @@ class TplFunctionRuntime {
 				$this->restoreTemplateVariables($tpl, $name);
 				return;
 			}
-			// try to load template function dynamically
-			if ($this->addTplFuncToCache($tpl, $name, $function)) {
-				$this->saveTemplateVariables($tpl, $name);
-				$function($tpl, $params);
-				$this->restoreTemplateVariables($tpl, $name);
-				return;
-			}
 		}
 		throw new \Smarty\Exception("Unable to find template function '{$name}'");
 	}
@@ -91,61 +84,6 @@ class TplFunctionRuntime {
 		}
 	}
 
-	/**
-	 * Add template function to cache file for nocache calls
-	 *
-	 * @param Template $tpl
-	 * @param string $_name template function name
-	 * @param string $_function PHP function name
-	 *
-	 * @return bool
-	 * @throws Exception
-	 */
-	private function addTplFuncToCache(Template $tpl, $_name, $_function) {
-		$funcParam = $tpl->tplFunctions[$_name];
-		if (is_file($funcParam['compiled_filepath'])) {
-			// read compiled file
-			$code = file_get_contents($funcParam['compiled_filepath']);
-			// grab template function
-			if (preg_match("/\/\* {$_function} \*\/([\S\s]*?)\/\*\/ {$_function} \*\//", $code, $match)) {
-				// grab source info from file dependency
-				preg_match("/\s*'{$funcParam['uid']}'([\S\s]*?)\),/", $code, $match1);
-				unset($code);
-				// make PHP function known
-				eval($match[0]);
-				if (function_exists($_function)) {
-
-					// Some magic code existed here, testing if the cached property had been set
-					// and then bubbling up until it found a parent template that had the cached property.
-					// This is no longer possible, so somehow this might break.
-
-					// add template function code to cache file
-					$content = $tpl->getCached()->readCache($tpl);
-					if ($content) {
-						// check if we must update file dependency
-						if (!preg_match("/'{$funcParam['uid']}'(.*?)'nocache_hash'/", $content, $match2)) {
-							$content = preg_replace("/('file_dependency'(.*?)\()/", "\\1{$match1[0]}", $content);
-						}
-						$tpl->getCached()->writeCache(
-							$tpl,
-							preg_replace('/\s*\?>\s*$/', "\n", $content) .
-							"\n" . preg_replace(
-								[
-									'/^\s*<\?php\s+/',
-									'/\s*\?>\s*$/',
-								],
-								"\n",
-								$match[0]
-							)
-						);
-					}
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
 	/**
 	 * Save current template variables on stack
 	 *

src/Smarty.php

@@ -191,12 +191,12 @@ class Smarty extends \Smarty\TemplateBase
      */
     public $force_compile = false;
 
-    /**
-     * use sub dirs for compiled/cached files?
-     *
-     * @var boolean
-     */
-    public $use_sub_dirs = false;
+	/**
+	 * Check template for modifications?
+	 * Set to Smarty::COMPILECHECK_OFF when templates won't change in production.
+	 * @var int
+	 */
+	public $compile_check = self::COMPILECHECK_ON;
 
     /**
      * allow ambiguous resources (that are made unique by the resource handler)
@@ -238,11 +238,11 @@ class Smarty extends \Smarty\TemplateBase
      *
      * @var array string
      */
-    public $literals = array();
+    private $literals = array();
 
     /**
      * class name
-     * This should be instance of \Smarty\Security.
+     * This should be an instance of \Smarty\Security.
      *
      * @var string
      * @see \Smarty\Security
@@ -579,7 +579,7 @@ class Smarty extends \Smarty\TemplateBase
      * @param string $resource_name template name
      *
      * @return bool status
-     * @throws \Smarty\Exception
+     * @throws Exception
      */
     public function templateExists($resource_name)
     {
@@ -594,7 +594,7 @@ class Smarty extends \Smarty\TemplateBase
      * @param string|\Smarty\Security $security_class if a string is used, it must be class-name
      *
      * @return Smarty                 current Smarty instance for chaining
-     * @throws \Smarty\Exception
+     * @throws Exception
      */
     public function enableSecurity($security_class = null)
     {
@@ -749,7 +749,7 @@ class Smarty extends \Smarty\TemplateBase
 	 * @param bool $cacheable if true (default) this function is cache able
 	 *
 	 * @return $this
-	 * @throws \Smarty\Exception
+	 * @throws Exception
 	 * @link https://www.smarty.net/docs/en/api.register.plugin.tpl
 	 *
 	 * @api  Smarty::registerPlugin()
@@ -854,7 +854,7 @@ class Smarty extends \Smarty\TemplateBase
     {
 	    trigger_error('Using Smarty::getPluginsDir() is deprecated and will be ' .
 		    'removed in a future release. For now, it will remove the DefaultExtension from the extensions list and ' .
-		    'proceed to call Smartyy::addPluginsDir..', E_USER_DEPRECATED);
+		    'proceed to call Smarty::addPluginsDir..', E_USER_DEPRECATED);
 
 		$this->extensions = array_filter(
 			$this->extensions,
@@ -1044,7 +1044,7 @@ class Smarty extends \Smarty\TemplateBase
 	    $nameIsDotted = !empty($name) && $name[0] === '.' && ($name[1] === '.' || $name[1] === '/');
 
 	    $id_parts[] = $type;
-	    $id_parts[] = $this->getSmarty()->_joined_template_dir;
+	    $id_parts[] = $this->_joined_template_dir;
 
 		// handle relative template names
         if ($baseFilePath && $nameIsDotted) {
@@ -1111,14 +1111,6 @@ class Smarty extends \Smarty\TemplateBase
         return $realpath !== false ? $parts[ 'root' ] . $path : str_ireplace(getcwd(), '.', $parts[ 'root' ] . $path);
     }
 
-    /**
-     * @param boolean $use_sub_dirs
-     */
-    public function setUseSubDirs($use_sub_dirs)
-    {
-        $this->use_sub_dirs = $use_sub_dirs;
-    }
-
     /**
      * @param int $error_reporting
      */
@@ -1271,7 +1263,7 @@ class Smarty extends \Smarty\TemplateBase
 
     /**
      * Get Smarty object
-     * // @TODO this is silly, remove?
+     * This is required for methods defined in base class Data trying to find Smarty
      * @return Smarty
      */
     public function getSmarty()
@@ -1345,7 +1337,7 @@ class Smarty extends \Smarty\TemplateBase
 	 * @param string  $type          resource type
 	 *
 	 * @return int number of cache files deleted
-	 * @throws \Smarty\Exception
+	 * @throws Exception
 	 * @link https://www.smarty.net/docs/en/api.clear.cache.tpl
 	 *
 	 * @api  Smarty::clearCache()
@@ -1383,10 +1375,12 @@ class Smarty extends \Smarty\TemplateBase
 	 * @param integer $exp_time      expiration time
 	 *
 	 * @return int number of template files deleted
-	 * @throws \Smarty\Exception
+	 * @throws Exception
 	 *@link https://www.smarty.net/docs/en/api.clear.compiled.template.tpl
 	 *
 	 * @api  Smarty::clearCompiledTemplate()
+	 *
+	 * @TODO can we remove this? It probably won't work anymore for specific files anyway
 	 */
 	public function clearCompiledTemplate($resource_name = null, $compile_id = null, $exp_time = null)
 	{
@@ -1395,7 +1389,6 @@ class Smarty extends \Smarty\TemplateBase
 			return 0;
 		}
 		$_compile_id = isset($compile_id) ? preg_replace('![^\w]+!', '_', $compile_id) : null;
-		$_dir_sep = $this->use_sub_dirs ? DIRECTORY_SEPARATOR : '^';
 		if (isset($resource_name)) {
 			$_save_stat = $this->caching;
 			$this->caching = \Smarty\Smarty::CACHING_OFF;
@@ -1412,11 +1405,11 @@ class Smarty extends \Smarty\TemplateBase
 			$_resource_part_2_length = strlen($_resource_part_2);
 		}
 		$_dir = $_compile_dir;
-		if ($this->use_sub_dirs && isset($_compile_id)) {
-			$_dir .= $_compile_id . $_dir_sep;
+		if (isset($_compile_id)) {
+			$_dir .= $_compile_id . DIRECTORY_SEPARATOR;
 		}
 		if (isset($_compile_id)) {
-			$_compile_id_part = $_compile_dir . $_compile_id . $_dir_sep;
+			$_compile_id_part = $_compile_dir . $_compile_id . DIRECTORY_SEPARATOR;
 			$_compile_id_part_length = strlen($_compile_id_part);
 		}
 		$_count = 0;
@@ -1614,7 +1607,7 @@ class Smarty extends \Smarty\TemplateBase
 	 * @param string                    $content
 	 *
 	 * @throws \Exception
-	 * @throws \Smarty\Exception
+	 * @throws Exception
 	 */
 	public function cacheModifiedCheck(Template\Cached $cached, Template $_template, $content)
 	{
@@ -1832,8 +1825,18 @@ class Smarty extends \Smarty\TemplateBase
 			error_reporting($_error_reporting);
 			throw new Exception("unable to write file {$_filepath}");
 		}
+
 		// set file permissions
 		@chmod($_filepath, 0666 & ~umask());
+
+		if (function_exists('opcache_invalidate')
+			&& (!function_exists('ini_get') || strlen(ini_get("opcache.restrict_api")) < 1)
+		) {
+			opcache_invalidate($_filepath, true);
+		} elseif (function_exists('apc_compile_file')) {
+			apc_compile_file($_filepath);
+		}
+
 		error_reporting($_error_reporting);
 		return true;
 	}
@@ -1869,7 +1872,7 @@ class Smarty extends \Smarty\TemplateBase
 				);
 		}
 
-		throw new \Smarty\Exception('Trying to load invalid runtime ' . $type);
+		throw new Exception('Trying to load invalid runtime ' . $type);
 	}
 
 	/**
@@ -1883,7 +1886,7 @@ class Smarty extends \Smarty\TemplateBase
 		try {
 			$this->getRuntime($type);
 			return true;
-		} catch (\Smarty\Exception $e) {
+		} catch (Exception $e) {
 			return false;
 		}
 	}
@@ -1902,7 +1905,7 @@ class Smarty extends \Smarty\TemplateBase
 	 * @param string $name filter name
 	 *
 	 * @return bool
-	 * @throws \Smarty\Exception
+	 * @throws Exception
 	 * @api  Smarty::loadFilter()
 	 * @link https://www.smarty.net/docs/en/api.load.filter.tpl
 	 *
@@ -1955,7 +1958,7 @@ class Smarty extends \Smarty\TemplateBase
 	 * @param string $name filter name
 	 *
 	 * @return TemplateBase
-	 * @throws \Smarty\Exception
+	 * @throws Exception
 	 * @api  Smarty::unloadFilter()
 	 *
 	 * @link https://www.smarty.net/docs/en/api.unload.filter.tpl
@@ -2057,7 +2060,7 @@ class Smarty extends \Smarty\TemplateBase
 	 * @param string|null $name optional filter name
 	 *
 	 * @return TemplateBase
-	 * @throws \Smarty\Exception
+	 * @throws Exception
 	 * @link https://www.smarty.net/docs/en/api.register.filter.tpl
 	 *
 	 * @api  Smarty::registerFilter()
@@ -2118,7 +2121,7 @@ class Smarty extends \Smarty\TemplateBase
 	 * @param callback|string $name the name previously used in ::registerFilter
 	 *
 	 * @return TemplateBase
-	 * @throws \Smarty\Exception
+	 * @throws Exception
 	 * @api  Smarty::unregisterFilter()
 	 *
 	 * @link https://www.smarty.net/docs/en/api.unregister.filter.tpl
@@ -2237,7 +2240,7 @@ class Smarty extends \Smarty\TemplateBase
 	 * @param mixed $compile_id compile id to be used with this template
 	 *
 	 * @throws \Exception
-	 * @throws \Smarty\Exception
+	 * @throws Exception
 	 */
 	public function display($template = null, $cache_id = null, $compile_id = null) {
 		return $this->returnOrCreateTemplate($template, $cache_id, $compile_id)->display();
@@ -2253,7 +2256,7 @@ class Smarty extends \Smarty\TemplateBase
 	 *
 	 * @return bool cache status
 	 * @throws \Exception
-	 * @throws \Smarty\Exception
+	 * @throws Exception
 	 * @link https://www.smarty.net/docs/en/api.is.cached.tpl
 	 *
 	 * @api  Smarty::isCached()
@@ -2279,5 +2282,326 @@ class Smarty extends \Smarty\TemplateBase
 		return $template;
 	}
 
+	/**
+	 * @return int
+	 */
+	public function getCompileCheck(): int {
+		return $this->compile_check;
+	}
+
+	/**
+	 * @param int $compile_check
+	 */
+	public function setCompileCheck($compile_check) {
+		$this->compile_check = (int)$compile_check;
+	}
+
+	/**
+	 * @var Debug
+	 */
+	private $debug;
+
+	/**
+	 * Registers object to be used in templates
+	 *
+	 * @param string $object_name
+	 * @param object $object the referenced PHP object to register
+	 * @param array $allowed_methods_properties list of allowed methods (empty = all)
+	 * @param bool $format smarty argument format, else traditional
+	 * @param array $block_methods list of block-methods
+	 *
+	 * @return Smarty
+	 * @throws Exception
+	 * @link https://www.smarty.net/docs/en/api.register.object.tpl
+	 *
+	 * @api  Smarty::registerObject()
+	 */
+	public function registerObject(
+		$object_name,
+		$object,
+		$allowed_methods_properties = [],
+		$format = true,
+		$block_methods = []
+	): Smarty {
+		// test if allowed methods callable
+		if (!empty($allowed_methods_properties)) {
+			foreach ((array)$allowed_methods_properties as $method) {
+				if (!is_callable([$object, $method]) && !property_exists($object, $method)) {
+					throw new Exception("Undefined method or property '$method' in registered object");
+				}
+			}
+		}
+		// test if block methods callable
+		if (!empty($block_methods)) {
+			foreach ((array)$block_methods as $method) {
+				if (!is_callable([$object, $method])) {
+					throw new Exception("Undefined method '$method' in registered object");
+				}
+			}
+		}
+		// register the object
+		$this->registered_objects[$object_name] =
+			[$object, (array)$allowed_methods_properties, (boolean)$format, (array)$block_methods];
+		return $this;
+	}
+
+	/**
+	 * Registers plugin to be used in templates
+	 *
+	 * @param string $object_name name of object
+	 *
+	 * @return Smarty
+	 * @api  Smarty::unregisterObject()
+	 * @link https://www.smarty.net/docs/en/api.unregister.object.tpl
+	 */
+	public function unregisterObject($object_name): Smarty {
+		if (isset($this->registered_objects[$object_name])) {
+			unset($this->registered_objects[$object_name]);
+		}
+		return $this;
+	}
+
+
+	/**
+	 * creates a data object
+	 *
+	 * @param Data|null $parent next higher level of Smarty variables
+	 * @param null $name optional data block name
+	 *
+	 * @return Data data object
+	 * @throws Exception
+	 * @api  Smarty::createData()
+	 * @link https://www.smarty.net/docs/en/api.create.data.tpl
+	 *
+	 */
+	public function createData(Data $parent = null, $name = null): Data {
+		$dataObj = new Data($this, $this, $name);
+		if ($this->debugging) {
+			$this->getDebug()->register_data($dataObj);
+		}
+		return $dataObj;
+	}
+
+	/**
+	 * return name of debugging template
+	 *
+	 * @return string|null
+	 * @api Smarty::getDebugTemplate()
+	 */
+	public function getDebugTemplate(): ?string {
+		return $this->debug_tpl;
+	}
+
+	/**
+	 * @return Debug
+	 */
+	public function getDebug(): Debug {
+		if (!isset($this->debug)) {
+			$this->debug = new \Smarty\Debug();
+		}
+		return $this->debug;
+	}
+
+
+	/**
+	 * return a reference to a registered object
+	 *
+	 * @param string $object_name object name
+	 *
+	 * @return object
+	 * @throws Exception if no such object is found
+	 * @link https://www.smarty.net/docs/en/api.get.registered.object.tpl
+	 *
+	 * @api  Smarty::getRegisteredObject()
+	 */
+	public function getRegisteredObject($object_name): object {
+		if (!isset($this->registered_objects[$object_name])) {
+			throw new Exception("'$object_name' is not a registered object");
+		}
+		if (!is_object($this->registered_objects[$object_name][0])) {
+			throw new Exception("registered '$object_name' is not an object");
+		}
+		return $this->registered_objects[$object_name][0];
+	}
+
+	/**
+	 * Get literals
+	 *
+	 * @return array list of literals
+	 * @api Smarty::getLiterals()
+	 *
+	 */
+	public function getLiterals(): array {
+		return $this->literals;
+	}
+
+	/**
+	 * Add literals
+	 *
+	 * @param array|string $literals literal or list of literals
+	 *                                                                                  to addto add
+	 *
+	 * @return Smarty
+	 * @throws Exception
+	 * @api Smarty::addLiterals()
+	 *
+	 */
+	public function addLiterals($literals = null): Smarty {
+		if (isset($literals)) {
+			$this->_setLiterals((array)$literals);
+		}
+		return $this;
+	}
+
+	/**
+	 * Set literals
+	 *
+	 * @param array|string $literals literal or list of literals to set
+	 *
+	 * @return Smarty
+	 * @throws Exception
+	 * @api Smarty::setLiterals()
+	 */
+	public function setLiterals($literals = null): Smarty {
+		$this->literals = [];
+		if (!empty($literals)) {
+			$this->_setLiterals((array)$literals);
+		}
+		return $this;
+	}
+
+	/**
+	 * common setter for literals for easier handling of duplicates the
+	 * Smarty::$literals array gets filled with identical key values
+	 *
+	 * @param array $literals
+	 *
+	 * @throws Exception
+	 */
+	private function _setLiterals(array $literals) {
+		$literals = array_combine($literals, $literals);
+		$error = isset($literals[$this->getLeftDelimiter()]) ? [$this->getLeftDelimiter()] : [];
+		$error = isset($literals[$this->getRightDelimiter()]) ? $error[] = $this->getRightDelimiter() : $error;
+		if (!empty($error)) {
+			throw new Exception(
+				'User defined literal(s) "' . $error .
+				'" may not be identical with left or right delimiter'
+			);
+		}
+		$this->literals = array_merge($this->literals, (array)$literals);
+	}
+
+	/**
+	 * Registers static classes to be used in templates
+	 *
+	 * @param string $class_name
+	 * @param string $class_impl the referenced PHP class to
+	 *                                                                                    register
+	 *
+	 * @return Smarty
+	 * @throws Exception
+	 * @api  Smarty::registerClass()
+	 * @link https://www.smarty.net/docs/en/api.register.class.tpl
+	 *
+	 */
+	public function registerClass($class_name, $class_impl): Smarty {
+		// test if exists
+		if (!class_exists($class_impl)) {
+			throw new Exception("Undefined class '$class_impl' in register template class");
+		}
+		// register the class
+		$this->registered_classes[$class_name] = $class_impl;
+		return $this;
+	}
+
+	/**
+	 * Register config default handler
+	 *
+	 * @param callable $callback class/method name
+	 *
+	 * @return Smarty
+	 * @throws Exception              if $callback is not callable
+	 * @api Smarty::registerDefaultConfigHandler()
+	 *
+	 */
+	public function registerDefaultConfigHandler($callback): Smarty {
+		if (is_callable($callback)) {
+			$this->default_config_handler_func = $callback;
+		} else {
+			throw new Exception('Default config handler not callable');
+		}
+		return $this;
+	}
+
+	/**
+	 * Register template default handler
+	 *
+	 * @param callable $callback class/method name
+	 *
+	 * @return Smarty
+	 * @throws Exception              if $callback is not callable
+	 * @api Smarty::registerDefaultTemplateHandler()
+	 *
+	 */
+	public function registerDefaultTemplateHandler($callback): Smarty {
+		if (is_callable($callback)) {
+			$this->default_template_handler_func = $callback;
+		} else {
+			throw new Exception('Default template handler not callable');
+		}
+		return $this;
+	}
+
+	/**
+	 * Registers a resource to fetch a template
+	 *
+	 * @param string $name name of resource type
+	 * @param BasePlugin $resource_handler instance of Smarty\Resource\Base
+	 *
+	 * @return Smarty
+	 * @link https://www.smarty.net/docs/en/api.register.resource.tpl
+	 *
+	 * @api  Smarty::registerResource()
+	 */
+	public function registerResource($name, \Smarty\Resource\BasePlugin $resource_handler): Smarty {
+		$this->registered_resources[$name] = $resource_handler;
+		return $this;
+	}
+
+	/**
+	 * Unregisters a resource to fetch a template
+	 *
+	 * @param string $type name of resource type
+	 *
+	 * @return Smarty
+	 * @api  Smarty::unregisterResource()
+	 * @link https://www.smarty.net/docs/en/api.unregister.resource.tpl
+	 *
+	 */
+	public function unregisterResource($type): Smarty {
+		if (isset($this->registered_resources[$type])) {
+			unset($this->registered_resources[$type]);
+		}
+		return $this;
+	}
+
+	/**
+	 * set the debug template
+	 *
+	 * @param string $tpl_name
+	 *
+	 * @return Smarty
+	 * @throws Exception if file is not readable
+	 * @api Smarty::setDebugTemplate()
+	 *
+	 */
+	public function setDebugTemplate($tpl_name): Smarty {
+		if (!is_readable($tpl_name)) {
+			throw new Exception("Unknown file '{$tpl_name}'");
+		}
+		$this->debug_tpl = $tpl_name;
+		return $this;
+	}
+
 }
 

src/Template.php

@@ -56,13 +56,6 @@ class Template extends TemplateBase {
 	 */
 	public $template_resource = null;
 
-	/**
-	 * flag if compiled template is invalid and must be (re)compiled
-	 *
-	 * @var bool
-	 */
-	public $mustCompile = null;
-
 	/**
 	 * Template ID
 	 *
@@ -70,13 +63,6 @@ class Template extends TemplateBase {
 	 */
 	public $templateId = null;
 
-	/**
-	 * Flag which is set while rending a cache file
-	 *
-	 * @var bool
-	 */
-	public $isRenderingCache = false;
-
 	/**
 	 * Callbacks called before rendering template
 	 *
@@ -140,7 +126,6 @@ class Template extends TemplateBase {
 		$this->compile_id = $_compile_id === null ? $this->smarty->compile_id : $_compile_id;
 		$this->caching = (int)($_caching === null ? $this->smarty->caching : $_caching);
 		$this->cache_lifetime = $this->smarty->cache_lifetime;
-		$this->compile_check = (int)$smarty->compile_check;
 		$this->parent = $_parent;
 		// Template resource
 		$this->template_resource = $template_resource;
@@ -152,83 +137,56 @@ class Template extends TemplateBase {
 	}
 
 	/**
-	 * render template
-	 *
-	 * @param bool $no_output_filter if true do not run output filter
-	 * @param null|bool $display true: display, false: fetch null: sub-template
+	 * render template and return result
 	 *
 	 * @return string
 	 * @throws \Exception
 	 * @throws \Smarty\Exception
 	 */
-	public function render($no_output_filter = true, $display = null) {
+	private function getResult(): string {
+
 		if ($this->smarty->debugging) {
-			$this->smarty->getDebug()->start_template($this, $display);
+			$this->smarty->getDebug()->start_template($this, 0);
 		}
-		// checks if template exists
+
 		if (!$this->getSource()->exists) {
 			throw new Exception(
 				"Unable to load template '{$this->getSource()->type}:{$this->getSource()->name}'" .
 				($this->_isSubTpl() ? " in '{$this->parent->template_resource}'" : '')
 			);
 		}
+
 		// disable caching for evaluated code
 		if ($this->getSource()->handler->recompiled) {
 			$this->caching = \Smarty\Smarty::CACHING_OFF;
 		}
+
+		foreach ($this->startRenderCallbacks as $callback) {
+			call_user_func($callback, $this);
+		}
+
 		// read from cache or render
-		if ($this->caching === \Smarty\Smarty::CACHING_LIFETIME_CURRENT || $this->caching === \Smarty\Smarty::CACHING_LIFETIME_SAVED) {
+		if ($this->isCachingEnabled()) {
+			// @TODO why would cache_id or compile_id differ. Is this because of re-using of Cached objects over subtemplates?
+			// If so, it seems error-prone to just throw that away here.
 			if ($this->getCached()->cache_id !== $this->cache_id || $this->getCached()->compile_id !== $this->compile_id) {
 				$this->getCached(true);
 			}
-			$this->getCached()->render($this, $no_output_filter);
+			$result = $this->getCached()->fetch($this);
 		} else {
 			$compiled = $this->getCompiled();
-			if ($compiled->compile_id !== $this->compile_id) {
-				$compiled = $this->getCompiled(true);
-			}
-			$compiled->render($this);
+			$result = $compiled->fetch();
 		}
-		// display or fetch
-		if ($display) {
-			if ($this->caching && $this->smarty->cache_modified_check) {
-				$this->smarty->cacheModifiedCheck(
-					$this->getCached(),
-					$this,
-					isset($content) ? $content : ob_get_clean()
-				);
-			} else {
-				if ((!$this->caching || $this->getCached()->getNocacheCode() || $this->getSource()->handler->recompiled)
-					&& !$no_output_filter && isset($this->smarty->registered_filters['output'])
-				) {
-					echo $this->smarty->runOutputFilters(ob_get_clean(), $this);
-				} else {
-					echo ob_get_clean();
-				}
-			}
-			if ($this->smarty->debugging) {
-				$this->smarty->getDebug()->end_template($this);
-				// debug output
-				$this->smarty->getDebug()->display_debug($this, true);
-			}
-			return '';
-		} else {
-			if ($this->smarty->debugging) {
-				$this->smarty->getDebug()->end_template($this);
-				if ($this->smarty->debugging === 2 && $display === false) {
-					$this->smarty->getDebug()->display_debug($this, true);
-				}
-			}
-			if (
-				!$no_output_filter
-				&& (!$this->caching || $this->getCached()->getNocacheCode() || $this->getSource()->handler->recompiled)
-			) {
 
-				return $this->smarty->runOutputFilters(ob_get_clean(), $this);
-			}
-			// return cache content
-			return null;
+		foreach ($this->endRenderCallbacks as $callback) {
+			call_user_func($callback, $this);
 		}
+
+		if ($this->smarty->debugging) {
+			$this->smarty->getDebug()->end_template($this);
+		}
+
+		return $result;
 	}
 
 	/**
@@ -240,8 +198,6 @@ class Template extends TemplateBase {
 	 * @param integer $caching cache mode
 	 * @param integer $cache_lifetime lifetime of cache data
 	 * @param array $extra_vars passed parameter template variables
-	 * @param null $uid file dependency uid
-	 * @param null $content_func function name
 	 * @param int|null $scope
 	 *
 	 * @throws Exception
@@ -252,9 +208,7 @@ class Template extends TemplateBase {
 		$compile_id,
 		$caching,
 		$cache_lifetime,
-		array $extra_vars,
-		$uid = null,
-		$content_func = null,
+		array $extra_vars = [],
 		int $scope = null
 	) {
 
@@ -270,22 +224,10 @@ class Template extends TemplateBase {
 
 		// recursive call ?
 		if ($tpl->getTemplateId() !== $this->getTemplateId()) {
-
-			if (isset($uid) && $this->getCompiled()->file_dependency) {
-				// for inline templates we can get all resource information from file dependency
-				[$filepath, $timestamp, $type] = $this->getCompiled()->file_dependency[$uid];
-				$source = new Source($this->getSmarty(), $filepath, $type, $filepath);
-				$source->filepath = $filepath;
-				$source->timestamp = $timestamp;
-				$source->exists = true;
-				$source->uid = $uid;
-				$tpl->setSource($source);
-			} else {
-				$tpl->setSource(Source::load($tpl));
-				$tpl->getCompiled(true); // @TODO this unset($tpl->compiled), there might be a bug here
-			}
+			$tpl->setSource(Source::load($tpl));
+			$tpl->getCompiled(true);
 			if ($caching !== \Smarty\Template::CACHING_NOCACHE_CODE) {
-				$tpl->getCached(true); // @TODO this unset($tpl->cached), there might be a bug here
+				$tpl->getCached(true);
 			}
 		}
 
@@ -300,20 +242,8 @@ class Template extends TemplateBase {
 				$this->getCached()->hashes[$tpl->getCompiled()->nocache_hash] = true;
 			}
 		}
-		if (isset($uid)) {
-			$smarty = $this->getSmarty();
-			if ($smarty->debugging) {
-				$smarty->getDebug()->start_template($tpl);
-				$smarty->getDebug()->start_render($tpl);
-			}
-			$tpl->getRenderedTemplateCode($content_func);
-			if ($smarty->debugging) {
-				$smarty->getDebug()->end_template($tpl);
-				$smarty->getDebug()->end_render($tpl);
-			}
-		} else {
-			$tpl->render();
-		}
+
+		$tpl->getResult();
 	}
 
 	/**
@@ -326,118 +256,19 @@ class Template extends TemplateBase {
 	}
 
 	public function assign($tpl_var, $value = null, $nocache = false, $scope = null) {
-		return parent::assign($tpl_var, $value, $nocache || $this->isRenderingCache, $scope);
-	}
-
-	/**
-	 * This function is executed automatically when a compiled or cached template file is included
-	 * - Decode saved properties from compiled template and cache files
-	 * - Check if compiled or cache file is valid
-	 *
-	 * @param array $properties special template properties
-	 * @param bool $cache flag if called from cache file
-	 *
-	 * @return bool flag if compiled or cache file is valid
-	 * @throws \Smarty\Exception
-	 */
-	public function isFresh($properties, $cache = false) {
-		// on cache resources other than file check version stored in cache code
-		if (!isset($properties['version']) || \Smarty\Smarty::SMARTY_VERSION !== $properties['version']) {
-			if ($cache) {
-				$this->getSmarty()->clearAllCache();
-			} else {
-				$this->getSmarty()->clearCompiledTemplate();
-			}
-			return false;
-		}
-		$is_valid = true;
-		if (!empty($properties['file_dependency'])
-			&& ((!$cache && $this->compile_check) || $this->compile_check === \Smarty\Smarty::COMPILECHECK_ON)
-		) {
-			// check file dependencies at compiled code
-			foreach ($properties['file_dependency'] as $_file_to_check) {
-				if ($_file_to_check[2] === 'file' || $_file_to_check[2] === 'php') {
-					if ($this->getSource()->filepath === $_file_to_check[0]) {
-						// do not recheck current template
-						continue;
-						//$mtime = $this->getSource()->getTimeStamp();
-					} else {
-						// file and php types can be checked without loading the respective resource handlers
-						$mtime = is_file($_file_to_check[0]) ? filemtime($_file_to_check[0]) : false;
-					}
-				} else {
-					$handler = \Smarty\Resource\BasePlugin::load($this->getSmarty(), $_file_to_check[2]);
-					if ($handler->checkTimestamps()) {
-						$source = Source::load($this, $this->getSmarty(), $_file_to_check[0]);
-						$mtime = $source->getTimeStamp();
-					} else {
-						continue;
-					}
-				}
-				if ($mtime === false || $mtime > $_file_to_check[1]) {
-					$is_valid = false;
-					break;
-				}
-			}
-		}
-		if ($cache) {
-			// CACHING_LIFETIME_SAVED cache expiry has to be validated here since otherwise we'd define the unifunc
-			if ($this->caching === \Smarty\Smarty::CACHING_LIFETIME_SAVED && $properties['cache_lifetime'] >= 0
-				&& (time() > ($this->getCached()->timestamp + $properties['cache_lifetime']))
-			) {
-				$is_valid = false;
-			}
-			$this->getCached()->cache_lifetime = $properties['cache_lifetime'];
-			$this->getCached()->valid = $is_valid;
-			$generatedFile = $this->getCached();
-		} else {
-			$this->mustCompile = !$is_valid;
-			$generatedFile = $this->getCompiled();
-			$generatedFile->includes = $properties['includes'] ?? [];
-		}
-		if ($is_valid) {
-			$generatedFile->unifunc = $properties['unifunc'];
-			$generatedFile->setNocacheCode($properties['has_nocache_code']);
-			$generatedFile->file_dependency = $properties['file_dependency'];
-		}
-		return $is_valid && !function_exists($properties['unifunc']);
+		return parent::assign($tpl_var, $value, $nocache, $scope);
 	}
 
 	/**
 	 * Compiles the template
 	 * If the template is not evaluated the compiled template is saved on disk
 	 *
+	 * @TODO only used in compileAll and 1 unit test: can we move this and make compileAndWrite private?
+	 *
 	 * @throws \Exception
 	 */
 	public function compileTemplateSource() {
-		return $this->getCompiled()->compileTemplateSource($this);
-	}
-
-	/**
-	 * Return cached content
-	 *
-	 * @return null|string
-	 * @throws Exception
-	 */
-	public function getCachedContent() {
-		return $this->getCached()->handler->getCachedContent($this);
-	}
-
-	/**
-	 * Writes the content to cache resource
-	 *
-	 * @param string $content
-	 *
-	 * @return bool
-	 */
-	public function writeCachedContent($content) {
-		if ($this->getSource()->handler->recompiled || !$this->caching
-		) {
-			// don't write cache file
-			return false;
-		}
-		$codeframe = $this->createCodeFrame($content, '', true);
-		return $this->getCached()->writeCache($this, $codeframe);
+		return $this->getCompiled()->compileAndWrite();
 	}
 
 	/**
@@ -466,7 +297,7 @@ class Template extends TemplateBase {
 	 */
 	public function getCompiled($forceNew = false) {
 		if ($forceNew || !isset($this->compiled)) {
-			$this->compiled = Compiled::load($this);
+			$this->compiled = new Compiled($this);
 		}
 		return $this->compiled;
 	}
@@ -475,8 +306,7 @@ class Template extends TemplateBase {
 	 * Return Cached object
 	 *
 	 * @param bool $forceNew force new cached object
-	 *
-	 * @throws Exception
+	 * @return Cached
 	 */
 	public function getCached($forceNew = false): Cached {
 		if ($forceNew || !isset($this->cached)) {
@@ -488,14 +318,11 @@ class Template extends TemplateBase {
 				$this->cache_id
 			);
 			$cacheResource->populate($this->cached, $this);
-			if (!$this->isCachingEnabled()) {
-				$this->cached->setValid(false);
-			}
 		}
 		return $this->cached;
 	}
 
-	public function isCachingEnabled(): bool {
+	private function isCachingEnabled(): bool {
 		return $this->caching && !$this->getSource()->handler->recompiled;
 	}
 
@@ -523,14 +350,6 @@ class Template extends TemplateBase {
 		$this->inheritance = $inheritanceRuntime;
 	}
 
-	/**
-	 * Unload event callbacks
-	 */
-	private function _cleanUp() {
-		$this->startRenderCallbacks = [];
-		$this->endRenderCallbacks = [];
-	}
-
 	/**
 	 * Return Compiler object
 	 */
@@ -547,13 +366,12 @@ class Template extends TemplateBase {
 	 * @param string $content optional template content
 	 * @param string $functions compiled template function and block code
 	 * @param bool $cache flag for cache file
-	 * @param Compiler\Template|null $compiler
 	 *
 	 * @return string
 	 * @throws Exception
 	 */
-	public function createCodeFrame($content = '', $functions = '', $cache = false, \Smarty\Compiler\Template $compiler = null) {
-		return $this->getCodeFrameCompiler()->create($content, $functions, $cache, $compiler);
+	public function createCodeFrame($content = '', $functions = '', $cache = false) {
+		return $this->getCodeFrameCompiler()->create($content, $functions, $cache);
 	}
 
 	/**
@@ -573,7 +391,7 @@ class Template extends TemplateBase {
 	 * @return bool
 	 * @throws \Smarty\Exception
 	 */
-	public function mustCompile() {
+	public function mustCompile(): bool {
 		if (!$this->getSource()->exists) {
 			if ($this->_isSubTpl()) {
 				$parent_resource = " in '{$this->parent->template_resource}'";
@@ -582,13 +400,12 @@ class Template extends TemplateBase {
 			}
 			throw new Exception("Unable to load template {$this->getSource()->type} '{$this->getSource()->name}'{$parent_resource}");
 		}
-		if ($this->mustCompile === null) {
-			$this->mustCompile = $this->smarty->force_compile
-				|| $this->getSource()->handler->recompiled
-				|| !$this->getCompiled()->exists
-				|| ($this->compile_check &&	$this->getCompiled()->getTimeStamp() < $this->getSource()->getTimeStamp());
-		}
-		return $this->mustCompile;
+
+		// @TODO move this logic to Compiled
+		return $this->smarty->force_compile
+			|| $this->getSource()->handler->recompiled
+			|| !$this->getCompiled()->exists
+			|| ($this->getSmarty()->getCompileCheck() && $this->getCompiled()->getTimeStamp() < $this->getSource()->getTimeStamp());
 	}
 
 	private function getCodeFrameCompiler(): Compiler\CodeFrame {
@@ -673,50 +490,12 @@ class Template extends TemplateBase {
 		return $confObj;
 	}
 
-	public function fetch() {
-		$result = $this->_execute(0);
-		return $result === null ? ob_get_clean() : $result;
-	}
-
-	public function display() {
-		$this->_execute(1);
-	}
-
-	/**
-	 * test if cache is valid
-	 *
-	 * @param mixed $cache_id cache id to be used with this template
-	 * @param mixed $compile_id compile id to be used with this template
-	 * @param object $parent next higher level of Smarty variables
-	 *
-	 * @return bool cache status
-	 * @throws \Exception
-	 * @throws \Smarty\Exception
-	 * @link https://www.smarty.net/docs/en/api.is.cached.tpl
-	 *
-	 * @api  Smarty::isCached()
-	 */
-	public function isCached(): bool {
-		return (bool) $this->_execute(2);
-	}
-
-	/**
-	 * fetches a rendered Smarty template
-	 *
-	 * @param string $function function type 0 = fetch,  1 = display, 2 = isCache
-	 *
-	 * @return mixed
-	 * @throws Exception
-	 * @throws \Throwable
-	 */
-	private function _execute($function) {
-
+	public function fetch(): ?string {
 		$smarty = $this->getSmarty();
 
 		// make sure we have integer values
 		$this->caching = (int)$this->caching;
-		// fetch template content
-		$level = ob_get_level();
+
 		try {
 			$_smarty_old_error_level =
 				isset($smarty->error_reporting) ? error_reporting($smarty->error_reporting) : null;
@@ -726,29 +505,15 @@ class Template extends TemplateBase {
 				$errorHandler->activate();
 			}
 
-			if ($function === 2) {
-				if ($this->caching) {
-					// return cache status of template
-					$result = $this->getCached()->isCached($this);
-				} else {
-					return false;
-				}
-			} else {
+			// After rendering a template, the tpl/config variables are reset, so the template can be re-used.
+			$savedTplVars = $this->tpl_vars;
+			$savedConfigVars = $this->config_vars;
 
-				// After rendering a template, the tpl/config variables are reset, so the template can be re-used.
-				$savedTplVars = $this->tpl_vars;
-				$savedConfigVars = $this->config_vars;
+			$result = $this->getResult();
 
-				// Start output-buffering.
-				ob_start();
-
-				$result = $this->render(false, $function);
-
-				// Restore the template to its previous state
-				$this->_cleanUp();
-				$this->tpl_vars = $savedTplVars;
-				$this->config_vars = $savedConfigVars;
-			}
+			// Restore the template to its previous state
+			$this->tpl_vars = $savedTplVars;
+			$this->config_vars = $savedConfigVars;
 
 			if (isset($errorHandler)) {
 				$errorHandler->deactivate();
@@ -757,11 +522,9 @@ class Template extends TemplateBase {
 			if (isset($_smarty_old_error_level)) {
 				error_reporting($_smarty_old_error_level);
 			}
-			return $result;
+
 		} catch (\Throwable $e) {
-			while (ob_get_level() > $level) {
-				ob_end_clean();
-			}
+
 			if (isset($errorHandler)) {
 				$errorHandler->deactivate();
 			}
@@ -771,41 +534,25 @@ class Template extends TemplateBase {
 			}
 			throw $e;
 		}
+
+		return $result;
+	}
+
+	public function display() {
+		echo $this->fetch();
 	}
 
 	/**
-	 * get rendered template content by calling compiled or cached template code
+	 * test if caching is enabled, a cache exists and it is still fresh
 	 *
-	 * @param string $unifunc function with template code
+	 * @return bool cache status
+	 * @throws Exception
+	 * @link https://www.smarty.net/docs/en/api.is.cached.tpl
 	 *
-	 * @throws \Exception
+	 * @api  Smarty::isCached()
 	 */
-	public function getRenderedTemplateCode($unifunc) {
-		$level = ob_get_level();
-		try {
-			if (empty($unifunc) || !function_exists($unifunc)) {
-				throw new \Smarty\Exception("Invalid compiled template for '{$this->template_resource}'");
-			}
-			if ($this->startRenderCallbacks) {
-				foreach ($this->startRenderCallbacks as $callback) {
-					call_user_func($callback, $this);
-				}
-			}
-			$unifunc($this);
-			foreach ($this->endRenderCallbacks as $callback) {
-				call_user_func($callback, $this);
-			}
-			$this->isRenderingCache = false;
-		} catch (\Exception $e) {
-			$this->isRenderingCache = false;
-			while (ob_get_level() > $level) {
-				ob_end_clean();
-			}
-			if (isset($this->getSmarty()->security_policy)) {
-				$this->getSmarty()->security_policy->endTemplate();
-			}
-			throw $e;
-		}
+	public function isCached(): bool {
+		return $this->isCachingEnabled() && $this->getCached()->isCached($this);
 	}
 
 	/**

src/Template/Cached.php

@@ -5,33 +5,48 @@ namespace Smarty\Template;
 use Smarty\Exception;
 use Smarty\Template;
 use Smarty\Template\Cacheresource\Base;
+use Smarty\Template\Compiler\CodeFrame;
 
 /**
  * Represents a cached version of a template or config file.
  * @author     Rodney Rehm
  */
-class Cached extends GeneratedPhpFile {
+class Cached {
+
+	/**
+	 * Filepath of cached file
+	 *
+	 * @var string
+	 */
+	public $filepath = null;
 
 	/**
 	 * Cache Is Valid
 	 *
 	 * @var boolean
 	 */
-	public $valid = null;
+	private $valid = null;
 
 	/**
-	 * @return bool|null
+	 * Indicates existence of cache in cacheresource
+	 *
+	 * @var boolean
 	 */
-	public function getValid(): ?bool {
-		return $this->valid;
-	}
+	public $exists = false;
 
 	/**
-	 * @param bool|null $valid
+	 * Template Compile Id (\Smarty\Template::$compile_id)
+	 *
+	 * @var string
 	 */
-	public function setValid(?bool $valid): void {
-		$this->valid = $valid;
-	}
+	public $compile_id = null;
+
+	/**
+	 * Compiled Timestamp
+	 *
+	 * @var int|bool
+	 */
+	public $timestamp = false;
 
 	/**
 	 * CacheResource Handler
@@ -73,7 +88,7 @@ class Cached extends GeneratedPhpFile {
 	 *
 	 * @var Source
 	 */
-	public $source = null;
+	private $source = null;
 
 	/**
 	 * Nocache hash codes of processed compiled templates
@@ -89,10 +104,12 @@ class Cached extends GeneratedPhpFile {
 	 */
 	public $content = null;
 
-	private function renderTemplateCode(Template $_template) {
-		$_template->isRenderingCache = true;
-		$_template->getRenderedTemplateCode($this->unifunc);
-	}
+	/**
+	 * resource file dependency
+	 *
+	 * @var array
+	 */
+	public $file_dependency = [];
 
 	/**
 	 * create Cached Object container
@@ -107,32 +124,69 @@ class Cached extends GeneratedPhpFile {
 		$this->cache_id = $cache_id;
 		$this->source = $source;
 		$this->handler = $handler;
+		//@TODO we need $template here too.
+	}
+
+	/**
+	 * Return cached template contents
+	 *
+	 * @param Template $_template
+	 *
+	 * @return string
+	 * @throws Exception
+	 */
+	public function fetch(Template $_template): string {
+
+		if (!$this->isCached($_template)) {
+			$this->saveCache($_template);
+		}
+
+		if ($_template->getSmarty()->debugging) {
+			$_template->getSmarty()->getDebug()->start_cache($_template);
+		}
+
+		$codeFrameClassname = $this->getCodeFrameClassname();
+		if ($this->getCodeFrameClassname() && !class_exists($codeFrameClassname)) {
+			$this->runCodeFrame($_template, $this->readCache($_template));
+		}
+
+		/** @var \Smarty\CodeFrame\Cached $codeFrameClassname */
+		$cachedTemplate = new $codeFrameClassname();
+		ob_start();
+
+		$cachedTemplate->renderContent($_template);
+
+		$result = ob_get_clean();
+
+		if ($_template->getSmarty()->debugging) {
+			$_template->getSmarty()->getDebug()->end_cache($_template);
+		}
+
+		return $result;
 	}
 
 	/**
 	 * Render cache template
 	 *
 	 * @param \Smarty\Template $_template
-	 * @param bool $no_output_filter
 	 *
 	 * @throws \Exception
 	 */
-	public function render(Template $_template, $no_output_filter = true) {
-		if ($this->isCached($_template)) {
-			if ($_template->getSmarty()->debugging) {
-				$_template->getSmarty()->getDebug()->start_cache($_template);
-			}
-			if (!$this->processed) {
-				$this->process($_template);
-			}
-			$this->renderTemplateCode($_template);
-			if ($_template->getSmarty()->debugging) {
-				$_template->getSmarty()->getDebug()->end_cache($_template);
-			}
-			return;
-		} else {
-			$this->updateCache($_template, $no_output_filter);
+	public function render(Template $_template): void {
+		echo $this->fetch($_template);
+	}
+
+	/**
+	 * Returns the codeframe for this cache, but only if it is loaded already. Will not load any data from
+	 * the cacheresource.
+	 *
+	 * @return \Smarty\CodeFrame\Cached|null
+	 */
+	private function getCodeFrame(): ?\Smarty\CodeFrame\Cached {
+		if (!$this->getCodeFrameClassname() || !class_exists($classname = $this->getCodeFrameClassname())) {
+			return null;
 		}
+		return new $classname;
 	}
 
 	/**
@@ -144,90 +198,7 @@ class Cached extends GeneratedPhpFile {
 	 * @throws Exception
 	 */
 	public function isCached(Template $_template) {
-		if ($this->valid !== null) {
-			return $this->valid;
-		}
-		while (true) {
-			while (true) {
-				if ($this->exists === false || $_template->getSmarty()->force_compile || $_template->getSmarty()->force_cache) {
-					$this->valid = false;
-				} else {
-					$this->valid = true;
-				}
-				if ($this->valid && $_template->caching === \Smarty\Smarty::CACHING_LIFETIME_CURRENT
-					&& $_template->cache_lifetime >= 0 && time() > ($this->timestamp + $_template->cache_lifetime)
-				) {
-					// lifetime expired
-					$this->valid = false;
-				}
-				if ($this->valid && $_template->compile_check === \Smarty\Smarty::COMPILECHECK_ON
-					&& $_template->getSource()->getTimeStamp() > $this->timestamp
-				) {
-					$this->valid = false;
-				}
-				if ($this->valid || !$_template->getSmarty()->cache_locking) {
-					break;
-				}
-				if (!$this->handler->locked($_template->getSmarty(), $this)) {
-					$this->handler->acquireLock($_template->getSmarty(), $this);
-					break 2;
-				}
-				$this->handler->populate($this, $_template);
-			}
-			if ($this->valid) {
-				if (!$_template->getSmarty()->cache_locking || $this->handler->locked($_template->getSmarty(), $this) === null) {
-					// load cache file for the following checks
-					if ($_template->getSmarty()->debugging) {
-						$_template->getSmarty()->getDebug()->start_cache($_template);
-					}
-					if ($this->handler->process($_template, $this) === false) {
-						$this->valid = false;
-					} else {
-						$this->processed = true;
-					}
-					if ($_template->getSmarty()->debugging) {
-						$_template->getSmarty()->getDebug()->end_cache($_template);
-					}
-				} else {
-					$this->is_locked = true;
-					continue;
-				}
-			} else {
-				return $this->valid;
-			}
-			if ($this->valid && $_template->caching === \Smarty\Smarty::CACHING_LIFETIME_SAVED
-				&& $_template->getCached()->cache_lifetime >= 0
-				&& (time() > ($_template->getCached()->timestamp + $_template->getCached()->cache_lifetime))
-			) {
-				$this->valid = false;
-			}
-			if ($_template->getSmarty()->cache_locking) {
-				if (!$this->valid) {
-					$this->handler->acquireLock($_template->getSmarty(), $this);
-				} elseif ($this->is_locked) {
-					$this->handler->releaseLock($_template->getSmarty(), $this);
-				}
-			}
-			return $this->valid;
-		}
-		return $this->valid;
-	}
-
-	/**
-	 * Process cached template
-	 *
-	 * @param Template $_template template object
-	 * @param bool $update flag if called because cache update
-	 */
-	private function process(Template $_template, $update = false) {
-		if ($this->handler->process($_template, $this, $update) === false) {
-			$this->valid = false;
-		}
-		if ($this->valid) {
-			$this->processed = true;
-		} else {
-			$this->processed = false;
-		}
+		return $this->getCodeFrame() && $this->getCodeFrame()->isFresh($_template);
 	}
 
 	/**
@@ -235,13 +206,13 @@ class Cached extends GeneratedPhpFile {
 	 *
 	 * @param Template $_template template object
 	 *
-	 * @return string|false content
-	 */
-	public function readCache(Template $_template) {
+	 * @return string content
+s	 */
+	private function readCache(Template $_template) {
 		if (!$_template->getSource()->handler->recompiled) {
 			return $this->handler->retrieveCachedContent($_template);
 		}
-		return false;
+		return '';
 	}
 
 	/**
@@ -251,7 +222,7 @@ class Cached extends GeneratedPhpFile {
 	 *
 	 * @return bool success
 	 */
-	public function writeCache(Template $_template, $content) {
+	private function writeCache(Template $_template, $content) {
 		if (!$_template->getSource()->handler->recompiled) {
 			if ($this->handler->storeCachedContent($_template, $content)) {
 				$this->content = null;
@@ -259,7 +230,6 @@ class Cached extends GeneratedPhpFile {
 				$this->exists = true;
 				$this->valid = true;
 				$this->cache_lifetime = $_template->cache_lifetime;
-				$this->processed = false;
 				if ($_template->getSmarty()->cache_locking) {
 					$this->handler->releaseLock($_template->getSmarty(), $this);
 				}
@@ -269,7 +239,6 @@ class Cached extends GeneratedPhpFile {
 			$this->timestamp = false;
 			$this->exists = false;
 			$this->valid = false;
-			$this->processed = false;
 		}
 		return false;
 	}
@@ -278,49 +247,71 @@ class Cached extends GeneratedPhpFile {
 	 * Cache was invalid , so render from compiled and write to cache
 	 *
 	 * @param Template $_template
-	 * @param bool $no_output_filter
 	 *
 	 * @throws \Smarty\Exception
 	 */
-	private function updateCache(Template $_template, $no_output_filter) {
-		ob_start();
+	private function saveCache(Template $_template) {
+
+		$content = $_template->getCompiled()->fetch();
 
-		$_template->getCompiled()->render($_template);
 		if ($_template->getSmarty()->debugging) {
 			$_template->getSmarty()->getDebug()->start_cache($_template);
 		}
-		$this->removeNoCacheHash($_template, $no_output_filter);
-		$compile_check = (int)$_template->compile_check;
-		$_template->compile_check = \Smarty\Smarty::COMPILECHECK_OFF;
+
+		$content = $this->removeNoCacheHash($content, $_template);
+
+		$codeframe = (new \Smarty\Compiler\CodeFrame($_template))->create(
+			$content,
+			'',
+			true
+		);
+		$this->writeCache($_template, $codeframe);
+
 		if ($_template->_isSubTpl()) {
-			$_template->getCompiled()->unifunc = $_template->parent->getCompiled()->unifunc;
+			// @TODO why was this needed? unifunc is no longer used, so this won't work anymore.
+//			$_template->getCompiled()->unifunc = $_template->parent->getCompiled()->unifunc;
 		}
-		if (!$_template->getCached()->processed) {
-			$_template->getCached()->process($_template, true);
-		}
-		$_template->compile_check = $compile_check;
-		$this->renderTemplateCode($_template);
+
 		if ($_template->getSmarty()->debugging) {
 			$_template->getSmarty()->getDebug()->end_cache($_template);
 		}
 	}
 
+	private function getCompiledUid(): string {
+		return hash(
+			\PHP_VERSION_ID < 80100 ? 'sha256' : 'xxh128',
+			join('_', [
+				$this->getSource()->uid,
+//				$this->template->compile_id, //@TODO
+				$this->getSource()->getSmarty()->config_overwrite ? '1' : '0',
+				$this->getSource()->getSmarty()->config_booleanize ? '1' : '0',
+				$this->getSource()->getSmarty()->config_read_hidden ? '1' : '0',
+				$this->getSource()->getSmarty()->caching ? '1' : '0',
+			])
+		);
+	}
+
+	private function getCodeFrameClassname() {
+		return '__Cache_' . $this->getCompiledUid(); //@TODO use value from properties
+	}
+
 	/**
 	 * Sanitize content and write it to cache resource
 	 *
+	 * @param string $content
 	 * @param Template $_template
-	 * @param bool $no_output_filter
 	 *
-	 * @throws \Smarty\Exception
+	 * @return string
 	 */
-	private function removeNoCacheHash(Template $_template, $no_output_filter) {
+	private function removeNoCacheHash(string $content, Template $_template): string {
+
 		$php_pattern = '/(<%|%>|<\?php|<\?|\?>|<script\s+language\s*=\s*[\"\']?\s*php\s*[\"\']?\s*>)/';
-		$content = ob_get_clean();
+
 		$hash_array = $this->hashes;
 		$hash_array[$_template->getCompiled()->nocache_hash] = true;
 		$hash_array = array_keys($hash_array);
 		$nocache_hash = '(' . implode('|', $hash_array) . ')';
-		$_template->getCached()->setNocacheCode(false);
+
 		// get text between non-cached items
 		$cache_split =
 			preg_split(
@@ -357,18 +348,11 @@ class Cached extends GeneratedPhpFile {
 				$content .= $curr_split;
 			}
 			if (isset($cache_parts[0][$curr_idx])) {
-				$_template->getCached()->setNocacheCode(true);
 				$content .= $cache_parts[2][$curr_idx];
 			}
 		}
-		if (
-			!$no_output_filter
-			&& !$_template->getCached()->getNocacheCode()
-		) {
-			$content = $_template->getSmarty()->runOutputFilters($content, $_template);
-		}
-		// write cache file content
-		$_template->writeCachedContent($content);
+
+		return $content;
 	}
 
 	/**
@@ -378,11 +362,12 @@ class Cached extends GeneratedPhpFile {
 		return $this->source;
 	}
 
-	/**
-	 * @param Source|null $source
-	 */
-	public function setSource(?Source $source): void {
-		$this->source = $source;
+	private function runCodeFrame(Template $_smarty_tpl, string $code) {
+
+
+		ob_start();
+		eval('?>' . $code);
+		return ob_get_clean();
 	}
 
 }

src/Template/Compiled.php

@@ -2,13 +2,15 @@
 
 namespace Smarty\Template;
 
+use Smarty\Exception;
+use Smarty\Resource\BasePlugin;
+use Smarty\Smarty;
 use Smarty\Template;
 
 /**
  * Represents a compiled version of a template or config file.
- * @author     Rodney Rehm
  */
-class Compiled extends GeneratedPhpFile {
+class Compiled {
 
 	/**
 	 * nocache hash
@@ -27,218 +29,303 @@ class Compiled extends GeneratedPhpFile {
 	public $includes = [];
 
 	/**
-	 * get a Compiled Object of this source
-	 *
-	 * @param Template $_template template object
-	 *
-	 * @return Compiled compiled object
+	 * @var Template
 	 */
-	public static function load($_template) {
-		$compiled = new Compiled();
-		if ($_template->getSource()->handler->supportsCompiledTemplates()) {
-			$compiled->populateCompiledFilepath($_template);
-		}
-		return $compiled;
+	private $template;
+
+	/**
+	 * flag if template does contain nocache code sections
+	 *
+	 * @var bool
+	 */
+	private $has_nocache_code = false;
+
+	/**
+	 * @var false|int
+	 */
+	private $timestamp = null;
+
+	/**
+	 * resource file dependency
+	 *
+	 * @var array
+	 */
+	public $file_dependency = [];
+
+	/**
+	 * @var null|\Smarty\CodeFrame\Compiled
+	 */
+	private $codeFrame = null;
+
+	/**
+	 * @return bool
+	 */
+	public function getNocacheCode(): bool {
+		return $this->has_nocache_code;
 	}
 
 	/**
-	 * populate Compiled Object with compiled filepath
-	 *
-	 * @param Template $_template template object
-	 **/
-	private function populateCompiledFilepath(Template $_template) {
-		$source = $_template->getSource();
-		$smarty = $_template->getSmarty();
-		$this->filepath = $smarty->getCompileDir();
-		if (isset($_template->compile_id)) {
-			$this->filepath .= preg_replace('![^\w]+!', '_', $_template->compile_id) .
-				($smarty->use_sub_dirs ? DIRECTORY_SEPARATOR : '^');
-		}
-		// if use_sub_dirs, break file into directories
-		if ($smarty->use_sub_dirs) {
-			$this->filepath .= $source->uid[0] . $source->uid[1] . DIRECTORY_SEPARATOR . $source->uid[2] .
-				$source->uid[3] . DIRECTORY_SEPARATOR . $source->uid[4] . $source->uid[5] .
-				DIRECTORY_SEPARATOR;
-		}
-		$this->filepath .= $source->uid . '_';
-		if ($source->isConfig) {
-			$this->filepath .= (int)$smarty->config_read_hidden + (int)$smarty->config_booleanize * 2 +
-				(int)$smarty->config_overwrite * 4;
-		} else {
-			$this->filepath .= (int)$smarty->merge_compiled_includes + (int)$smarty->escape_html * 2 +
-				(($smarty->merge_compiled_includes && $source->type === 'extends') ? 4 : 0);
-		}
-		$this->filepath .= '.' . $source->type;
-		$basename = $source->handler->getBasename($source);
-		if (!empty($basename)) {
-			$this->filepath .= '.' . $basename;
-		}
-		if ($_template->caching) {
-			$this->filepath .= '.cache';
-		}
-		$this->filepath .= '.php';
-		$this->timestamp = $this->exists = is_file($this->filepath);
-		if ($this->exists) {
-			$this->timestamp = filemtime($this->filepath);
-		}
+	 * @param bool $has_nocache_code
+	 */
+	public function setNocacheCode(bool $has_nocache_code): void {
+		$this->has_nocache_code = $has_nocache_code;
 	}
 
 	/**
-	 * render compiled template code
-	 *
-	 * @param Template $_template
+	 * @param Template $template
+	 */
+	public function __construct(Template $template) {
+		$this->template = $template;
+	}
+
+	/**
+	 * Return compiled template code
 	 *
 	 * @return string
-	 * @throws \Smarty\Exception
+	 * @throws Exception
+	 * @throws \Exception
 	 */
-	public function render(Template $_template) {
+	public function fetch(): string {
 		// checks if template exists
-		if (!$_template->getSource()->exists) {
-			$type = $_template->getSource()->isConfig ? 'config' : 'template';
-			throw new \Smarty\Exception("Unable to load {$type} '{$_template->getSource()->type}:{$_template->getSource()->name}'");
+		$source = $this->template->getSource();
+		if (!$source->exists) {
+			$type = $source->isConfig ? 'config' : 'template';
+			throw new Exception("Unable to load $type '$source->type:$source->name'");
 		}
-		if ($_template->getSmarty()->debugging) {
-			$_template->getSmarty()->getDebug()->start_render($_template);
-		}
-		if (!$this->processed) {
-			$this->process($_template);
+		if ($this->template->getSmarty()->debugging) {
+			$this->template->getSmarty()->getDebug()->start_render($this->template);
 		}
 
-		$_template->getCached()->file_dependency =
-			array_merge($_template->getCached()->file_dependency, $this->file_dependency);
+		$codeFrame = $this->getCodeFrame();
 
-		$_template->getRenderedTemplateCode($this->unifunc);
+		// @TODO Can't Cached handle this? Maybe introduce an event to decouple.
+		$this->template->getCached()->file_dependency =
+			array_merge($this->template->getCached()->file_dependency, $this->file_dependency);
 
-		if ($_template->caching && $this->getNocacheCode()) {
-			$_template->getCached()->hashes[$this->nocache_hash] = true;
-		}
-		if ($_template->getSmarty()->debugging) {
-			$_template->getSmarty()->getDebug()->end_render($_template);
-		}
-	}
+		$level = ob_get_level();
 
-	/**
-	 * load compiled template or compile from source
-	 *
-	 * @param Template $_smarty_tpl do not change variable name, is used by compiled template
-	 *
-	 * @throws Exception
-	 */
-	private function process(Template $_smarty_tpl) {
-		$source = $_smarty_tpl->getSource();
-		$smarty = $_smarty_tpl->getSmarty();
-		if ($source->handler->recompiled) {
-			$source->handler->process($_smarty_tpl);
-		} else {
-			if (!$this->exists || $smarty->force_compile
-				|| ($_smarty_tpl->compile_check && $source->getTimeStamp() > $this->getTimeStamp())
-			) {
-				$this->compileTemplateSource($_smarty_tpl);
-				$compileCheck = $_smarty_tpl->compile_check;
-				$_smarty_tpl->compile_check = \Smarty\Smarty::COMPILECHECK_OFF;
-				$this->loadCompiledTemplate($_smarty_tpl);
-				$_smarty_tpl->compile_check = $compileCheck;
-			} else {
-				$_smarty_tpl->mustCompile = true;
-				@include $this->filepath;
-				if ($_smarty_tpl->mustCompile) {
-					$this->compileTemplateSource($_smarty_tpl);
-					$compileCheck = $_smarty_tpl->compile_check;
-					$_smarty_tpl->compile_check = \Smarty\Smarty::COMPILECHECK_OFF;
-					$this->loadCompiledTemplate($_smarty_tpl);
-					$_smarty_tpl->compile_check = $compileCheck;
-				}
-			}
-			$this->processed = true;
-		}
-	}
-
-	/**
-	 * compile template from source
-	 *
-	 * @param Template $_template
-	 *
-	 * @throws Exception
-	 */
-	public function compileTemplateSource(Template $_template) {
-		$this->file_dependency = [];
-		$this->includes = [];
-		$this->nocache_hash = null;
-		$this->unifunc = null;
-		// compile locking
-		if ($saved_timestamp = (!$_template->getSource()->handler->recompiled && is_file($this->filepath))) {
-			$saved_timestamp = $this->getTimeStamp();
-			touch($this->filepath);
-		}
-		// compile locking
 		try {
-			// call compiler
-			$this->write($_template, $_template->getCompiler()->compileTemplate($_template));
+
+			ob_start();
+
+			$codeFrame->renderContent($this->template);
+
+			// @TODO Can't Cached handle this? Maybe introduce an event to decouple and remove the $this->caching property.
+			if ($this->template->caching && $this->getNocacheCode()) {
+				$this->template->getCached()->hashes[$this->nocache_hash] = true;
+			}
+
+			if ($this->template->getSmarty()->debugging) {
+				$this->template->getSmarty()->getDebug()->end_render($this->template);
+			}
+			return $this->template->getSmarty()->runOutputFilters(ob_get_clean(), $this->template);
+
 		} catch (\Exception $e) {
-			// restore old timestamp in case of error
-			if ($saved_timestamp && is_file($this->filepath)) {
-				touch($this->filepath, $saved_timestamp);
+			while (ob_get_level() > $level) {
+				ob_end_clean();
 			}
 			throw $e;
 		}
 	}
 
 	/**
-	 * Write compiled code by handler
+	 * Loads compiled template (or compile from source and (usually) store the compiled version).
+	 * Should only be called when code frame class doest NOT exist yet.
 	 *
-	 * @param Template $_template template object
-	 * @param string $code compiled code
-	 *
-	 * @return bool success
-	 * @throws \Smarty\Exception
+	 * @throws Exception
 	 */
-	public function write(Template $_template, $code) {
-		if (!$_template->getSource()->handler->recompiled) {
-			if ($_template->getSmarty()->writeFile($this->filepath, $code) === true) {
-				$this->timestamp = $this->exists = is_file($this->filepath);
-				if ($this->exists) {
-					$this->timestamp = filemtime($this->filepath);
-					return true;
+	private function getCodeFrame(): \Smarty\CodeFrame\Compiled {
+
+		if ($this->codeFrame !== null) {
+			return $this->codeFrame;
+		}
+
+		$properties = [];
+
+		if ($this->template->getSource()->handler->recompiled) {
+			$properties = eval('?>' . $this->doCompile());
+		} elseif (file_exists($this->getFilePath())) {
+			$properties = @include $this->getFilePath();
+		}
+
+		if (empty($properties) || !$this->isFresh($properties)) {
+			$content = $this->doCompile();
+			$this->write($content);
+			return $this->getCodeFrame(); // recursion
+		}
+
+		return new $properties['codeFrameClass']();
+	}
+
+	/**
+	 * This function is executed automatically when a generated file is included
+	 * - Decode saved properties
+	 * - Check if file is valid
+	 *
+	 * @param array $properties
+	 *
+	 * @return bool flag if compiled or cache file is valid
+	 * @throws Exception
+	 */
+	public function isFresh(array $properties): bool {
+
+		if (Smarty::SMARTY_VERSION !== $properties['version']) {
+			return false;
+		}
+
+		if ($this->template->getSmarty()->getCompileCheck()) {
+			if (!$this->checkFileDependencies($properties['file_dependency'])) {
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * @param array $file_dependency
+	 *
+	 * @return bool
+	 * @throws Exception
+	 */
+	protected function checkFileDependencies(array $file_dependency): bool {
+		// check file dependencies at compiled code
+		foreach ($file_dependency as $_file_to_check) {
+			if ($_file_to_check[2] === 'file') {
+				if ($this->template->getSource()->filepath === $_file_to_check[0]) {
+					// do not recheck current template
+					continue;
+				}
+				// file and php types can be checked without loading the respective resource handlers
+				$mtime = is_file($_file_to_check[0]) ? filemtime($_file_to_check[0]) : false;
+			} else {
+				$handler = BasePlugin::load($this->template->getSmarty(), $_file_to_check[2]);
+				if ($handler->checkTimestamps()) {
+					$source = Source::load($this->template, $this->template->getSmarty(), $_file_to_check[0]);
+					$mtime = $source->getTimeStamp();
+				} else {
+					continue;
 				}
 			}
-			return false;
+			if ($mtime === false || $mtime > $_file_to_check[1]) {
+				return false;
+			}
 		}
 		return true;
 	}
 
 	/**
-	 * Read compiled content from handler
+	 * compile template from source
 	 *
-	 * @param Template $_template template object
-	 *
-	 * @return string content
+	 * @throws Exception
 	 */
-	public function read(Template $_template) {
-		if (!$_template->getSource()->handler->recompiled) {
-			return file_get_contents($this->filepath);
+	public function compileAndWrite(): string {
+
+		$_template = $this->template;
+
+		$filepath = $this->getFilePath();
+
+		// compile locking
+		if ($saved_timestamp = (!$_template->getSource()->handler->recompiled && is_file($filepath))) {
+			$saved_timestamp = $this->getTimeStamp();
+			touch($filepath);
 		}
-		return false;
+		// compile locking
+		try {
+			// call compiler
+			$this->write($content = $this->doCompile());
+
+		} catch (\Exception $e) {
+			// restore old timestamp in case of error
+			if ($saved_timestamp && is_file($filepath)) {
+				touch($filepath, $saved_timestamp);
+			}
+			throw $e;
+		}
+
+		return $content;
 	}
 
 	/**
-	 * Load fresh compiled template by including the PHP file
-	 * HHVM requires a workaround because of a PHP incompatibility
+	 * Do the actual compiling.
 	 *
-	 * @param \Smarty\Template $_smarty_tpl do not change variable name, is used by compiled template
+	 * @return string
+	 * @throws Exception
 	 */
-	private function loadCompiledTemplate(Template $_smarty_tpl) {
-		if (function_exists('opcache_invalidate')
-			&& (!function_exists('ini_get') || strlen(ini_get("opcache.restrict_api")) < 1)
-		) {
-			opcache_invalidate($this->filepath, true);
-		} elseif (function_exists('apc_compile_file')) {
-			apc_compile_file($this->filepath);
+	private function doCompile(): string {
+		$this->file_dependency = [];
+		$this->includes = [];
+		$this->nocache_hash = null;
+
+		$level = ob_get_level();
+
+		try {
+			$result = $this->template->getCompiler()->compileTemplate($this->template);
+		} catch (\Exception $e) {
+			// close output buffers that were left open because of the exception
+			while (ob_get_level() > $level) {
+				ob_end_clean();
+			}
+			throw $e;
 		}
-		if (defined('HHVM_VERSION')) {
-			eval('?>' . file_get_contents($this->filepath));
-		} else {
-			include $this->filepath;
+
+		$this->timestamp = time();
+		return $result;
+	}
+
+	/**
+	 * Write compiled code by handler
+	 *
+	 * @param string $code compiled code
+	 *
+	 * @return void
+	 * @throws Exception
+	 */
+	private function write(string $code) {
+		if (!$this->template->getSource()->handler->recompiled) {
+			$filePath = $this->getFilePath();
+			if ($this->template->getSmarty()->writeFile($filePath, $code) === true) {
+				$this->timestamp = is_file($filePath) ? filemtime($filePath) : false;
+			}
 		}
 	}
 
+	private function getFilePath(): string {
+
+		$source = $this->template->getSource();
+		$smarty = $this->template->getSmarty();
+
+		$prefix = $smarty->getCompileDir() . $source->uid[0] . $source->uid[1];
+
+		return $prefix . DIRECTORY_SEPARATOR . join('_', [
+			$source->type,
+			$source->getBasename(),
+			$this->getCompiledUid()
+		]) . '.php';
+	}
+
+	private function getCompiledUid(): string {
+		return hash(
+			PHP_VERSION_ID < 80100 ? 'sha256' : 'xxh128',
+			join('_', [
+				$this->template->getSource()->uid,
+				$this->template->compile_id,
+				$this->template->getSmarty()->escape_html ? '1' : '0',
+				$this->template->caching ? '1' : '0',
+			])
+		);
+	}
+
+	/**
+	 * Get compiled time stamp or null if there is no compiled file
+	 *
+	 * @return int|null
+	 */
+	public function getTimeStamp(): ?int {
+		if ($this->timestamp === null && file_exists($this->getFilePath())) {
+			$this->timestamp = filemtime($this->getFilePath());
+		}
+		return $this->timestamp;
+	}
+
 }

src/Template/GeneratedPhpFile.php

@@ -1,93 +0,0 @@
-<?php
-
-namespace Smarty\Template;
-
-/**
- * Base class for generated PHP files, such as compiled and cached versions of templates and config files.
- * @author     Rodney Rehm
- */
-abstract class GeneratedPhpFile {
-
-	/**
-	 * Compiled Filepath
-	 *
-	 * @var string
-	 */
-	public $filepath = null;
-
-	/**
-	 * Compiled Timestamp
-	 *
-	 * @var int|bool
-	 */
-	public $timestamp = false;
-
-	/**
-	 * Compiled Existence
-	 *
-	 * @var boolean
-	 */
-	public $exists = false;
-
-	/**
-	 * Template Compile Id (\Smarty\Template::$compile_id)
-	 *
-	 * @var string
-	 */
-	public $compile_id = null;
-
-	/**
-	 * Compiled Content Loaded
-	 *
-	 * @var boolean
-	 */
-	public $processed = false;
-
-	/**
-	 * unique function name for compiled template code
-	 *
-	 * @var string
-	 */
-	public $unifunc = '';
-
-	/**
-	 * flag if template does contain nocache code sections
-	 *
-	 * @var bool
-	 */
-	private $has_nocache_code = false;
-
-	/**
-	 * resource file dependency
-	 *
-	 * @var array
-	 */
-	public $file_dependency = [];
-
-	/**
-	 * Get compiled time stamp
-	 *
-	 * @return int
-	 */
-	public function getTimeStamp() {
-		if ($this->exists && !$this->timestamp) {
-			$this->timestamp = filemtime($this->filepath);
-		}
-		return $this->timestamp;
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function getNocacheCode(): bool {
-		return $this->has_nocache_code;
-	}
-
-	/**
-	 * @param bool $has_nocache_code
-	 */
-	public function setNocacheCode(bool $has_nocache_code): void {
-		$this->has_nocache_code = $has_nocache_code;
-	}
-
-}

src/Template/Source.php

@@ -234,4 +234,14 @@ class Source {
 		return $this->smarty;
 	}
 
+	/**
+	 * Determine basename for compiled filename
+	 *
+	 * @return string                 resource's basename
+	 */
+	public function getBasename()
+	{
+		return $this->handler->getBasename($this);
+	}
+
 }

src/TemplateBase.php

@@ -38,13 +38,6 @@ abstract class TemplateBase extends Data {
 	 */
 	public $caching = \Smarty\Smarty::CACHING_OFF;
 
-	/**
-	 * check template for modifications?
-	 *
-	 * @var int
-	 */
-	public $compile_check = \Smarty\Smarty::COMPILECHECK_ON;
-
 	/**
 	 * cache lifetime in seconds
 	 *
@@ -66,87 +59,8 @@ abstract class TemplateBase extends Data {
 	 */
 	public $_var_stack = null;
 
-	/**
-	 * @var Debug
-	 */
-	private $debug;
 
-	/**
-	 * Registers object to be used in templates
-	 *
-	 * @param string $object_name
-	 * @param object $object the referenced PHP object to register
-	 * @param array $allowed_methods_properties list of allowed methods (empty = all)
-	 * @param bool $format smarty argument format, else traditional
-	 * @param array $block_methods list of block-methods
-	 *
-	 * @return \Smarty|\Smarty\Template
-	 * @throws \Smarty\Exception
-	 * @link https://www.smarty.net/docs/en/api.register.object.tpl
-	 *
-	 * @api  Smarty::registerObject()
-	 */
-	public function registerObject(
-		$object_name,
-		$object,
-		$allowed_methods_properties = [],
-		$format = true,
-		$block_methods = []
-	) {
-		$smarty = $this->getSmarty();
-		// test if allowed methods callable
-		if (!empty($allowed_methods_properties)) {
-			foreach ((array)$allowed_methods_properties as $method) {
-				if (!is_callable([$object, $method]) && !property_exists($object, $method)) {
-					throw new Exception("Undefined method or property '$method' in registered object");
-				}
-			}
-		}
-		// test if block methods callable
-		if (!empty($block_methods)) {
-			foreach ((array)$block_methods as $method) {
-				if (!is_callable([$object, $method])) {
-					throw new Exception("Undefined method '$method' in registered object");
-				}
-			}
-		}
-		// register the object
-		$smarty->registered_objects[$object_name] =
-			[$object, (array)$allowed_methods_properties, (boolean)$format, (array)$block_methods];
-		return $this;
-	}
 
-	/**
-	 * Registers plugin to be used in templates
-	 *
-	 * @param string $object_name name of object
-	 *
-	 * @return TemplateBase
-	 * @api  Smarty::unregisterObject()
-	 * @link https://www.smarty.net/docs/en/api.unregister.object.tpl
-	 *
-	 */
-	public function unregisterObject($object_name) {
-		$smarty = $this->getSmarty();
-		if (isset($smarty->registered_objects[$object_name])) {
-			unset($smarty->registered_objects[$object_name]);
-		}
-		return $this;
-	}
-
-	/**
-	 * @return int
-	 */
-	public function getCompileCheck(): int {
-		return $this->compile_check;
-	}
-
-	/**
-	 * @param int $compile_check
-	 */
-	public function setCompileCheck($compile_check) {
-		$this->compile_check = (int)$compile_check;
-	}
 
 	/**
 	 * @param int $caching
@@ -176,264 +90,6 @@ abstract class TemplateBase extends Data {
 		$this->cache_id = $cache_id;
 	}
 
-	/**
-	 * creates a data object
-	 *
-	 * @param Data|null $parent next higher level of Smarty
-	 *                                                                                     variables
-	 * @param null $name optional data block name
-	 *
-	 * @return Data data object
-	 * @throws Exception
-	 * @api  Smarty::createData()
-	 * @link https://www.smarty.net/docs/en/api.create.data.tpl
-	 *
-	 */
-	public function createData(Data $parent = null, $name = null) {
-		/* @var Smarty $smarty */
-		$smarty = $this->getSmarty();
-		$dataObj = new Data($parent, $smarty, $name);
-		if ($smarty->debugging) {
-			$smarty->getDebug()->register_data($dataObj);
-		}
-		return $dataObj;
-	}
-
-	/**
-	 * return name of debugging template
-	 *
-	 * @return string
-	 * @api Smarty::getDebugTemplate()
-	 *
-	 */
-	public function getDebugTemplate() {
-		$smarty = $this->getSmarty();
-		return $smarty->debug_tpl;
-	}
-
-	/**
-	 * @return Debug
-	 */
-	public function getDebug(): Debug {
-		if (!isset($this->debug)) {
-			$this->debug = new \Smarty\Debug();
-		}
-		return $this->debug;
-	}
-
-
-	/**
-	 * return a reference to a registered object
-	 *
-	 * @param string $object_name object name
-	 *
-	 * @return object
-	 * @throws \Smarty\Exception if no such object is found
-	 * @link https://www.smarty.net/docs/en/api.get.registered.object.tpl
-	 *
-	 * @api  Smarty::getRegisteredObject()
-	 */
-	public function getRegisteredObject($object_name) {
-		$smarty = $this->getSmarty();
-		if (!isset($smarty->registered_objects[$object_name])) {
-			throw new Exception("'$object_name' is not a registered object");
-		}
-		if (!is_object($smarty->registered_objects[$object_name][0])) {
-			throw new Exception("registered '$object_name' is not an object");
-		}
-		return $smarty->registered_objects[$object_name][0];
-	}
-
-	/**
-	 * Get literals
-	 *
-	 * @return array list of literals
-	 * @api Smarty::getLiterals()
-	 *
-	 */
-	public function getLiterals() {
-		$smarty = $this->getSmarty();
-		return (array)$smarty->literals;
-	}
-
-	/**
-	 * Add literals
-	 *
-	 * @param array|string $literals literal or list of literals
-	 *                                                                                  to addto add
-	 *
-	 * @return TemplateBase
-	 * @throws \Smarty\Exception
-	 * @api Smarty::addLiterals()
-	 *
-	 */
-	public function addLiterals($literals = null) {
-		if (isset($literals)) {
-			$this->_setLiterals($this->getSmarty(), (array)$literals);
-		}
-		return $this;
-	}
-
-	/**
-	 * Set literals
-	 *
-	 * @param array|string $literals literal or list of literals
-	 *                                                                                  to setto set
-	 *
-	 * @return TemplateBase
-	 * @throws \Smarty\Exception
-	 * @api Smarty::setLiterals()
-	 *
-	 */
-	public function setLiterals($literals = null) {
-		$smarty = $this->getSmarty();
-		$smarty->literals = [];
-		if (!empty($literals)) {
-			$this->_setLiterals($smarty, (array)$literals);
-		}
-		return $this;
-	}
-
-	/**
-	 * common setter for literals for easier handling of duplicates the
-	 * Smarty::$literals array gets filled with identical key values
-	 *
-	 * @param Smarty $smarty
-	 * @param array $literals
-	 *
-	 * @throws \Smarty\Exception
-	 */
-	private function _setLiterals(Smarty $smarty, $literals) {
-		$literals = array_combine($literals, $literals);
-		$error = isset($literals[$smarty->getLeftDelimiter()]) ? [$smarty->getLeftDelimiter()] : [];
-		$error = isset($literals[$smarty->getRightDelimiter()]) ? $error[] = $smarty->getRightDelimiter() : $error;
-		if (!empty($error)) {
-			throw new Exception(
-				'User defined literal(s) "' . $error .
-				'" may not be identical with left or right delimiter'
-			);
-		}
-		$smarty->literals = array_merge((array)$smarty->literals, (array)$literals);
-	}
-
-	/**
-	 * Registers static classes to be used in templates
-	 *
-	 * @param string $class_name
-	 * @param string $class_impl the referenced PHP class to
-	 *                                                                                    register
-	 *
-	 * @return TemplateBase
-	 * @throws \Smarty\Exception
-	 * @api  Smarty::registerClass()
-	 * @link https://www.smarty.net/docs/en/api.register.class.tpl
-	 *
-	 */
-	public function registerClass($class_name, $class_impl) {
-		$smarty = $this->getSmarty();
-		// test if exists
-		if (!class_exists($class_impl)) {
-			throw new Exception("Undefined class '$class_impl' in register template class");
-		}
-		// register the class
-		$smarty->registered_classes[$class_name] = $class_impl;
-		return $this;
-	}
-
-	/**
-	 * Register config default handler
-	 *
-	 * @param callable $callback class/method name
-	 *
-	 * @return TemplateBase
-	 * @throws Exception              if $callback is not callable
-	 * @api Smarty::registerDefaultConfigHandler()
-	 *
-	 */
-	public function registerDefaultConfigHandler($callback) {
-		$smarty = $this->getSmarty();
-		if (is_callable($callback)) {
-			$smarty->default_config_handler_func = $callback;
-		} else {
-			throw new Exception('Default config handler not callable');
-		}
-		return $this;
-	}
-
-	/**
-	 * Register template default handler
-	 *
-	 * @param callable $callback class/method name
-	 *
-	 * @return TemplateBase
-	 * @throws Exception              if $callback is not callable
-	 * @api Smarty::registerDefaultTemplateHandler()
-	 *
-	 */
-	public function registerDefaultTemplateHandler($callback) {
-		$smarty = $this->getSmarty();
-		if (is_callable($callback)) {
-			$smarty->default_template_handler_func = $callback;
-		} else {
-			throw new Exception('Default template handler not callable');
-		}
-		return $this;
-	}
-
-	/**
-	 * Registers a resource to fetch a template
-	 *
-	 * @param string $name name of resource type
-	 * @param Smarty\Resource\Base $resource_handler instance of Smarty\Resource\Base
-	 *
-	 * @return \Smarty|\Smarty\Template
-	 * @link https://www.smarty.net/docs/en/api.register.resource.tpl
-	 *
-	 * @api  Smarty::registerResource()
-	 */
-	public function registerResource($name, \Smarty\Resource\BasePlugin $resource_handler) {
-		$smarty = $this->getSmarty();
-		$smarty->registered_resources[$name] = $resource_handler;
-		return $this;
-	}
-
-	/**
-	 * Unregisters a resource to fetch a template
-	 *
-	 * @param string $type name of resource type
-	 *
-	 * @return TemplateBase
-	 * @api  Smarty::unregisterResource()
-	 * @link https://www.smarty.net/docs/en/api.unregister.resource.tpl
-	 *
-	 */
-	public function unregisterResource($type) {
-		$smarty = $this->getSmarty();
-		if (isset($smarty->registered_resources[$type])) {
-			unset($smarty->registered_resources[$type]);
-		}
-		return $this;
-	}
-
-	/**
-	 * set the debug template
-	 *
-	 * @param string $tpl_name
-	 *
-	 * @return TemplateBase
-	 * @throws Exception if file is not readable
-	 * @api Smarty::setDebugTemplate()
-	 *
-	 */
-	public function setDebugTemplate($tpl_name) {
-		$smarty = $this->getSmarty();
-		if (!is_readable($tpl_name)) {
-			throw new Exception("Unknown file '{$tpl_name}'");
-		}
-		$smarty->debug_tpl = $tpl_name;
-		return $this;
-	}
-
 
 
 }

tests/PHPUnit_Smarty.php

@@ -482,7 +482,6 @@ KEY `name` (`name`)
      * Return compiled file path
      *
      * @param \Smarty\Template|\Smarty\TemplateBase $tpl        template object
-     * @param bool                                                    $sub        use sub directory flag
      * @param bool                                                    $caching    caching flag
      * @param null|string                                             $compile_id optional compile id
      * @param null|string                                             $name       optional template name
@@ -492,7 +491,7 @@ KEY `name` (`name`)
      * @return string
      * @throws \Exception
      */
-    public function buildCompiledPath(Template $tpl, $sub = true, $caching = false, $compile_id = null,
+    public function buildCompiledPath(Template $tpl, $caching = false, $compile_id = null,
                                                $name = null, $type = null, $dir = null)
     {
         $sep = DIRECTORY_SEPARATOR;
@@ -507,15 +506,12 @@ KEY `name` (`name`)
             $_flag = '_' . ((int) $tpl->getSmarty()->merge_compiled_includes + (int) $tpl->getSmarty()->escape_html * 2);
         }
         $_filepath = $uid . $_flag;
-        // if use_sub_dirs, break file into directories
-        if ($sub) {
-            $_filepath =
-                substr($_filepath, 0, 2) . $sep . substr($_filepath, 2, 2) . $sep . substr($_filepath, 4, 2) . $sep .
-                $_filepath;
-        }
-        $_compile_dir_sep = $sub ? $sep : '^';
+        // break file into directories
+        $_filepath =
+            substr($_filepath, 0, 2) . $sep . $_filepath;
+
         if (isset($_compile_id)) {
-            $_filepath = $_compile_id . $_compile_dir_sep . $_filepath;
+            $_filepath = $_compile_id . $sep . $_filepath;
         }
         // caching token
         if ($caching) {
@@ -541,7 +537,6 @@ KEY `name` (`name`)
      * Return cache file path
      *
      * @param TemplateBase $tpl        template object
-     * @param bool                         $sub        use sub directory flag
      * @param null|string                  $cache_id   optional cache id
      * @param null|string                  $compile_id optional compile id
      * @param null|string                  $name       optional template name
@@ -552,7 +547,7 @@ KEY `name` (`name`)
      * @return string
      * @throws \Exception
      */
-    public function buildCachedPath(TemplateBase $tpl, $sub = true, $cache_id = null, $compile_id = null, $name = null, $type = null,
+    public function buildCachedPath(TemplateBase $tpl, $cache_id = null, $compile_id = null, $name = null, $type = null,
                                     $dir = null, $cacheType = null)
     {
         $cacheType = $cacheType ?? $tpl->getSmarty()->getCachingType();
@@ -565,13 +560,12 @@ KEY `name` (`name`)
                 $sp = $this->buildSourcePath($tpl, $name, $type, $dir);
                 $uid = $this->buildUid($tpl, $sp, $name, $type);
                 $_filepath = sha1($uid . $this->smarty->_joined_template_dir);
-                // if use_sub_dirs, break file into directories
-                if ($sub) {
-                    $_filepath =
-                        substr($_filepath, 0, 2) . $sep . substr($_filepath, 2, 2) . $sep . substr($_filepath, 4, 2) .
-                        $sep . $_filepath;
-                }
-                $_compile_dir_sep = $sub ? $sep : '^';
+                // break file into directories
+
+                $_filepath =
+                    substr($_filepath, 0, 2) . $sep . $_filepath;
+
+                $_compile_dir_sep = $sep;
                 if (isset($_cache_id)) {
                     $_cache_id = str_replace('|', $_compile_dir_sep, $_cache_id) . $_compile_dir_sep;
                 } else {

tests/UnitTests/A_2/UndefinedTemplateVar/templates_c/.gitignore

@@ -1,2 +0,0 @@
-# Ignore anything in here, but keep this directory
-*

tests/UnitTests/CacheResourceTests/File/CacheResourceFileTest.php

@@ -39,9 +39,9 @@ class CacheResourceFileTest extends CacheResourceTestCommon
     {
         $this->smarty->caching = true;
         $this->smarty->cache_lifetime = 1000;
-        $this->smarty->setUseSubDirs(true);
+
         $tpl = $this->smarty->createTemplate('helloworld.tpl');
-        $this->assertEquals($this->buildCachedPath($tpl, true, null, null, 'helloworld.tpl', $type = 'file', $this->smarty->getTemplateDir(0), 'file')
+        $this->assertEquals($this->buildCachedPath($tpl, null, null, 'helloworld.tpl', $type = 'file', $this->smarty->getTemplateDir(0), 'file')
             , $tpl->getCached()->filepath);
     }
 
@@ -52,9 +52,9 @@ class CacheResourceFileTest extends CacheResourceTestCommon
     {
         $this->smarty->caching = true;
         $this->smarty->cache_lifetime = 1000;
-        $this->smarty->setUseSubDirs(true);
+
         $tpl = $this->smarty->createTemplate('helloworld.tpl', 'foo|bar');
-        $this->assertEquals($this->buildCachedPath($tpl, true, 'foo|bar', null, 'helloworld.tpl', $type = 'file', $this->smarty->getTemplateDir(0), 'file')
+        $this->assertEquals($this->buildCachedPath($tpl, 'foo|bar', null, 'helloworld.tpl', $type = 'file', $this->smarty->getTemplateDir(0), 'file')
             , $tpl->getCached()->filepath);
     }
 
@@ -65,9 +65,9 @@ class CacheResourceFileTest extends CacheResourceTestCommon
     {
         $this->smarty->caching = true;
         $this->smarty->cache_lifetime = 1000;
-        $this->smarty->setUseSubDirs(true);
+
         $tpl = $this->smarty->createTemplate('helloworld.tpl', null, 'blar');
-        $this->assertEquals($this->buildCachedPath($tpl, true, null, 'blar', 'helloworld.tpl', $type = 'file', $this->smarty->getTemplateDir(0), 'file')
+        $this->assertEquals($this->buildCachedPath($tpl, null, 'blar', 'helloworld.tpl', $type = 'file', $this->smarty->getTemplateDir(0), 'file')
             , $tpl->getCached()->filepath);
     }
 
@@ -78,9 +78,9 @@ class CacheResourceFileTest extends CacheResourceTestCommon
     {
         $this->smarty->caching = true;
         $this->smarty->cache_lifetime = 1000;
-        $this->smarty->setUseSubDirs(true);
+
         $tpl = $this->smarty->createTemplate('helloworld.tpl', 'foo|bar', 'blar');
-        $this->assertEquals($this->buildCachedPath($tpl, true, 'foo|bar', 'blar', 'helloworld.tpl', $type = 'file', $this->smarty->getTemplateDir(0), 'file')
+        $this->assertEquals($this->buildCachedPath($tpl, 'foo|bar', 'blar', 'helloworld.tpl', $type = 'file', $this->smarty->getTemplateDir(0), 'file')
             , $tpl->getCached()->filepath);
     }
 
@@ -92,7 +92,7 @@ class CacheResourceFileTest extends CacheResourceTestCommon
         $this->cleanCacheDir();
         $this->smarty->caching = true;
         $this->smarty->cache_lifetime = 1000;
-        $this->smarty->setUseSubDirs(true);
+
         $tpl = $this->smarty->createTemplate('helloworld.tpl', 'foo|bar', 'blar');
         $this->writeCachedContent($tpl);
         $this->assertTrue(file_exists($tpl->getCached()->filepath));
@@ -100,14 +100,14 @@ class CacheResourceFileTest extends CacheResourceTestCommon
     }
 
     /**
-     * test cache->clear with cache_id and compile_id
+     * test cache->clear with cache_id
      */
-    public function testClearCacheCacheIdCompileId()
+    public function testClearCacheCacheId()
     {
         $this->smarty->caching = true;
         $this->smarty->cache_lifetime = 1000;
         $this->cleanCacheDir();
-        $this->smarty->setUseSubDirs(false);
+
         $tpl = $this->smarty->createTemplate('helloworld.tpl', 'foo|bar', 'blar');
         $this->writeCachedContent($tpl);
         $tpl2 = $this->smarty->createTemplate('helloworld.tpl', 'foo|bar2', 'blar');
@@ -127,7 +127,7 @@ class CacheResourceFileTest extends CacheResourceTestCommon
     {
         $this->smarty->caching = true;
         $this->smarty->cache_lifetime = 1000;
-        $this->smarty->setUseSubDirs(false);
+
         $this->cleanCacheDir();
         $tpl = $this->smarty->createTemplate('helloworld.tpl', 'foo|bar', 'blar');
         $this->writeCachedContent($tpl);
@@ -148,7 +148,7 @@ class CacheResourceFileTest extends CacheResourceTestCommon
     {
         $this->smarty->caching = true;
         $this->smarty->cache_lifetime = 1000;
-        $this->smarty->setUseSubDirs(true);
+
         $this->cleanCacheDir();
         $tpl = $this->smarty->createTemplate('helloworld.tpl', 'foo|bar', 'blar');
         $this->writeCachedContent($tpl);
@@ -170,7 +170,7 @@ class CacheResourceFileTest extends CacheResourceTestCommon
         $this->smarty->caching = true;
         $this->smarty->cache_lifetime = 1000;
         $this->cleanCacheDir();
-        $this->smarty->setUseSubDirs(false);
+
         $tpl = $this->smarty->createTemplate('helloworld.tpl', 'foo|bar', 'blar');
         $this->writeCachedContent($tpl);
         $tpl2 = $this->smarty->createTemplate('helloworld.tpl', 'foo|bar', 'blar2');
@@ -191,7 +191,7 @@ class CacheResourceFileTest extends CacheResourceTestCommon
         $this->smarty->caching = true;
         $this->smarty->cache_lifetime = 1000;
         $this->cleanCacheDir();
-        $this->smarty->setUseSubDirs(true);
+
         $tpl = $this->smarty->createTemplate('helloworld.tpl', 'foo|bar', 'blar');
         $this->writeCachedContent($tpl);
         $tpl2 = $this->smarty->createTemplate('helloworld.tpl', 'foo|bar', 'blar2');
@@ -211,7 +211,7 @@ class CacheResourceFileTest extends CacheResourceTestCommon
     {
         $this->smarty->caching = true;
         $this->smarty->cache_lifetime = 1000;
-        $this->smarty->setUseSubDirs(false);
+
         $this->cleanCacheDir();
         $tpl = $this->smarty->createTemplate('helloworld.tpl', 'foo|bar', 'blar');
         $this->writeCachedContent($tpl);
@@ -232,7 +232,7 @@ class CacheResourceFileTest extends CacheResourceTestCommon
     {
         $this->smarty->caching = true;
         $this->smarty->cache_lifetime = 1000;
-        $this->smarty->setUseSubDirs(true);
+
         $this->cleanCacheDir();
         $tpl = $this->smarty->createTemplate('helloworld.tpl', 'foo|bar', 'blar');
         $this->writeCachedContent($tpl);
@@ -253,7 +253,7 @@ class CacheResourceFileTest extends CacheResourceTestCommon
     {
         $this->smarty->caching = true;
         $this->smarty->cache_lifetime = 1000;
-        $this->smarty->setUseSubDirs(false);
+
         $this->cleanCacheDir();
         $tpl = $this->smarty->createTemplate('helloworld.tpl', 'foo|bar', 'blar');
         $this->writeCachedContent($tpl);
@@ -274,7 +274,7 @@ class CacheResourceFileTest extends CacheResourceTestCommon
     {
         $this->smarty->caching = true;
         $this->smarty->cache_lifetime = 1000;
-        $this->smarty->setUseSubDirs(true);
+
         $this->cleanCacheDir();
         $tpl = $this->smarty->createTemplate('helloworld.tpl', 'foo|bar', 'blar');
         $this->writeCachedContent($tpl);
@@ -295,7 +295,7 @@ class CacheResourceFileTest extends CacheResourceTestCommon
     {
         $this->smarty->caching = true;
         $this->smarty->cache_lifetime = 1000;
-        $this->smarty->setUseSubDirs(false);
+
         $this->cleanCacheDir();
         $tpl = $this->smarty->createTemplate('helloworld.tpl');
         $this->writeCachedContent($tpl);
@@ -320,7 +320,7 @@ class CacheResourceFileTest extends CacheResourceTestCommon
     {
         $this->smarty->caching = true;
         $this->smarty->cache_lifetime = 1000;
-        $this->smarty->setUseSubDirs(true);
+
         $this->cleanCacheDir();
         $tpl = $this->smarty->createTemplate('helloworld.tpl');
         $this->writeCachedContent($tpl);
@@ -376,8 +376,8 @@ class CacheResourceFileTest extends CacheResourceTestCommon
     }
 
 
-    private function writeCachedContent($tpl)
+    protected function writeCachedContent($tpl, string $string = "echo 'hello world';\n")
     {
-        $tpl->writeCachedContent("echo 'hello world';\n");
+	    $this->smarty->getCacheResource()->storeCachedContent($tpl, $string);
     }
 }

tests/UnitTests/CacheResourceTests/_shared/CacheResourceTestCommon.php

@@ -43,7 +43,6 @@ abstract class CacheResourceTestCommon extends PHPUnit_Smarty
     {
         $this->smarty->caching = true;
         $this->smarty->cache_lifetime = 1000;
-        $this->smarty->setUseSubDirs(true);
         $tpl = $this->smarty->createTemplate('helloworld.tpl');
         $this->assertEquals($this->buildCachedPath($tpl), $tpl->getCached()->filepath);
     }
@@ -56,7 +55,7 @@ abstract class CacheResourceTestCommon extends PHPUnit_Smarty
         $this->smarty->caching = true;
         $this->smarty->cache_lifetime = 1000;
         $tpl = $this->smarty->createTemplate('helloworld.tpl', 'foo|bar');
-        $this->assertEquals($this->buildCachedPath($tpl, true, 'foo|bar'), $tpl->getCached()->filepath);
+        $this->assertEquals($this->buildCachedPath($tpl, 'foo|bar'), $tpl->getCached()->filepath);
     }
 
     /**
@@ -67,7 +66,7 @@ abstract class CacheResourceTestCommon extends PHPUnit_Smarty
         $this->smarty->caching = true;
         $this->smarty->cache_lifetime = 1000;
         $tpl = $this->smarty->createTemplate('helloworld.tpl', null, 'blar');
-        $this->assertEquals($this->buildCachedPath($tpl, true, null, 'blar'), $tpl->getCached()->filepath);
+        $this->assertEquals($this->buildCachedPath($tpl, null, 'blar'), $tpl->getCached()->filepath);
     }
 
     /**
@@ -78,9 +77,15 @@ abstract class CacheResourceTestCommon extends PHPUnit_Smarty
         $this->smarty->caching = true;
         $this->smarty->cache_lifetime = 1000;
         $tpl = $this->smarty->createTemplate('helloworld.tpl', 'foo|bar', 'blar');
-        $this->assertEquals($this->buildCachedPath($tpl, true, 'foo|bar', 'blar'), $tpl->getCached()->filepath);
+        $this->assertEquals($this->buildCachedPath($tpl, 'foo|bar', 'blar'), $tpl->getCached()->filepath);
     }
 
+	private function getCachedContent(Smarty\Template $tpl) {
+		ob_start();
+		$this->smarty->getCacheResource()->process($tpl);
+		return ob_get_clean();
+	}
+
     /**
      * test cache->clear_all with cache_id and compile_id
      */
@@ -90,8 +95,8 @@ abstract class CacheResourceTestCommon extends PHPUnit_Smarty
         $this->smarty->caching = true;
         $this->smarty->cache_lifetime = 1000;
         $tpl = $this->smarty->createTemplate('helloworld.tpl', 'foo|bar', 'blar');
-        $tpl->writeCachedContent('hello world');
-        $this->assertEquals('hello world', $tpl->getCachedContent());
+        $this->writeCachedContent($tpl, 'hello world');
+        $this->assertEquals('hello world', $this->getCachedContent($tpl));
         // Custom CacheResources may return -1 if they can't tell the number of deleted elements
         //$this->assertEquals(-1, $this->smarty->clearAllCache());
     }
@@ -106,21 +111,21 @@ abstract class CacheResourceTestCommon extends PHPUnit_Smarty
         $this->smarty->clearAllCache();
         // create and cache templates
         $tpl = $this->smarty->createTemplate('helloworld.tpl', 'foo|bar', 'blar');
-        $tpl->writeCachedContent('hello world 1');
+        $this->writeCachedContent($tpl, 'hello world 1');
         $tpl2 = $this->smarty->createTemplate('helloworld.tpl', 'foo|bar2', 'blar');
-        $tpl2->writeCachedContent('hello world 2');
+        $this->writeCachedContent($tpl2, 'hello world 2');
         $tpl3 = $this->smarty->createTemplate('helloworld2.tpl', 'foo|bar', 'blar');
-        $tpl3->writeCachedContent('hello world 3');
+        $this->writeCachedContent($tpl3, 'hello world 3');
         // test cached content
-        $this->assertEquals('hello world 1', $tpl->getCachedContent());
-        $this->assertEquals('hello world 2', $tpl2->getCachedContent());
-        $this->assertEquals('hello world 3', $tpl3->getCachedContent());
+        $this->assertEquals('hello world 1', $this->getCachedContent($tpl));
+        $this->assertEquals('hello world 2', $this->getCachedContent($tpl2));
+        $this->assertEquals('hello world 3', $this->getCachedContent($tpl3));
         // test number of deleted caches
         $this->doClearCacheAssertion(2, $this->smarty->clearCache(null, 'foo|bar'));
         // test that caches are deleted properly
-        $this->assertNull($tpl->getCachedContent());
-        $this->assertEquals('hello world 2', $tpl2->getCachedContent());
-        $this->assertNull($tpl3->getCachedContent());
+        $this->assertEquals('', $this->getCachedContent($tpl));
+        $this->assertEquals('hello world 2', $this->getCachedContent($tpl2));
+        $this->assertEquals('', $this->getCachedContent($tpl3));
     }
 
     public function testClearCacheCacheIdCompileId2()
@@ -130,21 +135,21 @@ abstract class CacheResourceTestCommon extends PHPUnit_Smarty
         $this->smarty->clearAllCache();
         // create and cache templates
         $tpl = $this->smarty->createTemplate('helloworld.tpl', 'foo|bar', 'blar');
-        $tpl->writeCachedContent('hello world');
+        $this->writeCachedContent($tpl, 'hello world');
         $tpl2 = $this->smarty->createTemplate('helloworld.tpl', 'foo|bar2', 'blar');
-        $tpl2->writeCachedContent('hello world');
+        $this->writeCachedContent($tpl2, 'hello world');
         $tpl3 = $this->smarty->createTemplate('helloworld2.tpl', 'foo|bar', 'blar');
-        $tpl3->writeCachedContent('hello world');
+        $this->writeCachedContent($tpl3, 'hello world');
         // test cached content
-        $this->assertEquals('hello world', $tpl->getCachedContent());
-        $this->assertEquals('hello world', $tpl2->getCachedContent());
-        $this->assertEquals('hello world', $tpl3->getCachedContent());
+        $this->assertEquals('hello world', $this->getCachedContent($tpl));
+        $this->assertEquals('hello world', $this->getCachedContent($tpl2));
+        $this->assertEquals('hello world', $this->getCachedContent($tpl3));
         // test number of deleted caches
         $this->doClearCacheAssertion(2, $this->smarty->clearCache('helloworld.tpl'));
         // test that caches are deleted properly
-        $this->assertNull($tpl->getCachedContent());
-        $this->assertNull($tpl2->getCachedContent());
-        $this->assertEquals('hello world', $tpl3->getCachedContent());
+        $this->assertNull($this->getCachedContent($tpl));
+        $this->assertNull($this->getCachedContent($tpl2));
+        $this->assertEquals('hello world', $this->getCachedContent($tpl3));
     }
 
     public function testClearCacheCacheIdCompileId2Sub()
@@ -154,21 +159,21 @@ abstract class CacheResourceTestCommon extends PHPUnit_Smarty
         $this->smarty->clearAllCache();
         // create and cache templates
         $tpl = $this->smarty->createTemplate('helloworld.tpl', 'foo|bar', 'blar');
-        $tpl->writeCachedContent('hello world');
+        $this->writeCachedContent($tpl, 'hello world');
         $tpl2 = $this->smarty->createTemplate('helloworld.tpl', 'foo|bar2', 'blar');
-        $tpl2->writeCachedContent('hello world');
+        $this->writeCachedContent($tpl2, 'hello world');
         $tpl3 = $this->smarty->createTemplate('helloworld2.tpl', 'foo|bar', 'blar');
-        $tpl3->writeCachedContent('hello world');
+        $this->writeCachedContent($tpl3, 'hello world');
         // test cached content
-        $this->assertEquals('hello world', $tpl->getCachedContent());
-        $this->assertEquals('hello world', $tpl2->getCachedContent());
-        $this->assertEquals('hello world', $tpl3->getCachedContent());
+        $this->assertEquals('hello world', $this->getCachedContent($tpl));
+        $this->assertEquals('hello world', $this->getCachedContent($tpl2));
+        $this->assertEquals('hello world', $this->getCachedContent($tpl3));
         // test number of deleted caches
         $this->doClearCacheAssertion(2, $this->smarty->clearCache('helloworld.tpl'));
         // test that caches are deleted properly
-        $this->assertNull($tpl->getCachedContent());
-        $this->assertNull($tpl2->getCachedContent());
-        $this->assertEquals('hello world', $tpl3->getCachedContent());
+        $this->assertNull($this->getCachedContent($tpl));
+        $this->assertNull($this->getCachedContent($tpl2));
+        $this->assertEquals('hello world', $this->getCachedContent($tpl3));
     }
 
     public function testClearCacheCacheIdCompileId3()
@@ -178,21 +183,21 @@ abstract class CacheResourceTestCommon extends PHPUnit_Smarty
         $this->smarty->clearAllCache();
         // create and cache templates
         $tpl = $this->smarty->createTemplate('helloworld.tpl', 'foo|bar', 'blar');
-        $tpl->writeCachedContent('hello world');
+        $this->writeCachedContent($tpl, 'hello world');
         $tpl2 = $this->smarty->createTemplate('helloworld.tpl', 'foo|bar', 'blar2');
-        $tpl2->writeCachedContent('hello world');
+        $this->writeCachedContent($tpl2, 'hello world');
         $tpl3 = $this->smarty->createTemplate('helloworld2.tpl', 'foo|bar', 'blar');
-        $tpl3->writeCachedContent('hello world');
+        $this->writeCachedContent($tpl3, 'hello world');
         // test cached content
-        $this->assertEquals('hello world', $tpl->getCachedContent());
-        $this->assertEquals('hello world', $tpl2->getCachedContent());
-        $this->assertEquals('hello world', $tpl3->getCachedContent());
+        $this->assertEquals('hello world', $this->getCachedContent($tpl));
+        $this->assertEquals('hello world', $this->getCachedContent($tpl2));
+        $this->assertEquals('hello world', $this->getCachedContent($tpl3));
         // test number of deleted caches
         $this->doClearCacheAssertion(1, $this->smarty->clearCache('helloworld.tpl', null, 'blar2'));
         // test that caches are deleted properly
-        $this->assertEquals('hello world', $tpl->getCachedContent());
-        $this->assertNull($tpl2->getCachedContent());
-        $this->assertEquals('hello world', $tpl3->getCachedContent());
+        $this->assertEquals('hello world', $this->getCachedContent($tpl));
+        $this->assertNull($this->getCachedContent($tpl2));
+        $this->assertEquals('hello world', $this->getCachedContent($tpl3));
     }
 
     public function testClearCacheCacheIdCompileId3Sub()
@@ -202,21 +207,21 @@ abstract class CacheResourceTestCommon extends PHPUnit_Smarty
         $this->smarty->clearAllCache();
         // create and cache templates
         $tpl = $this->smarty->createTemplate('helloworld.tpl', 'foo|bar', 'blar');
-        $tpl->writeCachedContent('hello world');
+        $this->writeCachedContent($tpl, 'hello world');
         $tpl2 = $this->smarty->createTemplate('helloworld.tpl', 'foo|bar', 'blar2');
-        $tpl2->writeCachedContent('hello world');
+        $this->writeCachedContent($tpl2, 'hello world');
         $tpl3 = $this->smarty->createTemplate('helloworld2.tpl', 'foo|bar', 'blar');
-        $tpl3->writeCachedContent('hello world');
+        $this->writeCachedContent($tpl3, 'hello world');
         // test cached content
-        $this->assertEquals('hello world', $tpl->getCachedContent());
-        $this->assertEquals('hello world', $tpl2->getCachedContent());
-        $this->assertEquals('hello world', $tpl3->getCachedContent());
+        $this->assertEquals('hello world', $this->getCachedContent($tpl));
+        $this->assertEquals('hello world', $this->getCachedContent($tpl2));
+        $this->assertEquals('hello world', $this->getCachedContent($tpl3));
         // test number of deleted caches
         $this->doClearCacheAssertion(1, $this->smarty->clearCache('helloworld.tpl', null, 'blar2'));
         // test that caches are deleted properly
-        $this->assertEquals('hello world', $tpl->getCachedContent());
-        $this->assertNull($tpl2->getCachedContent());
-        $this->assertEquals('hello world', $tpl3->getCachedContent());
+        $this->assertEquals('hello world', $this->getCachedContent($tpl));
+        $this->assertNull($this->getCachedContent($tpl2));
+        $this->assertEquals('hello world', $this->getCachedContent($tpl3));
     }
 
     public function testClearCacheCacheIdCompileId4()
@@ -226,21 +231,21 @@ abstract class CacheResourceTestCommon extends PHPUnit_Smarty
         $this->smarty->clearAllCache();
         // create and cache templates
         $tpl = $this->smarty->createTemplate('helloworld.tpl', 'foo|bar', 'blar');
-        $tpl->writeCachedContent('hello world');
+        $this->writeCachedContent($tpl, 'hello world');
         $tpl2 = $this->smarty->createTemplate('helloworld.tpl', 'foo|bar', 'blar2');
-        $tpl2->writeCachedContent('hello world');
+        $this->writeCachedContent($tpl2, 'hello world');
         $tpl3 = $this->smarty->createTemplate('helloworld2.tpl', 'foo|bar', 'blar');
-        $tpl3->writeCachedContent('hello world');
+        $this->writeCachedContent($tpl3, 'hello world');
         // test cached content
-        $this->assertEquals('hello world', $tpl->getCachedContent());
-        $this->assertEquals('hello world', $tpl2->getCachedContent());
-        $this->assertEquals('hello world', $tpl3->getCachedContent());
+        $this->assertEquals('hello world', $this->getCachedContent($tpl));
+        $this->assertEquals('hello world', $this->getCachedContent($tpl2));
+        $this->assertEquals('hello world', $this->getCachedContent($tpl3));
         // test number of deleted caches
         $this->doClearCacheAssertion(1, $this->smarty->clearCache('helloworld.tpl', null, 'blar2'));
         // test that caches are deleted properly
-        $this->assertEquals('hello world', $tpl->getCachedContent());
-        $this->assertNull($tpl2->getCachedContent());
-        $this->assertEquals('hello world', $tpl3->getCachedContent());
+        $this->assertEquals('hello world', $this->getCachedContent($tpl));
+        $this->assertNull($this->getCachedContent($tpl2));
+        $this->assertEquals('hello world', $this->getCachedContent($tpl3));
     }
 
     public function testClearCacheCacheIdCompileId4Sub()
@@ -250,21 +255,21 @@ abstract class CacheResourceTestCommon extends PHPUnit_Smarty
         $this->smarty->clearAllCache();
         // create and cache templates
         $tpl = $this->smarty->createTemplate('helloworld.tpl', 'foo|bar', 'blar');
-        $tpl->writeCachedContent('hello world');
+        $this->writeCachedContent($tpl, 'hello world');
         $tpl2 = $this->smarty->createTemplate('helloworld.tpl', 'foo|bar', 'blar2');
-        $tpl2->writeCachedContent('hello world');
+        $this->writeCachedContent($tpl2, 'hello world');
         $tpl3 = $this->smarty->createTemplate('helloworld2.tpl', 'foo|bar', 'blar');
-        $tpl3->writeCachedContent('hello world');
+        $this->writeCachedContent($tpl3, 'hello world');
         // test cached content
-        $this->assertEquals('hello world', $tpl->getCachedContent());
-        $this->assertEquals('hello world', $tpl2->getCachedContent());
-        $this->assertEquals('hello world', $tpl3->getCachedContent());
+        $this->assertEquals('hello world', $this->getCachedContent($tpl));
+        $this->assertEquals('hello world', $this->getCachedContent($tpl2));
+        $this->assertEquals('hello world', $this->getCachedContent($tpl3));
         // test number of deleted caches
         $this->doClearCacheAssertion(1, $this->smarty->clearCache('helloworld.tpl', null, 'blar2'));
         // test that caches are deleted properly
-        $this->assertEquals('hello world', $tpl->getCachedContent());
-        $this->assertNull($tpl2->getCachedContent());
-        $this->assertEquals('hello world', $tpl3->getCachedContent());
+        $this->assertEquals('hello world', $this->getCachedContent($tpl));
+        $this->assertNull($this->getCachedContent($tpl2));
+        $this->assertEquals('hello world', $this->getCachedContent($tpl3));
     }
 
     public function testClearCacheCacheIdCompileId5()
@@ -274,21 +279,21 @@ abstract class CacheResourceTestCommon extends PHPUnit_Smarty
         $this->smarty->clearAllCache();
         // create and cache templates
         $tpl = $this->smarty->createTemplate('helloworld.tpl', 'foo|bar', 'blar');
-        $tpl->writeCachedContent('hello world');
+        $this->writeCachedContent($tpl, 'hello world');
         $tpl2 = $this->smarty->createTemplate('helloworld.tpl', 'foo|bar', 'blar2');
-        $tpl2->writeCachedContent('hello world');
+        $this->writeCachedContent($tpl2, 'hello world');
         $tpl3 = $this->smarty->createTemplate('helloworld2.tpl', 'foo|bar', 'blar');
-        $tpl3->writeCachedContent('hello world');
+        $this->writeCachedContent($tpl3, 'hello world');
         // test cached content
-        $this->assertEquals('hello world', $tpl->getCachedContent());
-        $this->assertEquals('hello world', $tpl2->getCachedContent());
-        $this->assertEquals('hello world', $tpl3->getCachedContent());
+        $this->assertEquals('hello world', $this->getCachedContent($tpl));
+        $this->assertEquals('hello world', $this->getCachedContent($tpl2));
+        $this->assertEquals('hello world', $this->getCachedContent($tpl3));
         // test number of deleted caches
         $this->doClearCacheAssertion(2, $this->smarty->clearCache(null, null, 'blar'));
         // test that caches are deleted properly
-        $this->assertNull($tpl->getCachedContent());
-        $this->assertEquals('hello world', $tpl2->getCachedContent());
-        $this->assertNull($tpl3->getCachedContent());
+        $this->assertNull($this->getCachedContent($tpl));
+        $this->assertEquals('hello world', $this->getCachedContent($tpl2));
+        $this->assertNull($this->getCachedContent($tpl3));
     }
 
     public function testClearCacheCacheIdCompileId5Sub()
@@ -298,21 +303,21 @@ abstract class CacheResourceTestCommon extends PHPUnit_Smarty
         $this->smarty->clearAllCache();
         // create and cache templates
         $tpl = $this->smarty->createTemplate('helloworld.tpl', 'foo|bar', 'blar');
-        $tpl->writeCachedContent('hello world');
+        $this->writeCachedContent($tpl, 'hello world');
         $tpl2 = $this->smarty->createTemplate('helloworld.tpl', 'foo|bar', 'blar2');
-        $tpl2->writeCachedContent('hello world');
+        $this->writeCachedContent($tpl2, 'hello world');
         $tpl3 = $this->smarty->createTemplate('helloworld2.tpl', 'foo|bar', 'blar');
-        $tpl3->writeCachedContent('hello world');
+        $this->writeCachedContent($tpl3, 'hello world');
         // test cached content
-        $this->assertEquals('hello world', $tpl->getCachedContent());
-        $this->assertEquals('hello world', $tpl2->getCachedContent());
-        $this->assertEquals('hello world', $tpl3->getCachedContent());
+        $this->assertEquals('hello world', $this->getCachedContent($tpl));
+        $this->assertEquals('hello world', $this->getCachedContent($tpl2));
+        $this->assertEquals('hello world', $this->getCachedContent($tpl3));
         // test number of deleted caches
         $this->doClearCacheAssertion(2, $this->smarty->clearCache(null, null, 'blar'));
         // test that caches are deleted properly
-        $this->assertNull($tpl->getCachedContent());
-        $this->assertEquals('hello world', $tpl2->getCachedContent());
-        $this->assertNull($tpl3->getCachedContent());
+        $this->assertNull($this->getCachedContent($tpl));
+        $this->assertEquals('hello world', $this->getCachedContent($tpl2));
+        $this->assertNull($this->getCachedContent($tpl3));
     }
 
     public function testClearCacheCacheFile()
@@ -322,25 +327,25 @@ abstract class CacheResourceTestCommon extends PHPUnit_Smarty
         $this->smarty->clearAllCache();
         // create and cache templates
         $tpl = $this->smarty->createTemplate('helloworld.tpl');
-        $tpl->writeCachedContent('hello world');
+        $this->writeCachedContent($tpl, 'hello world');
         $tpl2 = $this->smarty->createTemplate('helloworld.tpl', null, 'bar');
-        $tpl2->writeCachedContent('hello world');
+        $this->writeCachedContent($tpl2, 'hello world');
         $tpl3 = $this->smarty->createTemplate('helloworld.tpl', 'buh|blar');
-        $tpl3->writeCachedContent('hello world');
+        $this->writeCachedContent($tpl3, 'hello world');
         $tpl4 = $this->smarty->createTemplate('helloworld2.tpl');
-        $tpl4->writeCachedContent('hello world');
+        $this->writeCachedContent($tpl4, 'hello world');
         // test cached content
-        $this->assertEquals('hello world', $tpl->getCachedContent());
-        $this->assertEquals('hello world', $tpl2->getCachedContent());
-        $this->assertEquals('hello world', $tpl3->getCachedContent());
-        $this->assertEquals('hello world', $tpl4->getCachedContent());
+        $this->assertEquals('hello world', $this->getCachedContent($tpl));
+        $this->assertEquals('hello world', $this->getCachedContent($tpl2));
+        $this->assertEquals('hello world', $this->getCachedContent($tpl3));
+        $this->assertEquals('hello world', $this->getCachedContent($tpl4));
         // test number of deleted caches
         $this->doClearCacheAssertion(3, $this->smarty->clearCache('helloworld.tpl'));
         // test that caches are deleted properly
-        $this->assertNull($tpl->getCachedContent());
-        $this->assertNull($tpl2->getCachedContent());
-        $this->assertNull($tpl3->getCachedContent());
-        $this->assertEquals('hello world', $tpl4->getCachedContent());
+        $this->assertNull($this->getCachedContent($tpl));
+        $this->assertNull($this->getCachedContent($tpl2));
+        $this->assertNull($this->getCachedContent($tpl3));
+        $this->assertEquals('hello world', $this->getCachedContent($tpl4));
     }
 
     /**
@@ -353,25 +358,32 @@ abstract class CacheResourceTestCommon extends PHPUnit_Smarty
         $this->smarty->clearAllCache();
         // create and cache templates
         $tpl = $this->smarty->createTemplate('helloworld.tpl');
-        $tpl->writeCachedContent('hello world');
+        $this->writeCachedContent($tpl, 'something else 1');
         $tpl2 = $this->smarty->createTemplate('helloworld.tpl', null, 'bar');
-        $tpl2->writeCachedContent('hello world');
+        $this->writeCachedContent($tpl2, 'something else 2');
         $tpl3 = $this->smarty->createTemplate('helloworld.tpl', 'buh|blar');
-        $tpl3->writeCachedContent('hello world');
+        $this->writeCachedContent($tpl3, 'something else 3');
         // test cached content
-        $this->assertEquals('hello world', $tpl->getCachedContent());
-        $this->assertEquals('hello world', $tpl2->getCachedContent());
-        $this->assertEquals('hello world', $tpl3->getCachedContent());
+        $this->assertEquals('something else 1', $this->getCachedContent($tpl));
+        $this->assertEquals('something else 2', $this->getCachedContent($tpl2));
+        $this->assertEquals('something else 3', $this->getCachedContent($tpl3));
         sleep(10);
         $tpl4 = $this->smarty->createTemplate('helloworld2.tpl');
-        $tpl4->writeCachedContent('hello world');
+        $this->writeCachedContent($tpl4, 'something else 4');
+
         // test number of deleted caches
         $this->doClearCacheAssertion(3,$this->smarty->clearAllCache(5));
+
+	    $tpl = $this->smarty->createTemplate('helloworld.tpl');
+	    $tpl2 = $this->smarty->createTemplate('helloworld.tpl', null, 'bar');
+	    $tpl3 = $this->smarty->createTemplate('helloworld.tpl', 'buh|blar');
+	    $tpl4 = $this->smarty->createTemplate('helloworld2.tpl');
+
         // test that caches are deleted properly
-        $this->assertNull($tpl->getCachedContent());
-        $this->assertNull($tpl2->getCachedContent());
-        $this->assertNull($tpl3->getCachedContent());
-        $this->assertEquals('hello world', $tpl4->getCachedContent());
+        $this->assertEquals('hello world', $this->getCachedContent($tpl));
+        $this->assertEquals('hello world', $this->getCachedContent($tpl2));
+        $this->assertEquals('hello world', $this->getCachedContent($tpl3));
+        $this->assertEquals('something else 4', $this->getCachedContent($tpl4));
     }
 
     public function testClearCacheCacheFileSub()
@@ -381,25 +393,25 @@ abstract class CacheResourceTestCommon extends PHPUnit_Smarty
         $this->smarty->clearAllCache();
         // create and cache templates
         $tpl = $this->smarty->createTemplate('helloworld.tpl');
-        $tpl->writeCachedContent('hello world');
+        $this->writeCachedContent($tpl, 'hello world');
         $tpl2 = $this->smarty->createTemplate('helloworld.tpl', null, 'bar');
-        $tpl2->writeCachedContent('hello world');
+        $this->writeCachedContent($tpl2, 'hello world');
         $tpl3 = $this->smarty->createTemplate('helloworld.tpl', 'buh|blar');
-        $tpl3->writeCachedContent('hello world');
+        $this->writeCachedContent($tpl3, 'hello world');
         $tpl4 = $this->smarty->createTemplate('helloworld2.tpl');
-        $tpl4->writeCachedContent('hello world');
+        $this->writeCachedContent($tpl4, 'hello world');
         // test cached content
-        $this->assertEquals('hello world', $tpl->getCachedContent());
-        $this->assertEquals('hello world', $tpl2->getCachedContent());
-        $this->assertEquals('hello world', $tpl3->getCachedContent());
-        $this->assertEquals('hello world', $tpl4->getCachedContent());
+        $this->assertEquals('hello world', $this->getCachedContent($tpl));
+        $this->assertEquals('hello world', $this->getCachedContent($tpl2));
+        $this->assertEquals('hello world', $this->getCachedContent($tpl3));
+        $this->assertEquals('hello world', $this->getCachedContent($tpl4));
         // test number of deleted caches
         $this->doClearCacheAssertion(3, $this->smarty->clearCache('helloworld.tpl'));
         // test that caches are deleted properly
-        $this->assertNull($tpl->getCachedContent());
-        $this->assertNull($tpl2->getCachedContent());
-        $this->assertNull($tpl3->getCachedContent());
-        $this->assertEquals('hello world', $tpl4->getCachedContent());
+        $this->assertNull($this->getCachedContent($tpl));
+        $this->assertNull($this->getCachedContent($tpl2));
+        $this->assertNull($this->getCachedContent($tpl3));
+        $this->assertEquals('hello world', $this->getCachedContent($tpl4));
     }
     /**
      * Test caching

tests/UnitTests/CacheResourceTests/_shared/PHPunitplugins/resource.filetest.php

@@ -7,7 +7,7 @@ use Smarty\Template\Source;
 class Smarty_Resource_FiletestPlugin extends FilePlugin
 {
     /**
-     * populate Source Object with meta data from Resource
+     * populate Source Object with metadata from Resource
      *
      * @param Source   $source    source object
      * @param Template $_template template object

tests/UnitTests/ResourceTests/Custom/DemoPluginMysql/ResourceMysqlPluginTest.php

@@ -98,7 +98,7 @@ if (MysqlResourceEnable == true) {
         {
             //$this->smarty->addPluginsDir("./PHPunitplugins/");
             $tpl = $this->smarty->createTemplate('mysqltest:test.tpl');
-            $this->assertEquals($this->buildCompiledPath($tpl, false, false, null, 'test.tpl', 'mysqltest', $this->smarty->getTemplateDir(0)), $tpl->getCompiled()->filepath);
+            $this->assertEquals($this->buildCompiledPath($tpl, false, null, 'test.tpl', 'mysqltest', $this->smarty->getTemplateDir(0)), $tpl->getCompiled()->filepath);
         }
 
         public function testResourcePluginMysqlCompiledFilepathCache()
@@ -108,7 +108,7 @@ if (MysqlResourceEnable == true) {
             $this->smarty->setForceCompile(true);
             $this->smarty->fetch('mysqltest:test.tpl');
             $tpl = $this->smarty->createTemplate('mysqltest:test.tpl');
-            $this->assertEquals($this->buildCompiledPath($tpl, false, true, null, 'test.tpl', 'mysqltest', $this->smarty->getTemplateDir(0)), $tpl->getCompiled()->filepath);
+            $this->assertEquals($this->buildCompiledPath($tpl, true, null, 'test.tpl', 'mysqltest', $this->smarty->getTemplateDir(0)), $tpl->getCompiled()->filepath);
             $this->smarty->caching = false;
         }
 

tests/UnitTests/ResourceTests/File/FileResourceTest.php

@@ -105,7 +105,7 @@ class FileResourceTest extends PHPUnit_Smarty
     public function testGetCompiledFilepath()
     {
         $tpl = $this->smarty->createTemplate('helloworld.tpl');
-        $this->assertEquals($this->buildCompiledPath($tpl, false, false, null, 'helloworld.tpl', 'file', $this->smarty->getTemplateDir(0))
+        $this->assertEquals($this->buildCompiledPath($tpl, false, null, 'helloworld.tpl', 'file', $this->smarty->getTemplateDir(0))
             , $tpl->getCompiled()->filepath
         );
     }
@@ -175,7 +175,7 @@ class FileResourceTest extends PHPUnit_Smarty
         $this->smarty->caching = true;
         $this->smarty->cache_lifetime = 1000;
         $tpl = $this->smarty->createTemplate('helloworld.tpl');
-        $this->assertEquals($this->buildCachedPath($tpl, false, null, null, 'helloworld.tpl', 'file', $this->smarty->getTemplateDir(0), 'file')
+        $this->assertEquals($this->buildCachedPath($tpl, null, null, 'helloworld.tpl', 'file', $this->smarty->getTemplateDir(0), 'file')
             , $tpl->getCached()->filepath
         );
     }
@@ -183,7 +183,7 @@ class FileResourceTest extends PHPUnit_Smarty
     public function testGetCachedTimestamp()
     {
         // create dummy cache file for the following test
-        file_put_contents($this->buildCachedPath($this->smarty, false, null, null, 'helloworld.tpl', 'file', $this->smarty->getTemplateDir(0), 'file')
+        file_put_contents($this->buildCachedPath($this->smarty, null, null, 'helloworld.tpl', 'file', $this->smarty->getTemplateDir(0), 'file')
             , '<?php ?>');
         $this->smarty->caching = true;
         $this->smarty->cache_lifetime = 1000;

tests/UnitTests/ResourceTests/FileIndexed/FileResourceIndexedTest.php

@@ -101,7 +101,7 @@ class FileResourceIndexedTest extends PHPUnit_Smarty
     public function testGetCompiledFilepath()
     {
         $tpl = $this->smarty->createTemplate('[foo]dirname.tpl');
-        $this->assertEquals($this->buildCompiledPath($tpl, false, false, null, 'dirname.tpl', 'file', $this->smarty->getTemplateDir('foo')), $tpl->getCompiled()->filepath);
+        $this->assertEquals($this->buildCompiledPath($tpl, false, null, 'dirname.tpl', 'file', $this->smarty->getTemplateDir('foo')), $tpl->getCompiled()->filepath);
     }
 
     public function testGetCachedFilepath()
@@ -109,7 +109,7 @@ class FileResourceIndexedTest extends PHPUnit_Smarty
         $this->smarty->caching = true;
         $this->smarty->cache_lifetime = 1000;
         $tpl = $this->smarty->createTemplate('[foo]dirname.tpl');
-        $this->assertEquals($this->buildCachedPath($tpl, false, null, null, 'dirname.tpl', 'file', $this->smarty->getTemplateDir('foo'))
+        $this->assertEquals($this->buildCachedPath($tpl, null, null, 'dirname.tpl', 'file', $this->smarty->getTemplateDir('foo'))
             , $tpl->getCached()->filepath);
     }
 }

tests/UnitTests/ResourceTests/Stream/StreamResourceTest.php

@@ -8,10 +8,6 @@
 
 /**
  * class for stream resource tests
- *
- * 
- * 
- * 
  */
 class StreamResourceTest extends PHPUnit_Smarty
 {
@@ -156,7 +152,7 @@ class StreamResourceTest extends PHPUnit_Smarty
     public function testWriteCachedContent()
     {
         $tpl = $this->smarty->createTemplate('global:mytest');
-        $this->assertFalse($tpl->writeCachedContent('dummy'));
+        $this->assertFalse($tpl->getCached()->handler->storeCachedContent($tpl, 'dummy'));
     }
 
     /**

tests/UnitTests/ResourceTests/String/StringResourceTest.php

@@ -110,7 +110,7 @@ class StringResourceTest extends PHPUnit_Smarty
     public function testGetCompiledFilepath()
     {
         $tpl = $this->smarty->createTemplate('string:hello world');
-        $this->assertEquals($this->buildCompiledPath($tpl, false, false, null, 'hello world', 'string', $this->smarty->getTemplateDir(0)), $tpl->getCompiled()->filepath);
+        $this->assertEquals($this->buildCompiledPath($tpl, false, null, 'hello world', 'string', $this->smarty->getTemplateDir(0)), $tpl->getCompiled()->filepath);
     }
 
     /**
@@ -146,7 +146,7 @@ class StringResourceTest extends PHPUnit_Smarty
     public function testWriteCachedContent()
     {
         $tpl = $this->smarty->createTemplate('string:hello world');
-        $this->assertFalse($tpl->writeCachedContent('dummy'));
+        $this->assertFalse($this->writeCachedContent($tpl, 'dummy'));
     }
 
     /**

tests/UnitTests/SmartyMethodsTests/Append/AppendTest.php

@@ -8,10 +8,6 @@
 
 /**
  * class for append tests
- *
- * 
- * 
- *
  */
 class AppendTest extends PHPUnit_Smarty
 {

tests/UnitTests/SmartyMethodsTests/ClearCompiledTemplate/ClearCompiledTest.php

@@ -160,7 +160,7 @@ class ClearCompiledTest extends PHPUnit_Smarty
 
     public function runClearAll($useSubDirs)
     {
-        $this->getSmarty()->setUseSubDirs($useSubDirs);
+
         $this->clearFiles();
         $this->makeFiles();
 
@@ -194,7 +194,7 @@ class ClearCompiledTest extends PHPUnit_Smarty
 
     public function runClearTemplate($useSubDirs)
     {
-        $this->getSmarty()->setUseSubDirs($useSubDirs);
+
         $this->clearFiles();
         $this->makeFiles();
 
@@ -211,7 +211,7 @@ class ClearCompiledTest extends PHPUnit_Smarty
 
     public function runClearOtherTemplate($useSubDirs)
     {
-        $this->getSmarty()->setUseSubDirs($useSubDirs);
+
         $this->clearFiles();
         $this->makeFiles();
 
@@ -245,7 +245,7 @@ class ClearCompiledTest extends PHPUnit_Smarty
 
     public function runClearCompileid($useSubDirs)
     {
-        $this->getSmarty()->setUseSubDirs($useSubDirs);
+
         $this->clearFiles();
         $this->makeFiles();
 
@@ -264,7 +264,7 @@ class ClearCompiledTest extends PHPUnit_Smarty
 
     public function runClearOtherCompileid($useSubDirs)
     {
-        $this->getSmarty()->setUseSubDirs($useSubDirs);
+
         $this->clearFiles();
         $this->makeFiles();
 
@@ -288,7 +288,7 @@ class ClearCompiledTest extends PHPUnit_Smarty
 
     public function runClearExpired($useSubDirs)
     {
-        $this->getSmarty()->setUseSubDirs($useSubDirs);
+
         $this->clearFiles();
         $this->makeFiles();
 
@@ -313,7 +313,7 @@ class ClearCompiledTest extends PHPUnit_Smarty
 
     public function runClearTemplateExpired($useSubDirs)
     {
-        $this->getSmarty()->setUseSubDirs($useSubDirs);
+
         $this->clearFiles();
         $this->makeFiles();
 
@@ -343,7 +343,7 @@ class ClearCompiledTest extends PHPUnit_Smarty
 
     public function runClearTemplateCacheidExpired($useSubDirs)
     {
-        $this->getSmarty()->setUseSubDirs($useSubDirs);
+
         $this->clearFiles();
         $this->makeFiles();
 
@@ -373,7 +373,7 @@ class ClearCompiledTest extends PHPUnit_Smarty
 
     public function runClearCacheidExpired($useSubDirs)
     {
-        $this->getSmarty()->setUseSubDirs($useSubDirs);
+
         $this->clearFiles();
         $this->makeFiles();
 
@@ -403,7 +403,7 @@ class ClearCompiledTest extends PHPUnit_Smarty
 
     public function runClearTemplateCacheid($useSubDirs)
     {
-        $this->getSmarty()->setUseSubDirs($useSubDirs);
+
         $this->clearFiles();
         $this->makeFiles();
 
@@ -431,7 +431,7 @@ class ClearCompiledTest extends PHPUnit_Smarty
 
     public function runClearAmbiguousTemplate($useSubDirs)
     {
-        $this->getSmarty()->setUseSubDirs($useSubDirs);
+
         $this->clearFiles();
         $this->makeFiles();
 

tests/UnitTests/__shared/cacheresources/cacheresource.memcache.php

@@ -17,20 +17,22 @@ class Smarty_CacheResource_Memcache extends \Smarty\Cacheresource\KeyValueStore
      *
      * @var Memcache
      */
-    protected $memcache = null;
+    private $memcache = null;
 
-    /**
-     * Smarty_CacheResource_Memcache constructor.
-     */
-    public function __construct()
-    {
-        if (class_exists('Memcached')) {
-            $this->memcache = new Memcached();
-        } else {
-            $this->memcache = new Memcache();
-        }
-        $this->memcache->addServer('127.0.0.1', 11211);
-    }
+	/**
+	 * @return Memcache|Memcached
+	 */
+	public function getMemcache() {
+		if ($this->memcache ===  null) {
+			if (class_exists('Memcached')) {
+				$this->memcache = new Memcached();
+			} else {
+				$this->memcache = new Memcache();
+			}
+			$this->memcache->addServer('127.0.0.1', 11211);
+		}
+		return $this->memcache;
+	}
 
     /**
      * Read values for a set of keys from cache
@@ -45,7 +47,7 @@ class Smarty_CacheResource_Memcache extends \Smarty\Cacheresource\KeyValueStore
         $res = array();
         foreach ($keys as $key) {
             $k = sha1($key);
-            $res[$key] = $this->memcache->get($k);
+            $res[$key] = $this->getMemcache()->get($k);
         }
         return $res;
     }
@@ -63,9 +65,9 @@ class Smarty_CacheResource_Memcache extends \Smarty\Cacheresource\KeyValueStore
         foreach ($keys as $k => $v) {
             $k = sha1($k);
             if (class_exists('Memcached')) {
-                $this->memcache->set($k, $v, $expire);
+                $this->getMemcache()->set($k, $v, $expire);
             } else {
-                $this->memcache->set($k, $v, 0, $expire);
+                $this->getMemcache()->set($k, $v, 0, $expire);
             }
         }
         return true;
@@ -82,7 +84,7 @@ class Smarty_CacheResource_Memcache extends \Smarty\Cacheresource\KeyValueStore
     {
         foreach ($keys as $k) {
             $k = sha1($k);
-            $this->memcache->delete($k);
+            $this->getMemcache()->delete($k);
         }
         return true;
     }
@@ -94,6 +96,6 @@ class Smarty_CacheResource_Memcache extends \Smarty\Cacheresource\KeyValueStore
      */
     protected function purge()
     {
-        return $this->memcache->flush();
+        return $this->getMemcache()->flush();
     }
 }

tests/UnitTests/__shared/resources/resource.extendsall.php

@@ -29,7 +29,8 @@ class My_Resource_Extendsall extends \Smarty\Resource\ExtendsPlugin
         $timestamp = 0;
         foreach ($source->getSmarty()->getTemplateDir() as $key => $directory) {
             try {
-                $s = Smarty\Resource\BasePlugin::source(null, $source->getSmarty(), 'file:' . '[' . $key . ']' . $source->name);
+                $s = \Smarty\Template\Source::load(null, $source->getSmarty(),
+	                'file:' . '[' . $key . ']' . $source->name);
                 if (!$s->exists) {
                     continue;
                 }