Removed unit test from TODO.md as we have implemented it here

- simplified Smarty_Internal_TemplateCompilerBase::processText along the way
Fixes !447

.gitattributes

@@ -5,7 +5,6 @@
 *.y   text eol=lf
 *.lex text eol=lf
 
-
 # exclude from git export
 /travis.ini export-ignore
 /myconfig.ini export-ignore
@@ -14,3 +13,4 @@
 /.gitattributes export-ignore
 /lexer/ export-ignore
 /utilities/ export-ignore
+/error_reporting.ini export-ignore

.gitignore

@@ -6,3 +6,8 @@ lexer/*.php
 lexer/*.php.bak
 lexer/*.out
 utilies/*.php
+
+# Dev
+phpunit*
+vendor/*
+composer.lock

.travis.yml

@@ -7,26 +7,21 @@ dist: trusty
 
 matrix:
   include:
-   - php: 5.3
-     dist: precise
-   - php: 5.4
-      dist: precise
-  - php: 5.5
-   - php: 5.6
    - php: 7.0
    - php: 7.1
    - php: 7.2
+   - php: 7.3
+   - php: 7.4
+   - php: nightly
   fast_finish: true
+  allow_failures:
+   - php: nightly
 
 services:
   - memcached
   - mysql
 
 before_script:
-    - if [ ${TRAVIS_PHP_VERSION:0:3} != "5.2" ]; then travis_retry composer --prefer-source --dev install; fi
-    - if [ ${TRAVIS_PHP_VERSION:0:3} <= "5.6" ]; then  phpenv config-add travis.ini; fi
-    - if [ ${TRAVIS_PHP_VERSION:0:3} >= "5.3" ]; then  phpenv config-add error_reporting.ini; fi
-    - if [[ $TRAVIS_PHP_VERSION = 7.* ]]; then  composer require phpunit/phpunit 6.4.1; fi
     - mysql -e "create database IF NOT EXISTS test;" -uroot
 
 before_install:
@@ -34,13 +29,6 @@ before_install:
 
 install:
     - travis_retry composer install
-    - git clone --depth=50 --branch=master git://github.com/smarty-php/smarty-phpunit.git
 
 script:
-   - cd smarty-phpunit
-   - if [[ $TRAVIS_PHP_VERSION = 7.* ]]; then
-        ../vendor/bin/phpunit ./;
-    else
-        phpunit ./;
-    fi
-
+   - ./phpunit.sh

NEW_FEATURES.txt

@@ -35,13 +35,13 @@ Smarty 3.1.32
     will be treated now as literal. (This does apply for any number of delimiter repeatations).
     However {{foo}} is not an literal but will be interpreted as a recursive Smarty tag.
     If you use
-         $smarty->setLiteral(array('{{','}}'));
+         $smarty->setLiterals(array('{{','}}'));
          {{foo}}  is now a literal as well.
     NOTE: In the last example nested Smarty tags starting with '{{' or ending with '}}' will not
     work any longer, but this should be very very raw occouring restriction.
     B) Example 2
     Assume your delimiter are '<-' , '->' and '<--' , '-->' shall be literals 
-          $smarty->setLiteral(array('<--','-->'));
+          $smarty->setLiterals(array('<--','-->'));
 
 
     The capture buffers can now be accessed as array

README.md

@@ -1,11 +1,17 @@
 # Smarty 3 template engine
 [smarty.net](https://www.smarty.net/) 
 
+[![Build Status](https://travis-ci.org/smarty-php/smarty.svg?branch=master)](https://travis-ci.org/smarty-php/smarty)
+
 ## Documentation
 
 For documentation see 
 [www.smarty.net/docs/en/](https://www.smarty.net/docs/en/) 
 
+## Requirements
+
+Smarty can be run with PHP 5.2 to PHP 7.4.
+
 ## Distribution repository
 
 > Smarty 3.1.28 introduces run time template inheritance

TODO.md

@@ -0,0 +1,56 @@
+# Todo
+
+## Add unit test for isset issue in correct branch
+tests/UnitTests/TemplateSource/ValueTests/PHPfunctions/PhpFunctionTest.php
+```php
+    /**
+     * test PHP isset() on (non-)variables
+     * @dataProvider        dataTestIsset3
+     * @param string $strTemplate template to test
+     * @param string $result expected result
+     */
+    public function testIsset3($strTemplate, $result)
+    {
+        $this->smarty->disableSecurity();
+
+        $this->smarty->assign('varobject', new TestIsset());
+        $this->smarty->assign('vararray', $vararray = [
+            'keythatexists' => false,
+            'keywitharray' => [1 => 1],
+            'keywithobject' => new TestIsset()]
+        );
+
+        $this->smarty->assign('key', 'A');
+        $this->smarty->assign('_varsimpleA', 1);
+        $this->smarty->assign('varsimpleB', 0);
+        $this->smarty->assign('varsimpleC', null);
+
+        $this->assertEquals($result, $this->smarty->fetch('string:' . $strTemplate));
+    }
+
+    /**
+     * Data provider for testIsset3
+     */
+    public function dataTestIsset3()
+    {
+        return array(
+            array('{if isset($varobject->arr)}true{else}false{/if}', 'true'),
+            array('{if isset($vararray["keywitharray"])}true{else}false{/if}', 'true'),
+            array('{if isset($vararray["keythatexists"])}true{else}false{/if}', 'true'),
+            array('{if isset($vararray["nonexistingkey"])}true{else}false{/if}', 'false'),
+            array('{if isset($_GET["sscr6hr6cz34j6"])}true{else}false{/if}', 'false'),
+            array('{if isset(count([\'hi\']))}true{else}false{/if}', 'true'),
+            array('{if isset($vararray[\'keywitharray\'][intval(\'1\')])}true{else}false{/if}', 'true'),
+            array('{if isset($vararray[\'keywithobject\']->arr[\'isSet\'])}true{else}false{/if}', 'true'),
+            array('{if isset($vararray[\'keywithobject\']->arr[\'isNull\'])}true{else}false{/if}', 'false'),
+            array('{if isset($varobject->arr[\'isSet\'])}true{else}false{/if}', 'true'),
+            array('{if isset($varobject->arr[\'isNull\'])}true{else}false{/if}', 'false'),
+            array('{if isset($_varsimpleA)}true{else}false{/if}', 'true'),
+            array('{if isset($varsimpleB)}true{else}false{/if}', 'true'),
+            array('{if isset($varsimpleC)}true{else}false{/if}', 'false'),
+            array('{if isset($_varsimpleA && varsimpleB)}true{else}false{/if}', 'true'),
+            array('{if isset($_varsimpleA && varsimpleC)}true{else}false{/if}', 'true'),
+            array('{if isset($_varsimple{$key})}true{else}false{/if}', 'true'),
+        );
+    }
+```

change_log.txt

@@ -1,4 +1,44 @@
-===== 3.1.33 release ===== 12.09.2018
+ - remove whitespaces after comments https://github.com/smarty-php/smarty/issues/447
+ - fix foreachelse on arrayiterators https://github.com/smarty-php/smarty/issues/506
+
+===== 3.1.34 release ===== 05.11.2019
+13.01.2020
+ - fix typo in exception message (JercSi)
+ - fix typehint warning with callable (bets4breakfast)
+ - add travis badge and compatability info to readme (matks)
+ - fix stdClass cast when compiling foreach (carpii)
+ - fix wrong set/get methods for memcached (IT-Experte)
+ - fix pborm assigning value to object variables in smarty_internal_compile_assign (Hunman)
+ - exclude error_reporting.ini from git export (glensc)
+===== 3.1.34-dev-6 =====
+30.10.2018
+ - bugfix a nested subblock in an inheritance child template was not replace by
+   outer level block with same name in same child template https://github.com/smarty-php/smarty/issues/500
+
+29.10.2018
+ - bugfix Smarty::$php_handling == PHP_PASSTHRU (default) did eat the "\n" (newline) character if it did directly followed
+   a PHP tag like "?>" or other https://github.com/smarty-php/smarty/issues/501
+
+14.10.2018
+ - bugfix autoloader exit shortcut https://github.com/smarty-php/smarty/issues/467
+
+11.10.2018
+ - bugfix {insert} not works when caching is enabled and included template is present
+   https://github.com/smarty-php/smarty/issues/496
+ - bugfix in date-format modifier; NULL at date string or default_date did not produce correct output
+   https://github.com/smarty-php/smarty/pull/458
+
+09.10.2018
+ - bugfix fix of 26.8.2017 https://github.com/smarty-php/smarty/issues/327
+   modifier is applied to sum expression https://github.com/smarty-php/smarty/issues/491
+ - bugfix indexed arrays could not be defined "array(...)""
+
+18.09.2018
+  - bugfix large plain text template sections without a Smarty tag > 700kB could
+    could fail in version 3.1.32 and 3.1.33 because PHP preg_match() restrictions
+    https://github.com/smarty-php/smarty/issues/488
+
+===== 3.1.33 release ===== 12.09.2018
 ===== 3.1.33-dev-12 =====
 03.09.2018
   - bugfix {foreach} using new style property access like {$item@property} on
@@ -1138,7 +1178,7 @@
  - improvement on performance when using error handler and multiple template folders (issue 152)
 
 17.09.2013
- - improvement added patch for additional SmartyCompilerException properties for better access to scource information (forum topic 24559)
+ - improvement added patch for additional SmartyCompilerException properties for better access to source information (forum topic 24559)
 
 16.09.2013
  - bugfix recompiled templates did not show on first request with zend opcache cache (forum topic 24320)

composer.json

@@ -30,13 +30,16 @@
         "php": ">=5.2"
     },
     "autoload": {
-        "files": [
-            "libs/bootstrap.php"
+        "classmap": [
+            "libs/"
         ]
     },
     "extra": {
         "branch-alias": {
             "dev-master": "3.1.x-dev"
         }
+    },
+    "require-dev": {
+        "phpunit/phpunit": "6.4.1"
     }
-}
+}

demo/plugins/cacheresource.memcache.php

@@ -42,18 +42,12 @@ class Smarty_CacheResource_Memcache extends Smarty_CacheResource_KeyValueStore
      */
     protected function read(array $keys)
     {
-        $_keys = $lookup = array();
-        foreach ($keys as $k) {
-            $_k = sha1($k);
-            $_keys[] = $_k;
-            $lookup[ $_k ] = $k;
+        $res = array();
+        foreach ($keys as $key) {
+            $k = sha1($key);
+            $res[$key] = $this->memcache->get($k);
         }
-        $_res = array();
-        $res = $this->memcache->get($_keys);
-        foreach ($res as $k => $v) {
-            $_res[ $lookup[ $k ] ] = $v;
-        }
-        return $_res;
+        return $res;
     }
 
     /**
@@ -68,7 +62,11 @@ class Smarty_CacheResource_Memcache extends Smarty_CacheResource_KeyValueStore
     {
         foreach ($keys as $k => $v) {
             $k = sha1($k);
-            $this->memcache->set($k, $v, 0, $expire);
+            if (class_exists('Memcached')) {
+                $this->memcache->set($k, $v, $expire);
+            } else {
+                $this->memcache->set($k, $v, 0, $expire);
+            }
         }
         return true;
     }

lexer/smarty_internal_templatelexer.plex

@@ -209,6 +209,20 @@ class Smarty_Internal_Templatelexer
      */
     private $yy_global_pattern5 = null;
 
+    /**
+     * preg token pattern for text
+     *
+     * @var null
+     */
+    private $yy_global_text = null;
+
+    /**
+     * preg token pattern for literal
+     *
+     * @var null
+     */
+    private $yy_global_literal = null;
+
     /**
      * constructor
      *
@@ -324,14 +338,13 @@ class Smarty_Internal_Templatelexer
      if = ~(if|elseif|else if|while)\s+~
      for = ~for\s+~
      makenocache = ~make_nocache\s+~
+     array = ~array~
      foreach = ~foreach(?![^\s])~
      setfilter = ~setfilter\s+~
      instanceof = ~\s+instanceof\s+~
      not = ~[!]\s*|not\s+~
      typecast = ~[(](int(eger)?|bool(ean)?|float|double|real|string|binary|array|object)[)]\s*~
      double_quote = ~["]~
-     text = ~(.*?)(?=((SMARTYldel)SMARTYal|[<][?]((php\s+|=)|\s+)|[<][%]|[<][?]xml\s+|[<]script\s+language\s*=\s*["']?\s*php\s*["']?\s*[>]|[?][>]|[%][>]SMARTYliteral))|[\s\S]+~
-     literaltext = ~(.*?)(?=(SMARTYldel)SMARTYal[/]?literalSMARTYrdel)~
      */
      /*!lex2php
      %statename TEXT
@@ -339,7 +352,8 @@ class Smarty_Internal_Templatelexer
         $this->token = Smarty_Internal_Templateparser::TP_TEXT;
      }
      comment {
-        preg_match("/[*]{$this->compiler->getRdelPreg()}[\n]?/",$this->data,$match,PREG_OFFSET_CAPTURE,$this->counter);
+       $to = $this->dataLength;
+       preg_match("/[*]{$this->compiler->getRdelPreg()}[\n]?/",$this->data,$match,PREG_OFFSET_CAPTURE,$this->counter);
         if (isset($match[0][1])) {
             $to = $match[0][1] + strlen($match[0][0]);
         } else {
@@ -369,8 +383,17 @@ class Smarty_Internal_Templatelexer
      phpstart {
         $this->compiler->getTagCompiler('private_php')->parsePhp($this);
      }
-     text {
-        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+     char {
+       if (!isset($this->yy_global_text)) {
+           $this->yy_global_text = $this->replace('/(SMARTYldel)SMARTYal|[<][?]((php\s+|=)|\s+)|[<][%]|[<][?]xml\s+|[<]script\s+language\s*=\s*["\']?\s*php\s*["\']?\s*[>]|[?][>]|[%][>]SMARTYliteral/isS');
+       }
+       $to = $this->dataLength;
+       preg_match($this->yy_global_text, $this->data,$match,PREG_OFFSET_CAPTURE,$this->counter);
+       if (isset($match[0][1])) {
+         $to = $match[0][1];
+       }
+       $this->value = substr($this->data,$this->counter,$to-$this->counter);
+       $this->token = Smarty_Internal_Templateparser::TP_TEXT;
      }
      */
      /*!lex2php
@@ -528,6 +551,9 @@ class Smarty_Internal_Templatelexer
      at {
         $this->token = Smarty_Internal_Templateparser::TP_AT;
      }
+     array openP {
+        $this->token = Smarty_Internal_Templateparser::TP_ARRAYOPEN;
+     }
      hatch {
         $this->token = Smarty_Internal_Templateparser::TP_HATCH;
      }
@@ -601,8 +627,19 @@ class Smarty_Internal_Templatelexer
             $this->yypopstate();
         }
      }
-     literaltext {
-        $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
+     char {
+       if (!isset($this->yy_global_literal)) {
+           $this->yy_global_literal = $this->replace('/(SMARTYldel)SMARTYal[\/]?literalSMARTYrdel/isS');
+       }
+       $to = $this->dataLength;
+       preg_match($this->yy_global_literal, $this->data,$match,PREG_OFFSET_CAPTURE,$this->counter);
+       if (isset($match[0][1])) {
+         $to = $match[0][1];
+       } else {
+          $this->compiler->trigger_template_error ("missing or misspelled literal closing tag");
+       }
+       $this->value = substr($this->data,$this->counter,$to-$this->counter);
+       $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
      }
      */
      /*!lex2php
@@ -648,7 +685,12 @@ class Smarty_Internal_Templatelexer
      textdoublequoted {
         $this->token = Smarty_Internal_Templateparser::TP_TEXT;
      }
-     */
+     char {
+        $to = $this->dataLength;
+        $this->value = substr($this->data,$this->counter,$to-$this->counter);
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+     }
+    */
   }
 
      

lexer/smarty_internal_templateparser.y

@@ -226,7 +226,7 @@ class Smarty_Internal_Templateparser
 
 %right VERT.
 %left COLON.
-%left UNIMATH.
+
 
     //
     // complete template
@@ -632,16 +632,6 @@ expr(res)        ::= expr(e) MATH(m) value(v). {
 expr(res)        ::= expr(e) UNIMATH(m) value(v). {
     res = e . trim(m) . v;
 }
- 
-                  // array
-expr(res)       ::= array(a). {
-    res = a;
-}
-
-                  // modifier
-expr(res)        ::= expr(e) modifierlist(l). {
-    res = $this->compiler->compileTag('private_modifier',array(),array('value'=>e,'modifierlist'=>l));
-}
 
 // if expression
                     // special conditions
@@ -787,7 +777,10 @@ value(res)       ::= NAMESPACE(c). {
     res = c;
 }
 
-
+                  // array
+value(res)       ::= arraydef(a). {
+    res = a;
+}
                   // static class access
 value(res)       ::= ns1(c)DOUBLECOLON static_class_access(s). {
     if (!in_array(strtolower(c), array('self', 'parent')) && (!$this->security || $this->security->isTrustedStaticClassAccess(c, s, $this->compiler))) {
@@ -1109,6 +1102,9 @@ modparameters(res)      ::= . {
 modparameter(res) ::= COLON value(mp). {
     res = array(mp);
 }
+modparameter(res) ::= COLON UNIMATH(m) value(mp). {
+    res = array(trim(m).mp);
+}
 
 modparameter(res) ::= COLON array(mp). {
     res = array(mp);
@@ -1191,7 +1187,10 @@ scond(res)  ::= SINGLECOND(o). {
 //
 // ARRAY element assignment
 //
-array(res)           ::=  OPENB arrayelements(a) CLOSEB.  {
+arraydef(res)           ::=  OPENB arrayelements(a) CLOSEB.  {
+    res = 'array('.a.')';
+}
+arraydef(res)           ::=  ARRAYOPEN arrayelements(a) CLOSEP.  {
     res = 'array('.a.')';
 }
 

libs/Autoloader.php

@@ -90,7 +90,7 @@ class Smarty_Autoloader
      */
     public static function autoload($class)
     {
-        if ($class[ 0 ] !== 'S' && strpos($class, 'Smarty') !== 0) {
+        if ($class[ 0 ] !== 'S' || strpos($class, 'Smarty') !== 0) {
             return;
         }
         $_class = strtolower($class);

libs/Smarty.class.php

@@ -27,7 +27,7 @@
  * @author    Uwe Tews   <uwe dot tews at gmail dot com>
  * @author    Rodney Rehm
  * @package   Smarty
- * @version   3.1.33
+ * @version   3.1.34-dev
  */
 /**
  * set SMARTY_DIR to absolute path to Smarty library files.
@@ -112,7 +112,7 @@ class Smarty extends Smarty_Internal_TemplateBase
     /**
      * smarty version
      */
-    const SMARTY_VERSION = '3.1.33';
+    const SMARTY_VERSION = '3.1.34-dev-7';
     /**
      * define variable scopes
      */

libs/plugins/modifier.date_format.php

@@ -41,9 +41,9 @@ function smarty_modifier_date_format($string, $format = null, $default_date = ''
         }
         $is_loaded = true;
     }
-    if ($string !== '' && $string !== '0000-00-00' && $string !== '0000-00-00 00:00:00') {
+    if (!empty($string) && $string !== '0000-00-00' && $string !== '0000-00-00 00:00:00') {
         $timestamp = smarty_make_timestamp($string);
-    } elseif ($default_date !== '') {
+    } elseif (!empty($default_date)) {
         $timestamp = smarty_make_timestamp($default_date);
     } else {
         return;

libs/sysplugins/smarty_internal_compile_assign.php

@@ -83,7 +83,7 @@ class Smarty_Internal_Compile_Assign extends Smarty_Internal_CompileBase
         if (isset($parameter[ 'smarty_internal_index' ])) {
             $output =
                 "<?php \$_tmp_array = isset(\$_smarty_tpl->tpl_vars[{$_var}]) ? \$_smarty_tpl->tpl_vars[{$_var}]->value : array();\n";
-            $output .= "if (!is_array(\$_tmp_array) || \$_tmp_array instanceof ArrayAccess) {\n";
+            $output .= "if (!(is_array(\$_tmp_array) || \$_tmp_array instanceof ArrayAccess)) {\n";
             $output .= "settype(\$_tmp_array, 'array');\n";
             $output .= "}\n";
             $output .= "\$_tmp_array{$parameter['smarty_internal_index']} = {$_attr['value']};\n";

libs/sysplugins/smarty_internal_compile_foreach.php

@@ -219,8 +219,9 @@ class Smarty_Internal_Compile_Foreach extends Smarty_Internal_Compile_Private_Fo
         if (isset($itemAttr[ 'index' ])) {
             $output .= "{$itemVar}->index = -1;\n";
         }
-        $output .= "if (\$_from !== null) {\n";
-        $output .= "foreach (\$_from as {$keyTerm}{$itemVar}->value) {\n";
+	    $output .= "{$itemVar}->do_else = true;\n";
+        $output .= "if (\$_from !== null) foreach (\$_from as {$keyTerm}{$itemVar}->value) {\n";
+	    $output .= "{$itemVar}->do_else = false;\n";
         if (isset($attributes[ 'key' ]) && isset($itemAttr[ 'key' ])) {
             $output .= "\$_smarty_tpl->tpl_vars['{$key}']->value = {$itemVar}->key;\n";
         }
@@ -296,7 +297,7 @@ class Smarty_Internal_Compile_Foreachelse extends Smarty_Internal_CompileBase
         if ($restore === 2) {
             $output .= "{$itemVar} = {$local}saved;\n";
         }
-        $output .= "}\n} else {\n?>";
+        $output .= "}\nif ({$itemVar}->do_else) {\n?>";
         return $output;
     }
 }
@@ -332,9 +333,6 @@ class Smarty_Internal_Compile_Foreachclose extends Smarty_Internal_CompileBase
         if ($restore === 2) {
             $output .= "{$itemVar} = {$local}saved;\n";
         }
-        if ($restore > 0) {
-            $output .= "}\n";
-        }
         $output .= "}\n";
         /* @var Smarty_Internal_Compile_Foreach $foreachCompiler */
         $foreachCompiler = $compiler->getTagCompiler('foreach');

libs/sysplugins/smarty_internal_compile_insert.php

@@ -151,6 +151,7 @@ class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase
                 $_output .= "echo {$_function}({$_params},\$_smarty_tpl);?>";
             }
         }
+        $compiler->template->compiled->has_nocache_code = true;
         return $_output;
     }
 }

libs/sysplugins/smarty_internal_compile_private_php.php

@@ -47,7 +47,7 @@ class Smarty_Internal_Compile_Private_Php extends Smarty_Internal_CompileBase
                 new Smarty_Internal_ParseTree_Tag(
                     $compiler->parser,
                     $compiler->processNocacheCode(
-                        "<?php echo '{$output}';?>",
+                        "<?php echo '{$output}';?>\n",
                         true
                     )
                 )
@@ -77,7 +77,7 @@ class Smarty_Internal_Compile_Private_Php extends Smarty_Internal_CompileBase
                     new Smarty_Internal_ParseTree_Tag(
                         $compiler->parser,
                         $compiler->processNocacheCode(
-                            "<?php echo '{$output}';?>",
+                            "<?php echo '{$output}';?>\n",
                             true
                         )
                     )

libs/sysplugins/smarty_internal_parsetree_template.php

@@ -85,45 +85,85 @@ class Smarty_Internal_ParseTree_Template extends Smarty_Internal_ParseTree
     public function to_smarty_php(Smarty_Internal_Templateparser $parser)
     {
         $code = '';
-        for ($key = 0, $cnt = count($this->subtrees); $key < $cnt; $key++) {
-            if ($this->subtrees[ $key ] instanceof Smarty_Internal_ParseTree_Text) {
-                $subtree = $this->subtrees[ $key ]->to_smarty_php($parser);
-                while ($key + 1 < $cnt && ($this->subtrees[ $key + 1 ] instanceof Smarty_Internal_ParseTree_Text ||
-                                           $this->subtrees[ $key + 1 ]->data === '')) {
-                    $key++;
-                    if ($this->subtrees[ $key ]->data === '') {
-                        continue;
-                    }
-                    $subtree .= $this->subtrees[ $key ]->to_smarty_php($parser);
-                }
-                if ($subtree === '') {
-                    continue;
-                }
-                $code .= preg_replace(
-                    '/((<%)|(%>)|(<\?php)|(<\?)|(\?>)|(<\/?script))/',
-                    "<?php echo '\$1'; ?>\n",
-                    $subtree
-                );
-                continue;
-            }
-            if ($this->subtrees[ $key ] instanceof Smarty_Internal_ParseTree_Tag) {
-                $subtree = $this->subtrees[ $key ]->to_smarty_php($parser);
-                while ($key + 1 < $cnt && ($this->subtrees[ $key + 1 ] instanceof Smarty_Internal_ParseTree_Tag ||
-                                           $this->subtrees[ $key + 1 ]->data === '')) {
-                    $key++;
-                    if ($this->subtrees[ $key ]->data === '') {
-                        continue;
-                    }
-                    $subtree = $parser->compiler->appendCode($subtree, $this->subtrees[ $key ]->to_smarty_php($parser));
-                }
-                if ($subtree === '') {
-                    continue;
-                }
-                $code .= $subtree;
-                continue;
-            }
-            $code .= $this->subtrees[ $key ]->to_smarty_php($parser);
+
+        foreach ($this->getChunkedSubtrees() as $chunk) {
+	        $text = '';
+	        switch ($chunk['mode']) {
+		        case 'textstripped':
+			        foreach ($chunk['subtrees'] as $subtree) {
+				        $text .= $subtree->to_smarty_php($parser);
+			        }
+			        $code .= preg_replace(
+				        '/((<%)|(%>)|(<\?php)|(<\?)|(\?>)|(<\/?script))/',
+				        "<?php echo '\$1'; ?>\n",
+				        $parser->compiler->processText($text)
+			        );
+			        break;
+		        case 'text':
+			        foreach ($chunk['subtrees'] as $subtree) {
+				        $text .= $subtree->to_smarty_php($parser);
+			        }
+			        $code .= preg_replace(
+				        '/((<%)|(%>)|(<\?php)|(<\?)|(\?>)|(<\/?script))/',
+				        "<?php echo '\$1'; ?>\n",
+				        $text
+			        );
+			        break;
+		        case 'tag':
+			        foreach ($chunk['subtrees'] as $subtree) {
+				        $text = $parser->compiler->appendCode($text, $subtree->to_smarty_php($parser));
+			        }
+			        $code .= $text;
+			        break;
+		        default:
+			        foreach ($chunk['subtrees'] as $subtree) {
+				        $text = $subtree->to_smarty_php($parser);
+			        }
+			        $code .= $text;
+
+	        }
         }
         return $code;
     }
+
+    private function getChunkedSubtrees() {
+    	$chunks = [];
+    	$currentMode = null;
+    	$currentChunk = [];
+	    for ($key = 0, $cnt = count($this->subtrees); $key < $cnt; $key++) {
+
+	    	if ($this->subtrees[ $key ]->data === '' && in_array($currentMode, ['textstripped', 'text', 'tag'])) {
+	    		continue;
+	    	}
+
+		    if ($this->subtrees[ $key ] instanceof Smarty_Internal_ParseTree_Text
+			    && $this->subtrees[ $key ]->isToBeStripped()) {
+		    	$newMode = 'textstripped';
+		    } elseif ($this->subtrees[ $key ] instanceof Smarty_Internal_ParseTree_Text) {
+			    $newMode = 'text';
+		    } elseif ($this->subtrees[ $key ] instanceof Smarty_Internal_ParseTree_Tag) {
+			    $newMode = 'tag';
+		    } else {
+			    $newMode = 'other';
+		    }
+
+		    if ($newMode == $currentMode) {
+			    $currentChunk[] = $this->subtrees[ $key ];
+		    } else {
+		    	$chunks[] = [
+		    		'mode' => $currentMode,
+				    'subtrees' => $currentChunk
+			    ];
+		    	$currentMode = $newMode;
+			    $currentChunk = [$this->subtrees[ $key ]];
+		    }
+	    }
+	    if ($currentMode && $currentChunk) {
+		    $chunks[] = [
+			    'mode' => $currentMode,
+			    'subtrees' => $currentChunk
+		    ];
+	    }
+		return $chunks;
+    }
 }

libs/sysplugins/smarty_internal_parsetree_text.php

@@ -16,14 +16,31 @@
  */
 class Smarty_Internal_ParseTree_Text extends Smarty_Internal_ParseTree
 {
-    /**
-     * Create template text buffer
-     *
-     * @param string $data text
-     */
-    public function __construct($data)
+
+	/**
+	 * Wether this section should be stripped on output to smarty php
+	 * @var bool
+	 */
+	private $toBeStripped = false;
+
+	/**
+	 * Create template text buffer
+	 *
+	 * @param string $data text
+	 * @param bool $toBeStripped wether this section should be stripped on output to smarty php
+	 */
+    public function __construct($data, $toBeStripped = false)
     {
         $this->data = $data;
+        $this->toBeStripped = $toBeStripped;
+    }
+
+	/**
+	 * Wether this section should be stripped on output to smarty php
+	 * @return bool
+	 */
+	public function isToBeStripped() {
+    	return $this->toBeStripped;
     }
 
     /**

libs/sysplugins/smarty_internal_runtime_inheritance.php

@@ -150,7 +150,7 @@ class Smarty_Internal_Runtime_Inheritance
             return;
         }
         // make sure we got child block of child template of current block
-        while ($block->child && $block->tplIndex <= $block->child->tplIndex) {
+        while ($block->child && $block->child->child && $block->tplIndex <= $block->child->tplIndex) {
             $block->child = $block->child->child;
         }
         $this->process($tpl, $block);

libs/sysplugins/smarty_internal_templatebase.php

@@ -265,7 +265,7 @@ abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data
      *
      * @param string   $type       plugin type
      * @param string   $name       name of template tag
-     * @param callback $callback   PHP callback to register
+     * @param callable $callback   PHP callback to register
      * @param bool     $cacheable  if true (default) this function is cache able
      * @param mixed    $cache_attr caching attributes if any
      *
@@ -301,7 +301,7 @@ abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data
      * @link http://www.smarty.net/docs/en/api.register.filter.tpl
      *
      * @param string      $type filter type
-     * @param callback    $callback
+     * @param callable    $callback
      * @param string|null $name optional filter name
      *
      * @return \Smarty|\Smarty_Internal_Template

libs/sysplugins/smarty_internal_templatecompilerbase.php

@@ -672,73 +672,69 @@ abstract class Smarty_Internal_TemplateCompilerBase
     }
 
     /**
-     * This method is called from parser to process a text content section
+     * This method is called from parser to process a text content section if strip is enabled
      * - remove text from inheritance child templates as they may generate output
-     * - strip text if strip is enabled
      *
      * @param string $text
      *
-     * @return null|\Smarty_Internal_ParseTree_Text
+     * @return string
      */
     public function processText($text)
     {
-        if ((string)$text != '') {
-            $store = array();
-            $_store = 0;
-            if ($this->parser->strip) {
-                if (strpos($text, '<') !== false) {
-                    // capture html elements not to be messed with
-                    $_offset = 0;
-                    if (preg_match_all(
-                        '#(<script[^>]*>.*?</script[^>]*>)|(<textarea[^>]*>.*?</textarea[^>]*>)|(<pre[^>]*>.*?</pre[^>]*>)#is',
-                        $text,
-                        $matches,
-                        PREG_OFFSET_CAPTURE | PREG_SET_ORDER
-                    )
-                    ) {
-                        foreach ($matches as $match) {
-                            $store[] = $match[ 0 ][ 0 ];
-                            $_length = strlen($match[ 0 ][ 0 ]);
-                            $replace = '@!@SMARTY:' . $_store . ':SMARTY@!@';
-                            $text = substr_replace($text, $replace, $match[ 0 ][ 1 ] - $_offset, $_length);
-                            $_offset += $_length - strlen($replace);
-                            $_store++;
-                        }
-                    }
-                    $expressions = array(// replace multiple spaces between tags by a single space
-                                         '#(:SMARTY@!@|>)[\040\011]+(?=@!@SMARTY:|<)#s'                            => '\1 \2',
-                                         // remove newline between tags
-                                         '#(:SMARTY@!@|>)[\040\011]*[\n]\s*(?=@!@SMARTY:|<)#s'                     => '\1\2',
-                                         // remove multiple spaces between attributes (but not in attribute values!)
-                                         '#(([a-z0-9]\s*=\s*("[^"]*?")|(\'[^\']*?\'))|<[a-z0-9_]+)\s+([a-z/>])#is' => '\1 \5',
-                                         '#>[\040\011]+$#Ss'                                                       => '> ',
-                                         '#>[\040\011]*[\n]\s*$#Ss'                                                => '>',
-                                         $this->stripRegEx                                                         => '',
-                    );
-                    $text = preg_replace(array_keys($expressions), array_values($expressions), $text);
-                    $_offset = 0;
-                    if (preg_match_all(
-                        '#@!@SMARTY:([0-9]+):SMARTY@!@#is',
-                        $text,
-                        $matches,
-                        PREG_OFFSET_CAPTURE | PREG_SET_ORDER
-                    )
-                    ) {
-                        foreach ($matches as $match) {
-                            $_length = strlen($match[ 0 ][ 0 ]);
-                            $replace = $store[ $match[ 1 ][ 0 ] ];
-                            $text = substr_replace($text, $replace, $match[ 0 ][ 1 ] + $_offset, $_length);
-                            $_offset += strlen($replace) - $_length;
-                            $_store++;
-                        }
-                    }
-                } else {
-                    $text = preg_replace($this->stripRegEx, '', $text);
-                }
-            }
-            return new Smarty_Internal_ParseTree_Text($text);
+
+        if (strpos($text, '<') === false) {
+        	return preg_replace($this->stripRegEx, '', $text);
         }
-        return null;
+
+	    $store = array();
+	    $_store = 0;
+
+        // capture html elements not to be messed with
+        $_offset = 0;
+        if (preg_match_all(
+            '#(<script[^>]*>.*?</script[^>]*>)|(<textarea[^>]*>.*?</textarea[^>]*>)|(<pre[^>]*>.*?</pre[^>]*>)#is',
+            $text,
+            $matches,
+            PREG_OFFSET_CAPTURE | PREG_SET_ORDER
+        )
+        ) {
+            foreach ($matches as $match) {
+                $store[] = $match[ 0 ][ 0 ];
+                $_length = strlen($match[ 0 ][ 0 ]);
+                $replace = '@!@SMARTY:' . $_store . ':SMARTY@!@';
+                $text = substr_replace($text, $replace, $match[ 0 ][ 1 ] - $_offset, $_length);
+                $_offset += $_length - strlen($replace);
+                $_store++;
+            }
+        }
+        $expressions = array(// replace multiple spaces between tags by a single space
+                             '#(:SMARTY@!@|>)[\040\011]+(?=@!@SMARTY:|<)#s'                            => '\1 \2',
+                             // remove newline between tags
+                             '#(:SMARTY@!@|>)[\040\011]*[\n]\s*(?=@!@SMARTY:|<)#s'                     => '\1\2',
+                             // remove multiple spaces between attributes (but not in attribute values!)
+                             '#(([a-z0-9]\s*=\s*("[^"]*?")|(\'[^\']*?\'))|<[a-z0-9_]+)\s+([a-z/>])#is' => '\1 \5',
+                             '#>[\040\011]+$#Ss'                                                       => '> ',
+                             '#>[\040\011]*[\n]\s*$#Ss'                                                => '>',
+                             $this->stripRegEx                                                         => '',
+        );
+        $text = preg_replace(array_keys($expressions), array_values($expressions), $text);
+        $_offset = 0;
+        if (preg_match_all(
+            '#@!@SMARTY:([0-9]+):SMARTY@!@#is',
+            $text,
+            $matches,
+            PREG_OFFSET_CAPTURE | PREG_SET_ORDER
+        )
+        ) {
+            foreach ($matches as $match) {
+                $_length = strlen($match[ 0 ][ 0 ]);
+                $replace = $store[ $match[ 1 ][ 0 ] ];
+                $text = substr_replace($text, $replace, $match[ 0 ][ 1 ] + $_offset, $_length);
+                $_offset += strlen($replace) - $_length;
+                $_store++;
+            }
+        }
+        return $text;
     }
 
     /**

libs/sysplugins/smarty_internal_templatelexer.php

@@ -215,9 +215,23 @@ class Smarty_Internal_Templatelexer
      */
     private $yy_global_pattern5 = null;
 
-    private $_yy_state          = 1;
+    /**
+     * preg token pattern for text
+     *
+     * @var null
+     */
+    private $yy_global_text = null;
 
-    private $_yy_stack          = array();
+    /**
+     * preg token pattern for literal
+     *
+     * @var null
+     */
+    private $yy_global_literal = null;
+
+    private $_yy_state         = 1;
+
+    private $_yy_stack         = array();
 
     /**
      * constructor
@@ -319,7 +333,7 @@ class Smarty_Internal_Templatelexer
     {
         if (!isset($this->yy_global_pattern1)) {
             $this->yy_global_pattern1 =
-                $this->replace("/\G([{][}])|\G((SMARTYldel)SMARTYal[*])|\G((SMARTYldel)SMARTYalphp([ ].*?)?SMARTYrdel|(SMARTYldel)SMARTYal[\/]phpSMARTYrdel)|\G((SMARTYldel)SMARTYautoliteral\\s+SMARTYliteral)|\G((SMARTYldel)SMARTYalliteral\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[\/]literal\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal)|\G([<][?]((php\\s+|=)|\\s+)|[<][%]|[<][?]xml\\s+|[<]script\\s+language\\s*=\\s*[\"']?\\s*php\\s*[\"']?\\s*[>]|[?][>]|[%][>])|\G((.*?)(?=((SMARTYldel)SMARTYal|[<][?]((php\\s+|=)|\\s+)|[<][%]|[<][?]xml\\s+|[<]script\\s+language\\s*=\\s*[\"']?\\s*php\\s*[\"']?\\s*[>]|[?][>]|[%][>]SMARTYliteral))|[\s\S]+)/isS");
+                $this->replace("/\G([{][}])|\G((SMARTYldel)SMARTYal[*])|\G((SMARTYldel)SMARTYalphp([ ].*?)?SMARTYrdel|(SMARTYldel)SMARTYal[\/]phpSMARTYrdel)|\G((SMARTYldel)SMARTYautoliteral\\s+SMARTYliteral)|\G((SMARTYldel)SMARTYalliteral\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[\/]literal\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal)|\G([<][?]((php\\s+|=)|\\s+)|[<][%]|[<][?]xml\\s+|[<]script\\s+language\\s*=\\s*[\"']?\\s*php\\s*[\"']?\\s*[>]|[?][>]|[%][>])|\G([\S\s])/isS");
         }
         if (!isset($this->dataLength)) {
             $this->dataLength = strlen($this->data);
@@ -336,11 +350,8 @@ class Smarty_Internal_Templatelexer
                 }
                 if (empty($yymatches)) {
                     throw new Exception('Error: lexing failed because a rule matched' .
-                                        ' an empty string.  Input "' . substr(
-                                            $this->data,
-                                            $this->counter,
-                                            5
-                                        ) . '... state TEXT');
+                                        ' an empty string.  Input "' . substr($this->data,
+                            $this->counter, 5) . '... state TEXT');
                 }
                 next($yymatches); // skip global match
                 $this->token = key($yymatches); // token number
@@ -365,7 +376,7 @@ class Smarty_Internal_Templatelexer
                     continue;
                 }
             } else {
-                throw new Exception('Unexpected input at line' . $this->line .
+                throw new Exception('Unexpected input at line ' . $this->line .
                                     ': ' . $this->data[ $this->counter ]);
             }
             break;
@@ -379,6 +390,7 @@ class Smarty_Internal_Templatelexer
 
     public function yy_r1_2()
     {
+        $to = $this->dataLength;
         preg_match("/[*]{$this->compiler->getRdelPreg()}[\n]?/", $this->data, $match, PREG_OFFSET_CAPTURE,
             $this->counter);
         if (isset($match[ 0 ][ 1 ])) {
@@ -425,6 +437,16 @@ class Smarty_Internal_Templatelexer
 
     public function yy_r1_19()
     {
+        if (!isset($this->yy_global_text)) {
+            $this->yy_global_text =
+                $this->replace('/(SMARTYldel)SMARTYal|[<][?]((php\s+|=)|\s+)|[<][%]|[<][?]xml\s+|[<]script\s+language\s*=\s*["\']?\s*php\s*["\']?\s*[>]|[?][>]|[%][>]SMARTYliteral/isS');
+        }
+        $to = $this->dataLength;
+        preg_match($this->yy_global_text, $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter);
+        if (isset($match[ 0 ][ 1 ])) {
+            $to = $match[ 0 ][ 1 ];
+        }
+        $this->value = substr($this->data, $this->counter, $to - $this->counter);
         $this->token = Smarty_Internal_Templateparser::TP_TEXT;
     }
 
@@ -449,11 +471,8 @@ class Smarty_Internal_Templatelexer
                 }
                 if (empty($yymatches)) {
                     throw new Exception('Error: lexing failed because a rule matched' .
-                                        ' an empty string.  Input "' . substr(
-                                            $this->data,
-                                            $this->counter,
-                                            5
-                                        ) . '... state TAG');
+                                        ' an empty string.  Input "' . substr($this->data,
+                            $this->counter, 5) . '... state TAG');
                 }
                 next($yymatches); // skip global match
                 $this->token = key($yymatches); // token number
@@ -478,7 +497,7 @@ class Smarty_Internal_Templatelexer
                     continue;
                 }
             } else {
-                throw new Exception('Unexpected input at line' . $this->line .
+                throw new Exception('Unexpected input at line ' . $this->line .
                                     ': ' . $this->data[ $this->counter ]);
             }
             break;
@@ -573,7 +592,7 @@ class Smarty_Internal_Templatelexer
     {
         if (!isset($this->yy_global_pattern3)) {
             $this->yy_global_pattern3 =
-                $this->replace("/\G(\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal)|\G([\"])|\G('[^'\\\\]*(?:\\\\.[^'\\\\]*)*')|\G([$][0-9]*[a-zA-Z_]\\w*)|\G([$])|\G(\\s+is\\s+in\\s+)|\G(\\s+as\\s+)|\G(\\s+to\\s+)|\G(\\s+step\\s+)|\G(\\s+instanceof\\s+)|\G(\\s*([!=][=]{1,2}|[<][=>]?|[>][=]?|[&|]{2})\\s*)|\G(\\s+(eq|ne|neq|gt|ge|gte|lt|le|lte|mod|and|or|xor)\\s+)|\G(\\s+is\\s+(not\\s+)?(odd|even|div)\\s+by\\s+)|\G(\\s+is\\s+(not\\s+)?(odd|even))|\G([!]\\s*|not\\s+)|\G([(](int(eger)?|bool(ean)?|float|double|real|string|binary|array|object)[)]\\s*)|\G(\\s*[(]\\s*)|\G(\\s*[)])|\G(\\[\\s*)|\G(\\s*\\])|\G(\\s*[-][>]\\s*)|\G(\\s*[=][>]\\s*)|\G(\\s*[=]\\s*)|\G(([+]|[-]){2})|\G(\\s*([+]|[-])\\s*)|\G(\\s*([*]{1,2}|[%\/^&]|[<>]{2})\\s*)|\G([@])|\G([#])|\G(\\s+[0-9]*[a-zA-Z_][a-zA-Z0-9_\-:]*\\s*[=]\\s*)|\G(([0-9]*[a-zA-Z_]\\w*)?(\\\\[0-9]*[a-zA-Z_]\\w*)+)|\G([0-9]*[a-zA-Z_]\\w*)|\G(\\d+)|\G([`])|\G([|][@]?)|\G([.])|\G(\\s*[,]\\s*)|\G(\\s*[;]\\s*)|\G([:]{2})|\G(\\s*[:]\\s*)|\G(\\s*[?]\\s*)|\G(0[xX][0-9a-fA-F]+)|\G(\\s+)|\G([\S\s])/isS");
+                $this->replace("/\G(\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal)|\G([\"])|\G('[^'\\\\]*(?:\\\\.[^'\\\\]*)*')|\G([$][0-9]*[a-zA-Z_]\\w*)|\G([$])|\G(\\s+is\\s+in\\s+)|\G(\\s+as\\s+)|\G(\\s+to\\s+)|\G(\\s+step\\s+)|\G(\\s+instanceof\\s+)|\G(\\s*([!=][=]{1,2}|[<][=>]?|[>][=]?|[&|]{2})\\s*)|\G(\\s+(eq|ne|neq|gt|ge|gte|lt|le|lte|mod|and|or|xor)\\s+)|\G(\\s+is\\s+(not\\s+)?(odd|even|div)\\s+by\\s+)|\G(\\s+is\\s+(not\\s+)?(odd|even))|\G([!]\\s*|not\\s+)|\G([(](int(eger)?|bool(ean)?|float|double|real|string|binary|array|object)[)]\\s*)|\G(\\s*[(]\\s*)|\G(\\s*[)])|\G(\\[\\s*)|\G(\\s*\\])|\G(\\s*[-][>]\\s*)|\G(\\s*[=][>]\\s*)|\G(\\s*[=]\\s*)|\G(([+]|[-]){2})|\G(\\s*([+]|[-])\\s*)|\G(\\s*([*]{1,2}|[%\/^&]|[<>]{2})\\s*)|\G([@])|\G(array\\s*[(]\\s*)|\G([#])|\G(\\s+[0-9]*[a-zA-Z_][a-zA-Z0-9_\-:]*\\s*[=]\\s*)|\G(([0-9]*[a-zA-Z_]\\w*)?(\\\\[0-9]*[a-zA-Z_]\\w*)+)|\G([0-9]*[a-zA-Z_]\\w*)|\G(\\d+)|\G([`])|\G([|][@]?)|\G([.])|\G(\\s*[,]\\s*)|\G(\\s*[;]\\s*)|\G([:]{2})|\G(\\s*[:]\\s*)|\G(\\s*[?]\\s*)|\G(0[xX][0-9a-fA-F]+)|\G(\\s+)|\G([\S\s])/isS");
         }
         if (!isset($this->dataLength)) {
             $this->dataLength = strlen($this->data);
@@ -590,11 +609,8 @@ class Smarty_Internal_Templatelexer
                 }
                 if (empty($yymatches)) {
                     throw new Exception('Error: lexing failed because a rule matched' .
-                                        ' an empty string.  Input "' . substr(
-                                            $this->data,
-                                            $this->counter,
-                                            5
-                                        ) . '... state TAGBODY');
+                                        ' an empty string.  Input "' . substr($this->data,
+                            $this->counter, 5) . '... state TAGBODY');
                 }
                 next($yymatches); // skip global match
                 $this->token = key($yymatches); // token number
@@ -619,7 +635,7 @@ class Smarty_Internal_Templatelexer
                     continue;
                 }
             } else {
-                throw new Exception('Unexpected input at line' . $this->line .
+                throw new Exception('Unexpected input at line ' . $this->line .
                                     ': ' . $this->data[ $this->counter ]);
             }
             break;
@@ -772,10 +788,15 @@ class Smarty_Internal_Templatelexer
 
     public function yy_r3_42()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_HATCH;
+        $this->token = Smarty_Internal_Templateparser::TP_ARRAYOPEN;
     }
 
     public function yy_r3_43()
+    {
+        $this->token = Smarty_Internal_Templateparser::TP_HATCH;
+    }
+
+    public function yy_r3_44()
     {
         // resolve conflicts with shorttag and right_delimiter starting with '='
         if (substr($this->data, $this->counter + strlen($this->value) - 1, $this->compiler->getRdelLength()) ===
@@ -788,73 +809,73 @@ class Smarty_Internal_Templatelexer
         }
     }
 
-    public function yy_r3_44()
+    public function yy_r3_45()
     {
         $this->token = Smarty_Internal_Templateparser::TP_NAMESPACE;
     }
 
-    public function yy_r3_47()
+    public function yy_r3_48()
     {
         $this->token = Smarty_Internal_Templateparser::TP_ID;
     }
 
-    public function yy_r3_48()
+    public function yy_r3_49()
     {
         $this->token = Smarty_Internal_Templateparser::TP_INTEGER;
     }
 
-    public function yy_r3_49()
+    public function yy_r3_50()
     {
         $this->token = Smarty_Internal_Templateparser::TP_BACKTICK;
         $this->yypopstate();
     }
 
-    public function yy_r3_50()
+    public function yy_r3_51()
     {
         $this->token = Smarty_Internal_Templateparser::TP_VERT;
     }
 
-    public function yy_r3_51()
+    public function yy_r3_52()
     {
         $this->token = Smarty_Internal_Templateparser::TP_DOT;
     }
 
-    public function yy_r3_52()
+    public function yy_r3_53()
     {
         $this->token = Smarty_Internal_Templateparser::TP_COMMA;
     }
 
-    public function yy_r3_53()
+    public function yy_r3_54()
     {
         $this->token = Smarty_Internal_Templateparser::TP_SEMICOLON;
     }
 
-    public function yy_r3_54()
+    public function yy_r3_55()
     {
         $this->token = Smarty_Internal_Templateparser::TP_DOUBLECOLON;
     }
 
-    public function yy_r3_55()
+    public function yy_r3_56()
     {
         $this->token = Smarty_Internal_Templateparser::TP_COLON;
     }
 
-    public function yy_r3_56()
+    public function yy_r3_57()
     {
         $this->token = Smarty_Internal_Templateparser::TP_QMARK;
     }
 
-    public function yy_r3_57()
+    public function yy_r3_58()
     {
         $this->token = Smarty_Internal_Templateparser::TP_HEX;
     }
 
-    public function yy_r3_58()
+    public function yy_r3_59()
     {
         $this->token = Smarty_Internal_Templateparser::TP_SPACE;
     } // end function
 
-    public function yy_r3_59()
+    public function yy_r3_60()
     {
         $this->token = Smarty_Internal_Templateparser::TP_TEXT;
     }
@@ -863,7 +884,7 @@ class Smarty_Internal_Templatelexer
     {
         if (!isset($this->yy_global_pattern4)) {
             $this->yy_global_pattern4 =
-                $this->replace("/\G((SMARTYldel)SMARTYalliteral\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[\/]literal\\s*SMARTYrdel)|\G((.*?)(?=(SMARTYldel)SMARTYal[\/]?literalSMARTYrdel))/isS");
+                $this->replace("/\G((SMARTYldel)SMARTYalliteral\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[\/]literal\\s*SMARTYrdel)|\G([\S\s])/isS");
         }
         if (!isset($this->dataLength)) {
             $this->dataLength = strlen($this->data);
@@ -880,11 +901,8 @@ class Smarty_Internal_Templatelexer
                 }
                 if (empty($yymatches)) {
                     throw new Exception('Error: lexing failed because a rule matched' .
-                                        ' an empty string.  Input "' . substr(
-                                            $this->data,
-                                            $this->counter,
-                                            5
-                                        ) . '... state LITERAL');
+                                        ' an empty string.  Input "' . substr($this->data,
+                            $this->counter, 5) . '... state LITERAL');
                 }
                 next($yymatches); // skip global match
                 $this->token = key($yymatches); // token number
@@ -909,7 +927,7 @@ class Smarty_Internal_Templatelexer
                     continue;
                 }
             } else {
-                throw new Exception('Unexpected input at line' . $this->line .
+                throw new Exception('Unexpected input at line ' . $this->line .
                                     ': ' . $this->data[ $this->counter ]);
             }
             break;
@@ -935,6 +953,17 @@ class Smarty_Internal_Templatelexer
 
     public function yy_r4_5()
     {
+        if (!isset($this->yy_global_literal)) {
+            $this->yy_global_literal = $this->replace('/(SMARTYldel)SMARTYal[\/]?literalSMARTYrdel/isS');
+        }
+        $to = $this->dataLength;
+        preg_match($this->yy_global_literal, $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter);
+        if (isset($match[ 0 ][ 1 ])) {
+            $to = $match[ 0 ][ 1 ];
+        } else {
+            $this->compiler->trigger_template_error("missing or misspelled literal closing tag");
+        }
+        $this->value = substr($this->data, $this->counter, $to - $this->counter);
         $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
     } // end function
 
@@ -942,7 +971,7 @@ class Smarty_Internal_Templatelexer
     {
         if (!isset($this->yy_global_pattern5)) {
             $this->yy_global_pattern5 =
-                $this->replace("/\G((SMARTYldel)SMARTYautoliteral\\s+SMARTYliteral)|\G((SMARTYldel)SMARTYalliteral\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[\/]literal\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[\/])|\G((SMARTYldel)SMARTYal[0-9]*[a-zA-Z_]\\w*)|\G((SMARTYldel)SMARTYal)|\G([\"])|\G([`][$])|\G([$][0-9]*[a-zA-Z_]\\w*)|\G([$])|\G(([^\"\\\\]*?)((?:\\\\.[^\"\\\\]*?)*?)(?=((SMARTYldel)SMARTYal|\\$|`\\$|\"SMARTYliteral)))/isS");
+                $this->replace("/\G((SMARTYldel)SMARTYautoliteral\\s+SMARTYliteral)|\G((SMARTYldel)SMARTYalliteral\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[\/]literal\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[\/])|\G((SMARTYldel)SMARTYal[0-9]*[a-zA-Z_]\\w*)|\G((SMARTYldel)SMARTYal)|\G([\"])|\G([`][$])|\G([$][0-9]*[a-zA-Z_]\\w*)|\G([$])|\G(([^\"\\\\]*?)((?:\\\\.[^\"\\\\]*?)*?)(?=((SMARTYldel)SMARTYal|\\$|`\\$|\"SMARTYliteral)))|\G([\S\s])/isS");
         }
         if (!isset($this->dataLength)) {
             $this->dataLength = strlen($this->data);
@@ -959,11 +988,8 @@ class Smarty_Internal_Templatelexer
                 }
                 if (empty($yymatches)) {
                     throw new Exception('Error: lexing failed because a rule matched' .
-                                        ' an empty string.  Input "' . substr(
-                                            $this->data,
-                                            $this->counter,
-                                            5
-                                        ) . '... state DOUBLEQUOTEDSTRING');
+                                        ' an empty string.  Input "' . substr($this->data,
+                            $this->counter, 5) . '... state DOUBLEQUOTEDSTRING');
                 }
                 next($yymatches); // skip global match
                 $this->token = key($yymatches); // token number
@@ -988,7 +1014,7 @@ class Smarty_Internal_Templatelexer
                     continue;
                 }
             } else {
-                throw new Exception('Unexpected input at line' . $this->line .
+                throw new Exception('Unexpected input at line ' . $this->line .
                                     ': ' . $this->data[ $this->counter ]);
             }
             break;
@@ -1057,4 +1083,13 @@ class Smarty_Internal_Templatelexer
     {
         $this->token = Smarty_Internal_Templateparser::TP_TEXT;
     }
+
+    public function yy_r5_22()
+    {
+        $to = $this->dataLength;
+        $this->value = substr($this->data, $this->counter, $to - $this->counter);
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+    }
 }
+
+     

phpunit.sh

@@ -0,0 +1,2 @@
+#! /bin/bash
+vendor/phpunit/phpunit/phpunit tests/UnitTests

phpunit.xml

@@ -0,0 +1,43 @@
+<phpunit
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.5/phpunit.xsd"
+        bootstrap="tests/Bootstrap.php"
+        colors="true"
+        backupGlobals="false"
+        backupStaticAttributes="true"
+        forceCoversAnnotation="false"
+        mapTestClassNameToCoveredClassName="false"
+        processIsolation="false"
+        stopOnError="false"
+        stopOnFailure="false"
+        stopOnIncomplete="false"
+        stopOnSkipped="false"
+        stopOnRisky="false"
+        timeoutForSmallTests="1"
+        timeoutForMediumTests="10"
+        timeoutForLargeTests="60"
+        verbose="false">
+
+<filter>
+        <testsuites>
+            <testsuite name="Smarty Test Suite">
+                <directory>tests/UnitTests</directory>
+            </testsuite>
+        </testsuites>
+        <blacklist>
+            <directory suffix=".php">tests</directory>
+            <directory suffix=".php">tests/cache</directory>
+            <directory suffix=".php">tests/templates_c</directory>
+        </blacklist>
+        <whitelist processUncoveredFilesFromWhitelist="true">
+            <directory suffix=".php">libs</directory>
+            <directory suffix=".php">libs/plugins</directory>
+            <directory suffix=".php">libs/sysplugins</directory>
+            <directory suffix=".php">demo/plugins</directory>
+        </whitelist>
+    </filter>
+    <logging>
+        <log type="tap" target="tests/TestResults.tap"/>
+    </logging>
+
+</phpunit>

tests/.gitignore

@@ -0,0 +1,11 @@
+.idea
+
+# Unit test / coverage reports
+.coverage
+.tox
+
+#Smarty
+testdox.html
+TestResults.tap
+TestResults.txt
+

tests/Bootstrap.php

@@ -0,0 +1,28 @@
+<?php
+/*
+* This file is part of the Smarty PHPUnit tests.
+*
+*/
+/*
+ * Smarty PHPUnit Bootstrap
+ */
+require_once dirname(__FILE__) . '/Config.php';
+require_once dirname(__FILE__) . '/../vendor/autoload.php';
+require_once dirname(__FILE__) . '/../libs/bootstrap.php';
+
+if (!class_exists('\PHPUnit_Framework_TestCase') && class_exists('\PHPUnit\Framework\TestCase')) {
+    class_alias('\PHPUnit\Framework\TestCase', '\PHPUnit_Framework_TestCase');
+    class_alias('\PHPUnit\Framework\Error\Notice', '\PHPUnit_Framework_Error_Notice');
+    class_alias('\PHPUnit\Framework\Error\Error', '\PHPUnit_Framework_Error_Error');
+    class_alias('\PHPUnit\Framework\Error\Warning', '\PHPUnit_Framework_Error_Warning');
+    class_alias('\PHPUnit\Framework\Error\Warning', '\PHPUnit_Framework_Error_Deprecated');
+    class_alias('\PHPUnit\Util\Configuration', '\PHPUnit_Util_Configuration');
+}
+
+require_once 'PHPUnit_Smarty.php';
+if (!ini_get('date.timezone')) {
+    ini_set('date.timezone', 'Europe/Berlin');
+}
+
+
+

tests/Config.php

@@ -0,0 +1,18 @@
+<?php
+/*
+* This file is part of the Smarty PHPUnit tests.
+*
+*/
+/*
+ * Smarty PHPUnit Config
+ */
+define('individualFolders', true);
+define('MemCacheEnable', false);
+define('ApcCacheEnable', false);
+define('MysqlCacheEnable', false);
+define('PdoCacheEnable', false);
+define('PdoGzipCacheEnable', false);
+define('MysqlResourceEnable', false);
+define('DB_DSN', "mysql:dbname=test;host=localhost");
+define('DB_USER', "travis");
+define('DB_PASSWD', "");

tests/Include_Path/Plugins/include/function.plugin1.php

@@ -0,0 +1,5 @@
+<?php
+function smarty_function_plugin1($params, $template)
+{
+    return 'plugin1';
+}

tests/Include_Path/Plugins/include1/function.plugin2.php

@@ -0,0 +1,5 @@
+<?php
+function smarty_function_plugin2($params, $template)
+{
+    return 'plugin2';
+}

tests/Include_Path/Tpl/include/include_test2.tpl

@@ -0,0 +1 @@
+include_test2

tests/Include_Path/Tpl/include/include_test4.tpl

@@ -0,0 +1 @@
+include_test4

tests/Include_Path/Tpl/templates_2/test4.tpl

@@ -0,0 +1 @@
+{include 'include_test4.tpl'}

tests/Include_Path/Tpl/test5.tpl

@@ -0,0 +1 @@
+include path root

tests/PHPUnit_Smarty.php

@@ -0,0 +1,699 @@
+<?php
+/*
+ * This file is part of the Smarty PHPUnit tests.
+ *
+ */
+
+/**
+ * Smarty Test Case Fixture
+ */
+class PHPUnit_Smarty extends PHPUnit_Framework_TestCase
+{
+    /**
+     * Smarty object
+     *
+     * @var SmartyBC
+     */
+    public $smartyBC = null;
+
+    /**
+     * SmartyBC object
+     *
+     * @var Smarty
+     */
+    public $smarty = null;
+
+    /**
+     * Flag if test is using the Smarty object
+     *
+     * @var bool
+     */
+    public $loadSmarty = true;
+
+    /**
+     * Flag if test is using the SmartyBC object
+     *
+     * @var bool
+     */
+    public $loadSmartyBC = false;
+
+    /**
+     * Flag for initialization at first test
+     *
+     * @var bool
+     */
+    public static $init = true;
+
+    /**
+     * Count test number
+     *
+     * @var bool
+     */
+    public static $testNumber = 0;
+
+    /**
+     * Configuration data from config.xml
+     *
+     * @var array
+     */
+    public static $config = null;
+
+    /**
+     * Saved current working directory
+     *
+     * @var null
+     */
+    public static $cwd = null;
+
+    /**
+     * PDO object for Mysql tests
+     *
+     * @var PDO
+     */
+    public static $pdo = null;
+
+    public static $pluginsdir = null;
+
+    /**
+     * Default blacklist
+     *
+     * @var array
+     */
+    protected $backupStaticAttributesBlacklist = array('PHPUnit_Smarty' => array('config', 'pdo', 'init',
+                                                                                 'testNumver', 'pluginsdir'),);
+
+    /**
+     * This method is called before the first test of this test class is run.
+     *
+     */
+    public static function setUpBeforeClass()
+    {
+        error_reporting(E_ALL & ~E_STRICT);
+        self::$init = true;
+        self::$pluginsdir =self::getSmartyPluginsDir();
+    }
+
+    /**
+     * This method is called after the last test of this test class is run.
+     *
+     */
+    public static function tearDownAfterClass()
+    {
+        //self::$pdo = null;
+        self::$testNumber = 0;
+    }
+
+    /**
+     * Constructs a test case with the given name.
+     *
+     * @param string $name
+     * @param array  $data
+     * @param string $dataName
+     */
+    public function __construct($name = null, array $data = array(), $dataName = '')
+    {
+        date_default_timezone_set('Europe/Berlin');
+        if (!defined('individualFolders')) {
+            define('individualFolders', true);
+        }
+        parent::__construct($name, $data, $dataName);
+      $this->backupStaticAttributesBlacklist[ get_class($this) ] = array('init', 'config', 'pdo', 'testNumber');
+    }
+
+    /**
+     * Setup Smarty instance called for each test
+     *
+     * @param null $dir working directory
+     */
+    public function setUpSmarty($dir = null)
+    {
+        static $s_dir;
+        // set up current working directory
+        chdir($dir);
+        self::$cwd = getcwd();
+        // create missing folders for test
+        if (self::$init) {
+            if (!is_dir($dir . '/templates')) {
+                mkdir($dir . '/templates');
+            }
+            if (!is_dir($dir . '/configs')) {
+                mkdir($dir . '/configs');
+            }
+            if (individualFolders != 'true') {
+                if (!isset($s_dir[ $dir ])) {
+                    $this->cleanDir($dir . '/templates_c');
+                    $this->cleanDir($dir . '/cache');
+                    if (is_dir($dir . '/templates_tmp')) {
+                        $this->cleanDir($dir . '/templates_tmp');
+                    }
+                    $s_dir[ $dir ] = true;
+                }
+                $dir = dirname(__FILE__);
+            }
+            if (!is_dir($dir . '/templates_c')) {
+                mkdir($dir . '/templates_c');
+            }
+            chmod($dir . '/templates_c', 0775);
+            if (!is_dir($dir . '/cache')) {
+                mkdir($dir . '/cache');
+                chmod($dir . '/cache', 0775);
+            }
+            self::$init = false;
+        }
+        clearstatcache();
+        // instance Smarty class
+        if ($this->loadSmarty) {
+            $this->smarty = new Smarty;
+            if (individualFolders != 'true') {
+                $this->smarty->setCompileDir(dirname(__FILE__) . '/templates_c');
+                $this->smarty->setCacheDir(dirname(__FILE__) . '/cache');
+            }
+        }
+        // instance SmartyBC class
+        if ($this->loadSmartyBC) {
+            $this->smartyBC = new SmartyBC;
+            if (individualFolders != 'true') {
+                $this->smartyBC->setCompileDir(dirname(__FILE__) . '/templates_c');
+                $this->smartyBC->setCacheDir(dirname(__FILE__) . '/cache');
+            }
+        }
+        $smarty = $this->getSmartyObj();
+    }
+
+    /**
+     * Create Mysql PDO object
+     *
+     */
+    final public function getConnection()
+    {
+        if (PHPUnit_Smarty::$pdo == null) {
+            try {
+                PHPUnit_Smarty::$pdo = new PDO(DB_DSN, DB_USER, DB_PASSWD);
+            }
+            catch (PDOException $e) {
+                throw new SmartyException('Mysql Resource failed: ' . $e->getMessage());
+            }
+            $timezone = date_default_timezone_get();
+            $j = PHPUnit_Smarty::$pdo->exec("SET time_zone = '{$timezone}';");
+
+
+        }
+    }
+
+    /**
+     * Create table for Mysql resource
+     *
+     */
+    public function initMysqlResource()
+    {
+        $this->getConnection();
+        PHPUnit_Smarty::$pdo->exec("DROP TABLE `templates`");
+        PHPUnit_Smarty::$pdo->exec("CREATE TABLE IF NOT EXISTS `templates` (
+ `name` varchar(100) NOT NULL,
+ `modified` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+ `source` text,
+PRIMARY KEY (`name`)
+ ) ENGINE=InnoDB DEFAULT CHARSET=utf8");
+
+    }
+
+    /**
+     * Create table for Mysql cache resource
+     *
+     */
+    public function initMysqlCache()
+    {
+        $this->getConnection();
+        PHPUnit_Smarty::$pdo->exec("DROP TABLE `output_cache`");
+         PHPUnit_Smarty::$pdo->exec("CREATE TABLE IF NOT EXISTS `output_cache` (
+ `name` varchar(256) NOT NULL,
+ `id` char(40) NOT NULL,
+ `cache_id` varchar(250) DEFAULT NULL,
+ `compile_id` varchar(250) DEFAULT NULL,
+`modified` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+ `content` mediumblob NOT NULL,
+PRIMARY KEY (`id`),
+KEY `cache_id` (`cache_id`),
+KEY `compile_id` (`compile_id`),
+KEY `modified` (`modified`),
+KEY `name` (`name`)
+ ) ENGINE=InnoDB DEFAULT CHARSET=utf8");
+//     PHPUnit_Smarty::$pdo->exec("CREATE TABLE IF NOT EXISTS `output_cache` (
+//`id` char(40) NOT NULL,
+//`name` varchar(250) NOT NULL,
+//`cache_id` varchar(250) DEFAULT NULL,
+//`compile_id` varchar(250) DEFAULT NULL,
+//`modified` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+//`expire` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
+//`content` mediumblob NOT NULL,
+///PRIMARY KEY (`id`),
+//KEY `name` (`name`),
+//KEY `cache_id` (`cache_id`),
+//KEY `compile_id` (`compile_id`),
+//KEY `modified` (`modified`),
+//KEY `expire` (`expire`)
+//) ENGINE=InnoDB DEFAULT CHARSET=utf8");
+
+    }
+
+    /**
+     * Delete files in templates_c and cache folders
+     *
+     */
+    public function cleanDirs()
+    {
+        $this->cleanCompileDir();
+        $this->cleanCacheDir();
+        if (is_dir(self::$cwd . '/templates_tmp')) {
+            $this->cleanDir(self::$cwd . '/templates_tmp');
+        }
+        $this->assertTrue(true);
+   }
+
+    /**
+     * Make temporary template file
+     *
+     */
+    public function makeTemplateFile($name, $code)
+    {
+        if (!is_dir(self::$cwd . '/templates_tmp')) {
+            mkdir(self::$cwd . '/templates_tmp');
+            chmod(self::$cwd . '/templates_tmp', 0775);
+        }
+        $fileName = self::$cwd . '/templates_tmp/' . "{$name}";
+        file_put_contents($fileName, $code);
+    }
+
+    /**
+     * Delete files in templates_c folder
+     *
+     */
+    public function cleanCompileDir()
+    {
+        $smarty = $this->getSmartyObj();
+        if (isset($smarty)) {
+            $dir = $smarty->getCompileDir();
+            $this->cleanDir($dir);
+        }
+    }
+
+    /**
+     * Delete files in cache folder
+     *
+     */
+    public function cleanCacheDir()
+    {
+        $smarty = $this->getSmartyObj();
+        if (isset($smarty)) {
+            $dir = $smarty->getCacheDir();
+            $this->cleanDir($dir);
+         }
+    }
+
+    /**
+     * Delete files and sub folders
+     *
+     * @param string $dir
+     */
+    public function cleanDir($dir)
+    {
+        $di = new RecursiveDirectoryIterator($dir);
+        $ri = new RecursiveIteratorIterator($di, RecursiveIteratorIterator::CHILD_FIRST);
+        foreach ($ri as $file) {
+            if (substr(basename($file->getPathname()), 0, 1) === '.' || substr((string)$file,-4) === '.txt') {
+                continue;
+            }
+            // directory ?
+            if ($file->isDir()) {
+                if (!$ri->isDot()) {
+                    // delete folder if empty
+                    @rmdir($file->getPathname());
+                }
+            } else {
+                unlink($file->getPathname());
+            }
+        }
+    }
+
+    /**
+     * Get PDO object
+     *
+     * @return null|PDO
+     */
+    final public function getPDO()
+    {
+        return PHPUnit_Smarty::$pdo;
+    }
+
+    /**
+     * Remove "\r" and replace "\t" with spaces
+     *
+     * @param string $in
+     *
+     * @return mixed
+     */
+    public function normalizeString($in)
+    {
+        if (is_string($in)) {
+            return str_replace(array("\r", "\t"), array('', '    '), $in);
+        } else {
+            return $in;
+        }
+    }
+
+    /**
+     * Remove all spaces
+     *
+     * @param string $in
+     *
+     * @return mixed
+     */
+    public function strip($in)
+    {
+        if (is_string($in)) {
+            return preg_replace('/\s/', '', $in);
+        } else {
+            return $in;
+        }
+    }
+
+    /**
+     * Return source path
+     *
+     * @param Smarty_Internal_TemplateBase $tpl  template object
+     * @param null|string                  $name optional template name
+     * @param null|string                  $type optional template type
+     * @param null|string                  $dir  optional template folder
+     *
+     * @return string
+     * @throws \Exception
+     */
+    public function buildSourcePath($tpl, $name = null, $type = null, $dir = null)
+    {
+        $name = isset($name) ? $name : $tpl->source->name;
+        $type = isset($type) ? $type : $tpl->source->type;
+        $dir = isset($dir) ? $dir : $this->smarty->getTemplateDir(0);
+        switch ($type) {
+            case 'file':
+            case 'filetest':
+            case 'php':
+                return $this->normalizePath($dir . $name);
+            case 'mysqltest':
+            case 'mysql':
+                return sha1($type . ':' . $name);
+            case 'string':
+                $this->smarty->getTemplateDir();
+                return sha1($name . $this->smarty->_joined_template_dir);
+            default:
+                throw new Exception("Unhandled source resource type '{$type}'");
+        }
+    }
+
+    /**
+     * Build template uid
+     *
+     * @param Smarty_Internal_TemplateBase $tpl  template object
+     * @param null|string                  $value
+     * @param null|string                  $name optional template name
+     * @param null|string                  $type optional template type
+     *
+     * @return string
+     * @throws \Exception
+     */
+    public function buildUid($tpl, $value = null, $name = null, $type = null)
+    {
+        $type = isset($type) ? $type : $tpl->source->type;
+        $name = isset($name) ? $name : $tpl->source->name;
+        switch ($type) {
+            case 'php':
+            case 'file':
+            case 'filetest':
+                if ($tpl instanceof Smarty) {
+                    return sha1($this->normalizePath($this->smarty->getTemplateDir(0) . $name) .
+                                $this->smarty->_joined_template_dir);
+                }
+                return sha1($tpl->source->filepath . $this->smarty->_joined_template_dir);
+            case 'mysqltest':
+            case 'mysql':
+                return sha1($type . ':' . $name);
+            case 'string':
+                $this->smarty->getTemplateDir();
+                return sha1($name . $this->smarty->_joined_template_dir);
+            default:
+                throw new Exception("Unhandled source resource type '{$type}'");
+        }
+    }
+
+    /**
+     * Normalize path
+     *  - remove /./ and /../
+     *  - make it absolute
+     *
+     * @param string $path file path
+     *
+     * @return string
+     */
+    public function normalizePath($path, $ds =null ,$absolute = true)
+    {
+        $ds = isset($ds) ? $ds : DIRECTORY_SEPARATOR;
+        $nds = $ds == '/' ? '\\' : '/';
+        $getcwd = getcwd();
+        // normalize $ds
+        $path = str_replace($nds, $ds, $path);
+        preg_match('#^([a-zA-Z][:])?([.]{1,2}[\/\\\]+)?([\\\])?([.]{0,2}[\/\\\]+)?([[:print:]]*)#', $path, $match);
+        if ($match[1] === '') {
+            if ($match[ 2 ] !== '' || $match[ 2 ] . $match[ 3 ] . $match[ 4 ] === '') {
+                $path = $getcwd . $ds . $path;
+            } else if (Smarty::$_IS_WINDOWS && $match[ 3 ] !== '') {
+                $path = substr($getcwd, 0, 2) . $path;
+            }
+        }
+        $path = preg_replace('#[\\\/]+([.][\\\/]+)*#', $ds, $path);
+        while (strrpos($path, '.' . $ds) !== false) {
+            $path =
+                preg_replace('#([\\\/]([^\\\/]+[\\\/]){2}([.][.][\\\/]){2})|([\\\/][^\\\/]+[\\\/][.][.][\\\/])#', $ds,
+                             $path);
+        }
+        $cwd  = preg_replace('#[\\\/]#', $ds, $getcwd);
+        $path = str_ireplace($cwd,$getcwd, $path);
+        if (!$absolute) {
+            $path = preg_replace('#'.$getcwd.'#', '', $path);
+        }
+        return $path;
+    }
+
+    /**
+     * Return base name
+     *
+     * @param \Smarty_Internal_Template|\Smarty_Internal_TemplateBase $tpl  template object
+     * @param null|string                                             $name optional template name
+     * @param null|string                                             $type optional template type
+     *
+     * @return null|string
+     */
+    public function getBasename(Smarty_Internal_Template $tpl, $name = null, $type = null)
+    {
+        $name = isset($name) ? $name : $tpl->source->name;
+        $type = isset($type) ? $type : $tpl->source->type;
+        switch ($type) {
+            case 'file':
+            case 'filetest':
+                if (($_pos = strpos($name, ']')) !== false) {
+                    $name = substr($name, $_pos + 1);
+                }
+                return basename($name);
+            case 'mysqltest':
+            case 'mysql':
+                return $name;
+            case 'string':
+                return '';
+            default:
+                return null;
+        }
+    }
+
+    /**
+     * Return compiled file path
+     *
+     * @param \Smarty_Internal_Template|\Smarty_Internal_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
+     * @param null|string                                             $type       optional template type
+     * @param null|string                                             $dir        optional template folder
+     *
+     * @return string
+     * @throws \Exception
+     */
+    public function buildCompiledPath(Smarty_Internal_Template $tpl, $sub = true, $caching = false, $compile_id = null,
+                                      $name = null, $type = null, $dir = null)
+    {
+        $sep = DIRECTORY_SEPARATOR;
+        $_compile_id = isset($compile_id) ? preg_replace('![^\w\|]+!', '_', $compile_id) : null;
+        $sp = $this->buildSourcePath($tpl, $name, $type, $dir);
+        $uid = $this->buildUid($tpl, $sp, $name, $type);
+        $_flag = '';
+        if (isset($tpl->source) && $tpl->source->isConfig) {
+            $_flag = '_' . ((int) $tpl->smarty->config_read_hidden + (int) $tpl->smarty->config_booleanize * 2 +
+                            (int) $tpl->smarty->config_overwrite * 4);
+        } else {
+            $_flag = '_' . ((int) $tpl->smarty->merge_compiled_includes + (int) $tpl->smarty->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 : '^';
+        if (isset($_compile_id)) {
+            $_filepath = $_compile_id . $_compile_dir_sep . $_filepath;
+        }
+        // caching token
+        if ($caching) {
+            $_cache = '.cache';
+        } else {
+            $_cache = '';
+        }
+        $_compile_dir = $tpl->smarty->getCompileDir();
+        // set basename if not specified
+        $_basename = $this->getBasename($tpl, $name, $type);
+        if ($_basename === null) {
+            $_basename = basename(preg_replace('![^\w\/]+!', '_', $name));
+        }
+        // separate (optional) basename by dot
+        if ($_basename) {
+            $_basename = '.' . $_basename;
+        }
+
+        return $_compile_dir . $_filepath . '.' . $type . $_basename . $_cache . '.php';
+    }
+
+    /**
+     * Return cache file path
+     *
+     * @param Smarty_Internal_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
+     * @param null|string                  $type       optional template type
+     * @param null|string                  $dir        optional template folder
+     * @param null|string                  $cacheType  optional cache resource type
+     *
+     * @return string
+     * @throws \Exception
+     */
+    public function buildCachedPath($tpl, $sub = true, $cache_id = null, $compile_id = null, $name = null, $type = null,
+                                    $dir = null, $cacheType = null)
+    {
+        $cacheType = isset($cacheType) ? $cacheType : $tpl->smarty->caching_type;
+        switch ($cacheType) {
+            case 'file':
+            case 'filetest':
+                $sep = DIRECTORY_SEPARATOR;
+                $_compile_id = isset($compile_id) ? preg_replace('![^\w\|]+!', '_', $compile_id) : null;
+                $_cache_id = isset($cache_id) ? preg_replace('![^\w\|]+!', '_', $cache_id) : null;
+                $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 : '^';
+                if (isset($_cache_id)) {
+                    $_cache_id = str_replace('|', $_compile_dir_sep, $_cache_id) . $_compile_dir_sep;
+                } else {
+                    $_cache_id = '';
+                }
+                if (isset($_compile_id)) {
+                    $_compile_id = $_compile_id . $_compile_dir_sep;
+                } else {
+                    $_compile_id = '';
+                }
+                $smarty = isset($tpl->smarty) ? $tpl->smarty : $tpl;
+                $_cache_dir = $smarty->getCacheDir();
+                return $_cache_dir . $_cache_id . $_compile_id . $_filepath . '.' . basename($sp) . '.php';
+            case 'mysql':
+            case 'mysqltest':
+            case 'pdo':
+            case 'foobar':
+                $sp = $this->buildSourcePath($tpl, $name, $type, $dir);
+                $uid = $this->buildUid($tpl, $sp, $name, $type);
+                $_compile_id = isset($compile_id) ? preg_replace('![^\w\|]+!', '_', $compile_id) : null;
+                $_cache_id = isset($cache_id) ? preg_replace('![^\w\|]+!', '_', $cache_id) : null;
+                return sha1($uid . $_cache_id . $_compile_id);
+            case 'memcachetest':
+            case 'acp':
+                $sp = $this->buildSourcePath($tpl, $name, $type, $dir);
+                $uid = $this->buildUid($tpl, $sp, $name, $type);
+                $_compile_id = isset($compile_id) ? preg_replace('![^\w\|]+!', '_', $compile_id) : null;
+                $_cache_id = isset($cache_id) ? preg_replace('![^\w\|]+!', '_', $cache_id) : null;
+                return sha1($uid) . '#' . preg_replace('#[^\w\|]+#S', '_', $tpl->template_resource) . '#' . $_cache_id .
+                       '#' . $_compile_id;
+
+            default:
+                throw new Exception("Unhandled cache resource type '{$cacheType}'");
+        }
+    }
+
+    /**
+     * prefilter to insert test number
+     *
+     * @param  string                   $source
+     * @param \Smarty_Internal_Template $tpl
+     *
+     * @return string
+     */
+    public function prefilterTest($source, Smarty_Internal_Template $tpl)
+    {
+        return str_replace('#test#', "test:{\$test nocache} compiled:{$tpl->getTemplateVars('test')} rendered:{\$test}",
+                           $source);
+    }
+
+    /**
+     *  Gat Smarty object
+     * @return null|\Smarty|\SmartyBC
+     */
+    public function getSmartyObj(){
+        return isset($this->smarty) ? $this->smarty : (isset($this->smartyBC) ? $this->smartyBC : null);
+    }
+
+    public static function getSmartyPluginsDir(){
+        if (is_dir(dirname(__FILE__) . '/../smarty/libs/plugins')) {
+            return dirname(__FILE__) . '/../smarty/libs/plugins';
+        } else if(is_dir(dirname(__FILE__) . '/../libs/plugins')) {
+            return dirname(__FILE__) . '/../libs/plugins';
+        }
+    }
+    /**
+     * Tears down the fixture
+     * This method is called after a test is executed.
+     *
+     */
+    protected function tearDown()
+    {
+        if (class_exists('Smarty_Internal_TemplateCompilerBase') &&
+            isset(Smarty_Internal_TemplateCompilerBase::$_tag_objects)
+        ) {
+            Smarty_Internal_TemplateCompilerBase::$_tag_objects = array();
+        }
+        if (isset($this->smarty->smarty)) {
+            $this->smarty->smarty = null;
+        }
+        if (isset($this->smarty)) {
+            $this->smarty = null;
+        }
+        if (isset($this->smartyBC->smarty)) {
+            $this->smartyBC->smarty = null;
+        }
+        if (isset($this->smartyBC)) {
+            $this->smartyBC = null;
+        }
+    }
+}

tests/UnitTests/A_0/PathNormalization/PathNormalizationTest.php

@@ -0,0 +1,78 @@
+<?php
+/*
+ * This file is part of the Smarty PHPUnit tests.
+ */
+
+/**
+ * class for path normalization tests
+ *
+ * @runTestsInSeparateProcess
+ * @preserveGlobalState disabled
+ * @backupStaticAttributes enabled
+ */
+class PathNormalizationTest extends PHPUnit_Smarty
+{
+    /*
+     * Setup test fixture
+     */
+    public function setUp()
+    {
+        $this->setUpSmarty(dirname(__FILE__));
+    }
+
+    public function testNormalizeToAbsolute() {
+        $d = $this->smarty->_realpath('./foo/a.foo', true);
+        $this->assertEquals(getcwd() . DIRECTORY_SEPARATOR . 'foo' . DIRECTORY_SEPARATOR . 'a.foo', $d);
+    }
+    /**public function testNormalizeAbsolute() {
+        if (DIRECTORY_SEPARATOR == '/') {
+            $d = $this->smarty->_realpath('\\foo\\a.foo', true);
+            $this->assertEquals('/foo/a.foo', $d);
+        } else {
+            $d = $this->smarty->_realpath('/foo/a.foo', true);
+            $this->assertEquals(substr(getcwd(), 0, 2) . DIRECTORY_SEPARATOR . 'foo' . DIRECTORY_SEPARATOR . 'a.foo', $d);
+            $d = $this->smarty->_realpath(substr(getcwd(), 0, 2) . '/foo/a.foo', true);
+            $this->assertEquals(substr(getcwd(), 0, 2) . DIRECTORY_SEPARATOR . 'foo' . DIRECTORY_SEPARATOR . 'a.foo', $d);
+        }
+    }
+ * */
+    public function testNormalizeToAbsoluteNoStart() {
+        $d = $this->smarty->_realpath('foo/a.foo', true);
+        $this->assertEquals(getcwd() . DIRECTORY_SEPARATOR . 'foo' . DIRECTORY_SEPARATOR . 'a.foo', $d);
+    }
+    public function testNormalizeToAbsoluteNoStart2() {
+        $d = $this->smarty->_realpath('a.foo', true);
+        $this->assertEquals(getcwd() . DIRECTORY_SEPARATOR . 'a.foo', $d);
+    }
+    public function testNormalizeToAbsolutePathLeadingDot() {
+        $d = $this->smarty->_realpath('.foo/a.foo', true);
+        $this->assertEquals(getcwd() . DIRECTORY_SEPARATOR . '.foo' . DIRECTORY_SEPARATOR . 'a.foo', $d);
+    }
+    public function testNormalizeToAbsolutePathTrailingDot() {
+        $d = $this->smarty->_realpath('./foo./a.foo', true);
+        $this->assertEquals(getcwd() . DIRECTORY_SEPARATOR . 'foo.' . DIRECTORY_SEPARATOR . 'a.foo', $d);
+    }
+    public function testNormalizeToAbsolutePathBubbleUp() {
+        $ds = '\\' . DIRECTORY_SEPARATOR;
+        $prefix = preg_replace("#[{$ds}][^{$ds}]+$#", '', getcwd());
+        $d = $this->smarty->_realpath('./../a.foo', true);
+        $this->assertEquals($prefix . DIRECTORY_SEPARATOR . 'a.foo', $d);
+    }
+    public function testNormalizeToAbsolutePathBubbleUp2() {
+        $ds = '\\' . DIRECTORY_SEPARATOR;
+        $prefix = preg_replace("#[{$ds}][^{$ds}]+$#", '', getcwd());
+        $d = $this->smarty->_realpath('././../././a.foo', true);
+        $this->assertEquals($prefix . DIRECTORY_SEPARATOR . 'a.foo', $d);
+    }
+    public function testNormalizeToAbsolutePathBubbleUp3() {
+        $ds = '\\' . DIRECTORY_SEPARATOR;
+        $prefix = preg_replace("#[{$ds}][^{$ds}]+[{$ds}][^{$ds}]+$#", '', getcwd());
+        $d = $this->smarty->_realpath('././.././.././a.foo', true);
+        $this->assertEquals($prefix . DIRECTORY_SEPARATOR . 'a.foo', $d);
+    }
+    public function testNormalizeToAbsoluteKomplex() {
+        $d = $this->smarty->_realpath('./foo/\\./bar/jo/wie/so/../..///.././././../aa/bb/cc/../../go/a.foo', true);
+        $this->assertEquals(getcwd() . DIRECTORY_SEPARATOR . 'foo' . DIRECTORY_SEPARATOR . 'aa'. DIRECTORY_SEPARATOR . 'go' . DIRECTORY_SEPARATOR .'a.foo', $d);
+    }
+
+}

tests/UnitTests/A_0/PathNormalization/PluginDirNormalizationTest.php

@@ -0,0 +1,145 @@
+<?php
+/*
+ * This file is part of the Smarty PHPUnit tests.
+ */
+
+/**
+ * class for path normalization tests
+ *
+ * @runTestsInSeparateProcess
+ * @preserveGlobalState    disabled
+ * @backupStaticAttributes enabled
+ */
+class PluginNormalizationTest extends PHPUnit_Smarty
+{
+    /*
+     * Setup test fixture
+     */
+    public function setUp()
+    {
+        $this->setUpSmarty(dirname(__FILE__));
+    }
+
+    public function testGetPluginsDefaultDir()
+    {
+        $result = $this->smarty->getPluginsDir();
+        $this->assertEquals(1, count($result));
+        $this->assertEquals(SMARTY_PLUGINS_DIR, $result[ 0 ]);
+    }
+    public function testGetPluginsDefaultDir2()
+    {
+        $this->smarty->addPluginsDir('./foo/');
+        $result = $this->smarty->getPluginsDir();
+        $this->assertEquals(2, count($result));
+        $this->assertEquals(SMARTY_PLUGINS_DIR, $result[ 0 ]);
+        $this->assertEquals(getcwd() . DIRECTORY_SEPARATOR . 'foo' . DIRECTORY_SEPARATOR, $result[ 1 ]);
+    }
+
+    public function testSetPluginsDir1()
+    {
+        $result = $this->smarty->getPluginsDir();
+        $this->assertEquals(1, count($result));
+        $this->smarty->setPluginsDir('foo');
+        $result = $this->smarty->getPluginsDir();
+        $this->assertEquals(1, count($result));
+        $this->assertEquals(getcwd() . DIRECTORY_SEPARATOR . 'foo' . DIRECTORY_SEPARATOR, $result[ 0 ]);
+    }
+
+    public function testSetPluginsDir2()
+    {
+        $result = $this->smarty->getPluginsDir();
+        $this->assertEquals(1, count($result));
+        $this->smarty->setPluginsDir('foo/');
+        $result = $this->smarty->getPluginsDir();
+        $this->assertEquals(1, count($result));
+        $this->assertEquals(getcwd() . DIRECTORY_SEPARATOR . 'foo' . DIRECTORY_SEPARATOR, $result[ 0 ]);
+    }
+
+    public function testSetPluginsDir3()
+    {
+        $result = $this->smarty->getPluginsDir();
+        $this->assertEquals(1, count($result));
+        $this->smarty->setPluginsDir('foo/.');
+        $result = $this->smarty->getPluginsDir();
+        $this->assertEquals(1, count($result));
+        $this->assertEquals(getcwd() . DIRECTORY_SEPARATOR . 'foo' . DIRECTORY_SEPARATOR, $result[ 0 ]);
+    }
+
+    public function testSetPluginsDir4()
+    {
+        $result = $this->smarty->getPluginsDir();
+        $this->assertEquals(1, count($result));
+        $this->smarty->setPluginsDir('foo/./');
+        $result = $this->smarty->getPluginsDir();
+        $this->assertEquals(1, count($result));
+        $this->assertEquals(getcwd() . DIRECTORY_SEPARATOR . 'foo' . DIRECTORY_SEPARATOR, $result[ 0 ]);
+    }
+
+    public function testSetPluginsDir5()
+    {
+        $result = $this->smarty->getPluginsDir();
+        $this->assertEquals(1, count($result));
+        $this->smarty->setPluginsDir('.foo');
+        $result = $this->smarty->getPluginsDir();
+        $this->assertEquals(1, count($result));
+        $this->assertEquals(getcwd() . DIRECTORY_SEPARATOR . '.foo' . DIRECTORY_SEPARATOR, $result[ 0 ]);
+    }
+
+    public function testSetPluginsDir6()
+    {
+        $result = $this->smarty->getPluginsDir();
+        $this->assertEquals(1, count($result));
+        $this->smarty->setPluginsDir('..foo');
+        $result = $this->smarty->getPluginsDir();
+        $this->assertEquals(1, count($result));
+        $this->assertEquals(getcwd() . DIRECTORY_SEPARATOR . '..foo' . DIRECTORY_SEPARATOR, $result[ 0 ]);
+    }
+
+    public function testSetPluginsDir7()
+    {
+        $result = $this->smarty->getPluginsDir();
+        $this->assertEquals(1, count($result));
+        $this->smarty->setPluginsDir('../foo');
+        $result = $this->smarty->getPluginsDir();
+        $this->assertEquals(1, count($result));
+        $this->assertEquals(substr(getcwd(), 0, - strlen(basename(getcwd()))) . 'foo' . DIRECTORY_SEPARATOR,
+                            $result[ 0 ]);
+    }
+
+    public function testSetPluginsDir8()
+    {
+        $this->smarty->setPluginsDir(array('foo', 'bah'));
+        $result = $this->smarty->getPluginsDir();
+        $this->assertEquals(2, count($result));
+        $this->assertEquals(getcwd() . DIRECTORY_SEPARATOR . 'foo' . DIRECTORY_SEPARATOR, $result[ 0 ]);
+        $this->assertEquals(getcwd() . DIRECTORY_SEPARATOR . 'bah' . DIRECTORY_SEPARATOR, $result[ 1 ]);
+    }
+
+    public function testSetPluginsDir9()
+    {
+        $this->smarty->setPluginsDir(array('foo', 'bah'));
+        $result = $this->smarty->getPluginsDir();
+        $this->assertEquals(2, count($result));
+        $this->smarty->addPluginsDir('blar');
+        $result = $this->smarty->getPluginsDir();
+        $this->assertEquals(3, count($result));
+        $this->assertEquals(getcwd() . DIRECTORY_SEPARATOR . 'foo' . DIRECTORY_SEPARATOR, $result[ 0 ]);
+        $this->assertEquals(getcwd() . DIRECTORY_SEPARATOR . 'bah' . DIRECTORY_SEPARATOR, $result[ 1 ]);
+        $this->assertEquals(getcwd() . DIRECTORY_SEPARATOR . 'blar' . DIRECTORY_SEPARATOR, $result[ 2 ]);
+    }
+
+    public function testSetPluginsDir10()
+    {
+        $this->smarty->setPluginsDir(array('foo', 'bah'));
+        $result = $this->smarty->getPluginsDir();
+        $this->assertEquals(2, count($result));
+        $this->smarty->addPluginsDir(array('blar', 'smarty'));
+        $result = $this->smarty->getPluginsDir();
+        $this->assertEquals(4, count($result));
+        $this->assertEquals(getcwd() . DIRECTORY_SEPARATOR . 'foo' . DIRECTORY_SEPARATOR, $result[ 0 ]);
+        $this->assertEquals(getcwd() . DIRECTORY_SEPARATOR . 'bah' . DIRECTORY_SEPARATOR, $result[ 1 ]);
+        $this->assertEquals(getcwd() . DIRECTORY_SEPARATOR . 'blar' . DIRECTORY_SEPARATOR, $result[ 2 ]);
+        $this->assertEquals(getcwd() . DIRECTORY_SEPARATOR . 'smarty' . DIRECTORY_SEPARATOR, $result[ 3 ]);
+    }
+
+}

tests/UnitTests/A_0/PathNormalization/TemlateDirNormalizationTest.php

@@ -0,0 +1,137 @@
+<?php
+/*
+ * This file is part of the Smarty PHPUnit tests.
+ */
+
+/**
+ * class for path normalization tests
+ *
+ * @runTestsInSeparateProcess
+ * @preserveGlobalState    disabled
+ * @backupStaticAttributes enabled
+ */
+class TemplateNormalizationTest extends PHPUnit_Smarty
+{
+    /*
+     * Setup test fixture
+     */
+    public function setUp()
+    {
+        $this->setUpSmarty(dirname(__FILE__));
+    }
+
+    public function testGetTemplateDir()
+    {
+        $result = $this->smarty->getTemplateDir();
+        $this->assertEquals(1, count($result));
+        $this->assertEquals(getcwd() . DIRECTORY_SEPARATOR . 'templates' . DIRECTORY_SEPARATOR, $result[ 0 ]);
+    }
+
+    public function testSetTemplateDir1()
+    {
+        $result = $this->smarty->getTemplateDir();
+        $this->assertEquals(1, count($result));
+        $this->smarty->setTemplateDir('foo');
+        $result = $this->smarty->getTemplateDir();
+        $this->assertEquals(1, count($result));
+        $this->assertEquals(getcwd() . DIRECTORY_SEPARATOR . 'foo' . DIRECTORY_SEPARATOR, $result[ 0 ]);
+    }
+
+    public function testSetTemplateDir2()
+    {
+        $result = $this->smarty->getTemplateDir();
+        $this->assertEquals(1, count($result));
+        $this->smarty->setTemplateDir('foo/');
+        $result = $this->smarty->getTemplateDir();
+        $this->assertEquals(1, count($result));
+        $this->assertEquals(getcwd() . DIRECTORY_SEPARATOR . 'foo' . DIRECTORY_SEPARATOR, $result[ 0 ]);
+    }
+
+    public function testSetTemplateDir3()
+    {
+        $result = $this->smarty->getTemplateDir();
+        $this->assertEquals(1, count($result));
+        $this->smarty->setTemplateDir('foo/.');
+        $result = $this->smarty->getTemplateDir();
+        $this->assertEquals(1, count($result));
+        $this->assertEquals(getcwd() . DIRECTORY_SEPARATOR . 'foo' . DIRECTORY_SEPARATOR, $result[ 0 ]);
+    }
+
+    public function testSetTemplateDir4()
+    {
+        $result = $this->smarty->getTemplateDir();
+        $this->assertEquals(1, count($result));
+        $this->smarty->setTemplateDir('foo/./');
+        $result = $this->smarty->getTemplateDir();
+        $this->assertEquals(1, count($result));
+        $this->assertEquals(getcwd() . DIRECTORY_SEPARATOR . 'foo' . DIRECTORY_SEPARATOR, $result[ 0 ]);
+    }
+
+    public function testSetTemplateDir5()
+    {
+        $result = $this->smarty->getTemplateDir();
+        $this->assertEquals(1, count($result));
+        $this->smarty->setTemplateDir('.foo');
+        $result = $this->smarty->getTemplateDir();
+        $this->assertEquals(1, count($result));
+        $this->assertEquals(getcwd() . DIRECTORY_SEPARATOR . '.foo' . DIRECTORY_SEPARATOR, $result[ 0 ]);
+    }
+
+    public function testSetTemplateDir6()
+    {
+        $result = $this->smarty->getTemplateDir();
+        $this->assertEquals(1, count($result));
+        $this->smarty->setTemplateDir('..foo');
+        $result = $this->smarty->getTemplateDir();
+        $this->assertEquals(1, count($result));
+        $this->assertEquals(getcwd() . DIRECTORY_SEPARATOR . '..foo' . DIRECTORY_SEPARATOR, $result[ 0 ]);
+    }
+
+    public function testSetTemplateDir7()
+    {
+        $result = $this->smarty->getTemplateDir();
+        $this->assertEquals(1, count($result));
+        $this->smarty->setTemplateDir('../foo');
+        $result = $this->smarty->getTemplateDir();
+        $this->assertEquals(1, count($result));
+        $this->assertEquals(substr(getcwd(), 0, - strlen(basename(getcwd()))) . 'foo' . DIRECTORY_SEPARATOR,
+                            $result[ 0 ]);
+    }
+
+    public function testSetTemplateDir8()
+    {
+        $this->smarty->setTemplateDir(array('foo', 'bah'));
+        $result = $this->smarty->getTemplateDir();
+        $this->assertEquals(2, count($result));
+        $this->assertEquals(getcwd() . DIRECTORY_SEPARATOR . 'foo' . DIRECTORY_SEPARATOR, $result[ 0 ]);
+        $this->assertEquals(getcwd() . DIRECTORY_SEPARATOR . 'bah' . DIRECTORY_SEPARATOR, $result[ 1 ]);
+    }
+
+    public function testSetTemplateDir9()
+    {
+        $this->smarty->setTemplateDir(array('foo', 'bah'));
+        $result = $this->smarty->getTemplateDir();
+        $this->assertEquals(2, count($result));
+        $this->smarty->addTemplateDir('blar');
+        $result = $this->smarty->getTemplateDir();
+        $this->assertEquals(3, count($result));
+        $this->assertEquals(getcwd() . DIRECTORY_SEPARATOR . 'foo' . DIRECTORY_SEPARATOR, $result[ 0 ]);
+        $this->assertEquals(getcwd() . DIRECTORY_SEPARATOR . 'bah' . DIRECTORY_SEPARATOR, $result[ 1 ]);
+        $this->assertEquals(getcwd() . DIRECTORY_SEPARATOR . 'blar' . DIRECTORY_SEPARATOR, $result[ 2 ]);
+    }
+
+    public function testSetTemplateDir10()
+    {
+        $this->smarty->setTemplateDir(array('foo', 'bah'));
+        $result = $this->smarty->getTemplateDir();
+        $this->assertEquals(2, count($result));
+        $this->smarty->addTemplateDir(array('blar', 'smarty'));
+        $result = $this->smarty->getTemplateDir();
+        $this->assertEquals(4, count($result));
+        $this->assertEquals(getcwd() . DIRECTORY_SEPARATOR . 'foo' . DIRECTORY_SEPARATOR, $result[ 0 ]);
+        $this->assertEquals(getcwd() . DIRECTORY_SEPARATOR . 'bah' . DIRECTORY_SEPARATOR, $result[ 1 ]);
+        $this->assertEquals(getcwd() . DIRECTORY_SEPARATOR . 'blar' . DIRECTORY_SEPARATOR, $result[ 2 ]);
+        $this->assertEquals(getcwd() . DIRECTORY_SEPARATOR . 'smarty' . DIRECTORY_SEPARATOR, $result[ 3 ]);
+    }
+
+}

tests/UnitTests/A_0/PathNormalization/cache/.gitignore

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

tests/UnitTests/A_0/PathNormalization/templates_c/.gitignore

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

tests/UnitTests/A_1/ProtectedFolderVars/ProtectedFolderVarsTest.php

@@ -0,0 +1,226 @@
+<?php
+/*
+ * This file is part of the Smarty PHPUnit tests.
+ */
+
+/**
+ * class for protected $template_dir, $compile_dir, $cache_dir, $config_dir, $plugins_dir property tests
+ *
+ * @runTestsInSeparateProcess
+ * @preserveGlobalState    disabled
+ * @backupStaticAttributes enabled
+ */
+class ProtectedFolderVarsTest extends PHPUnit_Smarty
+{
+    /*
+     * Setup test fixture
+     */
+    public function setUp()
+    {
+        $this->setUpSmarty(dirname(__FILE__));
+    }
+
+    /*
+     * template_dir
+     */
+
+    public function testTemplateDirDirectRelative()
+    {
+        $s = new Smarty();
+        $s->template_dir = './foo';
+        $d = $s->getTemplateDir();
+        $this->assertEquals(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'foo' . DIRECTORY_SEPARATOR, $d[ 0 ]);
+    }
+
+    public function testTemplateDirDirectRelativeArray()
+    {
+        $s = new Smarty();
+        $s->template_dir = array('./foo', './bar/');
+        $d = $s->template_dir;
+        $this->assertEquals(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'foo' . DIRECTORY_SEPARATOR, $d[ 0 ]);
+        $this->assertEquals(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'bar' . DIRECTORY_SEPARATOR, $d[ 1 ]);
+    }
+
+    public function testTemplateDirDirectRelativeArrayAdd()
+    {
+        $s = new Smarty();
+        $s->template_dir = './foo';
+        $s->addTemplateDir('./bar/');
+        $d = $s->getTemplateDir();
+        $this->assertEquals(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'foo' . DIRECTORY_SEPARATOR, $d[ 0 ]);
+        $this->assertEquals(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'bar' . DIRECTORY_SEPARATOR, $d[ 1 ]);
+    }
+
+    public function testTemplateDirDirectRelativeExtends()
+    {
+        $s = new FolderT();
+        $d = $s->getTemplateDir();
+        $this->assertEquals(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'foo' . DIRECTORY_SEPARATOR, $d[ 0 ]);
+    }
+
+    public function testTemplateDirDirectRelativeExtends2()
+    {
+        $s = new FolderT();
+        $s->template_dir = './bar';
+        $d = $s->getTemplateDir();
+        $this->assertEquals(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'bar' . DIRECTORY_SEPARATOR, $d[ 0 ]);
+    }
+
+    /*
+    * config_dir
+    */
+
+    public function testConfigDirDirectRelative()
+    {
+        $s = new Smarty();
+        $s->config_dir = './foo';
+        $d = $s->getConfigDir();
+        $this->assertEquals(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'foo' . DIRECTORY_SEPARATOR, $d[ 0 ]);
+    }
+
+    public function testConfigDirDirectRelativeArray()
+    {
+        $s = new Smarty();
+        $s->config_dir = array('./foo', './bar/');
+        $d = $s->config_dir;
+        $this->assertEquals(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'foo' . DIRECTORY_SEPARATOR, $d[ 0 ]);
+        $this->assertEquals(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'bar' . DIRECTORY_SEPARATOR, $d[ 1 ]);
+    }
+
+    public function testConfigDirDirectRelativeArrayAdd()
+    {
+        $s = new Smarty();
+        $s->config_dir = './foo';
+        $s->addConfigDir('./bar/');
+        $d = $s->getConfigDir();
+        $this->assertEquals(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'foo' . DIRECTORY_SEPARATOR, $d[ 0 ]);
+        $this->assertEquals(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'bar' . DIRECTORY_SEPARATOR, $d[ 1 ]);
+    }
+
+    public function testConfigDirDirectRelativeExtends()
+    {
+        $s = new FolderT();
+        $d = $s->getConfigDir();
+        $this->assertEquals(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'conf' . DIRECTORY_SEPARATOR, $d[ 0 ]);
+    }
+
+    public function testConfigDirDirectRelativeExtends2()
+    {
+        $s = new FolderT();
+        $s->config_dir = './bar';
+        $d = $s->getConfigDir();
+        $this->assertEquals(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'bar' . DIRECTORY_SEPARATOR, $d[ 0 ]);
+    }
+
+    /*
+    * plugins_dir
+    */
+
+    public function testPluginDirDirectRelative()
+    {
+        $s = new Smarty();
+        $s->plugins_dir = './foo';
+        $d = $s->getPluginsDir();
+        $this->assertEquals(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'foo' . DIRECTORY_SEPARATOR, $d[ 0 ]);
+    }
+
+    public function testPluginDirDirectRelativeArray()
+    {
+        $s = new Smarty();
+        $s->plugins_dir = array('./foo', './bar/');
+        $d = $s->plugins_dir;
+        $this->assertEquals(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'foo' . DIRECTORY_SEPARATOR, $d[ 0 ]);
+        $this->assertEquals(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'bar' . DIRECTORY_SEPARATOR, $d[ 1 ]);
+    }
+
+    public function testPluginDirDirectRelativeArrayAdd()
+    {
+        $s = new Smarty();
+        $s->plugins_dir = './foo';
+        $s->addPluginsDir('./bar/');
+        $d = $s->getPluginsDir();
+        $this->assertEquals(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'foo' . DIRECTORY_SEPARATOR, $d[ 0 ]);
+        $this->assertEquals(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'bar' . DIRECTORY_SEPARATOR, $d[ 1 ]);
+    }
+
+    public function testPluginDirDirectRelativeExtends()
+    {
+        $s = new FolderT();
+        $d = $s->getPluginsDir();
+        $this->assertEquals(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'plug' . DIRECTORY_SEPARATOR, $d[ 0 ]);
+    }
+
+    public function testPluginDirDirectRelativeExtends2()
+    {
+        $s = new FolderT();
+        $s->plugins_dir = './bar';
+        $d = $s->getPluginsDir();
+        $this->assertEquals(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'bar' . DIRECTORY_SEPARATOR, $d[ 0 ]);
+    }
+    /*
+     * compile_dir
+     */
+
+    public function testCompileDirDirectRelative()
+    {
+        $s = new Smarty();
+        $s->compile_dir = './foo';
+        $d = $s->getCompileDir();
+        $this->assertEquals(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'foo' . DIRECTORY_SEPARATOR, $d);
+    }
+
+    public function testCompileDirDirectRelativeExtends()
+    {
+        $s = new FolderT();
+        $d = $s->getCompileDir();
+        $this->assertEquals(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'comp' . DIRECTORY_SEPARATOR, $d);
+    }
+
+    public function testCompileDirDirectRelativeExtends2()
+    {
+        $s = new FolderT();
+        $s->compile_dir = './bar';
+        $d = $s->getCompileDir();
+        $this->assertEquals(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'bar' . DIRECTORY_SEPARATOR, $d);
+    }
+    /*
+     * cache_dir
+     */
+
+    public function testCacheDirDirectRelative()
+    {
+        $s = new Smarty();
+        $s->cache_dir = './foo';
+        $d = $s->getCacheDir();
+        $this->assertEquals(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'foo' . DIRECTORY_SEPARATOR, $d);
+    }
+
+    public function testCacheDirDirectRelativeExtends()
+    {
+        $s = new FolderT();
+        $d = $s->getCacheDir();
+        $this->assertEquals(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'cache' . DIRECTORY_SEPARATOR, $d);
+    }
+
+    public function testCacheDirDirectRelativeExtends2()
+    {
+        $s = new FolderT();
+        $s->cache_dir = './bar';
+        $d = $s->getCacheDir();
+        $this->assertEquals(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'bar' . DIRECTORY_SEPARATOR, $d);
+    }
+}
+
+class FolderT extends Smarty
+{
+    protected $template_dir = './foo';
+
+    protected $compile_dir = './comp/';
+
+    protected $plugins_dir = './plug/';
+
+    protected $cache_dir = './cache/';
+
+    protected $config_dir = array('./conf/');
+
+}

tests/UnitTests/A_1/ProtectedFolderVars/cache/.gitignore

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

tests/UnitTests/A_1/ProtectedFolderVars/comp/.gitignore

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

tests/UnitTests/A_2/UndefinedTemplateVar/UndefinedTemplateVarTest.php

@@ -0,0 +1,74 @@
+<?php
+/*
+ * This file is part of the Smarty PHPUnit tests.
+ */
+
+/**
+ * class for protected $template_dir, $compile_dir, $cache_dir, $config_dir, $plugins_dir property tests
+ *
+ * @backupStaticAttributes enabled
+ */
+class UndefinedTemplateVarTest extends PHPUnit_Smarty
+{
+    /*
+     * Setup test fixture
+     */
+    public function setUp()
+    {
+        $this->setUpSmarty(dirname(__FILE__));
+        error_reporting(E_ALL | E_STRICT);
+    }
+
+    public function testInit()
+    {
+        $this->cleanDirs();
+    }
+    /**
+     * Test E_NOTICE suppression template fetched by Smarty object
+     */
+    public function testE_NoticeDisabled()
+    {
+        $e1 = error_reporting();
+        $this->smarty->setErrorReporting(E_ALL & ~E_NOTICE);
+        $this->assertEquals('undefined = ', $this->smarty->fetch('001_main.tpl'));
+        $e2 = error_reporting();
+        $this->assertEquals($e1, $e2);
+    }
+
+    /**
+     * Test E_NOTICE suppression template fetched by template object
+     */
+    public function testE_NoticeDisabledTplObject_1()
+    {
+        $e1 = error_reporting();
+        $this->smarty->setErrorReporting(E_ALL & ~E_NOTICE);
+        $tpl = $this->smarty->createTemplate('001_main.tpl');
+        $this->assertEquals('undefined = ', $tpl->fetch());
+        $e2 = error_reporting();
+        $this->assertEquals($e1, $e2);
+    }
+
+    public function testE_NoticeDisabledTplObject_2()
+    {
+        $e1 = error_reporting();
+        $this->smarty->setErrorReporting(E_ALL & ~E_NOTICE);
+        $tpl = $this->smarty->createTemplate('001_main.tpl');
+        $this->assertEquals('undefined = ', $this->smarty->fetch($tpl));
+        $e2 = error_reporting();
+        $this->assertEquals($e1, $e2);
+    }
+
+    /**
+     * Throw E_NOTICE message
+     *
+     * @expectedException PHPUnit_Framework_Error_Notice
+     * @expectedExceptionMessage Undefined index: foo
+     */
+    public function testE_Notice()
+    {
+            $e1 = error_reporting();
+            $this->assertEquals('undefined = ', $this->smarty->fetch('001_main.tpl'));
+            $e2 = error_reporting();
+            $this->assertEquals($e1, $e2);
+    }
+}

tests/UnitTests/A_2/UndefinedTemplateVar/cache/.gitignore

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

tests/UnitTests/A_2/UndefinedTemplateVar/templates/001_include.tpl

@@ -0,0 +1 @@
+undefined = {$foo}

tests/UnitTests/A_2/UndefinedTemplateVar/templates/001_main.tpl

@@ -0,0 +1 @@
+{include '001_include.tpl'}

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

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

tests/UnitTests/A_Core/AutoEscape/AutoEscapeTest.php

@@ -0,0 +1,33 @@
+<?php
+/*
+ * This file is part of the Smarty PHPUnit tests.
+ */
+
+/**
+ * class for 'escapeHtml' property tests
+ *
+ * @runTestsInSeparateProcess
+ * @preserveGlobalState disabled
+ * @backupStaticAttributes enabled
+ */
+class AutoEscapeTest extends PHPUnit_Smarty
+{
+    /*
+     * Setup test fixture
+     */
+    public function setUp()
+    {
+        $this->setUpSmarty(dirname(__FILE__));
+        $this->smarty->setEscapeHtml(true);
+    }
+
+    /**
+     * test 'escapeHtml' property
+     */
+    public function testAutoEscape()
+    {
+        $tpl = $this->smarty->createTemplate('eval:{$foo}');
+        $tpl->assign('foo', '<a@b.c>');
+        $this->assertEquals("&lt;a@b.c&gt;", $this->smarty->fetch($tpl));
+    }
+}

tests/UnitTests/A_Core/AutoEscape/cache/.gitignore

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

tests/UnitTests/A_Core/AutoEscape/templates_c/.gitignore

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

tests/UnitTests/A_Core/Filter/FilterClosure.php

@@ -0,0 +1,14 @@
+<?php
+
+     /**
+     * test registered pre filter closure
+     * @requires PHP 5.3
+     */
+
+        $this->smarty->registerFilter(Smarty::FILTER_PRE, function ($input) {
+            return '{$foo}' . $input;
+        });
+        $tpl = $this->smarty->createTemplate('eval:{" hello world"}');
+        $tpl->assign('foo', 'buh');
+        $this->assertEquals("buh hello world", $this->smarty->fetch($tpl));
+

tests/UnitTests/A_Core/Filter/FilterTest.php

@@ -0,0 +1,279 @@
+<?php
+/**
+ * Smarty PHPunit tests of filter
+ *
+ * @package PHPunit
+ * @author  Uwe Tews
+ */
+
+/**
+ * class for filter tests
+ *
+ * @runTestsInSeparateProcess
+ * @preserveGlobalState    disabled
+ * @backupStaticAttributes enabled
+ */
+class FilterTest extends PHPUnit_Smarty
+{
+    public $loadSmartyBC = true;
+
+    public function setUp()
+    {
+        $this->setUpSmarty(dirname(__FILE__));
+    }
+
+    public function testInit()
+    {
+        $this->cleanDirs();
+    }
+
+    /**
+     * test autoload output filter
+     */
+    public function testAutoloadOutputFilter()
+    {
+        $this->smarty->autoload_filters[ 'output' ] = 'trimwhitespace';
+        $tpl = $this->smarty->createTemplate('eval:{"    <br>hello world"}');
+        $this->assertEquals("<br>hello world", $this->smarty->fetch($tpl));
+    }
+
+    /**
+     * test autoload variable filter
+     */
+    public function testAutoloadVariableFilter()
+    {
+        $this->smarty->autoload_filters[ 'variable' ] = 'htmlspecialchars';
+        $tpl = $this->smarty->createTemplate('eval:{"<test>"}');
+        $this->assertEquals("&lt;test&gt;", $this->smarty->fetch($tpl));
+    }
+
+    /**
+     * test loaded filter
+     */
+    public function testLoadedOutputFilter()
+    {
+        $this->smarty->loadFilter(Smarty::FILTER_OUTPUT, 'trimwhitespace');
+        $tpl = $this->smarty->createTemplate('string:{"    <br>hello world"}');
+        $this->assertEquals("<br>hello world", $this->smarty->fetch($tpl));
+    }
+
+    public function testLoadedOutputFilterWrapper()
+    {
+        $this->smartyBC->load_filter(Smarty::FILTER_OUTPUT, 'trimwhitespace');
+        $tpl = $this->smartyBC->createTemplate('eval:{"    <br>hello world"}');
+        $this->assertEquals("<br>hello world", $this->smartyBC->fetch($tpl));
+    }
+
+    /**
+     * test registered output filter
+     */
+    public function testRegisteredOutputFilter()
+    {
+        $this->smarty->registerFilter(Smarty::FILTER_OUTPUT, 'myoutputfilter');
+        $tpl = $this->smarty->createTemplate('eval:{"hello   world"}');
+        $this->assertEquals("hello world", $this->smarty->fetch($tpl));
+    }
+
+    /**
+     * test registered output filter not cached
+     *
+     * @runInSeparateProcess
+     * @preserveGlobalState disabled
+     */
+    public function testRegisteredOutputFilter_001()
+    {
+        $this->smarty->assign('foo', 1);
+        $this->smarty->assign('bar', 2);
+        $this->smarty->registerFilter(Smarty::FILTER_OUTPUT, 'myoutputfilter2');
+        $this->assertEquals('1 filter 2', $this->smarty->fetch('output_001.tpl'));
+    }
+
+    /**
+     * test registered output filter not cached 2"
+     *
+     * @runInSeparateProcess
+     * @preserveGlobalState disabled
+     */
+    public function testRegisteredOutputFilter_001_2()
+    {
+        $this->smarty->assign('foo', 3);
+        $this->smarty->assign('bar', 4);
+        $this->smarty->registerFilter(Smarty::FILTER_OUTPUT, 'myoutputfilter2');
+        $this->assertEquals('3 filter 4', $this->smarty->fetch('output_001.tpl'));
+    }
+
+    /**
+     * test registered output filter cached 1"
+     *
+     * @runInSeparateProcess
+     * @preserveGlobalState disabled
+     */
+    public function testRegisteredOutputFilter_001_3()
+    {
+        $this->smarty->setCaching(true);
+        $this->smarty->assign('foo', 5);
+        $this->smarty->assign('bar', 6);
+        $this->smarty->registerFilter(Smarty::FILTER_OUTPUT, 'myoutputfilter2');
+        $this->assertEquals('5 filter 6', $this->smarty->fetch('output_001.tpl'));
+    }
+
+    /**
+     * test registered output filter cached 1"
+     *
+     * @runInSeparateProcess
+     * @preserveGlobalState disabled
+     */
+    public function testRegisteredOutputFilter_001_4()
+    {
+        $this->smarty->setCaching(true);
+        $this->smarty->assign('foo', 7);
+        $this->smarty->assign('bar', 8);
+        $this->smarty->registerFilter(Smarty::FILTER_OUTPUT, 'myoutputfilter2');
+        $this->assertEquals('5 filter 6', $this->smarty->fetch('output_001.tpl'));
+    }
+
+    /**
+     * test registered output filter cached nocache"
+     *
+     * @runInSeparateProcess
+     * @preserveGlobalState disabled
+     */
+    public function testRegisteredOutputFilter_002_1()
+    {
+        $this->smarty->setCaching(true);
+        $this->smarty->assign('foo', 10);
+        $this->smarty->assign('bar', 11);
+        $this->smarty->registerFilter(Smarty::FILTER_OUTPUT, 'myoutputfilter2');
+        $this->assertEquals('10 filter 11', $this->smarty->fetch('output_002.tpl'));
+    }
+
+    /**
+     * test registered output filter cached nocache"
+     *
+     * @runInSeparateProcess
+     * @preserveGlobalState disabled
+     */
+    public function testRegisteredOutputFilter_002_2()
+    {
+        $this->smarty->setCaching(true);
+        $this->smarty->assign('foo', 12);
+        $this->smarty->assign('bar', 13);
+        $this->smarty->registerFilter(Smarty::FILTER_OUTPUT, 'myoutputfilter2');
+        $this->assertEquals('12 filter 13', $this->smarty->fetch('output_002.tpl'));
+    }
+
+    public function testRegisteredOutputFilterWrapper()
+    {
+        $this->smartyBC->register_outputfilter('myoutputfilter');
+        $tpl = $this->smartyBC->createTemplate('eval:{"hello   world"}');
+        $this->assertEquals("hello world", $this->smartyBC->fetch($tpl));
+    }
+
+    /**
+     * test registered pre filter
+     */
+    public function testRegisteredPreFilter()
+    {
+        function myprefilter($input)
+        {
+            return '{$foo}' . $input;
+        }
+
+        $this->smarty->registerFilter(Smarty::FILTER_PRE, 'myprefilter');
+        $tpl = $this->smarty->createTemplate('eval:{" hello world"}');
+        $tpl->assign('foo', 'bar');
+        $this->assertEquals("bar hello world", $this->smarty->fetch($tpl));
+    }
+
+    /**
+     * test registered pre filter closure
+     * @requires PHP 5.3
+     */
+
+    public function testRegisteredPreFilterClosure()
+    {
+       if (version_compare(PHP_VERSION,'5.3','<'))
+       {
+           $this->markTestSkipped('does not run for PHP 5.2');
+       } else {
+           include 'FilterClosure.php';
+       }
+    }
+
+    /**
+     * test registered pre filter class
+     */
+    public function testRegisteredPreFilterClass()
+    {
+        $this->smarty->registerFilter(Smarty::FILTER_PRE, array('myprefilterclass', 'myprefilter'));
+        $tpl = $this->smarty->createTemplate('eval:{" hello world"}');
+        $tpl->assign('foo', 'bar');
+        $this->assertEquals("bar hello world", $this->smarty->fetch($tpl));
+    }
+
+    /**
+     * test registered post filter
+     */
+    public function testRegisteredPostFilter()
+    {
+        function mypostfilter($input)
+        {
+            return '{$foo}' . $input;
+        }
+
+        $this->smarty->registerFilter(Smarty::FILTER_POST, 'mypostfilter');
+        $tpl = $this->smarty->createTemplate('eval:{" hello world"}');
+        $tpl->assign('foo', 'bar');
+        $this->assertEquals('{$foo} hello world', $this->smarty->fetch($tpl));
+    }
+
+    /**
+     * test variable filter
+     */
+    public function testLoadedVariableFilter()
+    {
+        $this->smarty->loadFilter("variable", "htmlspecialchars");
+        $tpl = $this->smarty->createTemplate('eval:{$foo}');
+        $tpl->assign('foo', '<?php ?>');
+        $this->assertEquals('&lt;?php ?&gt;', $this->smarty->fetch($tpl));
+    }
+
+    /**
+     * test registered post filter
+     */
+    public function testRegisteredVariableFilter2()
+    {
+        $var = new VarFilter();
+
+        $this->smarty->registerFilter(Smarty::FILTER_VARIABLE, array($var, 'variablefilter'));
+        $tpl = $this->smarty->createTemplate('string:{$foo}');
+        $tpl->assign('foo', 'bar');
+        $this->assertEquals('var{$foo}bar', $this->smarty->fetch($tpl));
+    }
+}
+
+Class VarFilter
+{
+    function variablefilter($input, $smarty)
+    {
+        return 'var{$foo}' . $input;
+    }
+}
+
+function myoutputfilter($input)
+{
+    return str_replace('   ', ' ', $input);
+}
+
+function myoutputfilter2($input, $tpl)
+{
+    return $input . ' filter ' . $tpl->tpl_vars[ 'bar' ];
+}
+
+class myprefilterclass
+{
+    static function myprefilter($input)
+    {
+        return '{$foo}' . $input;
+    }
+}

tests/UnitTests/A_Core/Filter/LoadFilterTest.php

@@ -0,0 +1,31 @@
+<?php
+/**
+ * Smarty PHPunit tests loadFilter method
+ *
+ * @package PHPunit
+ * @author  Uwe Tews
+ */
+
+/**
+ * class for loadFilter method tests
+ *
+ * @runTestsInSeparateProcess
+ * @preserveGlobalState disabled
+ * @backupStaticAttributes enabled
+ */
+class LoadFilterTest extends PHPUnit_Smarty
+{
+    public function setUp()
+    {
+        $this->setUpSmarty(dirname(__FILE__));
+    }
+
+    /**
+     * test loadFilter method
+     */
+    public function testLoadFilter()
+    {
+        $this->smarty->loadFilter('output', 'trimwhitespace');
+        $this->assertTrue(is_callable($this->smarty->registered_filters['output']['smarty_outputfilter_trimwhitespace']));
+    }
+}

tests/UnitTests/A_Core/Filter/RegisterFilterTest.php

@@ -0,0 +1,158 @@
+<?php
+/**
+ * Smarty PHPunit tests register_filter / unregister_filter methods
+ *
+ * @package PHPunit
+ * @author  Uwe Tews
+ */
+
+/**
+ * class for register_filter / unregister_filter methods tests
+ *
+ * @runTestsInSeparateProcess
+ * @preserveGlobalState disabled
+ * @backupStaticAttributes enabled
+ */
+class RegisterFilterTest extends PHPUnit_Smarty
+{
+    public function setUp()
+    {
+        $this->setUpSmarty(dirname(__FILE__));
+    }
+
+    /**
+     * test register->preFilter method for function
+     */
+    public function testRegisterPrefilterFunction()
+    {
+        $this->smarty->registerFilter(Smarty::FILTER_PRE, 'myfilter');
+        $this->assertTrue(is_callable($this->smarty->registered_filters['pre']['myfilter']));
+    }
+
+    /**
+     * test register->preFilter method for class method
+     */
+    public function testRegisterPrefiltermethod()
+    {
+        $this->smarty->registerFilter(Smarty::FILTER_PRE, array('myfilterclass', 'execute'));
+        $this->assertTrue(is_callable($this->smarty->registered_filters['pre']['myfilterclass_execute']));
+    }
+
+    /**
+     * test register->preFilter method for class object
+     */
+    public function testRegisterPrefilterObject()
+    {
+        $this->smarty->registerFilter(Smarty::FILTER_PRE, array(new myfilterclass, 'execute'));
+        $this->assertTrue(is_callable($this->smarty->registered_filters['pre']['myfilterclass_execute']));
+    }
+
+    /**
+     * test unregister->preFilter method for function
+     */
+    public function testUnegisterPrefilterFunction()
+    {
+        $this->smarty->registerFilter(Smarty::FILTER_PRE, 'myfilter');
+        $this->smarty->unregisterFilter(Smarty::FILTER_PRE, 'myfilter');
+        $this->assertFalse(isset($this->smarty->registered_filters['pre']['myfilter']));
+    }
+
+    /**
+     * test unregister->preFilter method for class method
+     */
+    public function testUnregisterPrefiltermethod()
+    {
+        $this->smarty->registerFilter(Smarty::FILTER_PRE, array('myfilterclass', 'execute'));
+        $this->smarty->unregisterFilter(Smarty::FILTER_PRE, array('myfilterclass', 'execute'));
+        $this->assertFalse(isset($this->smarty->registered_filters['pre']['myfilterclass_execute']));
+    }
+
+    /**
+     * test register->postFilter method for function
+     */
+    public function testRegisterPostfilterFunction()
+    {
+        $this->smarty->registerFilter(Smarty::FILTER_POST, 'myfilter');
+        $this->assertTrue(is_callable($this->smarty->registered_filters['post']['myfilter']));
+    }
+
+    /**
+     * test register->postFilter method for class method
+     */
+    public function testRegisterPostfiltermethod()
+    {
+        $this->smarty->registerFilter(Smarty::FILTER_POST, array('myfilterclass', 'execute'));
+        $this->assertTrue(is_callable($this->smarty->registered_filters['post']['myfilterclass_execute']));
+    }
+
+    /**
+     * test unregister->postFilter method for function
+     */
+    public function testUnegisterPostfilterFunction()
+    {
+        $this->smarty->registerFilter(Smarty::FILTER_POST, 'myfilter');
+        $this->smarty->unregisterFilter(Smarty::FILTER_POST, 'myfilter');
+        $this->assertFalse(isset($this->smarty->registered_filters['post']['myfilter']));
+    }
+
+    /**
+     * test unregister->postFilter method for class method
+     */
+    public function testUnregisterPostfiltermethod()
+    {
+        $this->smarty->registerFilter(Smarty::FILTER_POST, array('myfilterclass', 'execute'));
+        $this->smarty->unregisterFilter(Smarty::FILTER_POST, array('myfilterclass', 'execute'));
+        $this->assertFalse(isset($this->smarty->registered_filters['post']['myfilterclass_execute']));
+    }
+
+    /**
+     * test register->outputFilter method for function
+     */
+    public function testRegisterOutputfilterFunction()
+    {
+        $this->smarty->registerFilter(Smarty::FILTER_OUTPUT, 'myfilter');
+        $this->assertTrue(is_callable($this->smarty->registered_filters['output']['myfilter']));
+    }
+
+    /**
+     * test register->outputFilter method for class method
+     */
+    public function testRegisterOutputfiltermethod()
+    {
+        $this->smarty->registerFilter(Smarty::FILTER_OUTPUT, array('myfilterclass', 'execute'));
+        $this->assertTrue(is_callable($this->smarty->registered_filters['output']['myfilterclass_execute']));
+    }
+
+    /**
+     * test unregister->outputFilter method for function
+     */
+    public function testUnegisterOutputfilterFunction()
+    {
+        $this->smarty->registerFilter(Smarty::FILTER_OUTPUT, 'myfilter');
+        $this->smarty->unregisterFilter(Smarty::FILTER_OUTPUT, 'myfilter');
+        $this->assertFalse(isset($this->smarty->registered_filters['output']['myfilter']));
+    }
+
+    /**
+     * test unregister->outputFilter method for class method
+     */
+    public function testUnregisterOutputfiltermethod()
+    {
+        $this->smarty->registerFilter(Smarty::FILTER_OUTPUT, array('myfilterclass', 'execute'));
+        $this->smarty->unregisterFilter(Smarty::FILTER_OUTPUT, array('myfilterclass', 'execute'));
+        $this->assertFalse(isset($this->smarty->registered_filters['output']['myfilterclass_execute']));
+    }
+}
+
+function myfilter($input)
+{
+    return $input;
+}
+
+class myfilterclass
+{
+    static function execute($input)
+    {
+        return $input;
+    }
+}

tests/UnitTests/A_Core/Filter/cache/.gitignore

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

tests/UnitTests/A_Core/Filter/templates/output_001.tpl

@@ -0,0 +1 @@
+{$foo}

tests/UnitTests/A_Core/Filter/templates/output_002.tpl

@@ -0,0 +1 @@
+{$foo nocache}

tests/UnitTests/A_Core/Filter/templates_c/.gitignore

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

tests/UnitTests/A_Core/GetterSetter/GetterSetterTest.php

@@ -0,0 +1,75 @@
+<?php
+/**
+ * Smarty PHPunit tests of generic getter/setter
+ *
+ * @package PHPunit
+ * @author  Uwe Tews
+ */
+
+/**
+ * class for generic getter/setter tests
+ *
+ * @runTestsInSeparateProcess
+ * @preserveGlobalState disabled
+ * @backupStaticAttributes enabled
+ */
+class GetterSetterTest extends PHPUnit_Smarty
+{
+     public function setUp()
+    {
+        $this->setUpSmarty(dirname(__FILE__));
+    }
+
+    public function testInit()
+    {
+        $this->cleanDirs();
+    }
+
+    /**
+     * test setter on Smarty object
+     */
+    public function testSmartySetter()
+    {
+        $this->smarty->setLeftDelimiter('<{');
+        $this->smarty->setRightDelimiter('}>');
+        $this->assertEquals('<{', $this->smarty->left_delimiter);
+        $this->assertEquals('}>', $this->smarty->right_delimiter);
+    }
+
+    /**
+     * test getter on Smarty object
+     */
+    public function testSmartyGetter()
+    {
+        $this->smarty->setLeftDelimiter('<{');
+        $this->smarty->setRightDelimiter('}>');
+        $this->assertEquals('<{', $this->smarty->getLeftDelimiter());
+        $this->assertEquals('}>', $this->smarty->getRightDelimiter());
+    }
+
+    /**
+     * test setter on Template object
+     */
+    public function testTemplateSetter()
+    {
+        $tpl = $this->smarty->createTemplate('helloworld.tpl');
+        $tpl->setLeftDelimiter('<{');
+        $tpl->setRightDelimiter('}>');
+        $this->assertEquals('<{', $tpl->smarty->left_delimiter);
+        $this->assertEquals('}>', $tpl->smarty->right_delimiter);
+        $this->assertEquals('{', $this->smarty->left_delimiter);
+        $this->assertEquals('}', $this->smarty->right_delimiter);
+    }
+
+    /**
+     * test getter on Template object
+     */
+    public function testTemplateGetter()
+    {
+        $tpl = $this->smarty->createTemplate('helloworld.tpl');
+        $tpl->setLeftDelimiter('<{');
+        $tpl->setRightDelimiter('}>');
+        $this->assertEquals('<{', $tpl->getLeftDelimiter());
+        $this->assertEquals('}>', $tpl->getRightDelimiter());
+    }
+}

tests/UnitTests/A_Core/GetterSetter/cache/.gitignore

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

tests/UnitTests/A_Core/GetterSetter/templates_c/.gitignore

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

tests/UnitTests/A_Core/LoadPlugin/DefaultPluginHandlerTest.php

@@ -0,0 +1,182 @@
+<?php
+/**
+ * Smarty PHPunit tests deault plugin handler
+ *
+ * @package PHPunit
+ * @author  Uwe Tews
+ */
+
+/**
+ * class for plugin handler tests
+ *
+ * @runTestsInSeparateProcess
+ * @preserveGlobalState disabled
+ * @backupStaticAttributes enabled
+ */
+class DefaultPluginHandlerTest extends PHPUnit_Smarty
+{
+    public function setUp()
+    {
+        $this->setUpSmarty(dirname(__FILE__));
+        $this->smarty->setForceCompile(true);
+        $this->smarty->disableSecurity();
+        $this->smarty->registerDefaultPluginHandler('my_plugin_handler');
+    }
+
+
+    public function testInit()
+    {
+        $this->cleanDirs();
+    }
+    public function testDefaultFunctionScript()
+    {
+        $this->assertEquals("scriptfunction foo bar", $this->smarty->fetch('test_default_function_script.tpl'));
+    }
+
+    public function testDefaultFunctionScriptNotCachable1()
+    {
+        $this->smarty->assign('foo', 'foo');
+        $this->smarty->caching = 1;
+        $this->assertEquals("scriptfunction foo", $this->smarty->fetch('test_default_function_script_notcachable.tpl'));
+    }
+
+    public function testDefaultFunctionScriptNotCachable2()
+    {
+        $this->smarty->assign('foo', 'bar');
+        $this->smarty->caching = 1;
+        $this->assertEquals("scriptfunction bar", $this->smarty->fetch('test_default_function_script_notcachable.tpl'));
+    }
+
+    public function testDefaultFunctionLocal()
+    {
+        $this->assertEquals("localfunction foo bar", $this->smarty->fetch('test_default_function_local.tpl'));
+    }
+
+    public function testDefaultCompilerFunctionScript()
+    {
+        $this->assertEquals("echo 'scriptcompilerfunction '.'foo bar';", $this->smarty->fetch('test_default_compiler_function_script.tpl'));
+    }
+    public function testDefaultCompilerObject()
+    {
+        $this->assertEquals('Public World', $this->smarty->fetch('test_default_compiler_object.tpl'));
+    }
+
+    public function testDefaultBlockScript()
+    {
+        $this->assertEquals("scriptblock foo bar", $this->smarty->fetch('test_default_block_script.tpl'));
+    }
+
+    public function testDefaultModifierScript()
+    {
+        $this->smarty->assign('foo', 'bar');
+        $this->assertEquals("scriptmodifier default bar", $this->smarty->fetch('test_default_modifier_script.tpl'));
+    }
+
+    public function testDefaultModifier()
+    {
+        $this->smarty->assign('foo', 'bar');
+        $this->assertEquals("localmodifier bar", $this->smarty->fetch('test_default_modifier.tpl'));
+    }
+
+    public function testDefaultModifierStaticClassMethodCaching1()
+    {
+        $this->smarty->assign('foo', 'bar');
+        $this->smarty->caching = 1;
+        $this->assertEquals("staticmodifier bar", $this->smarty->fetch('test_default_static_modifier.tpl'));
+    }
+
+    public function testDefaultModifierStaticClassMethodCaching2()
+    {
+        $this->smarty->assign('foo', 'bar');
+        $this->smarty->caching = 1;
+        $this->assertEquals("staticmodifier bar", $this->smarty->fetch('test_default_static_modifier.tpl'));
+    }
+}
+
+function my_plugin_handler($tag, $type, $template, &$callback, &$script, &$cachable)
+{
+    switch ($type) {
+        case Smarty::PLUGIN_FUNCTION:
+            switch ($tag) {
+                case 'scriptfunction':
+                    $script = './scripts/script_function_tag.php';
+                    $callback = 'default_script_function_tag';
+
+                    return true;
+                case 'scriptfunctionnotcachable':
+                    $script = './scripts/script_function_tag.php';
+                    $callback = 'default_script_function_tag';
+                    $cachable = false;
+
+                    return true;
+                case 'localfunction':
+                    $callback = 'default_local_function_tag';
+
+                    return true;
+                default:
+                    return false;
+            }
+        case Smarty::PLUGIN_COMPILER:
+            switch ($tag) {
+                case 'scriptcompilerfunction':
+                    $script = './scripts/script_compiler_function_tag.php';
+                    $callback = 'default_script_compiler_function_tag';
+                    return true;
+                case 'compilerobject':
+                     $callback = array(new CompilerDefaultPluginClass, 'compile');
+                    return true;
+                default:
+                    return false;
+            }
+        case Smarty::PLUGIN_BLOCK:
+            switch ($tag) {
+                case 'scriptblock':
+                    $script = './scripts/script_block_tag.php';
+                    $callback = 'default_script_block_tag';
+
+                    return true;
+                default:
+                    return false;
+            }
+        case Smarty::PLUGIN_MODIFIER:
+            switch ($tag) {
+                case 'scriptmodifier':
+                    $script = './scripts/script_modifier.php';
+                    $callback = 'default_script_modifier';
+
+                    return true;
+                case 'mydefaultmodifier':
+                    $callback = 'default_local_modifier';
+
+                    return true;
+                case 'mydefaultstaticmodifier':
+                    $script = './scripts/script_default_static_modifier.php';
+                    $callback = array('DefModifier', 'default_static_modifier');
+
+                    return true;
+                default:
+                    return false;
+            }
+        default:
+            return false;
+    }
+}
+
+function default_local_function_tag($params, $template)
+{
+    return 'localfunction ' . $params['value'];
+}
+
+function default_local_modifier($input)
+{
+    return 'localmodifier ' . $input;
+}
+class CompilerDefaultPluginClass
+{
+    static function statCompile ($params, $compiler) {
+        return '<?php echo \'Static World\';?>';
+    }
+    public function compile ($params, $compiler) {
+        return '<?php echo \'Public World\';?>';
+    }
+}

tests/UnitTests/A_Core/LoadPlugin/IncludePathTest.php

@@ -0,0 +1,51 @@
+<?php
+
+/**
+ * Smarty PHPunit tests for File resources
+ *
+ * @package                PHPunit
+ * @author                 Rodney Rehm
+ * @runTestsInSeparateProcess
+ * @preserveGlobalState disabled
+ * @backupStaticAttributes enabled
+ */
+class IncludePathTest extends PHPUnit_Smarty
+{
+    public function setUp()
+    {
+        $this->setUpSmarty(dirname(__FILE__));
+        $this->smarty->use_include_path = true;
+        $this->smarty->setPluginsDir(array('./include','./include1'));
+        $this->smarty->enableSecurity();
+        $ds = DIRECTORY_SEPARATOR;
+        set_include_path($this->smarty->_realpath(dirname(__FILE__) . "{$ds}..{$ds}..{$ds}..{$ds}Include_Path{$ds}Plugins{$ds}", true) . PATH_SEPARATOR . get_include_path());
+    }
+
+    /**
+     * Tears down the fixture
+     * This method is called after a test is executed.
+     *
+     */
+    protected function tearDown()
+    {
+        ini_restore('include_path');
+        $this->smarty->disableSecurity();
+        parent::tearDown();
+     }
+    public function testInit()
+    {
+        $this->cleanDirs();
+    }
+    public function testInclude1()
+    {
+        $this->assertContains('plugin1', $this->smarty->fetch('test_include_path1.tpl'));
+    }
+    public function testInclude2()
+    {
+        $this->assertContains('plugin2', $this->smarty->fetch('test_include_path2.tpl'));
+    }
+    public function testInclude3()
+    {
+        $this->assertContains('plugin3', $this->smarty->fetch('test_include_path3.tpl'));
+    }
+  }

tests/UnitTests/A_Core/LoadPlugin/LoadPluginTest.php

@@ -0,0 +1,54 @@
+<?php
+/**
+ * Smarty PHPunit basic core function tests
+ *
+ * @package PHPunit
+ * @author  Uwe Tews
+ */
+
+/**
+ * class core function tests
+ *
+ * @runTestsInSeparateProcess
+ * @preserveGlobalState disabled
+ * @backupStaticAttributes enabled
+ */
+class LoadPluginTest extends PHPUnit_Smarty
+{
+    public function setUp()
+    {
+        $this->setUpSmarty(dirname(__FILE__));
+    }
+
+    /**
+     * loadPlugin test unkown plugin
+     */
+    public function testLoadPluginErrorReturn()
+    {
+        $this->assertFalse($this->smarty->loadPlugin('Smarty_Not_Known'));
+    }
+
+    /**
+     * loadPlugin test Smarty_Internal_Debug exists
+     */
+    public function testLoadPluginSmartyInternalDebug()
+    {
+        $this->assertTrue($this->smarty->loadPlugin('Smarty_Internal_Debug') == true);
+    }
+
+    /**
+     * loadPlugin test $template_class exists
+     */
+    public function testLoadPluginSmartyTemplateClass()
+    {
+        $this->assertTrue($this->smarty->loadPlugin($this->smarty->template_class) == true);
+    }
+
+    /**
+     * loadPlugin test loaging from plugins_dir
+     */
+    public function testLoadPluginSmartyPluginCounter()
+    {
+        $this->assertTrue($this->smarty->loadPlugin('Smarty_Function_Counter') == true);
+    }
+}

tests/UnitTests/A_Core/LoadPlugin/cache/.gitignore

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

tests/UnitTests/A_Core/LoadPlugin/include/function.plugin3.php

@@ -0,0 +1,5 @@
+<?php
+function smarty_function_plugin3($params, $template)
+{
+    return 'plugin3';
+}

tests/UnitTests/A_Core/LoadPlugin/scripts/script_block_tag.php

@@ -0,0 +1,7 @@
+<?php
+function default_script_block_tag($params, $content, $template, &$repeat)
+{
+    if (isset($content)) {
+        return 'scriptblock ' . $content;
+    }
+}

tests/UnitTests/A_Core/LoadPlugin/scripts/script_compiler_function_tag.php

@@ -0,0 +1,5 @@
+<?php
+function default_script_compiler_function_tag($params, $template)
+{
+    return "echo 'scriptcompilerfunction '." . $params['value'] . ";";
+}

tests/UnitTests/A_Core/LoadPlugin/scripts/script_default_static_modifier.php

@@ -0,0 +1,10 @@
+<?php
+if (!class_exists('DefModifier')) {
+    Class DefModifier
+    {
+        static function default_static_modifier($input)
+        {
+            return 'staticmodifier ' . $input;
+        }
+    }
+}

tests/UnitTests/A_Core/LoadPlugin/scripts/script_function_tag.php

@@ -0,0 +1,5 @@
+<?php
+function default_script_function_tag($params, $template)
+{
+    return 'scriptfunction ' . $params['value'];
+}

tests/UnitTests/A_Core/LoadPlugin/scripts/script_modifier.php

@@ -0,0 +1,5 @@
+<?php
+function default_script_modifier($input, $text = null)
+{
+    return $text . $input;
+}

tests/UnitTests/A_Core/LoadPlugin/scripts/test_include_php.php

@@ -0,0 +1,2 @@
+<?php
+echo 'test include php';

tests/UnitTests/A_Core/LoadPlugin/templates/test_default_block_script.tpl

@@ -0,0 +1 @@
+{scriptblock}foo bar{/scriptblock}

tests/UnitTests/A_Core/LoadPlugin/templates/test_default_compiler_function_script.tpl

@@ -0,0 +1 @@
+{scriptcompilerfunction value='foo bar'}

tests/UnitTests/A_Core/LoadPlugin/templates/test_default_compiler_object.tpl

@@ -0,0 +1 @@
+{compilerobject value='foo bar'}

tests/UnitTests/A_Core/LoadPlugin/templates/test_default_function_local.tpl

@@ -0,0 +1 @@
+{localfunction value='foo bar'}

tests/UnitTests/A_Core/LoadPlugin/templates/test_default_function_script.tpl

@@ -0,0 +1 @@
+{scriptfunction value='foo bar'}

tests/UnitTests/A_Core/LoadPlugin/templates/test_default_function_script_notcachable.tpl

@@ -0,0 +1 @@
+{scriptfunctionnotcachable value=$foo}

tests/UnitTests/A_Core/LoadPlugin/templates/test_default_modifier.tpl

@@ -0,0 +1 @@
+{$foo|mydefaultmodifier}

tests/UnitTests/A_Core/LoadPlugin/templates/test_default_modifier_script.tpl

@@ -0,0 +1 @@
+{$foo|scriptmodifier:'scriptmodifier default '}

tests/UnitTests/A_Core/LoadPlugin/templates/test_default_static_modifier.tpl

@@ -0,0 +1 @@
+{$foo|mydefaultstaticmodifier nocache}

tests/UnitTests/A_Core/LoadPlugin/templates/test_include_path1.tpl

@@ -0,0 +1 @@
+{plugin1}

tests/UnitTests/A_Core/LoadPlugin/templates/test_include_path2.tpl

@@ -0,0 +1 @@
+{plugin2}

tests/UnitTests/A_Core/LoadPlugin/templates/test_include_path3.tpl

@@ -0,0 +1 @@
+{plugin3}

tests/UnitTests/A_Core/LoadPlugin/templates_c/.gitignore

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

tests/UnitTests/A_Core/MuteExpectedErrors/MuteExpectedErrorsTest.php

@@ -0,0 +1,123 @@
+<?php
+/**
+ * Smarty PHPunit tests of filter
+ *
+ * @package PHPunit
+ * @author  Rodney Rehm
+ */
+
+/**
+ * class for filter tests
+ *
+ * @runTestsInSeparateProcess
+ * @preserveGlobalState disabled
+ * @backupStaticAttributes enabled
+ */
+class MuteExpectedErrorsTest extends PHPUnit_Smarty
+{
+    protected $_errors = array();
+
+    public function setUp()
+    {
+        $this->setUpSmarty(dirname(__FILE__));
+    }
+
+
+    public function testInit()
+    {
+        $this->cleanDirs();
+    }
+    public function error_handler($errno, $errstr, $errfile, $errline, $errcontext)
+    {
+        $this->_errors[] = $errfile . ' line ' . $errline;
+    }
+
+    public function testMuted()
+    {
+        set_error_handler(array($this, 'error_handler'));
+        Smarty::muteExpectedErrors();
+
+        $this->smarty->clearCache('default.tpl');
+        $this->smarty->clearCompiledTemplate('default.tpl');
+        $this->smarty->fetch('default.tpl');
+
+        $this->assertEquals($this->_errors, array());
+
+        @filemtime('ckxladanwijicajscaslyxck');
+        $error = array(__FILE__ . ' line ' . (__LINE__ - 1));
+        $this->assertEquals($this->_errors, $error);
+
+        Smarty::unmuteExpectedErrors();
+        restore_error_handler();
+    }
+
+    /**
+     *
+     * @rrunInSeparateProcess
+     *
+     */
+    public function testUnmuted()
+    {
+        set_error_handler(array($this, 'error_handler'));
+
+        $this->smarty->clearCache('default.tpl');
+        $this->smarty->clearCompiledTemplate('default.tpl');
+        $this->smarty->fetch('default.tpl');
+
+        $this->assertEquals(Smarty::$_IS_WINDOWS ? 2 : 2, count($this->_errors));
+
+        @filemtime('ckxladanwijicajscaslyxck');
+        $this->assertEquals(Smarty::$_IS_WINDOWS ? 3 : 3, count($this->_errors));
+
+        restore_error_handler();
+    }
+
+    /**
+     *
+     * @runInSeparateProcess
+     * @preserveGlobalState disabled
+     *
+     */
+    public function testMutedCaching()
+    {
+        set_error_handler(array($this, 'error_handler'));
+        Smarty::muteExpectedErrors();
+
+        $this->smarty->caching = true;
+        $this->smarty->clearCache('default.tpl');
+        $this->smarty->clearCompiledTemplate('default.tpl');
+        $this->smarty->fetch('default.tpl');
+
+        $this->assertEquals($this->_errors, array());
+
+        @filemtime('ckxladanwijicajscaslyxck');
+        $error = array(__FILE__ . ' line ' . (__LINE__ - 1));
+        $this->assertEquals($error, $this->_errors);
+
+        Smarty::unmuteExpectedErrors();
+        restore_error_handler();
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState disabled
+     *
+     */
+    public function testUnmutedCaching()
+    {
+        set_error_handler(array($this, 'error_handler'));
+
+        $this->smarty->caching = true;
+        $this->smarty->clearCache('default.tpl');
+        $this->smarty->clearCompiledTemplate('default.tpl');
+        $this->smarty->fetch('default.tpl');
+
+        $this->assertEquals(Smarty::$_IS_WINDOWS ? 2 : 2, count($this->_errors));
+
+        @filemtime('ckxladanwijicajscaslyxck');
+        $error = array(__FILE__ . ' line ' . (__LINE__ - 1));
+        $this->assertEquals(Smarty::$_IS_WINDOWS ? 3 : 3, count($this->_errors));
+
+        restore_error_handler();
+    }
+}

tests/UnitTests/A_Core/MuteExpectedErrors/cache/.gitignore

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

tests/UnitTests/A_Core/MuteExpectedErrors/templates/default.tpl

@@ -0,0 +1 @@
+{$foo|default:""} /* should compile something with @silence error suppression */

tests/UnitTests/A_Core/MuteExpectedErrors/templates_c/.gitignore

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

tests/UnitTests/A_Core/PluginTests/PHPunitplugins/function.chain1.php

@@ -0,0 +1,7 @@
+<?php
+function smarty_function_chain1($params, $tpl)
+{
+    $tpl->smarty->loadPlugin('smarty_function_chain2');
+
+    return smarty_function_chain2($params, $tpl);
+}

tests/UnitTests/A_Core/PluginTests/PHPunitplugins/function.chain2.php

@@ -0,0 +1,7 @@
+<?php
+function smarty_function_chain2($params, $tpl)
+{
+    $tpl->smarty->loadPlugin('smarty_function_chain3');
+
+    return smarty_function_chain3($params, $tpl);
+}

tests/UnitTests/A_Core/PluginTests/PHPunitplugins/function.chain3.php

@@ -0,0 +1,5 @@
+<?php
+function smarty_function_chain3($params, $tpl)
+{
+    return 'from chain3';
+}

tests/UnitTests/A_Core/PluginTests/PluginChainedLoadTest.php

@@ -0,0 +1,33 @@
+<?php
+/**
+ * Smarty PHPunit tests chained loading of dependend pluglind
+ *
+ * @package PHPunit
+ * @author  Rodney Rehm
+ */
+
+/**
+ * class for modifier tests
+ *
+ * @runTestsInSeparateProcess
+ * @preserveGlobalState disabled
+ * @backupStaticAttributes enabled
+ */
+class PluginChainedLoadTest extends PHPUnit_Smarty
+{
+    public function setUp()
+    {
+        $this->setUpSmarty(dirname(__FILE__));
+    }
+
+    public function testInit()
+    {
+        $this->cleanDirs();
+    }
+
+    public function testPluginChainedLoad()
+    {
+        $this->smarty->addPluginsDir(dirname(__FILE__) . "/PHPunitplugins/");
+        $this->assertContains('from chain3', $this->smarty->fetch('test_plugin_chained_load.tpl'));
+    }
+}

tests/UnitTests/A_Core/PluginTests/Shared/SharedFunctionsTest.php

@@ -0,0 +1,29 @@
+<?php
+/**
+ * Smarty PHPunit tests of shared plugin functions
+ *
+ * @package PHPunit
+ * @author  Rodney Rehm
+ */
+
+/**
+ * class for function tests
+ */
+class SharedFunctionsTest extends PHPUnit_Smarty
+{
+    public function setUp()
+    {
+        $this->setUpSmarty(dirname(__FILE__));
+    }
+
+    /**
+     * test smarty_function_escape_special_chars()
+     */
+    public function testEscapeSpecialChars()
+    {
+        require_once SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php';
+
+        $this->assertEquals('hello&lt;world &copy;', smarty_function_escape_special_chars('hello<world &copy;'));
+        $this->assertEquals('ö€', smarty_function_escape_special_chars('ö€'));
+    }
+}

tests/UnitTests/A_Core/PluginTests/Shared/cache/.gitignore

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

tests/UnitTests/A_Core/PluginTests/Shared/templates_c/.gitignore

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

tests/UnitTests/A_Core/PluginTests/cache/.gitignore

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