diff --git a/.gitattributes b/.gitattributes
index 2cda67b0..4ba2fe45 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -11,9 +11,7 @@
 
 /.gitattributes export-ignore
 /.gitignore export-ignore
-/.travis.yml export-ignore
 /make-release.sh export-ignore
 /phpunit.sh export-ignore
 /phpunit.xml export-ignore
 /TODO.md export-ignore
-/travis.ini export-ignore
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 00000000..e82642aa
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,73 @@
+# https://help.github.com/en/categories/automating-your-workflow-with-github-actions
+
+on:
+  - pull_request
+  - push
+
+name: CI
+
+jobs:
+  tests:
+    name: Tests
+
+    runs-on: ${{ matrix.os }}
+
+    env:
+      PHP_EXTENSIONS: dom, json, libxml, mbstring, pdo_sqlite, soap, xml, xmlwriter
+      PHP_INI_VALUES: assert.exception=1, zend.assertions=1
+
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - ubuntu-latest
+
+        php-version:
+          - "7.1"
+          - "7.2"
+          - "7.3"
+          - "7.4"
+          - "8.0"
+
+        compiler:
+          - default
+
+        include:
+          - os: ubuntu-latest
+            php-version: "8.0"
+            compiler: jit
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: Override PHP ini values for JIT compiler
+      if: matrix.compiler == 'jit'
+      run: echo "PHP_INI_VALUES::assert.exception=1, zend.assertions=1, opcache.enable=1, opcache.enable_cli=1, opcache.optimization_level=-1, opcache.jit=1255, opcache.jit_buffer_size=32M" >> $GITHUB_ENV
+
+    - name: Install PHP with extensions
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: ${{ matrix.php-version }}
+        coverage: pcov
+        extensions: ${{ env.PHP_EXTENSIONS }}
+        ini-values: ${{ env.PHP_INI_VALUES }}
+
+    - name: Validate composer.json and composer.lock
+      run: composer validate
+
+    - name: Cache Composer packages
+      id: composer-cache
+      uses: actions/cache@v2
+      with:
+        path: vendor
+        key: ${{ runner.os }}-php-${{ matrix.php-version }}-${{ hashFiles('**/composer.lock') }}
+        restore-keys: |
+          ${{ runner.os }}-php-${{ matrix.php-version }}-
+
+    - name: Install dependencies
+      if: steps.composer-cache.outputs.cache-hit != 'true'
+      run: composer install --prefer-dist --no-progress --no-suggest
+
+    - name: Run tests with phpunit
+      run: ./phpunit.sh
diff --git a/.gitignore b/.gitignore
index 00d98c5b..5bd891e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,5 +9,6 @@ utilies/*.php
 
 # Dev
 phpunit*
+.phpunit.result.cache
 vendor/*
 composer.lock
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index a8a11dcb..00000000
--- a/.travis.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-language: php
-os: linux
-dist: xenial
-
-install:
-  - travis_retry composer install
-
-jobs:
-  include:
-   - php: 5.3 # Composer and PHPUnit require PHP 5.3.2+ to run, so we cannot test below 5.3
-     dist: precise # PHP 5.3 is supported only on Precise.
-   - php: 5.4
-     dist: trusty  # PHP 5.4 is supported only on Trusty.
-   - php: 5.5
-     dist: trusty  # PHP 5.5 is supported only on Trusty.
-   - php: 5.6
-   - php: 7.0
-   - php: 7.1
-   - php: 7.2
-   - php: 7.3
-   - php: 7.4
-   - php: nightly
-     install: travis_retry composer config platform.php 7.4.0 && composer install
-  fast_finish: true
-  allow_failures:
-   - php: nightly # PHP 8 is still in beta
-
-services:
-  - memcached
-  - mysql
-
-before_script:
-  - mysql -e "create database IF NOT EXISTS test;" -uroot
-
-before_install:
-  - phpenv config-rm xdebug.ini || return 0
-
-script:
-  - ./phpunit.sh
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a99257c2..d06da737 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+- You can now use `$smarty->muteUndefinedOrNullWarnings()` to activate convert warnings about undefined or null template vars to notices when running PHP8
+
+### Changed
+- Switch CI from Travis to Github CI
+- Updated unit tests to avoid skipped and risky test warnings
+
+### Removed
+- Dropped support for PHP7.0 and below, so Smarty now requires PHP >=7.1
+- Dropped support for php asp tags in templates (removed from php since php7.0)
+- Dropped deprecated API calls that where only accessible through SmartyBC
+- Dropped support for {php} and {include_php} tags and embedded PHP in templates. Embedded PHP will now be passed through as is.
+- Removed all PHP_VERSION_ID and compare_version checks and conditional code blocks that are now no longer required
+- Dropped deprecated SMARTY_RESOURCE_CHAR_SET and SMARTY_RESOURCE_DATE_FORMAT constants
+- Dropped deprecated Smarty::muteExpectedErrors and Smarty::unmuteExpectedErrors API methods
+- Dropped deprecated $smarty->getVariable() method. Use $smarty->getTemplateVars() instead.
+- $smarty->registerResource() no longer accepts an array of callback functions
+
 ## [3.1.40] - 2021-10-13
 
 ### Changed
diff --git a/README b/README
index 9a71519b..d34c5638 100644
--- a/README
+++ b/README
@@ -51,7 +51,7 @@ $smarty->unregisterFilter(...)
 
 Please refer to the online documentation for all specific changes:
 
-http://www.smarty.net/documentation
+https://www.smarty.net/documentation
 
 ----
 
diff --git a/README.md b/README.md
index b57969c4..112b8f63 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # 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)
+![CI](https://github.com/smarty-php/smarty/workflows/CI/badge.svg)
 
 ## Documentation
 
@@ -9,8 +9,7 @@ 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.
+Smarty can be run with PHP 7.1 to PHP 8.0.
 
 ## Distribution repository
 
@@ -74,5 +73,3 @@ Or you could use:
 ```
 
 Which is a wrapper to install all 3 packages.
-
-Composer can also be used for Smarty2 versions 2.6.24 to 2.6.30.
diff --git a/composer.json b/composer.json
index 183f9f24..abf395b9 100644
--- a/composer.json
+++ b/composer.json
@@ -5,7 +5,7 @@
     "keywords": [
         "templating"
     ],
-    "homepage": "http://www.smarty.net",
+    "homepage": "https://www.smarty.net",
     "license": "LGPL-3.0",
     "authors": [
         {
@@ -19,15 +19,18 @@
         {
             "name": "Rodney Rehm",
             "email": "rodney.rehm@medialize.de"
+        },
+        {
+            "name": "Simon Wisselink",
+            "homepage": "https://www.iwink.nl/"
         }
     ],
     "support": {
-        "irc": "irc://irc.freenode.org/smarty",
         "issues": "https://github.com/smarty-php/smarty/issues",
-        "forum": "http://www.smarty.net/forums/"
+        "forum": "https://www.smarty.net/forums/"
     },
     "require": {
-        "php": ">=5.2"
+        "php": "^7.1 || ^8.0"
     },
     "autoload": {
         "classmap": [
@@ -36,11 +39,11 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "3.1.x-dev"
+            "dev-master": "4.0.x-dev"
         }
     },
     "require-dev": {
-        "phpunit/phpunit": "^7.5 || ^6.5 || ^5.7 || ^4.8",
+        "phpunit/phpunit": "^8.5 || ^7.5",
         "smarty/smarty-lexer": "^3.1"
     }
 }
diff --git a/lexer/smarty_internal_templatelexer.plex b/lexer/smarty_internal_templatelexer.plex
index ac125025..67c840d7 100644
--- a/lexer/smarty_internal_templatelexer.plex
+++ b/lexer/smarty_internal_templatelexer.plex
@@ -289,8 +289,6 @@ class Smarty_Internal_Templatelexer
      textdoublequoted = ~([^"\\]*?)((?:\\.[^"\\]*?)*?)(?=((SMARTYldel)SMARTYal|\$|`\$|"SMARTYliteral))~
      namespace = ~([0-9]*[a-zA-Z_]\w*)?(\\[0-9]*[a-zA-Z_]\w*)+~
      emptyjava = ~[{][}]~
-     phptag = ~(SMARTYldel)SMARTYalphp([ ].*?)?SMARTYrdel|(SMARTYldel)SMARTYal[/]phpSMARTYrdel~
-     phpstart = ~[<][?]((php\s+|=)|\s+)|[<][%]|[<][?]xml\s+|[<]script\s+language\s*=\s*["']?\s*php\s*["']?\s*[>]|[?][>]|[%][>]~
      slash = ~[/]~
      ldel = ~(SMARTYldel)SMARTYal~
      rdel = ~\s*SMARTYrdel~
@@ -362,9 +360,6 @@ class Smarty_Internal_Templatelexer
         $this->value = substr($this->data,$this->counter,$to-$this->counter);
         return false;
      }
-     phptag {
-        $this->compiler->getTagCompiler('private_php')->parsePhp($this);
-     }
      userliteral {
         $this->token = Smarty_Internal_Templateparser::TP_TEXT;
      }
@@ -380,12 +375,9 @@ class Smarty_Internal_Templatelexer
         $this->yypushstate(self::TAG);
         return true;
      }
-     phpstart {
-        $this->compiler->getTagCompiler('private_php')->parsePhp($this);
-     }
      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');
+           $this->yy_global_text = $this->replace('/(SMARTYldel)SMARTYal/isS');
        }
        $to = $this->dataLength;
        preg_match($this->yy_global_text, $this->data,$match,PREG_OFFSET_CAPTURE,$this->counter);
diff --git a/lexer/smarty_internal_templateparser.y b/lexer/smarty_internal_templateparser.y
index c6890642..3786466f 100644
--- a/lexer/smarty_internal_templateparser.y
+++ b/lexer/smarty_internal_templateparser.y
@@ -23,7 +23,6 @@ class Smarty_Internal_Templateparser
 {
     const ERR1 = 'Security error: Call to private object member not allowed';
     const ERR2 = 'Security error: Call to dynamic object member not allowed';
-    const ERR3 = 'PHP in template not allowed. Use SmartyBC to enable it';
 
     /**
      * result status
@@ -237,16 +236,6 @@ start(res)       ::= template. {
     res = $this->root_buffer->to_smarty_php($this);
 }
 
-
-                      // php tags
-template       ::= template PHP(B). {
-    $code = $this->compiler->compileTag('private_php',array(array('code' => B), array('type' => $this->lex->phpType )),array());
-    if ($this->compiler->has_code && !empty($code)) {
-        $tmp =''; foreach ($this->compiler->prefix_code as $code) {$tmp.=$code;} $this->compiler->prefix_code=array();
-         $this->current_buffer->append_subtree($this,  new Smarty_Internal_ParseTree_Tag($this, $this->compiler->processNocacheCode($tmp.$code,true)));
-    }
-}
-
                       // template text
 template       ::= template  TEXT(B). {
          $text = $this->yystack[ $this->yyidx + 0 ]->minor;
diff --git a/libs/Autoloader.php b/libs/Autoloader.php
index c09361b6..1673ce2f 100644
--- a/libs/Autoloader.php
+++ b/libs/Autoloader.php
@@ -39,7 +39,7 @@ class Smarty_Autoloader
      *
      * @var array
      */
-    public static $rootClasses = array('smarty' => 'Smarty.class.php', 'smartybc' => 'SmartyBC.class.php',);
+    public static $rootClasses = array('smarty' => 'Smarty.class.php');
 
     /**
      * Registers Smarty_Autoloader backward compatible to older installations.
@@ -76,11 +76,7 @@ class Smarty_Autoloader
         self::$SMARTY_DIR = defined('SMARTY_DIR') ? SMARTY_DIR : dirname(__FILE__) . DIRECTORY_SEPARATOR;
         self::$SMARTY_SYSPLUGINS_DIR = defined('SMARTY_SYSPLUGINS_DIR') ? SMARTY_SYSPLUGINS_DIR :
             self::$SMARTY_DIR . 'sysplugins' . DIRECTORY_SEPARATOR;
-        if (version_compare(PHP_VERSION, '5.3.0', '>=')) {
-            spl_autoload_register(array(__CLASS__, 'autoload'), true, $prepend);
-        } else {
-            spl_autoload_register(array(__CLASS__, 'autoload'));
-        }
+        spl_autoload_register(array(__CLASS__, 'autoload'), true, $prepend);
     }
 
     /**
diff --git a/libs/Smarty.class.php b/libs/Smarty.class.php
index daa67749..294c1245 100644
--- a/libs/Smarty.class.php
+++ b/libs/Smarty.class.php
@@ -20,7 +20,7 @@
  * Smarty mailing list. Send a blank e-mail to
  * smarty-discussion-subscribe@googlegroups.com
  *
- * @link      http://www.smarty.net/
+ * @link      https://www.smarty.net/
  * @copyright 2018 New Digital Group, Inc.
  * @copyright 2018 Uwe Tews
  * @author    Monte Ohrt <monte at ohrt dot com>
@@ -60,19 +60,6 @@ if (!defined('SMARTY_MBSTRING')) {
      */
     define('SMARTY_MBSTRING', function_exists('mb_get_info'));
 }
-if (!defined('SMARTY_RESOURCE_CHAR_SET')) {
-    // UTF-8 can only be done properly when mbstring is available!
-    /**
-     * @deprecated in favor of Smarty::$_CHARSET
-     */
-    define('SMARTY_RESOURCE_CHAR_SET', SMARTY_MBSTRING ? 'UTF-8' : 'ISO-8859-1');
-}
-if (!defined('SMARTY_RESOURCE_DATE_FORMAT')) {
-    /**
-     * @deprecated in favor of Smarty::$_DATE_FORMAT
-     */
-    define('SMARTY_RESOURCE_DATE_FORMAT', '%b %e, %Y');
-}
 /**
  * Load Smarty_Autoloader
  */
@@ -143,13 +130,7 @@ class Smarty extends Smarty_Internal_TemplateBase
     const DEBUG_OFF        = 0;
     const DEBUG_ON         = 1;
     const DEBUG_INDIVIDUAL = 2;
-    /**
-     * modes for handling of "<?php ... ?>" tags in templates.
-     */
-    const PHP_PASSTHRU = 0; //-> print tags as plain text
-    const PHP_QUOTE    = 1; //-> escape tags as entities
-    const PHP_REMOVE   = 2; //-> escape tags as entities
-    const PHP_ALLOW    = 3; //-> escape tags as entities
+
     /**
      * filter types
      */
@@ -179,13 +160,13 @@ class Smarty extends Smarty_Internal_TemplateBase
     /**
      * The character set to adhere to (e.g. "UTF-8")
      */
-    public static $_CHARSET = SMARTY_RESOURCE_CHAR_SET;
+    public static $_CHARSET = SMARTY_MBSTRING ? 'UTF-8' : 'ISO-8859-1';
 
     /**
      * The date format to be used internally
      * (accepts date() and strftime())
      */
-    public static $_DATE_FORMAT = SMARTY_RESOURCE_DATE_FORMAT;
+    public static $_DATE_FORMAT = '%b %e, %Y';
 
     /**
      * Flag denoting if PCRE should run in UTF-8 mode
@@ -369,13 +350,6 @@ class Smarty extends Smarty_Internal_TemplateBase
      */
     public $security_policy = null;
 
-    /**
-     * controls handling of PHP-blocks
-     *
-     * @var integer
-     */
-    public $php_handling = self::PHP_PASSTHRU;
-
     /**
      * controls if the php template file resource is allowed
      *
@@ -666,6 +640,12 @@ class Smarty extends Smarty_Internal_TemplateBase
         'cache_dir'    => 'CacheDir',
     );
 
+    /**
+     * PHP7 Compatibility mode
+     * @var bool
+     */
+    private $isMutingUndefinedOrNullWarnings = false;
+
     /**
      * Initialize new Smarty object
      */
@@ -688,27 +668,6 @@ class Smarty extends Smarty_Internal_TemplateBase
         }
     }
 
-    /**
-     * Enable error handler to mute expected messages
-     *
-     * @return     boolean
-     * @deprecated
-     */
-    public static function muteExpectedErrors()
-    {
-        return Smarty_Internal_ErrorHandler::muteExpectedErrors();
-    }
-
-    /**
-     * Disable error handler muting expected messages
-     *
-     * @deprecated
-     */
-    public static function unmuteExpectedErrors()
-    {
-        restore_error_handler();
-    }
-
     /**
      * Check if a template resource exists
      *
@@ -1387,11 +1346,6 @@ class Smarty extends Smarty_Internal_TemplateBase
     private function _normalizeDir($dirName, $dir)
     {
         $this->{$dirName} = $this->_realpath(rtrim($dir, "/\\") . DIRECTORY_SEPARATOR, true);
-        if (class_exists('Smarty_Internal_ErrorHandler', false)) {
-            if (!isset(Smarty_Internal_ErrorHandler::$mutedDirectories[ $this->{$dirName} ])) {
-                Smarty_Internal_ErrorHandler::$mutedDirectories[ $this->{$dirName} ] = null;
-            }
-        }
     }
 
     /**
@@ -1421,4 +1375,23 @@ class Smarty extends Smarty_Internal_TemplateBase
         $isConfig ? $this->_joined_config_dir = join('#', $this->config_dir) :
             $this->_joined_template_dir = join('#', $this->template_dir);
     }
+
+    /**
+     * Activates PHP7 compatibility mode:
+     * - converts E_WARNINGS for "undefined array key" and "trying to read property of null" errors to E_NOTICE
+     *
+     * @void
+     */
+    public function muteUndefinedOrNullWarnings(): void {
+        $this->isMutingUndefinedOrNullWarnings = true;
+    }
+
+    /**
+     * Indicates if PHP7 compatibility mode is set.
+     * @bool
+     */
+    public function isMutingUndefinedOrNullWarnings(): bool {
+        return $this->isMutingUndefinedOrNullWarnings;
+    }
+
 }
diff --git a/libs/SmartyBC.class.php b/libs/SmartyBC.class.php
deleted file mode 100644
index 0550e46d..00000000
--- a/libs/SmartyBC.class.php
+++ /dev/null
@@ -1,477 +0,0 @@
-<?php
-/**
- * Project:     Smarty: the PHP compiling template engine
- * File:        SmartyBC.class.php
- * SVN:         $Id: $
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3.0 of the License, or (at your option) any later version.
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- * For questions, help, comments, discussion, etc., please join the
- * Smarty mailing list. Send a blank e-mail to
- * smarty-discussion-subscribe@googlegroups.com
- *
- * @link      http://www.smarty.net/
- * @copyright 2008 New Digital Group, Inc.
- * @author    Monte Ohrt <monte at ohrt dot com>
- * @author    Uwe Tews
- * @author    Rodney Rehm
- * @package   Smarty
- */
-/**
- * @ignore
- */
-require_once dirname(__FILE__) . '/Smarty.class.php';
-
-/**
- * Smarty Backward Compatibility Wrapper Class
- *
- * @package Smarty
- */
-class SmartyBC extends Smarty
-{
-    /**
-     * Smarty 2 BC
-     *
-     * @var string
-     */
-    public $_version = self::SMARTY_VERSION;
-
-    /**
-     * This is an array of directories where trusted php scripts reside.
-     *
-     * @var array
-     */
-    public $trusted_dir = array();
-
-    /**
-     * Initialize new SmartyBC object
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    /**
-     * wrapper for assign_by_ref
-     *
-     * @param string $tpl_var the template variable name
-     * @param mixed  &$value  the referenced value to assign
-     */
-    public function assign_by_ref($tpl_var, &$value)
-    {
-        $this->assignByRef($tpl_var, $value);
-    }
-
-    /**
-     * wrapper for append_by_ref
-     *
-     * @param string  $tpl_var the template variable name
-     * @param mixed   &$value  the referenced value to append
-     * @param boolean $merge   flag if array elements shall be merged
-     */
-    public function append_by_ref($tpl_var, &$value, $merge = false)
-    {
-        $this->appendByRef($tpl_var, $value, $merge);
-    }
-
-    /**
-     * clear the given assigned template variable.
-     *
-     * @param string $tpl_var the template variable to clear
-     */
-    public function clear_assign($tpl_var)
-    {
-        $this->clearAssign($tpl_var);
-    }
-
-    /**
-     * Registers custom function to be used in templates
-     *
-     * @param string $function      the name of the template function
-     * @param string $function_impl the name of the PHP function to register
-     * @param bool   $cacheable
-     * @param mixed  $cache_attrs
-     *
-     * @throws \SmartyException
-     */
-    public function register_function($function, $function_impl, $cacheable = true, $cache_attrs = null)
-    {
-        $this->registerPlugin('function', $function, $function_impl, $cacheable, $cache_attrs);
-    }
-
-    /**
-     * Unregister custom function
-     *
-     * @param string $function name of template function
-     */
-    public function unregister_function($function)
-    {
-        $this->unregisterPlugin('function', $function);
-    }
-
-    /**
-     * Registers object to be used in templates
-     *
-     * @param string  $object        name of template object
-     * @param object  $object_impl   the referenced PHP object to register
-     * @param array   $allowed       list of allowed methods (empty = all)
-     * @param boolean $smarty_args   smarty argument format, else traditional
-     * @param array   $block_methods list of methods that are block format
-     *
-     * @throws   SmartyException
-     * @internal param array $block_functs list of methods that are block format
-     */
-    public function register_object(
-        $object,
-        $object_impl,
-        $allowed = array(),
-        $smarty_args = true,
-        $block_methods = array()
-    ) {
-        settype($allowed, 'array');
-        settype($smarty_args, 'boolean');
-        $this->registerObject($object, $object_impl, $allowed, $smarty_args, $block_methods);
-    }
-
-    /**
-     * Unregister object
-     *
-     * @param string $object name of template object
-     */
-    public function unregister_object($object)
-    {
-        $this->unregisterObject($object);
-    }
-
-    /**
-     * Registers block function to be used in templates
-     *
-     * @param string $block      name of template block
-     * @param string $block_impl PHP function to register
-     * @param bool   $cacheable
-     * @param mixed  $cache_attrs
-     *
-     * @throws \SmartyException
-     */
-    public function register_block($block, $block_impl, $cacheable = true, $cache_attrs = null)
-    {
-        $this->registerPlugin('block', $block, $block_impl, $cacheable, $cache_attrs);
-    }
-
-    /**
-     * Unregister block function
-     *
-     * @param string $block name of template function
-     */
-    public function unregister_block($block)
-    {
-        $this->unregisterPlugin('block', $block);
-    }
-
-    /**
-     * Registers compiler function
-     *
-     * @param string $function      name of template function
-     * @param string $function_impl name of PHP function to register
-     * @param bool   $cacheable
-     *
-     * @throws \SmartyException
-     */
-    public function register_compiler_function($function, $function_impl, $cacheable = true)
-    {
-        $this->registerPlugin('compiler', $function, $function_impl, $cacheable);
-    }
-
-    /**
-     * Unregister compiler function
-     *
-     * @param string $function name of template function
-     */
-    public function unregister_compiler_function($function)
-    {
-        $this->unregisterPlugin('compiler', $function);
-    }
-
-    /**
-     * Registers modifier to be used in templates
-     *
-     * @param string $modifier      name of template modifier
-     * @param string $modifier_impl name of PHP function to register
-     *
-     * @throws \SmartyException
-     */
-    public function register_modifier($modifier, $modifier_impl)
-    {
-        $this->registerPlugin('modifier', $modifier, $modifier_impl);
-    }
-
-    /**
-     * Unregister modifier
-     *
-     * @param string $modifier name of template modifier
-     */
-    public function unregister_modifier($modifier)
-    {
-        $this->unregisterPlugin('modifier', $modifier);
-    }
-
-    /**
-     * Registers a resource to fetch a template
-     *
-     * @param string $type      name of resource
-     * @param array  $functions array of functions to handle resource
-     */
-    public function register_resource($type, $functions)
-    {
-        $this->registerResource($type, $functions);
-    }
-
-    /**
-     * Unregister a resource
-     *
-     * @param string $type name of resource
-     */
-    public function unregister_resource($type)
-    {
-        $this->unregisterResource($type);
-    }
-
-    /**
-     * Registers a prefilter function to apply
-     * to a template before compiling
-     *
-     * @param callable $function
-     *
-     * @throws \SmartyException
-     */
-    public function register_prefilter($function)
-    {
-        $this->registerFilter('pre', $function);
-    }
-
-    /**
-     * Unregister a prefilter function
-     *
-     * @param callable $function
-     */
-    public function unregister_prefilter($function)
-    {
-        $this->unregisterFilter('pre', $function);
-    }
-
-    /**
-     * Registers a postfilter function to apply
-     * to a compiled template after compilation
-     *
-     * @param callable $function
-     *
-     * @throws \SmartyException
-     */
-    public function register_postfilter($function)
-    {
-        $this->registerFilter('post', $function);
-    }
-
-    /**
-     * Unregister a postfilter function
-     *
-     * @param callable $function
-     */
-    public function unregister_postfilter($function)
-    {
-        $this->unregisterFilter('post', $function);
-    }
-
-    /**
-     * Registers an output filter function to apply
-     * to a template output
-     *
-     * @param callable $function
-     *
-     * @throws \SmartyException
-     */
-    public function register_outputfilter($function)
-    {
-        $this->registerFilter('output', $function);
-    }
-
-    /**
-     * Unregister an outputfilter function
-     *
-     * @param callable $function
-     */
-    public function unregister_outputfilter($function)
-    {
-        $this->unregisterFilter('output', $function);
-    }
-
-    /**
-     * load a filter of specified type and name
-     *
-     * @param string $type filter type
-     * @param string $name filter name
-     *
-     * @throws \SmartyException
-     */
-    public function load_filter($type, $name)
-    {
-        $this->loadFilter($type, $name);
-    }
-
-    /**
-     * clear cached content for the given template and cache id
-     *
-     * @param string $tpl_file   name of template file
-     * @param string $cache_id   name of cache_id
-     * @param string $compile_id name of compile_id
-     * @param string $exp_time   expiration time
-     *
-     * @return boolean
-     */
-    public function clear_cache($tpl_file = null, $cache_id = null, $compile_id = null, $exp_time = null)
-    {
-        return $this->clearCache($tpl_file, $cache_id, $compile_id, $exp_time);
-    }
-
-    /**
-     * clear the entire contents of cache (all templates)
-     *
-     * @param string $exp_time expire time
-     *
-     * @return boolean
-     */
-    public function clear_all_cache($exp_time = null)
-    {
-        return $this->clearCache(null, null, null, $exp_time);
-    }
-
-    /**
-     * test to see if valid cache exists for this template
-     *
-     * @param string $tpl_file name of template file
-     * @param string $cache_id
-     * @param string $compile_id
-     *
-     * @return bool
-     * @throws \Exception
-     * @throws \SmartyException
-     */
-    public function is_cached($tpl_file, $cache_id = null, $compile_id = null)
-    {
-        return $this->isCached($tpl_file, $cache_id, $compile_id);
-    }
-
-    /**
-     * clear all the assigned template variables.
-     */
-    public function clear_all_assign()
-    {
-        $this->clearAllAssign();
-    }
-
-    /**
-     * clears compiled version of specified template resource,
-     * or all compiled template files if one is not specified.
-     * This function is for advanced use only, not normally needed.
-     *
-     * @param string $tpl_file
-     * @param string $compile_id
-     * @param string $exp_time
-     *
-     * @return boolean results of {@link smarty_core_rm_auto()}
-     */
-    public function clear_compiled_tpl($tpl_file = null, $compile_id = null, $exp_time = null)
-    {
-        return $this->clearCompiledTemplate($tpl_file, $compile_id, $exp_time);
-    }
-
-    /**
-     * Checks whether requested template exists.
-     *
-     * @param string $tpl_file
-     *
-     * @return bool
-     * @throws \SmartyException
-     */
-    public function template_exists($tpl_file)
-    {
-        return $this->templateExists($tpl_file);
-    }
-
-    /**
-     * Returns an array containing template variables
-     *
-     * @param string $name
-     *
-     * @return array
-     */
-    public function get_template_vars($name = null)
-    {
-        return $this->getTemplateVars($name);
-    }
-
-    /**
-     * Returns an array containing config variables
-     *
-     * @param string $name
-     *
-     * @return array
-     */
-    public function get_config_vars($name = null)
-    {
-        return $this->getConfigVars($name);
-    }
-
-    /**
-     * load configuration values
-     *
-     * @param string $file
-     * @param string $section
-     * @param string $scope
-     */
-    public function config_load($file, $section = null, $scope = 'global')
-    {
-        $this->ConfigLoad($file, $section, $scope);
-    }
-
-    /**
-     * return a reference to a registered object
-     *
-     * @param string $name
-     *
-     * @return object
-     */
-    public function get_registered_object($name)
-    {
-        return $this->getRegisteredObject($name);
-    }
-
-    /**
-     * clear configuration values
-     *
-     * @param string $var
-     */
-    public function clear_config($var = null)
-    {
-        $this->clearConfig($var);
-    }
-
-    /**
-     * trigger Smarty error
-     *
-     * @param string  $error_msg
-     * @param integer $error_type
-     */
-    public function trigger_error($error_msg, $error_type = E_USER_WARNING)
-    {
-        trigger_error("Smarty error: $error_msg", $error_type);
-    }
-}
diff --git a/libs/plugins/block.textformat.php b/libs/plugins/block.textformat.php
index 5e494637..fed090e4 100644
--- a/libs/plugins/block.textformat.php
+++ b/libs/plugins/block.textformat.php
@@ -20,7 +20,7 @@
  * - indent_char   - string (" ")
  * - wrap_boundary - boolean (true)
  *
- * @link   http://www.smarty.net/manual/en/language.function.textformat.php {textformat}
+ * @link   https://www.smarty.net/manual/en/language.function.textformat.php {textformat}
  *         (Smarty online manual)
  *
  * @param array                    $params   parameters
diff --git a/libs/plugins/function.counter.php b/libs/plugins/function.counter.php
index a4129e77..54795459 100644
--- a/libs/plugins/function.counter.php
+++ b/libs/plugins/function.counter.php
@@ -12,7 +12,7 @@
  * Purpose:  print out a counter value
  *
  * @author Monte Ohrt <monte at ohrt dot com>
- * @link   http://www.smarty.net/manual/en/language.function.counter.php {counter}
+ * @link   https://www.smarty.net/manual/en/language.function.counter.php {counter}
  *         (Smarty online manual)
  *
  * @param array                    $params   parameters
diff --git a/libs/plugins/function.cycle.php b/libs/plugins/function.cycle.php
index 07ffcc5e..79356999 100644
--- a/libs/plugins/function.cycle.php
+++ b/libs/plugins/function.cycle.php
@@ -28,7 +28,7 @@
  * {cycle name=row values="one,two,three" reset=true}
  * {cycle name=row}
  *
- * @link    http://www.smarty.net/manual/en/language.function.cycle.php {cycle}
+ * @link    https://www.smarty.net/manual/en/language.function.cycle.php {cycle}
  *           (Smarty online manual)
  * @author  Monte Ohrt <monte at ohrt dot com>
  * @author  credit to Mark Priatel <mpriatel@rogers.com>
diff --git a/libs/plugins/function.fetch.php b/libs/plugins/function.fetch.php
index 768761b2..4a3e8819 100644
--- a/libs/plugins/function.fetch.php
+++ b/libs/plugins/function.fetch.php
@@ -11,7 +11,7 @@
  * Name:     fetch
  * Purpose:  fetch file, web or ftp data and display results
  *
- * @link   http://www.smarty.net/manual/en/language.function.fetch.php {fetch}
+ * @link   https://www.smarty.net/manual/en/language.function.fetch.php {fetch}
  *         (Smarty online manual)
  * @author Monte Ohrt <monte at ohrt dot com>
  *
diff --git a/libs/plugins/function.html_checkboxes.php b/libs/plugins/function.html_checkboxes.php
index 302358ed..a8e7a07d 100644
--- a/libs/plugins/function.html_checkboxes.php
+++ b/libs/plugins/function.html_checkboxes.php
@@ -29,7 +29,7 @@
  * - assign     (optional) - assign the output as an array to this variable
  * - escape     (optional) - escape the content (not value), defaults to true
  *
- * @link    http://www.smarty.net/manual/en/language.function.html.checkboxes.php {html_checkboxes}
+ * @link    https://www.smarty.net/manual/en/language.function.html.checkboxes.php {html_checkboxes}
  *             (Smarty online manual)
  * @author  Christopher Kvarme <christopher.kvarme@flashjab.com>
  * @author  credits to Monte Ohrt <monte at ohrt dot com>
diff --git a/libs/plugins/function.html_image.php b/libs/plugins/function.html_image.php
index ad468e4f..71bc6386 100644
--- a/libs/plugins/function.html_image.php
+++ b/libs/plugins/function.html_image.php
@@ -21,7 +21,7 @@
  * - basedir     - (optional) - base directory for absolute paths, default is environment variable DOCUMENT_ROOT
  * - path_prefix - prefix for path output (optional, default empty)
  *
- * @link    http://www.smarty.net/manual/en/language.function.html.image.php {html_image}
+ * @link    https://www.smarty.net/manual/en/language.function.html.image.php {html_image}
  *          (Smarty online manual)
  * @author  Monte Ohrt <monte at ohrt dot com>
  * @author  credits to Duda <duda@big.hu>
diff --git a/libs/plugins/function.html_options.php b/libs/plugins/function.html_options.php
index 6907e8ee..3e433534 100644
--- a/libs/plugins/function.html_options.php
+++ b/libs/plugins/function.html_options.php
@@ -21,7 +21,7 @@
  * - id         (optional) - string default not set
  * - class      (optional) - string default not set
  *
- * @link   http://www.smarty.net/manual/en/language.function.html.options.php {html_image}
+ * @link   https://www.smarty.net/manual/en/language.function.html.options.php {html_image}
  *           (Smarty online manual)
  * @author Monte Ohrt <monte at ohrt dot com>
  * @author Ralf Strehle (minor optimization) <ralf dot strehle at yahoo dot de>
diff --git a/libs/plugins/function.html_radios.php b/libs/plugins/function.html_radios.php
index 5e834587..2223ff7e 100644
--- a/libs/plugins/function.html_radios.php
+++ b/libs/plugins/function.html_radios.php
@@ -29,7 +29,7 @@
  * {html_radios values=$ids name='box' separator='<br>' output=$names}
  * {html_radios values=$ids checked=$checked separator='<br>' output=$names}
  *
- * @link    http://smarty.php.net/manual/en/language.function.html.radios.php {html_radios}
+ * @link    https://www.smarty.net/manual/en/language.function.html.radios.php {html_radios}
  *          (Smarty online manual)
  * @author  Christopher Kvarme <christopher.kvarme@flashjab.com>
  * @author  credits to Monte Ohrt <monte at ohrt dot com>
diff --git a/libs/plugins/function.html_select_date.php b/libs/plugins/function.html_select_date.php
index 86403e3d..763fc60f 100644
--- a/libs/plugins/function.html_select_date.php
+++ b/libs/plugins/function.html_select_date.php
@@ -28,7 +28,7 @@
  *            - 2.0 complete rewrite for performance,
  *              added attributes month_names, *_id
  *
- * @link    http://www.smarty.net/manual/en/language.function.html.select.date.php {html_select_date}
+ * @link    https://www.smarty.net/manual/en/language.function.html.select.date.php {html_select_date}
  *           (Smarty online manual)
  * @version 2.0
  * @author  Andrei Zmievski
diff --git a/libs/plugins/function.html_select_time.php b/libs/plugins/function.html_select_time.php
index cb047bc0..256b56b1 100644
--- a/libs/plugins/function.html_select_time.php
+++ b/libs/plugins/function.html_select_time.php
@@ -11,7 +11,7 @@
  * Name:     html_select_time
  * Purpose:  Prints the dropdowns for time selection
  *
- * @link   http://www.smarty.net/manual/en/language.function.html.select.time.php {html_select_time}
+ * @link   https://www.smarty.net/manual/en/language.function.html.select.time.php {html_select_time}
  *           (Smarty online manual)
  * @author Roberto Berto <roberto@berto.net>
  * @author Monte Ohrt <monte AT ohrt DOT com>
diff --git a/libs/plugins/function.html_table.php b/libs/plugins/function.html_table.php
index ae61e83d..17b0586e 100644
--- a/libs/plugins/function.html_table.php
+++ b/libs/plugins/function.html_table.php
@@ -38,7 +38,7 @@
  * @author  credit to Messju Mohr <messju at lammfellpuschen dot de>
  * @author  credit to boots <boots dot smarty at yahoo dot com>
  * @version 1.1
- * @link    http://www.smarty.net/manual/en/language.function.html.table.php {html_table}
+ * @link    https://www.smarty.net/manual/en/language.function.html.table.php {html_table}
  *           (Smarty online manual)
  *
  * @param array $params parameters
diff --git a/libs/plugins/function.mailto.php b/libs/plugins/function.mailto.php
index 27351df8..ff8d18eb 100644
--- a/libs/plugins/function.mailto.php
+++ b/libs/plugins/function.mailto.php
@@ -36,7 +36,7 @@
  * {mailto address="me@domain.com" cc="you@domain.com,they@domain.com"}
  * {mailto address="me@domain.com" extra='class="mailto"'}
  *
- * @link    http://www.smarty.net/manual/en/language.function.mailto.php {mailto}
+ * @link    https://www.smarty.net/manual/en/language.function.mailto.php {mailto}
  *           (Smarty online manual)
  * @version 1.2
  * @author  Monte Ohrt <monte at ohrt dot com>
diff --git a/libs/plugins/function.math.php b/libs/plugins/function.math.php
index 7348d964..5d58284f 100644
--- a/libs/plugins/function.math.php
+++ b/libs/plugins/function.math.php
@@ -12,7 +12,7 @@
  * Name:     math
  * Purpose:  handle math computations in template
  *
- * @link   http://www.smarty.net/manual/en/language.function.math.php {math}
+ * @link   https://www.smarty.net/manual/en/language.function.math.php {math}
  *           (Smarty online manual)
  * @author Monte Ohrt <monte at ohrt dot com>
  *
diff --git a/libs/plugins/modifier.date_format.php b/libs/plugins/modifier.date_format.php
index c8e88c5c..8e7e0b6e 100644
--- a/libs/plugins/modifier.date_format.php
+++ b/libs/plugins/modifier.date_format.php
@@ -15,7 +15,7 @@
  *          - format: strftime format for output
  *          - default_date: default date if $string is empty
  *
- * @link   http://www.smarty.net/manual/en/language.modifier.date.format.php date_format (Smarty online manual)
+ * @link   https://www.smarty.net/manual/en/language.modifier.date.format.php date_format (Smarty online manual)
  * @author Monte Ohrt <monte at ohrt dot com>
  *
  * @param string $string       input date string
diff --git a/libs/plugins/modifier.escape.php b/libs/plugins/modifier.escape.php
index 43353cfc..47489aa9 100644
--- a/libs/plugins/modifier.escape.php
+++ b/libs/plugins/modifier.escape.php
@@ -11,7 +11,7 @@
  * Name:     escape
  * Purpose:  escape string for output
  *
- * @link   http://www.smarty.net/docs/en/language.modifier.escape
+ * @link   https://www.smarty.net/docs/en/language.modifier.escape
  * @author Monte Ohrt <monte at ohrt dot com>
  *
  * @param string  $string        input string
@@ -23,12 +23,9 @@
  */
 function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $double_encode = true)
 {
-    static $_double_encode = null;
+    static $_double_encode = true;
     static $is_loaded_1 = false;
     static $is_loaded_2 = false;
-    if ($_double_encode === null) {
-        $_double_encode = version_compare(PHP_VERSION, '5.2.3', '>=');
-    }
     if (!$char_set) {
         $char_set = Smarty::$_CHARSET;
     }
diff --git a/libs/plugins/modifier.mb_wordwrap.php b/libs/plugins/modifier.mb_wordwrap.php
index 1cd625b6..7c7bd875 100644
--- a/libs/plugins/modifier.mb_wordwrap.php
+++ b/libs/plugins/modifier.mb_wordwrap.php
@@ -11,7 +11,7 @@
  * Name:     mb_wordwrap
  * Purpose:  Wrap a string to a given number of characters
  *
- * @link   http://php.net/manual/en/function.wordwrap.php for similarity
+ * @link   https://php.net/manual/en/function.wordwrap.php for similarity
  *
  * @param string  $str   the string to wrap
  * @param int     $width the width of the output
diff --git a/libs/plugins/modifier.regex_replace.php b/libs/plugins/modifier.regex_replace.php
index 7eb55069..cd57cdf3 100644
--- a/libs/plugins/modifier.regex_replace.php
+++ b/libs/plugins/modifier.regex_replace.php
@@ -11,7 +11,7 @@
  * Name:     regex_replace
  * Purpose:  regular expression search/replace
  *
- * @link   http://smarty.php.net/manual/en/language.modifier.regex.replace.php
+ * @link   https://www.smarty.net/manual/en/language.modifier.regex.replace.php
  *          regex_replace (Smarty online manual)
  * @author Monte Ohrt <monte at ohrt dot com>
  *
diff --git a/libs/plugins/modifier.replace.php b/libs/plugins/modifier.replace.php
index a98f5a4a..71a7c632 100644
--- a/libs/plugins/modifier.replace.php
+++ b/libs/plugins/modifier.replace.php
@@ -11,7 +11,7 @@
  * Name:     replace
  * Purpose:  simple search/replace
  *
- * @link   http://smarty.php.net/manual/en/language.modifier.replace.php replace (Smarty online manual)
+ * @link   https://www.smarty.net/manual/en/language.modifier.replace.php replace (Smarty online manual)
  * @author Monte Ohrt <monte at ohrt dot com>
  * @author Uwe Tews
  *
diff --git a/libs/plugins/modifier.spacify.php b/libs/plugins/modifier.spacify.php
index 98efd4b3..251dbe71 100644
--- a/libs/plugins/modifier.spacify.php
+++ b/libs/plugins/modifier.spacify.php
@@ -11,7 +11,7 @@
  * Name:     spacify
  * Purpose:  add spaces between characters in a string
  *
- * @link   http://smarty.php.net/manual/en/language.modifier.spacify.php spacify (Smarty online manual)
+ * @link   https://www.smarty.net/manual/en/language.modifier.spacify.php spacify (Smarty online manual)
  * @author Monte Ohrt <monte at ohrt dot com>
  *
  * @param string $string       input string
diff --git a/libs/plugins/modifier.truncate.php b/libs/plugins/modifier.truncate.php
index bb881bf6..33e7e53a 100644
--- a/libs/plugins/modifier.truncate.php
+++ b/libs/plugins/modifier.truncate.php
@@ -13,7 +13,7 @@
  *               optionally splitting in the middle of a word, and
  *               appending the $etc string or inserting $etc into the middle.
  *
- * @link   http://smarty.php.net/manual/en/language.modifier.truncate.php truncate (Smarty online manual)
+ * @link   https://www.smarty.net/manual/en/language.modifier.truncate.php truncate (Smarty online manual)
  * @author Monte Ohrt <monte at ohrt dot com>
  *
  * @param string  $string      input string
diff --git a/libs/plugins/modifiercompiler.cat.php b/libs/plugins/modifiercompiler.cat.php
index 21d0e662..2c3a8b2a 100644
--- a/libs/plugins/modifiercompiler.cat.php
+++ b/libs/plugins/modifiercompiler.cat.php
@@ -14,7 +14,7 @@
  * Input:    string to catenate
  * Example:  {$var|cat:"foo"}
  *
- * @link   http://smarty.php.net/manual/en/language.modifier.cat.php cat
+ * @link   https://www.smarty.net/manual/en/language.modifier.cat.php cat
  *           (Smarty online manual)
  * @author Uwe Tews
  *
diff --git a/libs/plugins/modifiercompiler.count_characters.php b/libs/plugins/modifiercompiler.count_characters.php
index 6c44278a..b5d97e27 100644
--- a/libs/plugins/modifiercompiler.count_characters.php
+++ b/libs/plugins/modifiercompiler.count_characters.php
@@ -11,7 +11,7 @@
  * Name:     count_characters
  * Purpose:  count the number of characters in a text
  *
- * @link   http://www.smarty.net/manual/en/language.modifier.count.characters.php count_characters (Smarty online
+ * @link   https://www.smarty.net/manual/en/language.modifier.count.characters.php count_characters (Smarty online
  *         manual)
  * @author Uwe Tews
  *
diff --git a/libs/plugins/modifiercompiler.count_paragraphs.php b/libs/plugins/modifiercompiler.count_paragraphs.php
index e214a56f..33240296 100644
--- a/libs/plugins/modifiercompiler.count_paragraphs.php
+++ b/libs/plugins/modifiercompiler.count_paragraphs.php
@@ -11,7 +11,7 @@
  * Name:     count_paragraphs
  * Purpose:  count the number of paragraphs in a text
  *
- * @link   http://www.smarty.net/manual/en/language.modifier.count.paragraphs.php
+ * @link   https://www.smarty.net/manual/en/language.modifier.count.paragraphs.php
  *          count_paragraphs (Smarty online manual)
  * @author Uwe Tews
  *
diff --git a/libs/plugins/modifiercompiler.count_sentences.php b/libs/plugins/modifiercompiler.count_sentences.php
index 02774563..30e36e5f 100644
--- a/libs/plugins/modifiercompiler.count_sentences.php
+++ b/libs/plugins/modifiercompiler.count_sentences.php
@@ -11,7 +11,7 @@
  * Name:     count_sentences
  * Purpose:  count the number of sentences in a text
  *
- * @link   http://www.smarty.net/manual/en/language.modifier.count.paragraphs.php
+ * @link   https://www.smarty.net/manual/en/language.modifier.count.paragraphs.php
  *          count_sentences (Smarty online manual)
  * @author Uwe Tews
  *
diff --git a/libs/plugins/modifiercompiler.count_words.php b/libs/plugins/modifiercompiler.count_words.php
index 6d889da5..cf2e5022 100644
--- a/libs/plugins/modifiercompiler.count_words.php
+++ b/libs/plugins/modifiercompiler.count_words.php
@@ -11,7 +11,7 @@
  * Name:     count_words
  * Purpose:  count the number of words in a text
  *
- * @link   http://www.smarty.net/manual/en/language.modifier.count.words.php count_words (Smarty online manual)
+ * @link   https://www.smarty.net/manual/en/language.modifier.count.words.php count_words (Smarty online manual)
  * @author Uwe Tews
  *
  * @param array $params parameters
diff --git a/libs/plugins/modifiercompiler.default.php b/libs/plugins/modifiercompiler.default.php
index ae886c4b..dffa7a98 100644
--- a/libs/plugins/modifiercompiler.default.php
+++ b/libs/plugins/modifiercompiler.default.php
@@ -11,7 +11,7 @@
  * Name:     default
  * Purpose:  designate default value for empty variables
  *
- * @link   http://www.smarty.net/manual/en/language.modifier.default.php default (Smarty online manual)
+ * @link   https://www.smarty.net/manual/en/language.modifier.default.php default (Smarty online manual)
  * @author Uwe Tews
  *
  * @param array $params parameters
@@ -26,7 +26,7 @@ function smarty_modifiercompiler_default($params)
     }
     array_shift($params);
     foreach ($params as $param) {
-        $output = '(($tmp = @' . $output . ')===null||$tmp===\'\' ? ' . $param . ' : $tmp)';
+        $output = '(($tmp = ' . $output . ' ?? null)===null||$tmp===\'\' ? ' . $param . ' ?? null : $tmp)';
     }
     return $output;
 }
diff --git a/libs/plugins/modifiercompiler.escape.php b/libs/plugins/modifiercompiler.escape.php
index a3048a03..70b95cc9 100644
--- a/libs/plugins/modifiercompiler.escape.php
+++ b/libs/plugins/modifiercompiler.escape.php
@@ -11,7 +11,7 @@
  * Name:     escape
  * Purpose:  escape string for output
  *
- * @link   http://www.smarty.net/docsv2/en/language.modifier.escape count_characters (Smarty online manual)
+ * @link   https://www.smarty.net/docsv2/en/language.modifier.escape count_characters (Smarty online manual)
  * @author Rodney Rehm
  *
  * @param array                                $params parameters
@@ -22,7 +22,7 @@
  */
 function smarty_modifiercompiler_escape($params, Smarty_Internal_TemplateCompilerBase $compiler)
 {
-    static $_double_encode = null;
+    static $_double_encode = true;
     static $is_loaded = false;
     $compiler->template->_checkPlugins(
         array(
@@ -32,9 +32,6 @@ function smarty_modifiercompiler_escape($params, Smarty_Internal_TemplateCompile
             )
         )
     );
-    if ($_double_encode === null) {
-        $_double_encode = version_compare(PHP_VERSION, '5.2.3', '>=');
-    }
     try {
         $esc_type = smarty_literal_compiler_param($params, 1, 'html');
         $char_set = smarty_literal_compiler_param($params, 2, Smarty::$_CHARSET);
diff --git a/libs/plugins/modifiercompiler.indent.php b/libs/plugins/modifiercompiler.indent.php
index 2088ad6a..636f0edf 100644
--- a/libs/plugins/modifiercompiler.indent.php
+++ b/libs/plugins/modifiercompiler.indent.php
@@ -11,7 +11,7 @@
  * Name:     indent
  * Purpose:  indent lines of text
  *
- * @link   http://www.smarty.net/manual/en/language.modifier.indent.php indent (Smarty online manual)
+ * @link   https://www.smarty.net/manual/en/language.modifier.indent.php indent (Smarty online manual)
  * @author Uwe Tews
  *
  * @param array $params parameters
diff --git a/libs/plugins/modifiercompiler.lower.php b/libs/plugins/modifiercompiler.lower.php
index 0d899a00..ac9cc39d 100644
--- a/libs/plugins/modifiercompiler.lower.php
+++ b/libs/plugins/modifiercompiler.lower.php
@@ -11,7 +11,7 @@
  * Name:     lower
  * Purpose:  convert string to lowercase
  *
- * @link   http://www.smarty.net/manual/en/language.modifier.lower.php lower (Smarty online manual)
+ * @link   https://www.smarty.net/manual/en/language.modifier.lower.php lower (Smarty online manual)
  * @author Monte Ohrt <monte at ohrt dot com>
  * @author Uwe Tews
  *
diff --git a/libs/plugins/modifiercompiler.string_format.php b/libs/plugins/modifiercompiler.string_format.php
index 66309431..8df5632c 100644
--- a/libs/plugins/modifiercompiler.string_format.php
+++ b/libs/plugins/modifiercompiler.string_format.php
@@ -11,7 +11,7 @@
  * Name:     string_format
  * Purpose:  format strings via sprintf
  *
- * @link   http://www.smarty.net/manual/en/language.modifier.string.format.php string_format (Smarty online manual)
+ * @link   https://www.smarty.net/manual/en/language.modifier.string.format.php string_format (Smarty online manual)
  * @author Uwe Tews
  *
  * @param array $params parameters
diff --git a/libs/plugins/modifiercompiler.strip.php b/libs/plugins/modifiercompiler.strip.php
index 04ea332c..51944bde 100644
--- a/libs/plugins/modifiercompiler.strip.php
+++ b/libs/plugins/modifiercompiler.strip.php
@@ -14,7 +14,7 @@
  * Example:  {$var|strip} {$var|strip:"&nbsp;"}
  * Date:     September 25th, 2002
  *
- * @link   http://www.smarty.net/manual/en/language.modifier.strip.php strip (Smarty online manual)
+ * @link   https://www.smarty.net/manual/en/language.modifier.strip.php strip (Smarty online manual)
  * @author Uwe Tews
  *
  * @param array $params parameters
diff --git a/libs/plugins/modifiercompiler.strip_tags.php b/libs/plugins/modifiercompiler.strip_tags.php
index 1bca1a28..6ee3df9a 100644
--- a/libs/plugins/modifiercompiler.strip_tags.php
+++ b/libs/plugins/modifiercompiler.strip_tags.php
@@ -11,7 +11,7 @@
  * Name:     strip_tags
  * Purpose:  strip html tags from text
  *
- * @link   http://www.smarty.net/docs/en/language.modifier.strip.tags.tpl strip_tags (Smarty online manual)
+ * @link   https://www.smarty.net/docs/en/language.modifier.strip.tags.tpl strip_tags (Smarty online manual)
  * @author Uwe Tews
  *
  * @param array $params parameters
diff --git a/libs/plugins/modifiercompiler.upper.php b/libs/plugins/modifiercompiler.upper.php
index ea4e95b7..e12ae676 100644
--- a/libs/plugins/modifiercompiler.upper.php
+++ b/libs/plugins/modifiercompiler.upper.php
@@ -11,7 +11,7 @@
  * Name:     lower
  * Purpose:  convert string to uppercase
  *
- * @link   http://smarty.php.net/manual/en/language.modifier.upper.php lower (Smarty online manual)
+ * @link   https://www.smarty.net/manual/en/language.modifier.upper.php lower (Smarty online manual)
  * @author Uwe Tews
  *
  * @param array $params parameters
diff --git a/libs/plugins/modifiercompiler.wordwrap.php b/libs/plugins/modifiercompiler.wordwrap.php
index 8565f140..49cb40b0 100644
--- a/libs/plugins/modifiercompiler.wordwrap.php
+++ b/libs/plugins/modifiercompiler.wordwrap.php
@@ -11,7 +11,7 @@
  * Name:     wordwrap
  * Purpose:  wrap a string of text at a given length
  *
- * @link   http://smarty.php.net/manual/en/language.modifier.wordwrap.php wordwrap (Smarty online manual)
+ * @link   https://www.smarty.net/manual/en/language.modifier.wordwrap.php wordwrap (Smarty online manual)
  * @author Uwe Tews
  *
  * @param array                                 $params parameters
diff --git a/libs/plugins/outputfilter.trimwhitespace.php b/libs/plugins/outputfilter.trimwhitespace.php
index 7e4503a1..2f747ad5 100644
--- a/libs/plugins/outputfilter.trimwhitespace.php
+++ b/libs/plugins/outputfilter.trimwhitespace.php
@@ -41,7 +41,7 @@ function smarty_outputfilter_trimwhitespace($source)
         }
     }
     // Strip all HTML-Comments
-    // yes, even the ones in <script> - see http://stackoverflow.com/a/808850/515124
+    // yes, even the ones in <script> - see https://stackoverflow.com/a/808850/515124
     $source = preg_replace('#<!--.*?-->#ms', '', $source);
     // capture html elements not to be messed with
     $_offset = 0;
diff --git a/libs/plugins/shared.escape_special_chars.php b/libs/plugins/shared.escape_special_chars.php
index 6b18d3ee..a204b092 100644
--- a/libs/plugins/shared.escape_special_chars.php
+++ b/libs/plugins/shared.escape_special_chars.php
@@ -20,13 +20,7 @@
 function smarty_function_escape_special_chars($string)
 {
     if (!is_array($string)) {
-        if (version_compare(PHP_VERSION, '5.2.3', '>=')) {
-            $string = htmlspecialchars($string, ENT_COMPAT, Smarty::$_CHARSET, false);
-        } else {
-            $string = preg_replace('!&(#?\w+);!', '%%%SMARTY_START%%%\\1%%%SMARTY_END%%%', $string);
-            $string = htmlspecialchars($string);
-            $string = str_replace(array('%%%SMARTY_START%%%', '%%%SMARTY_END%%%'), array('&', ';'), $string);
-        }
+        $string = htmlspecialchars($string, ENT_COMPAT, Smarty::$_CHARSET, false);
     }
     return $string;
 }
diff --git a/libs/sysplugins/smarty_internal_cacheresource_file.php b/libs/sysplugins/smarty_internal_cacheresource_file.php
index 61618449..abed98d8 100644
--- a/libs/sysplugins/smarty_internal_cacheresource_file.php
+++ b/libs/sysplugins/smarty_internal_cacheresource_file.php
@@ -196,11 +196,7 @@ class Smarty_Internal_CacheResource_File extends Smarty_CacheResource
      */
     public function hasLock(Smarty $smarty, Smarty_Template_Cached $cached)
     {
-        if (version_compare(PHP_VERSION, '5.3.0', '>=')) {
-            clearstatcache(true, $cached->lock_id);
-        } else {
-            clearstatcache();
-        }
+        clearstatcache(true, $cached->lock_id);
         if (is_file($cached->lock_id)) {
             $t = filemtime($cached->lock_id);
             return $t && (time() - $t < $smarty->locking_timeout);
diff --git a/libs/sysplugins/smarty_internal_compile_foreach.php b/libs/sysplugins/smarty_internal_compile_foreach.php
index a68da540..edfe358b 100644
--- a/libs/sysplugins/smarty_internal_compile_foreach.php
+++ b/libs/sysplugins/smarty_internal_compile_foreach.php
@@ -219,9 +219,9 @@ class Smarty_Internal_Compile_Foreach extends Smarty_Internal_Compile_Private_Fo
         if (isset($itemAttr[ 'index' ])) {
             $output .= "{$itemVar}->index = -1;\n";
         }
-	    $output .= "{$itemVar}->do_else = true;\n";
+        $output .= "{$itemVar}->do_else = true;\n";
         $output .= "if (\$_from !== null) foreach (\$_from as {$keyTerm}{$itemVar}->value) {\n";
-	    $output .= "{$itemVar}->do_else = false;\n";
+        $output .= "{$itemVar}->do_else = false;\n";
         if (isset($attributes[ 'key' ]) && isset($itemAttr[ 'key' ])) {
             $output .= "\$_smarty_tpl->tpl_vars['{$key}']->value = {$itemVar}->key;\n";
         }
diff --git a/libs/sysplugins/smarty_internal_compile_include_php.php b/libs/sysplugins/smarty_internal_compile_include_php.php
deleted file mode 100644
index 1b0fdaad..00000000
--- a/libs/sysplugins/smarty_internal_compile_include_php.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Include PHP
- * Compiles the {include_php} tag
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Insert Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Include_Php extends Smarty_Internal_CompileBase
-{
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $required_attributes = array('file');
-
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $shorttag_order = array('file');
-
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $optional_attributes = array('once', 'assign');
-
-    /**
-     * Compiles code for the {include_php} tag
-     *
-     * @param array                                 $args     array with attributes from parser
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
-     *
-     * @return string
-     * @throws \SmartyCompilerException
-     * @throws \SmartyException
-     */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
-    {
-        if (!($compiler->smarty instanceof SmartyBC)) {
-            throw new SmartyException("{include_php} is deprecated, use SmartyBC class to enable");
-        }
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        /**
-         *
-         *
-         * @var Smarty_Internal_Template $_smarty_tpl
-         * used in evaluated code
-         */
-        $_smarty_tpl = $compiler->template;
-        $_filepath = false;
-        $_file = null;
-        eval('$_file = @' . $_attr[ 'file' ] . ';');
-        if (!isset($compiler->smarty->security_policy) && file_exists($_file)) {
-            $_filepath = $compiler->smarty->_realpath($_file, true);
-        } else {
-            if (isset($compiler->smarty->security_policy)) {
-                $_dir = $compiler->smarty->security_policy->trusted_dir;
-            } else {
-                $_dir = $compiler->smarty->trusted_dir;
-            }
-            if (!empty($_dir)) {
-                foreach ((array)$_dir as $_script_dir) {
-                    $_path = $compiler->smarty->_realpath($_script_dir . DIRECTORY_SEPARATOR . $_file, true);
-                    if (file_exists($_path)) {
-                        $_filepath = $_path;
-                        break;
-                    }
-                }
-            }
-        }
-        if ($_filepath === false) {
-            $compiler->trigger_template_error("{include_php} file '{$_file}' is not readable", null, true);
-        }
-        if (isset($compiler->smarty->security_policy)) {
-            $compiler->smarty->security_policy->isTrustedPHPDir($_filepath);
-        }
-        if (isset($_attr[ 'assign' ])) {
-            // output will be stored in a smarty variable instead of being displayed
-            $_assign = $_attr[ 'assign' ];
-        }
-        $_once = '_once';
-        if (isset($_attr[ 'once' ])) {
-            if ($_attr[ 'once' ] === 'false') {
-                $_once = '';
-            }
-        }
-        if (isset($_assign)) {
-            return "<?php ob_start();\ninclude{$_once} ('{$_filepath}');\n\$_smarty_tpl->assign({$_assign},ob_get_clean());\n?>";
-        } else {
-            return "<?php include{$_once} ('{$_filepath}');?>\n";
-        }
-    }
-}
diff --git a/libs/sysplugins/smarty_internal_compile_insert.php b/libs/sysplugins/smarty_internal_compile_insert.php
index 4bdc3952..c91ff62c 100644
--- a/libs/sysplugins/smarty_internal_compile_insert.php
+++ b/libs/sysplugins/smarty_internal_compile_insert.php
@@ -89,7 +89,7 @@ class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase
                 if (isset($compiler->smarty->security_policy)) {
                     $_dir = $compiler->smarty->security_policy->trusted_dir;
                 } else {
-                    $_dir = $compiler->smarty instanceof SmartyBC ? $compiler->smarty->trusted_dir : null;
+                    $_dir = null;
                 }
                 if (!empty($_dir)) {
                     foreach ((array)$_dir as $_script_dir) {
diff --git a/libs/sysplugins/smarty_internal_compile_private_php.php b/libs/sysplugins/smarty_internal_compile_private_php.php
deleted file mode 100644
index ff48c6fb..00000000
--- a/libs/sysplugins/smarty_internal_compile_private_php.php
+++ /dev/null
@@ -1,253 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile PHP Expression
- * Compiles any tag which will output an expression or variable
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile PHP Expression Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Private_Php extends Smarty_Internal_CompileBase
-{
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $required_attributes = array('code', 'type');
-
-    /**
-     * Compiles code for generating output from any expression
-     *
-     * @param array                                 $args      array with attributes from parser
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
-     * @param array                                 $parameter array with compilation parameter
-     *
-     * @return string
-     * @throws \SmartyException
-     */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        $compiler->has_code = false;
-        if ($_attr[ 'type' ] === 'xml') {
-            $compiler->tag_nocache = true;
-            $output = addcslashes($_attr[ 'code' ], "'\\");
-            $compiler->parser->current_buffer->append_subtree(
-                $compiler->parser,
-                new Smarty_Internal_ParseTree_Tag(
-                    $compiler->parser,
-                    $compiler->processNocacheCode(
-                        "<?php echo '{$output}';?>\n",
-                        true
-                    )
-                )
-            );
-            return '';
-        }
-        if ($_attr[ 'type' ] !== 'tag') {
-            if ($compiler->php_handling === Smarty::PHP_REMOVE) {
-                return '';
-            } elseif ($compiler->php_handling === Smarty::PHP_QUOTE) {
-                $output =
-                    preg_replace_callback(
-                        '#(<\?(?:php|=)?)|(<%)|(<script\s+language\s*=\s*["\']?\s*php\s*["\']?\s*>)|(\?>)|(%>)|(<\/script>)#i',
-                        array($this, 'quote'),
-                        $_attr[ 'code' ]
-                    );
-                $compiler->parser->current_buffer->append_subtree(
-                    $compiler->parser,
-                    new Smarty_Internal_ParseTree_Text($output)
-                );
-                return '';
-            } elseif ($compiler->php_handling === Smarty::PHP_PASSTHRU || $_attr[ 'type' ] === 'unmatched') {
-                $compiler->tag_nocache = true;
-                $output = addcslashes($_attr[ 'code' ], "'\\");
-                $compiler->parser->current_buffer->append_subtree(
-                    $compiler->parser,
-                    new Smarty_Internal_ParseTree_Tag(
-                        $compiler->parser,
-                        $compiler->processNocacheCode(
-                            "<?php echo '{$output}';?>\n",
-                            true
-                        )
-                    )
-                );
-                return '';
-            } elseif ($compiler->php_handling === Smarty::PHP_ALLOW) {
-                if (!($compiler->smarty instanceof SmartyBC)) {
-                    $compiler->trigger_template_error(
-                        '$smarty->php_handling PHP_ALLOW not allowed. Use SmartyBC to enable it',
-                        null,
-                        true
-                    );
-                }
-                $compiler->has_code = true;
-                return $_attr[ 'code' ];
-            } else {
-                $compiler->trigger_template_error('Illegal $smarty->php_handling value', null, true);
-            }
-        } else {
-            $compiler->has_code = true;
-            if (!($compiler->smarty instanceof SmartyBC)) {
-                $compiler->trigger_template_error(
-                    '{php}{/php} tags not allowed. Use SmartyBC to enable them',
-                    null,
-                    true
-                );
-            }
-            $ldel = preg_quote($compiler->smarty->left_delimiter, '#');
-            $rdel = preg_quote($compiler->smarty->right_delimiter, '#');
-            preg_match("#^({$ldel}php\\s*)((.)*?)({$rdel})#", $_attr[ 'code' ], $match);
-            if (!empty($match[ 2 ])) {
-                if ('nocache' === trim($match[ 2 ])) {
-                    $compiler->tag_nocache = true;
-                } else {
-                    $compiler->trigger_template_error("illegal value of option flag '{$match[2]}'", null, true);
-                }
-            }
-            return preg_replace(
-                array("#^{$ldel}\\s*php\\s*(.)*?{$rdel}#", "#{$ldel}\\s*/\\s*php\\s*{$rdel}$#"),
-                array('<?php ', '?>'),
-                $_attr[ 'code' ]
-            );
-        }
-    }
-
-    /**
-     * Lexer code for PHP tags
-     *
-     * This code has been moved from lexer here fo easier debugging and maintenance
-     *
-     * @param Smarty_Internal_Templatelexer $lex
-     *
-     * @throws \SmartyCompilerException
-     */
-    public function parsePhp(Smarty_Internal_Templatelexer $lex)
-    {
-        $lex->token = Smarty_Internal_Templateparser::TP_PHP;
-        $close = 0;
-        $lex->taglineno = $lex->line;
-        $closeTag = '?>';
-        if (strpos($lex->value, '<?xml') === 0) {
-            $lex->is_xml = true;
-            $lex->phpType = 'xml';
-            return;
-        } elseif (strpos($lex->value, '<?') === 0) {
-            $lex->phpType = 'php';
-        } elseif (strpos($lex->value, '<%') === 0) {
-            $lex->phpType = 'asp';
-            $closeTag = '%>';
-        } elseif (strpos($lex->value, '%>') === 0) {
-            $lex->phpType = 'unmatched';
-        } elseif (strpos($lex->value, '?>') === 0) {
-            if ($lex->is_xml) {
-                $lex->is_xml = false;
-                $lex->phpType = 'xml';
-                return;
-            }
-            $lex->phpType = 'unmatched';
-        } elseif (strpos($lex->value, '<s') === 0) {
-            $lex->phpType = 'script';
-            $closeTag = '</script>';
-        } elseif (strpos($lex->value, $lex->smarty->left_delimiter) === 0) {
-            if ($lex->isAutoLiteral()) {
-                $lex->token = Smarty_Internal_Templateparser::TP_TEXT;
-                return;
-            }
-            $closeTag = "{$lex->smarty->left_delimiter}/php{$lex->smarty->right_delimiter}";
-            if ($lex->value === $closeTag) {
-                $lex->compiler->trigger_template_error("unexpected closing tag '{$closeTag}'");
-            }
-            $lex->phpType = 'tag';
-        }
-        if ($lex->phpType === 'unmatched') {
-            return;
-        }
-        if (($lex->phpType === 'php' || $lex->phpType === 'asp')
-            &&
-            ($lex->compiler->php_handling === Smarty::PHP_PASSTHRU ||
-             $lex->compiler->php_handling === Smarty::PHP_QUOTE)
-        ) {
-            return;
-        }
-        $start = $lex->counter + strlen($lex->value);
-        $body = true;
-        if (preg_match('~' . preg_quote($closeTag, '~') . '~i', $lex->data, $match, PREG_OFFSET_CAPTURE, $start)) {
-            $close = $match[ 0 ][ 1 ];
-        } else {
-            $lex->compiler->trigger_template_error("missing closing tag '{$closeTag}'");
-        }
-        while ($body) {
-            if (preg_match(
-                '~([/][*])|([/][/][^\n]*)|(\'[^\'\\\\]*(?:\\.[^\'\\\\]*)*\')|("[^"\\\\]*(?:\\.[^"\\\\]*)*")~',
-                $lex->data,
-                $match,
-                PREG_OFFSET_CAPTURE,
-                $start
-            )
-            ) {
-                $value = $match[ 0 ][ 0 ];
-                $from = $pos = $match[ 0 ][ 1 ];
-                if ($pos > $close) {
-                    $body = false;
-                } else {
-                    $start = $pos + strlen($value);
-                    $phpCommentStart = $value === '/*';
-                    if ($phpCommentStart) {
-                        $phpCommentEnd = preg_match('~([*][/])~', $lex->data, $match, PREG_OFFSET_CAPTURE, $start);
-                        if ($phpCommentEnd) {
-                            $pos2 = $match[ 0 ][ 1 ];
-                            $start = $pos2 + strlen($match[ 0 ][ 0 ]);
-                        }
-                    }
-                    while ($close > $pos && $close < $start) {
-                        if (preg_match(
-                            '~' . preg_quote($closeTag, '~') . '~i',
-                            $lex->data,
-                            $match,
-                            PREG_OFFSET_CAPTURE,
-                            $from
-                        )
-                        ) {
-                            $close = $match[ 0 ][ 1 ];
-                            $from = $close + strlen($match[ 0 ][ 0 ]);
-                        } else {
-                            $lex->compiler->trigger_template_error("missing closing tag '{$closeTag}'");
-                        }
-                    }
-                    if ($phpCommentStart && (!$phpCommentEnd || $pos2 > $close)) {
-                        $lex->taglineno = $lex->line + substr_count(substr($lex->data, $lex->counter, $start), "\n");
-                        $lex->compiler->trigger_template_error("missing PHP comment closing tag '*/'");
-                    }
-                }
-            } else {
-                $body = false;
-            }
-        }
-        $lex->value = substr($lex->data, $lex->counter, $close + strlen($closeTag) - $lex->counter);
-    }
-
-    /*
-     * Call back function for $php_handling = PHP_QUOTE
-     *
-     */
-    /**
-     * @param $match
-     *
-     * @return string
-     */
-    private function quote($match)
-    {
-        return htmlspecialchars($match[ 0 ], ENT_QUOTES);
-    }
-}
diff --git a/libs/sysplugins/smarty_internal_data.php b/libs/sysplugins/smarty_internal_data.php
index 98e3e57b..1b64185b 100644
--- a/libs/sysplugins/smarty_internal_data.php
+++ b/libs/sysplugins/smarty_internal_data.php
@@ -121,7 +121,7 @@ abstract class Smarty_Internal_Data
      * appends values to template variables
      *
      * @api  Smarty::append()
-     * @link http://www.smarty.net/docs/en/api.append.tpl
+     * @link https://www.smarty.net/docs/en/api.append.tpl
      *
      * @param array|string $tpl_var the template variable name(s)
      * @param mixed        $value   the value to append
@@ -182,7 +182,7 @@ abstract class Smarty_Internal_Data
      * Returns a single or all template variables
      *
      * @api  Smarty::getTemplateVars()
-     * @link http://www.smarty.net/docs/en/api.get.template.vars.tpl
+     * @link https://www.smarty.net/docs/en/api.get.template.vars.tpl
      *
      * @param string                                                  $varName       variable name or null
      * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $_ptr          optional pointer to data object
@@ -195,26 +195,6 @@ abstract class Smarty_Internal_Data
         return $this->ext->getTemplateVars->getTemplateVars($this, $varName, $_ptr, $searchParents);
     }
 
-    /**
-     * gets the object of a Smarty variable
-     *
-     * @param string               $variable      the name of the Smarty variable
-     * @param Smarty_Internal_Data $_ptr          optional pointer to data object
-     * @param boolean              $searchParents search also in parent data
-     * @param bool                 $error_enable
-     *
-     * @return     Smarty_Variable|Smarty_Undefined_Variable the object of the variable
-     * @deprecated since 3.1.28 please use Smarty_Internal_Data::getTemplateVars() instead.
-     */
-    public function getVariable(
-        $variable = null,
-        Smarty_Internal_Data $_ptr = null,
-        $searchParents = true,
-        $error_enable = true
-    ) {
-        return $this->ext->getTemplateVars->_getVariable($this, $variable, $_ptr, $searchParents, $error_enable);
-    }
-
     /**
      * Follow the parent chain an merge template and config variables
      *
diff --git a/libs/sysplugins/smarty_internal_errorhandler.php b/libs/sysplugins/smarty_internal_errorhandler.php
index 56dca18f..c2b653ef 100644
--- a/libs/sysplugins/smarty_internal_errorhandler.php
+++ b/libs/sysplugins/smarty_internal_errorhandler.php
@@ -1,61 +1,60 @@
 <?php
 
 /**
- * Smarty error handler
+ * Smarty error handler to fix new error levels in PHP8 for backwards compatibility
  *
  * @package    Smarty
  * @subpackage PluginsInternal
- * @author     Uwe Tews
+ * @author     Simon Wisselink
  *
- * @deprecated
-Smarty does no longer use @filemtime()
  */
 class Smarty_Internal_ErrorHandler
 {
-    /**
-     * contains directories outside of SMARTY_DIR that are to be muted by muteExpectedErrors()
-     */
-    public static $mutedDirectories = array();
 
     /**
-     * error handler returned by set_error_handler() in self::muteExpectedErrors()
+     * Allows {$foo} where foo is unset.
+     * @var bool
      */
-    private static $previousErrorHandler = null;
+    public $allowUndefinedVars = true;
 
     /**
-     * Enable error handler to mute expected messages
-     *
+     * Allows {$foo.bar} where bar is unset and {$foo.bar1.bar2} where either bar1 or bar2 is unset.
+     * @var bool
      */
-    public static function muteExpectedErrors()
-    {
+    public $allowUndefinedArrayKeys = true;
+
+    private $previousErrorHandler = null;
+
+    /**
+     * Enable error handler to intercept errors
+     */
+    public function activate() {
         /*
-            error muting is done because some people implemented custom error_handlers using
-            http://php.net/set_error_handler and for some reason did not understand the following paragraph:
+            Error muting is done because some people implemented custom error_handlers using
+            https://php.net/set_error_handler and for some reason did not understand the following paragraph:
 
-                It is important to remember that the standard PHP error handler is completely bypassed for the
-                error types specified by error_types unless the callback function returns FALSE.
-                error_reporting() settings will have no effect and your error handler will be called regardless -
-                however you are still able to read the current value of error_reporting and act appropriately.
-                Of particular note is that this value will be 0 if the statement that caused the error was
-                prepended by the @ error-control operator.
-
-            Smarty deliberately uses @filemtime() over file_exists() and filemtime() in some places. Reasons include
-                - @filemtime() is almost twice as fast as using an additional file_exists()
-                - between file_exists() and filemtime() a possible race condition is opened,
-                  which does not exist using the simple @filemtime() approach.
+            It is important to remember that the standard PHP error handler is completely bypassed for the
+            error types specified by error_types unless the callback function returns FALSE.
+            error_reporting() settings will have no effect and your error handler will be called regardless -
+            however you are still able to read the current value of error_reporting and act appropriately.
+            Of particular note is that this value will be 0 if the statement that caused the error was
+            prepended by the @ error-control operator.
         */
-        $error_handler = array('Smarty_Internal_ErrorHandler', 'mutingErrorHandler');
-        $previous = set_error_handler($error_handler);
-        // avoid dead loops
-        if ($previous !== $error_handler) {
-            self::$previousErrorHandler = $previous;
-        }
+        $this->previousErrorHandler = set_error_handler([$this, 'handleError']);
+    }
+
+    /**
+     * Disable error handler
+     */
+    public function deactivate() {
+        restore_error_handler();
+        $this->previousErrorHandler = null;
     }
 
     /**
      * Error Handler to mute expected messages
      *
-     * @link http://php.net/set_error_handler
+     * @link https://php.net/set_error_handler
      *
      * @param integer $errno Error level
      * @param         $errstr
@@ -65,49 +64,21 @@ class Smarty_Internal_ErrorHandler
      *
      * @return bool
      */
-    public static function mutingErrorHandler($errno, $errstr, $errfile, $errline, $errcontext = array())
+    public function handleError($errno, $errstr, $errfile, $errline, $errcontext = [])
     {
-        $_is_muted_directory = false;
-        // add the SMARTY_DIR to the list of muted directories
-        if (!isset(self::$mutedDirectories[ SMARTY_DIR ])) {
-            $smarty_dir = realpath(SMARTY_DIR);
-            if ($smarty_dir !== false) {
-                self::$mutedDirectories[ SMARTY_DIR ] =
-                    array('file' => $smarty_dir, 'length' => strlen($smarty_dir),);
-            }
+        if ($this->allowUndefinedVars && $errstr == 'Attempt to read property "value" on null') {
+            return; // suppresses this error
         }
-        // walk the muted directories and test against $errfile
-        foreach (self::$mutedDirectories as $key => &$dir) {
-            if (!$dir) {
-                // resolve directory and length for speedy comparisons
-                $file = realpath($key);
-                if ($file === false) {
-                    // this directory does not exist, remove and skip it
-                    unset(self::$mutedDirectories[ $key ]);
-                    continue;
-                }
-                $dir = array('file' => $file, 'length' => strlen($file),);
-            }
-            if (!strncmp($errfile, $dir[ 'file' ], $dir[ 'length' ])) {
-                $_is_muted_directory = true;
-                break;
-            }
-        }
-        // pass to next error handler if this error did not occur inside SMARTY_DIR
-        // or the error was within smarty but masked to be ignored
-        if (!$_is_muted_directory || ($errno && $errno & error_reporting())) {
-            if (self::$previousErrorHandler) {
-                return call_user_func(
-                    self::$previousErrorHandler,
-                    $errno,
-                    $errstr,
-                    $errfile,
-                    $errline,
-                    $errcontext
-                );
-            } else {
-                return false;
-            }
+
+        if ($this->allowUndefinedArrayKeys && preg_match(
+            '/^(Undefined array key|Trying to access array offset on value of type null)/',
+            $errstr
+        )) {
+            return; // suppresses this error
         }
+
+        // pass all other errors through to the previous error handler or to the default PHP error handler
+        return $this->previousErrorHandler ?
+            call_user_func($this->previousErrorHandler, $errno, $errstr, $errfile, $errline, $errcontext) : false;
     }
 }
diff --git a/libs/sysplugins/smarty_internal_method_append.php b/libs/sysplugins/smarty_internal_method_append.php
index 881375ef..e207734e 100644
--- a/libs/sysplugins/smarty_internal_method_append.php
+++ b/libs/sysplugins/smarty_internal_method_append.php
@@ -22,7 +22,7 @@ class Smarty_Internal_Method_Append
      * appends values to template variables
      *
      * @api  Smarty::append()
-     * @link http://www.smarty.net/docs/en/api.append.tpl
+     * @link https://www.smarty.net/docs/en/api.append.tpl
      *
      * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
      * @param array|string                                            $tpl_var the template variable name(s)
diff --git a/libs/sysplugins/smarty_internal_method_appendbyref.php b/libs/sysplugins/smarty_internal_method_appendbyref.php
index c9590446..b5be69b5 100644
--- a/libs/sysplugins/smarty_internal_method_appendbyref.php
+++ b/libs/sysplugins/smarty_internal_method_appendbyref.php
@@ -15,7 +15,7 @@ class Smarty_Internal_Method_AppendByRef
      * appends values to template variables by reference
      *
      * @api  Smarty::appendByRef()
-     * @link http://www.smarty.net/docs/en/api.append.by.ref.tpl
+     * @link https://www.smarty.net/docs/en/api.append.by.ref.tpl
      *
      * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
      * @param string                                                  $tpl_var the template variable name
diff --git a/libs/sysplugins/smarty_internal_method_clearallassign.php b/libs/sysplugins/smarty_internal_method_clearallassign.php
index 29ff2ffb..6fb0c8f3 100644
--- a/libs/sysplugins/smarty_internal_method_clearallassign.php
+++ b/libs/sysplugins/smarty_internal_method_clearallassign.php
@@ -22,7 +22,7 @@ class Smarty_Internal_Method_ClearAllAssign
      * clear all the assigned template variables.
      *
      * @api  Smarty::clearAllAssign()
-     * @link http://www.smarty.net/docs/en/api.clear.all.assign.tpl
+     * @link https://www.smarty.net/docs/en/api.clear.all.assign.tpl
      *
      * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
      *
diff --git a/libs/sysplugins/smarty_internal_method_clearallcache.php b/libs/sysplugins/smarty_internal_method_clearallcache.php
index 30d55f7d..b74d3058 100644
--- a/libs/sysplugins/smarty_internal_method_clearallcache.php
+++ b/libs/sysplugins/smarty_internal_method_clearallcache.php
@@ -22,7 +22,7 @@ class Smarty_Internal_Method_ClearAllCache
      * Empty cache folder
      *
      * @api  Smarty::clearAllCache()
-     * @link http://www.smarty.net/docs/en/api.clear.all.cache.tpl
+     * @link https://www.smarty.net/docs/en/api.clear.all.cache.tpl
      *
      * @param \Smarty $smarty
      * @param integer $exp_time expiration time
diff --git a/libs/sysplugins/smarty_internal_method_clearassign.php b/libs/sysplugins/smarty_internal_method_clearassign.php
index 22bfa2d3..12b755c0 100644
--- a/libs/sysplugins/smarty_internal_method_clearassign.php
+++ b/libs/sysplugins/smarty_internal_method_clearassign.php
@@ -22,7 +22,7 @@ class Smarty_Internal_Method_ClearAssign
      * clear the given assigned template variable(s).
      *
      * @api  Smarty::clearAssign()
-     * @link http://www.smarty.net/docs/en/api.clear.assign.tpl
+     * @link https://www.smarty.net/docs/en/api.clear.assign.tpl
      *
      * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
      * @param string|array                                            $tpl_var the template variable(s) to clear
diff --git a/libs/sysplugins/smarty_internal_method_clearcache.php b/libs/sysplugins/smarty_internal_method_clearcache.php
index a5dd4e26..df766eee 100644
--- a/libs/sysplugins/smarty_internal_method_clearcache.php
+++ b/libs/sysplugins/smarty_internal_method_clearcache.php
@@ -22,7 +22,7 @@ class Smarty_Internal_Method_ClearCache
      * Empty cache for a specific template
      *
      * @api  Smarty::clearCache()
-     * @link http://www.smarty.net/docs/en/api.clear.cache.tpl
+     * @link https://www.smarty.net/docs/en/api.clear.cache.tpl
      *
      * @param \Smarty $smarty
      * @param string  $template_name template name
diff --git a/libs/sysplugins/smarty_internal_method_clearcompiledtemplate.php b/libs/sysplugins/smarty_internal_method_clearcompiledtemplate.php
index bf492980..db0a49b0 100644
--- a/libs/sysplugins/smarty_internal_method_clearcompiledtemplate.php
+++ b/libs/sysplugins/smarty_internal_method_clearcompiledtemplate.php
@@ -22,7 +22,7 @@ class Smarty_Internal_Method_ClearCompiledTemplate
      * Delete compiled template file
      *
      * @api  Smarty::clearCompiledTemplate()
-     * @link http://www.smarty.net/docs/en/api.clear.compiled.template.tpl
+     * @link https://www.smarty.net/docs/en/api.clear.compiled.template.tpl
      *
      * @param \Smarty $smarty
      * @param string  $resource_name template name
diff --git a/libs/sysplugins/smarty_internal_method_clearconfig.php b/libs/sysplugins/smarty_internal_method_clearconfig.php
index 15bf492a..d1b73032 100644
--- a/libs/sysplugins/smarty_internal_method_clearconfig.php
+++ b/libs/sysplugins/smarty_internal_method_clearconfig.php
@@ -22,7 +22,7 @@ class Smarty_Internal_Method_ClearConfig
      * clear a single or all config variables
      *
      * @api  Smarty::clearConfig()
-     * @link http://www.smarty.net/docs/en/api.clear.config.tpl
+     * @link https://www.smarty.net/docs/en/api.clear.config.tpl
      *
      * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
      * @param string|null                                             $name variable name or null
diff --git a/libs/sysplugins/smarty_internal_method_configload.php b/libs/sysplugins/smarty_internal_method_configload.php
index 2e625488..c3174d2d 100644
--- a/libs/sysplugins/smarty_internal_method_configload.php
+++ b/libs/sysplugins/smarty_internal_method_configload.php
@@ -22,7 +22,7 @@ class Smarty_Internal_Method_ConfigLoad
      * load a config file, optionally load just selected sections
      *
      * @api  Smarty::configLoad()
-     * @link http://www.smarty.net/docs/en/api.config.load.tpl
+     * @link https://www.smarty.net/docs/en/api.config.load.tpl
      *
      * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
      * @param string                                                  $config_file filename
@@ -42,7 +42,7 @@ class Smarty_Internal_Method_ConfigLoad
      * load a config file, optionally load just selected sections
      *
      * @api  Smarty::configLoad()
-     * @link http://www.smarty.net/docs/en/api.config.load.tpl
+     * @link https://www.smarty.net/docs/en/api.config.load.tpl
      *
      * @param \Smarty|\Smarty_Internal_Data|\Smarty_Internal_Template $data
      * @param string                                                  $config_file filename
diff --git a/libs/sysplugins/smarty_internal_method_createdata.php b/libs/sysplugins/smarty_internal_method_createdata.php
index f9509751..c684c087 100644
--- a/libs/sysplugins/smarty_internal_method_createdata.php
+++ b/libs/sysplugins/smarty_internal_method_createdata.php
@@ -22,7 +22,7 @@ class Smarty_Internal_Method_CreateData
      * creates a data object
      *
      * @api  Smarty::createData()
-     * @link http://www.smarty.net/docs/en/api.create.data.tpl
+     * @link https://www.smarty.net/docs/en/api.create.data.tpl
      *
      * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty      $obj
      * @param \Smarty_Internal_Template|\Smarty_Internal_Data|\Smarty_Data|\Smarty $parent next higher level of Smarty
diff --git a/libs/sysplugins/smarty_internal_method_getconfigvars.php b/libs/sysplugins/smarty_internal_method_getconfigvars.php
index 1d11e44c..763bdf98 100644
--- a/libs/sysplugins/smarty_internal_method_getconfigvars.php
+++ b/libs/sysplugins/smarty_internal_method_getconfigvars.php
@@ -22,7 +22,7 @@ class Smarty_Internal_Method_GetConfigVars
      * Returns a single or all config variables
      *
      * @api  Smarty::getConfigVars()
-     * @link http://www.smarty.net/docs/en/api.get.config.vars.tpl
+     * @link https://www.smarty.net/docs/en/api.get.config.vars.tpl
      *
      * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
      * @param string                                                  $varname        variable name or null
diff --git a/libs/sysplugins/smarty_internal_method_getregisteredobject.php b/libs/sysplugins/smarty_internal_method_getregisteredobject.php
index df6ede13..0b3a071d 100644
--- a/libs/sysplugins/smarty_internal_method_getregisteredobject.php
+++ b/libs/sysplugins/smarty_internal_method_getregisteredobject.php
@@ -22,7 +22,7 @@ class Smarty_Internal_Method_GetRegisteredObject
      * return a reference to a registered object
      *
      * @api  Smarty::getRegisteredObject()
-     * @link http://www.smarty.net/docs/en/api.get.registered.object.tpl
+     * @link https://www.smarty.net/docs/en/api.get.registered.object.tpl
      *
      * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
      * @param string                                                          $object_name object name
diff --git a/libs/sysplugins/smarty_internal_method_gettags.php b/libs/sysplugins/smarty_internal_method_gettags.php
index c07ae07e..0d1335a8 100644
--- a/libs/sysplugins/smarty_internal_method_gettags.php
+++ b/libs/sysplugins/smarty_internal_method_gettags.php
@@ -22,7 +22,7 @@ class Smarty_Internal_Method_GetTags
      * Return array of tag/attributes of all tags used by an template
      *
      * @api  Smarty::getTags()
-     * @link http://www.smarty.net/docs/en/api.get.tags.tpl
+     * @link https://www.smarty.net/docs/en/api.get.tags.tpl
      *
      * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
      * @param null|string|Smarty_Internal_Template                            $template
diff --git a/libs/sysplugins/smarty_internal_method_gettemplatevars.php b/libs/sysplugins/smarty_internal_method_gettemplatevars.php
index 9ef7d46b..0470785b 100644
--- a/libs/sysplugins/smarty_internal_method_gettemplatevars.php
+++ b/libs/sysplugins/smarty_internal_method_gettemplatevars.php
@@ -22,7 +22,7 @@ class Smarty_Internal_Method_GetTemplateVars
      * Returns a single or all template variables
      *
      * @api  Smarty::getTemplateVars()
-     * @link http://www.smarty.net/docs/en/api.get.template.vars.tpl
+     * @link https://www.smarty.net/docs/en/api.get.template.vars.tpl
      *
      * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
      * @param string                                                  $varName       variable name or null
diff --git a/libs/sysplugins/smarty_internal_method_loadfilter.php b/libs/sysplugins/smarty_internal_method_loadfilter.php
index 66d80d47..af788a24 100644
--- a/libs/sysplugins/smarty_internal_method_loadfilter.php
+++ b/libs/sysplugins/smarty_internal_method_loadfilter.php
@@ -30,7 +30,7 @@ class Smarty_Internal_Method_LoadFilter
      *
      * @api  Smarty::loadFilter()
      *
-     * @link http://www.smarty.net/docs/en/api.load.filter.tpl
+     * @link https://www.smarty.net/docs/en/api.load.filter.tpl
      *
      * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
      * @param string                                                          $type filter type
diff --git a/libs/sysplugins/smarty_internal_method_registercacheresource.php b/libs/sysplugins/smarty_internal_method_registercacheresource.php
index 64836561..5608b3fd 100644
--- a/libs/sysplugins/smarty_internal_method_registercacheresource.php
+++ b/libs/sysplugins/smarty_internal_method_registercacheresource.php
@@ -22,7 +22,7 @@ class Smarty_Internal_Method_RegisterCacheResource
      * Registers a resource to fetch a template
      *
      * @api  Smarty::registerCacheResource()
-     * @link http://www.smarty.net/docs/en/api.register.cacheresource.tpl
+     * @link https://www.smarty.net/docs/en/api.register.cacheresource.tpl
      *
      * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
      * @param string                                                          $name name of resource type
diff --git a/libs/sysplugins/smarty_internal_method_registerclass.php b/libs/sysplugins/smarty_internal_method_registerclass.php
index 8d18547e..76a69c6e 100644
--- a/libs/sysplugins/smarty_internal_method_registerclass.php
+++ b/libs/sysplugins/smarty_internal_method_registerclass.php
@@ -22,7 +22,7 @@ class Smarty_Internal_Method_RegisterClass
      * Registers static classes to be used in templates
      *
      * @api  Smarty::registerClass()
-     * @link http://www.smarty.net/docs/en/api.register.class.tpl
+     * @link https://www.smarty.net/docs/en/api.register.class.tpl
      *
      * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
      * @param string                                                          $class_name
diff --git a/libs/sysplugins/smarty_internal_method_registerdefaultpluginhandler.php b/libs/sysplugins/smarty_internal_method_registerdefaultpluginhandler.php
index a9fb78dc..4cda5b05 100644
--- a/libs/sysplugins/smarty_internal_method_registerdefaultpluginhandler.php
+++ b/libs/sysplugins/smarty_internal_method_registerdefaultpluginhandler.php
@@ -22,7 +22,7 @@ class Smarty_Internal_Method_RegisterDefaultPluginHandler
      * Registers a default plugin handler
      *
      * @api  Smarty::registerDefaultPluginHandler()
-     * @link http://www.smarty.net/docs/en/api.register.default.plugin.handler.tpl
+     * @link https://www.smarty.net/docs/en/api.register.default.plugin.handler.tpl
      *
      * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
      * @param callable                                                        $callback class/method name
diff --git a/libs/sysplugins/smarty_internal_method_registerfilter.php b/libs/sysplugins/smarty_internal_method_registerfilter.php
index c0f9fff1..9719eb2b 100644
--- a/libs/sysplugins/smarty_internal_method_registerfilter.php
+++ b/libs/sysplugins/smarty_internal_method_registerfilter.php
@@ -30,7 +30,7 @@ class Smarty_Internal_Method_RegisterFilter
      *
      * @api  Smarty::registerFilter()
      *
-     * @link http://www.smarty.net/docs/en/api.register.filter.tpl
+     * @link https://www.smarty.net/docs/en/api.register.filter.tpl
      *
      * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
      * @param string                                                          $type filter type
diff --git a/libs/sysplugins/smarty_internal_method_registerobject.php b/libs/sysplugins/smarty_internal_method_registerobject.php
index 4646e4f2..8e6fe052 100644
--- a/libs/sysplugins/smarty_internal_method_registerobject.php
+++ b/libs/sysplugins/smarty_internal_method_registerobject.php
@@ -22,7 +22,7 @@ class Smarty_Internal_Method_RegisterObject
      * Registers object to be used in templates
      *
      * @api  Smarty::registerObject()
-     * @link http://www.smarty.net/docs/en/api.register.object.tpl
+     * @link https://www.smarty.net/docs/en/api.register.object.tpl
      *
      * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
      * @param string                                                          $object_name
diff --git a/libs/sysplugins/smarty_internal_method_registerplugin.php b/libs/sysplugins/smarty_internal_method_registerplugin.php
index ed18d84b..74c0ae90 100644
--- a/libs/sysplugins/smarty_internal_method_registerplugin.php
+++ b/libs/sysplugins/smarty_internal_method_registerplugin.php
@@ -22,7 +22,7 @@ class Smarty_Internal_Method_RegisterPlugin
      * Registers plugin to be used in templates
      *
      * @api  Smarty::registerPlugin()
-     * @link http://www.smarty.net/docs/en/api.register.plugin.tpl
+     * @link https://www.smarty.net/docs/en/api.register.plugin.tpl
      *
      * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
      * @param string                                                          $type       plugin type
diff --git a/libs/sysplugins/smarty_internal_method_registerresource.php b/libs/sysplugins/smarty_internal_method_registerresource.php
index 7c7d0f78..302657ae 100644
--- a/libs/sysplugins/smarty_internal_method_registerresource.php
+++ b/libs/sysplugins/smarty_internal_method_registerresource.php
@@ -22,25 +22,18 @@ class Smarty_Internal_Method_RegisterResource
      * Registers a resource to fetch a template
      *
      * @api  Smarty::registerResource()
-     * @link http://www.smarty.net/docs/en/api.register.resource.tpl
+     * @link https://www.smarty.net/docs/en/api.register.resource.tpl
      *
      * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
      * @param string                                                          $name             name of resource type
-     * @param Smarty_Resource|array                                           $resource_handler or instance of
-     *                                                                                          Smarty_Resource,
-     *                                                                                          or array of
-     *                                                                                          callbacks to
-     *                                                                                          handle
-     *                                                                                          resource
-     *                                                                                          (deprecated)
+     * @param Smarty_Resource                                           $resource_handler instance of Smarty_Resource
      *
      * @return \Smarty|\Smarty_Internal_Template
      */
-    public function registerResource(Smarty_Internal_TemplateBase $obj, $name, $resource_handler)
+    public function registerResource(Smarty_Internal_TemplateBase $obj, $name, Smarty_Resource $resource_handler)
     {
         $smarty = $obj->_getSmartyObj();
-        $smarty->registered_resources[ $name ] =
-            $resource_handler instanceof Smarty_Resource ? $resource_handler : array($resource_handler, false);
+        $smarty->registered_resources[ $name ] = $resource_handler;
         return $obj;
     }
 }
diff --git a/libs/sysplugins/smarty_internal_method_unloadfilter.php b/libs/sysplugins/smarty_internal_method_unloadfilter.php
index 55e1596b..e41e8dff 100644
--- a/libs/sysplugins/smarty_internal_method_unloadfilter.php
+++ b/libs/sysplugins/smarty_internal_method_unloadfilter.php
@@ -16,7 +16,7 @@ class Smarty_Internal_Method_UnloadFilter extends Smarty_Internal_Method_LoadFil
      *
      * @api  Smarty::unloadFilter()
      *
-     * @link http://www.smarty.net/docs/en/api.unload.filter.tpl
+     * @link https://www.smarty.net/docs/en/api.unload.filter.tpl
      *
      * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
      * @param string                                                          $type filter type
diff --git a/libs/sysplugins/smarty_internal_method_unregistercacheresource.php b/libs/sysplugins/smarty_internal_method_unregistercacheresource.php
index b9990386..377397e9 100644
--- a/libs/sysplugins/smarty_internal_method_unregistercacheresource.php
+++ b/libs/sysplugins/smarty_internal_method_unregistercacheresource.php
@@ -22,7 +22,7 @@ class Smarty_Internal_Method_UnregisterCacheResource
      * Registers a resource to fetch a template
      *
      * @api  Smarty::unregisterCacheResource()
-     * @link http://www.smarty.net/docs/en/api.unregister.cacheresource.tpl
+     * @link https://www.smarty.net/docs/en/api.unregister.cacheresource.tpl
      *
      * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
      * @param                                                                 $name
diff --git a/libs/sysplugins/smarty_internal_method_unregisterfilter.php b/libs/sysplugins/smarty_internal_method_unregisterfilter.php
index 9cb494a5..ebc9337d 100644
--- a/libs/sysplugins/smarty_internal_method_unregisterfilter.php
+++ b/libs/sysplugins/smarty_internal_method_unregisterfilter.php
@@ -16,7 +16,7 @@ class Smarty_Internal_Method_UnregisterFilter extends Smarty_Internal_Method_Reg
      *
      * @api  Smarty::unregisterFilter()
      *
-     * @link http://www.smarty.net/docs/en/api.unregister.filter.tpl
+     * @link https://www.smarty.net/docs/en/api.unregister.filter.tpl
      *
      * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
      * @param string                                                          $type filter type
diff --git a/libs/sysplugins/smarty_internal_method_unregisterobject.php b/libs/sysplugins/smarty_internal_method_unregisterobject.php
index 1e592b33..77d61963 100644
--- a/libs/sysplugins/smarty_internal_method_unregisterobject.php
+++ b/libs/sysplugins/smarty_internal_method_unregisterobject.php
@@ -22,7 +22,7 @@ class Smarty_Internal_Method_UnregisterObject
      * Registers plugin to be used in templates
      *
      * @api  Smarty::unregisterObject()
-     * @link http://www.smarty.net/docs/en/api.unregister.object.tpl
+     * @link https://www.smarty.net/docs/en/api.unregister.object.tpl
      *
      * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
      * @param string                                                          $object_name name of object
diff --git a/libs/sysplugins/smarty_internal_method_unregisterplugin.php b/libs/sysplugins/smarty_internal_method_unregisterplugin.php
index f39e3167..2431d5c2 100644
--- a/libs/sysplugins/smarty_internal_method_unregisterplugin.php
+++ b/libs/sysplugins/smarty_internal_method_unregisterplugin.php
@@ -22,7 +22,7 @@ class Smarty_Internal_Method_UnregisterPlugin
      * Registers plugin to be used in templates
      *
      * @api  Smarty::unregisterPlugin()
-     * @link http://www.smarty.net/docs/en/api.unregister.plugin.tpl
+     * @link https://www.smarty.net/docs/en/api.unregister.plugin.tpl
      *
      * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
      * @param string                                                          $type plugin type
diff --git a/libs/sysplugins/smarty_internal_method_unregisterresource.php b/libs/sysplugins/smarty_internal_method_unregisterresource.php
index a79db429..bbb6a861 100644
--- a/libs/sysplugins/smarty_internal_method_unregisterresource.php
+++ b/libs/sysplugins/smarty_internal_method_unregisterresource.php
@@ -22,7 +22,7 @@ class Smarty_Internal_Method_UnregisterResource
      * Registers a resource to fetch a template
      *
      * @api  Smarty::unregisterResource()
-     * @link http://www.smarty.net/docs/en/api.unregister.resource.tpl
+     * @link https://www.smarty.net/docs/en/api.unregister.resource.tpl
      *
      * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
      * @param string                                                          $type name of resource type
diff --git a/libs/sysplugins/smarty_internal_parsetree_template.php b/libs/sysplugins/smarty_internal_parsetree_template.php
index ab4c3ec3..829c420f 100644
--- a/libs/sysplugins/smarty_internal_parsetree_template.php
+++ b/libs/sysplugins/smarty_internal_parsetree_template.php
@@ -87,83 +87,83 @@ class Smarty_Internal_ParseTree_Template extends Smarty_Internal_ParseTree
         $code = '';
 
         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;
+            $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 = array();
-    	$currentMode = null;
-    	$currentChunk = array();
-	    for ($key = 0, $cnt = count($this->subtrees); $key < $cnt; $key++) {
+        $chunks = array();
+        $currentMode = null;
+        $currentChunk = array();
+        for ($key = 0, $cnt = count($this->subtrees); $key < $cnt; $key++) {
 
-	    	if ($this->subtrees[ $key ]->data === '' && in_array($currentMode, array('textstripped', 'text', 'tag'))) {
-	    		continue;
-	    	}
+            if ($this->subtrees[ $key ]->data === '' && in_array($currentMode, array('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 ($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[] = array(
-		    		'mode' => $currentMode,
-				    'subtrees' => $currentChunk
-			    );
-		    	$currentMode = $newMode;
-			    $currentChunk = array($this->subtrees[ $key ]);
-		    }
-	    }
-	    if ($currentMode && $currentChunk) {
-		    $chunks[] = array(
-			    'mode' => $currentMode,
-			    'subtrees' => $currentChunk
-		    );
-	    }
-		return $chunks;
+            if ($newMode == $currentMode) {
+                $currentChunk[] = $this->subtrees[ $key ];
+            } else {
+                $chunks[] = array(
+                    'mode' => $currentMode,
+                    'subtrees' => $currentChunk
+                );
+                $currentMode = $newMode;
+                $currentChunk = array($this->subtrees[ $key ]);
+            }
+        }
+        if ($currentMode && $currentChunk) {
+            $chunks[] = array(
+                'mode' => $currentMode,
+                'subtrees' => $currentChunk
+            );
+        }
+        return $chunks;
     }
 }
diff --git a/libs/sysplugins/smarty_internal_parsetree_text.php b/libs/sysplugins/smarty_internal_parsetree_text.php
index 399e8494..58116c81 100644
--- a/libs/sysplugins/smarty_internal_parsetree_text.php
+++ b/libs/sysplugins/smarty_internal_parsetree_text.php
@@ -17,30 +17,30 @@
 class Smarty_Internal_ParseTree_Text extends Smarty_Internal_ParseTree
 {
 
-	/**
-	 * Wether this section should be stripped on output to smarty php
-	 * @var bool
-	 */
-	private $toBeStripped = false;
+    /**
+     * 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
-	 */
+    /**
+     * 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;
+    /**
+     * Wether this section should be stripped on output to smarty php
+     * @return bool
+     */
+    public function isToBeStripped() {
+        return $this->toBeStripped;
     }
 
     /**
diff --git a/libs/sysplugins/smarty_internal_resource_registered.php b/libs/sysplugins/smarty_internal_resource_registered.php
deleted file mode 100644
index df526101..00000000
--- a/libs/sysplugins/smarty_internal_resource_registered.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Resource Registered
- *
- * @package    Smarty
- * @subpackage TemplateResources
- * @author     Uwe Tews
- * @author     Rodney Rehm
- */
-
-/**
- * Smarty Internal Plugin Resource Registered
- * Implements the registered resource for Smarty template
- *
- * @package    Smarty
- * @subpackage TemplateResources
- * @deprecated
- */
-class Smarty_Internal_Resource_Registered extends Smarty_Resource
-{
-    /**
-     * populate Source Object with meta data from Resource
-     *
-     * @param Smarty_Template_Source   $source    source object
-     * @param Smarty_Internal_Template $_template template object
-     *
-     * @return void
-     */
-    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
-    {
-        $source->filepath = $source->type . ':' . $source->name;
-        $source->uid = sha1($source->filepath . $source->smarty->_joined_template_dir);
-        $source->timestamp = $this->getTemplateTimestamp($source);
-        $source->exists = !!$source->timestamp;
-    }
-
-    /**
-     * populate Source Object with timestamp and exists from Resource
-     *
-     * @param Smarty_Template_Source $source source object
-     *
-     * @return void
-     */
-    public function populateTimestamp(Smarty_Template_Source $source)
-    {
-        $source->timestamp = $this->getTemplateTimestamp($source);
-        $source->exists = !!$source->timestamp;
-    }
-
-    /**
-     * Get timestamp (epoch) the template source was modified
-     *
-     * @param Smarty_Template_Source $source source object
-     *
-     * @return integer|boolean        timestamp (epoch) the template was modified, false if resources has no timestamp
-     */
-    public function getTemplateTimestamp(Smarty_Template_Source $source)
-    {
-        // return timestamp
-        $time_stamp = false;
-        call_user_func_array(
-            $source->smarty->registered_resources[ $source->type ][ 0 ][ 1 ],
-            array($source->name, &$time_stamp, $source->smarty)
-        );
-        return is_numeric($time_stamp) ? (int)$time_stamp : $time_stamp;
-    }
-
-    /**
-     * Load template's source by invoking the registered callback into current template object
-     *
-     * @param Smarty_Template_Source $source source object
-     *
-     * @return string                 template source
-     * @throws SmartyException        if source cannot be loaded
-     */
-    public function getContent(Smarty_Template_Source $source)
-    {
-        // return template string
-        $content = null;
-        $t = call_user_func_array(
-            $source->smarty->registered_resources[ $source->type ][ 0 ][ 0 ],
-            array($source->name, &$content, $source->smarty)
-        );
-        if (is_bool($t) && !$t) {
-            throw new SmartyException("Unable to read template {$source->type} '{$source->name}'");
-        }
-        return $content;
-    }
-
-    /**
-     * Determine basename for compiled filename
-     *
-     * @param Smarty_Template_Source $source source object
-     *
-     * @return string                 resource's basename
-     */
-    public function getBasename(Smarty_Template_Source $source)
-    {
-        return basename($source->name);
-    }
-}
diff --git a/libs/sysplugins/smarty_internal_resource_stream.php b/libs/sysplugins/smarty_internal_resource_stream.php
index 9956bd07..5f020349 100644
--- a/libs/sysplugins/smarty_internal_resource_stream.php
+++ b/libs/sysplugins/smarty_internal_resource_stream.php
@@ -13,7 +13,7 @@
  * Smarty Internal Plugin Resource Stream
  * Implements the streams as resource for Smarty template
  *
- * @link       http://php.net/streams
+ * @link       https://php.net/streams
  * @package    Smarty
  * @subpackage TemplateResources
  */
diff --git a/libs/sysplugins/smarty_internal_templatebase.php b/libs/sysplugins/smarty_internal_templatebase.php
index 200c11bb..2ffb896f 100644
--- a/libs/sysplugins/smarty_internal_templatebase.php
+++ b/libs/sysplugins/smarty_internal_templatebase.php
@@ -138,7 +138,7 @@ abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data
      * test if cache is valid
      *
      * @api  Smarty::isCached()
-     * @link http://www.smarty.net/docs/en/api.is.cached.tpl
+     * @link https://www.smarty.net/docs/en/api.is.cached.tpl
      *
      * @param null|string|\Smarty_Internal_Template $template   the resource handle of the template file or template
      *                                                          object
@@ -199,6 +199,12 @@ abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data
         try {
             $_smarty_old_error_level =
                 isset($smarty->error_reporting) ? error_reporting($smarty->error_reporting) : null;
+
+            if ($smarty->isMutingUndefinedOrNullWarnings()) {
+                $errorHandler = new Smarty_Internal_ErrorHandler();
+                $errorHandler->activate();
+            }
+
             if ($this->_objType === 2) {
                 /* @var Smarty_Internal_Template $this */
                 $template->tplFunctions = $this->tplFunctions;
@@ -242,6 +248,11 @@ abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data
                     }
                 }
             }
+
+            if (isset($errorHandler)) {
+                $errorHandler->deactivate();
+            }
+
             if (isset($_smarty_old_error_level)) {
                 error_reporting($_smarty_old_error_level);
             }
@@ -250,6 +261,10 @@ abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data
             while (ob_get_level() > $level) {
                 ob_end_clean();
             }
+            if (isset($errorHandler)) {
+                $errorHandler->deactivate();
+            }
+
             if (isset($_smarty_old_error_level)) {
                 error_reporting($_smarty_old_error_level);
             }
@@ -261,7 +276,7 @@ abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data
      * Registers plugin to be used in templates
      *
      * @api  Smarty::registerPlugin()
-     * @link http://www.smarty.net/docs/en/api.register.plugin.tpl
+     * @link https://www.smarty.net/docs/en/api.register.plugin.tpl
      *
      * @param string   $type       plugin type
      * @param string   $name       name of template tag
@@ -281,7 +296,7 @@ abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data
      * load a filter of specified type and name
      *
      * @api  Smarty::loadFilter()
-     * @link http://www.smarty.net/docs/en/api.load.filter.tpl
+     * @link https://www.smarty.net/docs/en/api.load.filter.tpl
      *
      * @param string $type filter type
      * @param string $name filter name
@@ -298,7 +313,7 @@ abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data
      * Registers a filter function
      *
      * @api  Smarty::registerFilter()
-     * @link http://www.smarty.net/docs/en/api.register.filter.tpl
+     * @link https://www.smarty.net/docs/en/api.register.filter.tpl
      *
      * @param string      $type filter type
      * @param callable    $callback
@@ -316,7 +331,7 @@ abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data
      * Registers object to be used in templates
      *
      * @api  Smarty::registerObject()
-     * @link http://www.smarty.net/docs/en/api.register.object.tpl
+     * @link https://www.smarty.net/docs/en/api.register.object.tpl
      *
      * @param string $object_name
      * @param object $object                     the referenced PHP object to register
diff --git a/libs/sysplugins/smarty_internal_templatecompilerbase.php b/libs/sysplugins/smarty_internal_templatecompilerbase.php
index 3cc957de..6a8dc9c4 100644
--- a/libs/sysplugins/smarty_internal_templatecompilerbase.php
+++ b/libs/sysplugins/smarty_internal_templatecompilerbase.php
@@ -203,13 +203,6 @@ abstract class Smarty_Internal_TemplateCompilerBase
      */
     public $blockOrFunctionCode = '';
 
-    /**
-     * php_handling setting either from Smarty or security
-     *
-     * @var int
-     */
-    public $php_handling = 0;
-
     /**
      * flags for used modifier plugins
      *
@@ -438,11 +431,6 @@ abstract class Smarty_Internal_TemplateCompilerBase
                 }
                 $this->smarty->_debug->start_compile($this->template);
             }
-            if (isset($this->template->smarty->security_policy)) {
-                $this->php_handling = $this->template->smarty->security_policy->php_handling;
-            } else {
-                $this->php_handling = $this->template->smarty->php_handling;
-            }
             $this->parent_compiler = $parent_compiler ? $parent_compiler : $this;
             $nocache = isset($nocache) ? $nocache : false;
             if (empty($template->compiled->nocache_hash)) {
@@ -627,11 +615,11 @@ abstract class Smarty_Internal_TemplateCompilerBase
                         $this->trigger_template_error('Illegal number of parameter in "isset()"');
                     }
 
-	                $pa = array();
-	                foreach ($parameter as $p) {
-		                $pa[] = $this->syntaxMatchesVariable($p) ? 'isset(' . $p . ')' : '(' . $p . ' !== null )';
-	                }
-	                return '(' . implode(' && ', $pa) . ')';
+                    $pa = array();
+                    foreach ($parameter as $p) {
+                        $pa[] = $this->syntaxMatchesVariable($p) ? 'isset(' . $p . ')' : '(' . $p . ' !== null )';
+                    }
+                    return '(' . implode(' && ', $pa) . ')';
 
                 } elseif (in_array(
                     $func_name,
@@ -649,12 +637,8 @@ abstract class Smarty_Internal_TemplateCompilerBase
                         $this->trigger_template_error("Illegal number of parameter in '{$func_name()}'");
                     }
                     if ($func_name === 'empty') {
-                        if (!$this->syntaxMatchesVariable($parameter[0]) && version_compare(PHP_VERSION, '5.5.0', '<')) {
-                            return '(' . $parameter[ 0 ] . ' === false )';
-                        } else {
-                            return $func_name . '(' .
-                                   str_replace("')->value", "',null,true,false)->value", $parameter[ 0 ]) . ')';
-                        }
+                        return $func_name . '(' .
+                               str_replace("')->value", "',null,true,false)->value", $parameter[ 0 ]) . ')';
                     } else {
                         return $func_name . '(' . $parameter[ 0 ] . ')';
                     }
@@ -667,16 +651,16 @@ abstract class Smarty_Internal_TemplateCompilerBase
         }
     }
 
-	/**
-	 * Determines whether the passed string represents a valid (PHP) variable.
-	 * This is important, because `isset()` only works on variables and `empty()` can only be passed
-	 * a variable prior to php5.5
-	 * @param $string
-	 * @return bool
-	 */
-	private function syntaxMatchesVariable($string) {
-    	static $regex_pattern = '/^\$[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*((->)[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*|\[.*]*\])*$/';
-    	return 1 === preg_match($regex_pattern, trim($string));
+    /**
+     * Determines whether the passed string represents a valid (PHP) variable.
+     * This is important, because `isset()` only works on variables and `empty()` can only be passed
+     * a variable prior to php5.5
+     * @param $string
+     * @return bool
+     */
+    private function syntaxMatchesVariable($string) {
+        static $regex_pattern = '/^\$[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*((->)[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*|\[.*]*\])*$/';
+        return 1 === preg_match($regex_pattern, trim($string));
     }
 
     /**
@@ -691,11 +675,11 @@ abstract class Smarty_Internal_TemplateCompilerBase
     {
 
         if (strpos($text, '<') === false) {
-        	return preg_replace($this->stripRegEx, '', $text);
+            return preg_replace($this->stripRegEx, '', $text);
         }
 
-	    $store = array();
-	    $_store = 0;
+        $store = array();
+        $_store = 0;
 
         // capture html elements not to be messed with
         $_offset = 0;
diff --git a/libs/sysplugins/smarty_internal_templatelexer.php b/libs/sysplugins/smarty_internal_templatelexer.php
index 867a31d2..5ca48205 100644
--- a/libs/sysplugins/smarty_internal_templatelexer.php
+++ b/libs/sysplugins/smarty_internal_templatelexer.php
@@ -18,12 +18,6 @@
  */
 class Smarty_Internal_Templatelexer
 {
-    const TEXT               = 1;
-    const TAG                = 2;
-    const TAGBODY            = 3;
-    const LITERAL            = 4;
-    const DOUBLEQUOTEDSTRING = 5;
-
     /**
      * Source
      *
@@ -80,7 +74,7 @@ class Smarty_Internal_Templatelexer
      */
     public $phpType = '';
 
-    /**
+   /**
      * state number
      *
      * @var int
@@ -229,10 +223,6 @@ class Smarty_Internal_Templatelexer
      */
     private $yy_global_literal = null;
 
-    private $_yy_state         = 1;
-
-    private $_yy_stack         = array();
-
     /**
      * constructor
      *
@@ -245,14 +235,14 @@ class Smarty_Internal_Templatelexer
         $this->dataLength = strlen($this->data);
         $this->counter = 0;
         if (preg_match('/^\xEF\xBB\xBF/i', $this->data, $match)) {
-            $this->counter += strlen($match[ 0 ]);
+            $this->counter += strlen($match[0]);
         }
         $this->line = 1;
         $this->smarty = $compiler->template->smarty;
         $this->compiler = $compiler;
         $this->compiler->initDelimiterPreg();
-        $this->smarty_token_names[ 'LDEL' ] = $this->smarty->getLeftDelimiter();
-        $this->smarty_token_names[ 'RDEL' ] = $this->smarty->getRightDelimiter();
+        $this->smarty_token_names['LDEL'] = $this->smarty->getLeftDelimiter();
+        $this->smarty_token_names['RDEL'] = $this->smarty->getRightDelimiter();
     }
 
     /**
@@ -265,17 +255,17 @@ class Smarty_Internal_Templatelexer
         $this->yyTracePrompt = '<br>';
     }
 
-    /**
+   /**
      * replace placeholders with runtime preg  code
      *
      * @param string $preg
      *
      * @return string
      */
-    public function replace($preg)
-    {
+   public function replace($preg)
+   {
         return $this->compiler->replaceDelimiter($preg);
-    }
+   }
 
     /**
      * check if current value is an autoliteral left delimiter
@@ -286,7 +276,11 @@ class Smarty_Internal_Templatelexer
     {
         return $this->smarty->getAutoLiteral() && isset($this->value[ $this->compiler->getLdelLength() ]) ?
             strpos(" \n\t\r", $this->value[ $this->compiler->getLdelLength() ]) !== false : false;
-    } // end function
+    }
+
+     
+    private $_yy_state = 1;
+    private $_yy_stack = array();
 
     public function yylex()
     {
@@ -296,62 +290,60 @@ class Smarty_Internal_Templatelexer
     public function yypushstate($state)
     {
         if ($this->yyTraceFILE) {
-            fprintf($this->yyTraceFILE, "%sState push %s\n", $this->yyTracePrompt,
-                isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] : $this->_yy_state);
+             fprintf($this->yyTraceFILE, "%sState push %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
         }
         array_push($this->_yy_stack, $this->_yy_state);
         $this->_yy_state = $state;
         if ($this->yyTraceFILE) {
-            fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt,
-                isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] : $this->_yy_state);
+             fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
         }
     }
 
     public function yypopstate()
     {
-        if ($this->yyTraceFILE) {
-            fprintf($this->yyTraceFILE, "%sState pop %s\n", $this->yyTracePrompt,
-                isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] : $this->_yy_state);
+       if ($this->yyTraceFILE) {
+             fprintf($this->yyTraceFILE, "%sState pop %s\n", $this->yyTracePrompt,  isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
         }
-        $this->_yy_state = array_pop($this->_yy_stack);
+       $this->_yy_state = array_pop($this->_yy_stack);
         if ($this->yyTraceFILE) {
-            fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt,
-                isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] : $this->_yy_state);
+             fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
         }
+
     }
 
     public function yybegin($state)
     {
-        $this->_yy_state = $state;
+       $this->_yy_state = $state;
         if ($this->yyTraceFILE) {
-            fprintf($this->yyTraceFILE, "%sState set %s\n", $this->yyTracePrompt,
-                isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] : $this->_yy_state);
+             fprintf($this->yyTraceFILE, "%sState set %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
         }
     }
 
+
+     
     public function yylex1()
     {
         if (!isset($this->yy_global_pattern1)) {
-            $this->yy_global_pattern1 =
-                $this->replace("/\G([{][}])|\G((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");
+            $this->yy_global_pattern1 = $this->replace("/\G([{][}])|\G((SMARTYldel)SMARTYal[*])|\G((SMARTYldel)SMARTYautoliteral\\s+SMARTYliteral)|\G((SMARTYldel)SMARTYalliteral\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[\/]literal\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal)|\G([\S\s])/isS");
         }
         if (!isset($this->dataLength)) {
             $this->dataLength = strlen($this->data);
         }
-        if ($this->counter >= $this->dataLength) {
+        if ($this->counter >=  $this->dataLength) {
             return false; // end of input
         }
+        
         do {
-            if (preg_match($this->yy_global_pattern1, $this->data, $yymatches, 0, $this->counter)) {
-                if (!isset($yymatches[ 0 ][ 1 ])) {
-                    $yymatches = preg_grep("/(.|\s)+/", $yymatches);
+            if (preg_match($this->yy_global_pattern1,$this->data, $yymatches, 0, $this->counter)) {
+                if (!isset($yymatches[ 0 ][1])) {
+                   $yymatches = preg_grep("/(.|\s)+/", $yymatches);
                 } else {
                     $yymatches = array_filter($yymatches);
                 }
                 if (empty($yymatches)) {
                     throw new Exception('Error: lexing failed because a rule matched' .
-                                        ' an empty string.  Input "' . substr($this->data,
-                            $this->counter, 5) . '... state TEXT');
+                        ' an empty string.  Input "' . substr($this->data,
+                        $this->counter, 5) . '... state TEXT');
                 }
                 next($yymatches); // skip global match
                 $this->token = key($yymatches); // token number
@@ -369,110 +361,102 @@ class Smarty_Internal_Templatelexer
                 } elseif ($r === false) {
                     $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= $this->dataLength) {
+                    if ($this->counter >=  $this->dataLength) {
                         return false; // end of input
                     }
                     // skip this token
                     continue;
-                }
-            } else {
-                throw new Exception('Unexpected input at line ' . $this->line .
-                                    ': ' . $this->data[ $this->counter ]);
+                }            } else {
+                throw new Exception('Unexpected input at line' . $this->line .
+                    ': ' . $this->data[$this->counter]);
             }
             break;
         } while (true);
-    }
 
-    public function yy_r1_1()
-    {
-        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-    }
-
-    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 ])) {
-            $to = $match[ 0 ][ 1 ] + strlen($match[ 0 ][ 0 ]);
-        } else {
-            $this->compiler->trigger_template_error("missing or misspelled comment closing tag '{$this->smarty->getRightDelimiter()}'");
-        }
-        $this->value = substr($this->data, $this->counter, $to - $this->counter);
-        return false;
-    }
-
-    public function yy_r1_4()
-    {
-        $this->compiler->getTagCompiler('private_php')->parsePhp($this);
-    }
-
-    public function yy_r1_8()
-    {
-        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-    }
-
-    public function yy_r1_10()
-    {
-        $this->token = Smarty_Internal_Templateparser::TP_LITERALSTART;
-        $this->yypushstate(self::LITERAL);
-    }
-
-    public function yy_r1_12()
-    {
-        $this->token = Smarty_Internal_Templateparser::TP_LITERALEND;
-        $this->yypushstate(self::LITERAL);
     } // end function
 
-    public function yy_r1_14()
+
+    const TEXT = 1;
+    public function yy_r1_1()
     {
+
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+         }
+    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])) {
+            $to = $match[0][1] + strlen($match[0][0]);
+        } else {
+            $this->compiler->trigger_template_error ("missing or misspelled comment closing tag '{$this->smarty->getRightDelimiter()}'");
+        }
+        $this->value = substr($this->data,$this->counter,$to-$this->counter);
+        return false;
+         }
+    public function yy_r1_4()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+         }
+    public function yy_r1_6()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_LITERALSTART;
+        $this->yypushstate(self::LITERAL);
+         }
+    public function yy_r1_8()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_LITERALEND;
+        $this->yypushstate(self::LITERAL);
+         }
+    public function yy_r1_10()
+    {
+
         $this->yypushstate(self::TAG);
         return true;
-    }
-
-    public function yy_r1_16()
+         }
+    public function yy_r1_12()
     {
-        $this->compiler->getTagCompiler('private_php')->parsePhp($this);
-    }
 
-    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;
-    }
+       if (!isset($this->yy_global_text)) {
+           $this->yy_global_text = $this->replace('/(SMARTYldel)SMARTYal/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;
+         }
 
+     
     public function yylex2()
     {
         if (!isset($this->yy_global_pattern2)) {
-            $this->yy_global_pattern2 =
-                $this->replace("/\G((SMARTYldel)SMARTYal(if|elseif|else if|while)\\s+)|\G((SMARTYldel)SMARTYalfor\\s+)|\G((SMARTYldel)SMARTYalforeach(?![^\s]))|\G((SMARTYldel)SMARTYalsetfilter\\s+)|\G((SMARTYldel)SMARTYalmake_nocache\\s+)|\G((SMARTYldel)SMARTYal[0-9]*[a-zA-Z_]\\w*(\\s+nocache)?\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[$]smarty\\.block\\.(child|parent)\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[\/][0-9]*[a-zA-Z_]\\w*\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[$][0-9]*[a-zA-Z_]\\w*(\\s+nocache)?\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[\/])|\G((SMARTYldel)SMARTYal)/isS");
+            $this->yy_global_pattern2 = $this->replace("/\G((SMARTYldel)SMARTYal(if|elseif|else if|while)\\s+)|\G((SMARTYldel)SMARTYalfor\\s+)|\G((SMARTYldel)SMARTYalforeach(?![^\s]))|\G((SMARTYldel)SMARTYalsetfilter\\s+)|\G((SMARTYldel)SMARTYalmake_nocache\\s+)|\G((SMARTYldel)SMARTYal[0-9]*[a-zA-Z_]\\w*(\\s+nocache)?\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[$]smarty\\.block\\.(child|parent)\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[\/][0-9]*[a-zA-Z_]\\w*\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[$][0-9]*[a-zA-Z_]\\w*(\\s+nocache)?\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[\/])|\G((SMARTYldel)SMARTYal)/isS");
         }
         if (!isset($this->dataLength)) {
             $this->dataLength = strlen($this->data);
         }
-        if ($this->counter >= $this->dataLength) {
+        if ($this->counter >=  $this->dataLength) {
             return false; // end of input
         }
+        
         do {
-            if (preg_match($this->yy_global_pattern2, $this->data, $yymatches, 0, $this->counter)) {
-                if (!isset($yymatches[ 0 ][ 1 ])) {
-                    $yymatches = preg_grep("/(.|\s)+/", $yymatches);
+            if (preg_match($this->yy_global_pattern2,$this->data, $yymatches, 0, $this->counter)) {
+                if (!isset($yymatches[ 0 ][1])) {
+                   $yymatches = preg_grep("/(.|\s)+/", $yymatches);
                 } else {
                     $yymatches = array_filter($yymatches);
                 }
                 if (empty($yymatches)) {
                     throw new Exception('Error: lexing failed because a rule matched' .
-                                        ' an empty string.  Input "' . substr($this->data,
-                            $this->counter, 5) . '... state TAG');
+                        ' an empty string.  Input "' . substr($this->data,
+                        $this->counter, 5) . '... state TAG');
                 }
                 next($yymatches); // skip global match
                 $this->token = key($yymatches); // token number
@@ -490,79 +474,82 @@ class Smarty_Internal_Templatelexer
                 } elseif ($r === false) {
                     $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= $this->dataLength) {
+                    if ($this->counter >=  $this->dataLength) {
                         return false; // end of input
                     }
                     // skip this token
                     continue;
-                }
-            } else {
-                throw new Exception('Unexpected input at line ' . $this->line .
-                                    ': ' . $this->data[ $this->counter ]);
+                }            } else {
+                throw new Exception('Unexpected input at line' . $this->line .
+                    ': ' . $this->data[$this->counter]);
             }
             break;
         } while (true);
-    }
 
+    } // end function
+
+
+    const TAG = 2;
     public function yy_r2_1()
     {
+
         $this->token = Smarty_Internal_Templateparser::TP_LDELIF;
         $this->yybegin(self::TAGBODY);
         $this->taglineno = $this->line;
-    }
-
+         }
     public function yy_r2_4()
     {
+
         $this->token = Smarty_Internal_Templateparser::TP_LDELFOR;
         $this->yybegin(self::TAGBODY);
         $this->taglineno = $this->line;
-    }
-
+         }
     public function yy_r2_6()
     {
+
         $this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH;
         $this->yybegin(self::TAGBODY);
         $this->taglineno = $this->line;
-    }
-
+         }
     public function yy_r2_8()
     {
+
         $this->token = Smarty_Internal_Templateparser::TP_LDELSETFILTER;
         $this->yybegin(self::TAGBODY);
         $this->taglineno = $this->line;
-    }
-
+         }
     public function yy_r2_10()
     {
+
         $this->token = Smarty_Internal_Templateparser::TP_LDELMAKENOCACHE;
         $this->yybegin(self::TAGBODY);
         $this->taglineno = $this->line;
-    }
-
+         }
     public function yy_r2_12()
     {
+
         $this->yypopstate();
         $this->token = Smarty_Internal_Templateparser::TP_SIMPLETAG;
         $this->taglineno = $this->line;
-    }
-
+         }
     public function yy_r2_15()
     {
-        $this->yypopstate();
-        $this->token = Smarty_Internal_Templateparser::TP_SMARTYBLOCKCHILDPARENT;
-        $this->taglineno = $this->line;
-    }
 
+         $this->yypopstate();
+         $this->token = Smarty_Internal_Templateparser::TP_SMARTYBLOCKCHILDPARENT;
+         $this->taglineno = $this->line;
+         }
     public function yy_r2_18()
     {
+
         $this->yypopstate();
         $this->token = Smarty_Internal_Templateparser::TP_CLOSETAG;
         $this->taglineno = $this->line;
-    }
-
+         }
     public function yy_r2_20()
     {
-        if ($this->_yy_stack[ count($this->_yy_stack) - 1 ] === self::TEXT) {
+
+        if ($this->_yy_stack[count($this->_yy_stack)-1] === self::TEXT) {
             $this->yypopstate();
             $this->token = Smarty_Internal_Templateparser::TP_SIMPELOUTPUT;
             $this->taglineno = $this->line;
@@ -572,45 +559,46 @@ class Smarty_Internal_Templatelexer
             $this->yybegin(self::TAGBODY);
             $this->taglineno = $this->line;
         }
-    } // end function
-
+         }
     public function yy_r2_23()
     {
+
         $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
         $this->yybegin(self::TAGBODY);
         $this->taglineno = $this->line;
-    }
-
+         }
     public function yy_r2_25()
     {
+
         $this->token = Smarty_Internal_Templateparser::TP_LDEL;
         $this->yybegin(self::TAGBODY);
         $this->taglineno = $this->line;
-    }
+         }
 
+     
     public function yylex3()
     {
         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(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");
+            $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(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);
         }
-        if ($this->counter >= $this->dataLength) {
+        if ($this->counter >=  $this->dataLength) {
             return false; // end of input
         }
+        
         do {
-            if (preg_match($this->yy_global_pattern3, $this->data, $yymatches, 0, $this->counter)) {
-                if (!isset($yymatches[ 0 ][ 1 ])) {
-                    $yymatches = preg_grep("/(.|\s)+/", $yymatches);
+            if (preg_match($this->yy_global_pattern3,$this->data, $yymatches, 0, $this->counter)) {
+                if (!isset($yymatches[ 0 ][1])) {
+                   $yymatches = preg_grep("/(.|\s)+/", $yymatches);
                 } else {
                     $yymatches = array_filter($yymatches);
                 }
                 if (empty($yymatches)) {
                     throw new Exception('Error: lexing failed because a rule matched' .
-                                        ' an empty string.  Input "' . substr($this->data,
-                            $this->counter, 5) . '... state TAGBODY');
+                        ' an empty string.  Input "' . substr($this->data,
+                        $this->counter, 5) . '... state TAGBODY');
                 }
                 next($yymatches); // skip global match
                 $this->token = key($yymatches); // token number
@@ -628,281 +616,285 @@ class Smarty_Internal_Templatelexer
                 } elseif ($r === false) {
                     $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= $this->dataLength) {
+                    if ($this->counter >=  $this->dataLength) {
                         return false; // end of input
                     }
                     // skip this token
                     continue;
-                }
-            } else {
-                throw new Exception('Unexpected input at line ' . $this->line .
-                                    ': ' . $this->data[ $this->counter ]);
+                }            } else {
+                throw new Exception('Unexpected input at line' . $this->line .
+                    ': ' . $this->data[$this->counter]);
             }
             break;
         } while (true);
-    }
 
+    } // end function
+
+
+    const TAGBODY = 3;
     public function yy_r3_1()
     {
+
         $this->token = Smarty_Internal_Templateparser::TP_RDEL;
         $this->yypopstate();
-    }
-
+         }
     public function yy_r3_2()
     {
+
         $this->yypushstate(self::TAG);
         return true;
-    }
-
+         }
     public function yy_r3_4()
     {
+
         $this->token = Smarty_Internal_Templateparser::TP_QUOTE;
         $this->yypushstate(self::DOUBLEQUOTEDSTRING);
         $this->compiler->enterDoubleQuote();
-    }
-
+         }
     public function yy_r3_5()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_SINGLEQUOTESTRING;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_SINGLEQUOTESTRING;
+         }
     public function yy_r3_6()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_DOLLARID;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_DOLLARID;
+         }
     public function yy_r3_7()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_DOLLAR;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_DOLLAR;
+         }
     public function yy_r3_8()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_ISIN;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_ISIN;
+         }
     public function yy_r3_9()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_AS;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_AS;
+         }
     public function yy_r3_10()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_TO;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_TO;
+         }
     public function yy_r3_11()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_STEP;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_STEP;
+         }
     public function yy_r3_12()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_INSTANCEOF;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_INSTANCEOF;
+         }
     public function yy_r3_13()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_LOGOP;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_LOGOP;
+         }
     public function yy_r3_15()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_SLOGOP;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_SLOGOP;
+         }
     public function yy_r3_17()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_TLOGOP;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_TLOGOP;
+         }
     public function yy_r3_20()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_SINGLECOND;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_SINGLECOND;
+         }
     public function yy_r3_23()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_NOT;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_NOT;
+         }
     public function yy_r3_24()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_TYPECAST;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_TYPECAST;
+         }
     public function yy_r3_28()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_OPENP;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_OPENP;
+         }
     public function yy_r3_29()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_CLOSEP;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_CLOSEP;
+         }
     public function yy_r3_30()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_OPENB;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_OPENB;
+         }
     public function yy_r3_31()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_CLOSEB;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_CLOSEB;
+         }
     public function yy_r3_32()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_PTR;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_PTR;
+         }
     public function yy_r3_33()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_APTR;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_APTR;
+         }
     public function yy_r3_34()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_EQUAL;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_EQUAL;
+         }
     public function yy_r3_35()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_INCDEC;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_INCDEC;
+         }
     public function yy_r3_37()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_UNIMATH;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_UNIMATH;
+         }
     public function yy_r3_39()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_MATH;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_MATH;
+         }
     public function yy_r3_41()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_AT;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_AT;
+         }
     public function yy_r3_42()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_ARRAYOPEN;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_ARRAYOPEN;
+         }
     public function yy_r3_43()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_HATCH;
-    }
 
+        $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()) ===
-            $this->smarty->getRightDelimiter()) {
-            preg_match('/\s+/', $this->value, $match);
-            $this->value = $match[ 0 ];
+        if (substr($this->data, $this->counter + strlen($this->value) - 1, $this->compiler->getRdelLength()) === $this->smarty->getRightDelimiter()) {
+            preg_match('/\s+/',$this->value,$match);
+            $this->value = $match[0];
             $this->token = Smarty_Internal_Templateparser::TP_SPACE;
         } else {
             $this->token = Smarty_Internal_Templateparser::TP_ATTR;
         }
-    }
-
+         }
     public function yy_r3_45()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_NAMESPACE;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_NAMESPACE;
+         }
     public function yy_r3_48()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_ID;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_ID;
+         }
     public function yy_r3_49()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_INTEGER;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_INTEGER;
+         }
     public function yy_r3_50()
     {
+
         $this->token = Smarty_Internal_Templateparser::TP_BACKTICK;
         $this->yypopstate();
-    }
-
+         }
     public function yy_r3_51()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_VERT;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_VERT;
+         }
     public function yy_r3_52()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_DOT;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_DOT;
+         }
     public function yy_r3_53()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_COMMA;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_COMMA;
+         }
     public function yy_r3_54()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_SEMICOLON;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_SEMICOLON;
+         }
     public function yy_r3_55()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_DOUBLECOLON;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_DOUBLECOLON;
+         }
     public function yy_r3_56()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_COLON;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_COLON;
+         }
     public function yy_r3_57()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_QMARK;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_QMARK;
+         }
     public function yy_r3_58()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_HEX;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_HEX;
+         }
     public function yy_r3_59()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_SPACE;
-    } // end function
 
+        $this->token = Smarty_Internal_Templateparser::TP_SPACE;
+         }
     public function yy_r3_60()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+         }
+
+
+     
     public function yylex4()
     {
         if (!isset($this->yy_global_pattern4)) {
-            $this->yy_global_pattern4 =
-                $this->replace("/\G((SMARTYldel)SMARTYalliteral\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[\/]literal\\s*SMARTYrdel)|\G([\S\s])/isS");
+            $this->yy_global_pattern4 = $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);
         }
-        if ($this->counter >= $this->dataLength) {
+        if ($this->counter >=  $this->dataLength) {
             return false; // end of input
         }
+        
         do {
-            if (preg_match($this->yy_global_pattern4, $this->data, $yymatches, 0, $this->counter)) {
-                if (!isset($yymatches[ 0 ][ 1 ])) {
-                    $yymatches = preg_grep("/(.|\s)+/", $yymatches);
+            if (preg_match($this->yy_global_pattern4,$this->data, $yymatches, 0, $this->counter)) {
+                if (!isset($yymatches[ 0 ][1])) {
+                   $yymatches = preg_grep("/(.|\s)+/", $yymatches);
                 } else {
                     $yymatches = array_filter($yymatches);
                 }
                 if (empty($yymatches)) {
                     throw new Exception('Error: lexing failed because a rule matched' .
-                                        ' an empty string.  Input "' . substr($this->data,
-                            $this->counter, 5) . '... state LITERAL');
+                        ' an empty string.  Input "' . substr($this->data,
+                        $this->counter, 5) . '... state LITERAL');
                 }
                 next($yymatches); // skip global match
                 $this->token = key($yymatches); // token number
@@ -920,76 +912,80 @@ class Smarty_Internal_Templatelexer
                 } elseif ($r === false) {
                     $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= $this->dataLength) {
+                    if ($this->counter >=  $this->dataLength) {
                         return false; // end of input
                     }
                     // skip this token
                     continue;
-                }
-            } else {
-                throw new Exception('Unexpected input at line ' . $this->line .
-                                    ': ' . $this->data[ $this->counter ]);
+                }            } else {
+                throw new Exception('Unexpected input at line' . $this->line .
+                    ': ' . $this->data[$this->counter]);
             }
             break;
         } while (true);
-    }
 
+    } // end function
+
+
+    const LITERAL = 4;
     public function yy_r4_1()
     {
+
         $this->literal_cnt++;
         $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
-    }
-
+         }
     public function yy_r4_3()
     {
+
         if ($this->literal_cnt) {
-            $this->literal_cnt--;
+             $this->literal_cnt--;
             $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
         } else {
             $this->token = Smarty_Internal_Templateparser::TP_LITERALEND;
             $this->yypopstate();
         }
-    }
-
+         }
     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
 
+       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;
+         }
+
+     
     public function yylex5()
     {
         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)))|\G([\S\s])/isS");
+            $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)))|\G([\S\s])/isS");
         }
         if (!isset($this->dataLength)) {
             $this->dataLength = strlen($this->data);
         }
-        if ($this->counter >= $this->dataLength) {
+        if ($this->counter >=  $this->dataLength) {
             return false; // end of input
         }
+        
         do {
-            if (preg_match($this->yy_global_pattern5, $this->data, $yymatches, 0, $this->counter)) {
-                if (!isset($yymatches[ 0 ][ 1 ])) {
-                    $yymatches = preg_grep("/(.|\s)+/", $yymatches);
+            if (preg_match($this->yy_global_pattern5,$this->data, $yymatches, 0, $this->counter)) {
+                if (!isset($yymatches[ 0 ][1])) {
+                   $yymatches = preg_grep("/(.|\s)+/", $yymatches);
                 } else {
                     $yymatches = array_filter($yymatches);
                 }
                 if (empty($yymatches)) {
                     throw new Exception('Error: lexing failed because a rule matched' .
-                                        ' an empty string.  Input "' . substr($this->data,
-                            $this->counter, 5) . '... state DOUBLEQUOTEDSTRING');
+                        ' an empty string.  Input "' . substr($this->data,
+                        $this->counter, 5) . '... state DOUBLEQUOTEDSTRING');
                 }
                 next($yymatches); // skip global match
                 $this->token = key($yymatches); // token number
@@ -1007,89 +1003,93 @@ class Smarty_Internal_Templatelexer
                 } elseif ($r === false) {
                     $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= $this->dataLength) {
+                    if ($this->counter >=  $this->dataLength) {
                         return false; // end of input
                     }
                     // skip this token
                     continue;
-                }
-            } else {
-                throw new Exception('Unexpected input at line ' . $this->line .
-                                    ': ' . $this->data[ $this->counter ]);
+                }            } else {
+                throw new Exception('Unexpected input at line' . $this->line .
+                    ': ' . $this->data[$this->counter]);
             }
             break;
         } while (true);
-    }
 
+    } // end function
+
+
+    const DOUBLEQUOTEDSTRING = 5;
     public function yy_r5_1()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+         }
     public function yy_r5_3()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+         }
     public function yy_r5_5()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+         }
     public function yy_r5_7()
     {
+
         $this->yypushstate(self::TAG);
         return true;
-    }
-
+         }
     public function yy_r5_9()
     {
+
         $this->yypushstate(self::TAG);
         return true;
-    }
-
+         }
     public function yy_r5_11()
     {
+
         $this->token = Smarty_Internal_Templateparser::TP_LDEL;
         $this->taglineno = $this->line;
         $this->yypushstate(self::TAGBODY);
-    }
-
+         }
     public function yy_r5_13()
     {
+
         $this->token = Smarty_Internal_Templateparser::TP_QUOTE;
         $this->yypopstate();
-    }
-
+         }
     public function yy_r5_14()
     {
+
         $this->token = Smarty_Internal_Templateparser::TP_BACKTICK;
-        $this->value = substr($this->value, 0, -1);
+        $this->value = substr($this->value,0,-1);
         $this->yypushstate(self::TAGBODY);
         $this->taglineno = $this->line;
-    }
-
+         }
     public function yy_r5_15()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_DOLLARID;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_DOLLARID;
+         }
     public function yy_r5_16()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+         }
     public function yy_r5_17()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-    }
 
+        $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;
-    }
-}
 
-     
+        $to = $this->dataLength;
+        $this->value = substr($this->data,$this->counter,$to-$this->counter);
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+         }
+
+  }
+
+     
\ No newline at end of file
diff --git a/libs/sysplugins/smarty_internal_templateparser.php b/libs/sysplugins/smarty_internal_templateparser.php
index aaeae63b..a065c94f 100644
--- a/libs/sysplugins/smarty_internal_templateparser.php
+++ b/libs/sysplugins/smarty_internal_templateparser.php
@@ -7,1598 +7,25 @@ class TP_yyStackEntry
                      ** number for the token at this stack level */
     public $minor; /* The user-supplied minor token value.  This
                      ** is the value of the token  */
-}
+};
+
 
 // line 11 "../smarty/lexer/smarty_internal_templateparser.y"
 
 /**
- * Smarty Template Parser Class
- *
- * This is the template parser.
- * It is generated from the smarty_internal_templateparser.y file
- *
- * @author Uwe Tews <uwe.tews@googlemail.com>
- */
+* Smarty Template Parser Class
+*
+* This is the template parser.
+* It is generated from the smarty_internal_templateparser.y file
+* 
+* @author Uwe Tews <uwe.tews@googlemail.com>
+*/
 class Smarty_Internal_Templateparser
 {
-    // line 23 "../smarty/lexer/smarty_internal_templateparser.y"
-    const ERR1                      = 'Security error: Call to private object member not allowed';
-    const ERR2                      = 'Security error: Call to dynamic object member not allowed';
-    const ERR3                      = 'PHP in template not allowed. Use SmartyBC to enable it';
-    const TP_VERT                   = 1;
-    const TP_COLON                  = 2;
-    const TP_PHP                    = 3;
-    const TP_TEXT                   = 4;
-    const TP_STRIPON                = 5;
-    const TP_STRIPOFF               = 6;
-    const TP_LITERALSTART           = 7;
-    const TP_LITERALEND             = 8;
-    const TP_LITERAL                = 9;
-    const TP_SIMPELOUTPUT           = 10;
-    const TP_SIMPLETAG              = 11;
-    const TP_SMARTYBLOCKCHILDPARENT = 12;
-    const TP_LDEL                   = 13;
-    const TP_RDEL                   = 14;
-    const TP_DOLLARID               = 15;
-    const TP_EQUAL                  = 16;
-    const TP_ID                     = 17;
-    const TP_PTR                    = 18;
-    const TP_LDELMAKENOCACHE        = 19;
-    const TP_LDELIF                 = 20;
-    const TP_LDELFOR                = 21;
-    const TP_SEMICOLON              = 22;
-    const TP_INCDEC                 = 23;
-    const TP_TO                     = 24;
-    const TP_STEP                   = 25;
-    const TP_LDELFOREACH            = 26;
-    const TP_SPACE                  = 27;
-    const TP_AS                     = 28;
-    const TP_APTR                   = 29;
-    const TP_LDELSETFILTER          = 30;
-    const TP_CLOSETAG               = 31;
-    const TP_LDELSLASH              = 32;
-    const TP_ATTR                   = 33;
-    const TP_INTEGER                = 34;
-    const TP_COMMA                  = 35;
-    const TP_OPENP                  = 36;
-    const TP_CLOSEP                 = 37;
-    const TP_MATH                   = 38;
-    const TP_UNIMATH                = 39;
-    const TP_ISIN                   = 40;
-    const TP_QMARK                  = 41;
-    const TP_NOT                    = 42;
-    const TP_TYPECAST               = 43;
-    const TP_HEX                    = 44;
-    const TP_DOT                    = 45;
-    const TP_INSTANCEOF             = 46;
-    const TP_SINGLEQUOTESTRING      = 47;
-    const TP_DOUBLECOLON            = 48;
-    const TP_NAMESPACE              = 49;
-    const TP_AT                     = 50;
-    const TP_HATCH                  = 51;
-    const TP_OPENB                  = 52;
-    const TP_CLOSEB                 = 53;
-    const TP_DOLLAR                 = 54;
-    const TP_LOGOP                  = 55;
-    const TP_SLOGOP                 = 56;
-    const TP_TLOGOP                 = 57;
-    const TP_SINGLECOND             = 58;
-    const TP_ARRAYOPEN              = 59;
-    const TP_QUOTE                  = 60;
-    const TP_BACKTICK               = 61;
-    const YY_NO_ACTION              = 516;
-    const YY_ACCEPT_ACTION          = 515;
-    const YY_ERROR_ACTION           = 514;
-    const YY_SZ_ACTTAB              = 2071;
-    const YY_SHIFT_USE_DFLT         = -31;
-    const YY_SHIFT_MAX              = 230;
-    const YY_REDUCE_USE_DFLT        = -91;
-    const YY_REDUCE_MAX             = 178;
-    const YYNOCODE                  = 110;
-    const YYSTACKDEPTH              = 500;
-    const YYNSTATE                  = 327;
-    const YYNRULE                   = 187;
-    const YYERRORSYMBOL             = 62;
-    const YYERRSYMDT                = 'yy0';
-    const YYFALLBACK                = 0;
+// line 23 "../smarty/lexer/smarty_internal_templateparser.y"
 
-    public static $yy_action        = array(
-        251, 234, 237, 1, 144, 127, 428, 184, 199, 212,
-        10, 54, 19, 175, 282, 215, 109, 389, 428, 428,
-        224, 321, 223, 303, 203, 389, 13, 389, 281, 43,
-        389, 428, 41, 40, 266, 225, 389, 213, 389, 194,
-        389, 52, 4, 308, 301, 383, 34, 209, 222, 3,
-        50, 153, 251, 234, 237, 1, 199, 131, 383, 198,
-        305, 212, 10, 54, 383, 16, 199, 428, 109, 385,
-        132, 18, 224, 321, 223, 222, 221, 12, 32, 428,
-        116, 43, 385, 262, 41, 40, 266, 225, 385, 233,
-        95, 194, 16, 52, 4, 131, 301, 252, 18, 265,
-        164, 3, 50, 324, 251, 234, 237, 1, 23, 130,
-        229, 198, 150, 212, 10, 54, 326, 11, 170, 284,
-        109, 42, 22, 239, 224, 321, 223, 193, 221, 261,
-        13, 52, 157, 43, 301, 286, 41, 40, 266, 225,
-        205, 233, 5, 194, 96, 52, 4, 263, 301, 301,
-        99, 349, 96, 3, 50, 199, 251, 234, 237, 1,
-        238, 130, 241, 181, 349, 212, 10, 54, 382, 240,
-        349, 36, 109, 185, 104, 256, 224, 321, 223, 132,
-        191, 382, 13, 49, 91, 43, 12, 382, 41, 40,
-        266, 225, 257, 233, 152, 194, 457, 52, 4, 457,
-        301, 301, 228, 457, 282, 3, 50, 285, 251, 234,
-        237, 1, 301, 131, 441, 198, 238, 212, 10, 54,
-        349, 441, 325, 175, 109, 30, 349, 273, 224, 321,
-        223, 20, 221, 295, 32, 211, 457, 39, 166, 49,
-        41, 40, 266, 225, 87, 233, 205, 194, 279, 52,
-        4, 24, 301, 204, 200, 280, 99, 3, 50, 199,
-        251, 234, 237, 1, 31, 130, 96, 198, 205, 212,
-        10, 54, 350, 55, 293, 207, 109, 283, 99, 96,
-        224, 321, 223, 199, 180, 350, 13, 134, 230, 43,
-        222, 350, 41, 40, 266, 225, 104, 233, 316, 194,
-        279, 52, 4, 24, 301, 165, 284, 280, 85, 3,
-        50, 25, 251, 234, 237, 1, 131, 129, 210, 198,
-        14, 212, 10, 54, 269, 270, 301, 116, 109, 295,
-        216, 211, 224, 321, 223, 171, 221, 95, 13, 28,
-        219, 43, 323, 9, 41, 40, 266, 225, 151, 233,
-        324, 194, 52, 52, 4, 301, 301, 30, 282, 302,
-        178, 3, 50, 7, 251, 234, 237, 1, 136, 130,
-        304, 179, 238, 212, 10, 54, 279, 175, 282, 24,
-        109, 238, 429, 280, 224, 321, 223, 177, 221, 270,
-        13, 255, 281, 43, 429, 49, 41, 40, 266, 225,
-        275, 233, 318, 194, 49, 52, 4, 276, 301, 163,
-        26, 199, 8, 3, 50, 119, 251, 234, 237, 1,
-        11, 93, 291, 51, 107, 212, 10, 54, 226, 428,
-        206, 201, 109, 148, 178, 322, 224, 321, 223, 441,
-        221, 428, 13, 282, 9, 43, 441, 115, 41, 40,
-        266, 225, 167, 233, 227, 194, 457, 52, 4, 457,
-        301, 96, 158, 457, 101, 3, 50, 271, 251, 234,
-        237, 1, 282, 130, 235, 186, 135, 212, 10, 54,
-        199, 37, 119, 315, 109, 165, 284, 176, 224, 321,
-        223, 104, 221, 149, 13, 281, 146, 43, 281, 300,
-        41, 40, 266, 225, 30, 233, 289, 194, 21, 52,
-        4, 272, 301, 211, 18, 301, 161, 3, 50, 110,
-        251, 234, 237, 1, 137, 128, 282, 198, 268, 212,
-        10, 54, 222, 169, 515, 92, 109, 172, 284, 31,
-        224, 321, 223, 29, 221, 238, 6, 260, 53, 43,
-        232, 139, 41, 40, 266, 225, 154, 233, 178, 194,
-        168, 52, 4, 214, 301, 145, 99, 33, 49, 3,
-        50, 245, 208, 211, 320, 282, 90, 111, 311, 183,
-        98, 70, 309, 297, 236, 178, 95, 319, 142, 258,
-        247, 267, 249, 264, 250, 195, 231, 199, 246, 324,
-        317, 253, 254, 259, 126, 137, 133, 251, 234, 237,
-        1, 326, 290, 105, 143, 156, 212, 10, 54, 88,
-        84, 83, 484, 109, 322, 282, 37, 224, 321, 223,
-        245, 208, 211, 320, 281, 90, 111, 298, 182, 98,
-        56, 245, 298, 211, 178, 95, 103, 147, 258, 197,
-        102, 75, 141, 250, 195, 231, 95, 246, 324, 258,
-        279, 242, 89, 24, 250, 195, 231, 280, 246, 324,
-        298, 298, 298, 298, 298, 298, 298, 16, 298, 192,
-        277, 298, 298, 18, 294, 44, 45, 38, 298, 298,
-        251, 234, 237, 2, 298, 296, 298, 298, 298, 212,
-        10, 54, 310, 312, 313, 314, 109, 162, 298, 298,
-        224, 321, 223, 298, 298, 298, 294, 282, 298, 42,
-        22, 239, 251, 234, 237, 2, 298, 296, 298, 298,
-        298, 212, 10, 54, 298, 159, 298, 298, 109, 298,
-        298, 17, 224, 321, 223, 282, 298, 42, 22, 239,
-        298, 298, 245, 298, 211, 278, 298, 103, 111, 298,
-        183, 98, 70, 298, 298, 298, 298, 95, 298, 298,
-        258, 298, 292, 17, 298, 250, 195, 231, 279, 246,
-        324, 24, 298, 395, 245, 280, 211, 298, 298, 103,
-        298, 298, 197, 102, 75, 16, 298, 140, 298, 95,
-        298, 18, 258, 298, 298, 298, 298, 250, 195, 231,
-        298, 246, 324, 298, 298, 298, 298, 428, 298, 395,
-        395, 395, 202, 277, 298, 245, 298, 211, 298, 428,
-        103, 298, 298, 197, 120, 69, 395, 395, 395, 395,
-        95, 298, 298, 258, 298, 298, 298, 160, 250, 195,
-        231, 86, 246, 324, 245, 16, 211, 282, 298, 103,
-        196, 18, 197, 120, 69, 298, 44, 45, 38, 95,
-        298, 298, 258, 298, 298, 298, 178, 250, 195, 231,
-        298, 246, 324, 310, 312, 313, 314, 298, 298, 190,
-        245, 298, 211, 298, 298, 103, 298, 298, 197, 102,
-        75, 298, 298, 298, 298, 95, 298, 298, 258, 298,
-        298, 298, 298, 250, 195, 231, 298, 246, 324, 298,
-        298, 298, 245, 298, 211, 298, 199, 100, 298, 288,
-        197, 120, 47, 298, 106, 298, 298, 95, 298, 353,
-        258, 155, 298, 218, 298, 250, 195, 231, 298, 246,
-        324, 282, 16, 42, 22, 239, 298, 245, 18, 211,
-        298, 428, 103, 298, 298, 197, 120, 69, 298, 298,
-        298, 298, 95, 428, 298, 258, 298, 298, 298, 298,
-        250, 195, 231, 298, 246, 324, 245, 298, 211, 298,
-        298, 100, 189, 298, 197, 120, 59, 245, 207, 211,
-        298, 95, 103, 298, 258, 197, 120, 81, 298, 250,
-        195, 231, 95, 246, 324, 258, 298, 298, 298, 298,
-        250, 195, 231, 298, 246, 324, 298, 245, 298, 211,
-        298, 298, 103, 298, 298, 197, 120, 80, 298, 298,
-        298, 298, 95, 298, 298, 258, 298, 298, 298, 298,
-        250, 195, 231, 298, 246, 324, 245, 298, 211, 298,
-        298, 103, 298, 298, 197, 120, 67, 245, 298, 211,
-        298, 95, 103, 298, 258, 197, 120, 57, 298, 250,
-        195, 231, 95, 246, 324, 258, 298, 298, 298, 298,
-        250, 195, 231, 298, 246, 324, 298, 245, 298, 211,
-        298, 298, 103, 298, 298, 197, 120, 58, 298, 298,
-        298, 298, 95, 298, 298, 258, 298, 298, 298, 298,
-        250, 195, 231, 298, 246, 324, 245, 298, 211, 298,
-        298, 103, 298, 298, 197, 120, 82, 245, 298, 211,
-        298, 95, 103, 298, 258, 197, 97, 76, 298, 250,
-        195, 231, 95, 246, 324, 258, 298, 298, 298, 298,
-        250, 195, 231, 298, 246, 324, 298, 245, 298, 211,
-        298, 298, 103, 298, 298, 197, 120, 71, 298, 298,
-        298, 298, 95, 298, 298, 258, 298, 298, 298, 298,
-        250, 195, 231, 298, 246, 324, 245, 298, 211, 298,
-        298, 103, 298, 298, 187, 120, 61, 245, 298, 211,
-        298, 95, 103, 298, 258, 197, 120, 63, 298, 250,
-        195, 231, 95, 246, 324, 258, 298, 298, 298, 298,
-        250, 195, 231, 298, 246, 324, 298, 245, 298, 211,
-        298, 298, 103, 298, 298, 197, 94, 79, 298, 298,
-        298, 298, 95, 298, 298, 258, 298, 298, 298, 298,
-        250, 195, 231, 298, 246, 324, 245, 298, 211, 298,
-        298, 103, 298, 298, 197, 120, 59, 245, 298, 211,
-        298, 95, 103, 298, 258, 197, 120, 77, 298, 250,
-        195, 231, 95, 246, 324, 258, 298, 298, 298, 298,
-        250, 195, 231, 298, 246, 324, 298, 245, 298, 211,
-        298, 298, 103, 298, 298, 188, 108, 64, 298, 298,
-        298, 298, 95, 298, 298, 258, 298, 298, 298, 298,
-        250, 195, 231, 298, 246, 324, 245, 298, 211, 298,
-        298, 103, 298, 298, 197, 120, 65, 245, 298, 211,
-        298, 95, 103, 298, 258, 197, 97, 66, 298, 250,
-        195, 231, 95, 246, 324, 258, 298, 298, 298, 298,
-        250, 195, 231, 298, 246, 324, 298, 245, 298, 211,
-        298, 298, 103, 298, 298, 197, 120, 68, 298, 298,
-        298, 298, 95, 298, 298, 258, 298, 298, 298, 298,
-        250, 195, 231, 298, 246, 324, 245, 298, 211, 298,
-        298, 103, 298, 298, 197, 120, 62, 245, 298, 211,
-        298, 95, 103, 298, 258, 197, 120, 60, 298, 250,
-        195, 231, 95, 246, 324, 258, 298, 298, 298, 298,
-        250, 195, 231, 298, 246, 324, 298, 245, 298, 211,
-        298, 298, 103, 298, 298, 197, 120, 74, 298, 298,
-        298, 298, 95, 298, 298, 258, 298, 298, 298, 298,
-        250, 195, 231, 298, 246, 324, 245, 298, 211, 298,
-        298, 103, 298, 298, 197, 120, 72, 245, 298, 211,
-        298, 95, 103, 298, 258, 197, 120, 48, 298, 250,
-        195, 231, 95, 246, 324, 258, 298, 298, 298, 298,
-        250, 195, 231, 298, 246, 324, 298, 245, 298, 211,
-        298, 298, 103, 298, 298, 197, 120, 46, 298, 298,
-        298, 298, 95, 298, 298, 258, 298, 298, 298, 298,
-        250, 195, 231, 298, 246, 324, 245, 298, 211, 298,
-        298, 103, 298, 298, 197, 120, 78, 245, 298, 211,
-        298, 95, 103, 298, 258, 197, 120, 73, 298, 250,
-        195, 231, 95, 246, 324, 258, 298, 298, 298, 298,
-        250, 195, 231, 298, 246, 324, 298, 245, 298, 211,
-        298, 298, 103, 298, 298, 197, 125, 298, 298, 298,
-        298, 298, 95, 298, 298, 298, 298, 298, 298, 244,
-        250, 195, 231, 298, 246, 324, 245, 298, 211, 298,
-        298, 103, 298, 298, 197, 114, 298, 245, 298, 211,
-        298, 95, 103, 298, 298, 197, 122, 298, 243, 250,
-        195, 231, 95, 246, 324, 298, 298, 298, 298, 298,
-        250, 195, 231, 298, 246, 324, 298, 245, 298, 211,
-        298, 298, 103, 298, 298, 197, 117, 298, 298, 298,
-        298, 298, 95, 298, 298, 298, 298, 298, 298, 298,
-        250, 195, 231, 298, 246, 324, 245, 298, 211, 298,
-        298, 103, 298, 298, 197, 121, 298, 245, 298, 211,
-        298, 95, 103, 298, 298, 197, 124, 298, 298, 250,
-        195, 231, 95, 246, 324, 298, 298, 298, 298, 298,
-        250, 195, 231, 298, 246, 324, 298, 245, 298, 211,
-        298, 298, 103, 298, 298, 197, 118, 298, 298, 298,
-        298, 298, 95, 298, 298, 298, 298, 298, 298, 298,
-        250, 195, 231, 298, 246, 324, 245, 298, 211, 298,
-        298, 103, 298, 298, 197, 123, 298, 245, 298, 211,
-        298, 95, 103, 298, 298, 197, 113, 298, 298, 250,
-        195, 231, 95, 246, 324, 298, 298, 298, 298, 298,
-        250, 195, 231, 220, 246, 324, 298, 27, 298, 16,
-        298, 457, 298, 298, 457, 18, 298, 26, 457, 441,
-        44, 45, 38, 217, 44, 45, 38, 298, 298, 298,
-        298, 298, 298, 298, 298, 298, 298, 310, 312, 313,
-        314, 310, 312, 313, 314, 298, 441, 298, 298, 441,
-        298, 457, 220, 441, 457, 298, 298, 457, 298, 298,
-        457, 457, 441, 457, 298, 298, 220, 457, 441, 298,
-        298, 298, 298, 298, 457, 298, 298, 457, 298, 298,
-        5, 457, 441, 298, 298, 298, 298, 298, 298, 441,
-        298, 298, 441, 298, 457, 441, 441, 298, 441, 298,
-        457, 298, 441, 306, 298, 298, 298, 298, 298, 441,
-        298, 298, 441, 298, 457, 220, 441, 298, 298, 298,
-        298, 298, 298, 457, 298, 298, 457, 298, 298, 15,
-        457, 441, 35, 274, 44, 45, 38, 457, 298, 298,
-        457, 298, 298, 298, 457, 441, 298, 298, 298, 298,
-        298, 310, 312, 313, 314, 298, 298, 298, 441, 298,
-        298, 441, 298, 457, 298, 441, 287, 298, 44, 45,
-        38, 298, 441, 298, 298, 441, 298, 457, 298, 441,
-        248, 298, 298, 298, 298, 310, 312, 313, 314, 298,
-        44, 45, 38, 298, 298, 112, 298, 44, 45, 38,
-        298, 173, 298, 298, 44, 45, 38, 310, 312, 313,
-        314, 44, 45, 38, 310, 312, 313, 314, 298, 298,
-        299, 310, 312, 313, 314, 44, 45, 38, 310, 312,
-        313, 314, 174, 298, 298, 298, 138, 298, 298, 298,
-        298, 298, 310, 312, 313, 314, 44, 45, 38, 298,
-        298, 298, 44, 45, 38, 298, 44, 45, 38, 298,
-        44, 45, 38, 310, 312, 313, 314, 307, 298, 310,
-        312, 313, 314, 310, 312, 313, 314, 310, 312, 313,
-        314,
-    );
-
-    public static $yy_lookahead     = array(
-        10, 11, 12, 13, 74, 15, 36, 17, 1, 19,
-        20, 21, 29, 103, 84, 45, 26, 14, 48, 36,
-        30, 31, 32, 53, 34, 22, 36, 24, 98, 39,
-        27, 48, 42, 43, 44, 45, 33, 47, 35, 49,
-        37, 51, 52, 53, 54, 14, 16, 16, 45, 59,
-        60, 96, 10, 11, 12, 13, 1, 15, 27, 17,
-        53, 19, 20, 21, 33, 27, 1, 36, 26, 14,
-        45, 33, 30, 31, 32, 45, 34, 52, 36, 48,
-        72, 39, 27, 75, 42, 43, 44, 45, 33, 47,
-        82, 49, 27, 51, 52, 15, 54, 17, 33, 91,
-        83, 59, 60, 95, 10, 11, 12, 13, 13, 15,
-        15, 17, 17, 19, 20, 21, 97, 35, 99, 100,
-        26, 86, 87, 88, 30, 31, 32, 66, 34, 49,
-        36, 51, 96, 39, 54, 53, 42, 43, 44, 45,
-        72, 47, 16, 49, 18, 51, 52, 79, 54, 54,
-        82, 14, 18, 59, 60, 1, 10, 11, 12, 13,
-        23, 15, 15, 17, 27, 19, 20, 21, 14, 17,
-        33, 13, 26, 15, 48, 17, 30, 31, 32, 45,
-        34, 27, 36, 46, 83, 39, 52, 33, 42, 43,
-        44, 45, 34, 47, 74, 49, 10, 51, 52, 13,
-        54, 54, 50, 17, 84, 59, 60, 14, 10, 11,
-        12, 13, 54, 15, 45, 17, 23, 19, 20, 21,
-        27, 52, 100, 103, 26, 35, 33, 37, 30, 31,
-        32, 22, 34, 67, 36, 69, 50, 39, 83, 46,
-        42, 43, 44, 45, 35, 47, 72, 49, 10, 51,
-        52, 13, 54, 79, 80, 17, 82, 59, 60, 1,
-        10, 11, 12, 13, 16, 15, 18, 17, 72, 19,
-        20, 21, 14, 107, 108, 79, 26, 71, 82, 18,
-        30, 31, 32, 1, 34, 27, 36, 15, 50, 39,
-        45, 33, 42, 43, 44, 45, 48, 47, 53, 49,
-        10, 51, 52, 13, 54, 99, 100, 17, 36, 59,
-        60, 29, 10, 11, 12, 13, 15, 15, 17, 17,
-        13, 19, 20, 21, 8, 9, 54, 72, 26, 67,
-        75, 69, 30, 31, 32, 78, 34, 82, 36, 24,
-        50, 39, 17, 36, 42, 43, 44, 45, 74, 47,
-        95, 49, 51, 51, 52, 54, 54, 35, 84, 37,
-        103, 59, 60, 36, 10, 11, 12, 13, 74, 15,
-        108, 17, 23, 19, 20, 21, 10, 103, 84, 13,
-        26, 23, 36, 17, 30, 31, 32, 7, 34, 9,
-        36, 17, 98, 39, 48, 46, 42, 43, 44, 45,
-        17, 47, 53, 49, 46, 51, 52, 93, 54, 78,
-        16, 1, 36, 59, 60, 101, 10, 11, 12, 13,
-        35, 15, 37, 17, 48, 19, 20, 21, 18, 36,
-        65, 66, 26, 74, 103, 104, 30, 31, 32, 45,
-        34, 48, 36, 84, 36, 39, 52, 17, 42, 43,
-        44, 45, 15, 47, 17, 49, 10, 51, 52, 13,
-        54, 18, 74, 17, 82, 59, 60, 34, 10, 11,
-        12, 13, 84, 15, 93, 17, 15, 19, 20, 21,
-        1, 2, 101, 101, 26, 99, 100, 17, 30, 31,
-        32, 48, 34, 96, 36, 98, 96, 39, 98, 71,
-        42, 43, 44, 45, 35, 47, 37, 49, 27, 51,
-        52, 67, 54, 69, 33, 54, 74, 59, 60, 17,
-        10, 11, 12, 13, 96, 15, 84, 17, 34, 19,
-        20, 21, 45, 78, 63, 64, 26, 99, 100, 16,
-        30, 31, 32, 16, 34, 23, 36, 17, 17, 39,
-        23, 51, 42, 43, 44, 45, 72, 47, 103, 49,
-        78, 51, 52, 17, 54, 74, 82, 41, 46, 59,
-        60, 67, 68, 69, 70, 84, 72, 73, 53, 75,
-        76, 77, 53, 61, 15, 103, 82, 14, 51, 85,
-        14, 37, 17, 8, 90, 91, 92, 1, 94, 95,
-        3, 4, 5, 6, 7, 96, 82, 10, 11, 12,
-        13, 97, 84, 81, 96, 74, 19, 20, 21, 78,
-        82, 82, 1, 26, 104, 84, 2, 30, 31, 32,
-        67, 68, 69, 70, 98, 72, 73, 109, 75, 76,
-        77, 67, 109, 69, 103, 82, 72, 96, 85, 75,
-        76, 77, 96, 90, 91, 92, 82, 94, 95, 85,
-        10, 14, 96, 13, 90, 91, 92, 17, 94, 95,
-        109, 109, 109, 109, 109, 109, 109, 27, 109, 105,
-        106, 109, 109, 33, 4, 38, 39, 40, 109, 109,
-        10, 11, 12, 13, 109, 15, 109, 109, 109, 19,
-        20, 21, 55, 56, 57, 58, 26, 74, 109, 109,
-        30, 31, 32, 109, 109, 109, 4, 84, 109, 86,
-        87, 88, 10, 11, 12, 13, 109, 15, 109, 109,
-        109, 19, 20, 21, 109, 74, 109, 109, 26, 109,
-        60, 61, 30, 31, 32, 84, 109, 86, 87, 88,
-        109, 109, 67, 109, 69, 70, 109, 72, 73, 109,
-        75, 76, 77, 109, 109, 109, 109, 82, 109, 109,
-        85, 109, 60, 61, 109, 90, 91, 92, 10, 94,
-        95, 13, 109, 2, 67, 17, 69, 109, 109, 72,
-        109, 109, 75, 76, 77, 27, 109, 29, 109, 82,
-        109, 33, 85, 109, 109, 109, 109, 90, 91, 92,
-        109, 94, 95, 109, 109, 109, 109, 36, 109, 38,
-        39, 40, 105, 106, 109, 67, 109, 69, 109, 48,
-        72, 109, 109, 75, 76, 77, 55, 56, 57, 58,
-        82, 109, 109, 85, 109, 109, 109, 74, 90, 91,
-        92, 78, 94, 95, 67, 27, 69, 84, 109, 72,
-        102, 33, 75, 76, 77, 109, 38, 39, 40, 82,
-        109, 109, 85, 109, 109, 109, 103, 90, 91, 92,
-        109, 94, 95, 55, 56, 57, 58, 109, 109, 102,
-        67, 109, 69, 109, 109, 72, 109, 109, 75, 76,
-        77, 109, 109, 109, 109, 82, 109, 109, 85, 109,
-        109, 109, 109, 90, 91, 92, 109, 94, 95, 109,
-        109, 109, 67, 109, 69, 109, 1, 72, 109, 106,
-        75, 76, 77, 109, 79, 109, 109, 82, 109, 14,
-        85, 74, 109, 18, 109, 90, 91, 92, 109, 94,
-        95, 84, 27, 86, 87, 88, 109, 67, 33, 69,
-        109, 36, 72, 109, 109, 75, 76, 77, 109, 109,
-        109, 109, 82, 48, 109, 85, 109, 109, 109, 109,
-        90, 91, 92, 109, 94, 95, 67, 109, 69, 109,
-        109, 72, 102, 109, 75, 76, 77, 67, 79, 69,
-        109, 82, 72, 109, 85, 75, 76, 77, 109, 90,
-        91, 92, 82, 94, 95, 85, 109, 109, 109, 109,
-        90, 91, 92, 109, 94, 95, 109, 67, 109, 69,
-        109, 109, 72, 109, 109, 75, 76, 77, 109, 109,
-        109, 109, 82, 109, 109, 85, 109, 109, 109, 109,
-        90, 91, 92, 109, 94, 95, 67, 109, 69, 109,
-        109, 72, 109, 109, 75, 76, 77, 67, 109, 69,
-        109, 82, 72, 109, 85, 75, 76, 77, 109, 90,
-        91, 92, 82, 94, 95, 85, 109, 109, 109, 109,
-        90, 91, 92, 109, 94, 95, 109, 67, 109, 69,
-        109, 109, 72, 109, 109, 75, 76, 77, 109, 109,
-        109, 109, 82, 109, 109, 85, 109, 109, 109, 109,
-        90, 91, 92, 109, 94, 95, 67, 109, 69, 109,
-        109, 72, 109, 109, 75, 76, 77, 67, 109, 69,
-        109, 82, 72, 109, 85, 75, 76, 77, 109, 90,
-        91, 92, 82, 94, 95, 85, 109, 109, 109, 109,
-        90, 91, 92, 109, 94, 95, 109, 67, 109, 69,
-        109, 109, 72, 109, 109, 75, 76, 77, 109, 109,
-        109, 109, 82, 109, 109, 85, 109, 109, 109, 109,
-        90, 91, 92, 109, 94, 95, 67, 109, 69, 109,
-        109, 72, 109, 109, 75, 76, 77, 67, 109, 69,
-        109, 82, 72, 109, 85, 75, 76, 77, 109, 90,
-        91, 92, 82, 94, 95, 85, 109, 109, 109, 109,
-        90, 91, 92, 109, 94, 95, 109, 67, 109, 69,
-        109, 109, 72, 109, 109, 75, 76, 77, 109, 109,
-        109, 109, 82, 109, 109, 85, 109, 109, 109, 109,
-        90, 91, 92, 109, 94, 95, 67, 109, 69, 109,
-        109, 72, 109, 109, 75, 76, 77, 67, 109, 69,
-        109, 82, 72, 109, 85, 75, 76, 77, 109, 90,
-        91, 92, 82, 94, 95, 85, 109, 109, 109, 109,
-        90, 91, 92, 109, 94, 95, 109, 67, 109, 69,
-        109, 109, 72, 109, 109, 75, 76, 77, 109, 109,
-        109, 109, 82, 109, 109, 85, 109, 109, 109, 109,
-        90, 91, 92, 109, 94, 95, 67, 109, 69, 109,
-        109, 72, 109, 109, 75, 76, 77, 67, 109, 69,
-        109, 82, 72, 109, 85, 75, 76, 77, 109, 90,
-        91, 92, 82, 94, 95, 85, 109, 109, 109, 109,
-        90, 91, 92, 109, 94, 95, 109, 67, 109, 69,
-        109, 109, 72, 109, 109, 75, 76, 77, 109, 109,
-        109, 109, 82, 109, 109, 85, 109, 109, 109, 109,
-        90, 91, 92, 109, 94, 95, 67, 109, 69, 109,
-        109, 72, 109, 109, 75, 76, 77, 67, 109, 69,
-        109, 82, 72, 109, 85, 75, 76, 77, 109, 90,
-        91, 92, 82, 94, 95, 85, 109, 109, 109, 109,
-        90, 91, 92, 109, 94, 95, 109, 67, 109, 69,
-        109, 109, 72, 109, 109, 75, 76, 77, 109, 109,
-        109, 109, 82, 109, 109, 85, 109, 109, 109, 109,
-        90, 91, 92, 109, 94, 95, 67, 109, 69, 109,
-        109, 72, 109, 109, 75, 76, 77, 67, 109, 69,
-        109, 82, 72, 109, 85, 75, 76, 77, 109, 90,
-        91, 92, 82, 94, 95, 85, 109, 109, 109, 109,
-        90, 91, 92, 109, 94, 95, 109, 67, 109, 69,
-        109, 109, 72, 109, 109, 75, 76, 77, 109, 109,
-        109, 109, 82, 109, 109, 85, 109, 109, 109, 109,
-        90, 91, 92, 109, 94, 95, 67, 109, 69, 109,
-        109, 72, 109, 109, 75, 76, 77, 67, 109, 69,
-        109, 82, 72, 109, 85, 75, 76, 77, 109, 90,
-        91, 92, 82, 94, 95, 85, 109, 109, 109, 109,
-        90, 91, 92, 109, 94, 95, 109, 67, 109, 69,
-        109, 109, 72, 109, 109, 75, 76, 109, 109, 109,
-        109, 109, 82, 109, 109, 109, 109, 109, 109, 89,
-        90, 91, 92, 109, 94, 95, 67, 109, 69, 109,
-        109, 72, 109, 109, 75, 76, 109, 67, 109, 69,
-        109, 82, 72, 109, 109, 75, 76, 109, 89, 90,
-        91, 92, 82, 94, 95, 109, 109, 109, 109, 109,
-        90, 91, 92, 109, 94, 95, 109, 67, 109, 69,
-        109, 109, 72, 109, 109, 75, 76, 109, 109, 109,
-        109, 109, 82, 109, 109, 109, 109, 109, 109, 109,
-        90, 91, 92, 109, 94, 95, 67, 109, 69, 109,
-        109, 72, 109, 109, 75, 76, 109, 67, 109, 69,
-        109, 82, 72, 109, 109, 75, 76, 109, 109, 90,
-        91, 92, 82, 94, 95, 109, 109, 109, 109, 109,
-        90, 91, 92, 109, 94, 95, 109, 67, 109, 69,
-        109, 109, 72, 109, 109, 75, 76, 109, 109, 109,
-        109, 109, 82, 109, 109, 109, 109, 109, 109, 109,
-        90, 91, 92, 109, 94, 95, 67, 109, 69, 109,
-        109, 72, 109, 109, 75, 76, 109, 67, 109, 69,
-        109, 82, 72, 109, 109, 75, 76, 109, 109, 90,
-        91, 92, 82, 94, 95, 109, 109, 109, 109, 109,
-        90, 91, 92, 2, 94, 95, 109, 25, 109, 27,
-        109, 10, 109, 109, 13, 33, 109, 16, 17, 18,
-        38, 39, 40, 37, 38, 39, 40, 109, 109, 109,
-        109, 109, 109, 109, 109, 109, 109, 55, 56, 57,
-        58, 55, 56, 57, 58, 109, 45, 109, 109, 48,
-        109, 50, 2, 52, 10, 109, 109, 13, 109, 109,
-        10, 17, 18, 13, 109, 109, 2, 17, 18, 109,
-        109, 109, 109, 109, 10, 109, 109, 13, 109, 109,
-        16, 17, 18, 109, 109, 109, 109, 109, 109, 45,
-        109, 109, 48, 109, 50, 45, 52, 109, 48, 109,
-        50, 109, 52, 53, 109, 109, 109, 109, 109, 45,
-        109, 109, 48, 109, 50, 2, 52, 109, 109, 109,
-        109, 109, 109, 10, 109, 109, 13, 109, 109, 2,
-        17, 18, 2, 37, 38, 39, 40, 10, 109, 109,
-        13, 109, 109, 109, 17, 18, 109, 109, 109, 109,
-        109, 55, 56, 57, 58, 109, 109, 109, 45, 109,
-        109, 48, 109, 50, 109, 52, 14, 109, 38, 39,
-        40, 109, 45, 109, 109, 48, 109, 50, 109, 52,
-        14, 109, 109, 109, 109, 55, 56, 57, 58, 109,
-        38, 39, 40, 109, 109, 22, 109, 38, 39, 40,
-        109, 14, 109, 109, 38, 39, 40, 55, 56, 57,
-        58, 38, 39, 40, 55, 56, 57, 58, 109, 109,
-        61, 55, 56, 57, 58, 38, 39, 40, 55, 56,
-        57, 58, 14, 109, 109, 109, 28, 109, 109, 109,
-        109, 109, 55, 56, 57, 58, 38, 39, 40, 109,
-        109, 109, 38, 39, 40, 109, 38, 39, 40, 109,
-        38, 39, 40, 55, 56, 57, 58, 53, 109, 55,
-        56, 57, 58, 55, 56, 57, 58, 55, 56, 57,
-        58,
-    );
-
-    public static $yy_shift_ofst    = array(
-        -31, 406, 406, 458, 458, 94, 510, 94, 94, 94,
-        510, 458, -10, 94, 94, 354, 146, 94, 94, 94,
-        94, 146, 94, 94, 94, 94, 250, 94, 94, 94,
-        94, 94, 94, 302, 94, 94, 94, 198, 42, 42,
-        42, 42, 42, 42, 42, 42, 1772, 828, 828, 80,
-        712, 925, 301, 65, 272, 680, 1942, 1920, 1886, 1776,
-        647, 1949, 1977, 2008, 2004, 1963, 1998, 1956, 2012, 2012,
-        2012, 2012, 2012, 2012, 2012, 2012, 2012, 2012, 2012, 2012,
-        2012, 2012, 2012, 768, 650, 272, 65, 272, 65, 134,
-        126, 479, 597, 1854, 154, 290, 95, 55, 258, 366,
-        248, 366, 282, 443, 437, 38, 38, 437, 7, 481,
-        410, 38, 461, 621, 596, 596, 261, 596, 596, 261,
-        596, 596, 596, 596, 596, -31, -31, 1840, 1791, 1917,
-        1903, 1834, 158, 238, 394, 446, 38, 25, 147, 169,
-        147, 25, 169, 25, 38, 38, 25, 25, 38, 25,
-        307, 38, 38, 25, 527, 38, 38, 25, 38, 38,
-        38, 38, 38, 596, 624, 261, 624, 327, 596, 596,
-        261, 596, 261, -31, -31, -31, -31, -31, -31, 781,
-        3, 31, 193, 137, -30, 186, -17, 522, 349, 469,
-        322, 30, 82, 316, 346, 376, 190, 358, 393, 152,
-        209, 380, 385, 245, 315, 523, 585, 554, 576, 575,
-        537, 573, 569, 529, 525, 546, 500, 526, 531, 325,
-        530, 487, 494, 502, 470, 433, 430, 408, 383, 327,
-        374,
-    );
-
-    public static $yy_reduce_ofst   = array(
-        471, 504, 563, 717, 574, 685, 919, 890, 787, 758,
-        855, 823, 1240, 1199, 1140, 1100, 1070, 1129, 1170, 1210,
-        1269, 1280, 1310, 1339, 1350, 1380, 1409, 1420, 1450, 1479,
-        1490, 1059, 1030, 1000, 930, 960, 989, 1520, 1549, 1700,
-        1619, 1689, 1660, 1630, 1590, 1560, 633, 661, 867, 8,
-        166, 773, 255, 541, 174, 262, 35, 35, 35, 35,
-        35, 35, 35, 35, 35, 35, 35, 35, 35, 35,
-        35, 35, 35, 35, 35, 35, 35, 35, 35, 35,
-        35, 35, 35, 294, -70, 196, 120, 68, 274, 19,
-        206, 331, 444, 428, 257, 400, 382, 257, 257, 400,
-        386, 397, 257, 386, 381, 388, 359, 314, 257, 442,
-        482, 491, 484, 257, 257, 455, 386, 257, 257, 438,
-        257, 257, 257, 257, 257, 257, 365, 509, 509, 509,
-        509, 509, 524, 536, 509, 509, 528, 514, 539, 551,
-        538, 514, 556, 514, 528, 528, 514, 514, 528, 514,
-        518, 528, 528, 514, 532, 528, 528, 514, 528, 528,
-        528, 528, 528, -90, 520, 122, 520, 566, -90, -90,
-        122, -90, 122, -45, 36, 155, 101, 61, 17,
-    );
-
-    public static $yyExpectedTokens = array(
-        array(),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 53, 54, 59,
-            60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(25, 27, 33, 38, 39, 40, 55, 56, 57, 58,),
-        array(27, 33, 38, 39, 40, 55, 56, 57, 58,),
-        array(27, 33, 38, 39, 40, 55, 56, 57, 58,),
-        array(15, 17, 49, 51, 54,),
-        array(4, 10, 11, 12, 13, 15, 19, 20, 21, 26, 30, 31, 32, 60, 61,),
-        array(1, 14, 18, 27, 33, 36, 48,),
-        array(15, 17, 51, 54,),
-        array(1, 27, 33,),
-        array(15, 36, 54,),
-        array(4, 10, 11, 12, 13, 15, 19, 20, 21, 26, 30, 31, 32, 60, 61,),
-        array(14, 38, 39, 40, 55, 56, 57, 58,),
-        array(2, 38, 39, 40, 55, 56, 57, 58,),
-        array(37, 38, 39, 40, 55, 56, 57, 58,),
-        array(37, 38, 39, 40, 55, 56, 57, 58,),
-        array(14, 38, 39, 40, 55, 56, 57, 58,),
-        array(38, 39, 40, 55, 56, 57, 58, 61,),
-        array(14, 38, 39, 40, 55, 56, 57, 58,),
-        array(14, 38, 39, 40, 55, 56, 57, 58,),
-        array(38, 39, 40, 53, 55, 56, 57, 58,),
-        array(22, 38, 39, 40, 55, 56, 57, 58,),
-        array(28, 38, 39, 40, 55, 56, 57, 58,),
-        array(14, 38, 39, 40, 55, 56, 57, 58,),
-        array(38, 39, 40, 55, 56, 57, 58,),
-        array(38, 39, 40, 55, 56, 57, 58,),
-        array(38, 39, 40, 55, 56, 57, 58,),
-        array(38, 39, 40, 55, 56, 57, 58,),
-        array(38, 39, 40, 55, 56, 57, 58,),
-        array(38, 39, 40, 55, 56, 57, 58,),
-        array(38, 39, 40, 55, 56, 57, 58,),
-        array(38, 39, 40, 55, 56, 57, 58,),
-        array(38, 39, 40, 55, 56, 57, 58,),
-        array(38, 39, 40, 55, 56, 57, 58,),
-        array(38, 39, 40, 55, 56, 57, 58,),
-        array(38, 39, 40, 55, 56, 57, 58,),
-        array(38, 39, 40, 55, 56, 57, 58,),
-        array(38, 39, 40, 55, 56, 57, 58,),
-        array(38, 39, 40, 55, 56, 57, 58,),
-        array(10, 13, 17, 27, 29, 33,),
-        array(10, 13, 17, 27, 33,),
-        array(15, 36, 54,),
-        array(1, 27, 33,),
-        array(15, 36, 54,),
-        array(1, 27, 33,),
-        array(18, 45, 52,),
-        array(16, 18, 48,),
-        array(1, 2,),
-        array(3, 4, 5, 6, 7, 10, 11, 12, 13, 19, 20, 21, 26, 30, 31, 32,),
-        array(2, 10, 13, 16, 17, 18, 45, 48, 50, 52,),
-        array(1, 14, 27, 33,),
-        array(10, 13, 17, 50,),
-        array(13, 15, 17, 54,),
-        array(1, 14, 27, 33,),
-        array(1, 14, 27, 33,),
-        array(10, 13, 17,),
-        array(16, 18, 48,),
-        array(10, 13, 17,),
-        array(1, 29,),
-        array(18, 48,),
-        array(15, 17,),
-        array(27, 33,),
-        array(27, 33,),
-        array(15, 17,),
-        array(1, 53,),
-        array(27, 33,),
-        array(1, 18,),
-        array(27, 33,),
-        array(15, 54,),
-        array(1,),
-        array(1,),
-        array(1,),
-        array(18,),
-        array(1,),
-        array(1,),
-        array(18,),
-        array(1,),
-        array(1,),
-        array(1,),
-        array(1,),
-        array(1,),
-        array(),
-        array(),
-        array(2, 10, 13, 17, 18, 45, 48, 50, 52, 53,),
-        array(2, 10, 13, 16, 17, 18, 45, 48, 50, 52,),
-        array(2, 10, 13, 17, 18, 45, 48, 50, 52,),
-        array(2, 10, 13, 17, 18, 45, 48, 50, 52,),
-        array(10, 13, 17, 18, 45, 48, 50, 52,),
-        array(13, 15, 17, 34, 54,),
-        array(10, 13, 17, 50,),
-        array(16, 45, 52,),
-        array(10, 13, 17,),
-        array(27, 33,),
-        array(45, 52,),
-        array(15, 54,),
-        array(45, 52,),
-        array(15, 54,),
-        array(45, 52,),
-        array(45, 52,),
-        array(45, 52,),
-        array(27, 33,),
-        array(27, 33,),
-        array(45, 52,),
-        array(45, 52,),
-        array(27, 33,),
-        array(45, 52,),
-        array(13, 36,),
-        array(27, 33,),
-        array(27, 33,),
-        array(45, 52,),
-        array(16, 23,),
-        array(27, 33,),
-        array(27, 33,),
-        array(45, 52,),
-        array(27, 33,),
-        array(27, 33,),
-        array(27, 33,),
-        array(27, 33,),
-        array(27, 33,),
-        array(1,),
-        array(2,),
-        array(18,),
-        array(2,),
-        array(36,),
-        array(1,),
-        array(1,),
-        array(18,),
-        array(1,),
-        array(18,),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(2, 36, 38, 39, 40, 48, 55, 56, 57, 58,),
-        array(14, 22, 24, 27, 33, 35, 37, 45,),
-        array(14, 16, 27, 33, 36, 48,),
-        array(14, 23, 27, 33, 46,),
-        array(14, 23, 27, 33, 46,),
-        array(36, 45, 48, 53,),
-        array(10, 13, 17, 50,),
-        array(29, 36, 48,),
-        array(23, 46, 61,),
-        array(23, 46, 53,),
-        array(35, 37,),
-        array(35, 37,),
-        array(16, 45,),
-        array(35, 53,),
-        array(8, 9,),
-        array(36, 48,),
-        array(36, 48,),
-        array(35, 37,),
-        array(23, 46,),
-        array(36, 48,),
-        array(17, 50,),
-        array(22, 35,),
-        array(7, 9,),
-        array(35, 37,),
-        array(45, 53,),
-        array(24,),
-        array(16,),
-        array(8,),
-        array(37,),
-        array(14,),
-        array(17,),
-        array(51,),
-        array(14,),
-        array(15,),
-        array(53,),
-        array(53,),
-        array(17,),
-        array(51,),
-        array(41,),
-        array(17,),
-        array(17,),
-        array(17,),
-        array(45,),
-        array(34,),
-        array(17,),
-        array(17,),
-        array(34,),
-        array(17,),
-        array(36,),
-        array(17,),
-        array(36,),
-        array(17,),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-    );
-
-    public static $yy_default       = array(
-        338, 514, 514, 499, 499, 514, 514, 476, 476, 476,
-        514, 514, 514, 514, 514, 514, 514, 514, 514, 514,
-        514, 514, 514, 514, 514, 514, 514, 514, 514, 514,
-        514, 514, 514, 514, 514, 514, 514, 514, 514, 514,
-        514, 514, 514, 514, 514, 514, 379, 358, 379, 514,
-        514, 415, 514, 379, 514, 514, 351, 514, 514, 514,
-        514, 514, 514, 514, 514, 514, 384, 514, 399, 475,
-        351, 403, 390, 474, 500, 502, 384, 501, 363, 381,
-        404, 386, 391, 379, 379, 514, 379, 514, 379, 489,
-        431, 370, 327, 430, 393, 441, 514, 393, 393, 441,
-        431, 441, 393, 431, 514, 379, 360, 514, 393, 379,
-        373, 379, 514, 406, 402, 375, 431, 396, 398, 486,
-        393, 408, 397, 407, 406, 483, 336, 430, 430, 430,
-        430, 430, 514, 443, 457, 441, 367, 438, 514, 436,
-        514, 435, 434, 466, 368, 348, 439, 437, 361, 467,
-        441, 356, 354, 468, 514, 366, 355, 469, 362, 359,
-        352, 369, 365, 371, 478, 463, 477, 441, 374, 376,
-        490, 424, 487, 441, 441, 482, 482, 336, 482, 415,
-        411, 415, 405, 405, 415, 442, 415, 405, 405, 514,
-        514, 411, 514, 514, 425, 514, 514, 405, 415, 514,
-        514, 334, 514, 411, 387, 514, 514, 514, 514, 514,
-        514, 514, 514, 420, 514, 514, 514, 417, 514, 514,
-        514, 411, 413, 514, 514, 514, 514, 488, 514, 457,
-        514, 421, 364, 420, 340, 422, 357, 341, 409, 400,
-        480, 457, 462, 401, 485, 423, 426, 342, 447, 380,
-        416, 339, 428, 329, 330, 444, 445, 446, 394, 331,
-        395, 429, 419, 388, 332, 418, 410, 392, 412, 333,
-        335, 414, 337, 472, 417, 479, 427, 497, 347, 461,
-        460, 459, 378, 346, 464, 510, 495, 511, 498, 473,
-        377, 496, 503, 506, 513, 512, 509, 507, 504, 508,
-        345, 458, 471, 448, 505, 454, 452, 455, 456, 450,
-        491, 449, 492, 493, 494, 470, 451, 328, 453, 343,
-        344, 372, 481, 432, 433, 465, 440,
-    );
-
-    public static $yyFallback       = array();
-
-    public static $yyRuleName       = array(
-        'start ::= template',
-        'template ::= template PHP',
-        'template ::= template TEXT',
-        'template ::= template STRIPON',
-        'template ::= template STRIPOFF',
-        'template ::= template LITERALSTART literal_e2 LITERALEND',
-        'literal_e2 ::= literal_e1 LITERALSTART literal_e1 LITERALEND',
-        'literal_e2 ::= literal_e1',
-        'literal_e1 ::= literal_e1 LITERAL',
-        'literal_e1 ::=',
-        'template ::= template smartytag',
-        'template ::=',
-        'smartytag ::= SIMPELOUTPUT',
-        'smartytag ::= SIMPLETAG',
-        'smartytag ::= SMARTYBLOCKCHILDPARENT',
-        'smartytag ::= LDEL tagbody RDEL',
-        'smartytag ::= tag RDEL',
-        'tagbody ::= outattr',
-        'tagbody ::= DOLLARID eqoutattr',
-        'tagbody ::= varindexed eqoutattr',
-        'eqoutattr ::= EQUAL outattr',
-        'outattr ::= output attributes',
-        'output ::= variable',
-        'output ::= value',
-        'output ::= expr',
-        'tag ::= LDEL ID attributes',
-        'tag ::= LDEL ID',
-        'tag ::= LDEL ID modifierlist attributes',
-        'tag ::= LDEL ID PTR ID attributes',
-        'tag ::= LDEL ID PTR ID modifierlist attributes',
-        'tag ::= LDELMAKENOCACHE DOLLARID',
-        'tag ::= LDELIF expr',
-        'tag ::= LDELIF expr attributes',
-        'tag ::= LDELIF statement',
-        'tag ::= LDELIF statement attributes',
-        'tag ::= LDELFOR statements SEMICOLON expr SEMICOLON varindexed foraction attributes',
-        'foraction ::= EQUAL expr',
-        'foraction ::= INCDEC',
-        'tag ::= LDELFOR statement TO expr attributes',
-        'tag ::= LDELFOR statement TO expr STEP expr attributes',
-        'tag ::= LDELFOREACH SPACE expr AS varvar attributes',
-        'tag ::= LDELFOREACH SPACE expr AS varvar APTR varvar attributes',
-        'tag ::= LDELFOREACH attributes',
-        'tag ::= LDELSETFILTER ID modparameters',
-        'tag ::= LDELSETFILTER ID modparameters modifierlist',
-        'smartytag ::= CLOSETAG',
-        'tag ::= LDELSLASH ID',
-        'tag ::= LDELSLASH ID modifierlist',
-        'tag ::= LDELSLASH ID PTR ID',
-        'tag ::= LDELSLASH ID PTR ID modifierlist',
-        'attributes ::= attributes attribute',
-        'attributes ::= attribute',
-        'attributes ::=',
-        'attribute ::= SPACE ID EQUAL ID',
-        'attribute ::= ATTR expr',
-        'attribute ::= ATTR value',
-        'attribute ::= SPACE ID',
-        'attribute ::= SPACE expr',
-        'attribute ::= SPACE value',
-        'attribute ::= SPACE INTEGER EQUAL expr',
-        'statements ::= statement',
-        'statements ::= statements COMMA statement',
-        'statement ::= DOLLARID EQUAL INTEGER',
-        'statement ::= DOLLARID EQUAL expr',
-        'statement ::= varindexed EQUAL expr',
-        'statement ::= OPENP statement CLOSEP',
-        'expr ::= value',
-        'expr ::= ternary',
-        'expr ::= DOLLARID COLON ID',
-        'expr ::= expr MATH value',
-        'expr ::= expr UNIMATH value',
-        'expr ::= expr tlop value',
-        'expr ::= expr lop expr',
-        'expr ::= expr scond',
-        'expr ::= expr ISIN array',
-        'expr ::= expr ISIN value',
-        'ternary ::= OPENP expr CLOSEP QMARK DOLLARID COLON expr',
-        'ternary ::= OPENP expr CLOSEP QMARK expr COLON expr',
-        'value ::= variable',
-        'value ::= UNIMATH value',
-        'value ::= NOT value',
-        'value ::= TYPECAST value',
-        'value ::= variable INCDEC',
-        'value ::= HEX',
-        'value ::= INTEGER',
-        'value ::= INTEGER DOT INTEGER',
-        'value ::= INTEGER DOT',
-        'value ::= DOT INTEGER',
-        'value ::= ID',
-        'value ::= function',
-        'value ::= OPENP expr CLOSEP',
-        'value ::= variable INSTANCEOF ns1',
-        'value ::= variable INSTANCEOF variable',
-        'value ::= SINGLEQUOTESTRING',
-        'value ::= doublequoted_with_quotes',
-        'value ::= varindexed DOUBLECOLON static_class_access',
-        'value ::= smartytag',
-        'value ::= value modifierlist',
-        'value ::= NAMESPACE',
-        'value ::= arraydef',
-        'value ::= ns1 DOUBLECOLON static_class_access',
-        'ns1 ::= ID',
-        'ns1 ::= NAMESPACE',
-        'variable ::= DOLLARID',
-        'variable ::= varindexed',
-        'variable ::= varvar AT ID',
-        'variable ::= object',
-        'variable ::= HATCH ID HATCH',
-        'variable ::= HATCH ID HATCH arrayindex',
-        'variable ::= HATCH variable HATCH',
-        'variable ::= HATCH variable HATCH arrayindex',
-        'varindexed ::= DOLLARID arrayindex',
-        'varindexed ::= varvar arrayindex',
-        'arrayindex ::= arrayindex indexdef',
-        'arrayindex ::=',
-        'indexdef ::= DOT DOLLARID',
-        'indexdef ::= DOT varvar',
-        'indexdef ::= DOT varvar AT ID',
-        'indexdef ::= DOT ID',
-        'indexdef ::= DOT INTEGER',
-        'indexdef ::= DOT LDEL expr RDEL',
-        'indexdef ::= OPENB ID CLOSEB',
-        'indexdef ::= OPENB ID DOT ID CLOSEB',
-        'indexdef ::= OPENB SINGLEQUOTESTRING CLOSEB',
-        'indexdef ::= OPENB INTEGER CLOSEB',
-        'indexdef ::= OPENB DOLLARID CLOSEB',
-        'indexdef ::= OPENB variable CLOSEB',
-        'indexdef ::= OPENB value CLOSEB',
-        'indexdef ::= OPENB expr CLOSEB',
-        'indexdef ::= OPENB CLOSEB',
-        'varvar ::= DOLLARID',
-        'varvar ::= DOLLAR',
-        'varvar ::= varvar varvarele',
-        'varvarele ::= ID',
-        'varvarele ::= SIMPELOUTPUT',
-        'varvarele ::= LDEL expr RDEL',
-        'object ::= varindexed objectchain',
-        'objectchain ::= objectelement',
-        'objectchain ::= objectchain objectelement',
-        'objectelement ::= PTR ID arrayindex',
-        'objectelement ::= PTR varvar arrayindex',
-        'objectelement ::= PTR LDEL expr RDEL arrayindex',
-        'objectelement ::= PTR ID LDEL expr RDEL arrayindex',
-        'objectelement ::= PTR method',
-        'function ::= ns1 OPENP params CLOSEP',
-        'method ::= ID OPENP params CLOSEP',
-        'method ::= DOLLARID OPENP params CLOSEP',
-        'params ::= params COMMA expr',
-        'params ::= expr',
-        'params ::=',
-        'modifierlist ::= modifierlist modifier modparameters',
-        'modifierlist ::= modifier modparameters',
-        'modifier ::= VERT AT ID',
-        'modifier ::= VERT ID',
-        'modparameters ::= modparameters modparameter',
-        'modparameters ::=',
-        'modparameter ::= COLON value',
-        'modparameter ::= COLON UNIMATH value',
-        'modparameter ::= COLON array',
-        'static_class_access ::= method',
-        'static_class_access ::= method objectchain',
-        'static_class_access ::= ID',
-        'static_class_access ::= DOLLARID arrayindex',
-        'static_class_access ::= DOLLARID arrayindex objectchain',
-        'lop ::= LOGOP',
-        'lop ::= SLOGOP',
-        'tlop ::= TLOGOP',
-        'scond ::= SINGLECOND',
-        'arraydef ::= OPENB arrayelements CLOSEB',
-        'arraydef ::= ARRAYOPEN arrayelements CLOSEP',
-        'arrayelements ::= arrayelement',
-        'arrayelements ::= arrayelements COMMA arrayelement',
-        'arrayelements ::=',
-        'arrayelement ::= value APTR expr',
-        'arrayelement ::= ID APTR expr',
-        'arrayelement ::= expr',
-        'doublequoted_with_quotes ::= QUOTE QUOTE',
-        'doublequoted_with_quotes ::= QUOTE doublequoted QUOTE',
-        'doublequoted ::= doublequoted doublequotedcontent',
-        'doublequoted ::= doublequotedcontent',
-        'doublequotedcontent ::= BACKTICK variable BACKTICK',
-        'doublequotedcontent ::= BACKTICK expr BACKTICK',
-        'doublequotedcontent ::= DOLLARID',
-        'doublequotedcontent ::= LDEL variable RDEL',
-        'doublequotedcontent ::= LDEL expr RDEL',
-        'doublequotedcontent ::= smartytag',
-        'doublequotedcontent ::= TEXT',
-    );
-
-    public static $yyRuleInfo       = array(
-        array(0 => 63, 1 => 1),
-        array(0 => 64, 1 => 2),
-        array(0 => 64, 1 => 2),
-        array(0 => 64, 1 => 2),
-        array(0 => 64, 1 => 2),
-        array(0 => 64, 1 => 4),
-        array(0 => 65, 1 => 4),
-        array(0 => 65, 1 => 1),
-        array(0 => 66, 1 => 2),
-        array(0 => 66, 1 => 0),
-        array(0 => 64, 1 => 2),
-        array(0 => 64, 1 => 0),
-        array(0 => 67, 1 => 1),
-        array(0 => 67, 1 => 1),
-        array(0 => 67, 1 => 1),
-        array(0 => 67, 1 => 3),
-        array(0 => 67, 1 => 2),
-        array(0 => 68, 1 => 1),
-        array(0 => 68, 1 => 2),
-        array(0 => 68, 1 => 2),
-        array(0 => 71, 1 => 2),
-        array(0 => 70, 1 => 2),
-        array(0 => 73, 1 => 1),
-        array(0 => 73, 1 => 1),
-        array(0 => 73, 1 => 1),
-        array(0 => 69, 1 => 3),
-        array(0 => 69, 1 => 2),
-        array(0 => 69, 1 => 4),
-        array(0 => 69, 1 => 5),
-        array(0 => 69, 1 => 6),
-        array(0 => 69, 1 => 2),
-        array(0 => 69, 1 => 2),
-        array(0 => 69, 1 => 3),
-        array(0 => 69, 1 => 2),
-        array(0 => 69, 1 => 3),
-        array(0 => 69, 1 => 8),
-        array(0 => 81, 1 => 2),
-        array(0 => 81, 1 => 1),
-        array(0 => 69, 1 => 5),
-        array(0 => 69, 1 => 7),
-        array(0 => 69, 1 => 6),
-        array(0 => 69, 1 => 8),
-        array(0 => 69, 1 => 2),
-        array(0 => 69, 1 => 3),
-        array(0 => 69, 1 => 4),
-        array(0 => 67, 1 => 1),
-        array(0 => 69, 1 => 2),
-        array(0 => 69, 1 => 3),
-        array(0 => 69, 1 => 4),
-        array(0 => 69, 1 => 5),
-        array(0 => 74, 1 => 2),
-        array(0 => 74, 1 => 1),
-        array(0 => 74, 1 => 0),
-        array(0 => 84, 1 => 4),
-        array(0 => 84, 1 => 2),
-        array(0 => 84, 1 => 2),
-        array(0 => 84, 1 => 2),
-        array(0 => 84, 1 => 2),
-        array(0 => 84, 1 => 2),
-        array(0 => 84, 1 => 4),
-        array(0 => 80, 1 => 1),
-        array(0 => 80, 1 => 3),
-        array(0 => 79, 1 => 3),
-        array(0 => 79, 1 => 3),
-        array(0 => 79, 1 => 3),
-        array(0 => 79, 1 => 3),
-        array(0 => 77, 1 => 1),
-        array(0 => 77, 1 => 1),
-        array(0 => 77, 1 => 3),
-        array(0 => 77, 1 => 3),
-        array(0 => 77, 1 => 3),
-        array(0 => 77, 1 => 3),
-        array(0 => 77, 1 => 3),
-        array(0 => 77, 1 => 2),
-        array(0 => 77, 1 => 3),
-        array(0 => 77, 1 => 3),
-        array(0 => 85, 1 => 7),
-        array(0 => 85, 1 => 7),
-        array(0 => 76, 1 => 1),
-        array(0 => 76, 1 => 2),
-        array(0 => 76, 1 => 2),
-        array(0 => 76, 1 => 2),
-        array(0 => 76, 1 => 2),
-        array(0 => 76, 1 => 1),
-        array(0 => 76, 1 => 1),
-        array(0 => 76, 1 => 3),
-        array(0 => 76, 1 => 2),
-        array(0 => 76, 1 => 2),
-        array(0 => 76, 1 => 1),
-        array(0 => 76, 1 => 1),
-        array(0 => 76, 1 => 3),
-        array(0 => 76, 1 => 3),
-        array(0 => 76, 1 => 3),
-        array(0 => 76, 1 => 1),
-        array(0 => 76, 1 => 1),
-        array(0 => 76, 1 => 3),
-        array(0 => 76, 1 => 1),
-        array(0 => 76, 1 => 2),
-        array(0 => 76, 1 => 1),
-        array(0 => 76, 1 => 1),
-        array(0 => 76, 1 => 3),
-        array(0 => 91, 1 => 1),
-        array(0 => 91, 1 => 1),
-        array(0 => 75, 1 => 1),
-        array(0 => 75, 1 => 1),
-        array(0 => 75, 1 => 3),
-        array(0 => 75, 1 => 1),
-        array(0 => 75, 1 => 3),
-        array(0 => 75, 1 => 4),
-        array(0 => 75, 1 => 3),
-        array(0 => 75, 1 => 4),
-        array(0 => 72, 1 => 2),
-        array(0 => 72, 1 => 2),
-        array(0 => 96, 1 => 2),
-        array(0 => 96, 1 => 0),
-        array(0 => 97, 1 => 2),
-        array(0 => 97, 1 => 2),
-        array(0 => 97, 1 => 4),
-        array(0 => 97, 1 => 2),
-        array(0 => 97, 1 => 2),
-        array(0 => 97, 1 => 4),
-        array(0 => 97, 1 => 3),
-        array(0 => 97, 1 => 5),
-        array(0 => 97, 1 => 3),
-        array(0 => 97, 1 => 3),
-        array(0 => 97, 1 => 3),
-        array(0 => 97, 1 => 3),
-        array(0 => 97, 1 => 3),
-        array(0 => 97, 1 => 3),
-        array(0 => 97, 1 => 2),
-        array(0 => 82, 1 => 1),
-        array(0 => 82, 1 => 1),
-        array(0 => 82, 1 => 2),
-        array(0 => 98, 1 => 1),
-        array(0 => 98, 1 => 1),
-        array(0 => 98, 1 => 3),
-        array(0 => 95, 1 => 2),
-        array(0 => 99, 1 => 1),
-        array(0 => 99, 1 => 2),
-        array(0 => 100, 1 => 3),
-        array(0 => 100, 1 => 3),
-        array(0 => 100, 1 => 5),
-        array(0 => 100, 1 => 6),
-        array(0 => 100, 1 => 2),
-        array(0 => 90, 1 => 4),
-        array(0 => 101, 1 => 4),
-        array(0 => 101, 1 => 4),
-        array(0 => 102, 1 => 3),
-        array(0 => 102, 1 => 1),
-        array(0 => 102, 1 => 0),
-        array(0 => 78, 1 => 3),
-        array(0 => 78, 1 => 2),
-        array(0 => 103, 1 => 3),
-        array(0 => 103, 1 => 2),
-        array(0 => 83, 1 => 2),
-        array(0 => 83, 1 => 0),
-        array(0 => 104, 1 => 2),
-        array(0 => 104, 1 => 3),
-        array(0 => 104, 1 => 2),
-        array(0 => 93, 1 => 1),
-        array(0 => 93, 1 => 2),
-        array(0 => 93, 1 => 1),
-        array(0 => 93, 1 => 2),
-        array(0 => 93, 1 => 3),
-        array(0 => 87, 1 => 1),
-        array(0 => 87, 1 => 1),
-        array(0 => 86, 1 => 1),
-        array(0 => 88, 1 => 1),
-        array(0 => 94, 1 => 3),
-        array(0 => 94, 1 => 3),
-        array(0 => 105, 1 => 1),
-        array(0 => 105, 1 => 3),
-        array(0 => 105, 1 => 0),
-        array(0 => 106, 1 => 3),
-        array(0 => 106, 1 => 3),
-        array(0 => 106, 1 => 1),
-        array(0 => 92, 1 => 2),
-        array(0 => 92, 1 => 3),
-        array(0 => 107, 1 => 2),
-        array(0 => 107, 1 => 1),
-        array(0 => 108, 1 => 3),
-        array(0 => 108, 1 => 3),
-        array(0 => 108, 1 => 1),
-        array(0 => 108, 1 => 3),
-        array(0 => 108, 1 => 3),
-        array(0 => 108, 1 => 1),
-        array(0 => 108, 1 => 1),
-    );
-
-    public static $yyReduceMap      = array(
-        0   => 0,
-        1   => 1,
-        2   => 2,
-        3   => 3,
-        4   => 4,
-        5   => 5,
-        6   => 6,
-        7   => 7,
-        22  => 7,
-        23  => 7,
-        24  => 7,
-        37  => 7,
-        57  => 7,
-        58  => 7,
-        66  => 7,
-        67  => 7,
-        78  => 7,
-        83  => 7,
-        84  => 7,
-        89  => 7,
-        93  => 7,
-        94  => 7,
-        98  => 7,
-        99  => 7,
-        101 => 7,
-        106 => 7,
-        170 => 7,
-        175 => 7,
-        8   => 8,
-        9   => 9,
-        10  => 10,
-        12  => 12,
-        13  => 13,
-        14  => 14,
-        15  => 15,
-        16  => 16,
-        17  => 17,
-        18  => 18,
-        19  => 19,
-        20  => 20,
-        21  => 21,
-        25  => 25,
-        26  => 26,
-        27  => 27,
-        28  => 28,
-        29  => 29,
-        30  => 30,
-        31  => 31,
-        32  => 32,
-        34  => 32,
-        33  => 33,
-        35  => 35,
-        36  => 36,
-        38  => 38,
-        39  => 39,
-        40  => 40,
-        41  => 41,
-        42  => 42,
-        43  => 43,
-        44  => 44,
-        45  => 45,
-        46  => 46,
-        47  => 47,
-        48  => 48,
-        49  => 49,
-        50  => 50,
-        51  => 51,
-        60  => 51,
-        148 => 51,
-        152 => 51,
-        156 => 51,
-        158 => 51,
-        52  => 52,
-        149 => 52,
-        155 => 52,
-        53  => 53,
-        54  => 54,
-        55  => 54,
-        56  => 56,
-        133 => 56,
-        59  => 59,
-        61  => 61,
-        62  => 62,
-        63  => 62,
-        64  => 64,
-        65  => 65,
-        68  => 68,
-        69  => 69,
-        70  => 69,
-        71  => 71,
-        72  => 72,
-        73  => 73,
-        74  => 74,
-        75  => 75,
-        76  => 76,
-        77  => 77,
-        79  => 79,
-        81  => 79,
-        82  => 79,
-        113 => 79,
-        80  => 80,
-        85  => 85,
-        86  => 86,
-        87  => 87,
-        88  => 88,
-        90  => 90,
-        91  => 91,
-        92  => 91,
-        95  => 95,
-        96  => 96,
-        97  => 97,
-        100 => 100,
-        102 => 102,
-        103 => 103,
-        104 => 104,
-        105 => 105,
-        107 => 107,
-        108 => 108,
-        109 => 109,
-        110 => 110,
-        111 => 111,
-        112 => 112,
-        114 => 114,
-        172 => 114,
-        115 => 115,
-        116 => 116,
-        117 => 117,
-        118 => 118,
-        119 => 119,
-        120 => 120,
-        128 => 120,
-        121 => 121,
-        122 => 122,
-        123 => 123,
-        124 => 123,
-        126 => 123,
-        127 => 123,
-        125 => 125,
-        129 => 129,
-        130 => 130,
-        131 => 131,
-        176 => 131,
-        132 => 132,
-        134 => 134,
-        135 => 135,
-        136 => 136,
-        137 => 137,
-        138 => 138,
-        139 => 139,
-        140 => 140,
-        141 => 141,
-        142 => 142,
-        143 => 143,
-        144 => 144,
-        145 => 145,
-        146 => 146,
-        147 => 147,
-        150 => 150,
-        151 => 151,
-        153 => 153,
-        154 => 154,
-        157 => 157,
-        159 => 159,
-        160 => 160,
-        161 => 161,
-        162 => 162,
-        163 => 163,
-        164 => 164,
-        165 => 165,
-        166 => 166,
-        167 => 167,
-        168 => 168,
-        169 => 168,
-        171 => 171,
-        173 => 173,
-        174 => 174,
-        177 => 177,
-        178 => 178,
-        179 => 179,
-        180 => 180,
-        183 => 180,
-        181 => 181,
-        184 => 181,
-        182 => 182,
-        185 => 185,
-        186 => 186,
-    );
+    const ERR1 = 'Security error: Call to private object member not allowed';
+    const ERR2 = 'Security error: Call to dynamic object member not allowed';
 
     /**
      * result status
@@ -1654,13 +81,19 @@ class Smarty_Internal_Templateparser
      */
     public $lex;
 
+    /**
+     * internal error flag
+     *
+     * @var bool
+     */
+    private $internalError = false;
+
     /**
      * {strip} status
      *
      * @var bool
      */
     public $strip = false;
-
     /**
      * compiler object
      *
@@ -1710,54 +143,6 @@ class Smarty_Internal_Templateparser
      */
     public $template_postfix = array();
 
-    public $yyTraceFILE;
-
-    public $yyTracePrompt;
-
-    public $yyidx;
-
-    public $yyerrcnt;
-
-    public $yystack          = array();
-
-    public $yyTokenName      = array(
-        '$', 'VERT', 'COLON', 'PHP',
-        'TEXT', 'STRIPON', 'STRIPOFF', 'LITERALSTART',
-        'LITERALEND', 'LITERAL', 'SIMPELOUTPUT', 'SIMPLETAG',
-        'SMARTYBLOCKCHILDPARENT', 'LDEL', 'RDEL', 'DOLLARID',
-        'EQUAL', 'ID', 'PTR', 'LDELMAKENOCACHE',
-        'LDELIF', 'LDELFOR', 'SEMICOLON', 'INCDEC',
-        'TO', 'STEP', 'LDELFOREACH', 'SPACE',
-        'AS', 'APTR', 'LDELSETFILTER', 'CLOSETAG',
-        'LDELSLASH', 'ATTR', 'INTEGER', 'COMMA',
-        'OPENP', 'CLOSEP', 'MATH', 'UNIMATH',
-        'ISIN', 'QMARK', 'NOT', 'TYPECAST',
-        'HEX', 'DOT', 'INSTANCEOF', 'SINGLEQUOTESTRING',
-        'DOUBLECOLON', 'NAMESPACE', 'AT', 'HATCH',
-        'OPENB', 'CLOSEB', 'DOLLAR', 'LOGOP',
-        'SLOGOP', 'TLOGOP', 'SINGLECOND', 'ARRAYOPEN',
-        'QUOTE', 'BACKTICK', 'error', 'start',
-        'template', 'literal_e2', 'literal_e1', 'smartytag',
-        'tagbody', 'tag', 'outattr', 'eqoutattr',
-        'varindexed', 'output', 'attributes', 'variable',
-        'value', 'expr', 'modifierlist', 'statement',
-        'statements', 'foraction', 'varvar', 'modparameters',
-        'attribute', 'ternary', 'tlop', 'lop',
-        'scond', 'array', 'function', 'ns1',
-        'doublequoted_with_quotes', 'static_class_access', 'arraydef', 'object',
-        'arrayindex', 'indexdef', 'varvarele', 'objectchain',
-        'objectelement', 'method', 'params', 'modifier',
-        'modparameter', 'arrayelements', 'arrayelement', 'doublequoted',
-        'doublequotedcontent',
-    );
-
-    /**
-     * internal error flag
-     *
-     * @var bool
-     */
-    private $internalError = false;                    /* Index of top element in stack */
-    private $_retvalue;                 /* Shifts left before out of the error */
     /**
      * constructor
      *
@@ -1772,16 +157,9 @@ class Smarty_Internal_Templateparser
         $this->smarty = $this->template->smarty;
         $this->security = isset($this->smarty->security_policy) ? $this->smarty->security_policy : false;
         $this->current_buffer = $this->root_buffer = new Smarty_Internal_ParseTree_Template();
-    }  /* The parser's stack */
-    public static function yy_destructor($yymajor, $yypminor)
-    {
-        switch ($yymajor) {
-            default:
-                break;   /* If no destructor action specified: do nothing */
-        }
     }
 
-    /**
+     /**
      * insert PHP code in current buffer
      *
      * @param string $code
@@ -1823,6 +201,898 @@ class Smarty_Internal_Templateparser
         return new Smarty_Internal_ParseTree_Tag($this, $this->compiler->processNocacheCode($tmp, true));
     }
 
+
+    const TP_VERT                           =  1;
+    const TP_COLON                          =  2;
+    const TP_TEXT                           =  3;
+    const TP_STRIPON                        =  4;
+    const TP_STRIPOFF                       =  5;
+    const TP_LITERALSTART                   =  6;
+    const TP_LITERALEND                     =  7;
+    const TP_LITERAL                        =  8;
+    const TP_SIMPELOUTPUT                   =  9;
+    const TP_SIMPLETAG                      = 10;
+    const TP_SMARTYBLOCKCHILDPARENT         = 11;
+    const TP_LDEL                           = 12;
+    const TP_RDEL                           = 13;
+    const TP_DOLLARID                       = 14;
+    const TP_EQUAL                          = 15;
+    const TP_ID                             = 16;
+    const TP_PTR                            = 17;
+    const TP_LDELMAKENOCACHE                = 18;
+    const TP_LDELIF                         = 19;
+    const TP_LDELFOR                        = 20;
+    const TP_SEMICOLON                      = 21;
+    const TP_INCDEC                         = 22;
+    const TP_TO                             = 23;
+    const TP_STEP                           = 24;
+    const TP_LDELFOREACH                    = 25;
+    const TP_SPACE                          = 26;
+    const TP_AS                             = 27;
+    const TP_APTR                           = 28;
+    const TP_LDELSETFILTER                  = 29;
+    const TP_CLOSETAG                       = 30;
+    const TP_LDELSLASH                      = 31;
+    const TP_ATTR                           = 32;
+    const TP_INTEGER                        = 33;
+    const TP_COMMA                          = 34;
+    const TP_OPENP                          = 35;
+    const TP_CLOSEP                         = 36;
+    const TP_MATH                           = 37;
+    const TP_UNIMATH                        = 38;
+    const TP_ISIN                           = 39;
+    const TP_QMARK                          = 40;
+    const TP_NOT                            = 41;
+    const TP_TYPECAST                       = 42;
+    const TP_HEX                            = 43;
+    const TP_DOT                            = 44;
+    const TP_INSTANCEOF                     = 45;
+    const TP_SINGLEQUOTESTRING              = 46;
+    const TP_DOUBLECOLON                    = 47;
+    const TP_NAMESPACE                      = 48;
+    const TP_AT                             = 49;
+    const TP_HATCH                          = 50;
+    const TP_OPENB                          = 51;
+    const TP_CLOSEB                         = 52;
+    const TP_DOLLAR                         = 53;
+    const TP_LOGOP                          = 54;
+    const TP_SLOGOP                         = 55;
+    const TP_TLOGOP                         = 56;
+    const TP_SINGLECOND                     = 57;
+    const TP_ARRAYOPEN                      = 58;
+    const TP_QUOTE                          = 59;
+    const TP_BACKTICK                       = 60;
+    const YY_NO_ACTION = 514;
+    const YY_ACCEPT_ACTION = 513;
+    const YY_ERROR_ACTION = 512;
+
+    const YY_SZ_ACTTAB = 1997;
+public static $yy_action = array(
+    249,  250,  239,    1,   27,  127,  220,  184,  160,  213,
+     11,   54,  278,   10,  173,   34,  108,  387,  282,  279,
+    223,  321,  221,    8,  194,  387,   18,  387,   85,   41,
+    387,  285,   42,   44,  264,  222,  387,  209,  387,  198,
+    387,   52,    5,  307,  288,  288,  164,  283,  224,    4,
+     50,  249,  250,  239,    1,  232,  131,  381,  189,  205,
+    213,   11,   54,   39,   35,  243,   31,  108,   94,   17,
+    381,  223,  321,  221,  439,  226,  381,   33,   49,  426,
+     41,  439,   89,   42,   44,  264,  222,    9,  235,  163,
+    198,  426,   52,    5,  131,  288,  212,  284,  102,  106,
+      4,   50,  249,  250,  239,    1,  232,  129,  426,  189,
+    347,  213,   11,   54,  175,  324,  347,  208,  108,   22,
+    426,  301,  223,  321,  221,  302,  226,  135,   18,   49,
+     52,   41,   26,  288,   42,   44,  264,  222,   16,  235,
+    294,  198,  204,   52,    5,  170,  288,   32,   90,  267,
+    268,    4,   50,  249,  250,  239,    1,   20,  129,  185,
+    179,  255,  213,   11,   54,  455,  288,  192,  455,  108,
+    175,  167,  455,  223,  321,  221,  439,  226,  256,   18,
+     55,  292,   41,  439,  132,   42,   44,  264,  222,  427,
+    235,   12,  198,  165,   52,    5,  232,  288,  288,  347,
+    153,  427,    4,   50,  249,  250,  239,    1,  232,  129,
+    286,  181,  347,  213,   11,   54,   24,   13,  347,   49,
+    108,  232,  320,  426,  223,  321,  221,  195,  201,  173,
+     18,   49,  139,   41,  296,  426,   42,   44,  264,  222,
+      7,  235,  286,  198,   49,   52,    5,  147,  288,  117,
+    150,  317,  263,    4,   50,  249,  250,  239,    1,   95,
+    130,  173,  189,  155,  213,   11,   54,   22,  244,  271,
+    192,  108,  323,  286,  101,  223,  321,  221,  294,  226,
+    204,   18,  348,  257,   41,  166,  283,   42,   44,  264,
+    222,   28,  235,  300,  198,  348,   52,    5,  247,  288,
+    117,  348,   94,  206,    4,   50,  249,  250,  239,    1,
+     95,  129,   22,  189,  277,  213,   11,   54,   91,  274,
+    224,  426,  108,  323,  216,  156,  223,  321,  221,  132,
+    180,  262,   18,  426,  100,   41,   12,  288,   42,   44,
+    264,  222,   15,  235,  216,  198,  254,   52,    5,  233,
+    288,  210,  190,  192,  100,    4,   50,  249,  250,  239,
+      1,    3,  131,   94,  189,  192,  213,   11,   54,  269,
+     10,  204,  290,  108,  325,  216,  224,  223,  321,  221,
+     23,  226,  211,   33,  315,  100,   45,  513,   92,   42,
+     44,  264,  222,  102,  235,  178,  198,  268,   52,    5,
+    275,  288,  161,  192,   37,   25,    4,   50,  249,  250,
+    239,    1,  286,  129,  172,  187,  305,  213,   11,   54,
+    164,  283,  310,  141,  108,  281,  281,  236,  223,  321,
+    221,  169,  226,  230,   18,  122,  171,   41,  225,  175,
+     42,   44,  264,  222,  144,  235,  303,  198,  134,   52,
+      5,  265,  288,  151,  286,  192,  175,    4,   50,  249,
+    250,  239,    1,  286,  128,   94,  189,  143,  213,   11,
+     54,  219,  152,  207,  193,  108,  149,  281,   31,  223,
+    321,  221,  100,  226,   21,    6,  286,  288,   41,  158,
+     16,   42,   44,  264,  222,  102,  235,  238,  198,  286,
+     52,    5,  157,  288,  281,  122,  168,  283,    4,   50,
+    249,  250,  239,    1,   30,   93,  308,   51,  215,  213,
+     11,   54,   53,  251,  140,  248,  108,  245,  304,  116,
+    223,  321,  221,  111,  226,  176,   18,  270,  266,   41,
+    224,  322,   42,   44,  264,  222,    7,  235,  259,  198,
+    147,   52,    5,  257,  288,   43,   40,   38,   83,    4,
+     50,  241,  214,  204,  319,  280,   88,  107,  138,  182,
+     97,   64,  311,  312,  313,  316,   95,  281,  298,  258,
+    142,  234,   94,  105,  272,  197,  231,  482,  237,  323,
+     37,  133,  324,  241,  214,  204,  319,  314,   88,  107,
+    296,  183,   97,   82,   84,   43,   40,   38,   95,  296,
+    296,  258,  296,  296,  296,  159,  272,  197,  231,  296,
+    237,  323,  311,  312,  313,  316,  241,  296,  204,  296,
+    296,  103,  296,  296,  199,  104,   77,  296,  296,  110,
+    296,   95,  296,  296,  258,  278,  296,  296,   34,  272,
+    197,  231,  279,  237,  323,   43,   40,   38,  296,  296,
+    296,  241,   26,  204,  196,  276,  103,  296,   16,  199,
+    104,   77,  311,  312,  313,  316,   95,  192,  296,  258,
+    146,  296,  296,  296,  272,  197,  231,  296,  237,  323,
+    286,  393,   39,   35,  243,  296,  296,  296,  296,  191,
+    276,  296,   26,  318,  252,  253,  126,  296,   16,  249,
+    250,  239,    1,  296,  296,  131,  296,  261,  213,   11,
+     54,  296,  296,  296,  426,  108,  393,  393,  393,  223,
+    321,  221,  241,  296,  204,  299,  426,  103,  107,  296,
+    183,   97,   82,  393,  393,  393,  393,   95,  296,  260,
+    258,   52,  296,  296,  288,  272,  197,  231,  296,  237,
+    323,  293,  296,  296,  296,  296,  296,  249,  250,  239,
+      2,  296,  295,  296,  296,  296,  213,   11,   54,  296,
+    296,  177,  296,  108,  136,  296,  296,  223,  321,  221,
+    296,  296,  296,  293,   43,   40,   38,  296,  296,  249,
+    250,  239,    2,  296,  295,   43,   40,   38,  213,   11,
+     54,  311,  312,  313,  316,  108,  296,  291,   14,  223,
+    321,  221,  311,  312,  313,  316,  296,  296,  241,  296,
+    204,  296,  192,  103,  296,  296,  199,  104,   77,  296,
+    296,  296,  296,   95,  383,  296,  258,  296,  296,  297,
+     14,  272,  197,  231,  296,  237,  323,  383,  296,  296,
+    241,  296,  204,  383,  296,   99,  296,  287,  199,  120,
+     48,  241,  112,  204,  296,   95,  103,  296,  258,  199,
+    120,   74,  296,  272,  197,  231,   95,  237,  323,  258,
+    455,  296,  296,  455,  272,  197,  231,  455,  237,  323,
+    241,  296,  204,  296,  296,  103,  200,  296,  199,  120,
+     74,  296,  296,  296,  296,   95,  296,  296,  258,  278,
+    296,  296,   34,  272,  197,  231,  279,  237,  323,  241,
+    455,  204,  296,  296,   99,  202,  296,  199,  120,   56,
+    241,  211,  204,  296,   95,  103,  296,  258,  199,  120,
+     74,  296,  272,  197,  231,   95,  237,  323,  258,  227,
+    296,  296,  296,  272,  197,  231,  296,  237,  323,  241,
+    296,  204,  148,  296,  103,  203,   86,  199,  120,   73,
+    296,  296,  286,  296,   95,  296,  296,  258,  278,  296,
+    296,   34,  272,  197,  231,  279,  237,  323,  241,  296,
+    204,  175,  296,  103,  296,  296,  199,  120,   75,  241,
+    296,  204,  296,   95,  103,  296,  258,  199,  120,   63,
+    296,  272,  197,  231,   95,  237,  323,  258,  229,  192,
+    296,  296,  272,  197,  231,  296,  237,  323,  241,  296,
+    204,  380,  296,  103,  296,  296,  199,  120,   58,  296,
+    296,  296,  296,   95,  380,  296,  258,  296,  296,  296,
+    380,  272,  197,  231,  296,  237,  323,  241,  296,  204,
+    296,  296,  103,  296,  296,  199,  120,   71,  241,  296,
+    204,  296,   95,  103,  296,  258,  199,  120,   79,  296,
+    272,  197,  231,   95,  237,  323,  258,  296,  296,  296,
+    154,  272,  197,  231,   87,  237,  323,  241,  296,  204,
+    286,  296,  103,  296,  296,  199,  120,   70,  296,  296,
+    296,  296,   95,  296,  296,  258,  296,  296,  296,  175,
+    272,  197,  231,  296,  237,  323,  241,  296,  204,  296,
+    296,  103,  296,  296,  199,  120,   56,  241,  296,  204,
+    296,   95,  103,  296,  258,  199,  120,   46,  296,  272,
+    197,  231,   95,  237,  323,  258,  296,  296,  296,  296,
+    272,  197,  231,  296,  237,  323,  241,  296,  204,  296,
+    296,  103,  296,  296,  199,  120,   78,  296,  296,  296,
+    296,   95,  296,  296,  258,  296,  296,  296,  296,  272,
+    197,  231,  296,  237,  323,  241,  296,  204,  296,  296,
+    103,  296,  296,  199,  120,   66,  241,  296,  204,  296,
+     95,  103,  296,  258,  199,  120,   59,  296,  272,  197,
+    231,   95,  237,  323,  258,  296,  296,  296,  296,  272,
+    197,  231,  296,  237,  323,  241,  296,  204,  296,  296,
+    103,  296,  296,  186,  109,   57,  296,  296,  296,  296,
+     95,  296,  296,  258,  296,  296,  296,  296,  272,  197,
+    231,  296,  237,  323,  241,  296,  204,  296,  296,  103,
+    296,  296,  188,  120,   67,  241,  296,  204,  296,   95,
+    103,  296,  258,  199,   96,   62,  296,  272,  197,  231,
+     95,  237,  323,  258,  296,  296,  296,  296,  272,  197,
+    231,  296,  237,  323,  241,  296,  204,  296,  296,  103,
+    296,  296,  199,  120,   80,  296,  296,  296,  296,   95,
+    296,  296,  258,  296,  296,  296,  296,  272,  197,  231,
+    296,  237,  323,  241,  296,  204,  296,  296,  103,  296,
+    296,  199,  120,   76,  241,  296,  204,  296,   95,  103,
+    296,  258,  199,  120,   81,  296,  272,  197,  231,   95,
+    237,  323,  258,  296,  296,  296,  296,  272,  197,  231,
+    296,  237,  323,  241,  296,  204,  296,  296,  103,  296,
+    296,  199,  120,   65,  296,  296,  296,  296,   95,  296,
+    296,  258,  296,  296,  296,  296,  272,  197,  231,  296,
+    237,  323,  241,  296,  204,  296,  296,  103,  296,  296,
+    199,   96,   68,  241,  296,  204,  296,   95,  103,  296,
+    258,  199,  120,   61,  296,  272,  197,  231,   95,  237,
+    323,  258,  296,  296,  296,  296,  272,  197,  231,  296,
+    237,  323,  241,  296,  204,  296,  296,  103,  296,  296,
+    199,   98,   69,  296,  296,  296,  296,   95,  296,  296,
+    258,  296,  296,  296,  296,  272,  197,  231,  296,  237,
+    323,  241,  296,  204,  296,  296,  103,  296,  296,  199,
+    120,   72,  241,  296,  204,  296,   95,  103,  296,  258,
+    199,  120,   47,  296,  272,  197,  231,   95,  237,  323,
+    258,  296,  296,  296,  296,  272,  197,  231,  296,  237,
+    323,  241,  192,  204,  296,  296,  103,  296,  296,  199,
+    120,   60,  296,  296,  351,  296,   95,  296,  217,  258,
+    296,  296,  296,  296,  272,  197,  231,   26,  237,  323,
+    241,  296,  204,   16,  296,  103,  426,  296,  199,  125,
+    296,  241,  296,  204,  296,   95,  103,  296,  426,  199,
+    118,  296,  242,  272,  197,  231,   95,  237,  323,  296,
+    296,  296,  296,  246,  272,  197,  231,  296,  237,  323,
+    241,  296,  204,  278,  296,  103,   34,  296,  199,  121,
+    279,  296,  296,  296,  296,   95,  296,  296,  296,  296,
+     26,  296,  162,  272,  197,  231,   16,  237,  323,  241,
+    296,  204,  296,  296,  103,  296,  296,  199,  123,  296,
+    241,  296,  204,  296,   95,  103,  296,  296,  199,  114,
+    296,  296,  272,  197,  231,   95,  237,  323,  296,  296,
+    296,  296,  296,  272,  197,  231,  296,  237,  323,  241,
+    296,  204,  296,  145,  103,  296,  296,  199,  124,  296,
+    296,  296,  296,  286,   95,   39,   35,  243,  296,  296,
+    296,  296,  272,  197,  231,  296,  237,  323,  241,  296,
+    204,  296,  296,  103,  296,  296,  199,  115,  296,  241,
+    296,  204,  296,   95,  103,  296,  296,  199,  113,  296,
+    296,  272,  197,  231,   95,  237,  323,  296,  296,  296,
+    296,  296,  272,  197,  231,  228,  237,  323,  241,  296,
+    204,  296,  455,  103,  296,  455,  199,  119,    3,  455,
+    439,  296,  296,   95,  296,  296,  296,  296,  296,  296,
+    296,  272,  197,  231,  228,  237,  323,  296,  296,  296,
+    296,  455,  296,  296,  455,  296,  296,  439,  455,  439,
+    439,  228,  455,  296,  439,  296,  296,  137,  455,  296,
+    296,  455,  296,  296,   32,  455,  439,  286,  296,   39,
+     35,  243,   29,  296,   26,  296,  439,  296,  296,  439,
+     16,  455,  296,  439,  306,   43,   40,   38,  296,  296,
+    296,  296,  296,  439,  296,  296,  439,  296,  455,  296,
+    439,   26,  311,  312,  313,  316,  296,   16,  228,  296,
+    296,  296,   43,   40,   38,  455,  296,  296,  455,  296,
+    296,  296,  455,  439,  296,  296,   19,  296,  296,  311,
+    312,  313,  316,  455,  296,  296,  455,  296,  296,  296,
+    455,  439,  296,  296,  296,   43,   40,   38,  296,  296,
+    439,  296,  296,  439,  174,  455,  296,  439,  296,  240,
+    309,  296,  311,  312,  313,  316,  296,  289,  439,  296,
+     36,  439,  296,  455,  296,  439,  296,  296,   43,   40,
+     38,  296,  296,   43,   40,   38,  296,  296,  296,  296,
+    296,   43,   40,   38,  296,  311,  312,  313,  316,  296,
+    311,  312,  313,  316,  296,   43,   40,   38,  311,  312,
+    313,  316,  273,   43,   40,   38,  296,  296,  296,  296,
+    296,  296,  311,  312,  313,  316,  296,  296,  296,  296,
+    311,  312,  313,  316,  455,  296,  296,  455,   43,   40,
+     38,  455,  439,  218,   43,   40,   38,  296,  296,  296,
+    296,  296,  296,  296,  296,  311,  312,  313,  316,  296,
+    296,  311,  312,  313,  316,  296,  296,  296,  296,  439,
+    296,  296,  439,  296,  455,  296,  439,
+    );
+    public static $yy_lookahead = array(
+      9,   10,   11,   12,   12,   14,   14,   16,   16,   18,
+     19,   20,    9,   34,  102,   12,   25,   13,   70,   16,
+     29,   30,   31,   35,   33,   21,   35,   23,   95,   38,
+     26,   52,   41,   42,   43,   44,   32,   46,   34,   48,
+     36,   50,   51,   52,   53,   53,   98,   99,   44,   58,
+     59,    9,   10,   11,   12,   22,   14,   13,   16,   15,
+     18,   19,   20,   85,   86,   87,   15,   25,   17,   21,
+     26,   29,   30,   31,   44,   33,   32,   35,   45,   35,
+     38,   51,   34,   41,   42,   43,   44,   35,   46,   77,
+     48,   47,   50,   51,   14,   53,   16,   13,   47,   47,
+     58,   59,    9,   10,   11,   12,   22,   14,   35,   16,
+     26,   18,   19,   20,  102,  103,   32,   44,   25,   34,
+     47,   36,   29,   30,   31,   52,   33,   14,   35,   45,
+     50,   38,   26,   53,   41,   42,   43,   44,   32,   46,
+     66,   48,   68,   50,   51,   77,   53,   15,   35,    7,
+      8,   58,   59,    9,   10,   11,   12,   12,   14,   14,
+     16,   16,   18,   19,   20,    9,   53,    1,   12,   25,
+    102,   82,   16,   29,   30,   31,   44,   33,   33,   35,
+    106,  107,   38,   51,   44,   41,   42,   43,   44,   35,
+     46,   51,   48,   82,   50,   51,   22,   53,   53,   13,
+     73,   47,   58,   59,    9,   10,   11,   12,   22,   14,
+     83,   16,   26,   18,   19,   20,   28,   12,   32,   45,
+     25,   22,   70,   35,   29,   30,   31,   65,   33,  102,
+     35,   45,   73,   38,   60,   47,   41,   42,   43,   44,
+     35,   46,   83,   48,   45,   50,   51,   95,   53,   71,
+     95,   52,   74,   58,   59,    9,   10,   11,   12,   81,
+     14,  102,   16,   73,   18,   19,   20,   34,   90,   36,
+      1,   25,   94,   83,   81,   29,   30,   31,   66,   33,
+     68,   35,   13,   96,   38,   98,   99,   41,   42,   43,
+     44,   15,   46,  100,   48,   26,   50,   51,   14,   53,
+     71,   32,   17,   74,   58,   59,    9,   10,   11,   12,
+     81,   14,   34,   16,   36,   18,   19,   20,   82,  107,
+     44,   35,   25,   94,   71,   95,   29,   30,   31,   44,
+     33,   78,   35,   47,   81,   38,   51,   53,   41,   42,
+     43,   44,   15,   46,   71,   48,   16,   50,   51,   22,
+     53,   78,   79,    1,   81,   58,   59,    9,   10,   11,
+     12,   15,   14,   17,   16,    1,   18,   19,   20,   66,
+     34,   68,   36,   25,   16,   71,   44,   29,   30,   31,
+     28,   33,   78,   35,   52,   81,   38,   62,   63,   41,
+     42,   43,   44,   47,   46,    6,   48,    8,   50,   51,
+     16,   53,   73,    1,    2,   40,   58,   59,    9,   10,
+     11,   12,   83,   14,   77,   16,   52,   18,   19,   20,
+     98,   99,   52,   95,   25,   97,   97,   92,   29,   30,
+     31,   77,   33,   49,   35,  100,   14,   38,   16,  102,
+     41,   42,   43,   44,   73,   46,   14,   48,   14,   50,
+     51,   36,   53,   73,   83,    1,  102,   58,   59,    9,
+     10,   11,   12,   83,   14,   17,   16,   50,   18,   19,
+     20,   17,   71,   64,   65,   25,   73,   97,   15,   29,
+     30,   31,   81,   33,   26,   35,   83,   53,   38,   73,
+     32,   41,   42,   43,   44,   47,   46,   92,   48,   83,
+     50,   51,   95,   53,   97,  100,   98,   99,   58,   59,
+      9,   10,   11,   12,   23,   14,   52,   16,   16,   18,
+     19,   20,   16,    7,   50,   16,   25,   13,   13,   16,
+     29,   30,   31,   16,   33,   16,   35,   33,   33,   38,
+     44,   16,   41,   42,   43,   44,   35,   46,   16,   48,
+     95,   50,   51,   96,   53,   37,   38,   39,   81,   58,
+     59,   66,   67,   68,   69,   83,   71,   72,   95,   74,
+     75,   76,   54,   55,   56,   57,   81,   97,   60,   84,
+     95,   13,   17,   80,   89,   90,   91,    1,   93,   94,
+      2,   81,  103,   66,   67,   68,   69,   99,   71,   72,
+    108,   74,   75,   76,   81,   37,   38,   39,   81,  108,
+    108,   84,  108,  108,  108,   95,   89,   90,   91,  108,
+     93,   94,   54,   55,   56,   57,   66,  108,   68,  108,
+    108,   71,  108,  108,   74,   75,   76,  108,  108,   21,
+    108,   81,  108,  108,   84,    9,  108,  108,   12,   89,
+     90,   91,   16,   93,   94,   37,   38,   39,  108,  108,
+    108,   66,   26,   68,  104,  105,   71,  108,   32,   74,
+     75,   76,   54,   55,   56,   57,   81,    1,  108,   84,
+     73,  108,  108,  108,   89,   90,   91,  108,   93,   94,
+     83,    2,   85,   86,   87,  108,  108,  108,  108,  104,
+    105,  108,   26,    3,    4,    5,    6,  108,   32,    9,
+     10,   11,   12,  108,  108,   14,  108,   16,   18,   19,
+     20,  108,  108,  108,   35,   25,   37,   38,   39,   29,
+     30,   31,   66,  108,   68,   69,   47,   71,   72,  108,
+     74,   75,   76,   54,   55,   56,   57,   81,  108,   48,
+     84,   50,  108,  108,   53,   89,   90,   91,  108,   93,
+     94,    3,  108,  108,  108,  108,  108,    9,   10,   11,
+     12,  108,   14,  108,  108,  108,   18,   19,   20,  108,
+    108,   13,  108,   25,   27,  108,  108,   29,   30,   31,
+    108,  108,  108,    3,   37,   38,   39,  108,  108,    9,
+     10,   11,   12,  108,   14,   37,   38,   39,   18,   19,
+     20,   54,   55,   56,   57,   25,  108,   59,   60,   29,
+     30,   31,   54,   55,   56,   57,  108,  108,   66,  108,
+     68,  108,    1,   71,  108,  108,   74,   75,   76,  108,
+    108,  108,  108,   81,   13,  108,   84,  108,  108,   59,
+     60,   89,   90,   91,  108,   93,   94,   26,  108,  108,
+     66,  108,   68,   32,  108,   71,  108,  105,   74,   75,
+     76,   66,   78,   68,  108,   81,   71,  108,   84,   74,
+     75,   76,  108,   89,   90,   91,   81,   93,   94,   84,
+      9,  108,  108,   12,   89,   90,   91,   16,   93,   94,
+     66,  108,   68,  108,  108,   71,  101,  108,   74,   75,
+     76,  108,  108,  108,  108,   81,  108,  108,   84,    9,
+    108,  108,   12,   89,   90,   91,   16,   93,   94,   66,
+     49,   68,  108,  108,   71,  101,  108,   74,   75,   76,
+     66,   78,   68,  108,   81,   71,  108,   84,   74,   75,
+     76,  108,   89,   90,   91,   81,   93,   94,   84,   49,
+    108,  108,  108,   89,   90,   91,  108,   93,   94,   66,
+    108,   68,   73,  108,   71,  101,   77,   74,   75,   76,
+    108,  108,   83,  108,   81,  108,  108,   84,    9,  108,
+    108,   12,   89,   90,   91,   16,   93,   94,   66,  108,
+     68,  102,  108,   71,  108,  108,   74,   75,   76,   66,
+    108,   68,  108,   81,   71,  108,   84,   74,   75,   76,
+    108,   89,   90,   91,   81,   93,   94,   84,   49,    1,
+    108,  108,   89,   90,   91,  108,   93,   94,   66,  108,
+     68,   13,  108,   71,  108,  108,   74,   75,   76,  108,
+    108,  108,  108,   81,   26,  108,   84,  108,  108,  108,
+     32,   89,   90,   91,  108,   93,   94,   66,  108,   68,
+    108,  108,   71,  108,  108,   74,   75,   76,   66,  108,
+     68,  108,   81,   71,  108,   84,   74,   75,   76,  108,
+     89,   90,   91,   81,   93,   94,   84,  108,  108,  108,
+     73,   89,   90,   91,   77,   93,   94,   66,  108,   68,
+     83,  108,   71,  108,  108,   74,   75,   76,  108,  108,
+    108,  108,   81,  108,  108,   84,  108,  108,  108,  102,
+     89,   90,   91,  108,   93,   94,   66,  108,   68,  108,
+    108,   71,  108,  108,   74,   75,   76,   66,  108,   68,
+    108,   81,   71,  108,   84,   74,   75,   76,  108,   89,
+     90,   91,   81,   93,   94,   84,  108,  108,  108,  108,
+     89,   90,   91,  108,   93,   94,   66,  108,   68,  108,
+    108,   71,  108,  108,   74,   75,   76,  108,  108,  108,
+    108,   81,  108,  108,   84,  108,  108,  108,  108,   89,
+     90,   91,  108,   93,   94,   66,  108,   68,  108,  108,
+     71,  108,  108,   74,   75,   76,   66,  108,   68,  108,
+     81,   71,  108,   84,   74,   75,   76,  108,   89,   90,
+     91,   81,   93,   94,   84,  108,  108,  108,  108,   89,
+     90,   91,  108,   93,   94,   66,  108,   68,  108,  108,
+     71,  108,  108,   74,   75,   76,  108,  108,  108,  108,
+     81,  108,  108,   84,  108,  108,  108,  108,   89,   90,
+     91,  108,   93,   94,   66,  108,   68,  108,  108,   71,
+    108,  108,   74,   75,   76,   66,  108,   68,  108,   81,
+     71,  108,   84,   74,   75,   76,  108,   89,   90,   91,
+     81,   93,   94,   84,  108,  108,  108,  108,   89,   90,
+     91,  108,   93,   94,   66,  108,   68,  108,  108,   71,
+    108,  108,   74,   75,   76,  108,  108,  108,  108,   81,
+    108,  108,   84,  108,  108,  108,  108,   89,   90,   91,
+    108,   93,   94,   66,  108,   68,  108,  108,   71,  108,
+    108,   74,   75,   76,   66,  108,   68,  108,   81,   71,
+    108,   84,   74,   75,   76,  108,   89,   90,   91,   81,
+     93,   94,   84,  108,  108,  108,  108,   89,   90,   91,
+    108,   93,   94,   66,  108,   68,  108,  108,   71,  108,
+    108,   74,   75,   76,  108,  108,  108,  108,   81,  108,
+    108,   84,  108,  108,  108,  108,   89,   90,   91,  108,
+     93,   94,   66,  108,   68,  108,  108,   71,  108,  108,
+     74,   75,   76,   66,  108,   68,  108,   81,   71,  108,
+     84,   74,   75,   76,  108,   89,   90,   91,   81,   93,
+     94,   84,  108,  108,  108,  108,   89,   90,   91,  108,
+     93,   94,   66,  108,   68,  108,  108,   71,  108,  108,
+     74,   75,   76,  108,  108,  108,  108,   81,  108,  108,
+     84,  108,  108,  108,  108,   89,   90,   91,  108,   93,
+     94,   66,  108,   68,  108,  108,   71,  108,  108,   74,
+     75,   76,   66,  108,   68,  108,   81,   71,  108,   84,
+     74,   75,   76,  108,   89,   90,   91,   81,   93,   94,
+     84,  108,  108,  108,  108,   89,   90,   91,  108,   93,
+     94,   66,    1,   68,  108,  108,   71,  108,  108,   74,
+     75,   76,  108,  108,   13,  108,   81,  108,   17,   84,
+    108,  108,  108,  108,   89,   90,   91,   26,   93,   94,
+     66,  108,   68,   32,  108,   71,   35,  108,   74,   75,
+    108,   66,  108,   68,  108,   81,   71,  108,   47,   74,
+     75,  108,   88,   89,   90,   91,   81,   93,   94,  108,
+    108,  108,  108,   88,   89,   90,   91,  108,   93,   94,
+     66,  108,   68,    9,  108,   71,   12,  108,   74,   75,
+     16,  108,  108,  108,  108,   81,  108,  108,  108,  108,
+     26,  108,   28,   89,   90,   91,   32,   93,   94,   66,
+    108,   68,  108,  108,   71,  108,  108,   74,   75,  108,
+     66,  108,   68,  108,   81,   71,  108,  108,   74,   75,
+    108,  108,   89,   90,   91,   81,   93,   94,  108,  108,
+    108,  108,  108,   89,   90,   91,  108,   93,   94,   66,
+    108,   68,  108,   73,   71,  108,  108,   74,   75,  108,
+    108,  108,  108,   83,   81,   85,   86,   87,  108,  108,
+    108,  108,   89,   90,   91,  108,   93,   94,   66,  108,
+     68,  108,  108,   71,  108,  108,   74,   75,  108,   66,
+    108,   68,  108,   81,   71,  108,  108,   74,   75,  108,
+    108,   89,   90,   91,   81,   93,   94,  108,  108,  108,
+    108,  108,   89,   90,   91,    2,   93,   94,   66,  108,
+     68,  108,    9,   71,  108,   12,   74,   75,   15,   16,
+     17,  108,  108,   81,  108,  108,  108,  108,  108,  108,
+    108,   89,   90,   91,    2,   93,   94,  108,  108,  108,
+    108,    9,  108,  108,   12,  108,  108,   44,   16,   17,
+     47,    2,   49,  108,   51,  108,  108,   73,    9,  108,
+    108,   12,  108,  108,   15,   16,   17,   83,  108,   85,
+     86,   87,   24,  108,   26,  108,   44,  108,  108,   47,
+     32,   49,  108,   51,   52,   37,   38,   39,  108,  108,
+    108,  108,  108,   44,  108,  108,   47,  108,   49,  108,
+     51,   26,   54,   55,   56,   57,  108,   32,    2,  108,
+    108,  108,   37,   38,   39,    9,  108,  108,   12,  108,
+    108,  108,   16,   17,  108,  108,    2,  108,  108,   54,
+     55,   56,   57,    9,  108,  108,   12,  108,  108,  108,
+     16,   17,  108,  108,  108,   37,   38,   39,  108,  108,
+     44,  108,  108,   47,   13,   49,  108,   51,  108,   13,
+     52,  108,   54,   55,   56,   57,  108,   13,   44,  108,
+      2,   47,  108,   49,  108,   51,  108,  108,   37,   38,
+     39,  108,  108,   37,   38,   39,  108,  108,  108,  108,
+    108,   37,   38,   39,  108,   54,   55,   56,   57,  108,
+     54,   55,   56,   57,  108,   37,   38,   39,   54,   55,
+     56,   57,   36,   37,   38,   39,  108,  108,  108,  108,
+    108,  108,   54,   55,   56,   57,  108,  108,  108,  108,
+     54,   55,   56,   57,    9,  108,  108,   12,   37,   38,
+     39,   16,   17,   36,   37,   38,   39,  108,  108,  108,
+    108,  108,  108,  108,  108,   54,   55,   56,   57,  108,
+    108,   54,   55,   56,   57,  108,  108,  108,  108,   44,
+    108,  108,   47,  108,   49,  108,   51,
+);
+    const YY_SHIFT_USE_DFLT = -22;
+    const YY_SHIFT_MAX = 230;
+    public static $yy_shift_ofst = array(
+    -22,  501,  501,   93,  399,  399,  450,   93,   93,   93,
+    399,  450,   -9,   93,   93,   93,   93,   93,   93,  144,
+     93,  195,   93,   93,   93,  246,  195,   93,   93,   93,
+     93,   93,  297,   93,   93,   93,   93,  348,   42,   42,
+     42,   42,   42,   42,   42,   42, 1768, 1795, 1795,  701,
+    758, 1521,   80,  676,  113,  790, 1927, 1828, 1896,  568,
+    768, 1861,  757, 1866, 1874, 1888,  618,  518, 1921, 1921,
+   1921, 1921, 1921, 1921, 1921, 1921, 1921, 1921, 1921, 1921,
+   1921, 1921, 1921, 1584,  636,  285,  676,  676,  346,  113,
+    113,  402,  700, 1723,   -8,  910,  831,  269, 1028,   51,
+      3,    3,  422,  448,  352,  106,  422,  106,  458,  364,
+    434,  454,  106,  166,  166,  166,  166,  565,  166,  166,
+    166,  586,  565,  166,  166,  -22,  -22, 1752, 1769, 1826,
+   1844, 1945,  145,  979,  156,  132,  284,  106,  140,  106,
+     30,  140,  140,   30,  106,  106,  106,  140,  106,  106,
+    140,  106,  327,  106,  106,  106,  140,  140,  106,  140,
+    205,  106,  284,  166,  565,  588,  565,  588,  565,  166,
+    166,  -12,  166,  -22,  -22,  -22,  -22,  -22,  -22,  689,
+      4,   44,   84,  186,   73,  881,  199,  188,  174,  286,
+     48,  336,  384,  389,  332,  142,  -21,   52,  154,   33,
+     85,  276,  278,  233,  515,  509,  474,  516,  502,  464,
+    491,  415,  417,  432,  514,  370,  463,  506,  365,  513,
+    -12,  517,  504,  519,  505,  511,  496,  525,  532,  330,
+    358,
+);
+    const YY_REDUCE_USE_DFLT = -89;
+    const YY_REDUCE_MAX = 178;
+    public static $yy_reduce_ofst = array(
+    325,  527,  495,  666,  595,  560,  863,  874,  834,  805,
+    762,  794, 1179, 1455, 1208, 1012, 1386, 1139, 1070, 1110,
+   1150, 1219, 1248, 1277, 1288, 1317, 1346, 1357, 1415, 1426,
+   1081, 1041, 1001,  972,  943,  932,  903, 1484, 1495, 1622,
+   1633, 1662, 1593, 1564, 1553, 1524, 1704,  607, 1590,  178,
+     74, 1027,  229,  899,  273,  212,  -22,  -22,  -22,  -22,
+    -22,  -22,  -22,  -22,  -22,  -22,  -22,  -22,  -22,  -22,
+    -22,  -22,  -22,  -22,  -22,  -22,  -22,  -22,  -22,  -22,
+    -22,  -22,  -22,  380,  329,  187,  159,  127,  -52,  253,
+    304,   12,  303,  152,  193,  328,   68,   68,   68,  322,
+    328,  407,  405,  322,   68,  190,  335,  416,  403,   68,
+    401,  354,  371,   68,   68,   68,  337,  322,   68,   68,
+     68,   68,  408,   68,   68,   68,  409,  455,  455,  455,
+    455,  455,  510,  480,  455,  455,  477,  482,  457,  482,
+    473,  457,  457,  485,  482,  482,  482,  457,  482,  482,
+    457,  482,  503,  482,  482,  482,  457,  457,  482,  457,
+    520,  482,  523,  -88,  498,  489,  498,  489,  498,  -88,
+    -88,  -67,  -88,  111,  155,   89,  236,  230,  162,
+);
+    public static $yyExpectedTokens = array(
+         array(),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 52, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(24, 26, 32, 37, 38, 39, 54, 55, 56, 57, ),
+         array(26, 32, 37, 38, 39, 54, 55, 56, 57, ),
+         array(26, 32, 37, 38, 39, 54, 55, 56, 57, ),
+         array(14, 16, 48, 50, 53, ),
+         array(3, 9, 10, 11, 12, 14, 18, 19, 20, 25, 29, 30, 31, 59, 60, ),
+         array(1, 13, 17, 26, 32, 35, 47, ),
+         array(14, 16, 50, 53, ),
+         array(1, 26, 32, ),
+         array(14, 35, 53, ),
+         array(3, 9, 10, 11, 12, 14, 18, 19, 20, 25, 29, 30, 31, 59, 60, ),
+         array(36, 37, 38, 39, 54, 55, 56, 57, ),
+         array(37, 38, 39, 52, 54, 55, 56, 57, ),
+         array(36, 37, 38, 39, 54, 55, 56, 57, ),
+         array(13, 37, 38, 39, 54, 55, 56, 57, ),
+         array(13, 37, 38, 39, 54, 55, 56, 57, ),
+         array(13, 37, 38, 39, 54, 55, 56, 57, ),
+         array(27, 37, 38, 39, 54, 55, 56, 57, ),
+         array(13, 37, 38, 39, 54, 55, 56, 57, ),
+         array(13, 37, 38, 39, 54, 55, 56, 57, ),
+         array(2, 37, 38, 39, 54, 55, 56, 57, ),
+         array(21, 37, 38, 39, 54, 55, 56, 57, ),
+         array(37, 38, 39, 54, 55, 56, 57, 60, ),
+         array(37, 38, 39, 54, 55, 56, 57, ),
+         array(37, 38, 39, 54, 55, 56, 57, ),
+         array(37, 38, 39, 54, 55, 56, 57, ),
+         array(37, 38, 39, 54, 55, 56, 57, ),
+         array(37, 38, 39, 54, 55, 56, 57, ),
+         array(37, 38, 39, 54, 55, 56, 57, ),
+         array(37, 38, 39, 54, 55, 56, 57, ),
+         array(37, 38, 39, 54, 55, 56, 57, ),
+         array(37, 38, 39, 54, 55, 56, 57, ),
+         array(37, 38, 39, 54, 55, 56, 57, ),
+         array(37, 38, 39, 54, 55, 56, 57, ),
+         array(37, 38, 39, 54, 55, 56, 57, ),
+         array(37, 38, 39, 54, 55, 56, 57, ),
+         array(37, 38, 39, 54, 55, 56, 57, ),
+         array(37, 38, 39, 54, 55, 56, 57, ),
+         array(9, 12, 16, 26, 28, 32, ),
+         array(9, 12, 16, 26, 32, ),
+         array(17, 44, 51, ),
+         array(1, 26, 32, ),
+         array(1, 26, 32, ),
+         array(15, 17, 47, ),
+         array(14, 35, 53, ),
+         array(14, 35, 53, ),
+         array(1, 2, ),
+         array(3, 4, 5, 6, 9, 10, 11, 12, 18, 19, 20, 25, 29, 30, 31, ),
+         array(2, 9, 12, 15, 16, 17, 44, 47, 49, 51, ),
+         array(12, 14, 16, 53, ),
+         array(9, 12, 16, 49, ),
+         array(1, 13, 26, 32, ),
+         array(1, 13, 26, 32, ),
+         array(1, 13, 26, 32, ),
+         array(15, 17, 47, ),
+         array(9, 12, 16, ),
+         array(9, 12, 16, ),
+         array(14, 16, ),
+         array(17, 47, ),
+         array(1, 28, ),
+         array(26, 32, ),
+         array(14, 16, ),
+         array(26, 32, ),
+         array(26, 32, ),
+         array(1, 52, ),
+         array(14, 53, ),
+         array(1, 17, ),
+         array(26, 32, ),
+         array(1, ),
+         array(1, ),
+         array(1, ),
+         array(1, ),
+         array(17, ),
+         array(1, ),
+         array(1, ),
+         array(1, ),
+         array(1, ),
+         array(17, ),
+         array(1, ),
+         array(1, ),
+         array(),
+         array(),
+         array(2, 9, 12, 16, 17, 44, 47, 49, 51, 52, ),
+         array(2, 9, 12, 15, 16, 17, 44, 47, 49, 51, ),
+         array(2, 9, 12, 16, 17, 44, 47, 49, 51, ),
+         array(2, 9, 12, 16, 17, 44, 47, 49, 51, ),
+         array(9, 12, 16, 17, 44, 47, 49, 51, ),
+         array(12, 14, 16, 33, 53, ),
+         array(9, 12, 16, 49, ),
+         array(9, 12, 16, ),
+         array(15, 44, 51, ),
+         array(14, 53, ),
+         array(26, 32, ),
+         array(44, 51, ),
+         array(26, 32, ),
+         array(44, 51, ),
+         array(44, 51, ),
+         array(44, 51, ),
+         array(44, 51, ),
+         array(26, 32, ),
+         array(26, 32, ),
+         array(26, 32, ),
+         array(44, 51, ),
+         array(26, 32, ),
+         array(26, 32, ),
+         array(44, 51, ),
+         array(26, 32, ),
+         array(15, 22, ),
+         array(26, 32, ),
+         array(26, 32, ),
+         array(26, 32, ),
+         array(44, 51, ),
+         array(44, 51, ),
+         array(26, 32, ),
+         array(44, 51, ),
+         array(12, 35, ),
+         array(26, 32, ),
+         array(14, 53, ),
+         array(1, ),
+         array(17, ),
+         array(2, ),
+         array(17, ),
+         array(2, ),
+         array(17, ),
+         array(1, ),
+         array(1, ),
+         array(35, ),
+         array(1, ),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(2, 35, 37, 38, 39, 47, 54, 55, 56, 57, ),
+         array(13, 21, 23, 26, 32, 34, 36, 44, ),
+         array(13, 15, 26, 32, 35, 47, ),
+         array(13, 22, 26, 32, 45, ),
+         array(13, 22, 26, 32, 45, ),
+         array(35, 44, 47, 52, ),
+         array(9, 12, 16, 49, ),
+         array(22, 45, 52, ),
+         array(28, 35, 47, ),
+         array(22, 45, 60, ),
+         array(35, 47, ),
+         array(21, 34, ),
+         array(34, 36, ),
+         array(16, 49, ),
+         array(6, 8, ),
+         array(44, 52, ),
+         array(7, 8, ),
+         array(34, 52, ),
+         array(35, 47, ),
+         array(35, 47, ),
+         array(22, 45, ),
+         array(34, 36, ),
+         array(15, 44, ),
+         array(34, 36, ),
+         array(34, 36, ),
+         array(13, ),
+         array(16, ),
+         array(50, ),
+         array(7, ),
+         array(16, ),
+         array(52, ),
+         array(23, ),
+         array(36, ),
+         array(50, ),
+         array(14, ),
+         array(13, ),
+         array(52, ),
+         array(15, ),
+         array(16, ),
+         array(40, ),
+         array(16, ),
+         array(35, ),
+         array(16, ),
+         array(33, ),
+         array(16, ),
+         array(33, ),
+         array(35, ),
+         array(44, ),
+         array(16, ),
+         array(16, ),
+         array(16, ),
+         array(16, ),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+);
+    public static $yy_default = array(
+    336,  512,  512,  512,  497,  497,  512,  474,  474,  474,
+    512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
+    512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
+    512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
+    512,  512,  512,  512,  512,  512,  377,  377,  356,  512,
+    512,  413,  512,  377,  512,  512,  512,  512,  512,  512,
+    512,  512,  382,  512,  349,  512,  512,  512,  382,  379,
+    389,  388,  384,  402,  473,  397,  498,  500,  401,  361,
+    472,  499,  349,  377,  377,  487,  377,  377,  429,  512,
+    512,  368,  326,  428,  512,  439,  391,  391,  391,  429,
+    439,  439,  512,  429,  391,  377,  512,  377,  377,  391,
+    512,  371,  358,  395,  394,  396,  373,  429,  400,  404,
+    391,  404,  484,  406,  405,  481,  334,  428,  428,  428,
+    428,  428,  512,  441,  439,  455,  512,  363,  435,  354,
+    434,  437,  433,  432,  359,  357,  364,  436,  353,  367,
+    466,  365,  512,  352,  350,  360,  467,  465,  346,  464,
+    439,  366,  512,  369,  461,  475,  488,  476,  485,  372,
+    422,  439,  374,  480,  439,  480,  480,  439,  334,  413,
+    409,  413,  403,  403,  413,  440,  403,  413,  403,  413,
+    512,  512,  512,  332,  409,  512,  512,  512,  423,  403,
+    512,  409,  512,  512,  512,  512,  512,  512,  512,  418,
+    385,  512,  512,  512,  512,  512,  512,  512,  415,  512,
+    455,  512,  512,  512,  411,  486,  409,  512,  512,  512,
+    512,  419,  407,  362,  445,  418,  425,  424,  420,  339,
+    460,  421,  483,  398,  416,  340,  399,  455,  378,  337,
+    338,  330,  328,  329,  442,  443,  444,  438,  392,  393,
+    427,  426,  386,  417,  408,  390,  410,  331,  333,  335,
+    412,  470,  414,  415,  503,  478,  495,  471,  459,  458,
+    375,  457,  344,  462,  508,  493,  376,  496,  456,  509,
+    494,  501,  504,  511,  510,  507,  505,  502,  506,  345,
+    468,  469,  446,  355,  341,  452,  450,  454,  448,  453,
+    447,  489,  490,  491,  463,  449,  492,  451,  327,  342,
+    343,  370,  430,  431,  479,  477,
+);
+    const YYNOCODE = 109;
+    const YYSTACKDEPTH = 500;
+    const YYNSTATE = 326;
+    const YYNRULE = 186;
+    const YYERRORSYMBOL = 61;
+    const YYERRSYMDT = 'yy0';
+    const YYFALLBACK = 0;
+    public static $yyFallback = array(
+    );
     public function Trace($TraceFILE, $zTracePrompt)
     {
         if (!$TraceFILE) {
@@ -1840,18 +1110,250 @@ class Smarty_Internal_Templateparser
         $this->yyTracePrompt = '<br>';
     }
 
+    public $yyTraceFILE;
+    public $yyTracePrompt;
+    public $yyidx;                    /* Index of top element in stack */
+    public $yyerrcnt;                 /* Shifts left before out of the error */
+    public $yystack = array();  /* The parser's stack */
+
+    public $yyTokenName = array(
+  '$',             'VERT',          'COLON',         'TEXT',        
+  'STRIPON',       'STRIPOFF',      'LITERALSTART',  'LITERALEND',  
+  'LITERAL',       'SIMPELOUTPUT',  'SIMPLETAG',     'SMARTYBLOCKCHILDPARENT',
+  'LDEL',          'RDEL',          'DOLLARID',      'EQUAL',       
+  'ID',            'PTR',           'LDELMAKENOCACHE',  'LDELIF',      
+  'LDELFOR',       'SEMICOLON',     'INCDEC',        'TO',          
+  'STEP',          'LDELFOREACH',   'SPACE',         'AS',          
+  'APTR',          'LDELSETFILTER',  'CLOSETAG',      'LDELSLASH',   
+  'ATTR',          'INTEGER',       'COMMA',         'OPENP',       
+  'CLOSEP',        'MATH',          'UNIMATH',       'ISIN',        
+  'QMARK',         'NOT',           'TYPECAST',      'HEX',         
+  'DOT',           'INSTANCEOF',    'SINGLEQUOTESTRING',  'DOUBLECOLON', 
+  'NAMESPACE',     'AT',            'HATCH',         'OPENB',       
+  'CLOSEB',        'DOLLAR',        'LOGOP',         'SLOGOP',      
+  'TLOGOP',        'SINGLECOND',    'ARRAYOPEN',     'QUOTE',       
+  'BACKTICK',      'error',         'start',         'template',    
+  'literal_e2',    'literal_e1',    'smartytag',     'tagbody',     
+  'tag',           'outattr',       'eqoutattr',     'varindexed',  
+  'output',        'attributes',    'variable',      'value',       
+  'expr',          'modifierlist',  'statement',     'statements',  
+  'foraction',     'varvar',        'modparameters',  'attribute',   
+  'ternary',       'tlop',          'lop',           'scond',       
+  'array',         'function',      'ns1',           'doublequoted_with_quotes',
+  'static_class_access',  'arraydef',      'object',        'arrayindex',  
+  'indexdef',      'varvarele',     'objectchain',   'objectelement',
+  'method',        'params',        'modifier',      'modparameter',
+  'arrayelements',  'arrayelement',  'doublequoted',  'doublequotedcontent',
+    );
+
+    public static $yyRuleName = array(
+  'start ::= template',
+  'template ::= template TEXT',
+  'template ::= template STRIPON',
+  'template ::= template STRIPOFF',
+  'template ::= template LITERALSTART literal_e2 LITERALEND',
+  'literal_e2 ::= literal_e1 LITERALSTART literal_e1 LITERALEND',
+  'literal_e2 ::= literal_e1',
+  'literal_e1 ::= literal_e1 LITERAL',
+  'literal_e1 ::=',
+  'template ::= template smartytag',
+  'template ::=',
+  'smartytag ::= SIMPELOUTPUT',
+  'smartytag ::= SIMPLETAG',
+  'smartytag ::= SMARTYBLOCKCHILDPARENT',
+  'smartytag ::= LDEL tagbody RDEL',
+  'smartytag ::= tag RDEL',
+  'tagbody ::= outattr',
+  'tagbody ::= DOLLARID eqoutattr',
+  'tagbody ::= varindexed eqoutattr',
+  'eqoutattr ::= EQUAL outattr',
+  'outattr ::= output attributes',
+  'output ::= variable',
+  'output ::= value',
+  'output ::= expr',
+  'tag ::= LDEL ID attributes',
+  'tag ::= LDEL ID',
+  'tag ::= LDEL ID modifierlist attributes',
+  'tag ::= LDEL ID PTR ID attributes',
+  'tag ::= LDEL ID PTR ID modifierlist attributes',
+  'tag ::= LDELMAKENOCACHE DOLLARID',
+  'tag ::= LDELIF expr',
+  'tag ::= LDELIF expr attributes',
+  'tag ::= LDELIF statement',
+  'tag ::= LDELIF statement attributes',
+  'tag ::= LDELFOR statements SEMICOLON expr SEMICOLON varindexed foraction attributes',
+  'foraction ::= EQUAL expr',
+  'foraction ::= INCDEC',
+  'tag ::= LDELFOR statement TO expr attributes',
+  'tag ::= LDELFOR statement TO expr STEP expr attributes',
+  'tag ::= LDELFOREACH SPACE expr AS varvar attributes',
+  'tag ::= LDELFOREACH SPACE expr AS varvar APTR varvar attributes',
+  'tag ::= LDELFOREACH attributes',
+  'tag ::= LDELSETFILTER ID modparameters',
+  'tag ::= LDELSETFILTER ID modparameters modifierlist',
+  'smartytag ::= CLOSETAG',
+  'tag ::= LDELSLASH ID',
+  'tag ::= LDELSLASH ID modifierlist',
+  'tag ::= LDELSLASH ID PTR ID',
+  'tag ::= LDELSLASH ID PTR ID modifierlist',
+  'attributes ::= attributes attribute',
+  'attributes ::= attribute',
+  'attributes ::=',
+  'attribute ::= SPACE ID EQUAL ID',
+  'attribute ::= ATTR expr',
+  'attribute ::= ATTR value',
+  'attribute ::= SPACE ID',
+  'attribute ::= SPACE expr',
+  'attribute ::= SPACE value',
+  'attribute ::= SPACE INTEGER EQUAL expr',
+  'statements ::= statement',
+  'statements ::= statements COMMA statement',
+  'statement ::= DOLLARID EQUAL INTEGER',
+  'statement ::= DOLLARID EQUAL expr',
+  'statement ::= varindexed EQUAL expr',
+  'statement ::= OPENP statement CLOSEP',
+  'expr ::= value',
+  'expr ::= ternary',
+  'expr ::= DOLLARID COLON ID',
+  'expr ::= expr MATH value',
+  'expr ::= expr UNIMATH value',
+  'expr ::= expr tlop value',
+  'expr ::= expr lop expr',
+  'expr ::= expr scond',
+  'expr ::= expr ISIN array',
+  'expr ::= expr ISIN value',
+  'ternary ::= OPENP expr CLOSEP QMARK DOLLARID COLON expr',
+  'ternary ::= OPENP expr CLOSEP QMARK expr COLON expr',
+  'value ::= variable',
+  'value ::= UNIMATH value',
+  'value ::= NOT value',
+  'value ::= TYPECAST value',
+  'value ::= variable INCDEC',
+  'value ::= HEX',
+  'value ::= INTEGER',
+  'value ::= INTEGER DOT INTEGER',
+  'value ::= INTEGER DOT',
+  'value ::= DOT INTEGER',
+  'value ::= ID',
+  'value ::= function',
+  'value ::= OPENP expr CLOSEP',
+  'value ::= variable INSTANCEOF ns1',
+  'value ::= variable INSTANCEOF variable',
+  'value ::= SINGLEQUOTESTRING',
+  'value ::= doublequoted_with_quotes',
+  'value ::= varindexed DOUBLECOLON static_class_access',
+  'value ::= smartytag',
+  'value ::= value modifierlist',
+  'value ::= NAMESPACE',
+  'value ::= arraydef',
+  'value ::= ns1 DOUBLECOLON static_class_access',
+  'ns1 ::= ID',
+  'ns1 ::= NAMESPACE',
+  'variable ::= DOLLARID',
+  'variable ::= varindexed',
+  'variable ::= varvar AT ID',
+  'variable ::= object',
+  'variable ::= HATCH ID HATCH',
+  'variable ::= HATCH ID HATCH arrayindex',
+  'variable ::= HATCH variable HATCH',
+  'variable ::= HATCH variable HATCH arrayindex',
+  'varindexed ::= DOLLARID arrayindex',
+  'varindexed ::= varvar arrayindex',
+  'arrayindex ::= arrayindex indexdef',
+  'arrayindex ::=',
+  'indexdef ::= DOT DOLLARID',
+  'indexdef ::= DOT varvar',
+  'indexdef ::= DOT varvar AT ID',
+  'indexdef ::= DOT ID',
+  'indexdef ::= DOT INTEGER',
+  'indexdef ::= DOT LDEL expr RDEL',
+  'indexdef ::= OPENB ID CLOSEB',
+  'indexdef ::= OPENB ID DOT ID CLOSEB',
+  'indexdef ::= OPENB SINGLEQUOTESTRING CLOSEB',
+  'indexdef ::= OPENB INTEGER CLOSEB',
+  'indexdef ::= OPENB DOLLARID CLOSEB',
+  'indexdef ::= OPENB variable CLOSEB',
+  'indexdef ::= OPENB value CLOSEB',
+  'indexdef ::= OPENB expr CLOSEB',
+  'indexdef ::= OPENB CLOSEB',
+  'varvar ::= DOLLARID',
+  'varvar ::= DOLLAR',
+  'varvar ::= varvar varvarele',
+  'varvarele ::= ID',
+  'varvarele ::= SIMPELOUTPUT',
+  'varvarele ::= LDEL expr RDEL',
+  'object ::= varindexed objectchain',
+  'objectchain ::= objectelement',
+  'objectchain ::= objectchain objectelement',
+  'objectelement ::= PTR ID arrayindex',
+  'objectelement ::= PTR varvar arrayindex',
+  'objectelement ::= PTR LDEL expr RDEL arrayindex',
+  'objectelement ::= PTR ID LDEL expr RDEL arrayindex',
+  'objectelement ::= PTR method',
+  'function ::= ns1 OPENP params CLOSEP',
+  'method ::= ID OPENP params CLOSEP',
+  'method ::= DOLLARID OPENP params CLOSEP',
+  'params ::= params COMMA expr',
+  'params ::= expr',
+  'params ::=',
+  'modifierlist ::= modifierlist modifier modparameters',
+  'modifierlist ::= modifier modparameters',
+  'modifier ::= VERT AT ID',
+  'modifier ::= VERT ID',
+  'modparameters ::= modparameters modparameter',
+  'modparameters ::=',
+  'modparameter ::= COLON value',
+  'modparameter ::= COLON UNIMATH value',
+  'modparameter ::= COLON array',
+  'static_class_access ::= method',
+  'static_class_access ::= method objectchain',
+  'static_class_access ::= ID',
+  'static_class_access ::= DOLLARID arrayindex',
+  'static_class_access ::= DOLLARID arrayindex objectchain',
+  'lop ::= LOGOP',
+  'lop ::= SLOGOP',
+  'tlop ::= TLOGOP',
+  'scond ::= SINGLECOND',
+  'arraydef ::= OPENB arrayelements CLOSEB',
+  'arraydef ::= ARRAYOPEN arrayelements CLOSEP',
+  'arrayelements ::= arrayelement',
+  'arrayelements ::= arrayelements COMMA arrayelement',
+  'arrayelements ::=',
+  'arrayelement ::= value APTR expr',
+  'arrayelement ::= ID APTR expr',
+  'arrayelement ::= expr',
+  'doublequoted_with_quotes ::= QUOTE QUOTE',
+  'doublequoted_with_quotes ::= QUOTE doublequoted QUOTE',
+  'doublequoted ::= doublequoted doublequotedcontent',
+  'doublequoted ::= doublequotedcontent',
+  'doublequotedcontent ::= BACKTICK variable BACKTICK',
+  'doublequotedcontent ::= BACKTICK expr BACKTICK',
+  'doublequotedcontent ::= DOLLARID',
+  'doublequotedcontent ::= LDEL variable RDEL',
+  'doublequotedcontent ::= LDEL expr RDEL',
+  'doublequotedcontent ::= smartytag',
+  'doublequotedcontent ::= TEXT',
+    );
+
     public function tokenName($tokenType)
     {
         if ($tokenType === 0) {
             return 'End of Input';
         }
         if ($tokenType > 0 && $tokenType < count($this->yyTokenName)) {
-            return $this->yyTokenName[ $tokenType ];
+            return $this->yyTokenName[$tokenType];
         } else {
             return 'Unknown';
         }
     }
 
+    public static function yy_destructor($yymajor, $yypminor)
+    {
+        switch ($yymajor) {
+            default:  break;   /* If no destructor action specified: do nothing */
+        }
+    }
+
     public function yy_pop_parser_stack()
     {
         if (empty($this->yystack)) {
@@ -1860,18 +1362,19 @@ class Smarty_Internal_Templateparser
         $yytos = array_pop($this->yystack);
         if ($this->yyTraceFILE && $this->yyidx >= 0) {
             fwrite($this->yyTraceFILE,
-                $this->yyTracePrompt . 'Popping ' . $this->yyTokenName[ $yytos->major ] .
-                "\n");
+                $this->yyTracePrompt . 'Popping ' . $this->yyTokenName[$yytos->major] .
+                    "\n");
         }
         $yymajor = $yytos->major;
         self::yy_destructor($yymajor, $yytos->minor);
         $this->yyidx--;
+
         return $yymajor;
     }
 
     public function __destruct()
     {
-        while ($this->yystack !== array()) {
+        while ($this->yystack !== Array()) {
             $this->yy_pop_parser_stack();
         }
         if (is_resource($this->yyTraceFILE)) {
@@ -1883,14 +1386,14 @@ class Smarty_Internal_Templateparser
     {
         static $res3 = array();
         static $res4 = array();
-        $state = $this->yystack[ $this->yyidx ]->stateno;
-        $expected = self::$yyExpectedTokens[ $state ];
-        if (isset($res3[ $state ][ $token ])) {
-            if ($res3[ $state ][ $token ]) {
+        $state = $this->yystack[$this->yyidx]->stateno;
+        $expected = self::$yyExpectedTokens[$state];
+        if (isset($res3[$state][$token])) {
+            if ($res3[$state][$token]) {
                 return $expected;
             }
         } else {
-            if ($res3[ $state ][ $token ] = in_array($token, self::$yyExpectedTokens[ $state ], true)) {
+            if ($res3[$state][$token] = in_array($token, self::$yyExpectedTokens[$state], true)) {
                 return $expected;
             }
         }
@@ -1910,21 +1413,20 @@ class Smarty_Internal_Templateparser
                         return array_unique($expected);
                     }
                     $yyruleno = $yyact - self::YYNSTATE;
-                    $this->yyidx -= self::$yyRuleInfo[ $yyruleno ][ 1 ];
+                    $this->yyidx -= self::$yyRuleInfo[$yyruleno][1];
                     $nextstate = $this->yy_find_reduce_action(
-                        $this->yystack[ $this->yyidx ]->stateno,
-                        self::$yyRuleInfo[ $yyruleno ][ 0 ]);
-                    if (isset(self::$yyExpectedTokens[ $nextstate ])) {
-                        $expected = array_merge($expected, self::$yyExpectedTokens[ $nextstate ]);
-                        if (isset($res4[ $nextstate ][ $token ])) {
-                            if ($res4[ $nextstate ][ $token ]) {
+                        $this->yystack[$this->yyidx]->stateno,
+                        self::$yyRuleInfo[$yyruleno][0]);
+                    if (isset(self::$yyExpectedTokens[$nextstate])) {
+                $expected = array_merge($expected, self::$yyExpectedTokens[$nextstate]);
+                        if (isset($res4[$nextstate][$token])) {
+                            if ($res4[$nextstate][$token]) {
                                 $this->yyidx = $yyidx;
                                 $this->yystack = $stack;
                                 return array_unique($expected);
                             }
                         } else {
-                            if ($res4[ $nextstate ][ $token ] =
-                                in_array($token, self::$yyExpectedTokens[ $nextstate ], true)) {
+                            if ($res4[$nextstate][$token] = in_array($token, self::$yyExpectedTokens[$nextstate], true)) {
                                 $this->yyidx = $yyidx;
                                 $this->yystack = $stack;
                                 return array_unique($expected);
@@ -1936,8 +1438,8 @@ class Smarty_Internal_Templateparser
                         $this->yyidx++;
                         $x = new TP_yyStackEntry;
                         $x->stateno = $nextstate;
-                        $x->major = self::$yyRuleInfo[ $yyruleno ][ 0 ];
-                        $this->yystack[ $this->yyidx ] = $x;
+                        $x->major = self::$yyRuleInfo[$yyruleno][0];
+                        $this->yystack[$this->yyidx] = $x;
                         continue 2;
                     } elseif ($nextstate === self::YYNSTATE + self::YYNRULE + 1) {
                         $this->yyidx = $yyidx;
@@ -1958,8 +1460,9 @@ class Smarty_Internal_Templateparser
             }
             break;
         } while (true);
-        $this->yyidx = $yyidx;
-        $this->yystack = $stack;
+    $this->yyidx = $yyidx;
+    $this->yystack = $stack;
+
         return array_unique($expected);
     }
 
@@ -1970,16 +1473,16 @@ class Smarty_Internal_Templateparser
         if ($token === 0) {
             return true; // 0 is not part of this
         }
-        $state = $this->yystack[ $this->yyidx ]->stateno;
-        if (isset($res[ $state ][ $token ])) {
-            if ($res[ $state ][ $token ]) {
+        $state = $this->yystack[$this->yyidx]->stateno;
+        if (isset($res[$state][$token])) {
+            if ($res[$state][$token]) {
                 return true;
             }
         } else {
-            if ($res[ $state ][ $token ] = in_array($token, self::$yyExpectedTokens[ $state ], true)) {
+            if ($res[$state][$token] = in_array($token, self::$yyExpectedTokens[$state], true)) {
                 return true;
             }
-        }
+       }
         $stack = $this->yystack;
         $yyidx = $this->yyidx;
         do {
@@ -1996,20 +1499,18 @@ class Smarty_Internal_Templateparser
                         return true;
                     }
                     $yyruleno = $yyact - self::YYNSTATE;
-                    $this->yyidx -= self::$yyRuleInfo[ $yyruleno ][ 1 ];
+                    $this->yyidx -= self::$yyRuleInfo[$yyruleno][1];
                     $nextstate = $this->yy_find_reduce_action(
-                        $this->yystack[ $this->yyidx ]->stateno,
-                        self::$yyRuleInfo[ $yyruleno ][ 0 ]);
-                    if (isset($res2[ $nextstate ][ $token ])) {
-                        if ($res2[ $nextstate ][ $token ]) {
+                        $this->yystack[$this->yyidx]->stateno,
+                        self::$yyRuleInfo[$yyruleno][0]);
+                    if (isset($res2[$nextstate][$token])) {
+                        if ($res2[$nextstate][$token]) {
                             $this->yyidx = $yyidx;
                             $this->yystack = $stack;
                             return true;
                         }
                     } else {
-                        if ($res2[ $nextstate ][ $token ] =
-                            (isset(self::$yyExpectedTokens[ $nextstate ]) &&
-                             in_array($token, self::$yyExpectedTokens[ $nextstate ], true))) {
+                        if ($res2[$nextstate][$token] = (isset(self::$yyExpectedTokens[$nextstate]) && in_array($token, self::$yyExpectedTokens[$nextstate], true))) {
                             $this->yyidx = $yyidx;
                             $this->yystack = $stack;
                             return true;
@@ -2020,8 +1521,8 @@ class Smarty_Internal_Templateparser
                         $this->yyidx++;
                         $x = new TP_yyStackEntry;
                         $x->stateno = $nextstate;
-                        $x->major = self::$yyRuleInfo[ $yyruleno ][ 0 ];
-                        $this->yystack[ $this->yyidx ] = $x;
+                        $x->major = self::$yyRuleInfo[$yyruleno][0];
+                        $this->yystack[$this->yyidx] = $x;
                         continue 2;
                     } elseif ($nextstate === self::YYNSTATE + self::YYNRULE + 1) {
                         $this->yyidx = $yyidx;
@@ -2048,65 +1549,69 @@ class Smarty_Internal_Templateparser
         } while (true);
         $this->yyidx = $yyidx;
         $this->yystack = $stack;
+
         return true;
     }
 
-    public function yy_find_shift_action($iLookAhead)
+   public function yy_find_shift_action($iLookAhead)
     {
-        $stateno = $this->yystack[ $this->yyidx ]->stateno;
+        $stateno = $this->yystack[$this->yyidx]->stateno;
+
         /* if ($this->yyidx < 0) return self::YY_NO_ACTION;  */
-        if (!isset(self::$yy_shift_ofst[ $stateno ])) {
+        if (!isset(self::$yy_shift_ofst[$stateno])) {
             // no shift actions
-            return self::$yy_default[ $stateno ];
+            return self::$yy_default[$stateno];
         }
-        $i = self::$yy_shift_ofst[ $stateno ];
+        $i = self::$yy_shift_ofst[$stateno];
         if ($i === self::YY_SHIFT_USE_DFLT) {
-            return self::$yy_default[ $stateno ];
+            return self::$yy_default[$stateno];
         }
         if ($iLookAhead === self::YYNOCODE) {
             return self::YY_NO_ACTION;
         }
         $i += $iLookAhead;
         if ($i < 0 || $i >= self::YY_SZ_ACTTAB ||
-            self::$yy_lookahead[ $i ] != $iLookAhead) {
+              self::$yy_lookahead[$i] != $iLookAhead) {
             if (count(self::$yyFallback) && $iLookAhead < count(self::$yyFallback)
-                && ($iFallback = self::$yyFallback[ $iLookAhead ]) != 0) {
+                   && ($iFallback = self::$yyFallback[$iLookAhead]) != 0) {
                 if ($this->yyTraceFILE) {
                     fwrite($this->yyTraceFILE, $this->yyTracePrompt . 'FALLBACK ' .
-                                               $this->yyTokenName[ $iLookAhead ] . ' => ' .
-                                               $this->yyTokenName[ $iFallback ] . "\n");
+                        $this->yyTokenName[$iLookAhead] . ' => ' .
+                        $this->yyTokenName[$iFallback] . "\n");
                 }
+
                 return $this->yy_find_shift_action($iFallback);
             }
-            return self::$yy_default[ $stateno ];
+
+            return self::$yy_default[$stateno];
         } else {
-            return self::$yy_action[ $i ];
+            return self::$yy_action[$i];
         }
     }
 
     public function yy_find_reduce_action($stateno, $iLookAhead)
     {
         /* $stateno = $this->yystack[$this->yyidx]->stateno; */
-        if (!isset(self::$yy_reduce_ofst[ $stateno ])) {
-            return self::$yy_default[ $stateno ];
+
+        if (!isset(self::$yy_reduce_ofst[$stateno])) {
+            return self::$yy_default[$stateno];
         }
-        $i = self::$yy_reduce_ofst[ $stateno ];
+        $i = self::$yy_reduce_ofst[$stateno];
         if ($i === self::YY_REDUCE_USE_DFLT) {
-            return self::$yy_default[ $stateno ];
+            return self::$yy_default[$stateno];
         }
         if ($iLookAhead === self::YYNOCODE) {
             return self::YY_NO_ACTION;
         }
         $i += $iLookAhead;
         if ($i < 0 || $i >= self::YY_SZ_ACTTAB ||
-            self::$yy_lookahead[ $i ] != $iLookAhead) {
-            return self::$yy_default[ $stateno ];
+              self::$yy_lookahead[$i] != $iLookAhead) {
+            return self::$yy_default[$stateno];
         } else {
-            return self::$yy_action[ $i ];
+            return self::$yy_action[$i];
         }
     }
 
-    // line 234 "../smarty/lexer/smarty_internal_templateparser.y"
     public function yy_shift($yyNewState, $yyMajor, $yypMinor)
     {
         $this->yyidx++;
@@ -2118,9 +1623,11 @@ class Smarty_Internal_Templateparser
             while ($this->yyidx >= 0) {
                 $this->yy_pop_parser_stack();
             }
-            // line 221 "../smarty/lexer/smarty_internal_templateparser.y"
-            $this->internalError = true;
-            $this->compiler->trigger_template_error('Stack overflow in template parser');
+// line 220 "../smarty/lexer/smarty_internal_templateparser.y"
+
+    $this->internalError = true;
+    $this->compiler->trigger_template_error('Stack overflow in template parser');
+
             return;
         }
         $yytos = new TP_yyStackEntry;
@@ -2134,1357 +1641,1147 @@ class Smarty_Internal_Templateparser
             fprintf($this->yyTraceFILE, "%sStack:", $this->yyTracePrompt);
             for ($i = 1; $i <= $this->yyidx; $i++) {
                 fprintf($this->yyTraceFILE, " %s",
-                    $this->yyTokenName[ $this->yystack[ $i ]->major ]);
+                    $this->yyTokenName[$this->yystack[$i]->major]);
             }
-            fwrite($this->yyTraceFILE, "\n");
+            fwrite($this->yyTraceFILE,"\n");
         }
     }
 
-    // line 242 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r0()
-    {
-        $this->root_buffer->prepend_array($this, $this->template_prefix);
-        $this->root_buffer->append_array($this, $this->template_postfix);
-        $this->_retvalue = $this->root_buffer->to_smarty_php($this);
+    public static $yyRuleInfo = array(
+  array( 0 => 62, 1 => 1 ),
+  array( 0 => 63, 1 => 2 ),
+  array( 0 => 63, 1 => 2 ),
+  array( 0 => 63, 1 => 2 ),
+  array( 0 => 63, 1 => 4 ),
+  array( 0 => 64, 1 => 4 ),
+  array( 0 => 64, 1 => 1 ),
+  array( 0 => 65, 1 => 2 ),
+  array( 0 => 65, 1 => 0 ),
+  array( 0 => 63, 1 => 2 ),
+  array( 0 => 63, 1 => 0 ),
+  array( 0 => 66, 1 => 1 ),
+  array( 0 => 66, 1 => 1 ),
+  array( 0 => 66, 1 => 1 ),
+  array( 0 => 66, 1 => 3 ),
+  array( 0 => 66, 1 => 2 ),
+  array( 0 => 67, 1 => 1 ),
+  array( 0 => 67, 1 => 2 ),
+  array( 0 => 67, 1 => 2 ),
+  array( 0 => 70, 1 => 2 ),
+  array( 0 => 69, 1 => 2 ),
+  array( 0 => 72, 1 => 1 ),
+  array( 0 => 72, 1 => 1 ),
+  array( 0 => 72, 1 => 1 ),
+  array( 0 => 68, 1 => 3 ),
+  array( 0 => 68, 1 => 2 ),
+  array( 0 => 68, 1 => 4 ),
+  array( 0 => 68, 1 => 5 ),
+  array( 0 => 68, 1 => 6 ),
+  array( 0 => 68, 1 => 2 ),
+  array( 0 => 68, 1 => 2 ),
+  array( 0 => 68, 1 => 3 ),
+  array( 0 => 68, 1 => 2 ),
+  array( 0 => 68, 1 => 3 ),
+  array( 0 => 68, 1 => 8 ),
+  array( 0 => 80, 1 => 2 ),
+  array( 0 => 80, 1 => 1 ),
+  array( 0 => 68, 1 => 5 ),
+  array( 0 => 68, 1 => 7 ),
+  array( 0 => 68, 1 => 6 ),
+  array( 0 => 68, 1 => 8 ),
+  array( 0 => 68, 1 => 2 ),
+  array( 0 => 68, 1 => 3 ),
+  array( 0 => 68, 1 => 4 ),
+  array( 0 => 66, 1 => 1 ),
+  array( 0 => 68, 1 => 2 ),
+  array( 0 => 68, 1 => 3 ),
+  array( 0 => 68, 1 => 4 ),
+  array( 0 => 68, 1 => 5 ),
+  array( 0 => 73, 1 => 2 ),
+  array( 0 => 73, 1 => 1 ),
+  array( 0 => 73, 1 => 0 ),
+  array( 0 => 83, 1 => 4 ),
+  array( 0 => 83, 1 => 2 ),
+  array( 0 => 83, 1 => 2 ),
+  array( 0 => 83, 1 => 2 ),
+  array( 0 => 83, 1 => 2 ),
+  array( 0 => 83, 1 => 2 ),
+  array( 0 => 83, 1 => 4 ),
+  array( 0 => 79, 1 => 1 ),
+  array( 0 => 79, 1 => 3 ),
+  array( 0 => 78, 1 => 3 ),
+  array( 0 => 78, 1 => 3 ),
+  array( 0 => 78, 1 => 3 ),
+  array( 0 => 78, 1 => 3 ),
+  array( 0 => 76, 1 => 1 ),
+  array( 0 => 76, 1 => 1 ),
+  array( 0 => 76, 1 => 3 ),
+  array( 0 => 76, 1 => 3 ),
+  array( 0 => 76, 1 => 3 ),
+  array( 0 => 76, 1 => 3 ),
+  array( 0 => 76, 1 => 3 ),
+  array( 0 => 76, 1 => 2 ),
+  array( 0 => 76, 1 => 3 ),
+  array( 0 => 76, 1 => 3 ),
+  array( 0 => 84, 1 => 7 ),
+  array( 0 => 84, 1 => 7 ),
+  array( 0 => 75, 1 => 1 ),
+  array( 0 => 75, 1 => 2 ),
+  array( 0 => 75, 1 => 2 ),
+  array( 0 => 75, 1 => 2 ),
+  array( 0 => 75, 1 => 2 ),
+  array( 0 => 75, 1 => 1 ),
+  array( 0 => 75, 1 => 1 ),
+  array( 0 => 75, 1 => 3 ),
+  array( 0 => 75, 1 => 2 ),
+  array( 0 => 75, 1 => 2 ),
+  array( 0 => 75, 1 => 1 ),
+  array( 0 => 75, 1 => 1 ),
+  array( 0 => 75, 1 => 3 ),
+  array( 0 => 75, 1 => 3 ),
+  array( 0 => 75, 1 => 3 ),
+  array( 0 => 75, 1 => 1 ),
+  array( 0 => 75, 1 => 1 ),
+  array( 0 => 75, 1 => 3 ),
+  array( 0 => 75, 1 => 1 ),
+  array( 0 => 75, 1 => 2 ),
+  array( 0 => 75, 1 => 1 ),
+  array( 0 => 75, 1 => 1 ),
+  array( 0 => 75, 1 => 3 ),
+  array( 0 => 90, 1 => 1 ),
+  array( 0 => 90, 1 => 1 ),
+  array( 0 => 74, 1 => 1 ),
+  array( 0 => 74, 1 => 1 ),
+  array( 0 => 74, 1 => 3 ),
+  array( 0 => 74, 1 => 1 ),
+  array( 0 => 74, 1 => 3 ),
+  array( 0 => 74, 1 => 4 ),
+  array( 0 => 74, 1 => 3 ),
+  array( 0 => 74, 1 => 4 ),
+  array( 0 => 71, 1 => 2 ),
+  array( 0 => 71, 1 => 2 ),
+  array( 0 => 95, 1 => 2 ),
+  array( 0 => 95, 1 => 0 ),
+  array( 0 => 96, 1 => 2 ),
+  array( 0 => 96, 1 => 2 ),
+  array( 0 => 96, 1 => 4 ),
+  array( 0 => 96, 1 => 2 ),
+  array( 0 => 96, 1 => 2 ),
+  array( 0 => 96, 1 => 4 ),
+  array( 0 => 96, 1 => 3 ),
+  array( 0 => 96, 1 => 5 ),
+  array( 0 => 96, 1 => 3 ),
+  array( 0 => 96, 1 => 3 ),
+  array( 0 => 96, 1 => 3 ),
+  array( 0 => 96, 1 => 3 ),
+  array( 0 => 96, 1 => 3 ),
+  array( 0 => 96, 1 => 3 ),
+  array( 0 => 96, 1 => 2 ),
+  array( 0 => 81, 1 => 1 ),
+  array( 0 => 81, 1 => 1 ),
+  array( 0 => 81, 1 => 2 ),
+  array( 0 => 97, 1 => 1 ),
+  array( 0 => 97, 1 => 1 ),
+  array( 0 => 97, 1 => 3 ),
+  array( 0 => 94, 1 => 2 ),
+  array( 0 => 98, 1 => 1 ),
+  array( 0 => 98, 1 => 2 ),
+  array( 0 => 99, 1 => 3 ),
+  array( 0 => 99, 1 => 3 ),
+  array( 0 => 99, 1 => 5 ),
+  array( 0 => 99, 1 => 6 ),
+  array( 0 => 99, 1 => 2 ),
+  array( 0 => 89, 1 => 4 ),
+  array( 0 => 100, 1 => 4 ),
+  array( 0 => 100, 1 => 4 ),
+  array( 0 => 101, 1 => 3 ),
+  array( 0 => 101, 1 => 1 ),
+  array( 0 => 101, 1 => 0 ),
+  array( 0 => 77, 1 => 3 ),
+  array( 0 => 77, 1 => 2 ),
+  array( 0 => 102, 1 => 3 ),
+  array( 0 => 102, 1 => 2 ),
+  array( 0 => 82, 1 => 2 ),
+  array( 0 => 82, 1 => 0 ),
+  array( 0 => 103, 1 => 2 ),
+  array( 0 => 103, 1 => 3 ),
+  array( 0 => 103, 1 => 2 ),
+  array( 0 => 92, 1 => 1 ),
+  array( 0 => 92, 1 => 2 ),
+  array( 0 => 92, 1 => 1 ),
+  array( 0 => 92, 1 => 2 ),
+  array( 0 => 92, 1 => 3 ),
+  array( 0 => 86, 1 => 1 ),
+  array( 0 => 86, 1 => 1 ),
+  array( 0 => 85, 1 => 1 ),
+  array( 0 => 87, 1 => 1 ),
+  array( 0 => 93, 1 => 3 ),
+  array( 0 => 93, 1 => 3 ),
+  array( 0 => 104, 1 => 1 ),
+  array( 0 => 104, 1 => 3 ),
+  array( 0 => 104, 1 => 0 ),
+  array( 0 => 105, 1 => 3 ),
+  array( 0 => 105, 1 => 3 ),
+  array( 0 => 105, 1 => 1 ),
+  array( 0 => 91, 1 => 2 ),
+  array( 0 => 91, 1 => 3 ),
+  array( 0 => 106, 1 => 2 ),
+  array( 0 => 106, 1 => 1 ),
+  array( 0 => 107, 1 => 3 ),
+  array( 0 => 107, 1 => 3 ),
+  array( 0 => 107, 1 => 1 ),
+  array( 0 => 107, 1 => 3 ),
+  array( 0 => 107, 1 => 3 ),
+  array( 0 => 107, 1 => 1 ),
+  array( 0 => 107, 1 => 1 ),
+    );
+
+    public static $yyReduceMap = array(
+        0 => 0,
+        1 => 1,
+        2 => 2,
+        3 => 3,
+        4 => 4,
+        5 => 5,
+        6 => 6,
+        21 => 6,
+        22 => 6,
+        23 => 6,
+        36 => 6,
+        56 => 6,
+        57 => 6,
+        65 => 6,
+        66 => 6,
+        77 => 6,
+        82 => 6,
+        83 => 6,
+        88 => 6,
+        92 => 6,
+        93 => 6,
+        97 => 6,
+        98 => 6,
+        100 => 6,
+        105 => 6,
+        169 => 6,
+        174 => 6,
+        7 => 7,
+        8 => 8,
+        9 => 9,
+        11 => 11,
+        12 => 12,
+        13 => 13,
+        14 => 14,
+        15 => 15,
+        16 => 16,
+        17 => 17,
+        18 => 18,
+        19 => 19,
+        20 => 20,
+        24 => 24,
+        25 => 25,
+        26 => 26,
+        27 => 27,
+        28 => 28,
+        29 => 29,
+        30 => 30,
+        31 => 31,
+        33 => 31,
+        32 => 32,
+        34 => 34,
+        35 => 35,
+        37 => 37,
+        38 => 38,
+        39 => 39,
+        40 => 40,
+        41 => 41,
+        42 => 42,
+        43 => 43,
+        44 => 44,
+        45 => 45,
+        46 => 46,
+        47 => 47,
+        48 => 48,
+        49 => 49,
+        50 => 50,
+        59 => 50,
+        147 => 50,
+        151 => 50,
+        155 => 50,
+        157 => 50,
+        51 => 51,
+        148 => 51,
+        154 => 51,
+        52 => 52,
+        53 => 53,
+        54 => 53,
+        55 => 55,
+        132 => 55,
+        58 => 58,
+        60 => 60,
+        61 => 61,
+        62 => 61,
+        63 => 63,
+        64 => 64,
+        67 => 67,
+        68 => 68,
+        69 => 68,
+        70 => 70,
+        71 => 71,
+        72 => 72,
+        73 => 73,
+        74 => 74,
+        75 => 75,
+        76 => 76,
+        78 => 78,
+        80 => 78,
+        81 => 78,
+        112 => 78,
+        79 => 79,
+        84 => 84,
+        85 => 85,
+        86 => 86,
+        87 => 87,
+        89 => 89,
+        90 => 90,
+        91 => 90,
+        94 => 94,
+        95 => 95,
+        96 => 96,
+        99 => 99,
+        101 => 101,
+        102 => 102,
+        103 => 103,
+        104 => 104,
+        106 => 106,
+        107 => 107,
+        108 => 108,
+        109 => 109,
+        110 => 110,
+        111 => 111,
+        113 => 113,
+        171 => 113,
+        114 => 114,
+        115 => 115,
+        116 => 116,
+        117 => 117,
+        118 => 118,
+        119 => 119,
+        127 => 119,
+        120 => 120,
+        121 => 121,
+        122 => 122,
+        123 => 122,
+        125 => 122,
+        126 => 122,
+        124 => 124,
+        128 => 128,
+        129 => 129,
+        130 => 130,
+        175 => 130,
+        131 => 131,
+        133 => 133,
+        134 => 134,
+        135 => 135,
+        136 => 136,
+        137 => 137,
+        138 => 138,
+        139 => 139,
+        140 => 140,
+        141 => 141,
+        142 => 142,
+        143 => 143,
+        144 => 144,
+        145 => 145,
+        146 => 146,
+        149 => 149,
+        150 => 150,
+        152 => 152,
+        153 => 153,
+        156 => 156,
+        158 => 158,
+        159 => 159,
+        160 => 160,
+        161 => 161,
+        162 => 162,
+        163 => 163,
+        164 => 164,
+        165 => 165,
+        166 => 166,
+        167 => 167,
+        168 => 167,
+        170 => 170,
+        172 => 172,
+        173 => 173,
+        176 => 176,
+        177 => 177,
+        178 => 178,
+        179 => 179,
+        182 => 179,
+        180 => 180,
+        183 => 180,
+        181 => 181,
+        184 => 184,
+        185 => 185,
+    );
+// line 233 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r0(){
+    $this->root_buffer->prepend_array($this, $this->template_prefix);
+    $this->root_buffer->append_array($this, $this->template_postfix);
+    $this->_retvalue = $this->root_buffer->to_smarty_php($this);
     }
+// line 240 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r1(){
+         $text = $this->yystack[ $this->yyidx + 0 ]->minor;
 
-    // line 251 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r1()
-    {
-        $code =
-            $this->compiler->compileTag('private_php',
-                array(array('code' => $this->yystack[ $this->yyidx + 0 ]->minor), array('type' => $this->lex->phpType)),
-                array());
-        if ($this->compiler->has_code && !empty($code)) {
-            $tmp = '';
-            foreach ($this->compiler->prefix_code as $code) {
-                $tmp .= $code;
-            }
-            $this->compiler->prefix_code = array();
-            $this->current_buffer->append_subtree($this,
-                new Smarty_Internal_ParseTree_Tag($this, $this->compiler->processNocacheCode($tmp . $code, true)));
-        }
+         if ((string)$text == '') {
+            $this->current_buffer->append_subtree($this, null);
+         }
+
+         $this->current_buffer->append_subtree($this, new Smarty_Internal_ParseTree_Text($text, $this->strip));
     }
-
-    // line 255 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r2()
-    {
-    	$text = $this->yystack[ $this->yyidx + 0 ]->minor;
-
-	    if ((string)$text == '') {
-	    	$this->current_buffer->append_subtree($this, null);
-	    }
-
-	    $this->current_buffer->append_subtree($this, new Smarty_Internal_ParseTree_Text($text, $this->strip));
+// line 250 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r2(){
+    $this->strip = true;
     }
+// line 254 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r3(){
+    $this->strip = false;
+    }
+// line 259 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r4(){
+       $this->current_buffer->append_subtree($this, new Smarty_Internal_ParseTree_Text($this->yystack[$this->yyidx + -1]->minor));
+    }
+// line 264 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r5(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -3]->minor.$this->yystack[$this->yyidx + -1]->minor;
+    }
+// line 267 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r6(){
+    $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 271 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r7(){
+        $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;
 
-    // line 259 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r3()
-    {
+    }
+// line 276 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r8(){
+    $this->_retvalue = '';
+    }
+// line 280 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r9(){
+      if ($this->compiler->has_code) {
+          $this->current_buffer->append_subtree($this, $this->mergePrefixCode($this->yystack[$this->yyidx + 0]->minor));
+      }
+     $this->compiler->has_variable_string = false;
+     $this->block_nesting_level = count($this->compiler->_tag_stack);
+    }
+// line 292 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r11(){
+    $var = trim(substr($this->yystack[$this->yyidx + 0]->minor, $this->compiler->getLdelLength(), -$this->compiler->getRdelLength()), ' $');
+    if (preg_match('/^(.*)(\s+nocache)$/', $var, $match)) {
+        $this->_retvalue = $this->compiler->compileTag('private_print_expression',array('nocache'),array('value'=>$this->compiler->compileVariable('\''.$match[1].'\'')));
+    } else {
+        $this->_retvalue = $this->compiler->compileTag('private_print_expression',array(),array('value'=>$this->compiler->compileVariable('\''.$var.'\'')));
+    }
+    }
+// line 302 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r12(){
+    $tag = trim(substr($this->yystack[$this->yyidx + 0]->minor, $this->compiler->getLdelLength(), -$this->compiler->getRdelLength()));
+    if ($tag == 'strip') {
         $this->strip = true;
+        $this->_retvalue = null;
+    } else {
+        if (defined($tag)) {
+            if ($this->security) {
+               $this->security->isTrustedConstant($tag, $this->compiler);
+            }
+            $this->_retvalue = $this->compiler->compileTag('private_print_expression',array(),array('value'=>$tag));
+        } else {
+            if (preg_match('/^(.*)(\s+nocache)$/', $tag, $match)) {
+                $this->_retvalue = $this->compiler->compileTag($match[1],array('\'nocache\''));
+            } else {
+                $this->_retvalue = $this->compiler->compileTag($tag,array());
+            }
+        }
     }
-
-    // line 264 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r4()
-    {
+    }
+// line 323 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r13(){
+    $j = strrpos($this->yystack[$this->yyidx + 0]->minor,'.');
+    if ($this->yystack[$this->yyidx + 0]->minor[$j+1] == 'c') {
+        // {$smarty.block.child}
+        $this->_retvalue = $this->compiler->compileTag('child',array(),array($this->yystack[$this->yyidx + 0]->minor));
+    } else {
+        // {$smarty.block.parent}
+       $this->_retvalue = $this->compiler->compileTag('parent',array(),array($this->yystack[$this->yyidx + 0]->minor));
+     }
+    }
+// line 334 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r14(){
+    $this->_retvalue  = $this->yystack[$this->yyidx + -1]->minor;
+    }
+// line 338 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r15(){
+     $this->_retvalue  = $this->yystack[$this->yyidx + -1]->minor;
+     }
+// line 342 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r16(){
+    $this->_retvalue = $this->compiler->compileTag('private_print_expression',$this->yystack[$this->yyidx + 0]->minor[1],array('value'=>$this->yystack[$this->yyidx + 0]->minor[0]));
+    }
+// line 351 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r17(){
+    $this->_retvalue = $this->compiler->compileTag('assign',array_merge(array(array('value'=>$this->yystack[$this->yyidx + 0]->minor[0]),array('var'=>'\''.substr($this->yystack[$this->yyidx + -1]->minor,1).'\'')),$this->yystack[$this->yyidx + 0]->minor[1]));
+    }
+// line 355 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r18(){
+    $this->_retvalue = $this->compiler->compileTag('assign',array_merge(array(array('value'=>$this->yystack[$this->yyidx + 0]->minor[0]),array('var'=>$this->yystack[$this->yyidx + -1]->minor['var'])),$this->yystack[$this->yyidx + 0]->minor[1]),array('smarty_internal_index'=>$this->yystack[$this->yyidx + -1]->minor['smarty_internal_index']));
+    }
+// line 359 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r19(){
+       $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 363 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r20(){
+    $this->_retvalue = array($this->yystack[$this->yyidx + -1]->minor,$this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 378 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r24(){
+        if (defined($this->yystack[$this->yyidx + -1]->minor)) {
+            if ($this->security) {
+                $this->security->isTrustedConstant($this->yystack[$this->yyidx + -1]->minor, $this->compiler);
+            }
+            $this->_retvalue = $this->compiler->compileTag('private_print_expression',$this->yystack[$this->yyidx + 0]->minor,array('value'=>$this->yystack[$this->yyidx + -1]->minor));
+        } else {
+            $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -1]->minor,$this->yystack[$this->yyidx + 0]->minor);
+        }
+    }
+// line 388 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r25(){
+        if (defined($this->yystack[$this->yyidx + 0]->minor)) {
+            if ($this->security) {
+                $this->security->isTrustedConstant($this->yystack[$this->yyidx + 0]->minor, $this->compiler);
+            }
+            $this->_retvalue = $this->compiler->compileTag('private_print_expression',array(),array('value'=>$this->yystack[$this->yyidx + 0]->minor));
+        } else {
+            $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + 0]->minor,array());
+        }
+    }
+// line 401 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r26(){
+        if (defined($this->yystack[$this->yyidx + -2]->minor)) {
+            if ($this->security) {
+                $this->security->isTrustedConstant($this->yystack[$this->yyidx + -2]->minor, $this->compiler);
+            }
+            $this->_retvalue = $this->compiler->compileTag('private_print_expression',$this->yystack[$this->yyidx + 0]->minor,array('value'=>$this->yystack[$this->yyidx + -2]->minor, 'modifierlist'=>$this->yystack[$this->yyidx + -1]->minor));
+        } else {
+            $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -2]->minor,$this->yystack[$this->yyidx + 0]->minor, array('modifierlist'=>$this->yystack[$this->yyidx + -1]->minor));
+        }
+    }
+// line 413 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r27(){
+    $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -3]->minor,$this->yystack[$this->yyidx + 0]->minor,array('object_method'=>$this->yystack[$this->yyidx + -1]->minor));
+    }
+// line 418 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r28(){
+    $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -4]->minor,$this->yystack[$this->yyidx + 0]->minor,array('modifierlist'=>$this->yystack[$this->yyidx + -1]->minor, 'object_method'=>$this->yystack[$this->yyidx + -2]->minor));
+    }
+// line 423 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r29(){
+    $this->_retvalue = $this->compiler->compileTag('make_nocache',array(array('var'=>'\''.substr($this->yystack[$this->yyidx + 0]->minor,1).'\'')));
+    }
+// line 428 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r30(){
+    $tag = trim(substr($this->yystack[$this->yyidx + -1]->minor,$this->compiler->getLdelLength())); 
+    $this->_retvalue = $this->compiler->compileTag(($tag === 'else if')? 'elseif' : $tag,array(),array('if condition'=>$this->yystack[$this->yyidx + 0]->minor));
+    }
+// line 433 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r31(){
+    $tag = trim(substr($this->yystack[$this->yyidx + -2]->minor,$this->compiler->getLdelLength()));
+    $this->_retvalue = $this->compiler->compileTag(($tag === 'else if')? 'elseif' : $tag,$this->yystack[$this->yyidx + 0]->minor,array('if condition'=>$this->yystack[$this->yyidx + -1]->minor));
+    }
+// line 438 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r32(){
+    $tag = trim(substr($this->yystack[$this->yyidx + -1]->minor,$this->compiler->getLdelLength()));
+    $this->_retvalue = $this->compiler->compileTag(($tag === 'else if')? 'elseif' : $tag,array(),array('if condition'=>$this->yystack[$this->yyidx + 0]->minor));
+    }
+// line 449 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r34(){
+    $this->_retvalue = $this->compiler->compileTag('for',array_merge($this->yystack[$this->yyidx + 0]->minor,array(array('start'=>$this->yystack[$this->yyidx + -6]->minor),array('ifexp'=>$this->yystack[$this->yyidx + -4]->minor),array('var'=>$this->yystack[$this->yyidx + -2]->minor),array('step'=>$this->yystack[$this->yyidx + -1]->minor))),1);
+    }
+// line 453 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r35(){
+    $this->_retvalue = '='.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 461 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r37(){
+    $this->_retvalue = $this->compiler->compileTag('for',array_merge($this->yystack[$this->yyidx + 0]->minor,array(array('start'=>$this->yystack[$this->yyidx + -3]->minor),array('to'=>$this->yystack[$this->yyidx + -1]->minor))),0);
+    }
+// line 465 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r38(){
+    $this->_retvalue = $this->compiler->compileTag('for',array_merge($this->yystack[$this->yyidx + 0]->minor,array(array('start'=>$this->yystack[$this->yyidx + -5]->minor),array('to'=>$this->yystack[$this->yyidx + -3]->minor),array('step'=>$this->yystack[$this->yyidx + -1]->minor))),0);
+    }
+// line 470 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r39(){
+    $this->_retvalue = $this->compiler->compileTag('foreach',array_merge($this->yystack[$this->yyidx + 0]->minor,array(array('from'=>$this->yystack[$this->yyidx + -3]->minor),array('item'=>$this->yystack[$this->yyidx + -1]->minor))));
+    }
+// line 474 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r40(){
+    $this->_retvalue = $this->compiler->compileTag('foreach',array_merge($this->yystack[$this->yyidx + 0]->minor,array(array('from'=>$this->yystack[$this->yyidx + -5]->minor),array('item'=>$this->yystack[$this->yyidx + -1]->minor),array('key'=>$this->yystack[$this->yyidx + -3]->minor))));
+    }
+// line 477 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r41(){
+    $this->_retvalue = $this->compiler->compileTag('foreach',$this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 482 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r42(){
+    $this->_retvalue = $this->compiler->compileTag('setfilter',array(),array('modifier_list'=>array(array_merge(array($this->yystack[$this->yyidx + -1]->minor),$this->yystack[$this->yyidx + 0]->minor))));
+    }
+// line 486 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r43(){
+    $this->_retvalue = $this->compiler->compileTag('setfilter',array(),array('modifier_list'=>array_merge(array(array_merge(array($this->yystack[$this->yyidx + -2]->minor),$this->yystack[$this->yyidx + -1]->minor)),$this->yystack[$this->yyidx + 0]->minor)));
+    }
+// line 492 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r44(){
+    $tag = trim(substr($this->yystack[$this->yyidx + 0]->minor, $this->compiler->getLdelLength(), -$this->compiler->getRdelLength()), ' /');
+    if ($tag === 'strip') {
         $this->strip = false;
-    }
-
-    // line 269 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r5()
-    {
-        $this->current_buffer->append_subtree($this,
-            new Smarty_Internal_ParseTree_Text($this->yystack[ $this->yyidx + -1 ]->minor));
-    }
-
-    // line 272 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r6()
-    {
-        $this->_retvalue = $this->yystack[ $this->yyidx + -3 ]->minor . $this->yystack[ $this->yyidx + -1 ]->minor;
-    }
-
-    // line 276 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r7()
-    {
-        $this->_retvalue = $this->yystack[ $this->yyidx + 0 ]->minor;
-    }
-
-    // line 281 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r8()
-    {
-        $this->_retvalue = $this->yystack[ $this->yyidx + -1 ]->minor . $this->yystack[ $this->yyidx + 0 ]->minor;
-    }
-
-    // line 285 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r9()
-    {
-        $this->_retvalue = '';
-    }
-
-    // line 297 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r10()
-    {
-        if ($this->compiler->has_code) {
-            $this->current_buffer->append_subtree($this,
-                $this->mergePrefixCode($this->yystack[ $this->yyidx + 0 ]->minor));
-        }
-        $this->compiler->has_variable_string = false;
-        $this->block_nesting_level = count($this->compiler->_tag_stack);
-    }
-
-    // line 307 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r12()
-    {
-        $var =
-            trim(substr($this->yystack[ $this->yyidx + 0 ]->minor, $this->compiler->getLdelLength(),
-                -$this->compiler->getRdelLength()), ' $');
-        if (preg_match('/^(.*)(\s+nocache)$/', $var, $match)) {
-            $this->_retvalue =
-                $this->compiler->compileTag('private_print_expression', array('nocache'),
-                    array('value' => $this->compiler->compileVariable('\'' . $match[ 1 ] . '\'')));
-        } else {
-            $this->_retvalue =
-                $this->compiler->compileTag('private_print_expression', array(),
-                    array('value' => $this->compiler->compileVariable('\'' . $var . '\'')));
-        }
-    }
-
-    // line 328 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r13()
-    {
-        $tag =
-            trim(substr($this->yystack[ $this->yyidx + 0 ]->minor, $this->compiler->getLdelLength(),
-                -$this->compiler->getRdelLength()));
-        if ($tag == 'strip') {
-            $this->strip = true;
-            $this->_retvalue = null;
-        } else {
-            if (defined($tag)) {
-                if ($this->security) {
-                    $this->security->isTrustedConstant($tag, $this->compiler);
-                }
-                $this->_retvalue =
-                    $this->compiler->compileTag('private_print_expression', array(), array('value' => $tag));
-            } else {
-                if (preg_match('/^(.*)(\s+nocache)$/', $tag, $match)) {
-                    $this->_retvalue = $this->compiler->compileTag($match[ 1 ], array('\'nocache\''));
-                } else {
-                    $this->_retvalue = $this->compiler->compileTag($tag, array());
-                }
-            }
-        }
-    }
-
-    // line 339 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r14()
-    {
-        $j = strrpos($this->yystack[ $this->yyidx + 0 ]->minor, '.');
-        if ($this->yystack[ $this->yyidx + 0 ]->minor[ $j + 1 ] == 'c') {
-            // {$smarty.block.child}
-            $this->_retvalue =
-                $this->compiler->compileTag('child', array(), array($this->yystack[ $this->yyidx + 0 ]->minor));
-        } else {
-            // {$smarty.block.parent}
-            $this->_retvalue =
-                $this->compiler->compileTag('parent', array(), array($this->yystack[ $this->yyidx + 0 ]->minor));
-        }
-    }
-
-    // line 343 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r15()
-    {
-        $this->_retvalue = $this->yystack[ $this->yyidx + -1 ]->minor;
-    }
-
-    // line 347 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r16()
-    {
-        $this->_retvalue = $this->yystack[ $this->yyidx + -1 ]->minor;
-    }
-
-    // line 356 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r17()
-    {
-        $this->_retvalue =
-            $this->compiler->compileTag('private_print_expression', $this->yystack[ $this->yyidx + 0 ]->minor[ 1 ],
-                array('value' => $this->yystack[ $this->yyidx + 0 ]->minor[ 0 ]));
-    }
-
-    // line 360 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r18()
-    {
-        $this->_retvalue =
-            $this->compiler->compileTag('assign', array_merge(array(
-                array('value' => $this->yystack[ $this->yyidx + 0 ]->minor[ 0 ]),
-                array('var' => '\'' . substr($this->yystack[ $this->yyidx + -1 ]->minor, 1) . '\'')
-            ), $this->yystack[ $this->yyidx + 0 ]->minor[ 1 ]));
-    }
-
-    // line 364 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r19()
-    {
-        $this->_retvalue =
-            $this->compiler->compileTag('assign', array_merge(array(
-                array('value' => $this->yystack[ $this->yyidx + 0 ]->minor[ 0 ]),
-                array('var' => $this->yystack[ $this->yyidx + -1 ]->minor[ 'var' ])
-            ), $this->yystack[ $this->yyidx + 0 ]->minor[ 1 ]), array(
-                'smarty_internal_index' => $this->yystack[ $this->yyidx +
-                                                           -1 ]->minor[ 'smarty_internal_index' ]
-            ));
-    }
-
-    // line 368 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r20()
-    {
-        $this->_retvalue = $this->yystack[ $this->yyidx + 0 ]->minor;
-    }
-
-    // line 383 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r21()
-    {
-        $this->_retvalue = array($this->yystack[ $this->yyidx + -1 ]->minor, $this->yystack[ $this->yyidx + 0 ]->minor);
-    }
-
-    // line 393 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r25()
-    {
-        if (defined($this->yystack[ $this->yyidx + -1 ]->minor)) {
-            if ($this->security) {
-                $this->security->isTrustedConstant($this->yystack[ $this->yyidx + -1 ]->minor, $this->compiler);
-            }
-            $this->_retvalue =
-                $this->compiler->compileTag('private_print_expression', $this->yystack[ $this->yyidx + 0 ]->minor,
-                    array('value' => $this->yystack[ $this->yyidx + -1 ]->minor));
-        } else {
-            $this->_retvalue =
-                $this->compiler->compileTag($this->yystack[ $this->yyidx + -1 ]->minor,
-                    $this->yystack[ $this->yyidx + 0 ]->minor);
-        }
-    }
-
-    // line 406 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r26()
-    {
-        if (defined($this->yystack[ $this->yyidx + 0 ]->minor)) {
-            if ($this->security) {
-                $this->security->isTrustedConstant($this->yystack[ $this->yyidx + 0 ]->minor, $this->compiler);
-            }
-            $this->_retvalue =
-                $this->compiler->compileTag('private_print_expression', array(),
-                    array('value' => $this->yystack[ $this->yyidx + 0 ]->minor));
-        } else {
-            $this->_retvalue = $this->compiler->compileTag($this->yystack[ $this->yyidx + 0 ]->minor, array());
-        }
-    }
-
-    // line 418 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r27()
-    {
-        if (defined($this->yystack[ $this->yyidx + -2 ]->minor)) {
-            if ($this->security) {
-                $this->security->isTrustedConstant($this->yystack[ $this->yyidx + -2 ]->minor, $this->compiler);
-            }
-            $this->_retvalue =
-                $this->compiler->compileTag('private_print_expression', $this->yystack[ $this->yyidx + 0 ]->minor,
-                    array(
-                        'value'        => $this->yystack[ $this->yyidx + -2 ]->minor,
-                        'modifierlist' => $this->yystack[ $this->yyidx + -1 ]->minor
-                    ));
-        } else {
-            $this->_retvalue =
-                $this->compiler->compileTag($this->yystack[ $this->yyidx + -2 ]->minor,
-                    $this->yystack[ $this->yyidx + 0 ]->minor,
-                    array('modifierlist' => $this->yystack[ $this->yyidx + -1 ]->minor));
-        }
-    }
-
-    // line 423 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r28()
-    {
-        $this->_retvalue =
-            $this->compiler->compileTag($this->yystack[ $this->yyidx + -3 ]->minor,
-                $this->yystack[ $this->yyidx + 0 ]->minor,
-                array('object_method' => $this->yystack[ $this->yyidx + -1 ]->minor));
-    }
-
-    // line 428 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r29()
-    {
-        $this->_retvalue =
-            $this->compiler->compileTag($this->yystack[ $this->yyidx + -4 ]->minor,
-                $this->yystack[ $this->yyidx + 0 ]->minor, array(
-                    'modifierlist'  => $this->yystack[ $this->yyidx + -1 ]->minor,
-                    'object_method' => $this->yystack[ $this->yyidx + -2 ]->minor
-                ));
-    }
-
-    // line 433 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r30()
-    {
-        $this->_retvalue =
-            $this->compiler->compileTag('make_nocache',
-                array(array('var' => '\'' . substr($this->yystack[ $this->yyidx + 0 ]->minor, 1) . '\'')));
-    }
-
-    // line 438 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r31()
-    {
-        $tag = trim(substr($this->yystack[ $this->yyidx + -1 ]->minor, $this->compiler->getLdelLength()));
-        $this->_retvalue =
-            $this->compiler->compileTag(($tag === 'else if') ? 'elseif' : $tag, array(),
-                array('if condition' => $this->yystack[ $this->yyidx + 0 ]->minor));
-    }
-
-    // line 443 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r32()
-    {
-        $tag = trim(substr($this->yystack[ $this->yyidx + -2 ]->minor, $this->compiler->getLdelLength()));
-        $this->_retvalue =
-            $this->compiler->compileTag(($tag === 'else if') ? 'elseif' : $tag,
-                $this->yystack[ $this->yyidx + 0 ]->minor,
-                array('if condition' => $this->yystack[ $this->yyidx + -1 ]->minor));
-    }
-
-    // line 454 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r33()
-    {
-        $tag = trim(substr($this->yystack[ $this->yyidx + -1 ]->minor, $this->compiler->getLdelLength()));
-        $this->_retvalue =
-            $this->compiler->compileTag(($tag === 'else if') ? 'elseif' : $tag, array(),
-                array('if condition' => $this->yystack[ $this->yyidx + 0 ]->minor));
-    }
-
-    // line 458 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r35()
-    {
-        $this->_retvalue =
-            $this->compiler->compileTag('for', array_merge($this->yystack[ $this->yyidx + 0 ]->minor, array(
-                array('start' => $this->yystack[ $this->yyidx + -6 ]->minor),
-                array('ifexp' => $this->yystack[ $this->yyidx + -4 ]->minor),
-                array('var' => $this->yystack[ $this->yyidx + -2 ]->minor),
-                array('step' => $this->yystack[ $this->yyidx + -1 ]->minor)
-            )), 1);
-    }
-
-    // line 466 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r36()
-    {
-        $this->_retvalue = '=' . $this->yystack[ $this->yyidx + 0 ]->minor;
-    }
-
-    // line 470 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r38()
-    {
-        $this->_retvalue =
-            $this->compiler->compileTag('for', array_merge($this->yystack[ $this->yyidx + 0 ]->minor, array(
-                array('start' => $this->yystack[ $this->yyidx + -3 ]->minor),
-                array('to' => $this->yystack[ $this->yyidx + -1 ]->minor)
-            )), 0);
-    }
-
-    // line 475 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r39()
-    {
-        $this->_retvalue =
-            $this->compiler->compileTag('for', array_merge($this->yystack[ $this->yyidx + 0 ]->minor, array(
-                array('start' => $this->yystack[ $this->yyidx + -5 ]->minor),
-                array('to' => $this->yystack[ $this->yyidx + -3 ]->minor),
-                array('step' => $this->yystack[ $this->yyidx + -1 ]->minor)
-            )), 0);
-    }
-
-    // line 479 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r40()
-    {
-        $this->_retvalue =
-            $this->compiler->compileTag('foreach', array_merge($this->yystack[ $this->yyidx + 0 ]->minor, array(
-                array('from' => $this->yystack[ $this->yyidx + -3 ]->minor),
-                array('item' => $this->yystack[ $this->yyidx + -1 ]->minor)
-            )));
-    }
-
-    // line 482 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r41()
-    {
-        $this->_retvalue =
-            $this->compiler->compileTag('foreach', array_merge($this->yystack[ $this->yyidx + 0 ]->minor, array(
-                array('from' => $this->yystack[ $this->yyidx + -5 ]->minor),
-                array('item' => $this->yystack[ $this->yyidx + -1 ]->minor),
-                array('key' => $this->yystack[ $this->yyidx + -3 ]->minor)
-            )));
-    }
-
-    // line 487 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r42()
-    {
-        $this->_retvalue = $this->compiler->compileTag('foreach', $this->yystack[ $this->yyidx + 0 ]->minor);
-    }
-
-    // line 491 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r43()
-    {
-        $this->_retvalue =
-            $this->compiler->compileTag('setfilter', array(), array(
-                'modifier_list' => array(
-                    array_merge(array($this->yystack[ $this->yyidx + -1 ]->minor),
-                        $this->yystack[ $this->yyidx + 0 ]->minor)
-                )
-            ));
-    }
-
-    // line 497 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r44()
-    {
-        $this->_retvalue =
-            $this->compiler->compileTag('setfilter', array(), array(
-                'modifier_list' => array_merge(array(
-                    array_merge(array(
-                        $this->yystack[ $this->yyidx +
-                                        -2 ]->minor
-                    ), $this->yystack[ $this->yyidx + -1 ]->minor)
-                ), $this->yystack[ $this->yyidx + 0 ]->minor)
-            ));
-    }
-
-    // line 506 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r45()
-    {
-        $tag =
-            trim(substr($this->yystack[ $this->yyidx + 0 ]->minor, $this->compiler->getLdelLength(),
-                -$this->compiler->getRdelLength()), ' /');
-        if ($tag === 'strip') {
-            $this->strip = false;
-            $this->_retvalue = null;
-        } else {
-            $this->_retvalue = $this->compiler->compileTag($tag . 'close', array());
-        }
-    }
-
-    // line 510 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r46()
-    {
-        $this->_retvalue = $this->compiler->compileTag($this->yystack[ $this->yyidx + 0 ]->minor . 'close', array());
-    }
-
-    // line 515 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r47()
-    {
-        $this->_retvalue =
-            $this->compiler->compileTag($this->yystack[ $this->yyidx + -1 ]->minor . 'close', array(),
-                array('modifier_list' => $this->yystack[ $this->yyidx + 0 ]->minor));
-    }
-
-    // line 519 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r48()
-    {
-        $this->_retvalue =
-            $this->compiler->compileTag($this->yystack[ $this->yyidx + -2 ]->minor . 'close', array(),
-                array('object_method' => $this->yystack[ $this->yyidx + 0 ]->minor));
-    }
-
-    // line 527 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r49()
-    {
-        $this->_retvalue =
-            $this->compiler->compileTag($this->yystack[ $this->yyidx + -3 ]->minor . 'close', array(), array(
-                'object_method' => $this->yystack[ $this->yyidx + -1 ]->minor,
-                'modifier_list' => $this->yystack[ $this->yyidx + 0 ]->minor
-            ));
-    }
-
-    // line 533 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r50()
-    {
-        $this->_retvalue = $this->yystack[ $this->yyidx + -1 ]->minor;
-        $this->_retvalue[] = $this->yystack[ $this->yyidx + 0 ]->minor;
-    }
-
-    // line 538 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r51()
-    {
-        $this->_retvalue = array($this->yystack[ $this->yyidx + 0 ]->minor);
-    }
-
-    // line 543 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r52()
-    {
-        $this->_retvalue = array();
-    }
-
-    // line 554 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r53()
-    {
-        if (defined($this->yystack[ $this->yyidx + 0 ]->minor)) {
-            if ($this->security) {
-                $this->security->isTrustedConstant($this->yystack[ $this->yyidx + 0 ]->minor, $this->compiler);
-            }
-            $this->_retvalue =
-                array($this->yystack[ $this->yyidx + -2 ]->minor => $this->yystack[ $this->yyidx + 0 ]->minor);
-        } else {
-            $this->_retvalue =
-                array(
-                    $this->yystack[ $this->yyidx + -2 ]->minor => '\'' .
-                                                                  $this->yystack[ $this->yyidx + 0 ]->minor .
-                                                                  '\''
-                );
-        }
-    }
-
-    // line 562 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r54()
-    {
-        $this->_retvalue =
-            array(
-                trim($this->yystack[ $this->yyidx + -1 ]->minor, " =\n\r\t") => $this->yystack[ $this->yyidx +
-                                                                                                0 ]->minor
-            );
-    }
-
-    // line 574 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r56()
-    {
-        $this->_retvalue = '\'' . $this->yystack[ $this->yyidx + 0 ]->minor . '\'';
-    }
-
-    // line 587 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r59()
-    {
-        $this->_retvalue =
-            array($this->yystack[ $this->yyidx + -2 ]->minor => $this->yystack[ $this->yyidx + 0 ]->minor);
-    }
-
-    // line 592 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r61()
-    {
-        $this->yystack[ $this->yyidx + -2 ]->minor[] = $this->yystack[ $this->yyidx + 0 ]->minor;
-        $this->_retvalue = $this->yystack[ $this->yyidx + -2 ]->minor;
-    }
-
-    // line 599 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r62()
-    {
-        $this->_retvalue =
-            array(
-                'var'   => '\'' . substr($this->yystack[ $this->yyidx + -2 ]->minor, 1) . '\'',
-                'value' => $this->yystack[ $this->yyidx + 0 ]->minor
-            );
-    }
-
-    // line 603 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r64()
-    {
-        $this->_retvalue =
-            array(
-                'var'   => $this->yystack[ $this->yyidx + -2 ]->minor,
-                'value' => $this->yystack[ $this->yyidx + 0 ]->minor
-            );
-    }
-
-    // line 623 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r65()
-    {
-        $this->_retvalue = $this->yystack[ $this->yyidx + -1 ]->minor;
-    }
-
-    // line 628 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r68()
-    {
-        $this->_retvalue =
-            '$_smarty_tpl->getStreamVariable(\'' .
-            substr($this->yystack[ $this->yyidx + -2 ]->minor, 1) .
-            '://' .
-            $this->yystack[ $this->yyidx + 0 ]->minor .
-            '\')';
-    }
-
-    // line 638 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r69()
-    {
-        $this->_retvalue =
-            $this->yystack[ $this->yyidx + -2 ]->minor .
-            trim($this->yystack[ $this->yyidx + -1 ]->minor) .
-            $this->yystack[ $this->yyidx + 0 ]->minor;
-    }
-
-    // line 642 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r71()
-    {
-        $this->_retvalue =
-            $this->yystack[ $this->yyidx + -1 ]->minor[ 'pre' ] .
-            $this->yystack[ $this->yyidx + -2 ]->minor .
-            $this->yystack[ $this->yyidx + -1 ]->minor[ 'op' ] .
-            $this->yystack[ $this->yyidx + 0 ]->minor .
-            ')';
-    }
-
-    // line 646 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r72()
-    {
-        $this->_retvalue =
-            $this->yystack[ $this->yyidx + -2 ]->minor .
-            $this->yystack[ $this->yyidx + -1 ]->minor .
-            $this->yystack[ $this->yyidx + 0 ]->minor;
-    }
-
-    // line 650 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r73()
-    {
-        $this->_retvalue = $this->yystack[ $this->yyidx + 0 ]->minor . $this->yystack[ $this->yyidx + -1 ]->minor . ')';
-    }
-
-    // line 654 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r74()
-    {
-        $this->_retvalue =
-            'in_array(' .
-            $this->yystack[ $this->yyidx + -2 ]->minor .
-            ',' .
-            $this->yystack[ $this->yyidx + 0 ]->minor .
-            ')';
-    }
-
-    // line 662 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r75()
-    {
-        $this->_retvalue =
-            'in_array(' .
-            $this->yystack[ $this->yyidx + -2 ]->minor .
-            ',(array)' .
-            $this->yystack[ $this->yyidx + 0 ]->minor .
-            ')';
-    }
-
-    // line 666 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r76()
-    {
-        $this->_retvalue =
-            $this->yystack[ $this->yyidx + -5 ]->minor .
-            ' ? ' .
-            $this->compiler->compileVariable('\'' . substr($this->yystack[ $this->yyidx + -2 ]->minor, 1) . '\'') .
-            ' : ' .
-            $this->yystack[ $this->yyidx + 0 ]->minor;
-    }
-
-    // line 676 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r77()
-    {
-        $this->_retvalue =
-            $this->yystack[ $this->yyidx + -5 ]->minor .
-            ' ? ' .
-            $this->yystack[ $this->yyidx + -2 ]->minor .
-            ' : ' .
-            $this->yystack[ $this->yyidx + 0 ]->minor;
-    }
-
-    // line 681 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r79()
-    {
-        $this->_retvalue = $this->yystack[ $this->yyidx + -1 ]->minor . $this->yystack[ $this->yyidx + 0 ]->minor;
-    }
-
-    // line 702 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r80()
-    {
-        $this->_retvalue = '!' . $this->yystack[ $this->yyidx + 0 ]->minor;
-    }
-
-    // line 706 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r85()
-    {
-        $this->_retvalue = $this->yystack[ $this->yyidx + -2 ]->minor . '.' . $this->yystack[ $this->yyidx + 0 ]->minor;
-    }
-
-    // line 710 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r86()
-    {
-        $this->_retvalue = $this->yystack[ $this->yyidx + -1 ]->minor . '.';
-    }
-
-    // line 715 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r87()
-    {
-        $this->_retvalue = '.' . $this->yystack[ $this->yyidx + 0 ]->minor;
-    }
-
-    // line 732 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r88()
-    {
-        if (defined($this->yystack[ $this->yyidx + 0 ]->minor)) {
-            if ($this->security) {
-                $this->security->isTrustedConstant($this->yystack[ $this->yyidx + 0 ]->minor, $this->compiler);
-            }
-            $this->_retvalue = $this->yystack[ $this->yyidx + 0 ]->minor;
-        } else {
-            $this->_retvalue = '\'' . $this->yystack[ $this->yyidx + 0 ]->minor . '\'';
-        }
-    }
-
-    // line 736 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r90()
-    {
-        $this->_retvalue = '(' . $this->yystack[ $this->yyidx + -1 ]->minor . ')';
-    }
-
-    // line 754 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r91()
-    {
-        $this->_retvalue =
-            $this->yystack[ $this->yyidx + -2 ]->minor .
-            $this->yystack[ $this->yyidx + -1 ]->minor .
-            $this->yystack[ $this->yyidx + 0 ]->minor;
-    }
-
-    // line 765 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r95()
-    {
-        $prefixVar = $this->compiler->getNewPrefixVariable();
-        if ($this->yystack[ $this->yyidx + -2 ]->minor[ 'var' ] === '\'smarty\'') {
-            $this->compiler->appendPrefixCode("<?php {$prefixVar} = " .
-                                              $this->compiler->compileTag('private_special_variable', array(),
-                                                  $this->yystack[ $this->yyidx +
-                                                                  -2 ]->minor[ 'smarty_internal_index' ]) .
-                                              ';?>');
-        } else {
-            $this->compiler->appendPrefixCode("<?php  {$prefixVar} = " .
-                                              $this->compiler->compileVariable($this->yystack[ $this->yyidx +
-                                                                                               -2 ]->minor[ 'var' ]) .
-                                              $this->yystack[ $this->yyidx + -2 ]->minor[ 'smarty_internal_index' ] .
-                                              ';?>');
-        }
-        $this->_retvalue =
-            $prefixVar .
-            '::' .
-            $this->yystack[ $this->yyidx + 0 ]->minor[ 0 ] .
-            $this->yystack[ $this->yyidx + 0 ]->minor[ 1 ];
-    }
-
-    // line 772 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r96()
-    {
-        $prefixVar = $this->compiler->getNewPrefixVariable();
-        $tmp = $this->compiler->appendCode('<?php ob_start();?>', $this->yystack[ $this->yyidx + 0 ]->minor);
-        $this->compiler->appendPrefixCode($this->compiler->appendCode($tmp, "<?php {$prefixVar} = ob_get_clean();?>"));
-        $this->_retvalue = $prefixVar;
-    }
-
-    // line 785 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r97()
-    {
-        $this->_retvalue =
-            $this->compiler->compileTag('private_modifier', array(), array(
-                'value'        => $this->yystack[ $this->yyidx + -1 ]->minor,
-                'modifierlist' => $this->yystack[ $this->yyidx + 0 ]->minor
-            ));
-    }
-
-    // line 804 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r100()
-    {
-        if (!in_array(strtolower($this->yystack[ $this->yyidx + -2 ]->minor), array('self', 'parent')) &&
-            (!$this->security ||
-             $this->security->isTrustedStaticClassAccess($this->yystack[ $this->yyidx + -2 ]->minor,
-                 $this->yystack[ $this->yyidx + 0 ]->minor, $this->compiler))) {
-            if (isset($this->smarty->registered_classes[ $this->yystack[ $this->yyidx + -2 ]->minor ])) {
-                $this->_retvalue =
-                    $this->smarty->registered_classes[ $this->yystack[ $this->yyidx + -2 ]->minor ] .
-                    '::' .
-                    $this->yystack[ $this->yyidx + 0 ]->minor[ 0 ] .
-                    $this->yystack[ $this->yyidx + 0 ]->minor[ 1 ];
-            } else {
-                $this->_retvalue =
-                    $this->yystack[ $this->yyidx + -2 ]->minor .
-                    '::' .
-                    $this->yystack[ $this->yyidx + 0 ]->minor[ 0 ] .
-                    $this->yystack[ $this->yyidx + 0 ]->minor[ 1 ];
-            }
-        } else {
-            $this->compiler->trigger_template_error('static class \'' .
-                                                    $this->yystack[ $this->yyidx + -2 ]->minor .
-                                                    '\' is undefined or not allowed by security setting');
-        }
-    }
-
-    // line 815 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r102()
-    {
-        $this->_retvalue = $this->yystack[ $this->yyidx + 0 ]->minor;
-    }
-
-    // line 818 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r103()
-    {
-        $this->_retvalue =
-            $this->compiler->compileVariable('\'' . substr($this->yystack[ $this->yyidx + 0 ]->minor, 1) . '\'');
-    }
-
-    // line 831 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r104()
-    {
-        if ($this->yystack[ $this->yyidx + 0 ]->minor[ 'var' ] === '\'smarty\'') {
-            $smarty_var =
-                $this->compiler->compileTag('private_special_variable', array(),
-                    $this->yystack[ $this->yyidx + 0 ]->minor[ 'smarty_internal_index' ]);
-            $this->_retvalue = $smarty_var;
-        } else {
-            // used for array reset,next,prev,end,current
-            $this->last_variable = $this->yystack[ $this->yyidx + 0 ]->minor[ 'var' ];
-            $this->last_index = $this->yystack[ $this->yyidx + 0 ]->minor[ 'smarty_internal_index' ];
-            $this->_retvalue =
-                $this->compiler->compileVariable($this->yystack[ $this->yyidx + 0 ]->minor[ 'var' ]) .
-                $this->yystack[ $this->yyidx + 0 ]->minor[ 'smarty_internal_index' ];
-        }
-    }
-
-    // line 841 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r105()
-    {
-        $this->_retvalue =
-            '$_smarty_tpl->tpl_vars[' .
-            $this->yystack[ $this->yyidx + -2 ]->minor .
-            ']->' .
-            $this->yystack[ $this->yyidx + 0 ]->minor;
-    }
-
-    // line 845 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r107()
-    {
-        $this->_retvalue =
-            $this->compiler->compileConfigVariable('\'' . $this->yystack[ $this->yyidx + -1 ]->minor . '\'');
-    }
-
-    // line 849 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r108()
-    {
-        $this->_retvalue =
-            '(is_array($tmp = ' .
-            $this->compiler->compileConfigVariable('\'' . $this->yystack[ $this->yyidx + -2 ]->minor . '\'') .
-            ') ? $tmp' .
-            $this->yystack[ $this->yyidx + 0 ]->minor .
-            ' :null)';
-    }
-
-    // line 853 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r109()
-    {
-        $this->_retvalue = $this->compiler->compileConfigVariable($this->yystack[ $this->yyidx + -1 ]->minor);
-    }
-
-    // line 857 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r110()
-    {
-        $this->_retvalue =
-            '(is_array($tmp = ' .
-            $this->compiler->compileConfigVariable($this->yystack[ $this->yyidx + -2 ]->minor) .
-            ') ? $tmp' .
-            $this->yystack[ $this->yyidx + 0 ]->minor .
-            ' : null)';
-    }
-
-    // line 860 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r111()
-    {
-        $this->_retvalue =
-            array(
-                'var'                   => '\'' . substr($this->yystack[ $this->yyidx + -1 ]->minor, 1) . '\'',
-                'smarty_internal_index' => $this->yystack[ $this->yyidx + 0 ]->minor
-            );
-    }
-
-    // line 873 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r112()
-    {
-        $this->_retvalue =
-            array(
-                'var'                   => $this->yystack[ $this->yyidx + -1 ]->minor,
-                'smarty_internal_index' => $this->yystack[ $this->yyidx + 0 ]->minor
-            );
-    }
-
-    // line 879 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r114()
-    {
-        return;
-    }
-
-    // line 882 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r115()
-    {
-        $this->_retvalue =
-            '[' .
-            $this->compiler->compileVariable('\'' . substr($this->yystack[ $this->yyidx + 0 ]->minor, 1) . '\'') .
-            ']';
-    }
-
-    // line 886 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r116()
-    {
-        $this->_retvalue = '[' . $this->compiler->compileVariable($this->yystack[ $this->yyidx + 0 ]->minor) . ']';
-    }
-
-    // line 890 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r117()
-    {
-        $this->_retvalue =
-            '[' .
-            $this->compiler->compileVariable($this->yystack[ $this->yyidx + -2 ]->minor) .
-            '->' .
-            $this->yystack[ $this->yyidx + 0 ]->minor .
-            ']';
-    }
-
-    // line 894 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r118()
-    {
-        $this->_retvalue = '[\'' . $this->yystack[ $this->yyidx + 0 ]->minor . '\']';
-    }
-
-    // line 899 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r119()
-    {
-        $this->_retvalue = '[' . $this->yystack[ $this->yyidx + 0 ]->minor . ']';
-    }
-
-    // line 904 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r120()
-    {
-        $this->_retvalue = '[' . $this->yystack[ $this->yyidx + -1 ]->minor . ']';
-    }
-
-    // line 908 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r121()
-    {
-        $this->_retvalue =
-            '[' .
-            $this->compiler->compileTag('private_special_variable', array(),
-                '[\'section\'][\'' . $this->yystack[ $this->yyidx + -1 ]->minor . '\'][\'index\']') .
-            ']';
-    }
-
-    // line 911 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r122()
-    {
-        $this->_retvalue =
-            '[' .
-            $this->compiler->compileTag('private_special_variable', array(), '[\'section\'][\'' .
-                                                                             $this->yystack[ $this->yyidx +
-                                                                                             -3 ]->minor .
-                                                                             '\'][\'' .
-                                                                             $this->yystack[ $this->yyidx +
-                                                                                             -1 ]->minor .
-                                                                             '\']') .
-            ']';
-    }
-
-    // line 917 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r123()
-    {
-        $this->_retvalue = '[' . $this->yystack[ $this->yyidx + -1 ]->minor . ']';
-    }
-
-    // line 933 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r125()
-    {
-        $this->_retvalue =
-            '[' .
-            $this->compiler->compileVariable('\'' . substr($this->yystack[ $this->yyidx + -1 ]->minor, 1) . '\'') .
-            ']';
-    }
-
-    // line 943 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r129()
-    {
-        $this->_retvalue = '[]';
-    }
-
-    // line 947 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r130()
-    {
-        $this->_retvalue = '\'' . substr($this->yystack[ $this->yyidx + 0 ]->minor, 1) . '\'';
-    }
-
-    // line 952 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r131()
-    {
-        $this->_retvalue = '\'\'';
-    }
-
-    // line 960 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r132()
-    {
-        $this->_retvalue = $this->yystack[ $this->yyidx + -1 ]->minor . '.' . $this->yystack[ $this->yyidx + 0 ]->minor;
-    }
-
-    // line 966 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r134()
-    {
-        $var =
-            trim(substr($this->yystack[ $this->yyidx + 0 ]->minor, $this->compiler->getLdelLength(),
-                -$this->compiler->getRdelLength()), ' $');
-        $this->_retvalue = $this->compiler->compileVariable('\'' . $var . '\'');
-    }
-
-    // line 973 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r135()
-    {
-        $this->_retvalue = '(' . $this->yystack[ $this->yyidx + -1 ]->minor . ')';
-    }
-
-    // line 982 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r136()
-    {
-        if ($this->yystack[ $this->yyidx + -1 ]->minor[ 'var' ] === '\'smarty\'') {
-            $this->_retvalue =
-                $this->compiler->compileTag('private_special_variable', array(),
-                    $this->yystack[ $this->yyidx + -1 ]->minor[ 'smarty_internal_index' ]) .
-                $this->yystack[ $this->yyidx + 0 ]->minor;
-        } else {
-            $this->_retvalue =
-                $this->compiler->compileVariable($this->yystack[ $this->yyidx + -1 ]->minor[ 'var' ]) .
-                $this->yystack[ $this->yyidx + -1 ]->minor[ 'smarty_internal_index' ] .
-                $this->yystack[ $this->yyidx + 0 ]->minor;
-        }
-    }
-
-    // line 987 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r137()
-    {
-        $this->_retvalue = $this->yystack[ $this->yyidx + 0 ]->minor;
-    }
-
-    // line 992 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r138()
-    {
-        $this->_retvalue = $this->yystack[ $this->yyidx + -1 ]->minor . $this->yystack[ $this->yyidx + 0 ]->minor;
-    }
-
-    // line 999 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r139()
-    {
-        if ($this->security && substr($this->yystack[ $this->yyidx + -1 ]->minor, 0, 1) === '_') {
-            $this->compiler->trigger_template_error(self::ERR1);
-        }
-        $this->_retvalue =
-            '->' . $this->yystack[ $this->yyidx + -1 ]->minor . $this->yystack[ $this->yyidx + 0 ]->minor;
-    }
-
-    // line 1006 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r140()
-    {
+        $this->_retvalue = null;
+    } else {
+       $this->_retvalue = $this->compiler->compileTag($tag.'close',array());
+    }
+     }
+// line 501 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r45(){
+    $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + 0]->minor.'close',array());
+    }
+// line 505 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r46(){
+    $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -1]->minor.'close',array(),array('modifier_list'=>$this->yystack[$this->yyidx + 0]->minor));
+    }
+// line 510 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r47(){
+    $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -2]->minor.'close',array(),array('object_method'=>$this->yystack[$this->yyidx + 0]->minor));
+    }
+// line 514 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r48(){
+    $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -3]->minor.'close',array(),array('object_method'=>$this->yystack[$this->yyidx + -1]->minor, 'modifier_list'=>$this->yystack[$this->yyidx + 0]->minor));
+    }
+// line 522 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r49(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor;
+    $this->_retvalue[] = $this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 528 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r50(){
+    $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 533 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r51(){
+    $this->_retvalue = array();
+    }
+// line 538 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r52(){
+    if (defined($this->yystack[$this->yyidx + 0]->minor)) {
         if ($this->security) {
-            $this->compiler->trigger_template_error(self::ERR2);
+            $this->security->isTrustedConstant($this->yystack[$this->yyidx + 0]->minor, $this->compiler);
         }
-        $this->_retvalue =
-            '->{' .
-            $this->compiler->compileVariable($this->yystack[ $this->yyidx + -1 ]->minor) .
-            $this->yystack[ $this->yyidx + 0 ]->minor .
-            '}';
+        $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>$this->yystack[$this->yyidx + 0]->minor);
+    } else {
+        $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>'\''.$this->yystack[$this->yyidx + 0]->minor.'\'');
     }
-
-    // line 1013 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r141()
-    {
+    }
+// line 549 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r53(){
+    $this->_retvalue = array(trim($this->yystack[$this->yyidx + -1]->minor," =\n\r\t")=>$this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 557 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r55(){
+    $this->_retvalue = '\''.$this->yystack[$this->yyidx + 0]->minor.'\'';
+    }
+// line 569 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r58(){
+    $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>$this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 582 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r60(){
+    $this->yystack[$this->yyidx + -2]->minor[]=$this->yystack[$this->yyidx + 0]->minor;
+    $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor;
+    }
+// line 587 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r61(){
+    $this->_retvalue = array('var' => '\''.substr($this->yystack[$this->yyidx + -2]->minor,1).'\'', 'value'=>$this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 594 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r63(){
+    $this->_retvalue = array('var' => $this->yystack[$this->yyidx + -2]->minor, 'value'=>$this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 598 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r64(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor;
+    }
+// line 618 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r67(){
+    $this->_retvalue = '$_smarty_tpl->getStreamVariable(\''.substr($this->yystack[$this->yyidx + -2]->minor,1).'://' . $this->yystack[$this->yyidx + 0]->minor . '\')';
+    }
+// line 623 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r68(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor . trim($this->yystack[$this->yyidx + -1]->minor) . $this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 633 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r70(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor['pre']. $this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + -1]->minor['op'].$this->yystack[$this->yyidx + 0]->minor .')';
+    }
+// line 637 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r71(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 641 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r72(){
+    $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor . $this->yystack[$this->yyidx + -1]->minor . ')';
+    }
+// line 645 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r73(){
+    $this->_retvalue = 'in_array('.$this->yystack[$this->yyidx + -2]->minor.','.$this->yystack[$this->yyidx + 0]->minor.')';
+    }
+// line 649 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r74(){
+    $this->_retvalue = 'in_array('.$this->yystack[$this->yyidx + -2]->minor.',(array)'.$this->yystack[$this->yyidx + 0]->minor.')';
+    }
+// line 657 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r75(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -5]->minor.' ? '. $this->compiler->compileVariable('\''.substr($this->yystack[$this->yyidx + -2]->minor,1).'\'') . ' : '.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 661 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r76(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -5]->minor.' ? '.$this->yystack[$this->yyidx + -2]->minor.' : '.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 671 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r78(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 676 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r79(){
+    $this->_retvalue = '!'.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 697 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r84(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.'.'.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 701 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r85(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.'.';
+    }
+// line 705 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r86(){
+    $this->_retvalue = '.'.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 710 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r87(){
+    if (defined($this->yystack[$this->yyidx + 0]->minor)) {
         if ($this->security) {
-            $this->compiler->trigger_template_error(self::ERR2);
+             $this->security->isTrustedConstant($this->yystack[$this->yyidx + 0]->minor, $this->compiler);
         }
-        $this->_retvalue =
-            '->{' . $this->yystack[ $this->yyidx + -2 ]->minor . $this->yystack[ $this->yyidx + 0 ]->minor . '}';
+        $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
+    } else {
+        $this->_retvalue = '\''.$this->yystack[$this->yyidx + 0]->minor.'\'';
     }
-
-    // line 1021 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r142()
-    {
-        if ($this->security) {
-            $this->compiler->trigger_template_error(self::ERR2);
+    }
+// line 727 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r89(){
+    $this->_retvalue = '('. $this->yystack[$this->yyidx + -1]->minor .')';
+    }
+// line 731 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r90(){
+      $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 749 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r94(){
+    $prefixVar = $this->compiler->getNewPrefixVariable();
+    if ($this->yystack[$this->yyidx + -2]->minor['var'] === '\'smarty\'') {
+        $this->compiler->appendPrefixCode("<?php {$prefixVar} = ". $this->compiler->compileTag('private_special_variable',array(),$this->yystack[$this->yyidx + -2]->minor['smarty_internal_index']).';?>');
+     } else {
+        $this->compiler->appendPrefixCode("<?php  {$prefixVar} = ". $this->compiler->compileVariable($this->yystack[$this->yyidx + -2]->minor['var']).$this->yystack[$this->yyidx + -2]->minor['smarty_internal_index'].';?>');
+    }
+    $this->_retvalue = $prefixVar .'::'.$this->yystack[$this->yyidx + 0]->minor[0].$this->yystack[$this->yyidx + 0]->minor[1];
+    }
+// line 760 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r95(){
+    $prefixVar = $this->compiler->getNewPrefixVariable();
+    $tmp = $this->compiler->appendCode('<?php ob_start();?>', $this->yystack[$this->yyidx + 0]->minor);
+    $this->compiler->appendPrefixCode($this->compiler->appendCode($tmp, "<?php {$prefixVar} = ob_get_clean();?>"));
+    $this->_retvalue = $prefixVar;
+    }
+// line 767 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r96(){
+    $this->_retvalue = $this->compiler->compileTag('private_modifier',array(),array('value'=>$this->yystack[$this->yyidx + -1]->minor,'modifierlist'=>$this->yystack[$this->yyidx + 0]->minor));
+    }
+// line 780 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r99(){
+    if (!in_array(strtolower($this->yystack[$this->yyidx + -2]->minor), array('self', 'parent')) && (!$this->security || $this->security->isTrustedStaticClassAccess($this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, $this->compiler))) {
+        if (isset($this->smarty->registered_classes[$this->yystack[$this->yyidx + -2]->minor])) {
+            $this->_retvalue = $this->smarty->registered_classes[$this->yystack[$this->yyidx + -2]->minor].'::'.$this->yystack[$this->yyidx + 0]->minor[0].$this->yystack[$this->yyidx + 0]->minor[1];
+        } else {
+            $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.'::'.$this->yystack[$this->yyidx + 0]->minor[0].$this->yystack[$this->yyidx + 0]->minor[1];
+        } 
+    } else {
+        $this->compiler->trigger_template_error ('static class \''.$this->yystack[$this->yyidx + -2]->minor.'\' is undefined or not allowed by security setting');
+    }
+    }
+// line 799 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r101(){
+    $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
         }
-        $this->_retvalue =
-            '->{\'' .
-            $this->yystack[ $this->yyidx + -4 ]->minor .
-            '\'.' .
-            $this->yystack[ $this->yyidx + -2 ]->minor .
-            $this->yystack[ $this->yyidx + 0 ]->minor .
-            '}';
+// line 810 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r102(){
+   $this->_retvalue = $this->compiler->compileVariable('\''.substr($this->yystack[$this->yyidx + 0]->minor,1).'\'');
     }
-
-    // line 1029 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r143()
-    {
-        $this->_retvalue = '->' . $this->yystack[ $this->yyidx + 0 ]->minor;
+// line 813 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r103(){
+    if ($this->yystack[$this->yyidx + 0]->minor['var'] === '\'smarty\'') {
+        $smarty_var = $this->compiler->compileTag('private_special_variable',array(),$this->yystack[$this->yyidx + 0]->minor['smarty_internal_index']);
+        $this->_retvalue = $smarty_var;
+    } else {
+        // used for array reset,next,prev,end,current 
+        $this->last_variable = $this->yystack[$this->yyidx + 0]->minor['var'];
+        $this->last_index = $this->yystack[$this->yyidx + 0]->minor['smarty_internal_index'];
+        $this->_retvalue = $this->compiler->compileVariable($this->yystack[$this->yyidx + 0]->minor['var']).$this->yystack[$this->yyidx + 0]->minor['smarty_internal_index'];
     }
-
-    // line 1037 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r144()
-    {
-        $this->_retvalue =
-            $this->compiler->compilePHPFunctionCall($this->yystack[ $this->yyidx + -3 ]->minor,
-                $this->yystack[ $this->yyidx + -1 ]->minor);
     }
-
-    // line 1044 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r145()
-    {
-        if ($this->security && substr($this->yystack[ $this->yyidx + -3 ]->minor, 0, 1) === '_') {
-            $this->compiler->trigger_template_error(self::ERR1);
-        }
-        $this->_retvalue =
-            $this->yystack[ $this->yyidx + -3 ]->minor .
-            '(' .
-            implode(',', $this->yystack[ $this->yyidx + -1 ]->minor) .
-            ')';
+// line 826 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r104(){
+    $this->_retvalue = '$_smarty_tpl->tpl_vars['. $this->yystack[$this->yyidx + -2]->minor .']->'.$this->yystack[$this->yyidx + 0]->minor;
     }
-
-    // line 1055 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r146()
-    {
-        if ($this->security) {
-            $this->compiler->trigger_template_error(self::ERR2);
-        }
-        $prefixVar = $this->compiler->getNewPrefixVariable();
-        $this->compiler->appendPrefixCode("<?php {$prefixVar} = " .
-                                          $this->compiler->compileVariable('\'' .
-                                                                           substr($this->yystack[ $this->yyidx +
-                                                                                                  -3 ]->minor, 1) .
-                                                                           '\'') .
-                                          ';?>');
-        $this->_retvalue = $prefixVar . '(' . implode(',', $this->yystack[ $this->yyidx + -1 ]->minor) . ')';
+// line 836 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r106(){
+    $this->_retvalue = $this->compiler->compileConfigVariable('\'' . $this->yystack[$this->yyidx + -1]->minor . '\'');
     }
-
-    // line 1072 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r147()
-    {
-        $this->_retvalue =
-            array_merge($this->yystack[ $this->yyidx + -2 ]->minor, array($this->yystack[ $this->yyidx + 0 ]->minor));
+// line 840 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r107(){
+    $this->_retvalue = '(is_array($tmp = ' . $this->compiler->compileConfigVariable('\'' . $this->yystack[$this->yyidx + -2]->minor . '\'') . ') ? $tmp'.$this->yystack[$this->yyidx + 0]->minor.' :null)';
     }
-
-    // line 1076 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r150()
-    {
-        $this->_retvalue =
-            array_merge($this->yystack[ $this->yyidx + -2 ]->minor, array(
-                array_merge($this->yystack[ $this->yyidx + -1 ]->minor, $this->yystack[ $this->yyidx + 0 ]->minor)
-            ));
+// line 844 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r108(){
+    $this->_retvalue = $this->compiler->compileConfigVariable($this->yystack[$this->yyidx + -1]->minor);
     }
-
-    // line 1084 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r151()
-    {
-        $this->_retvalue =
-            array(array_merge($this->yystack[ $this->yyidx + -1 ]->minor, $this->yystack[ $this->yyidx + 0 ]->minor));
+// line 848 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r109(){
+    $this->_retvalue = '(is_array($tmp = ' . $this->compiler->compileConfigVariable($this->yystack[$this->yyidx + -2]->minor) . ') ? $tmp'.$this->yystack[$this->yyidx + 0]->minor.' : null)';
     }
-
-    // line 1092 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r153()
-    {
-        $this->_retvalue = array($this->yystack[ $this->yyidx + 0 ]->minor);
+// line 852 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r110(){
+    $this->_retvalue = array('var'=>'\''.substr($this->yystack[$this->yyidx + -1]->minor,1).'\'', 'smarty_internal_index'=>$this->yystack[$this->yyidx + 0]->minor);
     }
-
-    // line 1105 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r154()
-    {
-        $this->_retvalue =
-            array_merge($this->yystack[ $this->yyidx + -1 ]->minor, $this->yystack[ $this->yyidx + 0 ]->minor);
+// line 855 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r111(){
+    $this->_retvalue = array('var'=>$this->yystack[$this->yyidx + -1]->minor, 'smarty_internal_index'=>$this->yystack[$this->yyidx + 0]->minor);
     }
-
-    // line 1114 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r157()
-    {
-        $this->_retvalue =
-            array(trim($this->yystack[ $this->yyidx + -1 ]->minor) . $this->yystack[ $this->yyidx + 0 ]->minor);
+// line 868 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r113(){
+    return;
     }
-
-    // line 1119 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r159()
-    {
-        $this->_retvalue = array($this->yystack[ $this->yyidx + 0 ]->minor, '', 'method');
+// line 874 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r114(){
+    $this->_retvalue = '['.$this->compiler->compileVariable('\''.substr($this->yystack[$this->yyidx + 0]->minor,1).'\'').']';
     }
-
-    // line 1124 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r160()
-    {
-        $this->_retvalue =
-            array($this->yystack[ $this->yyidx + -1 ]->minor, $this->yystack[ $this->yyidx + 0 ]->minor, 'method');
+// line 877 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r115(){
+    $this->_retvalue = '['.$this->compiler->compileVariable($this->yystack[$this->yyidx + 0]->minor).']';
     }
-
-    // line 1129 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r161()
-    {
-        $this->_retvalue = array($this->yystack[ $this->yyidx + 0 ]->minor, '');
+// line 881 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r116(){
+    $this->_retvalue = '['.$this->compiler->compileVariable($this->yystack[$this->yyidx + -2]->minor).'->'.$this->yystack[$this->yyidx + 0]->minor.']';
     }
-
-    // line 1134 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r162()
-    {
-        $this->_retvalue =
-            array($this->yystack[ $this->yyidx + -1 ]->minor, $this->yystack[ $this->yyidx + 0 ]->minor, 'property');
+// line 885 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r117(){
+    $this->_retvalue = '[\''. $this->yystack[$this->yyidx + 0]->minor .'\']';
     }
-
-    // line 1140 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r163()
-    {
-        $this->_retvalue =
-            array(
-                $this->yystack[ $this->yyidx + -2 ]->minor,
-                $this->yystack[ $this->yyidx + -1 ]->minor . $this->yystack[ $this->yyidx + 0 ]->minor, 'property'
-            );
+// line 889 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r118(){
+    $this->_retvalue = '['. $this->yystack[$this->yyidx + 0]->minor .']';
     }
-
-    // line 1144 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r164()
-    {
-        $this->_retvalue = ' ' . trim($this->yystack[ $this->yyidx + 0 ]->minor) . ' ';
+// line 894 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r119(){
+    $this->_retvalue = '['. $this->yystack[$this->yyidx + -1]->minor .']';
     }
-
-    // line 1163 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r165()
-    {
-        static $lops = array(
-            'eq'  => ' == ',
-            'ne'  => ' != ',
-            'neq' => ' != ',
-            'gt'  => ' > ',
-            'ge'  => ' >= ',
-            'gte' => ' >= ',
-            'lt'  => ' < ',
-            'le'  => ' <= ',
-            'lte' => ' <= ',
-            'mod' => ' % ',
-            'and' => ' && ',
-            'or'  => ' || ',
-            'xor' => ' xor ',
-        );
-        $op = strtolower(preg_replace('/\s*/', '', $this->yystack[ $this->yyidx + 0 ]->minor));
-        $this->_retvalue = $lops[ $op ];
+// line 899 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r120(){
+    $this->_retvalue = '['.$this->compiler->compileTag('private_special_variable',array(),'[\'section\'][\''.$this->yystack[$this->yyidx + -1]->minor.'\'][\'index\']').']';
     }
-
-    // line 1176 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r166()
-    {
-        static $tlops = array(
-            'isdivby'     => array('op' => ' % ', 'pre' => '!('),
-            'isnotdivby'  => array('op' => ' % ', 'pre' => '('),
-            'isevenby'    => array('op' => ' / ', 'pre' => '!(1 & '),
-            'isnotevenby' => array('op' => ' / ', 'pre' => '(1 & '),
-            'isoddby'     => array('op' => ' / ', 'pre' => '(1 & '),
-            'isnotoddby'  => array('op' => ' / ', 'pre' => '!(1 & '),
-        );
-        $op = strtolower(preg_replace('/\s*/', '', $this->yystack[ $this->yyidx + 0 ]->minor));
-        $this->_retvalue = $tlops[ $op ];
+// line 903 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r121(){
+    $this->_retvalue = '['.$this->compiler->compileTag('private_special_variable',array(),'[\'section\'][\''.$this->yystack[$this->yyidx + -3]->minor.'\'][\''.$this->yystack[$this->yyidx + -1]->minor.'\']').']';
     }
-
-    // line 1190 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r167()
-    {
-        static $scond = array(
-            'iseven'    => '!(1 & ',
+// line 906 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r122(){
+    $this->_retvalue = '['.$this->yystack[$this->yyidx + -1]->minor.']';
+    }
+// line 912 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r124(){
+    $this->_retvalue = '['.$this->compiler->compileVariable('\''.substr($this->yystack[$this->yyidx + -1]->minor,1).'\'').']';
+    }
+// line 928 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r128(){
+    $this->_retvalue = '[]';
+    }
+// line 938 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r129(){
+    $this->_retvalue = '\''.substr($this->yystack[$this->yyidx + 0]->minor,1).'\'';
+    }
+// line 942 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r130(){
+    $this->_retvalue = '\'\'';
+    }
+// line 947 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r131(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.'.'.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 955 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r133(){
+    $var = trim(substr($this->yystack[$this->yyidx + 0]->minor, $this->compiler->getLdelLength(), -$this->compiler->getRdelLength()), ' $');
+    $this->_retvalue = $this->compiler->compileVariable('\''.$var.'\'');
+    }
+// line 961 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r134(){
+    $this->_retvalue = '('.$this->yystack[$this->yyidx + -1]->minor.')';
+    }
+// line 968 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r135(){
+    if ($this->yystack[$this->yyidx + -1]->minor['var'] === '\'smarty\'') {
+        $this->_retvalue =  $this->compiler->compileTag('private_special_variable',array(),$this->yystack[$this->yyidx + -1]->minor['smarty_internal_index']).$this->yystack[$this->yyidx + 0]->minor;
+    } else {
+        $this->_retvalue = $this->compiler->compileVariable($this->yystack[$this->yyidx + -1]->minor['var']).$this->yystack[$this->yyidx + -1]->minor['smarty_internal_index'].$this->yystack[$this->yyidx + 0]->minor;
+    }
+    }
+// line 977 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r136(){
+    $this->_retvalue  = $this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 982 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r137(){
+    $this->_retvalue  = $this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 987 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r138(){
+    if ($this->security && substr($this->yystack[$this->yyidx + -1]->minor,0,1) === '_') {
+        $this->compiler->trigger_template_error (self::ERR1);
+    }
+    $this->_retvalue = '->'.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 994 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r139(){
+    if ($this->security) {
+        $this->compiler->trigger_template_error (self::ERR2);
+    }
+    $this->_retvalue = '->{'.$this->compiler->compileVariable($this->yystack[$this->yyidx + -1]->minor).$this->yystack[$this->yyidx + 0]->minor.'}';
+    }
+// line 1001 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r140(){
+    if ($this->security) {
+        $this->compiler->trigger_template_error (self::ERR2);
+    }
+    $this->_retvalue = '->{'.$this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + 0]->minor.'}';
+    }
+// line 1008 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r141(){
+    if ($this->security) {
+        $this->compiler->trigger_template_error (self::ERR2);
+    }
+    $this->_retvalue = '->{\''.$this->yystack[$this->yyidx + -4]->minor.'\'.'.$this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + 0]->minor.'}';
+    }
+// line 1016 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r142(){
+    $this->_retvalue = '->'.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 1024 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r143(){
+    $this->_retvalue = $this->compiler->compilePHPFunctionCall($this->yystack[$this->yyidx + -3]->minor, $this->yystack[$this->yyidx + -1]->minor);
+    }
+// line 1032 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r144(){
+    if ($this->security && substr($this->yystack[$this->yyidx + -3]->minor,0,1) === '_') {
+        $this->compiler->trigger_template_error (self::ERR1);
+    }
+    $this->_retvalue = $this->yystack[$this->yyidx + -3]->minor . '('. implode(',',$this->yystack[$this->yyidx + -1]->minor) .')';
+    }
+// line 1039 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r145(){
+    if ($this->security) {
+        $this->compiler->trigger_template_error (self::ERR2);
+    }
+    $prefixVar = $this->compiler->getNewPrefixVariable();
+    $this->compiler->appendPrefixCode("<?php {$prefixVar} = ".$this->compiler->compileVariable('\''.substr($this->yystack[$this->yyidx + -3]->minor,1).'\'').';?>');
+    $this->_retvalue = $prefixVar .'('. implode(',',$this->yystack[$this->yyidx + -1]->minor) .')';
+    }
+// line 1050 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r146(){
+    $this->_retvalue = array_merge($this->yystack[$this->yyidx + -2]->minor,array($this->yystack[$this->yyidx + 0]->minor));
+    }
+// line 1067 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r149(){
+    $this->_retvalue = array_merge($this->yystack[$this->yyidx + -2]->minor,array(array_merge($this->yystack[$this->yyidx + -1]->minor,$this->yystack[$this->yyidx + 0]->minor)));
+    }
+// line 1071 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r150(){
+    $this->_retvalue = array(array_merge($this->yystack[$this->yyidx + -1]->minor,$this->yystack[$this->yyidx + 0]->minor));
+    }
+// line 1079 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r152(){
+    $this->_retvalue =  array($this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 1087 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r153(){
+    $this->_retvalue = array_merge($this->yystack[$this->yyidx + -1]->minor,$this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 1100 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r156(){
+    $this->_retvalue = array(trim($this->yystack[$this->yyidx + -1]->minor).$this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 1109 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r158(){
+    $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor, '', 'method');
+    }
+// line 1114 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r159(){
+    $this->_retvalue = array($this->yystack[$this->yyidx + -1]->minor, $this->yystack[$this->yyidx + 0]->minor, 'method');
+    }
+// line 1119 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r160(){
+    $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor, '');
+    }
+// line 1124 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r161(){
+    $this->_retvalue = array($this->yystack[$this->yyidx + -1]->minor, $this->yystack[$this->yyidx + 0]->minor, 'property');
+    }
+// line 1129 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r162(){
+    $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor, 'property');
+    }
+// line 1135 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r163(){
+    $this->_retvalue = ' '. trim($this->yystack[$this->yyidx + 0]->minor) . ' ';
+    }
+// line 1139 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r164(){
+    static $lops = array(
+        'eq' => ' == ',
+        'ne' => ' != ',
+        'neq' => ' != ',
+        'gt' => ' > ',
+        'ge' => ' >= ',
+        'gte' => ' >= ',
+        'lt' =>  ' < ',
+        'le' =>  ' <= ',
+        'lte' => ' <= ',
+        'mod' =>  ' % ',
+        'and' => ' && ',
+        'or' => ' || ',
+        'xor' => ' xor ',
+         );
+    $op = strtolower(preg_replace('/\s*/', '', $this->yystack[$this->yyidx + 0]->minor));
+    $this->_retvalue = $lops[$op];
+    }
+// line 1158 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r165(){
+     static $tlops = array(
+         'isdivby' => array('op' => ' % ', 'pre' => '!('),
+         'isnotdivby' => array('op' => ' % ', 'pre' => '('),
+         'isevenby' => array('op' => ' / ', 'pre' => '!(1 & '),
+         'isnotevenby' => array('op' => ' / ', 'pre' => '(1 & '),
+         'isoddby' => array('op' => ' / ', 'pre' => '(1 & '),
+         'isnotoddby' => array('op' => ' / ', 'pre' => '!(1 & '),
+         );
+     $op = strtolower(preg_replace('/\s*/', '', $this->yystack[$this->yyidx + 0]->minor));
+     $this->_retvalue = $tlops[$op];
+     }
+// line 1171 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r166(){
+        static $scond = array (
+            'iseven' => '!(1 & ',
             'isnoteven' => '(1 & ',
-            'isodd'     => '(1 & ',
-            'isnotodd'  => '!(1 & ',
+            'isodd' => '(1 & ',
+            'isnotodd' => '!(1 & ',
         );
-        $op = strtolower(str_replace(' ', '', $this->yystack[ $this->yyidx + 0 ]->minor));
-        $this->_retvalue = $scond[ $op ];
+   $op = strtolower(str_replace(' ', '', $this->yystack[$this->yyidx + 0]->minor));
+   $this->_retvalue = $scond[$op];
+    }
+// line 1185 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r167(){
+    $this->_retvalue = 'array('.$this->yystack[$this->yyidx + -1]->minor.')';
+    }
+// line 1196 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r170(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.','.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 1204 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r172(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.'=>'.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 1208 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r173(){ 
+    $this->_retvalue = '\''.$this->yystack[$this->yyidx + -2]->minor.'\'=>'.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 1224 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r176(){
+    $this->compiler->leaveDoubleQuote();
+    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor->to_smarty_php($this);
+    }
+// line 1230 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r177(){
+    $this->yystack[$this->yyidx + -1]->minor->append_subtree($this, $this->yystack[$this->yyidx + 0]->minor);
+    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor;
+    }
+// line 1235 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r178(){
+    $this->_retvalue = new Smarty_Internal_ParseTree_Dq($this, $this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 1239 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r179(){
+    $this->_retvalue = new Smarty_Internal_ParseTree_Code('(string)'.$this->yystack[$this->yyidx + -1]->minor);
+    }
+// line 1243 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r180(){
+    $this->_retvalue = new Smarty_Internal_ParseTree_Code('(string)('.$this->yystack[$this->yyidx + -1]->minor.')');
+    }
+// line 1247 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r181(){
+    $this->_retvalue = new Smarty_Internal_ParseTree_Code('(string)$_smarty_tpl->tpl_vars[\''. substr($this->yystack[$this->yyidx + 0]->minor,1) .'\']->value');
+    }
+// line 1259 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r184(){
+    $this->_retvalue = new Smarty_Internal_ParseTree_Tag($this, $this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 1263 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r185(){
+    $this->_retvalue = new Smarty_Internal_ParseTree_DqContent($this->yystack[$this->yyidx + 0]->minor);
     }
 
-    // line 1201 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r168()
-    {
-        $this->_retvalue = 'array(' . $this->yystack[ $this->yyidx + -1 ]->minor . ')';
-    }
-
-    // line 1209 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r171()
-    {
-        $this->_retvalue = $this->yystack[ $this->yyidx + -2 ]->minor . ',' . $this->yystack[ $this->yyidx + 0 ]->minor;
-    }
-
-    // line 1213 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r173()
-    {
-        $this->_retvalue =
-            $this->yystack[ $this->yyidx + -2 ]->minor . '=>' . $this->yystack[ $this->yyidx + 0 ]->minor;
-    }
-
-    // line 1229 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r174()
-    {
-        $this->_retvalue =
-            '\'' . $this->yystack[ $this->yyidx + -2 ]->minor . '\'=>' . $this->yystack[ $this->yyidx + 0 ]->minor;
-    }
-
-    // line 1235 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r177()
-    {
-        $this->compiler->leaveDoubleQuote();
-        $this->_retvalue = $this->yystack[ $this->yyidx + -1 ]->minor->to_smarty_php($this);
-    }
-
-    // line 1240 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r178()
-    {
-        $this->yystack[ $this->yyidx + -1 ]->minor->append_subtree($this, $this->yystack[ $this->yyidx + 0 ]->minor);
-        $this->_retvalue = $this->yystack[ $this->yyidx + -1 ]->minor;
-    }
-
-    // line 1244 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r179()
-    {
-        $this->_retvalue = new Smarty_Internal_ParseTree_Dq($this, $this->yystack[ $this->yyidx + 0 ]->minor);
-    }
-
-    // line 1248 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r180()
-    {
-        $this->_retvalue = new Smarty_Internal_ParseTree_Code('(string)' . $this->yystack[ $this->yyidx + -1 ]->minor);
-    }
-
-    // line 1252 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r181()
-    {
-        $this->_retvalue =
-            new Smarty_Internal_ParseTree_Code('(string)(' . $this->yystack[ $this->yyidx + -1 ]->minor . ')');
-    }
-
-    // line 1264 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r182()
-    {
-        $this->_retvalue =
-            new Smarty_Internal_ParseTree_Code('(string)$_smarty_tpl->tpl_vars[\'' .
-                                               substr($this->yystack[ $this->yyidx + 0 ]->minor, 1) .
-                                               '\']->value');
-    }
-
-    // line 1268 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r185()
-    {
-        $this->_retvalue = new Smarty_Internal_ParseTree_Tag($this, $this->yystack[ $this->yyidx + 0 ]->minor);
-    }
-
-    public function yy_r186()
-    {
-        $this->_retvalue = new Smarty_Internal_ParseTree_DqContent($this->yystack[ $this->yyidx + 0 ]->minor);
-    }
+    private $_retvalue;
 
     public function yy_reduce($yyruleno)
     {
         if ($this->yyTraceFILE && $yyruleno >= 0
-            && $yyruleno < count(self::$yyRuleName)) {
+              && $yyruleno < count(self::$yyRuleName)) {
             fprintf($this->yyTraceFILE, "%sReduce (%d) [%s].\n",
                 $this->yyTracePrompt, $yyruleno,
-                self::$yyRuleName[ $yyruleno ]);
+                self::$yyRuleName[$yyruleno]);
         }
+
         $this->_retvalue = $yy_lefthand_side = null;
-        if (isset(self::$yyReduceMap[ $yyruleno ])) {
+        if (isset(self::$yyReduceMap[$yyruleno])) {
             // call the action
             $this->_retvalue = null;
-            $this->{'yy_r' . self::$yyReduceMap[ $yyruleno ]}();
+            $this->{'yy_r' . self::$yyReduceMap[$yyruleno]}();
             $yy_lefthand_side = $this->_retvalue;
         }
-        $yygoto = self::$yyRuleInfo[ $yyruleno ][ 0 ];
-        $yysize = self::$yyRuleInfo[ $yyruleno ][ 1 ];
+        $yygoto = self::$yyRuleInfo[$yyruleno][0];
+        $yysize = self::$yyRuleInfo[$yyruleno][1];
         $this->yyidx -= $yysize;
         for ($i = $yysize; $i; $i--) {
             // pop all of the right-hand side parameters
             array_pop($this->yystack);
         }
-        $yyact = $this->yy_find_reduce_action($this->yystack[ $this->yyidx ]->stateno, $yygoto);
+        $yyact = $this->yy_find_reduce_action($this->yystack[$this->yyidx]->stateno, $yygoto);
         if ($yyact < self::YYNSTATE) {
             if (!$this->yyTraceFILE && $yysize) {
                 $this->yyidx++;
@@ -3492,7 +2789,7 @@ class Smarty_Internal_Templateparser
                 $x->stateno = $yyact;
                 $x->major = $yygoto;
                 $x->minor = $yy_lefthand_side;
-                $this->yystack[ $this->yyidx ] = $x;
+                $this->yystack[$this->yyidx] = $x;
             } else {
                 $this->yy_shift($yyact, $yygoto, $yy_lefthand_side);
             }
@@ -3505,37 +2802,38 @@ class Smarty_Internal_Templateparser
     {
         if ($this->yyTraceFILE) {
             fprintf($this->yyTraceFILE, "%sFail!\n", $this->yyTracePrompt);
-        }
-        while ($this->yyidx >= 0) {
+        } while ($this->yyidx >= 0) {
             $this->yy_pop_parser_stack();
         }
     }
 
     public function yy_syntax_error($yymajor, $TOKEN)
     {
-        // line 214 "../smarty/lexer/smarty_internal_templateparser.y"
-        $this->internalError = true;
-        $this->yymajor = $yymajor;
-        $this->compiler->trigger_template_error();
+// line 213 "../smarty/lexer/smarty_internal_templateparser.y"
+
+    $this->internalError = true;
+    $this->yymajor = $yymajor;
+    $this->compiler->trigger_template_error();
     }
 
     public function yy_accept()
     {
         if ($this->yyTraceFILE) {
             fprintf($this->yyTraceFILE, "%sAccept!\n", $this->yyTracePrompt);
-        }
-        while ($this->yyidx >= 0) {
+        } while ($this->yyidx >= 0) {
             $this->yy_pop_parser_stack();
         }
-        // line 207 "../smarty/lexer/smarty_internal_templateparser.y"
-        $this->successful = !$this->internalError;
-        $this->internalError = false;
-        $this->retvalue = $this->_retvalue;
+// line 206 "../smarty/lexer/smarty_internal_templateparser.y"
+
+    $this->successful = !$this->internalError;
+    $this->internalError = false;
+    $this->retvalue = $this->_retvalue;
     }
 
     public function doParse($yymajor, $yytokenvalue)
     {
         $yyerrorhit = 0;   /* True if yymajor has invoked an error */
+
         if ($this->yyidx === null || $this->yyidx < 0) {
             $this->yyidx = 0;
             $this->yyerrcnt = -1;
@@ -3545,15 +2843,17 @@ class Smarty_Internal_Templateparser
             $this->yystack = array();
             $this->yystack[] = $x;
         }
-        $yyendofinput = ($yymajor == 0);
+        $yyendofinput = ($yymajor==0);
+
         if ($this->yyTraceFILE) {
             fprintf($this->yyTraceFILE, "%sInput %s\n",
-                $this->yyTracePrompt, $this->yyTokenName[ $yymajor ]);
+                $this->yyTracePrompt, $this->yyTokenName[$yymajor]);
         }
+
         do {
             $yyact = $this->yy_find_shift_action($yymajor);
             if ($yymajor < self::YYERRORSYMBOL &&
-                !$this->yy_is_expected_token($yymajor)) {
+                  !$this->yy_is_expected_token($yymajor)) {
                 // force a syntax error
                 $yyact = self::YY_ERROR_ACTION;
             }
@@ -3576,22 +2876,22 @@ class Smarty_Internal_Templateparser
                     if ($this->yyerrcnt < 0) {
                         $this->yy_syntax_error($yymajor, $yytokenvalue);
                     }
-                    $yymx = $this->yystack[ $this->yyidx ]->major;
+                    $yymx = $this->yystack[$this->yyidx]->major;
                     if ($yymx === self::YYERRORSYMBOL || $yyerrorhit) {
                         if ($this->yyTraceFILE) {
                             fprintf($this->yyTraceFILE, "%sDiscard input token %s\n",
-                                $this->yyTracePrompt, $this->yyTokenName[ $yymajor ]);
+                                $this->yyTracePrompt, $this->yyTokenName[$yymajor]);
                         }
                         $this->yy_destructor($yymajor, $yytokenvalue);
                         $yymajor = self::YYNOCODE;
                     } else {
                         while ($this->yyidx >= 0 &&
-                               $yymx !== self::YYERRORSYMBOL &&
-                               ($yyact = $this->yy_find_shift_action(self::YYERRORSYMBOL)) >= self::YYNSTATE
-                        ) {
+                                 $yymx !== self::YYERRORSYMBOL &&
+        ($yyact = $this->yy_find_shift_action(self::YYERRORSYMBOL)) >= self::YYNSTATE
+                              ){
                             $this->yy_pop_parser_stack();
                         }
-                        if ($this->yyidx < 0 || $yymajor == 0) {
+                        if ($this->yyidx < 0 || $yymajor==0) {
                             $this->yy_destructor($yymajor, $yytokenvalue);
                             $this->yy_parse_failed();
                             $yymajor = self::YYNOCODE;
diff --git a/libs/sysplugins/smarty_internal_testinstall.php b/libs/sysplugins/smarty_internal_testinstall.php
index 504a4582..1fac79b7 100644
--- a/libs/sysplugins/smarty_internal_testinstall.php
+++ b/libs/sysplugins/smarty_internal_testinstall.php
@@ -362,7 +362,6 @@ class Smarty_Internal_TestInstall
                 'smarty_internal_compile_function.php'                      => true,
                 'smarty_internal_compile_if.php'                            => true,
                 'smarty_internal_compile_include.php'                       => true,
-                'smarty_internal_compile_include_php.php'                   => true,
                 'smarty_internal_compile_insert.php'                        => true,
                 'smarty_internal_compile_ldelim.php'                        => true,
                 'smarty_internal_compile_make_nocache.php'                  => true,
@@ -373,7 +372,6 @@ class Smarty_Internal_TestInstall
                 'smarty_internal_compile_private_modifier.php'              => true,
                 'smarty_internal_compile_private_object_block_function.php' => true,
                 'smarty_internal_compile_private_object_function.php'       => true,
-                'smarty_internal_compile_private_php.php'                   => true,
                 'smarty_internal_compile_private_print_expression.php'      => true,
                 'smarty_internal_compile_private_registered_block.php'      => true,
                 'smarty_internal_compile_private_registered_function.php'   => true,
@@ -388,7 +386,6 @@ class Smarty_Internal_TestInstall
                 'smarty_internal_config_file_compiler.php'                  => true,
                 'smarty_internal_data.php'                                  => true,
                 'smarty_internal_debug.php'                                 => true,
-                'smarty_internal_errorhandler.php'                          => true,
                 'smarty_internal_extension_handler.php'                     => true,
                 'smarty_internal_method_addautoloadfilters.php'             => true,
                 'smarty_internal_method_adddefaultmodifiers.php'            => true,
@@ -450,7 +447,6 @@ class Smarty_Internal_TestInstall
                 'smarty_internal_resource_extends.php'                      => true,
                 'smarty_internal_resource_file.php'                         => true,
                 'smarty_internal_resource_php.php'                          => true,
-                'smarty_internal_resource_registered.php'                   => true,
                 'smarty_internal_resource_stream.php'                       => true,
                 'smarty_internal_resource_string.php'                       => true,
                 'smarty_internal_runtime_cachemodify.php'                   => true,
diff --git a/libs/sysplugins/smarty_resource.php b/libs/sysplugins/smarty_resource.php
index aae7e42f..7fe84536 100644
--- a/libs/sysplugins/smarty_resource.php
+++ b/libs/sysplugins/smarty_resource.php
@@ -72,9 +72,7 @@ abstract class Smarty_Resource
         }
         // try registered resource
         if (isset($smarty->registered_resources[ $type ])) {
-            return $smarty->_cache[ 'resource_handlers' ][ $type ] =
-                $smarty->registered_resources[ $type ] instanceof Smarty_Resource ?
-                    $smarty->registered_resources[ $type ] : new Smarty_Internal_Resource_Registered();
+            return $smarty->_cache[ 'resource_handlers' ][ $type ] = $smarty->registered_resources[ $type ];
         }
         // try sysplugins dir
         if (isset(self::$sysplugins[ $type ])) {
diff --git a/libs/sysplugins/smarty_security.php b/libs/sysplugins/smarty_security.php
index 441a7e28..3c29c813 100644
--- a/libs/sysplugins/smarty_security.php
+++ b/libs/sysplugins/smarty_security.php
@@ -21,19 +21,6 @@
  */
 class Smarty_Security
 {
-    /**
-     * This determines how Smarty handles "<?php ... ?>" tags in templates.
-     * possible values:
-     * <ul>
-     *   <li>Smarty::PHP_PASSTHRU -> echo PHP tags as they are</li>
-     *   <li>Smarty::PHP_QUOTE    -> escape tags as entities</li>
-     *   <li>Smarty::PHP_REMOVE   -> remove php tags</li>
-     *   <li>Smarty::PHP_ALLOW    -> execute php tags</li>
-     * </ul>
-     *
-     * @var integer
-     */
-    public $php_handling = Smarty::PHP_PASSTHRU;
 
     /**
      * This is the list of template directories that are considered secure.
diff --git a/phpunit.sh b/phpunit.sh
index 65935ab5..a733b767 100755
--- a/phpunit.sh
+++ b/phpunit.sh
@@ -1,2 +1,2 @@
 #! /bin/bash
-vendor/phpunit/phpunit/phpunit tests/UnitTests
+vendor/phpunit/phpunit/phpunit
diff --git a/phpunit.xml b/phpunit.xml
index e372eb80..e0ad81d6 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -6,7 +6,6 @@
         backupGlobals="false"
         backupStaticAttributes="true"
         forceCoversAnnotation="false"
-        mapTestClassNameToCoveredClassName="false"
         processIsolation="false"
         stopOnError="false"
         stopOnFailure="false"
@@ -17,18 +16,15 @@
         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>
+    <testsuites>
+        <testsuite name="foo">
+            <directory>./tests/UnitTests/</directory>
+            <exclude>./tests/UnitTests/CacheResourceTests/Memcache/CacheResourceCustomMemcacheTest.php</exclude>
+            <exclude>./tests/UnitTests/CacheResourceTests/Apc/CacheResourceCustomApcTest.php</exclude>
+            <exclude>./tests/UnitTests/CacheModify/ModifiedSince/HttpModifiedSinceTest.php</exclude>
+        </testsuite>
+    </testsuites>
+    <filter>
         <whitelist processUncoveredFilesFromWhitelist="true">
             <directory suffix=".php">libs</directory>
             <directory suffix=".php">libs/plugins</directory>
@@ -36,8 +32,4 @@
             <directory suffix=".php">demo/plugins</directory>
         </whitelist>
     </filter>
-    <logging>
-        <log type="tap" target="tests/TestResults.tap"/>
-    </logging>
-
 </phpunit>
diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php
index ac4a4e6f..d7ed0b5a 100644
--- a/tests/Bootstrap.php
+++ b/tests/Bootstrap.php
@@ -10,14 +10,6 @@ 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');
-}
-
 require_once 'PHPUnit_Smarty.php';
 if (!ini_get('date.timezone')) {
     ini_set('date.timezone', 'Europe/Berlin');
diff --git a/tests/Config.php b/tests/Config.php
index c6663cff..e2d66127 100644
--- a/tests/Config.php
+++ b/tests/Config.php
@@ -7,12 +7,10 @@
  * 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_USER', "root");
 define('DB_PASSWD', "");
diff --git a/tests/PHPUnit_Smarty.php b/tests/PHPUnit_Smarty.php
index 6edcff18..2b949bf4 100644
--- a/tests/PHPUnit_Smarty.php
+++ b/tests/PHPUnit_Smarty.php
@@ -7,36 +7,16 @@
 /**
  * Smarty Test Case Fixture
  */
-class PHPUnit_Smarty extends PHPUnit_Framework_TestCase
+class PHPUnit_Smarty extends PHPUnit\Framework\TestCase
 {
-    /**
-     * Smarty object
-     *
-     * @var SmartyBC
-     */
-    public $smartyBC = null;
 
     /**
-     * SmartyBC object
+     * Smarty 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
      *
@@ -86,7 +66,7 @@ class PHPUnit_Smarty extends PHPUnit_Framework_TestCase
      * This method is called before the first test of this test class is run.
      *
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         error_reporting(E_ALL & ~E_STRICT);
         self::$init = true;
@@ -97,7 +77,7 @@ class PHPUnit_Smarty extends PHPUnit_Framework_TestCase
      * This method is called after the last test of this test class is run.
      *
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
         //self::$pdo = null;
         self::$testNumber = 0;
@@ -161,23 +141,15 @@ class PHPUnit_Smarty extends PHPUnit_Framework_TestCase
             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');
-            }
+        $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();
+
+        $this->getSmartyObj();
     }
 
     /**
@@ -658,10 +630,10 @@ KEY `name` (`name`)
 
     /**
      *  Gat Smarty object
-     * @return null|\Smarty|\SmartyBC
+     * @return null|\Smarty
      */
     public function getSmartyObj(){
-        return isset($this->smarty) ? $this->smarty : (isset($this->smartyBC) ? $this->smartyBC : null);
+        return $this->smarty;
     }
 
     public static function getSmartyPluginsDir(){
@@ -676,7 +648,7 @@ KEY `name` (`name`)
      * This method is called after a test is executed.
      *
      */
-    protected function tearDown()
+    protected function tearDown(): void
     {
         if (class_exists('Smarty_Internal_TemplateCompilerBase') &&
             isset(Smarty_Internal_TemplateCompilerBase::$_tag_objects)
@@ -689,11 +661,5 @@ KEY `name` (`name`)
         if (isset($this->smarty)) {
             $this->smarty = null;
         }
-        if (isset($this->smartyBC->smarty)) {
-            $this->smartyBC->smarty = null;
-        }
-        if (isset($this->smartyBC)) {
-            $this->smartyBC = null;
-        }
     }
 }
diff --git a/tests/UnitTests/A_0/PathNormalization/PathNormalizationTest.php b/tests/UnitTests/A_0/PathNormalization/PathNormalizationTest.php
index ce4cdd91..fdba81b9 100644
--- a/tests/UnitTests/A_0/PathNormalization/PathNormalizationTest.php
+++ b/tests/UnitTests/A_0/PathNormalization/PathNormalizationTest.php
@@ -15,7 +15,7 @@ class PathNormalizationTest extends PHPUnit_Smarty
     /*
      * Setup test fixture
      */
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
diff --git a/tests/UnitTests/A_0/PathNormalization/PluginDirNormalizationTest.php b/tests/UnitTests/A_0/PathNormalization/PluginDirNormalizationTest.php
index 737ff4eb..81e51730 100644
--- a/tests/UnitTests/A_0/PathNormalization/PluginDirNormalizationTest.php
+++ b/tests/UnitTests/A_0/PathNormalization/PluginDirNormalizationTest.php
@@ -15,7 +15,7 @@ class PluginNormalizationTest extends PHPUnit_Smarty
     /*
      * Setup test fixture
      */
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
diff --git a/tests/UnitTests/A_0/PathNormalization/TemlateDirNormalizationTest.php b/tests/UnitTests/A_0/PathNormalization/TemlateDirNormalizationTest.php
index 3ee101b1..e8107f3e 100644
--- a/tests/UnitTests/A_0/PathNormalization/TemlateDirNormalizationTest.php
+++ b/tests/UnitTests/A_0/PathNormalization/TemlateDirNormalizationTest.php
@@ -15,7 +15,7 @@ class TemplateNormalizationTest extends PHPUnit_Smarty
     /*
      * Setup test fixture
      */
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
diff --git a/tests/UnitTests/A_1/ProtectedFolderVars/ProtectedFolderVarsTest.php b/tests/UnitTests/A_1/ProtectedFolderVars/ProtectedFolderVarsTest.php
index a51757ae..0b2c4aa2 100644
--- a/tests/UnitTests/A_1/ProtectedFolderVars/ProtectedFolderVarsTest.php
+++ b/tests/UnitTests/A_1/ProtectedFolderVars/ProtectedFolderVarsTest.php
@@ -15,7 +15,7 @@ class ProtectedFolderVarsTest extends PHPUnit_Smarty
     /*
      * Setup test fixture
      */
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
diff --git a/tests/UnitTests/A_2/UndefinedTemplateVar/UndefinedTemplateVarTest.php b/tests/UnitTests/A_2/UndefinedTemplateVar/UndefinedTemplateVarTest.php
index 289e73e6..3e813100 100644
--- a/tests/UnitTests/A_2/UndefinedTemplateVar/UndefinedTemplateVarTest.php
+++ b/tests/UnitTests/A_2/UndefinedTemplateVar/UndefinedTemplateVarTest.php
@@ -13,10 +13,9 @@ class UndefinedTemplateVarTest extends PHPUnit_Smarty
     /*
      * Setup test fixture
      */
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
-        error_reporting(E_ALL | E_STRICT);
     }
 
     public function testInit()
@@ -48,9 +47,9 @@ class UndefinedTemplateVarTest extends PHPUnit_Smarty
         $this->assertEquals($e1, $e2);
     }
 
-	/**
-	 * Test Error suppression template object fetched by Smarty object
-	 */
+    /**
+     * Test Error suppression template object fetched by Smarty object
+     */
     public function testErrorDisabledTplObject_2()
     {
         $e1 = error_reporting();
@@ -66,27 +65,73 @@ class UndefinedTemplateVarTest extends PHPUnit_Smarty
      */
     public function testError()
     {
-	    $exceptionThrown = false;
+        $exceptionThrown = false;
 
         try {
-	        $e1 = error_reporting();
-	        $this->assertEquals('undefined = ', $this->smarty->fetch('001_main.tpl'));
-	        $e2 = error_reporting();
-	        $this->assertEquals($e1, $e2);
+            $e1 = error_reporting();
+            $this->assertEquals('undefined = ', $this->smarty->fetch('001_main.tpl'));
+            $e2 = error_reporting();
+            $this->assertEquals($e1, $e2);
         } catch (Exception $e) {
 
-        	$exceptionThrown = true;
-	        $this->assertStringStartsWith('Undefined ', $e->getMessage());
-	        $this->assertTrue(in_array(
-	        	get_class($e),
-		        array(
-		        	'PHPUnit_Framework_Error_Warning',
-			        'PHPUnit_Framework_Error_Notice',
-			        'PHPUnit\Framework\Error\Warning',
-			        'PHPUnit\Framework\Error\Notice',
-		        )
-	        ));
+            $exceptionThrown = true;
+            $this->assertStringStartsWith('Undefined ', $e->getMessage());
+            $this->assertTrue(in_array(
+                get_class($e),
+                [
+                    'PHPUnit\Framework\Error\Warning',
+                    'PHPUnit\Framework\Error\Notice',
+                ]
+            ));
         }
-	    $this->assertTrue($exceptionThrown);
+        $this->assertTrue($exceptionThrown);
     }
+
+    public function testUndefinedSimpleVar() {
+        $this->smarty->setErrorReporting(E_ALL & ~E_NOTICE);
+        $this->smarty->muteUndefinedOrNullWarnings();
+        $tpl = $this->smarty->createTemplate('string:a{if $undef}def{/if}b');
+        $this->assertEquals("ab", $this->smarty->fetch($tpl));
+    }
+
+    public function testUndefinedArrayIndex() {
+        $this->smarty->setErrorReporting(E_ALL & ~E_NOTICE);
+        $this->smarty->muteUndefinedOrNullWarnings();
+        $tpl = $this->smarty->createTemplate('string:a{if $ar.undef}def{/if}b');
+        $tpl->assign('ar', []);
+        $this->assertEquals("ab", $this->smarty->fetch($tpl));
+    }
+
+    public function testUndefinedArrayIndexDeep() {
+        $this->smarty->setErrorReporting(E_ALL & ~E_NOTICE);
+        $this->smarty->muteUndefinedOrNullWarnings();
+        $tpl = $this->smarty->createTemplate('string:a{if $ar.undef.nope.neither}def{/if}b');
+        $tpl->assign('ar', []);
+        $this->assertEquals("ab", $this->smarty->fetch($tpl));
+    }
+
+    public function testUndefinedArrayIndexError()
+    {
+        $exceptionThrown = false;
+
+        try {
+            $tpl = $this->smarty->createTemplate('string:a{if $ar.undef}def{/if}b');
+            $tpl->assign('ar', []);
+            $this->smarty->fetch($tpl);
+        } catch (Exception $e) {
+
+            $exceptionThrown = true;
+            $this->assertStringStartsWith('Undefined ', $e->getMessage());
+            $this->assertTrue(in_array(
+                get_class($e),
+                [
+                    'PHPUnit\Framework\Error\Warning',
+                    'PHPUnit\Framework\Error\Notice',
+                ]
+            ));
+        }
+        $this->assertTrue($exceptionThrown);
+    }
+
+
 }
diff --git a/tests/UnitTests/A_Core/AutoEscape/AutoEscapeTest.php b/tests/UnitTests/A_Core/AutoEscape/AutoEscapeTest.php
index 733c7226..e1d73628 100644
--- a/tests/UnitTests/A_Core/AutoEscape/AutoEscapeTest.php
+++ b/tests/UnitTests/A_Core/AutoEscape/AutoEscapeTest.php
@@ -15,7 +15,7 @@ class AutoEscapeTest extends PHPUnit_Smarty
     /*
      * Setup test fixture
      */
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
         $this->smarty->setEscapeHtml(true);
diff --git a/tests/UnitTests/A_Core/Filter/FilterTest.php b/tests/UnitTests/A_Core/Filter/FilterTest.php
index e3847be1..d7b023d8 100644
--- a/tests/UnitTests/A_Core/Filter/FilterTest.php
+++ b/tests/UnitTests/A_Core/Filter/FilterTest.php
@@ -15,9 +15,8 @@
  */
 class FilterTest extends PHPUnit_Smarty
 {
-    public $loadSmartyBC = true;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
@@ -57,13 +56,6 @@ class FilterTest extends PHPUnit_Smarty
         $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
      */
@@ -164,9 +156,9 @@ class FilterTest extends PHPUnit_Smarty
 
     public function testRegisteredOutputFilterWrapper()
     {
-        $this->smartyBC->register_outputfilter('myoutputfilter');
-        $tpl = $this->smartyBC->createTemplate('eval:{"hello   world"}');
-        $this->assertEquals("hello world", $this->smartyBC->fetch($tpl));
+        $this->smarty->registerFilter('output', 'myoutputfilter');
+        $tpl = $this->smarty->createTemplate('eval:{"hello   world"}');
+        $this->assertEquals("hello world", $this->smarty->fetch($tpl));
     }
 
     /**
@@ -187,17 +179,11 @@ class FilterTest extends PHPUnit_Smarty
 
     /**
      * 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';
-       }
+       include 'FilterClosure.php';
     }
 
     /**
diff --git a/tests/UnitTests/A_Core/Filter/LoadFilterTest.php b/tests/UnitTests/A_Core/Filter/LoadFilterTest.php
index f99719ab..27ef30b2 100644
--- a/tests/UnitTests/A_Core/Filter/LoadFilterTest.php
+++ b/tests/UnitTests/A_Core/Filter/LoadFilterTest.php
@@ -15,7 +15,7 @@
  */
 class LoadFilterTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
diff --git a/tests/UnitTests/A_Core/Filter/RegisterFilterTest.php b/tests/UnitTests/A_Core/Filter/RegisterFilterTest.php
index 9bd0f0e3..9c9733c1 100644
--- a/tests/UnitTests/A_Core/Filter/RegisterFilterTest.php
+++ b/tests/UnitTests/A_Core/Filter/RegisterFilterTest.php
@@ -15,7 +15,7 @@
  */
 class RegisterFilterTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
diff --git a/tests/UnitTests/A_Core/GetterSetter/GetterSetterTest.php b/tests/UnitTests/A_Core/GetterSetter/GetterSetterTest.php
index e2d46fcf..3610b3e9 100644
--- a/tests/UnitTests/A_Core/GetterSetter/GetterSetterTest.php
+++ b/tests/UnitTests/A_Core/GetterSetter/GetterSetterTest.php
@@ -15,7 +15,7 @@
  */
 class GetterSetterTest extends PHPUnit_Smarty
 {
-     public function setUp()
+     public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
diff --git a/tests/UnitTests/A_Core/LoadPlugin/DefaultPluginHandlerTest.php b/tests/UnitTests/A_Core/LoadPlugin/DefaultPluginHandlerTest.php
index aa1764f3..2205a746 100644
--- a/tests/UnitTests/A_Core/LoadPlugin/DefaultPluginHandlerTest.php
+++ b/tests/UnitTests/A_Core/LoadPlugin/DefaultPluginHandlerTest.php
@@ -15,7 +15,7 @@
  */
 class DefaultPluginHandlerTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
         $this->smarty->setForceCompile(true);
diff --git a/tests/UnitTests/A_Core/LoadPlugin/IncludePathTest.php b/tests/UnitTests/A_Core/LoadPlugin/IncludePathTest.php
index 2a3b46b7..100bc877 100644
--- a/tests/UnitTests/A_Core/LoadPlugin/IncludePathTest.php
+++ b/tests/UnitTests/A_Core/LoadPlugin/IncludePathTest.php
@@ -11,7 +11,7 @@
  */
 class IncludePathTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
         $this->smarty->use_include_path = true;
@@ -26,7 +26,7 @@ class IncludePathTest extends PHPUnit_Smarty
      * This method is called after a test is executed.
      *
      */
-    protected function tearDown()
+    protected function tearDown(): void
     {
         ini_restore('include_path');
         $this->smarty->disableSecurity();
@@ -38,14 +38,14 @@ class IncludePathTest extends PHPUnit_Smarty
     }
     public function testInclude1()
     {
-        $this->assertContains('plugin1', $this->smarty->fetch('test_include_path1.tpl'));
+        $this->assertStringContainsString('plugin1', $this->smarty->fetch('test_include_path1.tpl'));
     }
     public function testInclude2()
     {
-        $this->assertContains('plugin2', $this->smarty->fetch('test_include_path2.tpl'));
+        $this->assertStringContainsString('plugin2', $this->smarty->fetch('test_include_path2.tpl'));
     }
     public function testInclude3()
     {
-        $this->assertContains('plugin3', $this->smarty->fetch('test_include_path3.tpl'));
+        $this->assertStringContainsString('plugin3', $this->smarty->fetch('test_include_path3.tpl'));
     }
   }
diff --git a/tests/UnitTests/A_Core/LoadPlugin/LoadPluginTest.php b/tests/UnitTests/A_Core/LoadPlugin/LoadPluginTest.php
index 0b9a918a..cf7756a6 100644
--- a/tests/UnitTests/A_Core/LoadPlugin/LoadPluginTest.php
+++ b/tests/UnitTests/A_Core/LoadPlugin/LoadPluginTest.php
@@ -15,7 +15,7 @@
  */
 class LoadPluginTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
diff --git a/tests/UnitTests/A_Core/MuteExpectedErrors/MuteExpectedErrorsTest.php b/tests/UnitTests/A_Core/MuteExpectedErrors/MuteExpectedErrorsTest.php
deleted file mode 100644
index 6fbb53c1..00000000
--- a/tests/UnitTests/A_Core/MuteExpectedErrors/MuteExpectedErrorsTest.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?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 = array())
-    {
-        $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();
-    }
-}
diff --git a/tests/UnitTests/A_Core/MuteExpectedErrors/cache/.gitignore b/tests/UnitTests/A_Core/MuteExpectedErrors/cache/.gitignore
deleted file mode 100644
index 1d34e205..00000000
--- a/tests/UnitTests/A_Core/MuteExpectedErrors/cache/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# Ignore anything in here, but keep this directory
-*
\ No newline at end of file
diff --git a/tests/UnitTests/A_Core/MuteExpectedErrors/templates/default.tpl b/tests/UnitTests/A_Core/MuteExpectedErrors/templates/default.tpl
deleted file mode 100644
index 585945d3..00000000
--- a/tests/UnitTests/A_Core/MuteExpectedErrors/templates/default.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{$foo|default:""} /* should compile something with @silence error suppression */
\ No newline at end of file
diff --git a/tests/UnitTests/A_Core/MuteExpectedErrors/templates_c/.gitignore b/tests/UnitTests/A_Core/MuteExpectedErrors/templates_c/.gitignore
deleted file mode 100644
index 1d34e205..00000000
--- a/tests/UnitTests/A_Core/MuteExpectedErrors/templates_c/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# Ignore anything in here, but keep this directory
-*
\ No newline at end of file
diff --git a/tests/UnitTests/A_Core/PluginTests/PluginChainedLoadTest.php b/tests/UnitTests/A_Core/PluginTests/PluginChainedLoadTest.php
index d0f68809..e2c171f8 100644
--- a/tests/UnitTests/A_Core/PluginTests/PluginChainedLoadTest.php
+++ b/tests/UnitTests/A_Core/PluginTests/PluginChainedLoadTest.php
@@ -15,7 +15,7 @@
  */
 class PluginChainedLoadTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
@@ -28,6 +28,6 @@ class PluginChainedLoadTest extends PHPUnit_Smarty
     public function testPluginChainedLoad()
     {
         $this->smarty->addPluginsDir(dirname(__FILE__) . "/PHPunitplugins/");
-        $this->assertContains('from chain3', $this->smarty->fetch('test_plugin_chained_load.tpl'));
+        $this->assertStringContainsString('from chain3', $this->smarty->fetch('test_plugin_chained_load.tpl'));
     }
 }
diff --git a/tests/UnitTests/A_Core/PluginTests/Shared/SharedFunctionsTest.php b/tests/UnitTests/A_Core/PluginTests/Shared/SharedFunctionsTest.php
index 2ecafd32..2fb82d43 100644
--- a/tests/UnitTests/A_Core/PluginTests/Shared/SharedFunctionsTest.php
+++ b/tests/UnitTests/A_Core/PluginTests/Shared/SharedFunctionsTest.php
@@ -11,7 +11,7 @@
  */
 class SharedFunctionsTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
diff --git a/tests/UnitTests/A_Core/SmartyBC/SmartyBcTest.php b/tests/UnitTests/A_Core/SmartyBC/SmartyBcTest.php
deleted file mode 100644
index 988d1a4a..00000000
--- a/tests/UnitTests/A_Core/SmartyBC/SmartyBcTest.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Smarty PHPunit tests SmartyBC code
- *
- * @package PHPunit
- * @author  Uwe Tews
- */
-
-/**
- * class SmartyBC class tests
- *
- * @runTestsInSeparateProcess
- * @preserveGlobalState disabled
- * @backupStaticAttributes enabled
- */
-class SmartyBcTest extends PHPUnit_Smarty
-{
-    public $loadSmartyBC = true;
-    public $loadSmarty = false;
-    public function setUp()
-    {
-        $this->setUpSmarty(dirname(__FILE__));
-    }
-
-
-    public function testInit()
-    {
-        $this->cleanDirs();
-    }
-    /**
-     * test {php} tag
-     */
-    public function testSmartyPhpTag()
-    {
-        $this->assertEquals('hello world', $this->smartyBC->fetch('string:{php} echo "hello world"; {/php}'));
-    }
-}
diff --git a/tests/UnitTests/A_Core/SmartyBC/cache/.gitignore b/tests/UnitTests/A_Core/SmartyBC/cache/.gitignore
deleted file mode 100644
index 1d34e205..00000000
--- a/tests/UnitTests/A_Core/SmartyBC/cache/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# Ignore anything in here, but keep this directory
-*
\ No newline at end of file
diff --git a/tests/UnitTests/A_Core/SmartyBC/templates_c/.gitignore b/tests/UnitTests/A_Core/SmartyBC/templates_c/.gitignore
deleted file mode 100644
index 1d34e205..00000000
--- a/tests/UnitTests/A_Core/SmartyBC/templates_c/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# Ignore anything in here, but keep this directory
-*
\ No newline at end of file
diff --git a/tests/UnitTests/CacheModify/ModifiedSince/HttpModifiedSinceTest.php b/tests/UnitTests/CacheModify/ModifiedSince/HttpModifiedSinceTest.php
index d59577c5..8f483de7 100644
--- a/tests/UnitTests/CacheModify/ModifiedSince/HttpModifiedSinceTest.php
+++ b/tests/UnitTests/CacheModify/ModifiedSince/HttpModifiedSinceTest.php
@@ -16,9 +16,8 @@
 class HttpModifiedSinceTest extends PHPUnit_Smarty
 {
 
-    public function setUp()
+    public function setUp(): void
     {
-        $this->markTestSkipped('modified since tests are disabled');
         $this->setUpSmarty(dirname(__FILE__));
      }
 
diff --git a/tests/UnitTests/CacheResourceTests/Apc/CacheResourceCustomApcTest.php b/tests/UnitTests/CacheResourceTests/Apc/CacheResourceCustomApcTest.php
index 3032a91e..d1114a73 100644
--- a/tests/UnitTests/CacheResourceTests/Apc/CacheResourceCustomApcTest.php
+++ b/tests/UnitTests/CacheResourceTests/Apc/CacheResourceCustomApcTest.php
@@ -5,32 +5,26 @@
  * @package PHPunit
  * @author  Uwe Tews
  */
-if (ApcCacheEnable == true) {
-    include_once dirname(__FILE__) . '/../Memcache/CacheResourceCustomMemcacheTest.php';
+include_once dirname(__FILE__) . '/../Memcache/CacheResourceCustomMemcacheTest.php';
 
-    /**
-     * class for cache resource file tests
-     *
-     * @runTestsInSeparateProcess
-     * @preserveGlobalState    disabled
-     * @backupStaticAttributes enabled
-     */
-    class CacheResourceCustomApcTest extends CacheResourceCustomMemcacheTest
+/**
+ * class for cache resource file tests
+ *
+ * @runTestsInSeparateProcess
+ * @preserveGlobalState    disabled
+ * @backupStaticAttributes enabled
+ */
+class CacheResourceCustomApcTest extends CacheResourceCustomMemcacheTest
+{
+    public function setUp(): void
     {
-        public function setUp()
-        {
-            if (ApcCacheEnable != true) {
-                $this->markTestSkipped('Apc tests are disabled');
-            } else {
-                if (!function_exists('apc_cache_info') || ini_get('apc.enable_cli')) {
-                    $this->markTestSkipped('APC cache not available');
-                }
-            }
-            $this->setUpSmarty(dirname(__FILE__));
-            parent::setUp();
-            $this->smarty->setCachingType('apc');
-            $this->smarty->addPluginsDir(SMARTY_DIR . '../demo/plugins/');
+        if (!function_exists('apc_cache_info') || ini_get('apc.enable_cli')) {
+            $this->markTestSkipped('APC cache not available');
         }
+        $this->setUpSmarty(dirname(__FILE__));
+        parent::setUp();
+        $this->smarty->setCachingType('apc');
+        $this->smarty->addPluginsDir(SMARTY_DIR . '../demo/plugins/');
     }
 }
 
diff --git a/tests/UnitTests/CacheResourceTests/File/CacheResourceFileTest.php b/tests/UnitTests/CacheResourceTests/File/CacheResourceFileTest.php
index dda616a8..383aa20f 100644
--- a/tests/UnitTests/CacheResourceTests/File/CacheResourceFileTest.php
+++ b/tests/UnitTests/CacheResourceTests/File/CacheResourceFileTest.php
@@ -18,7 +18,7 @@ include_once dirname(__FILE__) . '/../_shared/CacheResourceTestCommon.php';
 class CacheResourceFileTest extends CacheResourceTestCommon
 {
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
         parent::setUp();
diff --git a/tests/UnitTests/CacheResourceTests/Memcache/CacheResourceCustomMemcacheTest.php b/tests/UnitTests/CacheResourceTests/Memcache/CacheResourceCustomMemcacheTest.php
index d8d9df1b..9b9ebfaa 100644
--- a/tests/UnitTests/CacheResourceTests/Memcache/CacheResourceCustomMemcacheTest.php
+++ b/tests/UnitTests/CacheResourceTests/Memcache/CacheResourceCustomMemcacheTest.php
@@ -22,14 +22,10 @@ class CacheResourceCustomMemcacheTest extends CacheResourceTestCommon
      * This method is called before a test is executed.
      *
      */
-    public function setUp()
+    public function setUp(): void
     {
-        if (MemCacheEnable != true) {
-            $this->markTestSkipped('Memcache tests are disabled');
-        } else {
-            if (!class_exists('Memcache')) {
-                $this->markTestSkipped('Memcache not available');
-            }
+        if (!class_exists('Memcache')) {
+            $this->markTestSkipped('Memcache not available');
         }
         $this->setUpSmarty(dirname(__FILE__));
         parent::setUp();
diff --git a/tests/UnitTests/CacheResourceTests/_shared/CacheResourceTestCommon.php b/tests/UnitTests/CacheResourceTests/_shared/CacheResourceTestCommon.php
index 129fb6ba..92207d2a 100644
--- a/tests/UnitTests/CacheResourceTests/_shared/CacheResourceTestCommon.php
+++ b/tests/UnitTests/CacheResourceTests/_shared/CacheResourceTestCommon.php
@@ -15,7 +15,7 @@ class CacheResourceTestCommon extends PHPUnit_Smarty
 {
     public static $touchResource = null;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->smarty->setTemplateDir(dirname(__FILE__) . '/templates');
         $this->smarty->addPluginsDir(dirname(__FILE__) . '/PHPunitplugins');
@@ -407,9 +407,6 @@ class CacheResourceTestCommon extends PHPUnit_Smarty
      */
     public function testCache($lockTime, $lockTimeout, $compile_id, $cache_id, $isCached, $tmin, $tmax, $forceCompile, $forceCache, $update, $testNumber, $compileTestNumber, $renderTestNumber, $testName)
     {
-        if ($testNumber == 13) {
-            $i =0;
-        }
         $this->smarty->caching = true;
         $this->smarty->cache_lifetime = 1000;
         $this->smarty->assign('test', $testNumber);
@@ -555,7 +552,7 @@ class CacheResourceTestCommon extends PHPUnit_Smarty
         }
         $tpl = $this->smarty->createTemplate('templatedir.tpl', $this->smarty);
         $this->assertEquals($iscached, $tpl->isCached());
-        $this->assertContains($result, $tpl->fetch());
+        $this->assertStringContainsString($result, $tpl->fetch());
     }
 
     public function dataDir(){
diff --git a/tests/UnitTests/Compiler/CompilerPlugin/CompileCompilerPluginTest.php b/tests/UnitTests/Compiler/CompilerPlugin/CompileCompilerPluginTest.php
index d83197c0..f59c0903 100644
--- a/tests/UnitTests/Compiler/CompilerPlugin/CompileCompilerPluginTest.php
+++ b/tests/UnitTests/Compiler/CompilerPlugin/CompileCompilerPluginTest.php
@@ -15,7 +15,7 @@
  */
 class CompileCompilerPluginTest extends PHPUnit_Smarty
 {
-     public function setUp()
+     public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
diff --git a/tests/UnitTests/Compiler/Delimiter/AutoLiteralTest.php b/tests/UnitTests/Compiler/Delimiter/AutoLiteralTest.php
index 32dde734..49bdcdf7 100644
--- a/tests/UnitTests/Compiler/Delimiter/AutoLiteralTest.php
+++ b/tests/UnitTests/Compiler/Delimiter/AutoLiteralTest.php
@@ -14,7 +14,7 @@
  */
 class AutoliteralTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
         $this->smarty->addPluginsDir("../../__shared/PHPunitplugins/");
diff --git a/tests/UnitTests/Compiler/Delimiter/DelimiterTest.php b/tests/UnitTests/Compiler/Delimiter/DelimiterTest.php
index 11e333ef..caa7f707 100644
--- a/tests/UnitTests/Compiler/Delimiter/DelimiterTest.php
+++ b/tests/UnitTests/Compiler/Delimiter/DelimiterTest.php
@@ -15,7 +15,7 @@
  */
 class DelimiterTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
diff --git a/tests/UnitTests/Compiler/Delimiter/UserLiteralTest.php b/tests/UnitTests/Compiler/Delimiter/UserLiteralTest.php
index 49f8d79c..1d0980ce 100644
--- a/tests/UnitTests/Compiler/Delimiter/UserLiteralTest.php
+++ b/tests/UnitTests/Compiler/Delimiter/UserLiteralTest.php
@@ -15,7 +15,7 @@
  */
 class UserliteralTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         if (!property_exists('Smarty', 'literals')) {
             $this->markTestSkipped('user literal support');
diff --git a/tests/UnitTests/ConfigFileTests/defaultHandler/DefaultConfigHandlerTest.php b/tests/UnitTests/ConfigFileTests/defaultHandler/DefaultConfigHandlerTest.php
index 458c4d9e..e311c003 100644
--- a/tests/UnitTests/ConfigFileTests/defaultHandler/DefaultConfigHandlerTest.php
+++ b/tests/UnitTests/ConfigFileTests/defaultHandler/DefaultConfigHandlerTest.php
@@ -21,33 +21,30 @@ class DefaultConfigHandlerTest extends PHPUnit_Smarty
      * This method is called before a test is executed.
      *
      */
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
         $this->smarty->setForceCompile(true);
     }
 
     /**
-     * @expectedException        SmartyException
-     * @expectedExceptionMessage Unable to load config 'file:foo.conf'
-     *
      * test unknown config file
      */
     public function testUnknownConfigFile()
     {
+        $this->expectException('SmartyException');
+        $this->expectExceptionMessage('Unable to load config \'file:foo.conf\'');
         $this->smarty->configLoad('foo.conf');
     }
 
     /**
-     * @expectedException        SmartyException
-     * @expectedExceptionMessage Default config handler
-     * @expectedExceptionMessage not callable
-     *
      * test register unknown default config handler
-     *
      */
     public function testRegisterUnknownDefaultConfigHandler()
     {
+        $this->expectException('SmartyException');
+        $this->expectExceptionMessage('Default config handler');
+        $this->expectExceptionMessage('not callable');
         $this->smarty->registerDefaultConfigHandler('foo');
     }
 
@@ -77,42 +74,32 @@ class DefaultConfigHandlerTest extends PHPUnit_Smarty
         $this->assertEquals("123.4", $this->smarty->fetch('number.tpl'));
     }
 
-    /**
-     * @expectedException        SmartyException
-     * @expectedExceptionMessage Unable to load config default file 'no.conf' for 'file:fo.conf'
-     *
-     *
-     */
     public function testDefaultConfigHandlerReplacementByConfigFileFail()
     {
+        $this->expectException('SmartyException');
+        $this->expectExceptionMessage("Unable to load config default file 'no.conf' for 'file:fo.conf'");
         $this->smarty->registerDefaultConfigHandler('configHandlerFile');
         $this->smarty->configLoad('fo.conf');
         $this->assertEquals("123.4", $this->smarty->fetch('number.tpl'));
     }
 
     /**
-     * @expectedException        SmartyException
-     * @expectedExceptionMessage Unable to load config 'file:foo.conf'
-     *
-     *
      * test default config handler replacement (return false)
-     *
      */
     public function testDefaultConfigHandlerReplacementReturningFalse()
     {
+        $this->expectException('SmartyException');
+        $this->expectExceptionMessage('Unable to load config \'file:foo.conf\'');
         $this->smarty->configLoad('foo.conf');
     }
 
     /**
-     * @expectedException        SmartyException
-     * @expectedExceptionMessage No config default content for 'file:bla.conf'
-     *
-     *
      * test default config handler replacement (return false)
-     *
      */
     public function testDefaultConfigHandlerReplacementReturningFalse1()
     {
+        $this->expectException('SmartyException');
+        $this->expectExceptionMessage('No config default content for \'file:bla.conf\'');
         $this->smarty->registerDefaultConfigHandler('configHandlerData');
         $this->smarty->configLoad('bla.conf');
     }
diff --git a/tests/UnitTests/ConfigFileTests/file/ConfigVarTest.php b/tests/UnitTests/ConfigFileTests/file/ConfigVarTest.php
index 41faf101..70287c5d 100644
--- a/tests/UnitTests/ConfigFileTests/file/ConfigVarTest.php
+++ b/tests/UnitTests/ConfigFileTests/file/ConfigVarTest.php
@@ -20,7 +20,7 @@ class ConfigVarTest extends PHPUnit_Smarty
      * This method is called before a test is executed.
      *
      */
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
@@ -403,11 +403,7 @@ class ConfigVarTest extends PHPUnit_Smarty
             $this->assertEquals("", $this->smarty->fetch('foo.tpl'));
         }
         catch (Exception $e) {
-	        if (PHP_VERSION_ID >= 80000) {
-		        $this->assertStringStartsWith('Undefined variable', $e->getMessage());
-	        } else {
-		        $this->assertStringStartsWith('Undefined variable', $e->getMessage());
-	        }
+            $this->assertStringStartsWith('Undefined variable', $e->getMessage());
         }
     }
 }
diff --git a/tests/UnitTests/ResourceTests/Custom/Ambiguous/CustomResourceAmbiguousTest.php b/tests/UnitTests/ResourceTests/Custom/Ambiguous/CustomResourceAmbiguousTest.php
index b16af7dc..c3ba4e51 100644
--- a/tests/UnitTests/ResourceTests/Custom/Ambiguous/CustomResourceAmbiguousTest.php
+++ b/tests/UnitTests/ResourceTests/Custom/Ambiguous/CustomResourceAmbiguousTest.php
@@ -17,7 +17,7 @@ class CustomResourceAmbiguousTest extends PHPUnit_Smarty
 {
     public $_resource = null;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
         require_once dirname(__FILE__) . '/PHPunitplugins/resource.ambiguous.php';
diff --git a/tests/UnitTests/ResourceTests/Custom/DemoPluginExtendsAll/ResourceExtendsAllPluginTest.php b/tests/UnitTests/ResourceTests/Custom/DemoPluginExtendsAll/ResourceExtendsAllPluginTest.php
index e89e11bc..d32b0407 100644
--- a/tests/UnitTests/ResourceTests/Custom/DemoPluginExtendsAll/ResourceExtendsAllPluginTest.php
+++ b/tests/UnitTests/ResourceTests/Custom/DemoPluginExtendsAll/ResourceExtendsAllPluginTest.php
@@ -15,7 +15,7 @@
  */
 class ResourceExtendsAllPluginTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
diff --git a/tests/UnitTests/ResourceTests/Custom/DemoPluginMysql/ResourceMysqlPluginTest.php b/tests/UnitTests/ResourceTests/Custom/DemoPluginMysql/ResourceMysqlPluginTest.php
index 23d0c0e1..526e90d0 100644
--- a/tests/UnitTests/ResourceTests/Custom/DemoPluginMysql/ResourceMysqlPluginTest.php
+++ b/tests/UnitTests/ResourceTests/Custom/DemoPluginMysql/ResourceMysqlPluginTest.php
@@ -138,13 +138,13 @@ if (MysqlResourceEnable == true) {
         /**
         * test unknown template
         *
-        * @expectedException        SmartyException
-        * @expectedExceptionMessage Unable to load template 'mysqlstest:foo.tpl'
         * @runInSeparateProcess
         * @preserveGlobalState disabled
         *
         */
         public function testUnknownTemplate() {
+            $this->expectException('SmartyException');
+            $this->expectExceptionMessage('Unable to load template \'mysqlstest:foo.tpl\'');
             $this->assertEquals('foo', $this->smarty->fetch('mysqlstest:foo.tpl'));
         }
     }
diff --git a/tests/UnitTests/ResourceTests/DefaultHandler/DefaultTemplateHandlerTest.php b/tests/UnitTests/ResourceTests/DefaultHandler/DefaultTemplateHandlerTest.php
index 63dc3604..6914dd06 100644
--- a/tests/UnitTests/ResourceTests/DefaultHandler/DefaultTemplateHandlerTest.php
+++ b/tests/UnitTests/ResourceTests/DefaultHandler/DefaultTemplateHandlerTest.php
@@ -15,7 +15,7 @@
  */
 class DefaultTemplateHandlerTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
         $this->smarty->setForceCompile(true);
@@ -36,7 +36,7 @@ class DefaultTemplateHandlerTest extends PHPUnit_Smarty
             $this->smarty->fetch('foo.tpl');
         }
         catch (Exception $e) {
-            $this->assertContains('Unable to load template', $e->getMessage());
+            $this->assertStringContainsString('Unable to load template', $e->getMessage());
 
             return;
         }
@@ -52,8 +52,8 @@ class DefaultTemplateHandlerTest extends PHPUnit_Smarty
             $this->smarty->registerDefaultTemplateHandler('foo');
         }
         catch (Exception $e) {
-            $this->assertContains("Default template handler", $e->getMessage());
-            $this->assertContains("not callable", $e->getMessage());
+            $this->assertStringContainsString("Default template handler", $e->getMessage());
+            $this->assertStringContainsString("not callable", $e->getMessage());
 
             return;
         }
@@ -85,7 +85,7 @@ class DefaultTemplateHandlerTest extends PHPUnit_Smarty
             $this->smarty->fetch('foo.tpl');
         }
         catch (Exception $e) {
-            $this->assertContains('Default handler: No template default content for \'file:foo.tpl\'', $e->getMessage());
+            $this->assertStringContainsString('Default handler: No template default content for \'file:foo.tpl\'', $e->getMessage());
 
             return;
         }
diff --git a/tests/UnitTests/ResourceTests/Eval/EvalResourceTest.php b/tests/UnitTests/ResourceTests/Eval/EvalResourceTest.php
index 27635f02..867dfc19 100644
--- a/tests/UnitTests/ResourceTests/Eval/EvalResourceTest.php
+++ b/tests/UnitTests/ResourceTests/Eval/EvalResourceTest.php
@@ -15,7 +15,7 @@
  */
 class EvalResourceTest extends PHPUnit_Smarty
 {
-   public function setUp()
+   public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
diff --git a/tests/UnitTests/ResourceTests/Extends/ExtendsResourceTest.php b/tests/UnitTests/ResourceTests/Extends/ExtendsResourceTest.php
index 06fe239a..e5d8a718 100644
--- a/tests/UnitTests/ResourceTests/Extends/ExtendsResourceTest.php
+++ b/tests/UnitTests/ResourceTests/Extends/ExtendsResourceTest.php
@@ -15,7 +15,7 @@
  */
 class ExtendsResourceTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
         $this->smarty->enableSecurity();
@@ -48,8 +48,8 @@ class ExtendsResourceTest extends PHPUnit_Smarty
             $this->smarty->compile_id = 1;
         }
         $result = $this->smarty->fetch('extends:003_parent.tpl|003_child_prepend.tpl');
-        $this->assertContains("prepend - Default Title", $result, $testName . ' - content');
-        $this->assertContains("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result, $testName . ' - fetch() failure');
+        $this->assertStringContainsString("prepend - Default Title", $result, $testName . ' - content');
+        $this->assertStringContainsString("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result, $testName . ' - fetch() failure');
     }
     /**
      * test  child/parent template chain with apppend
@@ -67,8 +67,8 @@ class ExtendsResourceTest extends PHPUnit_Smarty
             $this->smarty->compile_id = 1;
         }
         $result = $this->smarty->fetch('extends:004_parent.tpl|004_child_append.tpl');
-        $this->assertContains("Default Title - append", $result, $testName . ' - content');
-        $this->assertContains("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result, $testName . ' - fetch() failure');
+        $this->assertStringContainsString("Default Title - append", $result, $testName . ' - content');
+        $this->assertStringContainsString("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result, $testName . ' - fetch() failure');
     }
 
     /**
@@ -87,8 +87,8 @@ class ExtendsResourceTest extends PHPUnit_Smarty
             $this->smarty->compile_id = 1;
         }
         $result = $this->smarty->fetch('extends:040_parent.tpl|040_child.tpl');
-        $this->assertContains("var-bar-var", $result, $testName . ' - content');
-        $this->assertContains("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result, $testName . ' - fetch() failure');
+        $this->assertStringContainsString("var-bar-var", $result, $testName . ' - content');
+        $this->assertStringContainsString("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result, $testName . ' - fetch() failure');
     }
 
     /**
@@ -103,7 +103,7 @@ class ExtendsResourceTest extends PHPUnit_Smarty
         $tpl = $this->smarty->createTemplate('extends:021_parent.tpl|021_child.tpl|021_grandchild.tpl');
         $this->assertFalse($tpl->isCached());
         $result = $this->smarty->fetch($tpl);
-        $this->assertContains('Grandchild Page Title', $result);
+        $this->assertStringContainsString('Grandchild Page Title', $result);
     }
 
     /**
@@ -118,7 +118,7 @@ class ExtendsResourceTest extends PHPUnit_Smarty
          $tpl2 = $this->smarty->createTemplate('extends:021_parent.tpl|021_child.tpl|021_grandchild.tpl');
         $this->assertTrue($tpl2->isCached());
         $result = $this->smarty->fetch($tpl2);
-        $this->assertContains('Grandchild Page Title', $result);
+        $this->assertStringContainsString('Grandchild Page Title', $result);
     }
 
     /**
@@ -137,7 +137,7 @@ class ExtendsResourceTest extends PHPUnit_Smarty
         $tpl = $this->smarty->createTemplate('extends:021_parent.tpl|021_child.tpl|021_grandchild.tpl');
         $this->assertFalse($tpl->isCached());
         $result = $this->smarty->fetch($tpl);
-        $this->assertContains('Grandchild Page Title', $result);
+        $this->assertStringContainsString('Grandchild Page Title', $result);
     }
     /**
      * test  grandchild/child/parent dependency test2
@@ -152,7 +152,7 @@ class ExtendsResourceTest extends PHPUnit_Smarty
         $tpl2 = $this->smarty->createTemplate('extends:021_parent.tpl|021_child.tpl|021_grandchild.tpl');
         $this->assertTrue($tpl2->isCached());
         $result = $this->smarty->fetch($tpl2);
-        $this->assertContains('Grandchild Page Title', $result);
+        $this->assertStringContainsString('Grandchild Page Title', $result);
     }
 
     /**
@@ -171,7 +171,7 @@ class ExtendsResourceTest extends PHPUnit_Smarty
         $tpl = $this->smarty->createTemplate('extends:021_parent.tpl|021_child.tpl|021_grandchild.tpl');
         $this->assertFalse($tpl->isCached());
         $result = $this->smarty->fetch($tpl);
-        $this->assertContains('Grandchild Page Title', $result);
+        $this->assertStringContainsString('Grandchild Page Title', $result);
     }
     /**
      * test  grandchild/child/parent dependency test3
@@ -186,7 +186,7 @@ class ExtendsResourceTest extends PHPUnit_Smarty
         $tpl2 = $this->smarty->createTemplate('extends:021_parent.tpl|021_child.tpl|021_grandchild.tpl');
         $this->assertTrue($tpl2->isCached());
         $result = $this->smarty->fetch($tpl2);
-        $this->assertContains('Grandchild Page Title', $result);
+        $this->assertStringContainsString('Grandchild Page Title', $result);
     }
 
     /**
@@ -205,7 +205,7 @@ class ExtendsResourceTest extends PHPUnit_Smarty
         $tpl = $this->smarty->createTemplate('extends:021_parent.tpl|021_child.tpl|021_grandchild.tpl');
         $this->assertFalse($tpl->isCached());
         $result = $this->smarty->fetch($tpl);
-        $this->assertContains('Grandchild Page Title', $result);
+        $this->assertStringContainsString('Grandchild Page Title', $result);
     }
     /**
      * test  grandchild/child/parent dependency test4
@@ -220,7 +220,7 @@ class ExtendsResourceTest extends PHPUnit_Smarty
         $tpl = $this->smarty->createTemplate('extends:021_parent.tpl|021_child.tpl|021_grandchild.tpl');
         $this->assertTrue($tpl->isCached());
         $result = $this->smarty->fetch($tpl);
-        $this->assertContains('Grandchild Page Title', $result);
+        $this->assertStringContainsString('Grandchild Page Title', $result);
     }
 
     /**
@@ -241,10 +241,10 @@ class ExtendsResourceTest extends PHPUnit_Smarty
             $this->smarty->setCompileId(1);
         }
         $result = $this->smarty->fetch('extends:./child/parent/033_parent.tpl|./child/033_child.tpl|033_grandchild.tpl');
-        $this->assertContains('include grand:content include grand', $result, $testName . ' - grand');
-        $this->assertContains('include child:content include child', $result, $testName . ' - grand');
-        $this->assertContains('include parent:content include parent', $result, $testName . ' - grand');
-        $this->assertContains("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result,
+        $this->assertStringContainsString('include grand:content include grand', $result, $testName . ' - grand');
+        $this->assertStringContainsString('include child:content include child', $result, $testName . ' - grand');
+        $this->assertStringContainsString('include parent:content include parent', $result, $testName . ' - grand');
+        $this->assertStringContainsString("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result,
                               $testName . ' - fetch() failure');
     }
     public function data(){
@@ -293,11 +293,11 @@ class ExtendsResourceTest extends PHPUnit_Smarty
             }
             $this->smarty->setCompileId($cid);
             $result = $this->smarty->fetch('extends:034_parent.tpl|034_grandchild.tpl');
-            $this->assertContains('grandchild - grandchild', $result, $testName . ' - grand');
-            $this->assertContains('parent - parent', $result, $testName . ' - grand');
-            $this->assertContains($extends_recursion ? 'child - child' : 'child - parent', $result,
+            $this->assertStringContainsString('grandchild - grandchild', $result, $testName . ' - grand');
+            $this->assertStringContainsString('parent - parent', $result, $testName . ' - grand');
+            $this->assertStringContainsString($extends_recursion ? 'child - child' : 'child - parent', $result,
                                   $testName . ' - grand');
-            $this->assertContains("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}",
+            $this->assertStringContainsString("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}",
                                   $result, $testName . ' - fetch() failure');
         }
     }
diff --git a/tests/UnitTests/ResourceTests/File/FileResourceTest.php b/tests/UnitTests/ResourceTests/File/FileResourceTest.php
index 1a1d615a..d5633fba 100644
--- a/tests/UnitTests/ResourceTests/File/FileResourceTest.php
+++ b/tests/UnitTests/ResourceTests/File/FileResourceTest.php
@@ -15,7 +15,7 @@
  */
 class FileResourceTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
         $this->smarty->enableSecurity();
@@ -65,16 +65,14 @@ class FileResourceTest extends PHPUnit_Smarty
     }
 
     /**
-     * @expectedException        SmartyException
-     * @expectedExceptionMessage Unable to
-     * @expectedExceptionMessage notthere.tpl
-     *
      * test not existing file
      */
     public function testTemplateFileNotExists3()
     {
-
-            $result = $this->smarty->fetch('notthere.tpl');
+        $this->expectException('SmartyException');
+        $this->expectExceptionMessage('Unable to');
+        $this->expectExceptionMessage('notthere.tpl');
+        $this->smarty->fetch('notthere.tpl');
     }
 
     public function testGetTemplateTimestamp()
@@ -110,6 +108,9 @@ class FileResourceTest extends PHPUnit_Smarty
         );
     }
 
+    /**
+     * @doesNotPerformAssertions
+     */
     public function testGetCompiledTimestampPrepare()
     {
         $tpl = $this->smarty->createTemplate('helloworld.tpl');
@@ -142,6 +143,9 @@ class FileResourceTest extends PHPUnit_Smarty
         $this->assertTrue($tpl->mustCompile());
     }
 
+    /**
+     * @doesNotPerformAssertions
+     */
     public function testMustCompileTouchedSourcePrepare()
     {
         // touch to prepare next test
@@ -196,7 +200,7 @@ class FileResourceTest extends PHPUnit_Smarty
     public function testRelativeInclude()
     {
         $result = $this->smarty->fetch('relative.tpl');
-        $this->assertContains('hello world', $result);
+        $this->assertStringContainsString('hello world', $result);
     }
 
     /**
@@ -208,12 +212,9 @@ class FileResourceTest extends PHPUnit_Smarty
     public function testRelativeIncludeSub()
     {
         $result = $this->smarty->fetch('sub/relative.tpl');
-        $this->assertContains('hello world', $result);
+        $this->assertStringContainsString('hello world', $result);
     }
     /**
-     * @expectedException        SmartyException
-     * @expectedExceptionMessage Unable to
-     * @expectedExceptionMessage notthereh.tpl
      * @runInSeparateProcess
      * @preserveGlobalState disabled
      *
@@ -221,11 +222,11 @@ class FileResourceTest extends PHPUnit_Smarty
      */
     public function testRelativeIncludeFail()
     {
-        $result =  $this->smarty->fetch('relative_sub.tpl');
+        $this->expectException('SmartyException');
+        $this->expectExceptionMessage('Unable to');
+        $this->smarty->fetch('relative_sub.tpl');
     }
     /**
-     * @expectedException        SmartyException
-      * @expectedExceptionMessage ./hello.tpl
      * @runInSeparateProcess
      * @preserveGlobalState disabled
      *
@@ -233,8 +234,10 @@ class FileResourceTest extends PHPUnit_Smarty
      */
     public function testRelativeIncludeFailOtherDir()
     {
+        $this->expectException('SmartyException');
+        $this->expectExceptionMessage('./hello.tpl');
         $this->smarty->addTemplateDir('./templates_2');
-         $result =    $this->smarty->fetch('relative_notexist.tpl');
+        $this->smarty->fetch('relative_notexist.tpl');
      }
 
     /**
diff --git a/tests/UnitTests/ResourceTests/FileIncludePath/FileIncludePathTest.php b/tests/UnitTests/ResourceTests/FileIncludePath/FileIncludePathTest.php
index 8ba53fb3..6b297458 100644
--- a/tests/UnitTests/ResourceTests/FileIncludePath/FileIncludePathTest.php
+++ b/tests/UnitTests/ResourceTests/FileIncludePath/FileIncludePathTest.php
@@ -11,7 +11,7 @@
  */
 class FileIncludePathTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
         $this->smarty->use_include_path = true;
@@ -26,7 +26,7 @@ class FileIncludePathTest extends PHPUnit_Smarty
      * This method is called after a test is executed.
      *
      */
-    protected function tearDown()
+    protected function tearDown(): void
     {
         ini_restore('include_path');
         $this->smarty->disableSecurity();
@@ -38,30 +38,30 @@ class FileIncludePathTest extends PHPUnit_Smarty
     }
     public function testInclude1()
     {
-        $this->assertContains('include_test1', $this->smarty->fetch('test1.tpl'));
+        $this->assertStringContainsString('include_test1', $this->smarty->fetch('test1.tpl'));
     }
     public function testInclude2()
     {
-        $this->assertContains('include_test2', $this->smarty->fetch('test2.tpl'));
+        $this->assertStringContainsString('include_test2', $this->smarty->fetch('test2.tpl'));
     }
     public function testInclude3()
     {
-        $this->assertContains('include_test3', $this->smarty->fetch('test3.tpl'));
+        $this->assertStringContainsString('include_test3', $this->smarty->fetch('test3.tpl'));
     }
     public function testInclude31()
     {
         $this->smarty->use_include_path = false;
         $this->smarty->security_policy->secure_dir = getcwd();
-        $this->assertContains('include_test3', $this->smarty->fetch('test3.tpl'));
+        $this->assertStringContainsString('include_test3', $this->smarty->fetch('test3.tpl'));
     }
     public function testInclude4()
     {
-        $this->assertContains('include_test4', $this->smarty->fetch('test4.tpl'));
+        $this->assertStringContainsString('include_test4', $this->smarty->fetch('test4.tpl'));
     }
     public function testInclude5()
     {
         $this->smarty->setTemplateDir(array('./'));
-        $this->assertContains('include path root', $this->smarty->fetch('test5.tpl'));
+        $this->assertStringContainsString('include path root', $this->smarty->fetch('test5.tpl'));
     }
 
  }
diff --git a/tests/UnitTests/ResourceTests/FileIndexed/FileResourceIndexedTest.php b/tests/UnitTests/ResourceTests/FileIndexed/FileResourceIndexedTest.php
index 9a1cf606..0650f799 100644
--- a/tests/UnitTests/ResourceTests/FileIndexed/FileResourceIndexedTest.php
+++ b/tests/UnitTests/ResourceTests/FileIndexed/FileResourceIndexedTest.php
@@ -11,7 +11,7 @@
  */
 class FileResourceIndexedTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
         $this->smarty->addTemplateDir(dirname(__FILE__) . '/templates_2');
diff --git a/tests/UnitTests/ResourceTests/Php/PhpResourceTest.php b/tests/UnitTests/ResourceTests/Php/PhpResourceTest.php
index dd4f20f0..c55cd647 100644
--- a/tests/UnitTests/ResourceTests/Php/PhpResourceTest.php
+++ b/tests/UnitTests/ResourceTests/Php/PhpResourceTest.php
@@ -15,7 +15,7 @@
  */
 class PhpResourceTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
@@ -57,7 +57,7 @@ class PhpResourceTest extends PHPUnit_Smarty
      * public function testGetTemplateSource()
      * {
      * $tpl = $this->smarty->createTemplate('php:phphelloworld.php');
-     * $this->assertContains('php hello world', $tpl->source->getContent());
+     * $this->assertStringContainsString('php hello world', $tpl->source->getContent());
      * }
      * /**
      * test usesCompiler
@@ -110,7 +110,7 @@ class PhpResourceTest extends PHPUnit_Smarty
         $this->smarty->caching = true;
         $this->smarty->cache_lifetime = 1000;
         $tpl = $this->smarty->createTemplate('php:phphelloworld.php');
-        $this->assertContains('php hello world', $this->smarty->fetch($tpl));
+        $this->assertStringContainsString('php hello world', $this->smarty->fetch($tpl));
     }
 
     /**
@@ -161,7 +161,7 @@ class PhpResourceTest extends PHPUnit_Smarty
      *
      * @runInSeparateProcess
      * @preserveGlobalState disabled
-     *
+     * @doesNotPerformAssertions
      */
     public function testIsCachedTouchedSourcePrepare()
     {
@@ -207,11 +207,12 @@ class PhpResourceTest extends PHPUnit_Smarty
     {
         $this->smarty->setAllowPhpTemplates(true);
         $tpl = $this->smarty->createTemplate('php:phphelloworld.php');
-        $this->assertContains('php hello world', $tpl->fetch());
+        $this->assertStringContainsString('php hello world', $tpl->fetch());
     }
 
     /**
      * test $smarty->is_cached
+     * @doesNotPerformAssertions
      */
     public function testSmartyIsCachedPrepare()
     {
@@ -275,7 +276,7 @@ class PhpResourceTest extends PHPUnit_Smarty
     public function testIncludePhpTemplate()
     {
         $this->smarty->setAllowPhpTemplates(true);
-        $this->assertContains('php hello world', $this->smarty->fetch('includephp.tpl'));
+        $this->assertStringContainsString('php hello world', $this->smarty->fetch('includephp.tpl'));
     }
 
     /**
@@ -285,7 +286,7 @@ class PhpResourceTest extends PHPUnit_Smarty
     {
         $this->smarty->caching = true;
         $this->smarty->setAllowPhpTemplates(true);
-        $this->assertContains('php hello world', $this->smarty->fetch('includephp.tpl'));
+        $this->assertStringContainsString('php hello world', $this->smarty->fetch('includephp.tpl'));
     }
 
     /**
diff --git a/tests/UnitTests/ResourceTests/Registered/RegisteredResourceTest.php b/tests/UnitTests/ResourceTests/Registered/RegisteredResourceTest.php
index d55a1852..d42786cb 100644
--- a/tests/UnitTests/ResourceTests/Registered/RegisteredResourceTest.php
+++ b/tests/UnitTests/ResourceTests/Registered/RegisteredResourceTest.php
@@ -16,14 +16,11 @@
 class RegisteredResourceTest extends PHPUnit_Smarty
 {
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
 
-        $this->smarty->registerResource("rr", array("rr_get_template",
-                                                    "rr_get_timestamp",
-                                                    "rr_get_secure",
-                                                    "rr_get_trusted"));
+        $this->smarty->registerResource("rr", new RegisteredResourceTest_Resource1());
     }
 
 
@@ -59,7 +56,7 @@ class RegisteredResourceTest extends PHPUnit_Smarty
      */
     public function testResourceCompileIdChange()
     {
-        $this->smarty->registerResource('myresource', array('getSource', 'getTimestamp', 'getSecure', 'getTrusted'));
+        $this->smarty->registerResource('myresource', new RegisteredResourceTest_Resource2());
         $this->smarty->compile_id = 'a';
         $this->assertEquals('this is template 1', $this->smarty->fetch('myresource:some'));
         $this->assertEquals('this is template 1', $this->smarty->fetch('myresource:some'));
@@ -72,7 +69,7 @@ class RegisteredResourceTest extends PHPUnit_Smarty
      *
      */
     public function testSmartyTemplate() {
-        $this->smarty->registerResource('mytpl', array('getTemplate', 'getTimestamp', 'getSecure', 'getTrusted'));
+        $this->smarty->registerResource('mytpl', new RegisteredResourceTest_Resource3());
         $this->assertEquals('template = mytpl:foo', $this->smarty->fetch('mytpl:foo'));
     }
     /**
@@ -80,83 +77,55 @@ class RegisteredResourceTest extends PHPUnit_Smarty
      *
      */
     public function testSmartyCurrentDir() {
-        $this->smarty->registerResource('mytpl', array('getCurrentDir', 'getTimestamp', 'getSecure', 'getTrusted'));
+        $this->smarty->registerResource('mytpl', new RegisteredResourceTest_Resource4());
         $this->assertEquals('current_dir = .', $this->smarty->fetch('mytpl:bar'));
     }
 }
 
+class RegisteredResourceTest_Resource1 extends Smarty_Resource_Custom {
 
-/**
- * resource functions
- */
-function rr_get_template($tpl_name, &$tpl_source, $smarty_obj)
-{
-    // populating $tpl_source
-    $tpl_source = '{$x="hello world"}{$x}';
+    protected function fetch($name, &$source, &$mtime) {
+        $source = '{$x="hello world"}{$x}';
+        $mtime = 1000000000;
+    }
 
-    return true;
 }
 
-function rr_get_timestamp($tpl_name, &$tpl_timestamp, $smarty_obj)
-{
-    // $tpl_timestamp.
-    $tpl_timestamp = (int) floor(time() / 100) * 100;
+class RegisteredResourceTest_Resource2 extends Smarty_Resource_Custom {
+
+    protected function fetch($name, &$source, &$mtime) {
+
+        // we update a counter, so that we return a new source for every call
+        static $counter = 0;
+        $counter ++;
+
+        // construct a new source
+        $source = "this is template $counter";
+
+        $mtime = 1000000000;
+    }
+
+    protected function fetchTimestamp($name)
+    {
+        return 1000000000;
+    }
 
-    return true;
 }
 
-function rr_get_secure($tpl_name, $smarty_obj)
-{
-    // assume all templates are secure
-    return true;
+class RegisteredResourceTest_Resource3 extends Smarty_Resource_Custom {
+
+    protected function fetch($name, &$source, &$mtime) {
+        $source = 'template = {$smarty.template}';
+        $mtime = 1000000000;
+    }
+
 }
 
-function rr_get_trusted($tpl_name, $smarty_obj)
-{
-    // not used for templates
-}
-
-// resource functions for compile_id change test
-
-function getSecure($name, $smarty)
-{
-    return true;
-}
-
-function getTrusted($name, $smarty)
-{
-}
-
-function getSource($name, &$source, $smarty)
-{
-    // we update a counter, so that we return a new source for every call
-    static $counter = 0;
-    $counter ++;
-
-    // construct a new source
-    $source = "this is template $counter";
-
-    return true;
-}
-function getTemplate($name, &$source, $smarty)
-{
-    // construct a new source
-    $source = 'template = {$smarty.template}';
-
-    return true;
-}
-function getCurrentDir($name, &$source, $smarty)
-{
-    // construct a new source
-    $source = 'current_dir = {$smarty.current_dir}';
-
-    return true;
-}
-
-function getTimestamp($name, &$timestamp, $smarty)
-{
-    // always pretend the template is brand new
-    $timestamp = (int) floor(time() / 100) * 100;
-
-    return true;
+class RegisteredResourceTest_Resource4 extends Smarty_Resource_Custom {
+
+    protected function fetch($name, &$source, &$mtime) {
+        $source = 'current_dir = {$smarty.current_dir}';
+        $mtime = 1000000000;
+    }
+
 }
diff --git a/tests/UnitTests/ResourceTests/ResourcePlugins/PHPunitplugins/resource.db.php b/tests/UnitTests/ResourceTests/ResourcePlugins/PHPunitplugins/resource.db.php
index 3b066db1..668b83da 100644
--- a/tests/UnitTests/ResourceTests/ResourcePlugins/PHPunitplugins/resource.db.php
+++ b/tests/UnitTests/ResourceTests/ResourcePlugins/PHPunitplugins/resource.db.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
  * Smarty plugin
  * -------------------------------------------------------------
@@ -8,30 +9,17 @@
  * Purpose:  Fetches templates from a database
  * -------------------------------------------------------------
  */
-function smarty_resource_db_source($tpl_name, &$tpl_source, $smarty)
-{
-    // do database call here to fetch your template,
-    // populating $tpl_source
-    $tpl_source = '{$x="hello world"}{$x}';
 
-    return true;
-}
-
-function smarty_resource_db_timestamp($tpl_name, &$tpl_timestamp, $smarty)
-{
-    // $tpl_timestamp.
-    $tpl_timestamp = (int) floor(time() / 100) * 100;
-
-    return true;
-}
-
-function smarty_resource_db_secure($tpl_name, $smarty)
-{
-    // assume all templates are secure
-    return true;
-}
-
-function smarty_resource_db_trusted($tpl_name, $smarty)
-{
-    // not used for templates
+class Smarty_Resource_Db extends Smarty_Resource_Recompiled {
+
+    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null) {
+        $source->filepath = 'db:';
+        $source->uid = sha1($source->resource);
+        $source->timestamp = 1000000000;
+        $source->exists = true;
+    }
+
+    public function getContent(Smarty_Template_Source $source) {
+        return '{$x="hello world"}{$x}';
+    }
 }
diff --git a/tests/UnitTests/ResourceTests/ResourcePlugins/ResourcePluginTest.php b/tests/UnitTests/ResourceTests/ResourcePlugins/ResourcePluginTest.php
index ba8d9162..17a136a6 100644
--- a/tests/UnitTests/ResourceTests/ResourcePlugins/ResourcePluginTest.php
+++ b/tests/UnitTests/ResourceTests/ResourcePlugins/ResourcePluginTest.php
@@ -15,7 +15,7 @@
  */
 class ResourcePluginTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
           $this->setUpSmarty(dirname(__FILE__));
     }
diff --git a/tests/UnitTests/ResourceTests/Stream/StreamResourceTest.php b/tests/UnitTests/ResourceTests/Stream/StreamResourceTest.php
index 73584f09..6d0201bd 100644
--- a/tests/UnitTests/ResourceTests/Stream/StreamResourceTest.php
+++ b/tests/UnitTests/ResourceTests/Stream/StreamResourceTest.php
@@ -15,7 +15,7 @@
  */
 class StreamResourceTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
 
@@ -32,7 +32,7 @@ class StreamResourceTest extends PHPUnit_Smarty
     {
         $this->cleanDirs();
     }
-    public function tearDown()
+    public function tearDown(): void
     {
         parent::tearDown();
         stream_wrapper_unregister("global");
@@ -138,8 +138,6 @@ class StreamResourceTest extends PHPUnit_Smarty
         $this->assertFalse($this->smarty->templateExists('global:notthere'));
     }
     /**
-     * @expectedException        SmartyException
-     * @expectedExceptionMessage 'global:notthere'
      * @runInSeparateProcess
      * @preserveGlobalState disabled
      *
@@ -148,7 +146,9 @@ class StreamResourceTest extends PHPUnit_Smarty
 
     public function testTemplateStramNotExists3()
     {
-            $result = $this->smarty->fetch('global:notthere');
+        $this->expectException('SmartyException');
+        $this->expectExceptionMessage('\'global:notthere\'');
+        $this->smarty->fetch('global:notthere');
     }
 
     /**
diff --git a/tests/UnitTests/ResourceTests/String/StringResourceTest.php b/tests/UnitTests/ResourceTests/String/StringResourceTest.php
index 7c938842..b01e2925 100644
--- a/tests/UnitTests/ResourceTests/String/StringResourceTest.php
+++ b/tests/UnitTests/ResourceTests/String/StringResourceTest.php
@@ -15,7 +15,7 @@
  */
 class StringResourceTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
diff --git a/tests/UnitTests/SecurityTests/FunctionTest.php b/tests/UnitTests/SecurityTests/FunctionTest.php
index 0706f23b..30ba119b 100644
--- a/tests/UnitTests/SecurityTests/FunctionTest.php
+++ b/tests/UnitTests/SecurityTests/FunctionTest.php
@@ -15,7 +15,7 @@
  */
 class FunctionTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
@@ -35,7 +35,7 @@ class FunctionTest extends PHPUnit_Smarty
             $this->smarty->fetch('eval:{unknown()}');
         }
         catch (Exception $e) {
-            $this->assertContains("PHP function 'unknown' not allowed by security setting", $e->getMessage());
+            $this->assertStringContainsString("PHP function 'unknown' not allowed by security setting", $e->getMessage());
 
             return;
         }
diff --git a/tests/UnitTests/SecurityTests/SecurityTest.php b/tests/UnitTests/SecurityTests/SecurityTest.php
index bbb8b4e8..72bb3cdc 100644
--- a/tests/UnitTests/SecurityTests/SecurityTest.php
+++ b/tests/UnitTests/SecurityTests/SecurityTest.php
@@ -15,15 +15,12 @@
  */
 class SecurityTest extends PHPUnit_Smarty
 {
-    public $loadSmartyBC = true;
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
 
         $this->smarty->setForceCompile(true);
         $this->smarty->enableSecurity();
-        $this->smartyBC->setForceCompile(true);
-        $this->smartyBC->enableSecurity();
    }
    public function testInit()
     {
@@ -60,15 +57,15 @@ class SecurityTest extends PHPUnit_Smarty
 
 /**
  * test not trusted PHP function
-  * @expectedException        SmartyException
-  * @expectedExceptionMessage   PHP function 'count' not allowed by security setting
   * @runInSeparateProcess
   * @preserveGlobalState disabled
   */
     public function testNotTrustedPHPFunction()
     {
+        $this->expectException('SmartyException');
+        $this->expectExceptionMessage('PHP function \'count\' not allowed by security setting');
         $this->smarty->security_policy->php_functions = array('null');
-            $this->smarty->fetch('string:{assign var=foo value=[1,2,3,4,5]}{count($foo)}');
+        $this->smarty->fetch('string:{assign var=foo value=[1,2,3,4,5]}{count($foo)}');
     }
 
 /**
@@ -91,13 +88,13 @@ class SecurityTest extends PHPUnit_Smarty
 
 /**
  * test not trusted modifier
-  * @expectedException        SmartyException
-  * @expectedExceptionMessage  modifier 'count' not allowed by security setting
   * @runInSeparateProcess
   * @preserveGlobalState disabled
  */
     public function testNotTrustedModifier()
     {
+        $this->expectException('SmartyException');
+        $this->expectExceptionMessage('modifier \'count\' not allowed by security setting');
         $this->smarty->security_policy->php_modifiers = array('null');
         $this->smarty->fetch('string:{assign var=foo value=[1,2,3,4,5]}{$foo|@count}');
     }
@@ -123,26 +120,26 @@ class SecurityTest extends PHPUnit_Smarty
 
 /**
  * test not allowed tag
-  * @expectedException        SmartyException
-  * @expectedExceptionMessage   tag 'cycle' not allowed by security setting
   * @runInSeparateProcess
   * @preserveGlobalState disabled
  */
     public function testNotAllowedTags2()
     {
+        $this->expectException('SmartyException');
+        $this->expectExceptionMessage('tag \'cycle\' not allowed by security setting');
         $this->smarty->security_policy->allowed_tags = array('counter');
         $this->smarty->fetch('string:{counter}{cycle values="1,2"}');
     }
 
 /**
  * test disabled tag
-  * @expectedException        SmartyException
-  * @expectedExceptionMessage  tag 'cycle' disabled by security setting
   * @runInSeparateProcess
   * @preserveGlobalState disabled
  */
     public function testDisabledTags()
     {
+        $this->expectException('SmartyException');
+        $this->expectExceptionMessage('tag \'cycle\' disabled by security setting');
         $this->smarty->security_policy->disabled_tags = array('cycle');
         $this->smarty->fetch('string:{counter}{cycle values="1,2"}');
     }
@@ -166,85 +163,47 @@ class SecurityTest extends PHPUnit_Smarty
 
 /**
  * test not allowed modifier
-  * @expectedException        SmartyException
-  * @expectedExceptionMessage   modifier 'lower' not allowed by security setting
   * @runInSeparateProcess
   * @preserveGlobalState disabled
   */
     public function testNotAllowedModifier()
     {
+        $this->expectException('SmartyException');
+        $this->expectExceptionMessage('modifier \'lower\' not allowed by security setting');
         $this->smarty->security_policy->allowed_modifiers = array('upper');
         $this->smarty->fetch('string:{"hello"|upper}{"world"|lower}');
-  }
+    }
 
 /**
  * test disabled modifier
-  * @expectedException        SmartyException
-  * @expectedExceptionMessage   modifier 'lower' disabled by security setting
   * @runInSeparateProcess
   * @preserveGlobalState disabled
   */
     public function testDisabledModifier()
     {
+        $this->expectException('SmartyException');
+        $this->expectExceptionMessage('modifier \'lower\' disabled by security setting');
         $this->smarty->security_policy->disabled_modifiers = array('lower');
-           $this->smarty->fetch('string:{"hello"|upper}{"world"|lower}');
+        $this->smarty->fetch('string:{"hello"|upper}{"world"|lower}');
     }
 
+
 /**
- * test Smarty::PHP_QUOTE
- */
-    public function testSmartyPhpQuote()
-    {
-        $this->smarty->security_policy->php_handling = Smarty::PHP_QUOTE;
-        $this->assertEquals('&lt;?php echo "hello world"; ?&gt;', $this->smarty->fetch('string:<?php echo "hello world"; ?>'));
-    }
-
-    public function testSmartyPhpQuoteAsp()
-    {
-        // NOTE: asp_tags cannot be changed by ini_set()
-        if (!ini_get('asp_tags')) {
-            $this->markTestSkipped('asp tags disabled in php.ini');
-        }
-        $this->smarty->security_policy->php_handling = Smarty::PHP_QUOTE;
-        $this->assertEquals('&lt;% echo "hello world"; %&gt;', $this->smarty->fetch('string:<% echo "hello world"; %>'));
-    }
-
-/**
- * test Smarty::PHP_REMOVE
- */
-    public function testSmartyPhpRemove()
-    {
-        $this->smarty->security_policy->php_handling = Smarty::PHP_REMOVE;
-        $this->assertEquals('', $this->smarty->fetch('string:<?php echo "hello world"; ?>'));
-    }
-
-    public function testSmartyPhpRemoveAsp()
-    {
-        // NOTE: asp_tags cannot be changed by ini_set()
-        if (!ini_get('asp_tags')) {
-            $this->markTestSkipped('asp tags disabled in php.ini');
-        }
-        $this->smarty->security_policy->php_handling = Smarty::PHP_REMOVE;
-        $this->assertEquals('', $this->smarty->fetch('string:<% echo "hello world"; %>'));
-    }
-
-/**
- * test Smarty::PHP_ALLOW
+ * test Smarty no longer handles embedded PHP
  */
     public function testSmartyPhpAllow()
     {
-        $this->smartyBC->security_policy->php_handling = Smarty::PHP_ALLOW;
-        $this->assertEquals('hello world', $this->smartyBC->fetch('string:<?php echo "hello world"; ?>'));
+        $this->assertEquals('<?php echo "hello world"; ?>', $this->smarty->fetch('string:<?php echo "hello world"; ?>'));
     }
 
-    public function testSmartyPhpAllowAsp()
+    public function testSmartyPhpAllow2()
     {
-        // NOTE: asp_tags cannot be changed by ini_set()
-        if (!ini_get('asp_tags')) {
-            $this->markTestSkipped('asp tags disabled in php.ini');
-        }
-        $this->smartyBC->security_policy->php_handling = Smarty::PHP_ALLOW;
-        $this->assertEquals('hello world', $this->smartyBC->fetch('string:<% echo "hello world"; %>'));
+        $this->assertEquals('<? echo "hello world"; ?>', $this->smarty->fetch('string:<? echo "hello world"; ?>'));
+    }
+
+    public function testSmartyPhpAllow3()
+    {
+        $this->assertEquals('<% echo "hello world"; %>', $this->smarty->fetch('string:<% echo "hello world"; %>'));
     }
 
 /**
@@ -268,15 +227,15 @@ class SecurityTest extends PHPUnit_Smarty
 /**
  * test not trusted directory
   *
-  * @expectedException        SmartyException
-  * @expectedExceptionMessage   not trusted file path
   * @runInSeparateProcess
   * @preserveGlobalState disabled
   */
     public function testNotTrustedDirectory()
     {
+        $this->expectException('SmartyException');
+        $this->expectExceptionMessage('not trusted file path');
         $this->smarty->security_policy->secure_dir = array(str_replace('\\', '/', dirname(__FILE__) . '/templates_3/'));
-             $this->smarty->fetch('string:{include file="templates_2/hello.tpl"}');
+        $this->smarty->fetch('string:{include file="templates_2/hello.tpl"}');
      }
 
 /**
@@ -300,15 +259,15 @@ class SecurityTest extends PHPUnit_Smarty
 
 /**
  * test not trusted PHP function
-  * @expectedException        SmartyException
-  * @expectedExceptionMessage   access to static class 'mysecuritystaticclass' not allowed by security setting
   * @runInSeparateProcess
   * @preserveGlobalState disabled
   */
     public function testNotTrustedStaticClass()
     {
+        $this->expectException('SmartyException');
+        $this->expectExceptionMessage('access to static class \'mysecuritystaticclass\' not allowed by security setting');
         $this->smarty->security_policy->static_classes = array('null');
-            $this->smarty->fetch('string:{mysecuritystaticclass::square(5)}');
+        $this->smarty->fetch('string:{mysecuritystaticclass::square(5)}');
     }
 
     public function testChangedTrustedDirectory()
@@ -342,14 +301,14 @@ class SecurityTest extends PHPUnit_Smarty
         $this->assertTrue($tpl->source->exists);
     }
 /**
- * @expectedException        SmartyException
- * @expectedExceptionMessage  stream 'global' not allowed by security setting
  * @runInSeparateProcess
  * @preserveGlobalState disabled
  * test template file exits
  */
     public function testTemplateNotTrustedStream()
     {
+        $this->expectException('SmartyException');
+        $this->expectExceptionMessage('stream \'global\' not allowed by security setting');
         stream_wrapper_register("global", "ResourceStreamSecurity")
         or die("Failed to register protocol");
         $fp = fopen("global://mytest", "r+");
@@ -368,19 +327,19 @@ class SecurityTest extends PHPUnit_Smarty
         $this->smarty->security_policy->trusted_uri = array(
             '#https://www.smarty.net$#i'
         );
-        $this->assertContains('<title>Preface | Smarty</title>', $this->smarty->fetch('string:{fetch file="https://www.smarty.net/docs/en/preface.tpl"}'));
+        $this->assertStringContainsString('<title>Preface | Smarty</title>', $this->smarty->fetch('string:{fetch file="https://www.smarty.net/docs/en/preface.tpl"}'));
     }
 
 /**
- * @expectedException        SmartyException
- * @expectedExceptionMessage  URI 'https://www.smarty.net/docs/en/preface.tpl' not allowed by security setting
  * @runInSeparateProcess
  * @preserveGlobalState disabled
 */
     public function testNotTrustedUri()
     {
+        $this->expectException('SmartyException');
+        $this->expectExceptionMessage('URI \'https://www.smarty.net/docs/en/preface.tpl\' not allowed by security setting');
         $this->smarty->security_policy->trusted_uri = array();
-        $this->assertContains('<title>Preface | Smarty</title>', $this->smarty->fetch('string:{fetch file="https://www.smarty.net/docs/en/preface.tpl"}'));
+        $this->assertStringContainsString('<title>Preface | Smarty</title>', $this->smarty->fetch('string:{fetch file="https://www.smarty.net/docs/en/preface.tpl"}'));
     }
 
     /**
diff --git a/tests/UnitTests/SmartyMethodsTests/Append/AppendTest.php b/tests/UnitTests/SmartyMethodsTests/Append/AppendTest.php
index 4955b7d7..5d63b654 100644
--- a/tests/UnitTests/SmartyMethodsTests/Append/AppendTest.php
+++ b/tests/UnitTests/SmartyMethodsTests/Append/AppendTest.php
@@ -15,7 +15,7 @@
  */
 class AppendTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
diff --git a/tests/UnitTests/SmartyMethodsTests/AppendByRef/AppendByRefBCTest.php b/tests/UnitTests/SmartyMethodsTests/AppendByRef/AppendByRefBCTest.php
deleted file mode 100644
index 0c8a759e..00000000
--- a/tests/UnitTests/SmartyMethodsTests/AppendByRef/AppendByRefBCTest.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/**
- * Smarty PHPunit tests appendByRef method
- *
- * @package PHPunit
- * @author  Uwe Tews
- */
-
-/**
- * class for appendByRef tests
- *
- * @runTestsInSeparateProcess
- * @preserveGlobalState disabled
- * @backupStaticAttributes enabled
- */
-class AppendByRefBCTest extends PHPUnit_Smarty
-{
-    public $loadSmartyBC = true;
-    public $loadSmarty = false;
-    public function setUp()
-    {
-        $this->setUpSmarty(dirname(__FILE__));
-    }
-
-    public function testInit()
-    {
-        $this->cleanDirs();
-    }
-
-    public function testSmarty2AppendByRef()
-    {
-        $bar = 'bar';
-        $bar2 = 'bar2';
-        $this->smartyBC->append_by_ref('foo', $bar);
-        $this->smartyBC->append_by_ref('foo', $bar2);
-        $bar = 'newbar';
-        $bar2 = 'newbar2';
-        $this->assertEquals('newbar newbar2', $this->smartyBC->fetch('eval:{$foo[0]} {$foo[1]}'));
-    }
-
-    public function testSmarty2AppendByRefUnassigned()
-    {
-        $bar2 = 'bar2';
-        $this->smartyBC->append_by_ref('foo', $bar2);
-        $bar2 = 'newbar2';
-        $this->assertEquals('newbar2', $this->smartyBC->fetch('eval:{$foo[0]}'));
-    }
-}
diff --git a/tests/UnitTests/SmartyMethodsTests/AppendByRef/AppendByRefTest.php b/tests/UnitTests/SmartyMethodsTests/AppendByRef/AppendByRefTest.php
index 7a52d700..abf074dc 100644
--- a/tests/UnitTests/SmartyMethodsTests/AppendByRef/AppendByRefTest.php
+++ b/tests/UnitTests/SmartyMethodsTests/AppendByRef/AppendByRefTest.php
@@ -15,7 +15,7 @@
  */
 class AppendByRefTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
diff --git a/tests/UnitTests/SmartyMethodsTests/Assign/AssignTest.php b/tests/UnitTests/SmartyMethodsTests/Assign/AssignTest.php
index cc45a5c9..fbe44365 100644
--- a/tests/UnitTests/SmartyMethodsTests/Assign/AssignTest.php
+++ b/tests/UnitTests/SmartyMethodsTests/Assign/AssignTest.php
@@ -15,7 +15,7 @@
  */
 class AssignTest extends PHPUnit_Smarty
 {
-     public function setUp()
+     public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
diff --git a/tests/UnitTests/SmartyMethodsTests/AssignByRef/AssignByRefBCTest.php b/tests/UnitTests/SmartyMethodsTests/AssignByRef/AssignByRefBCTest.php
deleted file mode 100644
index 902d27ac..00000000
--- a/tests/UnitTests/SmartyMethodsTests/AssignByRef/AssignByRefBCTest.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/**
- * Smarty PHPunit tests assignByRef method
- *
- * @package PHPunit
- * @author  Uwe Tews
- */
-
-/**
- * class for assignByRef tests
- *
- * @runTestsInSeparateProcess
- * @preserveGlobalState disabled
- * @backupStaticAttributes enabled
- */
-class AssignByRefBCTest extends PHPUnit_Smarty
-{
-    public $loadSmartyBC = true;
-    public $loadSmarty = false;
-    public function setUp()
-    {
-        $this->setUpSmarty(dirname(__FILE__));
-    }
-
-
-    public function testInit()
-    {
-        $this->cleanDirs();
-    }
-    /**
-     * test Smarty2 assign_By_Ref
-     */
-    public function testSmarty2AssignByRef()
-    {
-        $bar = 'bar';
-        $this->smartyBC->assign_by_ref('foo', $bar);
-        $bar = 'newbar';
-        $this->assertEquals('newbar', $this->smartyBC->fetch('eval:{$foo}'));
-    }
-
-    /**
-     * test Smarty2's behaviour of assign_By_Ref (Issue 88)
-     */
-    public function testSmarty2AssignByRef2()
-    {
-        $bar = 'bar';
-        $this->smartyBC->assign_by_ref('foo', $bar);
-        $this->smartyBC->fetch('eval:{$foo = "newbar"}');
-        $this->assertEquals('newbar', $bar);
-    }
-}
diff --git a/tests/UnitTests/SmartyMethodsTests/AssignByRef/AssignByRefTest.php b/tests/UnitTests/SmartyMethodsTests/AssignByRef/AssignByRefTest.php
index 6c393d86..789f2aa5 100644
--- a/tests/UnitTests/SmartyMethodsTests/AssignByRef/AssignByRefTest.php
+++ b/tests/UnitTests/SmartyMethodsTests/AssignByRef/AssignByRefTest.php
@@ -15,7 +15,7 @@
  */
 class AssignByRefTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
diff --git a/tests/UnitTests/SmartyMethodsTests/AssignGlobal/AssignGlobalTest.php b/tests/UnitTests/SmartyMethodsTests/AssignGlobal/AssignGlobalTest.php
index ecd4130b..62c5aca8 100644
--- a/tests/UnitTests/SmartyMethodsTests/AssignGlobal/AssignGlobalTest.php
+++ b/tests/UnitTests/SmartyMethodsTests/AssignGlobal/AssignGlobalTest.php
@@ -15,7 +15,7 @@
  */
 class AssignGlobalTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
diff --git a/tests/UnitTests/SmartyMethodsTests/ClearAllAssign/ClearAllAssignBCTest.php b/tests/UnitTests/SmartyMethodsTests/ClearAllAssign/ClearAllAssignBCTest.php
deleted file mode 100644
index 48c104e9..00000000
--- a/tests/UnitTests/SmartyMethodsTests/ClearAllAssign/ClearAllAssignBCTest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * Smarty PHPunit tests clearing all assigned variables
- *
- * @package PHPunit
- * @author  Uwe Tews
- */
-
-/**
- * class for clearing all assigned variables tests
- *
- * @runTestsInSeparateProcess
- * @preserveGlobalState disabled
- * @backupStaticAttributes enabled
- */
-class ClearAllAssignBCTest extends PHPUnit_Smarty
-{
-    public $loadSmartyBC = true;
-    public $loadSmarty = false;
-    protected $_dataBC = null;
-    protected $_tplBC = null;
-
-    public function setUp()
-    {
-        $this->setUpSmarty(dirname(__FILE__));
-
-        $this->smartyBC->assign('foo', 'foo');
-        $this->_dataBC = $this->smartyBC->createData($this->smartyBC);
-        $this->_dataBC->assign('bar', 'bar');
-        $this->_tplBC = $this->smartyBC->createTemplate('eval:{$foo}{$bar}{$blar}', null, null, $this->_dataBC);
-        $this->_tplBC->assign('blar', 'blar');
-    }
-
-    public function testSmarty2ClearAllAssignInSmarty()
-    {
-        error_reporting((error_reporting() & ~(E_NOTICE | E_WARNING | E_USER_NOTICE)));
-        $this->smartyBC->clear_all_assign();
-        $this->assertEquals('barblar', $this->smartyBC->fetch($this->_tplBC));
-    }
-}
diff --git a/tests/UnitTests/SmartyMethodsTests/ClearAllAssign/ClearAllAssignTest.php b/tests/UnitTests/SmartyMethodsTests/ClearAllAssign/ClearAllAssignTest.php
index 459e8557..db273ffd 100644
--- a/tests/UnitTests/SmartyMethodsTests/ClearAllAssign/ClearAllAssignTest.php
+++ b/tests/UnitTests/SmartyMethodsTests/ClearAllAssign/ClearAllAssignTest.php
@@ -18,7 +18,7 @@ class ClearAllAssignTest extends PHPUnit_Smarty
     protected $_data = null;
     protected $_tpl = null;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
 
diff --git a/tests/UnitTests/SmartyMethodsTests/ClearAssign/ClearAssignBCTest.php b/tests/UnitTests/SmartyMethodsTests/ClearAssign/ClearAssignBCTest.php
deleted file mode 100644
index b9867627..00000000
--- a/tests/UnitTests/SmartyMethodsTests/ClearAssign/ClearAssignBCTest.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
- * Smarty PHPunit tests clearing assigned variables
- *
- * @package PHPunit
- * @author  Uwe Tews
- */
-
-/**
- * class for clearing assigned variables tests
- *
- * @runTestsInSeparateProcess
- * @preserveGlobalState disabled
- * @backupStaticAttributes enabled
- */
-class ClearAssignBCTest extends PHPUnit_Smarty
-{
-    public $loadSmartyBC = true;
-    public $loadSmarty = false;
-    public function setUp()
-    {
-        $this->setUpSmarty(dirname(__FILE__));
-
-        $this->smartyBC->assign('foo', 'foo');
-        $this->smartyBC->assign('bar', 'bar');
-        $this->smartyBC->assign('blar', 'blar');
-    }
-
-
-    public function testInit()
-    {
-        $this->cleanDirs();
-    }
-    public function testSmarty2ClearAssign()
-    {
-        $this->smartyBC->setErrorReporting(error_reporting() & ~(E_NOTICE | E_USER_NOTICE | E_WARNING));
-        $this->smartyBC->clear_assign('blar');
-        $this->assertEquals('foobar', $this->smartyBC->fetch('eval:{$foo}{$bar}{$blar}'));
-    }
-
-    public function testSmarty2ArrayClearAssign()
-    {
-        $this->smartyBC->setErrorReporting(error_reporting() & ~(E_NOTICE | E_USER_NOTICE | E_WARNING));
-        $this->smartyBC->clear_assign(array('blar', 'foo'));
-        $this->assertEquals('bar', $this->smartyBC->fetch('eval:{$foo}{$bar}{$blar}'));
-    }
-}
diff --git a/tests/UnitTests/SmartyMethodsTests/ClearAssign/ClearAssignTest.php b/tests/UnitTests/SmartyMethodsTests/ClearAssign/ClearAssignTest.php
index 2b466928..7dd12d15 100644
--- a/tests/UnitTests/SmartyMethodsTests/ClearAssign/ClearAssignTest.php
+++ b/tests/UnitTests/SmartyMethodsTests/ClearAssign/ClearAssignTest.php
@@ -15,7 +15,7 @@
  */
 class ClearAssignTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
         $this->smarty->assign('foo', 'foo');
diff --git a/tests/UnitTests/SmartyMethodsTests/ClearCompiledTemplate/ClearCompiledBCTest.php b/tests/UnitTests/SmartyMethodsTests/ClearCompiledTemplate/ClearCompiledBCTest.php
deleted file mode 100644
index 9cf3f127..00000000
--- a/tests/UnitTests/SmartyMethodsTests/ClearCompiledTemplate/ClearCompiledBCTest.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/**
- * Smarty PHPunit tests for deleting compiled templates
- *
- * @package PHPunit
- * @author  Uwe Tews
- * @author  Rodney Rehm
- */
-include_once dirname(__FILE__) . '/ClearCompiledTest.php';
-
-/**
- * class for delete compiled template tests
- *
- * @runTestsInSeparateProcess
- * @preserveGlobalState disabled
- * @backupStaticAttributes enabled
- */
-class ClearCompiledBCTest extends ClearCompiledTest
-{
-    public $loadSmartyBC = true;
-    public $loadSmarty = false;
-
-    public function setUp()
-    {
-        $this->setUpSmarty(dirname(__FILE__));
-        $this->smartyBC->addTemplateDir('./templates_2/');
-        $this->methodName = 'clear_compiled_tpl';
-    }
-}
diff --git a/tests/UnitTests/SmartyMethodsTests/ClearCompiledTemplate/ClearCompiledTest.php b/tests/UnitTests/SmartyMethodsTests/ClearCompiledTemplate/ClearCompiledTest.php
index 51fe36b5..796ca360 100644
--- a/tests/UnitTests/SmartyMethodsTests/ClearCompiledTemplate/ClearCompiledTest.php
+++ b/tests/UnitTests/SmartyMethodsTests/ClearCompiledTemplate/ClearCompiledTest.php
@@ -17,7 +17,7 @@
 class ClearCompiledTest extends PHPUnit_Smarty
 {
     public $methodName = null;
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
         $this->smarty->addTemplateDir('./templates_2/');
diff --git a/tests/UnitTests/SmartyMethodsTests/GetTemplateVars/GetTemplateVarsBCTest.php b/tests/UnitTests/SmartyMethodsTests/GetTemplateVars/GetTemplateVarsBCTest.php
deleted file mode 100644
index 816c9f50..00000000
--- a/tests/UnitTests/SmartyMethodsTests/GetTemplateVars/GetTemplateVarsBCTest.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/**
- * Smarty PHPunit tests get_template_vars method
- *
- * @package PHPunit
- * @author  Uwe Tews
- */
-
-/**
- * class for get_template_vars method test
- *
- * @runTestsInSeparateProcess
- * @preserveGlobalState disabled
- * @backupStaticAttributes enabled
- */
-class get_template_varsBCTest extends PHPUnit_Smarty
-{
-    public $loadSmartyBC = true;
-    public $loadSmarty = false;
-
-    public function setUp()
-    {
-        $this->setUpSmarty(dirname(__FILE__));
-    }
-
-
-    public function testInit()
-    {
-        $this->cleanDirs();
-    }
-    /**
-     * test root get_template_vars single value
-     */
-    public function testGetSingleTemplateVarScopeRoot()
-    {
-        $this->smartyBC->assign('foo', 'bar');
-        $this->smartyBC->assign('blar', 'buh');
-        $this->assertEquals("bar", $this->smartyBC->get_template_vars('foo'));
-    }
-
-    /**
-     * test root get_template_vars all values
-     */
-    public function testGetAllTemplateVarsScopeRoot()
-    {
-        $this->smartyBC->assign('foo', 'bar');
-        $this->smartyBC->assign('blar', 'buh');
-        $vars = $this->smartyBC->get_template_vars();
-        $this->assertTrue(is_array($vars));
-        $this->assertEquals("bar", $vars['foo']);
-        $this->assertEquals("buh", $vars['blar']);
-    }
-
-}
diff --git a/tests/UnitTests/SmartyMethodsTests/GetTemplateVars/GetTemplateVarsTest.php b/tests/UnitTests/SmartyMethodsTests/GetTemplateVars/GetTemplateVarsTest.php
index 7fd71f1e..35af56fb 100644
--- a/tests/UnitTests/SmartyMethodsTests/GetTemplateVars/GetTemplateVarsTest.php
+++ b/tests/UnitTests/SmartyMethodsTests/GetTemplateVars/GetTemplateVarsTest.php
@@ -15,7 +15,7 @@
  */
 class GetTemplateVarsTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
diff --git a/tests/UnitTests/SmartyMethodsTests/RegisterBlock/RegisterBlockTest.php b/tests/UnitTests/SmartyMethodsTests/RegisterBlock/RegisterBlockTest.php
index 5d5f845f..7d72c73d 100644
--- a/tests/UnitTests/SmartyMethodsTests/RegisterBlock/RegisterBlockTest.php
+++ b/tests/UnitTests/SmartyMethodsTests/RegisterBlock/RegisterBlockTest.php
@@ -15,12 +15,10 @@
  */
 class RegisterBlockTest extends PHPUnit_Smarty
 {
-    public $loadSmartyBC = true;
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
         $this->smarty->disableSecurity();
-        $this->smartyBC->disableSecurity();
     }
 
 
@@ -54,9 +52,9 @@ class RegisterBlockTest extends PHPUnit_Smarty
 
     public function testRegisterBlockFunctionWrapper()
     {
-        $this->smartyBC->register_block('testblock', 'myblock');
-        $this->smartyBC->assign('value', 1);
-        $this->assertEquals('function hello world 1 1 function hello world 1 2 function hello world 1 3 ', $this->smartyBC->fetch('eval:{testblock}hello world {$value}{/testblock}'));
+        $this->smarty->registerPlugin('block', 'testblock', 'myblock');
+        $this->smarty->assign('value', 1);
+        $this->assertEquals('function hello world 1 1 function hello world 1 2 function hello world 1 3 ', $this->smarty->fetch('eval:{testblock}hello world {$value}{/testblock}'));
     }
 
     /**
@@ -71,9 +69,9 @@ class RegisterBlockTest extends PHPUnit_Smarty
 
     public function testRegisterBlockClassWrapper()
     {
-        $this->smartyBC->register_block('testblock', array('myblockclass', 'static_method'));
-        $this->smartyBC->assign('value', 2);
-        $this->assertEquals('static hello world 2 1 static hello world 2 2 static hello world 2 3 ', $this->smartyBC->fetch('eval:{testblock}hello world {$value}{/testblock}'));
+        $this->smarty->registerPlugin('block', 'testblock', array('myblockclass', 'static_method'));
+        $this->smarty->assign('value', 2);
+        $this->assertEquals('static hello world 2 1 static hello world 2 2 static hello world 2 3 ', $this->smarty->fetch('eval:{testblock}hello world {$value}{/testblock}'));
     }
 
     /**
@@ -90,9 +88,9 @@ class RegisterBlockTest extends PHPUnit_Smarty
     public function testRegisterBlockObjectWrapper()
     {
         $myblock_object = new myblockclass;
-        $this->smartyBC->register_block('testblock', array($myblock_object, 'object_method'));
-        $this->smartyBC->assign('value', 3);
-        $this->assertEquals('object hello world 3 1 object hello world 3 2 object hello world 3 3 ', $this->smartyBC->fetch('eval:{testblock}hello world {$value}{/testblock}'));
+        $this->smarty->registerPlugin('block', 'testblock', array($myblock_object, 'object_method'));
+        $this->smarty->assign('value', 3);
+        $this->assertEquals('object hello world 3 1 object hello world 3 2 object hello world 3 3 ', $this->smarty->fetch('eval:{testblock}hello world {$value}{/testblock}'));
     }
 
     /**
@@ -166,14 +164,14 @@ class RegisterBlockTest extends PHPUnit_Smarty
      */
     public function testRegisterBlockCaching1Wrapper()
     {
-        $this->smartyBC->caching = 1;
-        $this->smartyBC->cache_lifetime = 1000;
-        $this->smartyBC->setForceCompile(true);
-        $this->smartyBC->assign('x', 1);
-        $this->smartyBC->assign('y', 10);
-        $this->smartyBC->assign('z', 100);
-        $this->smartyBC->register_block('testblock', 'myblockcache');
-        $this->assertEquals('1 10 100', $this->smartyBC->fetch('test_register_block.tpl'));
+        $this->smarty->caching = 1;
+        $this->smarty->cache_lifetime = 1000;
+        $this->smarty->setForceCompile(true);
+        $this->smarty->assign('x', 1);
+        $this->smarty->assign('y', 10);
+        $this->smarty->assign('z', 100);
+        $this->smarty->registerPlugin('block', 'testblock', 'myblockcache');
+        $this->assertEquals('1 10 100', $this->smarty->fetch('test_register_block.tpl'));
     }
 
     /**
@@ -183,13 +181,13 @@ class RegisterBlockTest extends PHPUnit_Smarty
      */
     public function testRegisterBlockCaching2Wrapper()
     {
-        $this->smartyBC->caching = 1;
-        $this->smartyBC->cache_lifetime = 1000;
-        $this->smartyBC->assign('x', 2);
-        $this->smartyBC->assign('y', 20);
-        $this->smartyBC->assign('z', 200);
-        $this->smartyBC->register_block('testblock', 'myblockcache');
-        $this->assertEquals('1 10 100', $this->smartyBC->fetch('test_register_block.tpl'));
+        $this->smarty->caching = 1;
+        $this->smarty->cache_lifetime = 1000;
+        $this->smarty->assign('x', 2);
+        $this->smarty->assign('y', 20);
+        $this->smarty->assign('z', 200);
+        $this->smarty->registerPlugin('block', 'testblock', 'myblockcache');
+        $this->assertEquals('1 10 100', $this->smarty->fetch('test_register_block.tpl'));
     }
 
     /**
@@ -199,14 +197,14 @@ class RegisterBlockTest extends PHPUnit_Smarty
      */
     public function testRegisterBlockCaching3Wrapper()
     {
-        $this->smartyBC->caching = 1;
-        $this->smartyBC->cache_lifetime = 1000;
-        $this->smartyBC->setForceCompile(true);
-        $this->smartyBC->assign('x', 3);
-        $this->smartyBC->assign('y', 30);
-        $this->smartyBC->assign('z', 300);
-        $this->smartyBC->register_block('testblock', 'myblockcache', false);
-        $this->assertEquals('3 30 300', $this->smartyBC->fetch('test_register_block.tpl'));
+        $this->smarty->caching = 1;
+        $this->smarty->cache_lifetime = 1000;
+        $this->smarty->setForceCompile(true);
+        $this->smarty->assign('x', 3);
+        $this->smarty->assign('y', 30);
+        $this->smarty->assign('z', 300);
+        $this->smarty->registerPlugin('block', 'testblock', 'myblockcache', false);
+        $this->assertEquals('3 30 300', $this->smarty->fetch('test_register_block.tpl'));
     }
 
     /**
@@ -216,13 +214,13 @@ class RegisterBlockTest extends PHPUnit_Smarty
      */
     public function testRegisterBlockCaching4Wrapper()
     {
-        $this->smartyBC->caching = 1;
-        $this->smartyBC->cache_lifetime = 1000;
-        $this->smartyBC->assign('x', 4);
-        $this->smartyBC->assign('y', 40);
-        $this->smartyBC->assign('z', 400);
-        $this->smartyBC->register_block('testblock', 'myblockcache', false);
-        $this->assertEquals('3 40 300', $this->smartyBC->fetch('test_register_block.tpl'));
+        $this->smarty->caching = 1;
+        $this->smarty->cache_lifetime = 1000;
+        $this->smarty->assign('x', 4);
+        $this->smarty->assign('y', 40);
+        $this->smarty->assign('z', 400);
+        $this->smarty->registerPlugin('block', 'testblock', 'myblockcache', false);
+        $this->assertEquals('3 40 300', $this->smarty->fetch('test_register_block.tpl'));
     }
 
     /**
@@ -237,9 +235,9 @@ class RegisterBlockTest extends PHPUnit_Smarty
 
     public function testUnregisterBlockWrapper()
     {
-        $this->smartyBC->register_block('testblock', 'myblock');
-        $this->smartyBC->unregister_block('testblock');
-        $this->assertFalse(isset($this->smartyBC->registered_plugins[Smarty::PLUGIN_BLOCK]['testblock']));
+        $this->smarty->registerPlugin('block', 'testblock', 'myblock');
+        $this->smarty->unregisterPlugin('block', 'testblock');
+        $this->assertFalse(isset($this->smarty->registered_plugins[Smarty::PLUGIN_BLOCK]['testblock']));
     }
 
     /**
diff --git a/tests/UnitTests/SmartyMethodsTests/RegisterCompiler/RegisterCompilerFunctionBCTest.php b/tests/UnitTests/SmartyMethodsTests/RegisterCompiler/RegisterCompilerFunctionBCTest.php
deleted file mode 100644
index 3dee8b1e..00000000
--- a/tests/UnitTests/SmartyMethodsTests/RegisterCompiler/RegisterCompilerFunctionBCTest.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-/**
- * Smarty PHPunit tests register->compilerFunction / unregister->compilerFunction methods
- *
- * @package PHPunit
- * @author  Uwe Tews
- */
-
-/**
- * class for register->compilerFunction / unregister->compilerFunction methods tests
- *
- * @runTestsInSeparateProcess
- * @preserveGlobalState disabled
- * @backupStaticAttributes enabled
- */
-class RegisterCompilerFunctionBCTest extends PHPUnit_Smarty
-{
-    public $loadSmartyBC = true;
-    public $loadSmarty = false;
-
-    public function setUp()
-    {
-        $this->setUpSmarty(dirname(__FILE__));
-    }
-
-
-    public function testInit()
-    {
-        $this->cleanDirs();
-    }
-    /**
-     * test register->compilerFunction method for function
-     */
-    public function testRegisterCompilerFunction()
-    {
-        $this->smartyBC->register_compiler_function('testcompilerfunction', 'mycompilerfunctionBC');
-        $this->assertEquals('mycompilerfunctionBC', $this->smartyBC->registered_plugins['compiler']['testcompilerfunction'][0]);
-        $this->assertEquals('hello world 1', $this->smartyBC->fetch('eval:{testcompilerfunction var=1}'));
-    }
-
-    /**
-     * test register->compilerFunction method for blocks
-     */
-    public function testRegisterCompilerFunctionBlock()
-    {
-        $this->smartyBC->register_compiler_function('foo', 'mycompilerfunctionBCopen');
-        $this->smartyBC->register_compiler_function('fooclose', 'mycompilerfunctionBCclose');
-        $result = $this->smartyBC->fetch('eval:{foo} hallo {/foo}');
-        $this->assertEquals('open tag hallo close tag', $result);
-    }
-
-    /**
-     * test register->compilerFunction method for static class
-     */
-    public function testRegisterCompilerFunctionClass()
-    {
-        $this->smartyBC->register_compiler_function('testcompilerfunction', array('mycompilerfunctionBCclass', 'execute'));
-        $this->assertEquals('hello world 2', $this->smartyBC->fetch('eval:{testcompilerfunction var1=2}'));
-    }
-
-    /**
-     * test register->compilerFunction method for objects
-     */
-    public function testRegisterCompilerFunctionObject()
-    {
-        $obj = new mycompilerfunctionBCclass;
-        $this->smartyBC->register_compiler_function('testcompilerfunction', array($obj, 'compile'));
-        $this->assertEquals('hello world 3', $this->smartyBC->fetch('eval:{testcompilerfunction var2=3}'));
-    }
-
-    /**
-     * test unregister->compilerFunction method
-     */
-    public function testUnregisterCompilerFunction()
-    {
-        $this->smartyBC->register_compiler_function('testcompilerfunction', 'mycompilerfunctionBC');
-        $this->smartyBC->unregister_compiler_function('testcompilerfunction');
-        $this->assertFalse(isset($this->smartyBC->registered_plugins[Smarty::PLUGIN_COMPILER]['testcompilerfunction']));
-    }
-
-    /**
-     * test unregister->compilerFunction method not registered
-     */
-    public function testUnregisterCompilerFunctionNotRegistered()
-    {
-        $this->smartyBC->unregister_compiler_function('testcompilerfunction');
-        $this->assertFalse(isset($this->smartyBC->registered_plugins[Smarty::PLUGIN_COMPILER]['testcompilerfunction']));
-    }
-
-    /**
-     * test unregister->compilerFunction method other registered
-     */
-    public function testUnregisterCompilerFunctionOtherRegistered()
-    {
-        $this->smartyBC->register_block('testcompilerfunction', 'mycompilerfunctionBC');
-        $this->smartyBC->unregister_compiler_function('testcompilerfunction');
-        $this->assertTrue(isset($this->smartyBC->registered_plugins[Smarty::PLUGIN_BLOCK]['testcompilerfunction']));
-    }
-}
-
-function mycompilerfunctionBC($params, $smarty)
-{
-    return "<?php echo 'hello world {$params['var']}';?>";
-}
-
-function mycompilerfunctionBCopen($params, $smarty)
-{
-    return "<?php echo 'open tag';?>";
-}
-
-function mycompilerfunctionBCclose($params, $smarty)
-{
-    return "<?php echo 'close tag';?>";
-}
-
-class mycompilerfunctionBCclass
-{
-    static function execute($params, $smarty)
-    {
-        return "<?php echo 'hello world {$params['var1']}';?>";
-    }
-
-    public function compile($params, $smarty)
-    {
-        return "<?php echo 'hello world {$params['var2']}';?>";
-    }
-}
diff --git a/tests/UnitTests/SmartyMethodsTests/RegisterCompiler/RegisterCompilerFunctionTest.php b/tests/UnitTests/SmartyMethodsTests/RegisterCompiler/RegisterCompilerFunctionTest.php
index 54db28a6..996e9067 100644
--- a/tests/UnitTests/SmartyMethodsTests/RegisterCompiler/RegisterCompilerFunctionTest.php
+++ b/tests/UnitTests/SmartyMethodsTests/RegisterCompiler/RegisterCompilerFunctionTest.php
@@ -15,7 +15,7 @@
  */
 class RegisterCompilerFunctionTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
diff --git a/tests/UnitTests/SmartyMethodsTests/RegisterFunction/RegisterFunctionBCTest.php b/tests/UnitTests/SmartyMethodsTests/RegisterFunction/RegisterFunctionBCTest.php
deleted file mode 100644
index b9082c26..00000000
--- a/tests/UnitTests/SmartyMethodsTests/RegisterFunction/RegisterFunctionBCTest.php
+++ /dev/null
@@ -1,173 +0,0 @@
-<?php
-/**
- * Smarty PHPunit tests register/unregister function plugins
- *
- * @package PHPunit
- * @author  Uwe Tews
- */
-
-/**
- * class for register/unregister function plugins methods tests
- *
- * @runTestsInSeparateProcess
- * @preserveGlobalState    disabled
- * @backupStaticAttributes enabled
- *
- */
-class RegisterFunctionBCTest extends PHPUnit_Smarty
-{
-    public $loadSmartyBC = true;
-
-    public $loadSmarty = false;
-
-    public function setUp()
-    {
-        $this->setUpSmarty(dirname(__FILE__));
-    }
-
-    public function testInit()
-    {
-        $this->cleanDirs();
-    }
-
-    /**
-     * test registerPlugin method for function
-     */
-    public function testRegisterFunction()
-    {
-        $this->smartyBC->register_function('testfunction', 'myfunctionBC');
-        $this->assertEquals('myfunctionBC',
-                            $this->smartyBC->registered_plugins[ Smarty::PLUGIN_FUNCTION ][ 'testfunction' ][ 0 ]);
-        $this->assertEquals('hello world 1', $this->smartyBC->fetch('eval:{testfunction value=1}'));
-    }
-
-    /**
-     * test registerPlugin method for function  class
-     */
-    public function testRegisterFunctionClass()
-    {
-        $this->smartyBC->register_function('testfunction', array('myfunctionBCclass', 'execute'));
-        $this->assertEquals('hello world 2', $this->smartyBC->fetch('eval:{testfunction value=2}'));
-    }
-
-    /**
-     * test registerPlugin method for function object
-     */
-    public function testRegisterFunctionObject()
-    {
-        $myfunctionBC_object = new myfunctionBCclass;
-        $this->smartyBC->register_function('testfunction', array($myfunctionBC_object, 'execute'));
-        $this->assertEquals('hello world 3', $this->smartyBC->fetch('eval:{testfunction value=3}'));
-    }
-
-    /**
-     * test registerPlugin method for function cached
-     *
-     * @runInSeparateProcess
-     * @preserveGlobalState disabled
-     */
-    public function testRegisterFunctionCaching1()
-    {
-        $this->smartyBC->caching = 1;
-        $this->smartyBC->cache_lifetime = 1000;
-        $this->smartyBC->setForceCompile(true);
-        $this->smartyBC->assign('x', 0);
-        $this->smartyBC->assign('y', 10);
-        $this->smartyBC->register_function('testfunction', 'myfunctionBC');
-        $this->assertEquals('hello world 0 10', $this->smartyBC->fetch('test_register_function.tpl'));
-    }
-
-    /**
-     * test registerPlugin method for function cached
-     *
-     * @runInSeparateProcess
-     * @preserveGlobalState disabled
-     *
-     */
-    public function testRegisterFunctionCaching2()
-    {
-        $this->smartyBC->caching = 1;
-        $this->smartyBC->cache_lifetime = 1000;
-        $this->smartyBC->assign('x', 1);
-        $this->smartyBC->assign('y', 20);
-        $this->smartyBC->register_function('testfunction', 'myfunctionBC');
-        $this->assertEquals('hello world 0 10', $this->smartyBC->fetch('test_register_function.tpl'));
-    }
-
-    /**
-     * test registerPlugin method for function not cached
-     *
-     * @runInSeparateProcess
-     * @preserveGlobalState disabled
-     *
-     */
-    public function testRegisterFunctionCaching3()
-    {
-        $this->smartyBC->caching = 1;
-        $this->smartyBC->cache_lifetime = 1000;
-        $this->smartyBC->setForceCompile(true);
-        $this->smartyBC->assign('x', 2);
-        $this->smartyBC->assign('y', 30);
-        $this->smartyBC->register_function('testfunction', 'myfunctionBC', false);
-        $this->assertEquals('hello world 2 30', $this->smartyBC->fetch('test_register_function.tpl'));
-    }
-
-    /**
-     * test registerPlugin method for function not cached
-     *
-     * @runInSeparateProcess
-     * @preserveGlobalState disabled
-     *
-     */
-    public function testRegisterFunctionCaching4()
-    {
-        $this->smartyBC->caching = 1;
-        $this->smartyBC->cache_lifetime = 1000;
-        $this->smartyBC->assign('x', 3);
-        $this->smartyBC->assign('y', 40);
-        $this->smartyBC->register_function('testfunction', 'myfunctionBC', false);
-        $this->assertEquals('hello world 3 30', $this->smartyBC->fetch('test_register_function.tpl'));
-    }
-
-    /**
-     * test unregisterPlugin method for function
-     */
-    public function testUnregisterFunction()
-    {
-        $this->smartyBC->register_function('testfunction', 'myfunctionBC');
-        $this->smartyBC->unregister_function('testfunction');
-        $this->assertFalse(isset($this->smartyBC->registered_plugins[ Smarty::PLUGIN_FUNCTION ][ 'testfunction' ]));
-    }
-
-    /**
-     * test test unregisterPlugin method for function not registered
-     */
-    public function testUnregisterfunctionotRegistered()
-    {
-        $this->smartyBC->unregister_function('testfunction');
-        $this->assertFalse(isset($this->smartyBC->registered_plugins[ Smarty::PLUGIN_FUNCTION ][ 'testfunction' ]));
-    }
-
-    /**
-     * test test unregisterPlugin method for function other registered
-     */
-    public function testUnregisterFunctionOtherRegistered()
-    {
-        $this->smartyBC->register_block('testfunction', 'myfunctionBC');
-        $this->smartyBC->unregister_function('testfunction');
-        $this->assertTrue(isset($this->smartyBC->registered_plugins[ Smarty::PLUGIN_BLOCK ][ 'testfunction' ]));
-    }
-}
-
-function myfunctionBC($params, $smarty)
-{
-    return "hello world $params[value]";
-}
-
-class myfunctionBCclass
-{
-    static function execute($params, $smarty)
-    {
-        return "hello world $params[value]";
-    }
-}
diff --git a/tests/UnitTests/SmartyMethodsTests/RegisterFunction/RegisterFunctionTest.php b/tests/UnitTests/SmartyMethodsTests/RegisterFunction/RegisterFunctionTest.php
index 8cc828cc..478d1e71 100644
--- a/tests/UnitTests/SmartyMethodsTests/RegisterFunction/RegisterFunctionTest.php
+++ b/tests/UnitTests/SmartyMethodsTests/RegisterFunction/RegisterFunctionTest.php
@@ -16,7 +16,7 @@
  */
 class RegisterFunctionTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
diff --git a/tests/UnitTests/SmartyMethodsTests/RegisterModifier/RegisterModifierTest.php b/tests/UnitTests/SmartyMethodsTests/RegisterModifier/RegisterModifierTest.php
index 6b768984..4c76197c 100644
--- a/tests/UnitTests/SmartyMethodsTests/RegisterModifier/RegisterModifierTest.php
+++ b/tests/UnitTests/SmartyMethodsTests/RegisterModifier/RegisterModifierTest.php
@@ -15,7 +15,7 @@
  */
 class RegisterModifierTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
diff --git a/tests/UnitTests/SmartyMethodsTests/RegisterObject/CompileRegisteredObjectFunctionTest.php b/tests/UnitTests/SmartyMethodsTests/RegisterObject/CompileRegisteredObjectFunctionTest.php
index be57c06f..59bd3cb8 100644
--- a/tests/UnitTests/SmartyMethodsTests/RegisterObject/CompileRegisteredObjectFunctionTest.php
+++ b/tests/UnitTests/SmartyMethodsTests/RegisterObject/CompileRegisteredObjectFunctionTest.php
@@ -15,7 +15,7 @@
  */
 class CompileRegisteredObjectFunctionTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
 
diff --git a/tests/UnitTests/SmartyMethodsTests/TemplateExist/TemplateExistsTest.php b/tests/UnitTests/SmartyMethodsTests/TemplateExist/TemplateExistsTest.php
index f387d8f7..6712ddaf 100644
--- a/tests/UnitTests/SmartyMethodsTests/TemplateExist/TemplateExistsTest.php
+++ b/tests/UnitTests/SmartyMethodsTests/TemplateExist/TemplateExistsTest.php
@@ -15,7 +15,7 @@
  */
 class TemplateExistsTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
diff --git a/tests/UnitTests/TemplateSource/Comments/CommentsTest.php b/tests/UnitTests/TemplateSource/Comments/CommentsTest.php
index 281b5aec..4e01b845 100644
--- a/tests/UnitTests/TemplateSource/Comments/CommentsTest.php
+++ b/tests/UnitTests/TemplateSource/Comments/CommentsTest.php
@@ -15,7 +15,7 @@
  */
 class CommentsTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
diff --git a/tests/UnitTests/TemplateSource/Spacing/SpacingTest.php b/tests/UnitTests/TemplateSource/Spacing/SpacingTest.php
index bfcb7495..5a0bbfeb 100644
--- a/tests/UnitTests/TemplateSource/Spacing/SpacingTest.php
+++ b/tests/UnitTests/TemplateSource/Spacing/SpacingTest.php
@@ -15,7 +15,7 @@
  */
 class SpacingTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
diff --git a/tests/UnitTests/TemplateSource/StaticClass/StaticClassAccessTest.php b/tests/UnitTests/TemplateSource/StaticClass/StaticClassAccessTest.php
index 42d9f0ce..aaaa1819 100644
--- a/tests/UnitTests/TemplateSource/StaticClass/StaticClassAccessTest.php
+++ b/tests/UnitTests/TemplateSource/StaticClass/StaticClassAccessTest.php
@@ -15,7 +15,7 @@
  */
 class StaticClassAccessTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
         $this->smarty->disableSecurity();
diff --git a/tests/UnitTests/TemplateSource/TagTests/Append/CompileAppendTest.php b/tests/UnitTests/TemplateSource/TagTests/Append/CompileAppendTest.php
index 1c671f15..76b11052 100644
--- a/tests/UnitTests/TemplateSource/TagTests/Append/CompileAppendTest.php
+++ b/tests/UnitTests/TemplateSource/TagTests/Append/CompileAppendTest.php
@@ -15,7 +15,7 @@
  */
 class CompileAppendTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
         $this->smarty->addPluginsDir("../../../__shared/PHPunitplugins/");
diff --git a/tests/UnitTests/TemplateSource/TagTests/Assign/CompileAssignTest.php b/tests/UnitTests/TemplateSource/TagTests/Assign/CompileAssignTest.php
index b4301d59..fefdd72d 100644
--- a/tests/UnitTests/TemplateSource/TagTests/Assign/CompileAssignTest.php
+++ b/tests/UnitTests/TemplateSource/TagTests/Assign/CompileAssignTest.php
@@ -15,7 +15,7 @@
  */
 class CompileAssignTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
         $this->smarty->addPluginsDir("../../../__shared/PHPunitplugins/");
diff --git a/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/CompileBlockPluginTest.php b/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/CompileBlockPluginTest.php
index c6a2eee4..4a0480ec 100644
--- a/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/CompileBlockPluginTest.php
+++ b/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/CompileBlockPluginTest.php
@@ -15,7 +15,7 @@
  */
 class CompileBlockPluginTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
         $this->smarty->addPluginsDir("./PHPunitplugins/");
@@ -47,13 +47,11 @@ class CompileBlockPluginTest extends PHPUnit_Smarty
 
     /**
      * test unknown block plugin tag
-     *
-     * @expectedException        SmartyCompilerException
-     * @expectedExceptionMessage unknown tag 'bar'
-     *
      */
     public function testBlockPluginUnknown()
     {
+        $this->expectException('SmartyCompilerException');
+        $this->expectExceptionMessage('unknown tag \'bar\'');
         $this->assertEquals("hello world", $this->smarty->fetch('unknown.tpl'));
     }
 
@@ -75,12 +73,11 @@ class CompileBlockPluginTest extends PHPUnit_Smarty
      *
      * @runInSeparateProcess
      * @preserveGlobalState      disabled
-     * @expectedException        SmartyException
-     * @expectedExceptionMessage block tag 'blockplugintest' not callable
-     *
      */
     public function testBlockPluginRegisteredFunction2()
     {
+        $this->expectException('SmartyException');
+        $this->expectExceptionMessage('block tag \'blockplugintest\' not callable');
         $this->assertEquals('block test', $this->smarty->fetch('registered.tpl'));
     }
 
@@ -102,12 +99,12 @@ class CompileBlockPluginTest extends PHPUnit_Smarty
      *
      * @runInSeparateProcess
      * @preserveGlobalState      disabled
-     * @expectedException        SmartyException
-     * @expectedExceptionMessage block tag 'blockpluginstatic' not callable
      *
      */
     public function testBlockPluginRegisteredStatic2()
     {
+        $this->expectException('SmartyException');
+        $this->expectExceptionMessage('block tag \'blockpluginstatic\' not callable');
         $this->assertEquals('static block test', $this->smarty->fetch('registered_static.tpl'));
     }
 
@@ -130,12 +127,11 @@ class CompileBlockPluginTest extends PHPUnit_Smarty
      *
      * @runInSeparateProcess
      * @preserveGlobalState      disabled
-     * @expectedException        SmartyException
-     * @expectedExceptionMessage block tag 'blockpluginmethod' not callable
-     *
      */
     public function testBlockPluginRegisteredMethod2()
     {
+        $this->expectException('SmartyException');
+        $this->expectExceptionMessage('block tag \'blockpluginmethod\' not callable');
         $this->assertEquals('method block test', $this->smarty->fetch('registered_method.tpl'));
     }
 
@@ -158,12 +154,11 @@ class CompileBlockPluginTest extends PHPUnit_Smarty
      *
      * @runInSeparateProcess
      * @preserveGlobalState      disabled
-     * @expectedException        SmartyException
-     * @expectedExceptionMessage block tag 'myobject' not callable
-     *
      */
     public function testBlockPluginRegisteredObject2()
     {
+        $this->expectException('SmartyException');
+        $this->expectExceptionMessage('block tag \'myobject\' not callable');
         $this->assertEquals('object block test', $this->smarty->fetch('registered_object.tpl'));
     }
 
@@ -297,10 +292,10 @@ class CompileBlockPluginTest extends PHPUnit_Smarty
             $this->assertEquals($isCached, $tpl->isCached(), $testName . ' - isCached()');
         }
         $result = $this->smarty->fetch($tpl);
-        $this->assertContains("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}",
+        $this->assertStringContainsString("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}",
                               $result,
                               $testName . ' - fetch() failure test number');
-        $this->assertContains("block test{$resultNumber}", $result, $testName . ' - fetch() failure result');
+        $this->assertStringContainsString("block test{$resultNumber}", $result, $testName . ' - fetch() failure result');
     }
 
     public function data()
diff --git a/tests/UnitTests/TemplateSource/TagTests/BockExtend/CompileBlockExtendsTest.php b/tests/UnitTests/TemplateSource/TagTests/BockExtend/CompileBlockExtendsTest.php
index 0fb1cbe0..84eaf92a 100644
--- a/tests/UnitTests/TemplateSource/TagTests/BockExtend/CompileBlockExtendsTest.php
+++ b/tests/UnitTests/TemplateSource/TagTests/BockExtend/CompileBlockExtendsTest.php
@@ -15,7 +15,7 @@
  */
 class CompileBlockExtendsTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
         //$this->smarty->setMergeCompiledIncludes(true);
@@ -54,7 +54,7 @@ class CompileBlockExtendsTest extends PHPUnit_Smarty
     {
         $this->smarty->assign('parent', 'parent');
         $result = $this->smarty->fetch('001_parent.tpl');
-        $this->assertContains('(parent|b)content parent b(parent|/b)', $result);
+        $this->assertStringContainsString('(parent|b)content parent b(parent|/b)', $result);
     }
 
     /**
@@ -77,8 +77,8 @@ class CompileBlockExtendsTest extends PHPUnit_Smarty
             $this->smarty->setCompileId(1);
         }
         $result = $this->smarty->fetch('002_child.tpl');
-        $this->assertContains('(child|b)content child b(child|/b)', $result, $testName . ' - content');
-        $this->assertContains("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result,
+        $this->assertStringContainsString('(child|b)content child b(child|/b)', $result, $testName . ' - content');
+        $this->assertStringContainsString("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result,
                               $testName . ' - fetch() failure');
     }
 
@@ -102,9 +102,9 @@ class CompileBlockExtendsTest extends PHPUnit_Smarty
             $this->smarty->setCompileId(1);
         }
         $result = $this->smarty->fetch('003_child.tpl');
-        $this->assertContains('(child|b)content child b(child|/b)(parent|b)content parent b(parent|/b)', $result,
+        $this->assertStringContainsString('(child|b)content child b(child|/b)(parent|b)content parent b(parent|/b)', $result,
                               $testName . ' - content');
-        $this->assertContains("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result,
+        $this->assertStringContainsString("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result,
                               $testName . ' - fetch() failure');
     }
 
@@ -129,9 +129,9 @@ class CompileBlockExtendsTest extends PHPUnit_Smarty
             $this->smarty->setCompileId(1);
         }
         $result = $this->smarty->fetch('003_grand.tpl');
-        $this->assertContains('(grand|b)content grand b(grand|/b)(child|b)content child b(child|/b)(parent|b)content parent b(parent|/b)',
+        $this->assertStringContainsString('(grand|b)content grand b(grand|/b)(child|b)content child b(child|/b)(parent|b)content parent b(parent|/b)',
                               $result, $testName . ' - content');
-        $this->assertContains("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result,
+        $this->assertStringContainsString("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result,
                               $testName . ' - fetch() failure');
     }
 
@@ -156,9 +156,9 @@ class CompileBlockExtendsTest extends PHPUnit_Smarty
             $this->smarty->setCompileId(1);
         }
         $result = $this->smarty->fetch('004_child.tpl');
-        $this->assertContains('(parent|b)content parent b(parent|/b)(child|b)content child b(child|/b)', $result,
+        $this->assertStringContainsString('(parent|b)content parent b(parent|/b)(child|b)content child b(child|/b)', $result,
                               $testName . ' - content');
-        $this->assertContains("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result,
+        $this->assertStringContainsString("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result,
                               $testName . ' - fetch() failure');
     }
 
@@ -183,9 +183,9 @@ class CompileBlockExtendsTest extends PHPUnit_Smarty
             $this->smarty->setCompileId(1);
         }
         $result = $this->smarty->fetch('004_grand.tpl');
-        $this->assertContains('(parent|b)content parent b(parent|/b)(child|b)content child b(child|/b)(grand|b)content grand b(grand|/b)',
+        $this->assertStringContainsString('(parent|b)content parent b(parent|/b)(child|b)content child b(child|/b)(grand|b)content grand b(grand|/b)',
                               $result, $testName . ' - content');
-        $this->assertContains("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result,
+        $this->assertStringContainsString("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result,
                               $testName . ' - fetch() failure');
     }
 
@@ -210,9 +210,9 @@ class CompileBlockExtendsTest extends PHPUnit_Smarty
             $this->smarty->setCompileId(1);
         }
         $result = $this->smarty->fetch('004_grand2.tpl');
-        $this->assertContains('(parent|b)content parent b(parent|/b)(grand|b)content grand b(grand|/b)(child|b)content child b(child|/b)(grand|b)content grand b(grand|/b)',
+        $this->assertStringContainsString('(parent|b)content parent b(parent|/b)(grand|b)content grand b(grand|/b)(child|b)content child b(child|/b)(grand|b)content grand b(grand|/b)',
                               $result, $testName . ' - content');
-        $this->assertContains("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result,
+        $this->assertStringContainsString("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result,
                               $testName . ' - fetch() failure');
     }
 
@@ -236,9 +236,9 @@ class CompileBlockExtendsTest extends PHPUnit_Smarty
             $this->smarty->setCompileId(1);
         }
         $result = $this->smarty->fetch('005_child.tpl');
-        $this->assertContains('(parent|b)content parent b(parent|/b)(child|b)content child b(child|/b)', $result,
+        $this->assertStringContainsString('(parent|b)content parent b(parent|/b)(child|b)content child b(child|/b)', $result,
                               $testName . ' - content');
-        $this->assertContains("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result,
+        $this->assertStringContainsString("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result,
                               $testName . ' - fetch() failure');
     }
 
@@ -262,9 +262,9 @@ class CompileBlockExtendsTest extends PHPUnit_Smarty
             $this->smarty->setCompileId(1);
         }
         $result = $this->smarty->fetch('006_child.tpl');
-        $this->assertContains('(parent|b)content (child|b)content child b(child|/b) b(parent|/b)', $result,
+        $this->assertStringContainsString('(parent|b)content (child|b)content child b(child|/b) b(parent|/b)', $result,
                               $testName . ' - content');
-        $this->assertContains("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result,
+        $this->assertStringContainsString("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result,
                               $testName . ' - fetch() failure');
     }
 
@@ -289,9 +289,9 @@ class CompileBlockExtendsTest extends PHPUnit_Smarty
             $this->smarty->setCompileId(1);
         }
         $result = $this->smarty->fetch('007_child.tpl');
-        $this->assertContains('(child|b)content (parent|b)content parent b(parent|/b) b(child|/b)', $result,
+        $this->assertStringContainsString('(child|b)content (parent|b)content parent b(parent|/b) b(child|/b)', $result,
                               $testName . ' - content');
-        $this->assertContains("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result,
+        $this->assertStringContainsString("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result,
                               $testName . ' - fetch() failure');
     }
 
@@ -316,9 +316,9 @@ class CompileBlockExtendsTest extends PHPUnit_Smarty
             $this->smarty->setCompileId(1);
         }
         $result = $this->smarty->fetch('007_grand.tpl');
-        $this->assertContains('(grand|b)content (child|b)content (parent|b)content parent b(parent|/b) b(child|/b) b(grand|/b)',
+        $this->assertStringContainsString('(grand|b)content (child|b)content (parent|b)content parent b(parent|/b) b(child|/b) b(grand|/b)',
                               $result, $testName . ' - content');
-        $this->assertContains("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result,
+        $this->assertStringContainsString("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result,
                               $testName . ' - fetch() failure');
     }
 
@@ -343,9 +343,9 @@ class CompileBlockExtendsTest extends PHPUnit_Smarty
             $this->smarty->setCompileId(1);
         }
         $result = $this->smarty->fetch('008_child.tpl');
-        $this->assertContains('(child|b)content escaped &lt;text&gt; child 1 b(child|/b', $result,
+        $this->assertStringContainsString('(child|b)content escaped &lt;text&gt; child 1 b(child|/b', $result,
                               $testName . ' - content');
-        $this->assertContains("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result,
+        $this->assertStringContainsString("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result,
                               $testName . ' - fetch() failure');
     }
 
@@ -368,9 +368,9 @@ class CompileBlockExtendsTest extends PHPUnit_Smarty
             $this->smarty->setCompileId(1);
         }
         $result = $this->smarty->fetch('009_parent.tpl');
-        $this->assertContains('(parent|b)content (parent|c)content parent c(parent|/c) b(parent|/b)', $result,
+        $this->assertStringContainsString('(parent|b)content (parent|c)content parent c(parent|/c) b(parent|/b)', $result,
                               $testName . ' - content');
-        $this->assertContains("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result,
+        $this->assertStringContainsString("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result,
                               $testName . ' - fetch() failure');
     }
 
@@ -394,9 +394,9 @@ class CompileBlockExtendsTest extends PHPUnit_Smarty
             $this->smarty->setCompileId(1);
         }
         $result = $this->smarty->fetch('010_child.tpl');
-        $this->assertContains('(parent|b)content (parent|c)content child c(parent|/c) b(parent|/b)', $result,
+        $this->assertStringContainsString('(parent|b)content (parent|c)content child c(parent|/c) b(parent|/b)', $result,
                               $testName . ' - content');
-        $this->assertContains("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result,
+        $this->assertStringContainsString("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result,
                               $testName . ' - fetch() failure');
     }
 
@@ -421,9 +421,9 @@ class CompileBlockExtendsTest extends PHPUnit_Smarty
             $this->smarty->setCompileId(1);
         }
         $result = $this->smarty->fetch('011_grand.tpl');
-        $this->assertContains('(child|b)content(child|c)content(child|n)content(include)content child i(/include)n(child|/n)c(child|/c)(grand|c)content grand c(grand|\c)b(child|/b)',
+        $this->assertStringContainsString('(child|b)content(child|c)content(child|n)content(include)content child i(/include)n(child|/n)c(child|/c)(grand|c)content grand c(grand|\c)b(child|/b)',
                               $result, $testName . ' - content');
-        $this->assertContains("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result,
+        $this->assertStringContainsString("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result,
                               $testName . ' - fetch() failure');
     }
 
@@ -448,9 +448,9 @@ class CompileBlockExtendsTest extends PHPUnit_Smarty
             $this->smarty->setCompileId(1);
         }
         $result = $this->smarty->fetch('012_grandgrand.tpl');
-        $this->assertContains('(grand|b)content (grandgrand|c)content c(grandgrand|\c)(grand|c)content c(grand|\c) b(grand|/b)',
+        $this->assertStringContainsString('(grand|b)content (grandgrand|c)content c(grandgrand|\c)(grand|c)content c(grand|\c) b(grand|/b)',
                               $result, $testName . ' - content');
-        $this->assertContains("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result,
+        $this->assertStringContainsString("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result,
                               $testName . ' - fetch() failure');
     }
 
@@ -472,9 +472,9 @@ class CompileBlockExtendsTest extends PHPUnit_Smarty
             $this->smarty->setCompileId(1);
         }
         $result = $this->smarty->fetch('018_child.tpl');
-        $this->assertContains('(child|b)content(child|c)content child c(child|/c)b(child|/b)', $result,
+        $this->assertStringContainsString('(child|b)content(child|c)content child c(child|/c)b(child|/b)', $result,
                               $testName . ' - content');
-        $this->assertContains("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result,
+        $this->assertStringContainsString("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result,
                               $testName . ' - fetch() failure');
     }
 
@@ -496,9 +496,9 @@ class CompileBlockExtendsTest extends PHPUnit_Smarty
             $this->smarty->setCompileId(1);
         }
         $result = $this->smarty->fetch('018_grand.tpl');
-        $this->assertContains('(child|b)content(child|c)content child c(child|/c)(child|d)content (grand|d)content grand d(grand|/d) d(child|/d)b(child|/b)',
+        $this->assertStringContainsString('(child|b)content(child|c)content child c(child|/c)(child|d)content (grand|d)content grand d(grand|/d) d(child|/d)b(child|/b)',
                               $result, $testName . ' - content');
-        $this->assertContains("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result,
+        $this->assertStringContainsString("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result,
                               $testName . ' - fetch() failure');
     }
 
@@ -520,9 +520,9 @@ class CompileBlockExtendsTest extends PHPUnit_Smarty
             $this->smarty->setCompileId(1);
         }
         $result = $this->smarty->fetch('018_grandgrand.tpl');
-        $this->assertContains('(child|b)content(grand|c)content (grandgrand|c)content grandgrand c(grandgrand|/c) c(grand|/c)(child|d)content (grandgrand|d)content grandgrand d(grandgrand|/d) d(child|/d)b(child|/b)',
+        $this->assertStringContainsString('(child|b)content(grand|c)content (grandgrand|c)content grandgrand c(grandgrand|/c) c(grand|/c)(child|d)content (grandgrand|d)content grandgrand d(grandgrand|/d) d(child|/d)b(child|/b)',
                               $result, $testName . ' - content');
-        $this->assertContains("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result,
+        $this->assertStringContainsString("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result,
                               $testName . ' - fetch() failure');
     }
 
@@ -544,13 +544,13 @@ class CompileBlockExtendsTest extends PHPUnit_Smarty
             $this->smarty->setCompileId(1);
         }
         $result = $this->smarty->fetch('020_include_root.tpl');
-        $this->assertContains('(include1)(include1|p)content 1 p(include1|\p)(include1|b)content 1 b(include1|\b)(\include1)',
+        $this->assertStringContainsString('(include1)(include1|p)content 1 p(include1|\p)(include1|b)content 1 b(include1|\b)(\include1)',
                               $result, $testName . ' - include 1');
-        $this->assertContains('(include2)(include2|p)content 2 p(include2|\p)(include2|b)content 2 b(include2|\b)(\include2)',
+        $this->assertStringContainsString('(include2)(include2|p)content 2 p(include2|\p)(include2|b)content 2 b(include2|\b)(\include2)',
                               $result, $testName . ' - include 1');
-        $this->assertContains('(include3)(include3|p)content 3 p(include3|\p)(include3|b)content 3 b(include3|\b)(\include3)',
+        $this->assertStringContainsString('(include3)(include3|p)content 3 p(include3|\p)(include3|b)content 3 b(include3|\b)(\include3)',
                               $result, $testName . ' - include 1');
-        $this->assertContains("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result,
+        $this->assertStringContainsString("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result,
                               $testName . ' - fetch() failure');
     }
 
@@ -571,7 +571,7 @@ class CompileBlockExtendsTest extends PHPUnit_Smarty
         $tpl = $this->smarty->createTemplate('021_grand.tpl', $this->smarty);
         $this->assertFalse($tpl->isCached());
         $result = $this->smarty->fetch($tpl);
-        $this->assertContains('(grand|b)content grand b(grand|/b)(child|b)content child b(child|/b)(parent|b)content parent b(parent|/b)',
+        $this->assertStringContainsString('(grand|b)content grand b(grand|/b)(child|b)content child b(child|/b)(parent|b)content parent b(parent|/b)',
                               $result);
         $this->smarty->_clearTemplateCache();
         $this->smarty->assign('parent', 'parent2');
@@ -580,7 +580,7 @@ class CompileBlockExtendsTest extends PHPUnit_Smarty
         $tpl2 = $this->smarty->createTemplate('021_grand.tpl', $this->smarty);
         $this->assertTrue($tpl2->isCached());
         $result = $this->smarty->fetch($tpl2);
-        $this->assertContains('(grand|b)content grand2 b(grand|/b)(child|b)content child2 b(child|/b)(parent|b)content parent b(parent|/b)',
+        $this->assertStringContainsString('(grand|b)content grand2 b(grand|/b)(child|b)content child2 b(child|/b)(parent|b)content parent b(parent|/b)',
                               $result);
     }
 
@@ -601,7 +601,7 @@ class CompileBlockExtendsTest extends PHPUnit_Smarty
         $tpl2 = $this->smarty->createTemplate('021_grand.tpl', $this->smarty);
         $this->assertTrue($tpl2->isCached());
         $result = $this->smarty->fetch($tpl2);
-        $this->assertContains('(grand|b)content grand3 b(grand|/b)(child|b)content child3 b(child|/b)(parent|b)content parent b(parent|/b)',
+        $this->assertStringContainsString('(grand|b)content grand3 b(grand|/b)(child|b)content child3 b(child|/b)(parent|b)content parent b(parent|/b)',
                               $result);
     }
 
@@ -626,7 +626,7 @@ class CompileBlockExtendsTest extends PHPUnit_Smarty
         $tpl = $this->smarty->createTemplate('021_grand.tpl', $this->smarty);
         $this->assertFalse($tpl->isCached());
         $result = $this->smarty->fetch($tpl);
-        $this->assertContains('(grand|b)content grand4 b(grand|/b)(child|b)content child4 b(child|/b)(parent|b)content parent4 b(parent|/b)',
+        $this->assertStringContainsString('(grand|b)content grand4 b(grand|/b)(child|b)content child4 b(child|/b)(parent|b)content parent4 b(parent|/b)',
                               $result);
         $this->smarty->_clearTemplateCache();
         $this->smarty->assign('parent', 'parent5');
@@ -636,7 +636,7 @@ class CompileBlockExtendsTest extends PHPUnit_Smarty
         $tpl2 = $this->smarty->createTemplate('021_grand.tpl', $this->smarty);
         $this->assertTrue($tpl2->isCached());
         $result = $this->smarty->fetch($tpl2);
-        $this->assertContains('(grand|b)content grand5 b(grand|/b)(child|b)content child5 b(child|/b)(parent|b)content parent4 b(parent|/b)',
+        $this->assertStringContainsString('(grand|b)content grand5 b(grand|/b)(child|b)content child5 b(child|/b)(parent|b)content parent4 b(parent|/b)',
                               $result);
     }
 
@@ -661,7 +661,7 @@ class CompileBlockExtendsTest extends PHPUnit_Smarty
         $tpl = $this->smarty->createTemplate('021_grand.tpl', $this->smarty);
         $this->assertFalse($tpl->isCached());
         $result = $this->smarty->fetch($tpl);
-        $this->assertContains('(grand|b)content grand6 b(grand|/b)(child|b)content child6 b(child|/b)(parent|b)content parent6 b(parent|/b)',
+        $this->assertStringContainsString('(grand|b)content grand6 b(grand|/b)(child|b)content child6 b(child|/b)(parent|b)content parent6 b(parent|/b)',
                               $result);
     }
 
@@ -683,7 +683,7 @@ class CompileBlockExtendsTest extends PHPUnit_Smarty
         $tpl2 = $this->smarty->createTemplate('021_grand.tpl', $this->smarty);
         $this->assertTrue($tpl2->isCached());
         $result = $this->smarty->fetch($tpl2);
-        $this->assertContains('(grand|b)content grand7 b(grand|/b)(child|b)content child7 b(child|/b)(parent|b)content parent6 b(parent|/b)',
+        $this->assertStringContainsString('(grand|b)content grand7 b(grand|/b)(child|b)content child7 b(child|/b)(parent|b)content parent6 b(parent|/b)',
                               $result);
     }
 
@@ -708,7 +708,7 @@ class CompileBlockExtendsTest extends PHPUnit_Smarty
         $tpl = $this->smarty->createTemplate('021_grand.tpl', $this->smarty);
         $this->assertFalse($tpl->isCached());
         $result = $this->smarty->fetch($tpl);
-        $this->assertContains('(grand|b)content grand8 b(grand|/b)(child|b)content child8 b(child|/b)(parent|b)content parent8 b(parent|/b)',
+        $this->assertStringContainsString('(grand|b)content grand8 b(grand|/b)(child|b)content child8 b(child|/b)(parent|b)content parent8 b(parent|/b)',
                               $result);
     }
 
@@ -730,7 +730,7 @@ class CompileBlockExtendsTest extends PHPUnit_Smarty
         $tpl2 = $this->smarty->createTemplate('021_grand.tpl', $this->smarty);
         $this->assertTrue($tpl2->isCached());
         $result = $this->smarty->fetch($tpl2);
-        $this->assertContains('(grand|b)content grand9 b(grand|/b)(child|b)content child9 b(child|/b)(parent|b)content parent8 b(parent|/b)',
+        $this->assertStringContainsString('(grand|b)content grand9 b(grand|/b)(child|b)content child9 b(child|/b)(parent|b)content parent8 b(parent|/b)',
                               $result);
     }
 
@@ -749,37 +749,37 @@ class CompileBlockExtendsTest extends PHPUnit_Smarty
     public function testNotExistingChildBlock_024()
     {
         $result = $this->smarty->fetch('024_parent.tpl');
-        $this->assertContains('no >< child', $result);
+        $this->assertStringContainsString('no >< child', $result);
     }
 
     /**
-     * @expectedException        SmartyCompilerException
-     * @expectedExceptionMessage '{$smarty.block.child}' used outside {block} tags
      * test {$this->smarty.block.child} outside {block]
      */
     public function testSmartyBlockChildOutsideBlock_025()
     {
+        $this->expectException('SmartyCompilerException');
+        $this->expectExceptionMessage('\'{$smarty.block.child}\' used outside {block} tags');
         $this->smarty->fetch('025_parent.tpl');
     }
 
     /**
-     * @expectedException        SmartyCompilerException
-     * @expectedExceptionMessage '{$smarty.block.parent}' used outside {block} tags
      * test {$this->smarty.block.parent} outside {block]
      */
     public function testSmartyBlockParentOutsideBlock_026()
     {
+        $this->expectException('SmartyCompilerException');
+        $this->expectExceptionMessage('\'{$smarty.block.parent}\' used outside {block} tags');
         $this->smarty->fetch('026_child.tpl');
     }
 
     /**
-     * @expectedException        SmartyException
-     * @expectedExceptionMessage illegal '{$smarty.block.parent}'
      * test {$this->smarty.block.parent} in parent template
      */
     public function testSmartyBlockParentInParent_027()
     {
-        $result = $this->smarty->fetch('027_parent.tpl');
+        $this->expectException('SmartyException');
+        $this->expectExceptionMessage('illegal \'{$smarty.block.parent}\'');
+        $this->smarty->fetch('027_parent.tpl');
     }
 
     /**
@@ -802,8 +802,8 @@ class CompileBlockExtendsTest extends PHPUnit_Smarty
         }
         $this->smarty->assign('foo', '028_parent_include1.tpl');
         $result = $this->smarty->fetch('028_child.tpl');
-        $this->assertContains('b1-include-1--b1', $result, $testName . ' - content');
-        $this->assertContains("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result,
+        $this->assertStringContainsString('b1-include-1--b1', $result, $testName . ' - content');
+        $this->assertStringContainsString("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result,
                               $testName . ' - fetch() failure');
     }
 
@@ -824,8 +824,8 @@ class CompileBlockExtendsTest extends PHPUnit_Smarty
         }
         $this->smarty->assign('foo', '028_parent_include2.tpl');
         $result = $this->smarty->fetch('028_child.tpl');
-        $this->assertContains('b1-child-i2-include-2--b1', $result, $testName . ' - content');
-        $this->assertContains("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result,
+        $this->assertStringContainsString('b1-child-i2-include-2--b1', $result, $testName . ' - content');
+        $this->assertStringContainsString("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result,
                               $testName . ' - fetch() failure');
     }
 
@@ -847,9 +847,9 @@ class CompileBlockExtendsTest extends PHPUnit_Smarty
             $this->smarty->setCompileId(1);
         }
         $result = $this->smarty->fetch('030_grandchild_nested.tpl');
-        $this->assertContains('child pre -grandchild content- child post', $result, $testName . ' - content');
-        $this->assertContains('include:' . $testNumber, $result, $testName . ' - content 2');
-        $this->assertContains("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result,
+        $this->assertStringContainsString('child pre -grandchild content- child post', $result, $testName . ' - content');
+        $this->assertStringContainsString('include:' . $testNumber, $result, $testName . ' - content 2');
+        $this->assertStringContainsString("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result,
                               $testName . ' - fetch() failure');
     }
     /**
@@ -870,9 +870,9 @@ class CompileBlockExtendsTest extends PHPUnit_Smarty
             $this->smarty->setCompileId(1);
         }
         $result = $this->smarty->fetch('sub/030_grandchild_nested_rel.tpl');
-        $this->assertContains('child pre -grandchild content- child post', $result, $testName . ' - content');
-        $this->assertContains('include:' . $testNumber, $result, $testName . ' - content 2');
-        $this->assertContains("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result,
+        $this->assertStringContainsString('child pre -grandchild content- child post', $result, $testName . ' - content');
+        $this->assertStringContainsString('include:' . $testNumber, $result, $testName . ' - content 2');
+        $this->assertStringContainsString("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result,
                               $testName . ' - fetch() failure');
     }
      /**
@@ -893,8 +893,8 @@ class CompileBlockExtendsTest extends PHPUnit_Smarty
             $this->smarty->setCompileId(1);
         }
         $result = $this->smarty->fetch('034_1child.tpl');
-        $this->assertContains('parent b1', $result, $testName . ' - content');
-        $this->assertContains("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result,
+        $this->assertStringContainsString('parent b1', $result, $testName . ' - content');
+        $this->assertStringContainsString("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result,
                               $testName . ' - fetch() failure');
     }
     /**
@@ -915,8 +915,8 @@ class CompileBlockExtendsTest extends PHPUnit_Smarty
             $this->smarty->setCompileId(1);
         }
         $result = $this->smarty->fetch('034_2child.tpl');
-        $this->assertContains('parent b1', $result, $testName . ' - content');
-        $this->assertContains("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result,
+        $this->assertStringContainsString('parent b1', $result, $testName . ' - content');
+        $this->assertStringContainsString("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result,
                               $testName . ' - fetch() failure');
     }
     /**
@@ -937,8 +937,8 @@ class CompileBlockExtendsTest extends PHPUnit_Smarty
             $this->smarty->setCompileId(1);
         }
         $result = $this->smarty->fetch('034_3child.tpl');
-        $this->assertContains('parent b1', $result, $testName . ' - content');
-        $this->assertContains("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result,
+        $this->assertStringContainsString('parent b1', $result, $testName . ' - content');
+        $this->assertStringContainsString("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result,
                               $testName . ' - fetch() failure');
     }
     /**
@@ -959,8 +959,8 @@ class CompileBlockExtendsTest extends PHPUnit_Smarty
             $this->smarty->setCompileId(1);
         }
         $result = $this->smarty->fetch('034_4child.tpl');
-        $this->assertContains('parent b1', $result, $testName . ' - content');
-        $this->assertContains("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result,
+        $this->assertStringContainsString('parent b1', $result, $testName . ' - content');
+        $this->assertStringContainsString("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result,
                               $testName . ' - fetch() failure');
     }
     /**
@@ -984,9 +984,9 @@ class CompileBlockExtendsTest extends PHPUnit_Smarty
             $this->smarty->setCompileId(1);
         }
         $result = $this->smarty->fetch('035_child.tpl');
-        $this->assertContains('(parent|b)content (child|b)content child b(child|/b) b(parent|/b)', $result,
+        $this->assertStringContainsString('(parent|b)content (child|b)content child b(child|/b) b(parent|/b)', $result,
                               $testName . ' - content');
-        $this->assertContains("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result,
+        $this->assertStringContainsString("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result,
                               $testName . ' - fetch() failure');
     }
 
@@ -1011,9 +1011,9 @@ class CompileBlockExtendsTest extends PHPUnit_Smarty
             $this->smarty->setCompileId(1);
         }
         $result = $this->smarty->fetch('035_child.tpl');
-        $this->assertContains('(parent|b)content (child|b)content child b(child|/b) b(parent|/b)', $result,
+        $this->assertStringContainsString('(parent|b)content (child|b)content child b(child|/b) b(parent|/b)', $result,
                               $testName . ' - content');
-        $this->assertContains("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result,
+        $this->assertStringContainsString("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result,
                               $testName . ' - fetch() failure');
     }
     /**
@@ -1037,9 +1037,9 @@ class CompileBlockExtendsTest extends PHPUnit_Smarty
             $this->smarty->setCompileId(1);
         }
         $result = $this->smarty->fetch('035_child.tpl');
-        $this->assertContains('(parent|b)content (child|b)content child b(child|/b) b(parent|/b)', $result,
+        $this->assertStringContainsString('(parent|b)content (child|b)content child b(child|/b) b(parent|/b)', $result,
                               $testName . ' - content');
-        $this->assertContains("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result,
+        $this->assertStringContainsString("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result,
                               $testName . ' - fetch() failure');
     }
     /**
@@ -1063,9 +1063,9 @@ class CompileBlockExtendsTest extends PHPUnit_Smarty
             $this->smarty->setCompileId(1);
         }
         $result = $this->smarty->fetch('035_child.tpl');
-        $this->assertContains('(parent|b)content (child|b)content child b(child|/b) b(parent|/b)', $result,
+        $this->assertStringContainsString('(parent|b)content (child|b)content child b(child|/b) b(parent|/b)', $result,
                               $testName . ' - content');
-        $this->assertContains("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result,
+        $this->assertStringContainsString("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result,
                               $testName . ' - fetch() failure');
     }
 
@@ -1104,7 +1104,7 @@ class CompileBlockExtendsTest extends PHPUnit_Smarty
         $this->smarty->loadFilter('post', 'test031');
         $this->smarty->assign('foo', 'foo');
         $this->smarty->assign('bar', 'bar');
-        $this->assertContains('bar', $this->smarty->fetch('031_post_filter.tpl'));
+        $this->assertStringContainsString('bar', $this->smarty->fetch('031_post_filter.tpl'));
     }
     /*
       * Test new inheritance root in outermost include
@@ -1112,11 +1112,11 @@ class CompileBlockExtendsTest extends PHPUnit_Smarty
     public function testInclude_032()
     {
         $result = $this->smarty->fetch('032_child.tpl');
-        $this->assertContains('foo in 032_child.tpl', $result);
-        $this->assertContains('bar in 032_included_child.tpl', $result);
-        $this->assertContains('foo in 032_included_parent.tpl', $result);
-        $this->assertNotContains('bar in 032_included_parent.tpl', $result);
-        $this->assertNotContains('foo in 032_parent.tpl', $result);
+        $this->assertStringContainsString('foo in 032_child.tpl', $result);
+        $this->assertStringContainsString('bar in 032_included_child.tpl', $result);
+        $this->assertStringContainsString('foo in 032_included_parent.tpl', $result);
+        $this->assertStringNotContainsString('bar in 032_included_parent.tpl', $result);
+        $this->assertStringNotContainsString('foo in 032_parent.tpl', $result);
     }
     /**
      * test  relative includes in {block}
@@ -1136,66 +1136,56 @@ class CompileBlockExtendsTest extends PHPUnit_Smarty
             $this->smarty->setCompileId(1);
         }
         $result = $this->smarty->fetch('033_grandchild.tpl');
-        $this->assertContains('include grand:content include grand', $result, $testName . ' - grand');
-        $this->assertContains('include child:content include child', $result, $testName . ' - grand');
-        $this->assertContains('include parent:content include parent', $result, $testName . ' - grand');
-        $this->assertContains("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result,
+        $this->assertStringContainsString('include grand:content include grand', $result, $testName . ' - grand');
+        $this->assertStringContainsString('include child:content include child', $result, $testName . ' - grand');
+        $this->assertStringContainsString('include parent:content include parent', $result, $testName . ' - grand');
+        $this->assertStringContainsString("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result,
                               $testName . ' - fetch() failure');
     }
     /**
-     *
      * test smarty.block.foo
-     *
-     * @expectedException        SmartyCompilerException
-     * @expectedExceptionMessage $smarty.block is not defined
      */
     public function testSmartyBlockWrongBlockName_036()
     {
+        $this->expectException('SmartyCompilerException');
+        $this->expectExceptionMessage('$smarty.block is not defined');
         $this->smarty->fetch('036_parent.tpl');
     }
     /**
-     *
      * test '{$smarty.block.parent}'
-     *
-     * @expectedException        SmartyException
-     * @expectedExceptionMessage inheritance: illegal '{$smarty.block.parent}' used in child template
      */
     public function testSmartyParentBlockCalledInParent_036_1()
     {
+        $this->expectException('SmartyException');
+        $this->expectExceptionMessage('inheritance: illegal \'{$smarty.block.parent}\' used in child template');
         $this->smarty->fetch('036_1_parent.tpl');
     }
     /**
-     *
      * test {block_parent}
-     *
-     * @expectedException        SmartyException
-     * @expectedExceptionMessage inheritance: illegal '{block_parent}' used in child template
      */
     public function testSmartyParentBlockCalledInParent_036_2()
     {
+        $this->expectException('SmartyException');
+        $this->expectExceptionMessage('inheritance: illegal \'{block_parent}\' used in child template');
         $this->smarty->fetch('036_2_parent.tpl');
     }
     /**
-     *
      * test {block_parent}
-     *
-     * @expectedException        SmartyException
-     * @expectedExceptionMessage inheritance: illegal '{parent}' used in child template
      */
     public function testSmartyParentBlockCalledInParent_036_3()
     {
+        $this->expectException('SmartyException');
+        $this->expectExceptionMessage('inheritance: illegal \'{parent}\' used in child template');
         $this->smarty->fetch('036_3_parent.tpl');
     }
 
     /**
-     *
      * test smarty.block
-     *
-     * @expectedException        SmartyCompilerException
-     * @expectedExceptionMessage $smarty.block is not defined
      */
     public function testSmartyBlockMissigBlockName_037()
     {
+        $this->expectException('SmartyCompilerException');
+        $this->expectExceptionMessage('$smarty.block is not defined');
         $this->smarty->fetch('037_parent.tpl');
     }
 
diff --git a/tests/UnitTests/TemplateSource/TagTests/Capture/CompileCaptureTest.php b/tests/UnitTests/TemplateSource/TagTests/Capture/CompileCaptureTest.php
index b76b5f7d..ae89049e 100644
--- a/tests/UnitTests/TemplateSource/TagTests/Capture/CompileCaptureTest.php
+++ b/tests/UnitTests/TemplateSource/TagTests/Capture/CompileCaptureTest.php
@@ -15,7 +15,7 @@
  */
 class CompileCaptureTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
         $this->smarty->addTemplateDir("./templates_tmp");
@@ -70,15 +70,15 @@ class CompileCaptureTest extends PHPUnit_Smarty
     public function testCapture9()
     {
         $result = $this->smarty->fetch('009_capture.tpl');
-        $this->assertContains('-->hello world<--', $result);
-        $this->assertContains('-->hello world2<--', $result);
+        $this->assertStringContainsString('-->hello world<--', $result);
+        $this->assertStringContainsString('-->hello world2<--', $result);
     }
 
     public function testCompileCaptureNocache1()
     {
         $this->smarty->assign('foo', 1);
         $this->smarty->caching = 1;
-        $this->assertContains('foo 1', $this->smarty->fetch('test_capture_nocache.tpl'));
+        $this->assertStringContainsString('foo 1', $this->smarty->fetch('test_capture_nocache.tpl'));
     }
 
     /**
@@ -92,7 +92,7 @@ class CompileCaptureTest extends PHPUnit_Smarty
         $this->smarty->assign('foo', 2);
         $this->smarty->caching = 1;
         $this->assertTrue($this->smarty->isCached('test_capture_nocache.tpl'));
-        $this->assertContains('foo 2', $this->smarty->fetch('test_capture_nocache.tpl'));
+        $this->assertStringContainsString('foo 2', $this->smarty->fetch('test_capture_nocache.tpl'));
     }
     /*
      *  Test capture buffer names with uppercase
@@ -100,8 +100,8 @@ class CompileCaptureTest extends PHPUnit_Smarty
     public function testCapture10()
     {
         $result = $this->smarty->fetch('010_capture.tpl');
-        $this->assertContains('lowercase', $result);
-        $this->assertContains('uppercase', $result);
+        $this->assertStringContainsString('lowercase', $result);
+        $this->assertStringContainsString('uppercase', $result);
     }
 
     /**
diff --git a/tests/UnitTests/TemplateSource/TagTests/CompilerPlugin/CompilerPluginTest.php b/tests/UnitTests/TemplateSource/TagTests/CompilerPlugin/CompilerPluginTest.php
index eca3d1a3..2f455656 100644
--- a/tests/UnitTests/TemplateSource/TagTests/CompilerPlugin/CompilerPluginTest.php
+++ b/tests/UnitTests/TemplateSource/TagTests/CompilerPlugin/CompilerPluginTest.php
@@ -15,7 +15,7 @@
  */
 class CompilerPluginTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
diff --git a/tests/UnitTests/TemplateSource/TagTests/ConfigLoad/CompileConfigLoadTest.php b/tests/UnitTests/TemplateSource/TagTests/ConfigLoad/CompileConfigLoadTest.php
index 50a8a321..f3d800a2 100644
--- a/tests/UnitTests/TemplateSource/TagTests/ConfigLoad/CompileConfigLoadTest.php
+++ b/tests/UnitTests/TemplateSource/TagTests/ConfigLoad/CompileConfigLoadTest.php
@@ -20,7 +20,7 @@ class CompileConfigLoadTest extends PHPUnit_Smarty
      * This method is called before a test is executed.
      *
      */
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
         $this->smarty->addPluginsDir("../../../__shared/PHPunitplugins/");
@@ -161,12 +161,12 @@ class CompileConfigLoadTest extends PHPUnit_Smarty
     }
 
     /**
-     * @expectedException        SmartyCompilerException
-     * @expectedExceptionMessage Syntax error in config file
      * test config file syntax error
      */
     public function testConfigSyntaxError_009()
     {
+        $this->expectException('SmartyCompilerException');
+        $this->expectExceptionMessage('Syntax error in config file');
         $this->smarty->fetch('009_error.tpl');
     }
 }
diff --git a/tests/UnitTests/TemplateSource/TagTests/Delimiter/CompileDelimiterTest.php b/tests/UnitTests/TemplateSource/TagTests/Delimiter/CompileDelimiterTest.php
index 16ae980f..2efd06f6 100644
--- a/tests/UnitTests/TemplateSource/TagTests/Delimiter/CompileDelimiterTest.php
+++ b/tests/UnitTests/TemplateSource/TagTests/Delimiter/CompileDelimiterTest.php
@@ -15,7 +15,7 @@
  */
 class CompileDelimiterTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
@@ -41,12 +41,10 @@ class CompileDelimiterTest extends PHPUnit_Smarty
         $this->assertEquals('x}x', $this->smarty->fetch($tpl));
     }
 
-    /**
-     * @expectedException        SmartyCompilerException
-     * @expectedExceptionMessage nocache option not allowed
-     */
     public function testLeftDelimiterError()
     {
+        $this->expectException('SmartyCompilerException');
+        $this->expectExceptionMessage('nocache option not allowed');
         $tpl = $this->smarty->createTemplate('string:x{ldelim nocache}x');
         $this->assertEquals('x{x', $this->smarty->fetch($tpl));
     }
diff --git a/tests/UnitTests/TemplateSource/TagTests/Eval/CompileEvalTest.php b/tests/UnitTests/TemplateSource/TagTests/Eval/CompileEvalTest.php
index 5053e42d..1a979184 100644
--- a/tests/UnitTests/TemplateSource/TagTests/Eval/CompileEvalTest.php
+++ b/tests/UnitTests/TemplateSource/TagTests/Eval/CompileEvalTest.php
@@ -15,7 +15,7 @@
  */
 class CompileEvalTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
diff --git a/tests/UnitTests/TemplateSource/TagTests/For/CompileForTest.php b/tests/UnitTests/TemplateSource/TagTests/For/CompileForTest.php
index 0a1c5d9d..289fd365 100644
--- a/tests/UnitTests/TemplateSource/TagTests/For/CompileForTest.php
+++ b/tests/UnitTests/TemplateSource/TagTests/For/CompileForTest.php
@@ -15,7 +15,7 @@
  */
 class CompileForTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
diff --git a/tests/UnitTests/TemplateSource/TagTests/Foreach/CompileForeachTest.php b/tests/UnitTests/TemplateSource/TagTests/Foreach/CompileForeachTest.php
index 0630d6f8..845b6986 100644
--- a/tests/UnitTests/TemplateSource/TagTests/Foreach/CompileForeachTest.php
+++ b/tests/UnitTests/TemplateSource/TagTests/Foreach/CompileForeachTest.php
@@ -15,7 +15,7 @@
  */
 class CompileForeachTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
         $this->smarty->addPluginsDir("../../../__shared/PHPunitplugins/");
@@ -94,9 +94,9 @@ class CompileForeachTest extends PHPUnit_Smarty
             array('{foreach item=x from=$foo}{$x}{foreachelse}else{/foreach}{if $x@show}-show{else}-noshow{/if}', array(), 'else-noshow', '', $i ++),
             array('{foreach $foo x y foo}{$y}.{$x},{foreachelse}else{/foreach}total{$smarty.foreach.foo.total}', array(9,10,11), '0.9,1.10,2.11,total3', '', $i ++),
             array('{$x = "hallo"}{$bar=[1,2,3]}{foreach $foo as $x}outer={$x@index}.{$x}#{foreach $bar as $x}inner={$x@index}.{$x}{/foreach}##{/foreach}###{$x}', array(9,10,11), 'outer=0.9#inner=0.1inner=1.2inner=2.3##outer=1.10#inner=0.1inner=1.2inner=2.3##outer=2.11#inner=0.1inner=1.2inner=2.3#####hallo', '', $i ++),
-	        array('{foreach $foo as $x}{$x}{foreachelse}else{/foreach}', null, 'else', '', $i ++),
-	        array('{foreach $foo as $x}{$x}{foreachelse}else{/foreach}', array(), 'else', '', $i ++),
-	        array('{foreach $foo as $x}{$x}{foreachelse}else{/foreach}', new \ArrayIterator(), 'else', '', $i ++),
+            array('{foreach $foo as $x}{$x}{foreachelse}else{/foreach}', null, 'else', '', $i ++),
+            array('{foreach $foo as $x}{$x}{foreachelse}else{/foreach}', array(), 'else', '', $i ++),
+            array('{foreach $foo as $x}{$x}{foreachelse}else{/foreach}', new \ArrayIterator(), 'else', '', $i ++),
         );
     }
 
diff --git a/tests/UnitTests/TemplateSource/TagTests/FunctionPlugin/CompileFunctionPluginTest.php b/tests/UnitTests/TemplateSource/TagTests/FunctionPlugin/CompileFunctionPluginTest.php
index 4622e578..e029dbf7 100644
--- a/tests/UnitTests/TemplateSource/TagTests/FunctionPlugin/CompileFunctionPluginTest.php
+++ b/tests/UnitTests/TemplateSource/TagTests/FunctionPlugin/CompileFunctionPluginTest.php
@@ -15,7 +15,7 @@
  */
 class CompileFunctionPluginTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
         $this->smarty->addPluginsDir("../../../__shared/PHPunitplugins/");
diff --git a/tests/UnitTests/TemplateSource/TagTests/If/CompileIfTest.php b/tests/UnitTests/TemplateSource/TagTests/If/CompileIfTest.php
index 1eb7bd30..595ff55c 100644
--- a/tests/UnitTests/TemplateSource/TagTests/If/CompileIfTest.php
+++ b/tests/UnitTests/TemplateSource/TagTests/If/CompileIfTest.php
@@ -15,7 +15,7 @@
  */
 class CompileIfTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
         $this->smarty->addPluginsDir("../../../__shared/PHPunitplugins/");
diff --git a/tests/UnitTests/TemplateSource/TagTests/Include/CompileIncludeTest.php b/tests/UnitTests/TemplateSource/TagTests/Include/CompileIncludeTest.php
index 830089ae..69d3f69c 100644
--- a/tests/UnitTests/TemplateSource/TagTests/Include/CompileIncludeTest.php
+++ b/tests/UnitTests/TemplateSource/TagTests/Include/CompileIncludeTest.php
@@ -15,7 +15,7 @@
  */
 class CompileIncludeTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
         $this->smarty->addPluginsDir("../../../__shared/PHPunitplugins/");
@@ -187,7 +187,7 @@ class CompileIncludeTest extends PHPUnit_Smarty
         $this->smarty->assign('foo', 1);
         $this->smarty->assign('bar', 'bar');
         $content = $this->smarty->fetch('test_recursive_includes.tpl');
-        $this->assertContains("before 1 bar<br>\nbefore 2 bar<br>\nbefore 3 bar<br>\nafter 3 bar<br>\nafter 2 bar<br>\nafter 1 bar<br>", $content, $text);
+        $this->assertStringContainsString("before 1 bar<br>\nbefore 2 bar<br>\nbefore 3 bar<br>\nafter 3 bar<br>\nafter 2 bar<br>\nafter 1 bar<br>", $content, $text);
     }
 
     /**
@@ -203,7 +203,7 @@ class CompileIncludeTest extends PHPUnit_Smarty
         $this->smarty->assign('foo', 1);
         $this->smarty->assign('bar', 'bar');
         $content = $this->smarty->fetch('test_recursive_includes2.tpl');
-        $this->assertContains("before 1 bar<br>\nbefore 3 bar<br>\nbefore 5 bar<br>\nafter 5 bar<br>\nafter 3 bar<br>\nafter 1 bar<br>", $content, $text);
+        $this->assertStringContainsString("before 1 bar<br>\nbefore 3 bar<br>\nbefore 5 bar<br>\nafter 5 bar<br>\nafter 3 bar<br>\nafter 1 bar<br>", $content, $text);
     }
 
     /**
diff --git a/tests/UnitTests/TemplateSource/TagTests/IncludePhp/CompileIncludePhpTest.php b/tests/UnitTests/TemplateSource/TagTests/IncludePhp/CompileIncludePhpTest.php
deleted file mode 100644
index acdd1429..00000000
--- a/tests/UnitTests/TemplateSource/TagTests/IncludePhp/CompileIncludePhpTest.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-/**
- * Smarty PHPunit tests compilation of the {include_php} tag
- *
- * @package PHPunit
- * @author  Uwe Tews
- */
-
-/**
- * class for {include_php} tests
- *
- * @runTestsInSeparateProcess
- * @preserveGlobalState disabled
- * @backupStaticAttributes enabled
- */
-class CompileIncludePhpTest extends PHPUnit_Smarty
-{
-    public $loadSmartyBC = true;
-    public $loadSmarty = false;
-    public function setUp()
-    {
-        $this->setUpSmarty(dirname(__FILE__));
-        $this->smartyBC->setForceCompile(true);
-    }
-
-
-    public function testInit()
-    {
-        $this->cleanDirs();
-    }
-    /**
-     * test include_php string file_name function
-     */
-    public function testIncludePhpStringFileName()
-    {
-        $this->smartyBC->disableSecurity();
-        $tpl = $this->smartyBC->createTemplate('include_php.tpl');
-        $result = $this->smartyBC->fetch($tpl);
-        $this->assertContains("test include php", $result);
-    }
-
-    /**
-     * test include_php from trusted dir
-     */
-    public function testIncludePhpTrusted()
-    {
-        $this->smartyBC->enableSecurity();
-        $this->smartyBC->security_policy->trusted_dir = '.\\scripts\\';
-        $tpl = $this->smartyBC->createTemplate('include_php_trusted.tpl');
-        $result = $this->smartyBC->fetch($tpl);
-        $this->assertContains("test include php", $result);
-    }
-
-    /**
-     * test include_php string file_name function
-     */
-    public function testIncludePhpVariableFileName()
-    {
-        $this->smartyBC->disableSecurity();
-        $tpl = $this->smartyBC->createTemplate('string:start {include_php file=$filename once=false} end');
-        $tpl->assign('filename', 'scripts/test_include_php.php');
-        $result = $this->smartyBC->fetch($tpl);
-        $this->assertContains("test include php", $result);
-    }
-
-    public function testIncludePhpVariableFileNameShortag()
-    {
-        $this->smartyBC->disableSecurity();
-        $tpl = $this->smartyBC->createTemplate('string:start {include_php $filename once=false} end');
-        $tpl->assign('filename', 'scripts/test_include_php.php');
-        $result = $this->smartyBC->fetch($tpl);
-        $this->assertContains("test include php", $result);
-    }
-}
diff --git a/tests/UnitTests/TemplateSource/TagTests/IncludePhp/cache/.gitignore b/tests/UnitTests/TemplateSource/TagTests/IncludePhp/cache/.gitignore
deleted file mode 100644
index d88cc144..00000000
--- a/tests/UnitTests/TemplateSource/TagTests/IncludePhp/cache/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# Ignore anything in here, but keep this directory
-*
diff --git a/tests/UnitTests/TemplateSource/TagTests/IncludePhp/scripts/test_include_php.php b/tests/UnitTests/TemplateSource/TagTests/IncludePhp/scripts/test_include_php.php
deleted file mode 100644
index 2bb96d8a..00000000
--- a/tests/UnitTests/TemplateSource/TagTests/IncludePhp/scripts/test_include_php.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-echo 'test include php';
diff --git a/tests/UnitTests/TemplateSource/TagTests/IncludePhp/templates/include_php.tpl b/tests/UnitTests/TemplateSource/TagTests/IncludePhp/templates/include_php.tpl
deleted file mode 100644
index f8fbe555..00000000
--- a/tests/UnitTests/TemplateSource/TagTests/IncludePhp/templates/include_php.tpl
+++ /dev/null
@@ -1 +0,0 @@
-start {include_php file='scripts/test_include_php.php'} end
diff --git a/tests/UnitTests/TemplateSource/TagTests/IncludePhp/templates/include_php_trusted.tpl b/tests/UnitTests/TemplateSource/TagTests/IncludePhp/templates/include_php_trusted.tpl
deleted file mode 100644
index 55c5865d..00000000
--- a/tests/UnitTests/TemplateSource/TagTests/IncludePhp/templates/include_php_trusted.tpl
+++ /dev/null
@@ -1 +0,0 @@
-start {include_php file='test_include_php.php' once=false} end
diff --git a/tests/UnitTests/TemplateSource/TagTests/IncludePhp/templates_c/.gitignore b/tests/UnitTests/TemplateSource/TagTests/IncludePhp/templates_c/.gitignore
deleted file mode 100644
index d88cc144..00000000
--- a/tests/UnitTests/TemplateSource/TagTests/IncludePhp/templates_c/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# Ignore anything in here, but keep this directory
-*
diff --git a/tests/UnitTests/TemplateSource/TagTests/Insert/CompileInsertTest.php b/tests/UnitTests/TemplateSource/TagTests/Insert/CompileInsertTest.php
index 7498d2cf..6e608df9 100644
--- a/tests/UnitTests/TemplateSource/TagTests/Insert/CompileInsertTest.php
+++ b/tests/UnitTests/TemplateSource/TagTests/Insert/CompileInsertTest.php
@@ -15,7 +15,7 @@
  */
 class CompileInsertTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
         $this->smarty->addPluginsDir(dirname(__FILE__) . "/PHPunitplugins/");
@@ -192,7 +192,7 @@ class CompileInsertTest extends PHPUnit_Smarty
         $this->smarty->compile_id = 1;
         $tpl = $this->smarty->createTemplate('insertplugintest.tpl');
         $tpl->assign('foo', 'buh');
-        $this->assertContains('param foo bar globalvar global 2', $this->smarty->fetch($tpl));
+        $this->assertStringContainsString('param foo bar globalvar global 2', $this->smarty->fetch($tpl));
     }
     /**
      * test insert plugin caching 3
@@ -203,7 +203,7 @@ class CompileInsertTest extends PHPUnit_Smarty
     {
         $this->smarty->caching = true;
         $this->smarty->assign('insert',$t=time());
-        $this->assertContains($t.'Inner template', $this->smarty->fetch('insertplugintest2.tpl'));
+        $this->assertStringContainsString($t.'Inner template', $this->smarty->fetch('insertplugintest2.tpl'));
     }
 
     /**
@@ -217,7 +217,7 @@ class CompileInsertTest extends PHPUnit_Smarty
         sleep(2);
         $this->smarty->caching = true;
         $this->smarty->assign('insert',$t=time());
-        $this->assertContains($t.'Inner template', $this->smarty->fetch('insertplugintest2.tpl'));
+        $this->assertStringContainsString($t.'Inner template', $this->smarty->fetch('insertplugintest2.tpl'));
     }
 
 
@@ -233,7 +233,7 @@ class CompileInsertTest extends PHPUnit_Smarty
             $this->smarty->fetch($tpl);
         }
         catch (Exception $e) {
-            $this->assertContains("{insert} no function or plugin found for 'mustfail'", $e->getMessage());
+            $this->assertStringContainsString("{insert} no function or plugin found for 'mustfail'", $e->getMessage());
 
             return;
         }
@@ -252,7 +252,7 @@ class CompileInsertTest extends PHPUnit_Smarty
             $this->smarty->fetch($tpl);
         }
         catch (Exception $e) {
-            $this->assertContains('missing script file', $e->getMessage());
+            $this->assertStringContainsString('missing script file', $e->getMessage());
 
             return;
         }
diff --git a/tests/UnitTests/TemplateSource/TagTests/Insert/PHPunitplugins/insert.test2.php b/tests/UnitTests/TemplateSource/TagTests/Insert/PHPunitplugins/insert.test2.php
index bfc35e12..75f3ccb8 100644
--- a/tests/UnitTests/TemplateSource/TagTests/Insert/PHPunitplugins/insert.test2.php
+++ b/tests/UnitTests/TemplateSource/TagTests/Insert/PHPunitplugins/insert.test2.php
@@ -2,5 +2,5 @@
 
 function smarty_insert_test2($params, $smarty) {
 
-	return $smarty->tpl_vars[$params['var']]->value;
+    return $smarty->tpl_vars[$params['var']]->value;
 }
diff --git a/tests/UnitTests/TemplateSource/TagTests/Literal/LiteralTest.php b/tests/UnitTests/TemplateSource/TagTests/Literal/LiteralTest.php
index 972f9e25..6cb608bd 100644
--- a/tests/UnitTests/TemplateSource/TagTests/Literal/LiteralTest.php
+++ b/tests/UnitTests/TemplateSource/TagTests/Literal/LiteralTest.php
@@ -15,7 +15,7 @@
  */
 class LiteralTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
diff --git a/tests/UnitTests/TemplateSource/TagTests/MakeNocache/CompileMakeNocacheTest.php b/tests/UnitTests/TemplateSource/TagTests/MakeNocache/CompileMakeNocacheTest.php
index 718c7313..daf85774 100644
--- a/tests/UnitTests/TemplateSource/TagTests/MakeNocache/CompileMakeNocacheTest.php
+++ b/tests/UnitTests/TemplateSource/TagTests/MakeNocache/CompileMakeNocacheTest.php
@@ -15,7 +15,7 @@
  */
 class CompileMakeNocacheTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
         $this->smarty->addPluginsDir("../../../__shared/PHPunitplugins/");
diff --git a/tests/UnitTests/TemplateSource/TagTests/Nocache/CompileNocacheTest.php b/tests/UnitTests/TemplateSource/TagTests/Nocache/CompileNocacheTest.php
index a0a7e373..332e4919 100644
--- a/tests/UnitTests/TemplateSource/TagTests/Nocache/CompileNocacheTest.php
+++ b/tests/UnitTests/TemplateSource/TagTests/Nocache/CompileNocacheTest.php
@@ -15,7 +15,7 @@
  */
 class CompileNocacheTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
@@ -34,13 +34,13 @@ class CompileNocacheTest extends PHPUnit_Smarty
         $this->smarty->assign('foo', 0);
         $this->smarty->assign('bar', 'A');
         $content = $this->smarty->fetch('test_nocache_tag.tpl');
-        $this->assertContains("root 2A", $content);
-        $this->assertContains("include 4A", $content);
+        $this->assertStringContainsString("root 2A", $content);
+        $this->assertStringContainsString("include 4A", $content);
         $this->smarty->assign('foo', 2);
         $this->smarty->assign('bar', 'B');
         $content = $this->smarty->fetch('test_nocache_tag.tpl');
-        $this->assertContains("root 4B", $content);
-        $this->assertContains("include 6B", $content);
+        $this->assertStringContainsString("root 4B", $content);
+        $this->assertStringContainsString("include 6B", $content);
     }
 
     /**
@@ -52,8 +52,8 @@ class CompileNocacheTest extends PHPUnit_Smarty
         $this->smarty->assign('foo', 0);
         $this->smarty->assign('bar', 'A');
         $content = $this->smarty->fetch('test_nocache_tag.tpl');
-        $this->assertContains("root 2A", $content);
-        $this->assertContains("include 4A", $content);
+        $this->assertStringContainsString("root 2A", $content);
+        $this->assertStringContainsString("include 4A", $content);
 
     }
 
@@ -69,7 +69,7 @@ class CompileNocacheTest extends PHPUnit_Smarty
         $this->smarty->assign('foo', 2);
         $this->smarty->assign('bar', 'B');
         $content = $this->smarty->fetch('test_nocache_tag.tpl');
-        $this->assertContains("root 4A", $content);
-        $this->assertContains("include 6A", $content);
+        $this->assertStringContainsString("root 4A", $content);
+        $this->assertStringContainsString("include 6A", $content);
     }
 }
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/CompilePhpTest.php b/tests/UnitTests/TemplateSource/TagTests/Php/CompilePhpTest.php
deleted file mode 100644
index fb34e9f4..00000000
--- a/tests/UnitTests/TemplateSource/TagTests/Php/CompilePhpTest.php
+++ /dev/null
@@ -1,198 +0,0 @@
-<?php
-/**
- * Smarty PHPunit tests compilation of {php} and <?php...?> tag
- *
- * @package PHPunit
- * @author  Uwe Tews
- */
-
-/**
- * class for {php} and <?php...?> tag tests
- *
- * @runTestsInSeparateProcess
- * @preserveGlobalState disabled
- * @backupStaticAttributes enabled
- */
-class CompilePhpTest extends PHPUnit_Smarty
-{
-    public $loadSmartyBC = true;
-    public function setUp()
-    {
-        $this->setUpSmarty(dirname(__FILE__));
-        $this->smarty->setUseSubDirs(true);
-        $this->smartyBC->setUseSubDirs(true);
-        $this->smartyBC->disableSecurity();
-        $this->smarty->disableSecurity();
-        $this->smarty->setCompileId($this->getName());
-        $this->smartyBC->setCompileId($this->getName());
-    }
-
-    public function testInit()
-    {
-        $this->cleanDirs();
-    }
-
-
-    /**
-     * Test
-     * @run InSeparateProcess
-     * @preserveGlobalState disabled
-     * @dataProvider data
-     *
-     */
-    public function testPHP($phpHandling, $templateFile, $result, $testName)
-    {
-        $result = str_replace("\r", '', $result);
-        $this->smartyBC->force_compile = true;
-        $this->smartyBC->php_handling = $phpHandling;
-        $this->smartyBC->compile_id = $testName.$this->smartyBC->php_handling ;
-        $tpl = $this->smartyBC->createTemplate($templateFile);
-        if ($phpHandling == Smarty::PHP_PASSTHRU || $phpHandling == Smarty::PHP_QUOTE) {
-            $result = str_replace("\r", '', $tpl->source->getContent());
-        }
-        if ($phpHandling == Smarty::PHP_QUOTE) {
-            $result = preg_replace_callback('#(<\?(?:php|=)?)|(<%)|(<script\s+language\s*=\s*["\']?\s*php\s*["\']?\s*>)|(\?>)|(%>)|(<\/script>)#i', array($this, 'quote'), $result);
-        }
-        $content = $tpl->fetch();
-        $this->assertEquals($result, $content, $testName);
-    }   /**
- * Test
- * @runInSeparateProcess
- * @preserveGlobalState disabled
- * @dataProvider data
- *
- */
-    public function testPHPcaching($phpHandling, $templateFile, $result, $testName)
-    {
-        $result = str_replace("\r", '', $result);
-        $this->smartyBC->php_handling = $phpHandling;
-        $this->smartyBC->compile_id = $testName.$this->smartyBC->php_handling ;
-        $this->smartyBC->caching = true;
-        $this->smartyBC->force_cache = true;
-        $tpl = $this->smartyBC->createTemplate($templateFile);
-        if ($phpHandling == Smarty::PHP_PASSTHRU || $phpHandling == Smarty::PHP_QUOTE) {
-            $result = str_replace("\r", '', $tpl->source->getContent());
-        }
-        if ($phpHandling == Smarty::PHP_QUOTE) {
-            $result = preg_replace_callback('#(<\?(?:php|=)?)|(<%)|(<script\s+language\s*=\s*["\']?\s*php\s*["\']?\s*>)|(\?>)|(%>)|(<\/script>)#i', array($this, 'quote'), $result);
-        }
-        $content = $tpl->fetch();
-        $this->assertEquals($result, $content, $testName);
-    }
-    /**
-     * @expectedException        SmartyCompilerException
-     * @expectedExceptionMessage $smarty->php_handling PHP_ALLOW not allowed. Use SmartyBC to enable it
-     */
-
-    public function testPHP_ALLOW_error()
-    {
-        $this->smarty->setPhpHandling(Smarty::PHP_ALLOW);
-        $content = $this->smarty->fetch("string:aa <?php echo 'hallo'; ?> ae");
-    }
-
-    /**
-     * test {php nocache}{/php} tag
-     */
-    public function testPHP_Tag_Nocache1()
-    {
-        $this->smartyBC->caching = 1;
-        $this->smartyBC->assign('foo', 'foo');
-        $this->smartyBC->compile_id = 'Tag nocache' ;
-        $content = $this->smartyBC->fetch('phptag_nocache.tpl');
-        $this->assertEquals('-->foo<--', $content,'Tag nocache 1');
-    }
-
-    public function testPHP_Tag_Nocache2()
-    {
-        $this->smartyBC->caching = 1;
-        $this->smartyBC->assign('foo', 'bar');
-        $this->smartyBC->compile_id = 'Tag nocache' ;
-        $content = $this->smartyBC->fetch('phptag_nocache.tpl');
-        $this->assertEquals('-->bar<--', $content,'Tag nocache 2');
-    }
-    /**
-     * test {php no cache}illegal option
-     * @expectedException        SmartyCompilerException
-     * @expectedExceptionMessage illegal value of option flag 'no cache'
-     *
-     */
-    public function testPHP_Tag_IllegalOption()
-    {
-        $content = $this->smartyBC->fetch("string:aa {php no cache} echo 'hallo'; {/php} ae");
-    }
-
-    /**
-     * Test regression that plugin names starting with 'php' do work
-     */
-    public function testPHPfooPlugin()
-    {
-        $this->smarty->addPluginsDir("./PHPunitplugins/");
-        $this->smartyBC->compile_id = 'Tag nocache' ;
-        $this->assertEquals('phptest okay', $this->smarty->fetch('string:{phptest}'),'testPHPfooPlugin');
-    }
-
-    public function data()
-    {
-        $shortTag = ini_get('short_open_tag') == 1;
-        $aspTag = ini_get('asp_tags') == 1;
-
-        $data = array(
-            /*
-            * php_handling
-            * template file
-            * result
-            * text
-            */
-            array(Smarty::PHP_REMOVE, 'php.tpl', '--><--', 'PHP_REMOVE, \'php.tpl\''),
-            array(Smarty::PHP_PASSTHRU, 'php.tpl', '', 'PHP_PASSTHRU, \'php.tpl\''),
-            array(Smarty::PHP_QUOTE, 'php.tpl', '', 'PHP_QUOTE, \'php.tpl\''),
-            array(Smarty::PHP_ALLOW, 'php.tpl', '--> hello world <?php ?> <--', 'PHP_ALLOW, \'php.tpl\''),
-            array(Smarty::PHP_REMOVE, 'php_line_comment.tpl', '--><--', 'PHP_REMOVE, \'php_line_comment.tpl\''),
-            array(Smarty::PHP_PASSTHRU, 'php_line_comment.tpl', '', 'PHP_PASSTHRU, \'php_line_comment.tpl\''),
-            array(Smarty::PHP_QUOTE, 'php_line_comment.tpl', '', 'PHP_QUOTE, \'php_line_comment.tpl\''),
-            array(Smarty::PHP_ALLOW, 'php_line_comment.tpl', '--> hello world <?php ?> <--', 'PHP_ALLOW, \'php_line_comment.tpl\''),
-            array(Smarty::PHP_REMOVE, 'php_block_comment.tpl', '--><--', 'PHP_REMOVE, \'php_block_comment.tpl\''),
-            array(Smarty::PHP_PASSTHRU, 'php_block_comment.tpl', '', 'PHP_PASSTHRU, \'php_block_comment.tpl\''),
-            array(Smarty::PHP_QUOTE, 'php_block_comment.tpl', '', 'PHP_QUOTE, \'php_block_comment.tpl\''),
-            array(Smarty::PHP_ALLOW, 'php_block_comment.tpl', '--> hello world <?php ?> <--', 'PHP_ALLOW, \'php_block_comment.tpl\''),
-            array(Smarty::PHP_REMOVE, 'php2.tpl', '--><--', 'PHP_REMOVE, \'php2.tpl\''),
-            array(Smarty::PHP_PASSTHRU, 'php2.tpl', '', 'PHP_PASSTHRU, \'php2.tpl\''),
-            array(Smarty::PHP_QUOTE, 'php2.tpl', '', 'PHP_QUOTE, \'php2.tpl\''),
-            array(Smarty::PHP_ALLOW, 'php2.tpl', $shortTag || strpos(phpversion(), 'hhvm') !== false ? '--> hello world <?  ?> <--' : '--><? echo \' hello world \';
-echo \'<?  \';
-echo \'?> \';
-?><--', 'PHP_ALLOW, \'php2.tpl\''),
-            array(Smarty::PHP_REMOVE, 'asp.tpl', '--><--', 'PHP_REMOVE, \'asp.tpl\''),
-            array(Smarty::PHP_PASSTHRU, 'asp.tpl', '', 'PHP_PASSTHRU, \'asp.tpl\''),
-            array(Smarty::PHP_QUOTE, 'asp.tpl', '', 'PHP_QUOTE, \'asp.tpl\''),
-            array(Smarty::PHP_ALLOW, 'asp.tpl', $aspTag ? '-->hello world <% %> <--' : '--><% echo \'hello world \';
-echo \'<% \';
-echo \'%> \';
-%><--', 'PHP_ALLOW, \'asp.tpl\''),
-            array(Smarty::PHP_REMOVE, 'script.tpl', '<br><br>', 'PHP_REMOVE, \'script.tpl\''),
-            array(Smarty::PHP_PASSTHRU, 'script.tpl', '', 'PHP_PASSTHRU, \'script.tpl\''),
-            array(Smarty::PHP_QUOTE, 'script.tpl', '', 'PHP_QUOTE, \'script.tpl\''),
-            array(Smarty::PHP_ALLOW, 'phptag.tpl', '--> hello world {php} {/php} <--', 'PHP_ALLOW, \'phptag.tpl\''),
-            array(Smarty::PHP_ALLOW, 'phptag_line_comment.tpl', '--> hello world {php} {/php} <--', 'PHP_ALLOW, \'phptag_line_comment.tpl\''),
-            array(Smarty::PHP_ALLOW, 'phptag_block_comment.tpl', '--> hello world {php} {/php} <--', 'PHP_ALLOW, \'phptag_block_comment.tpl\''),
-            array(Smarty::PHP_ALLOW, 'phptag_literal.tpl', '-->{ php} echo \' hello world \';
-echo \'foo \';
-echo \'bar \';
-$foo = 3;
-{ /php}<--', 'PHP_ALLOW, \'phptag_literal.tpl\''),
-        );
-        if (version_compare(phpversion(), '5.7.0', '<')) {
-            $data[] = array(Smarty::PHP_ALLOW, 'script.tpl', '<br> This is a script <br> 5<br>', 'PHP_ALLOW, \'script.tpl\'');
-        }
-        return $data;
-    }
-    /*
- * Call back function for $php_handling = PHP_QUOTE
- *
- */
-    private function quote($match)
-    {
-        return htmlspecialchars($match[0], ENT_QUOTES);
-    }
-
-}
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/PHPunitplugins/function.phptest.php b/tests/UnitTests/TemplateSource/TagTests/Php/PHPunitplugins/function.phptest.php
deleted file mode 100644
index 922609e4..00000000
--- a/tests/UnitTests/TemplateSource/TagTests/Php/PHPunitplugins/function.phptest.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-function smarty_function_phptest($params,$smarty)
-{
-    return 'phptest okay';
-}
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/cache/.gitignore b/tests/UnitTests/TemplateSource/TagTests/Php/cache/.gitignore
deleted file mode 100644
index d88cc144..00000000
--- a/tests/UnitTests/TemplateSource/TagTests/Php/cache/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# Ignore anything in here, but keep this directory
-*
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/templates/asp.tpl b/tests/UnitTests/TemplateSource/TagTests/Php/templates/asp.tpl
deleted file mode 100644
index c3a2433e..00000000
--- a/tests/UnitTests/TemplateSource/TagTests/Php/templates/asp.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
---><% echo 'hello world ';
-echo '<% ';
-echo '%> ';
-%><--
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/templates/php.tpl b/tests/UnitTests/TemplateSource/TagTests/Php/templates/php.tpl
deleted file mode 100644
index 8a9acec6..00000000
--- a/tests/UnitTests/TemplateSource/TagTests/Php/templates/php.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
---><?php echo ' hello world ';
-echo '<?php ';
-echo '?> ';
-$foo = 3;
-?><--
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/templates/php2.tpl b/tests/UnitTests/TemplateSource/TagTests/Php/templates/php2.tpl
deleted file mode 100644
index 44beed4a..00000000
--- a/tests/UnitTests/TemplateSource/TagTests/Php/templates/php2.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
---><? echo ' hello world ';
-echo '<?  ';
-echo '?> ';
-?><--
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/templates/php_block_comment.tpl b/tests/UnitTests/TemplateSource/TagTests/Php/templates/php_block_comment.tpl
deleted file mode 100644
index 4524e45e..00000000
--- a/tests/UnitTests/TemplateSource/TagTests/Php/templates/php_block_comment.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
---><?php echo ' hello world ';
-/*
-* comment <?php is okay
-*
-* comment <?php once again
-*/
-
-echo '<?php ';
-
-/*
-* other comment <% foo
-*/
-
-echo '?> ';
-$foo = 3;
-?><--
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/templates/php_line_comment.tpl b/tests/UnitTests/TemplateSource/TagTests/Php/templates/php_line_comment.tpl
deleted file mode 100644
index 176d3580..00000000
--- a/tests/UnitTests/TemplateSource/TagTests/Php/templates/php_line_comment.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
---><?php echo ' hello world ';
-// comment <?php is okay
-//
-// comment <?php once again
-
-echo '<?php ';
-
-// other comment <% foo
-
-echo '?> ';
-$foo = 3;
-?><--
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/templates/phptag.tpl b/tests/UnitTests/TemplateSource/TagTests/Php/templates/phptag.tpl
deleted file mode 100644
index f7b92e9f..00000000
--- a/tests/UnitTests/TemplateSource/TagTests/Php/templates/phptag.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
--->{php} echo ' hello world ';
-echo '{php} ';
-echo '{/php} ';
-$foo = 3;
-{/php}<--
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/templates/phptag_block_comment.tpl b/tests/UnitTests/TemplateSource/TagTests/Php/templates/phptag_block_comment.tpl
deleted file mode 100644
index af837c78..00000000
--- a/tests/UnitTests/TemplateSource/TagTests/Php/templates/phptag_block_comment.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
--->{php} echo ' hello world ';
-/*
-*    comment {/php} is okay
-*
-* comment {/php} once again {/php} foo
-*/
-
-echo '{php} ';
-
-/*
-* other comment <% foo
-*/
-
-echo '{/php} ';
-$foo = 3;
-{/php}<--
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/templates/phptag_line_comment.tpl b/tests/UnitTests/TemplateSource/TagTests/Php/templates/phptag_line_comment.tpl
deleted file mode 100644
index 16907ce2..00000000
--- a/tests/UnitTests/TemplateSource/TagTests/Php/templates/phptag_line_comment.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
--->{php} echo ' hello world ';
-// comment {/php} is okay
-//
-// comment {/php} once again {/php} foo
-
-echo '{php} ';
-
-// other comment <% foo
-
-echo '{/php} ';
-$foo = 3;
-{/php}<--
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/templates/phptag_literal.tpl b/tests/UnitTests/TemplateSource/TagTests/Php/templates/phptag_literal.tpl
deleted file mode 100644
index 24420541..00000000
--- a/tests/UnitTests/TemplateSource/TagTests/Php/templates/phptag_literal.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
--->{ php} echo ' hello world ';
-echo 'foo ';
-echo 'bar ';
-$foo = 3;
-{ /php}<--
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/templates/phptag_nocache.tpl b/tests/UnitTests/TemplateSource/TagTests/Php/templates/phptag_nocache.tpl
deleted file mode 100644
index 086a25f0..00000000
--- a/tests/UnitTests/TemplateSource/TagTests/Php/templates/phptag_nocache.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
--->{php nocache} echo $_smarty_tpl->getTemplateVars('foo');
-{/php}<--
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/templates/script.tpl b/tests/UnitTests/TemplateSource/TagTests/Php/templates/script.tpl
deleted file mode 100644
index 076e32dd..00000000
--- a/tests/UnitTests/TemplateSource/TagTests/Php/templates/script.tpl
+++ /dev/null
@@ -1 +0,0 @@
-<br><script language='php'>echo ' This is a script <br> ';echo 2+3;</script><br>
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/.gitignore b/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/.gitignore
deleted file mode 100644
index d88cc144..00000000
--- a/tests/UnitTests/TemplateSource/TagTests/Php/templates_c/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# Ignore anything in here, but keep this directory
-*
diff --git a/tests/UnitTests/TemplateSource/TagTests/PluginBlock/PluginBlockTextformatTest.php b/tests/UnitTests/TemplateSource/TagTests/PluginBlock/PluginBlockTextformatTest.php
index 382c73ce..9ee5e315 100644
--- a/tests/UnitTests/TemplateSource/TagTests/PluginBlock/PluginBlockTextformatTest.php
+++ b/tests/UnitTests/TemplateSource/TagTests/PluginBlock/PluginBlockTextformatTest.php
@@ -17,7 +17,7 @@ class PluginBlockTextformatTest extends PHPUnit_Smarty
 {
     protected $string = "\n\nThis is foo.\nThis is foo.\nThis is foo.\nThis is foo.\nThis is foo.\nThis is foo.\n\nThis is bar.\n\nbar foo bar foo     foo.\nbar foo bar foo     foo.\nbar foo bar foo     foo.\nbar foo bar foo     foo.\nbar foo bar foo     foo.\nbar foo bar foo     foo.\nbar foo bar foo     foo.\n\n";
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
diff --git a/tests/UnitTests/TemplateSource/TagTests/PluginFunction/PluginFunctionFetchTest.php b/tests/UnitTests/TemplateSource/TagTests/PluginFunction/PluginFunctionFetchTest.php
index acea7def..f4de02c6 100644
--- a/tests/UnitTests/TemplateSource/TagTests/PluginFunction/PluginFunctionFetchTest.php
+++ b/tests/UnitTests/TemplateSource/TagTests/PluginFunction/PluginFunctionFetchTest.php
@@ -15,7 +15,7 @@
  */
 class PluginFunctionFetchTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
@@ -34,52 +34,52 @@ class PluginFunctionFetchTest extends PHPUnit_Smarty
 */
    public function testFetchUri()
     {
-        $this->assertContains('<title>Preface | Smarty</title>', $this->smarty->fetch('string:{fetch file="https://www.smarty.net/docs/en/preface.tpl"}'));
+        $this->assertStringContainsString('<title>Preface | Smarty</title>', $this->smarty->fetch('string:{fetch file="https://www.smarty.net/docs/en/preface.tpl"}'));
     }
 
 /**
 * test {fetch} invalid uri
 *
-* @expectedException        SmartyException
-* @expectedExceptionMessage  {fetch} cannot read resource 'https://foo.smarty.net/foo.dat'
 * @runInSeparateProcess
 * @preserveGlobalState disabled
 */
   public function testFetchInvalidUri()
   {
-      $result = $this->smarty->fetch('string:{fetch file="https://foo.smarty.net/foo.dat"}');
+      $this->expectException('SmartyException');
+      $this->expectExceptionMessage('{fetch} cannot read resource \'https://foo.smarty.net/foo.dat\'');
+      $this->smarty->fetch('string:{fetch file="https://foo.smarty.net/foo.dat"}');
   }
 
   /**
   * test {fetch file=...} access to file from path not aloo/wed by security settings
   *
-  * @expectedException        SmartyException
-  * @expectedExceptionMessage   not trusted file path
   * @run InSeparateProcess
   * @preserveGlobalState disabled
   */
   public function testFetchSecurity()
   {
+      $this->expectException('SmartyException');
+      $this->expectExceptionMessage('not trusted file path');
       $this->cleanDirs();
       $dir=$this->smarty->getTemplateDir();
       $this->smarty->enableSecurity();
-      $result = $this->smarty->fetch('string:{fetch file=\''. $dir[0]. '../../../../../etc/passwd\'}');
+      $this->smarty->fetch('string:{fetch file=\''. $dir[0]. '../../../../../etc/passwd\'}');
   }
   /**
   * test {fetch file=...} access to file from path not aloo/wed by security settings
   *
-  * @expectedException        SmartyException
-  * @expectedExceptionMessage   not trusted file path
   * @run InSeparateProcess
   * @preserveGlobalState disabled
   */
   public function testFetchSecurity2()
   {
+      $this->expectException('SmartyException');
+      $this->expectExceptionMessage('not trusted file path');
       $this->cleanDirs();
-      $dir=$this->smarty->getTemplateDir();
+      $this->smarty->getTemplateDir();
       $this->smarty->enableSecurity();
       $this->smarty->setTemplateDir('/templates');
-      $result = $this->smarty->fetch('string:{fetch file="/templates/../etc/passwd"}');
+      $this->smarty->fetch('string:{fetch file="/templates/../etc/passwd"}');
   }
 
 }
diff --git a/tests/UnitTests/TemplateSource/TagTests/PluginFunction/PluginFunctionHtmlCheckboxesTest.php b/tests/UnitTests/TemplateSource/TagTests/PluginFunction/PluginFunctionHtmlCheckboxesTest.php
index 2e4d6e68..12aed25d 100644
--- a/tests/UnitTests/TemplateSource/TagTests/PluginFunction/PluginFunctionHtmlCheckboxesTest.php
+++ b/tests/UnitTests/TemplateSource/TagTests/PluginFunction/PluginFunctionHtmlCheckboxesTest.php
@@ -17,7 +17,7 @@ require_once(dirname(__FILE__) . '/helpers/_object_tostring.php');
  */
 class PluginFunctionHtmlCheckboxesTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
@@ -285,12 +285,7 @@ class PluginFunctionHtmlCheckboxesTest extends PHPUnit_Smarty
         $this->_errors = array();
         set_error_handler(array($this, 'error_handler'));
 
-        $n = "\n";
-        $expected = '<label><input type="checkbox" name="id[]" value="1000" />Joe Schmoe</label><br />'
-            . $n . '<label><input type="checkbox" name="id[]" value="1001" checked="checked" />Jack Smith</label><br />'
-            . $n . '<label><input type="checkbox" name="id[]" value="1002" />Jane Johnson</label><br />'
-            . $n . '<label><input type="checkbox" name="id[]" value="1003" />Charlie Brown</label><br />';
-
+        $this->smarty->muteUndefinedOrNullWarnings();
         $tpl = $this->smarty->createTemplate('eval:{html_checkboxes name="id" options=$cust_radios selected=$customer_id separator="<br />"}');
         $tpl->assign('customer_id', new _object_noString(1001));
         $tpl->assign('cust_radios', array(
@@ -312,12 +307,6 @@ class PluginFunctionHtmlCheckboxesTest extends PHPUnit_Smarty
         $this->_errors = array();
         set_error_handler(array($this, 'error_handler'));
 
-        $n = "\n";
-        $expected = '<label><input type="checkbox" name="id[]" value="1000" />Joe Schmoe</label><br />'
-            . $n . '<label><input type="checkbox" name="id[]" value="1001" checked="checked" />Jack Smith</label><br />'
-            . $n . '<label><input type="checkbox" name="id[]" value="1002" />Jane Johnson</label><br />'
-            . $n . '<label><input type="checkbox" name="id[]" value="1003" />Charlie Brown</label><br />';
-
         $tpl = $this->smarty->createTemplate('eval:{html_checkboxes name="id" options=$cust_radios selected=$customer_id separator="<br />"}');
         $tpl->assign('customer_id', 1001);
         $tpl->assign('cust_radios', array(
diff --git a/tests/UnitTests/TemplateSource/TagTests/PluginFunction/PluginFunctionHtmlImageTest.php b/tests/UnitTests/TemplateSource/TagTests/PluginFunction/PluginFunctionHtmlImageTest.php
deleted file mode 100644
index 4293450f..00000000
--- a/tests/UnitTests/TemplateSource/TagTests/PluginFunction/PluginFunctionHtmlImageTest.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-/**
- * Smarty PHPunit tests of modifier
- *
- * @package PHPunit
- * @author  Rodney Rehm
- */
-
-/**
- * class for modifier tests
- *
- * @runTestsInSeparateProcess
- * @preserveGlobalState disabled
- * @backupStaticAttributes enabled
- */
-class PluginFunctionHtmlImageTest extends PHPUnit_Smarty
-{
-    public function setUp()
-    {
-        $this->setUpSmarty(dirname(__FILE__));
-    }
-
-    public function testFoo()
-    {
-        // TODO: UnitTests for {html_image}
-    }
-}
diff --git a/tests/UnitTests/TemplateSource/TagTests/PluginFunction/PluginFunctionHtmlOptionsTest.php b/tests/UnitTests/TemplateSource/TagTests/PluginFunction/PluginFunctionHtmlOptionsTest.php
index d9182c4e..039a5eec 100644
--- a/tests/UnitTests/TemplateSource/TagTests/PluginFunction/PluginFunctionHtmlOptionsTest.php
+++ b/tests/UnitTests/TemplateSource/TagTests/PluginFunction/PluginFunctionHtmlOptionsTest.php
@@ -17,7 +17,7 @@ require_once(dirname(__FILE__) . '/helpers/_object_tostring.php');
  */
 class PluginFunctionHtmlOptionsTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
diff --git a/tests/UnitTests/TemplateSource/TagTests/PluginFunction/PluginFunctionHtmlRadiosTest.php b/tests/UnitTests/TemplateSource/TagTests/PluginFunction/PluginFunctionHtmlRadiosTest.php
index 819d1049..57a3ecc5 100644
--- a/tests/UnitTests/TemplateSource/TagTests/PluginFunction/PluginFunctionHtmlRadiosTest.php
+++ b/tests/UnitTests/TemplateSource/TagTests/PluginFunction/PluginFunctionHtmlRadiosTest.php
@@ -16,7 +16,7 @@ require_once(dirname(__FILE__) . '/helpers/_object_tostring.php');
  */
 class PluginFunctionHtmlRadiosTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
diff --git a/tests/UnitTests/TemplateSource/TagTests/PluginFunction/PluginFunctionHtmlSelectDateTest.php b/tests/UnitTests/TemplateSource/TagTests/PluginFunction/PluginFunctionHtmlSelectDateTest.php
index 8f4f79de..84e74bb8 100644
--- a/tests/UnitTests/TemplateSource/TagTests/PluginFunction/PluginFunctionHtmlSelectDateTest.php
+++ b/tests/UnitTests/TemplateSource/TagTests/PluginFunction/PluginFunctionHtmlSelectDateTest.php
@@ -207,7 +207,7 @@ class PluginFunctionHtmlSelectDateTest extends PHPUnit_Smarty
 <option value="031">31</option>',
     );
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
 
diff --git a/tests/UnitTests/TemplateSource/TagTests/PluginFunction/PluginFunctionHtmlSelectTimeTest.php b/tests/UnitTests/TemplateSource/TagTests/PluginFunction/PluginFunctionHtmlSelectTimeTest.php
index f152a8e8..acef4694 100644
--- a/tests/UnitTests/TemplateSource/TagTests/PluginFunction/PluginFunctionHtmlSelectTimeTest.php
+++ b/tests/UnitTests/TemplateSource/TagTests/PluginFunction/PluginFunctionHtmlSelectTimeTest.php
@@ -15,7 +15,7 @@
  */
 class PluginFunctionHtmlSelectTimeTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
         $this->now = mktime(16, 15, 11, 2, 20, 2011);
diff --git a/tests/UnitTests/TemplateSource/TagTests/PluginFunction/PluginFunctionMailtoTest.php b/tests/UnitTests/TemplateSource/TagTests/PluginFunction/PluginFunctionMailtoTest.php
index 2ea16ce5..e22d8ef3 100644
--- a/tests/UnitTests/TemplateSource/TagTests/PluginFunction/PluginFunctionMailtoTest.php
+++ b/tests/UnitTests/TemplateSource/TagTests/PluginFunction/PluginFunctionMailtoTest.php
@@ -15,7 +15,7 @@
  */
 class PluginFunctionMailtoTest extends PHPUnit_Smarty
 {
-     public function setUp()
+     public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
diff --git a/tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierCapitalizeTest.php b/tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierCapitalizeTest.php
index a78dce31..59b34fa8 100644
--- a/tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierCapitalizeTest.php
+++ b/tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierCapitalizeTest.php
@@ -15,7 +15,7 @@
  */
 class PluginModifierCapitalizeTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
diff --git a/tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierCharsetTest.php b/tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierCharsetTest.php
index 87fd673f..d960b23e 100644
--- a/tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierCharsetTest.php
+++ b/tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierCharsetTest.php
@@ -15,7 +15,7 @@
  */
 class PluginModifierCharsetTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
diff --git a/tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierCountCharactersTest.php b/tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierCountCharactersTest.php
index b2026cc8..df92c71a 100644
--- a/tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierCountCharactersTest.php
+++ b/tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierCountCharactersTest.php
@@ -15,7 +15,7 @@
  */
 class PluginModifierCountCharactersTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
diff --git a/tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierCountSentencesTest.php b/tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierCountSentencesTest.php
index acca87cb..a1a055b3 100644
--- a/tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierCountSentencesTest.php
+++ b/tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierCountSentencesTest.php
@@ -15,7 +15,7 @@
  */
 class PluginModifierCountSentencesTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
diff --git a/tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierCountWordsTest.php b/tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierCountWordsTest.php
index 2da98e1b..7684a39b 100644
--- a/tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierCountWordsTest.php
+++ b/tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierCountWordsTest.php
@@ -15,7 +15,7 @@
  */
 class PluginModifierCountWordsTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
diff --git a/tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierDefaultTest.php b/tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierDefaultTest.php
new file mode 100644
index 00000000..34bc7f50
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierDefaultTest.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Smarty PHPunit tests of modifier
+ *
+ * @package PHPunit
+ * @author  Rodney Rehm
+ */
+
+/**
+ * class for modifier tests
+ *
+ * @runTestsInSeparateProcess
+ * @preserveGlobalState disabled
+ * @backupStaticAttributes enabled
+ */
+class PluginModifierDefaultTest extends PHPUnit_Smarty
+{
+    public function setUp(): void
+    {
+        $this->setUpSmarty(dirname(__FILE__));
+    }
+
+    public function testDefault()
+    {
+        $tpl = $this->smarty->createTemplate('string:{$array.a.b|default:$array.c:\'defaultval\'}');
+
+        $this->smarty->assign('array', []);
+        $this->assertEquals('defaultval', $this->smarty->fetch($tpl));
+    }
+}
diff --git a/tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierEscapeTest.php b/tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierEscapeTest.php
index afabe71a..46a8297f 100644
--- a/tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierEscapeTest.php
+++ b/tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierEscapeTest.php
@@ -15,7 +15,7 @@
  */
 class PluginModifierEscapeTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
diff --git a/tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierLowerTest.php b/tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierLowerTest.php
index e465c7b9..b5fe9e41 100644
--- a/tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierLowerTest.php
+++ b/tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierLowerTest.php
@@ -14,7 +14,7 @@
  */
 class PluginModifierLowerTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
diff --git a/tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierRegexReplaceTest.php b/tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierRegexReplaceTest.php
index 88ce0982..b0fed84d 100644
--- a/tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierRegexReplaceTest.php
+++ b/tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierRegexReplaceTest.php
@@ -15,7 +15,7 @@
 */
 class PluginModifierRegexReplaceTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
diff --git a/tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierSpacifyTest.php b/tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierSpacifyTest.php
index 2ccd6cdb..55323845 100644
--- a/tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierSpacifyTest.php
+++ b/tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierSpacifyTest.php
@@ -15,7 +15,7 @@
  */
 class PluginModifierSpacifyTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
diff --git a/tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierStripTest.php b/tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierStripTest.php
index 9dc7bdf3..4383f965 100644
--- a/tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierStripTest.php
+++ b/tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierStripTest.php
@@ -15,7 +15,7 @@
  */
 class PluginModifierStripTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
diff --git a/tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierTruncateTest.php b/tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierTruncateTest.php
index 7af50af6..a6105817 100644
--- a/tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierTruncateTest.php
+++ b/tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierTruncateTest.php
@@ -15,7 +15,7 @@
  */
 class PluginModifierTruncateTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
diff --git a/tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierUnescapeTest.php b/tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierUnescapeTest.php
index 608eb5c4..c08adf95 100644
--- a/tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierUnescapeTest.php
+++ b/tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierUnescapeTest.php
@@ -15,7 +15,7 @@
  */
 class PluginModifierUnescapeTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
diff --git a/tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierUpperTest.php b/tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierUpperTest.php
index fb96fa5b..d4bff113 100644
--- a/tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierUpperTest.php
+++ b/tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierUpperTest.php
@@ -15,7 +15,7 @@
  */
 class PluginModifierUpperTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
diff --git a/tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierWordwrapTest.php b/tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierWordwrapTest.php
index bd94590d..c65ab3a7 100644
--- a/tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierWordwrapTest.php
+++ b/tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierWordwrapTest.php
@@ -15,7 +15,7 @@
  */
 class PluginModifierWordwrapTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
diff --git a/tests/UnitTests/TemplateSource/TagTests/Section/CompileSectionTest.php b/tests/UnitTests/TemplateSource/TagTests/Section/CompileSectionTest.php
index 0cedbcfd..9e422f34 100644
--- a/tests/UnitTests/TemplateSource/TagTests/Section/CompileSectionTest.php
+++ b/tests/UnitTests/TemplateSource/TagTests/Section/CompileSectionTest.php
@@ -15,7 +15,7 @@
  */
 class CompileSectionTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
diff --git a/tests/UnitTests/TemplateSource/TagTests/SetFilter/CompileSetfilterTest.php b/tests/UnitTests/TemplateSource/TagTests/SetFilter/CompileSetfilterTest.php
index 89b187e5..1dcbaf37 100644
--- a/tests/UnitTests/TemplateSource/TagTests/SetFilter/CompileSetfilterTest.php
+++ b/tests/UnitTests/TemplateSource/TagTests/SetFilter/CompileSetfilterTest.php
@@ -15,7 +15,7 @@
  */
 class CompileSetfilterTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
diff --git a/tests/UnitTests/TemplateSource/TagTests/Strip/CompileStripTest.php b/tests/UnitTests/TemplateSource/TagTests/Strip/CompileStripTest.php
index cc850d38..ae9f0e69 100644
--- a/tests/UnitTests/TemplateSource/TagTests/Strip/CompileStripTest.php
+++ b/tests/UnitTests/TemplateSource/TagTests/Strip/CompileStripTest.php
@@ -15,7 +15,7 @@
  */
 class CompileStripTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
         $this->smarty->addPluginsDir("../../../__shared/PHPunitplugins/");
diff --git a/tests/UnitTests/TemplateSource/TagTests/TemplateFunction/CompileFunctionTest.php b/tests/UnitTests/TemplateSource/TagTests/TemplateFunction/CompileFunctionTest.php
index 65d3b2de..ca3e3714 100644
--- a/tests/UnitTests/TemplateSource/TagTests/TemplateFunction/CompileFunctionTest.php
+++ b/tests/UnitTests/TemplateSource/TagTests/TemplateFunction/CompileFunctionTest.php
@@ -15,7 +15,7 @@
  */
 class CompileFunctionTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
    }
@@ -196,7 +196,7 @@ class CompileFunctionTest extends PHPUnit_Smarty
         $this->smarty->cache_lifetime = 1000;
         $tpl = $this->smarty->createTemplate('test_template_function.tpl', $cacheId);
         $tpl->assign('foo', 'foo');
-        $this->assertContains('foo foo', $this->smarty->fetch($tpl), $text);
+        $this->assertStringContainsString('foo foo', $this->smarty->fetch($tpl), $text);
     }
 
     /**
@@ -208,9 +208,9 @@ class CompileFunctionTest extends PHPUnit_Smarty
     public function testExternalDefinedFunctionCalledByFetch()
     {
         $this->smarty->assign('foo', 'foo');
-        $this->assertContains('foo foo', $this->smarty->fetch('test_template_function.tpl'));
+        $this->assertStringContainsString('foo foo', $this->smarty->fetch('test_template_function.tpl'));
         $this->smarty->assign('foo', 'bar');
-        $this->assertContains('bar bar', $this->smarty->fetch('test_template_function_call.tpl'));
+        $this->assertStringContainsString('bar bar', $this->smarty->fetch('test_template_function_call.tpl'));
     }
 
     /**
@@ -229,7 +229,7 @@ class CompileFunctionTest extends PHPUnit_Smarty
         $tpl = $this->smarty->createTemplate('test_template_function.tpl', $cacheId);
         $this->assertTrue($this->smarty->isCached($tpl), $text);
         $tpl->assign('foo', 'bar');
-        $this->assertContains('foo bar', $this->smarty->fetch($tpl), $text);
+        $this->assertStringContainsString('foo bar', $this->smarty->fetch($tpl), $text);
     }
 
     /**
@@ -247,7 +247,7 @@ class CompileFunctionTest extends PHPUnit_Smarty
         $this->smarty->cache_lifetime = 1000;
         $tpl = $this->smarty->createTemplate('test_template_function_nocache_call.tpl', $cacheId);
         $tpl->assign('foo', 'foo');
-        $this->assertContains('foo foo', $this->smarty->fetch($tpl), $text);
+        $this->assertStringContainsString('foo foo', $this->smarty->fetch($tpl), $text);
     }
 
     /**
@@ -266,7 +266,7 @@ class CompileFunctionTest extends PHPUnit_Smarty
         $tpl = $this->smarty->createTemplate('test_template_function_nocache_call.tpl', $cacheId);
         $this->assertTrue($this->smarty->isCached($tpl), $text);
         $tpl->assign('foo', 'bar');
-        $this->assertContains('bar bar', $this->smarty->fetch($tpl), $text);
+        $this->assertStringContainsString('bar bar', $this->smarty->fetch($tpl), $text);
     }
 
     /**
@@ -285,7 +285,7 @@ class CompileFunctionTest extends PHPUnit_Smarty
         $tpl = $this->smarty->createTemplate('test_template_function_nocache_call.tpl', $cacheId);
         $this->assertTrue($this->smarty->isCached($tpl), $text);
         $tpl->assign('foo', 'bar');
-        $this->assertContains('bar bar', $this->smarty->fetch($tpl), $text);
+        $this->assertStringContainsString('bar bar', $this->smarty->fetch($tpl), $text);
     }
 
     /**
diff --git a/tests/UnitTests/TemplateSource/TagTests/While/CompileWhileTest.php b/tests/UnitTests/TemplateSource/TagTests/While/CompileWhileTest.php
index 78fe828a..a808aec9 100644
--- a/tests/UnitTests/TemplateSource/TagTests/While/CompileWhileTest.php
+++ b/tests/UnitTests/TemplateSource/TagTests/While/CompileWhileTest.php
@@ -15,7 +15,7 @@
  */
 class CompileWhileTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
diff --git a/tests/UnitTests/TemplateSource/TagTests/_Attributes/AttributeTest.php b/tests/UnitTests/TemplateSource/TagTests/_Attributes/AttributeTest.php
index b3fe851f..ad81d673 100644
--- a/tests/UnitTests/TemplateSource/TagTests/_Attributes/AttributeTest.php
+++ b/tests/UnitTests/TemplateSource/TagTests/_Attributes/AttributeTest.php
@@ -15,7 +15,7 @@
  */
 class AttributeTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
         $this->smarty->addPluginsDir("../../../__shared/PHPunitplugins/");
@@ -28,43 +28,43 @@ class AttributeTest extends PHPUnit_Smarty
     }
 
     /**
-     * @expectedException        SmartyCompilerException
-     * @expectedExceptionMessage missing 'var' attribute
      * test required attribute
      */
     public function testRequiredAttributeVar()
     {
+        $this->expectException('SmartyCompilerException');
+        $this->expectExceptionMessage('missing \'var\' attribute');
         $this->smarty->fetch('string:{assign value=1}');
     }
 
     /**
-     * @expectedException        SmartyCompilerException
-     * @expectedExceptionMessage unexpected 'bar' attribute
      * test unexpected attribute
      */
     public function testUnexpectedAttribute()
     {
+        $this->expectException('SmartyCompilerException');
+        $this->expectExceptionMessage('unexpected \'bar\' attribute');
         $this->smarty->fetch('string:{assign var=foo value=1 bar=2}');
     }
 
     /**
-     * @expectedException        SmartyCompilerException
-     * @expectedExceptionMessage for option flag 'nocache'
-     * @expectedExceptionMessage illegal value
      * test illegal option value
      */
     public function testIllegalOptionValue()
     {
+        $this->expectException('SmartyCompilerException');
+        $this->expectExceptionMessage('for option flag \'nocache\'');
+        $this->expectExceptionMessage('illegal value');
         $this->smarty->fetch('string:{assign var=foo value=1 nocache=buh}');
     }
 
     /**
-     * @expectedException        SmartyCompilerException
-     * @expectedExceptionMessage too many shorthand attributes
      * test too many shorthands
      */
     public function testTooManyShorthands()
     {
+        $this->expectException('SmartyCompilerException');
+        $this->expectExceptionMessage('too many shorthand attributes');
         $this->smarty->fetch('string:{assign foo 1 2}');
     }
 
diff --git a/tests/UnitTests/TemplateSource/TagTests/_Error/CompileErrorTest.php b/tests/UnitTests/TemplateSource/TagTests/_Error/CompileErrorTest.php
index b190c5ff..2f50ea31 100644
--- a/tests/UnitTests/TemplateSource/TagTests/_Error/CompileErrorTest.php
+++ b/tests/UnitTests/TemplateSource/TagTests/_Error/CompileErrorTest.php
@@ -15,7 +15,7 @@
  */
 class CompileErrorTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
@@ -26,42 +26,42 @@ class CompileErrorTest extends PHPUnit_Smarty
     }
 
     /**
-     * @expectedException        SmartyException
-     * @expectedExceptionMessage no.tpl
      * test none existing template file error
      */
     public function testNoneExistingTemplateError()
     {
+        $this->expectException('SmartyException');
+        $this->expectExceptionMessage('no.tpl');
         $this->smarty->fetch('eval:{include file=\'no.tpl\'}');
     }
 
     /**
-     * @expectedException        SmartyCompilerException
-     * @expectedExceptionMessage unknown tag 'unknown'
      * test unkown tag error
      */
     public function testUnknownTagError()
     {
+        $this->expectException('SmartyCompilerException');
+        $this->expectExceptionMessage('unknown tag \'unknown\'');
         $this->smarty->fetch('eval:{unknown}');
     }
 
     /**
-     * @expectedException        SmartyCompilerException
-     * @expectedExceptionMessage unclosed {if} tag
      * test unclosed tag error
      */
     public function testUnclosedTagError()
     {
+        $this->expectException('SmartyCompilerException');
+        $this->expectExceptionMessage('unclosed {if} tag');
         $this->smarty->fetch('eval:{if true}');
     }
 
     /**
-     * @expectedException        SmartyCompilerException
-     * @expectedExceptionMessage Unexpected "}"
      * test syntax error
      */
     public function testSyntaxError()
     {
+        $this->expectException('SmartyCompilerException');
+        $this->expectExceptionMessage('Unexpected "}"');
         $this->smarty->fetch('eval:{assign var=}');
     }
 }
diff --git a/tests/UnitTests/TemplateSource/TagTests/_Print/PrintTest.php b/tests/UnitTests/TemplateSource/TagTests/_Print/PrintTest.php
index 6c5d624a..b856a969 100644
--- a/tests/UnitTests/TemplateSource/TagTests/_Print/PrintTest.php
+++ b/tests/UnitTests/TemplateSource/TagTests/_Print/PrintTest.php
@@ -15,7 +15,7 @@
  */
 class PrintTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
diff --git a/tests/UnitTests/TemplateSource/TagTests/break/CompileBreakTest.php b/tests/UnitTests/TemplateSource/TagTests/break/CompileBreakTest.php
index 7594678a..e0a68ff6 100644
--- a/tests/UnitTests/TemplateSource/TagTests/break/CompileBreakTest.php
+++ b/tests/UnitTests/TemplateSource/TagTests/break/CompileBreakTest.php
@@ -15,7 +15,7 @@
  */
 class CompileBreakTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
diff --git a/tests/UnitTests/TemplateSource/ValueTests/Array/ArrayTest.php b/tests/UnitTests/TemplateSource/ValueTests/Array/ArrayTest.php
index d8f5cd63..67868bb8 100644
--- a/tests/UnitTests/TemplateSource/ValueTests/Array/ArrayTest.php
+++ b/tests/UnitTests/TemplateSource/ValueTests/Array/ArrayTest.php
@@ -15,7 +15,7 @@
  */
 class ArrayTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
diff --git a/tests/UnitTests/TemplateSource/ValueTests/BoolenNull/BooleanNullTest.php b/tests/UnitTests/TemplateSource/ValueTests/BoolenNull/BooleanNullTest.php
index 9fba0bac..20eed17b 100644
--- a/tests/UnitTests/TemplateSource/ValueTests/BoolenNull/BooleanNullTest.php
+++ b/tests/UnitTests/TemplateSource/ValueTests/BoolenNull/BooleanNullTest.php
@@ -15,7 +15,7 @@
  */
 class BooleanNullTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
diff --git a/tests/UnitTests/TemplateSource/ValueTests/ConstantTests/ConstantsTest.php b/tests/UnitTests/TemplateSource/ValueTests/ConstantTests/ConstantsTest.php
index 42f9df6f..4168a152 100644
--- a/tests/UnitTests/TemplateSource/ValueTests/ConstantTests/ConstantsTest.php
+++ b/tests/UnitTests/TemplateSource/ValueTests/ConstantTests/ConstantsTest.php
@@ -19,7 +19,7 @@ Class TestConst
  */
 class ConstantsTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
@@ -76,16 +76,22 @@ class ConstantsTest extends PHPUnit_Smarty
         $tpl->assign('obj', new TestConst());
         $this->assertEquals("yes", $this->smarty->fetch($tpl));
     }
+
     public function testConstantsUndefined()
     {
-	    $this->smarty->setErrorReporting(E_ALL & ~E_WARNING & ~E_NOTICE);
         $tpl = $this->smarty->createTemplate('string:{$smarty.const.MYCONSTANT2}');
         $this->assertEquals("", $this->smarty->fetch($tpl));
     }
+
     public function testConstantsUndefined2()
     {
-	    $this->smarty->setErrorReporting(E_ALL & ~E_WARNING & ~E_NOTICE);
         $tpl = $this->smarty->createTemplate('eval:{$foo = MYCONSTANT2}{$foo}');
         $this->assertEquals("MYCONSTANT2", $this->smarty->fetch($tpl));
     }
+
+    public function testConstantsUndefined3()
+    {
+        $tpl = $this->smarty->createTemplate('eval:{if $smarty.const.MYCONSTANT2}{$smarty.const.MYCONSTANT2}{/if}');
+        $this->assertEquals("", $this->smarty->fetch($tpl));
+    }
 }
diff --git a/tests/UnitTests/TemplateSource/ValueTests/DoubleQuoted/DoubleQuotedStringTest.php b/tests/UnitTests/TemplateSource/ValueTests/DoubleQuoted/DoubleQuotedStringTest.php
index 0b647b4c..653c2691 100644
--- a/tests/UnitTests/TemplateSource/ValueTests/DoubleQuoted/DoubleQuotedStringTest.php
+++ b/tests/UnitTests/TemplateSource/ValueTests/DoubleQuoted/DoubleQuotedStringTest.php
@@ -15,7 +15,7 @@
 */
 class DoubleQuotedStringTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
         $this->smarty->addPluginsDir("../../../__shared/PHPunitplugins/");
@@ -80,14 +80,12 @@ class DoubleQuotedStringTest extends PHPUnit_Smarty
 
 
     /**
-     *
      * test unclosed block tag
-     *
-     * @expectedException        SmartyCompilerException
-     * @expectedExceptionMessage unclosed '{if}' in doubled quoted string
      */
     public function testDoubleQuotedUnclosedBlock_001()
     {
+        $this->expectException('SmartyCompilerException');
+        $this->expectExceptionMessage('unclosed \'{if}\' in doubled quoted string');
         $this->smarty->fetch('001_unclosedBlock.tpl');
     }
 
diff --git a/tests/UnitTests/TemplateSource/ValueTests/Math/MathTest.php b/tests/UnitTests/TemplateSource/ValueTests/Math/MathTest.php
index ff0b3a1c..9c45d36e 100644
--- a/tests/UnitTests/TemplateSource/ValueTests/Math/MathTest.php
+++ b/tests/UnitTests/TemplateSource/ValueTests/Math/MathTest.php
@@ -15,7 +15,7 @@
  */
 class MathTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
diff --git a/tests/UnitTests/TemplateSource/ValueTests/Modifier/ModifierTest.php b/tests/UnitTests/TemplateSource/ValueTests/Modifier/ModifierTest.php
index 2dc1751b..6578550f 100644
--- a/tests/UnitTests/TemplateSource/ValueTests/Modifier/ModifierTest.php
+++ b/tests/UnitTests/TemplateSource/ValueTests/Modifier/ModifierTest.php
@@ -15,7 +15,7 @@
  */
 class ModifierTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
         $this->smarty->addTemplateDir("./templates_tmp");
@@ -96,12 +96,12 @@ class ModifierTest extends PHPUnit_Smarty
     }
 
     /**
-     * @expectedException        SmartyCompilerException
-     * @expectedExceptionMessage unknown modifier 'unknown'
      * test unknown modifier error
      */
     public function testUnknownModifier()
     {
+        $this->expectException('SmartyCompilerException');
+        $this->expectExceptionMessage('unknown modifier \'unknown\'');
         $this->smarty->fetch('eval:{"hello world"|unknown}');
     }
 
diff --git a/tests/UnitTests/TemplateSource/ValueTests/Objects/ObjectVariableTest.php b/tests/UnitTests/TemplateSource/ValueTests/Objects/ObjectVariableTest.php
index 717b94e8..4180dbac 100644
--- a/tests/UnitTests/TemplateSource/ValueTests/Objects/ObjectVariableTest.php
+++ b/tests/UnitTests/TemplateSource/ValueTests/Objects/ObjectVariableTest.php
@@ -15,7 +15,7 @@
  */
 class ObjectVariableTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
         $this->smarty->setForceCompile(true);
diff --git a/tests/UnitTests/TemplateSource/ValueTests/PHPfunctions/PhpFunctionTest.php b/tests/UnitTests/TemplateSource/ValueTests/PHPfunctions/PhpFunctionTest.php
index 7534e024..c8f0f9ea 100644
--- a/tests/UnitTests/TemplateSource/ValueTests/PHPfunctions/PhpFunctionTest.php
+++ b/tests/UnitTests/TemplateSource/ValueTests/PHPfunctions/PhpFunctionTest.php
@@ -17,7 +17,7 @@
  */
 class PhpFunctionTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
@@ -56,10 +56,6 @@ class PhpFunctionTest extends PHPUnit_Smarty
      */
     public function testEmpty2()
     {
-        if (version_compare(phpversion(), '5.5', '<')) {
-            $this->markTestSkipped('runs only on PHP >= 5.5');
-        }
-
         $this->smarty->disableSecurity();
         $this->smarty->assign('var', array(null,
                                            false,
@@ -81,9 +77,6 @@ class PhpFunctionTest extends PHPUnit_Smarty
      */
     public function testEmpty3()
     {
-        if (version_compare(phpversion(), '5.5', '<')) {
-            $this->markTestSkipped('runs only on PHP >= 5.5');
-        }
         $this->smarty->disableSecurity();
         $this->smarty->assign('var', array(true,
                                            (int) 1,
@@ -103,10 +96,6 @@ class PhpFunctionTest extends PHPUnit_Smarty
      */
     public function testEmpty4()
     {
-        if (version_compare(phpversion(), '5.5', '<')) {
-        $this->markTestSkipped('runs only on PHP >= 5.5');
-        }
-
         $this->smarty->disableSecurity();
         $this->smarty->assign('var', new TestIsset());
         $expected = ' true , false , false , true , true , true , false ';
@@ -157,56 +146,56 @@ class PhpFunctionTest extends PHPUnit_Smarty
         '));
     }
 
-	/**
-	 * 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();
+    /**
+     * 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 = array(
-			'keythatexists' => false,
-			'keywitharray' => array(1 => 1),
-			'keywithobject' => new TestIsset()
-		));
+        $this->smarty->assign('varobject', new TestIsset());
+        $this->smarty->assign('vararray', $vararray = array(
+            'keythatexists' => false,
+            'keywitharray' => array(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->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));
-	}
+        $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'),
-		);
-	}
+    /**
+     * 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'),
+        );
+    }
 }
 
 /**
diff --git a/tests/UnitTests/TemplateSource/ValueTests/SingleQouted/SingleQuotedStringTest.php b/tests/UnitTests/TemplateSource/ValueTests/SingleQouted/SingleQuotedStringTest.php
index 41378e1b..b55871bb 100644
--- a/tests/UnitTests/TemplateSource/ValueTests/SingleQouted/SingleQuotedStringTest.php
+++ b/tests/UnitTests/TemplateSource/ValueTests/SingleQouted/SingleQuotedStringTest.php
@@ -15,7 +15,7 @@
  */
 class SingleQuotedStringTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
diff --git a/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Constant/SmartyConstantTest.php b/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Constant/SmartyConstantTest.php
index 179f7123..990d686b 100644
--- a/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Constant/SmartyConstantTest.php
+++ b/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Constant/SmartyConstantTest.php
@@ -15,7 +15,7 @@
  */
 class SmartyConstantTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
diff --git a/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Cookie/CookieTest.php b/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Cookie/CookieTest.php
index cb92b776..e6e3dc44 100644
--- a/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Cookie/CookieTest.php
+++ b/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Cookie/CookieTest.php
@@ -15,7 +15,7 @@
  */
 class CookieTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
diff --git a/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Delimiter/SmartyDelimiterTest.php b/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Delimiter/SmartyDelimiterTest.php
index 3a298362..0b1bd1d4 100644
--- a/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Delimiter/SmartyDelimiterTest.php
+++ b/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Delimiter/SmartyDelimiterTest.php
@@ -15,7 +15,7 @@
  */
 class SmartyDelimiterTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
diff --git a/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Error/SmartyErrorTest.php b/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Error/SmartyErrorTest.php
index b14c271c..07ba2677 100644
--- a/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Error/SmartyErrorTest.php
+++ b/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Error/SmartyErrorTest.php
@@ -15,7 +15,7 @@
  */
 class SmartyErrorTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
@@ -25,12 +25,11 @@ class SmartyErrorTest extends PHPUnit_Smarty
         $this->cleanDirs();
     }
     /**
-     * @expectedException        SmartyException
-     * @expectedExceptionMessage $smarty.foo is not defined
      * test undefined Smarty special variable
-     *
      */
     public function testSmartyError() {
+        $this->expectException('SmartyException');
+        $this->expectExceptionMessage('$smarty.foo is not defined');
         $this->assertEquals(Smarty::SMARTY_VERSION, $this->smarty->fetch('error.tpl'));
     }
  }
diff --git a/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Now/SmartyNowTest.php b/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Now/SmartyNowTest.php
index 21f4bf26..ed7d6b35 100644
--- a/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Now/SmartyNowTest.php
+++ b/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Now/SmartyNowTest.php
@@ -15,7 +15,7 @@
  */
 class SmartyNowTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
diff --git a/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Post/PostTest.php b/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Post/PostTest.php
index a49e44d8..f924edb8 100644
--- a/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Post/PostTest.php
+++ b/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Post/PostTest.php
@@ -15,7 +15,7 @@
  */
 class PostTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
diff --git a/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/TemplateObject/SmartyTemplateObjectTest.php b/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/TemplateObject/SmartyTemplateObjectTest.php
index 6f661b4d..4f24f4eb 100644
--- a/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/TemplateObject/SmartyTemplateObjectTest.php
+++ b/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/TemplateObject/SmartyTemplateObjectTest.php
@@ -15,7 +15,7 @@
  */
 class SmartyTemplateObjectTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
diff --git a/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Version/SmartyVersionTest.php b/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Version/SmartyVersionTest.php
index 733609a3..518e42f3 100644
--- a/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Version/SmartyVersionTest.php
+++ b/tests/UnitTests/TemplateSource/ValueTests/SmartySpecialVars/Version/SmartyVersionTest.php
@@ -15,7 +15,7 @@
  */
 class SmartyVersionTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
diff --git a/tests/UnitTests/TemplateSource/ValueTests/Variables/Stream/StreamVariableTest.php b/tests/UnitTests/TemplateSource/ValueTests/Variables/Stream/StreamVariableTest.php
index aed4fb9b..e49d6205 100644
--- a/tests/UnitTests/TemplateSource/ValueTests/Variables/Stream/StreamVariableTest.php
+++ b/tests/UnitTests/TemplateSource/ValueTests/Variables/Stream/StreamVariableTest.php
@@ -15,7 +15,7 @@
  */
 class StreamVariableTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
 
@@ -31,7 +31,7 @@ class StreamVariableTest extends PHPUnit_Smarty
         $this->cleanDirs();
     }
 
-    public function tearDown()
+    protected function tearDown(): void
     {
         parent::tearDown();
         stream_wrapper_unregister("var");
diff --git a/tests/UnitTests/TemplateSource/ValueTests/Variables/VariableVariable/VariableVariableTest.php b/tests/UnitTests/TemplateSource/ValueTests/Variables/VariableVariable/VariableVariableTest.php
index cbd7c662..3e45a204 100644
--- a/tests/UnitTests/TemplateSource/ValueTests/Variables/VariableVariable/VariableVariableTest.php
+++ b/tests/UnitTests/TemplateSource/ValueTests/Variables/VariableVariable/VariableVariableTest.php
@@ -15,7 +15,7 @@
  */
 class VariableVariableTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
diff --git a/tests/UnitTests/TemplateSource/X_Scopes/ScopeTest.php b/tests/UnitTests/TemplateSource/X_Scopes/ScopeTest.php
index e546b670..c24ec2b3 100644
--- a/tests/UnitTests/TemplateSource/X_Scopes/ScopeTest.php
+++ b/tests/UnitTests/TemplateSource/X_Scopes/ScopeTest.php
@@ -15,7 +15,7 @@
  */
 class ScopeTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
         $this->smarty->addPluginsDir("../../__shared/PHPunitplugins/");
@@ -291,6 +291,9 @@ class ScopeTest extends PHPUnit_Smarty
                            'no  smarty', $i ++,),);
     }
 
+    /**
+     * @doesNotPerformAssertions
+     */
     public function testFunctionScope()
     {
         $this->smarty->assign('scope', 'none');
diff --git a/tests/UnitTests/TemplateSource/Xml/XmlTest.php b/tests/UnitTests/TemplateSource/Xml/XmlTest.php
index 9690a35c..78473284 100644
--- a/tests/UnitTests/TemplateSource/Xml/XmlTest.php
+++ b/tests/UnitTests/TemplateSource/Xml/XmlTest.php
@@ -15,7 +15,7 @@
  */
 class XmlTest extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
         $this->smarty->enableSecurity();
@@ -37,23 +37,10 @@ class XmlTest extends PHPUnit_Smarty
     }
 
     /**
-     * test standard xml Smarty::PHP_QUOTE
-     */
-    public function testXmlPhpQuote()
-    {
-        $this->smarty->compile_id = 'PHP_QUOTE';
-        $this->smarty->security_policy->php_handling = Smarty::PHP_QUOTE;
-        $tpl = $this->smarty->createTemplate('xml.tpl');
-        $this->assertEquals('<?xml version="1.0" encoding="UTF-8"?>', $this->smarty->fetch($tpl));
-    }
-
-    /**
-     * test standard xml Smarty::PHP_ALLOW
+     * test standard xml
      */
     public function testXmlPhpAllow()
     {
-        $this->smarty->compile_id = 'PHP_ALLOW';
-        $this->smarty->security_policy->php_handling = Smarty::PHP_ALLOW;
         $tpl = $this->smarty->createTemplate('xml.tpl');
         $this->assertEquals('<?xml version="1.0" encoding="UTF-8"?>', $this->smarty->fetch($tpl));
     }
@@ -63,7 +50,6 @@ class XmlTest extends PHPUnit_Smarty
      */
     public function testXmlCaching()
     {
-        $this->smarty->security_policy->php_handling = Smarty::PHP_PASSTHRU;
         $this->smarty->caching = true;
         $this->smarty->cache_lifetime = 1000;
         $content = $this->smarty->fetch('xml.tpl');
@@ -74,38 +60,13 @@ class XmlTest extends PHPUnit_Smarty
      */
     public function testXmlCaching2()
     {
-        $this->smarty->security_policy->php_handling = Smarty::PHP_PASSTHRU;
         $this->smarty->caching = true;
         $this->smarty->cache_lifetime = 1000;
         $content = $this->smarty->fetch('xml_main.tpl');
         $this->assertEquals('<?xml version="1.0" encoding="UTF-8"?>', $content);
     }
 
-    /**
-     * test xml caching PhpQuote
-     */
-    public function testXmlCachingPhpQuote()
-    {
-        $this->smarty->compile_id = 'PHP_QUOTE';
-        $this->smarty->security_policy->php_handling = Smarty::PHP_QUOTE;
-        $this->smarty->caching = true;
-        $this->smarty->cache_lifetime = 1000;
-        $content = $this->smarty->fetch('xml.tpl');
-        $this->assertEquals('<?xml version="1.0" encoding="UTF-8"?>', $content);
-    }
 
-    /**
-     * test xml caching PhpAllow
-     */
-    public function testXmlCachingPhpAllow()
-    {
-        $this->smarty->compile_id = 'PHP_ALLOW';
-        $this->smarty->security_policy->php_handling = Smarty::PHP_ALLOW;
-        $this->smarty->caching = true;
-        $this->smarty->cache_lifetime = 1000;
-        $content = $this->smarty->fetch('xml.tpl');
-        $this->assertEquals('<?xml version="1.0" encoding="UTF-8"?>', $content);
-    }
     /**
      * test xml with variable
      */
diff --git a/tests/UnitTests/TemplateSource/_Issues/327/ModifierIssue327Test.php b/tests/UnitTests/TemplateSource/_Issues/327/ModifierIssue327Test.php
index ecbf045d..8418ea3e 100644
--- a/tests/UnitTests/TemplateSource/_Issues/327/ModifierIssue327Test.php
+++ b/tests/UnitTests/TemplateSource/_Issues/327/ModifierIssue327Test.php
@@ -15,7 +15,7 @@
  */
 class ModifierIssue327Test extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
diff --git a/tests/UnitTests/TemplateSource/_Issues/419/ExtendsIssue419Test.php b/tests/UnitTests/TemplateSource/_Issues/419/ExtendsIssue419Test.php
index 1f969291..d6358a5c 100644
--- a/tests/UnitTests/TemplateSource/_Issues/419/ExtendsIssue419Test.php
+++ b/tests/UnitTests/TemplateSource/_Issues/419/ExtendsIssue419Test.php
@@ -15,7 +15,7 @@
  */
 class ExtendsIssue419Test extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
diff --git a/tests/UnitTests/TemplateSource/_Issues/422/NestedLoopIssue422Test.php b/tests/UnitTests/TemplateSource/_Issues/422/NestedLoopIssue422Test.php
index c541b3cb..4a772789 100644
--- a/tests/UnitTests/TemplateSource/_Issues/422/NestedLoopIssue422Test.php
+++ b/tests/UnitTests/TemplateSource/_Issues/422/NestedLoopIssue422Test.php
@@ -17,7 +17,7 @@
  */
 class NestedLoopIssue422Test extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
diff --git a/tests/UnitTests/TemplateSource/_Issues/428/SectionPropertiesShortSyntaxIssue428Test.php b/tests/UnitTests/TemplateSource/_Issues/428/SectionPropertiesShortSyntaxIssue428Test.php
index 7c900349..1b0fbc06 100644
--- a/tests/UnitTests/TemplateSource/_Issues/428/SectionPropertiesShortSyntaxIssue428Test.php
+++ b/tests/UnitTests/TemplateSource/_Issues/428/SectionPropertiesShortSyntaxIssue428Test.php
@@ -17,7 +17,7 @@
  */
 class SectionPropertiesShortSyntaxIssue428Test extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
diff --git a/tests/UnitTests/TemplateSource/_Issues/topic26878/NewlineSpacing.php b/tests/UnitTests/TemplateSource/_Issues/topic26878/NewlineSpacing.php
index 6feac558..b1f34d39 100644
--- a/tests/UnitTests/TemplateSource/_Issues/topic26878/NewlineSpacing.php
+++ b/tests/UnitTests/TemplateSource/_Issues/topic26878/NewlineSpacing.php
@@ -15,7 +15,7 @@
  */
 class NewlineSpacing extends PHPUnit_Smarty
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
     }
diff --git a/travis.ini b/travis.ini
deleted file mode 100644
index 00b62452..00000000
--- a/travis.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-extension = "memcache.so"
-extension = "apc.so"
\ No newline at end of file