Added some unit test to study consistent behavior on passing argument by reference.

Merge branch 'release/3.1.48' into support/3.1
version bump
2026-08-04 12:34:33 +02:00 · 2024-04-05 17:04:03 +02:00 · 2023-03-28 21:45:54 +02:00 · 2023-03-28 21:45:52 +02:00 · 2023-03-28 21:43:12 +02:00 · 2023-03-28 21:41:31 +02:00
80 changed files with 1375 additions and 400 deletions
@@ -6,11 +6,16 @@
 *.lex text eol=lf

 # exclude from git export
-/travis.ini export-ignore
-/myconfig.ini export-ignore
-/.travis.yml export-ignore
-/.gitignore export-ignore
-/.gitattributes export-ignore
-/lexer/ export-ignore
+/tests export-ignore
 /utilities/ export-ignore
-/error_reporting.ini export-ignore
+/docker-compose.yml export-ignore
+/.github export-ignore
+/run_tests_for_all_php_versions.sh export-ignore
+/.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
@@ -0,0 +1,69 @@
+# https://help.github.com/en/categories/automating-your-workflow-with-github-actions
+
+on:
+  pull_request:
+  push:
+    branches:
+      - 'support/3.1'
+
+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:
+          - "5.3"
+          - "5.4"
+          - "5.5"
+          - "5.6"          
+          - "7.1"
+          - "7.2"
+          - "7.3"
+          - "7.4"
+
+        compiler:
+          - default
+
+    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: Smartyv3-${{ runner.os }}-php-${{ matrix.php-version }}-${{ hashFiles('**/composer.lock') }}
+        restore-keys: |
+          Smartyv3-${{ runner.os }}-php-${{ matrix.php-version }}-
+
+    - name: Run tests with phpunit
+      run: ./run-tests.sh
@@ -1,34 +1,39 @@
-
 language: php
+os: linux
+dist: xenial

-sudo: false
+install:
+  - travis_retry composer install

-dist: trusty
-
-matrix:
+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: nightly # PHP 8 is still in beta

 services:
  - memcached
  - mysql

 before_script:
-    - mysql -e "create database IF NOT EXISTS test;" -uroot
+  - mysql -e "create database IF NOT EXISTS test;" -uroot

 before_install:
-    - phpenv config-rm xdebug.ini || return 0
-
-install:
-    - travis_retry composer install
+  - phpenv config-rm xdebug.ini || return 0

 script:
-   - ./phpunit.sh
+  - ./phpunit.sh
@@ -1,7 +1,108 @@
- - fix foreachelse on arrayiterators https://github.com/smarty-php/smarty/issues/506
- - fix errors that occured where isset was replaced with null check such as https://github.com/smarty-php/smarty/issues/453
+# Changelog
+All notable changes to this project will be documented in this file.

-===== 3.1.34 release ===== 05.11.2019
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+## [3.1.48] - 2023-03-28
+
+### Security
+- Fixed Cross site scripting vulnerability in Javascript escaping.  This addresses CVE-2023-28447.
+
+### Fixed
+- Output buffer is now cleaned for internal PHP errors as well, not just for Exceptions [#514](https://github.com/smarty-php/smarty/issues/514)
+
+## [3.1.47] - 2022-09-14
+
+### Security
+- Applied appropriate javascript and html escaping in mailto plugin to counter injection attacks [#454](https://github.com/smarty-php/smarty/issues/454)
+
+### Fixed
+- Fixed use of `rand()` without a parameter in math function [#794](https://github.com/smarty-php/smarty/issues/794)
+- Fixed unselected year/month/day not working in html_select_date [#395](https://github.com/smarty-php/smarty/issues/395)
+- Updated requirement contraint for 'php' in composer.json to correctly reflect that Smarty3 does not support PHP8. Please upgrade to Smarty4 to use PHP8. 
+ 
+## [3.1.46] - 2022-08-01
+
+### Fixed
+- Fixed problems with smarty_mb_str_replace [#549](https://github.com/smarty-php/smarty/issues/549)
+- Fixed second parameter of unescape modifier not working [#777](https://github.com/smarty-php/smarty/issues/777)
+
+## [3.1.45] - 2022-05-17
+
+### Security
+- Prevent PHP injection through malicious block name or include file name. This addresses CVE-2022-29221
+
+### Fixed
+- Math equation `max(x, y)` didn't work anymore [#721](https://github.com/smarty-php/smarty/issues/721)
+
+## [3.1.44] - 2022-01-18
+
+### Fixed
+- Fixed illegal characters bug in math function security check [#702](https://github.com/smarty-php/smarty/issues/702)
+
+## [3.1.43] - 2022-01-10
+
+### Security
+- Prevent evasion of the `static_classes` security policy. This addresses CVE-2021-21408
+
+## [3.1.42] - 2022-01-10
+
+### Security
+- Prevent arbitrary PHP code execution through maliciously crafted expression for the math function. This addresses CVE-2021-29454
+
+## [3.1.41] - 2022-01-09
+
+### Security
+- Rewrote the mailto function to not use `eval` when encoding with javascript
+
+## [3.1.40] - 2021-10-13
+
+### Changed
+- modifier escape now triggers a E_USER_NOTICE when an unsupported escape type is used https://github.com/smarty-php/smarty/pull/649
+
+### Security
+- More advanced javascript escaping to handle https://html.spec.whatwg.org/multipage/scripting.html#restrictions-for-contents-of-script-elements thanks to m-haritonov
+
+## [3.1.39] - 2021-02-17
+
+### Security
+- Prevent access to `$smarty.template_object` in sandbox mode. This addresses CVE-2021-26119.
+- Fixed code injection vulnerability by using illegal function names in `{function name='blah'}{/function}`. This addresses CVE-2021-26120.
+
+## [3.1.38] - 2021-01-08
+
+### Fixed
+- Smarty::SMARTY_VERSION wasn't updated https://github.com/smarty-php/smarty/issues/628
+
+## [3.1.37] - 2021-01-07
+
+### Changed
+- Changed error handlers and handling of undefined constants for php8-compatibility (set $errcontext argument optional) https://github.com/smarty-php/smarty/issues/605
+- Changed expected error levels in unit tests for php8-compatibility
+- Travis unit tests now run for all php versions >= 5.3, including php8
+- Travis runs on Xenial where possible
+
+### Fixed
+- PHP5.3 compatibility fixes
+- Brought lexer source functionally up-to-date with compiled version
+
+## [3.1.36] - 2020-04-14
+
+### Fixed
+ - Smarty::SMARTY_VERSION wasn't updated in v3.1.35 https://github.com/smarty-php/smarty/issues/584
+
+## [3.1.35] - 2020-04-14
+ - remove whitespaces after comments https://github.com/smarty-php/smarty/issues/447
+ - fix foreachelse on arrayiterators https://github.com/smarty-php/smarty/issues/506
+ - fix files contained in git export archive for package maintainers https://github.com/smarty-php/smarty/issues/325
+ - throw SmartyException when setting caching attributes for cacheable plugin https://github.com/smarty-php/smarty/issues/457
+ - fix errors that occured where isset was replaced with null check such as https://github.com/smarty-php/smarty/issues/453
+ - unit tests are now in the repository
+
+## 3.1.34 release - 05.11.2019
 13.01.2020
 - fix typo in exception message (JercSi)
 - fix typehint warning with callable (bets4breakfast)
@@ -10,7 +111,8 @@
 - fix wrong set/get methods for memcached (IT-Experte)
 - fix pborm assigning value to object variables in smarty_internal_compile_assign (Hunman)
 - exclude error_reporting.ini from git export (glensc)
-===== 3.1.34-dev-6 =====
+
+## 3.1.34-dev-6 -
 30.10.2018
 - bugfix a nested subblock in an inheritance child template was not replace by
   outer level block with same name in same child template https://github.com/smarty-php/smarty/issues/500
@@ -38,8 +140,8 @@
    could fail in version 3.1.32 and 3.1.33 because PHP preg_match() restrictions
    https://github.com/smarty-php/smarty/issues/488

-===== 3.1.33 release ===== 12.09.2018
-===== 3.1.33-dev-12 =====
+## 3.1.33 release - 12.09.2018
+## 3.1.33-dev-12 -
 03.09.2018
  - bugfix {foreach} using new style property access like {$item@property} on
    Smarty 2 style named foreach loop could produce errors https://github.com/smarty-php/smarty/issues/484
@@ -61,14 +163,14 @@
  - bugfix/enhancement {capture} allow variable as capture block name in Smarty special variable
    like $smarty.capture.$foo https://github.com/smarty-php/smarty/issues/478 https://github.com/smarty-php/smarty/pull/481

-===== 3.1.33-dev-6 =====
+## 3.1.33-dev-6 -
 19.08.2018
  - fix PSR-2 coding standards and PHPDoc blocks https://github.com/smarty-php/smarty/pull/452
    https://github.com/smarty-php/smarty/pull/475
    https://github.com/smarty-php/smarty/pull/473
  - bugfix PHP5.2 compatibility https://github.com/smarty-php/smarty/pull/472

-===== 3.1.33-dev-4 =====
+## 3.1.33-dev-4 -
 17.05.2018
 - bugfix strip-block produces different output in Smarty v3.1.32 https://github.com/smarty-php/smarty/issues/436
 - bugfix Smarty::compileAllTemplates ignores `$extension` parameter https://github.com/smarty-php/smarty/issues/437
@@ -80,7 +182,7 @@
 - bugfix  regarding Security Vulnerability did not solve the problem under Linux.
   Security issue CVE-2018-16831

-===== 3.1.32 ===== (24.04.2018)
+## 3.1.32 - (24.04.2018)
 24.04.2018
 - bugfix  possible Security Vulnerability in Smarty_Security class.

@@ -221,7 +323,7 @@
 13.4.2017
  - bugfix array_merge() parameter should be checked https://github.com/smarty-php/smarty/issues/350

-===== 3.1.31 ===== (14.12.2016)
+## 3.1.31 - (14.12.2016)
  23.11.2016
   - move template object cache into static variables

@@ -335,7 +437,7 @@
           compiled or cached template files https://github.com/smarty-php/smarty/issues/269
  - optimization remove unneeded call to update acopes when {assign} scope and template scope was local (default)

-===== 3.1.30 ===== (07.08.2016)
+## 3.1.30 - (07.08.2016)

 07.08.2016
  - bugfix update of 04.08.2016 was incomplete
@@ -558,7 +660,7 @@
  - optimization of filepath normalization
  - bugfix {strip} must remove all blanks between html tags https://github.com/smarty-php/smarty/issues/136

- ===== 3.1.29 ===== (21.12.2015)
+ - 3.1.29 - (21.12.2015)
 21.12.2015
  - optimization improve speed of filetime checks on extends and extendsall resource

@@ -594,7 +696,7 @@
  - bugfix  {$smarty.config.foo} broken in 3.1.28 https://github.com/smarty-php/smarty/issues/120
  - bugfix  multiple calls of {section} with same name droped E_NOTICE error https://github.com/smarty-php/smarty/issues/118

- ===== 3.1.28 ===== (13.12.2015)
+ - 3.1.28 - (13.12.2015)
 13.12.2015
  - bugfix {foreach} and {section} with uppercase characters in name attribute did not work (forum topic 25819)
  - bugfix $smarty->debugging_ctrl = 'URL' did not work (forum topic 25811)
@@ -773,18 +875,18 @@
 19.06.2015
  - improvement allow closures as callback at $smarty->registerFilter() https://github.com/smarty-php/smarty/issues/59

- ===== 3.1.27===== (18.06.2015)
+ - 3.1.27- (18.06.2015)
 18.06.2015
  - bugfix another update on file path normalization failed on path containing something like "/.foo/" https://github.com/smarty-php/smarty/issues/56

- ===== 3.1.26===== (18.06.2015)
+ - 3.1.26- (18.06.2015)
 18.06.2015
  - bugfix file path normalization failed on path containing something like "/.foo/" https://github.com/smarty-php/smarty/issues/56

 17.06.2015
  - bugfix calling a plugin with nocache option but no other attributes like {foo nocache} caused call to undefined function https://github.com/smarty-php/smarty/issues/55

- ===== 3.1.25===== (15.06.2015)
+ - 3.1.25- (15.06.2015)
 15.06.2015
  - optimization of smarty_cachereource_keyvaluestore.php code

@@ -814,7 +916,7 @@
 24.05.2015
  - bugfix if condition string 'neq' broken due to a typo https://github.com/smarty-php/smarty/issues/42

- ===== 3.1.24===== (23.05.2015)
+ - 3.1.24- (23.05.2015)
 23.05.2015
  - improvement on php_handling to allow very large PHP sections, better error handling
  - improvement allow extreme large comment sections (forum 25538)
@@ -852,12 +954,12 @@
  - bugfix access to undefined config variable like {#undef#} did fail https://github.com/smarty-php/smarty/issues/29
  - bugfix in nested {foreach} saved item attributes got overwritten https://github.com/smarty-php/smarty/issues/33

- ===== 3.1.23 ===== (12.05.2015)
+ - 3.1.23 - (12.05.2015)
 12.05.2015
  - bugfix of smaller performance issue introduce in 3.1.22 when caching is enabled
  - bugfix missig entry for smarty-temmplate-config in autoloader

- ===== 3.1.22 ===== tag was deleted because 3.1.22 did fail caused by the missing entry for smarty-temmplate-config in autoloader
+ - 3.1.22 - tag was deleted because 3.1.22 did fail caused by the missing entry for smarty-temmplate-config in autoloader
 10.05.2015
  - bugfix custom cache resource did not observe compile_id and cache_id when $cache_locking == true
  - bugfix cache lock was not handled correctly after timeout when $cache_locking == true
@@ -1009,7 +1111,7 @@
 - bugfix E_NOTICE message was created during compilation when ASP tags '<%' or '%>' are in template source text
 - bugfix merge_compiled_includes option failed when caching  enables and same subtemplate was included cached and not cached

- ===== 3.1.21 ===== (18.10.2014)
+ - 3.1.21 - (18.10.2014)
 18.10.2014
  - composer moved to github

@@ -1032,7 +1134,7 @@
 - bugfix change of 08.10.2014 could create E_NOTICE meassage when using "<?php" tags
 - bugfix "<script language=php>" with $php_handling PHP_PASSTHRU was executed in {nocache} sections

- ===== 3.1.20 ===== (09.10.2014)
+ - 3.1.20 - (09.10.2014)
 08.10.2014
 - bugfix security mode of "<script language=php>" must be controlled by $php_handling property (Thue Kristensen)

@@ -1052,7 +1154,7 @@
 04.07.2014
 - bugfix the bufix of 02.06.2014 broke correct handling of child templates with same name but different template folders in extends resource (issue 194 and topic 25099)

- ===== 3.1.19 ===== (30.06.2014)
+ - 3.1.19 - (30.06.2014)
 20.06.2014
 - bugfix template variables could not be passed as parameter in {include} when the include was in a {nocache} section (topic 25131)

@@ -1079,7 +1181,7 @@
 18.04.2014
 - revert bugfix of 5.4.2014 because %-e date format is not supported on all operating systems

- ===== 3.1.18 ===== (07.04.2014)
+ - 3.1.18 - (07.04.2014)
 06.04.2014
 - bugfix template inheritance fail when using custom resource after patch of 8.3.2014 (Issue 187)
 - bugfix update of composer file (Issue 168 and 184)
@@ -1108,7 +1210,7 @@
 13.03.2014
 - bugfix clearXxx() change of 27.1.2014 did not work when specifing cache_id or compile_id  (forum topic 24868 and 24867)

- ===== 3.1.17 =====
+ - 3.1.17 -
 08.03.2014
 - bugfix relative file path {include} within {block} of child templates did throw exception on first call (Issue 177)

@@ -1139,7 +1241,7 @@
 - bugfix Smarty_CacheResource_Custom did not handle template resource type specifications on clearCache() calls (Issue 169)
 - bugfix SmartyBC.class.php should use require_once to load Smarty.class.php (forum topic 24683)

- ===== 3.1.16 =====
+ - 3.1.16 -
 15.12.2013
 - bugfix {include} with {block} tag handling (forum topic 24599, 24594, 24682) (Issue 161)
   Read 3.1.16_RELEASE_NOTES for more details
@@ -1172,7 +1274,7 @@
 03.10.2013
 - bugfix loops using modifier capitalize did eat up memory (issue 159)

- ===== Smarty 3.1.15 =====
+ - Smarty 3.1.15 -
 01.10.2013
 - use current delimiters in compiler error messages (issue 157)
 - improvement on performance when using error handler and multiple template folders (issue 152)
@@ -1236,7 +1338,7 @@
 2.7.2013
 - bugfix trimwhitespace would replace captured items in wrong order (forum topic 24387)

-===== Smarty-3.1.14 =====
+## Smarty-3.1.14 -
 27.06.2013
 - bugfix removed PHP 5.5 deprecated preg_replace /e option in modifier capitalize (forum topic 24389)

@@ -1269,7 +1371,7 @@
 24.01.2013
 - bugfix wrong tag type in smarty_internal_templatecompilerbase.php could cause wrong plugin search order (Forum Topic 24028)

-===== Smarty-3.1.13 =====
+## Smarty-3.1.13 -
 13.01.2013
 - enhancement allow to disable exception message escaping by SmartyException::$escape = false;  (Issue #130)

@@ -1300,7 +1402,7 @@
 01.11.2012
 - bugfix muteExcpetedErrors() would screw up for non-readable paths (Issue #118)

-===== Smarty-3.1.12  =====
+## Smarty-3.1.12  -
 14.09.2012
 - bugfix template inheritance failed to compile with delimiters {/ and /} (Forum Topic 23008)

@@ -1345,7 +1447,7 @@
 - bugfix the default plugin handler did create wrong compiled code for static class methods
  from external script files (issue 108)

-===== Smarty-3.1.11 =====
+## Smarty-3.1.11 -
 30.06.2012
 - bugfix {block.. hide} did not work as nested child (Forum Topic 22216)

@@ -1358,12 +1460,12 @@
 11.06.2012
 - bugfix the patch for Topic 21856 did break tabs between tag attributes (Forum Topic 22124)

-===== Smarty-3.1.10  =====
+## Smarty-3.1.10  -
 09.06.2012
 - bugfix the compiler did ignore registered compiler plugins for closing tags (Forum Topic 22094)
 - bugfix the patch for Topic 21856 did break multiline tags (Forum Topic 22124)

-===== Smarty-3.1.9 =====
+## Smarty-3.1.9 -
 07.06.2012
 - bugfix fetch() and display() with relative paths (Issue 104)
 - bugfix treat "0000-00-00" as 0 in modifier.date_format (Issue 103)
@@ -1417,7 +1519,7 @@
 - enhancement the default plugin handler can now also resolve undefined modifier (Smarty::PLUGIN_MODIFIER)
  (Issue 85)

-===== Smarty-3.1.8  =====
+## Smarty-3.1.8  -
 19.02.2012
 - bugfix {include} could result in a fatal error if used in appended or prepended nested {block} tags
  (reported by mh and Issue 83)
@@ -1464,7 +1566,7 @@
 - bugfix template inheritance: {$smarty.block.child} in nested child {block} tags did not return
  content after {$smarty.block.child} (Forum Topic 20564)

-===== Smarty-3.1.7 =====
+## Smarty-3.1.7 -
 18.12.2011
 - bugfix strings ending with " in multiline strings of config files failed to compile (issue #67)
 - added chaining to Smarty_Internal_Templatebase
@@ -1489,7 +1591,7 @@
 - bugfix template inheritance: {$smarty.block.child} in nested child {block} tags did not return expected
  result (Forum Topic 20564)

-===== Smarty-3.1.6  =====
+## Smarty-3.1.6  -
 30.11.2011
 - bugfix is_cache() for individual cached subtemplates with $smarty->caching = CACHING_OFF did produce
  an exception (Forum Topic 20531)
@@ -1514,7 +1616,7 @@
 - bugfix Smarty_Resource::load() did not always return a proper resource handler (Forum Topic 20414)
 - added escape argument to html_checkboxes and html_radios (Forum Topic 20425)

-===== Smarty-3.1.5  =====
+## Smarty-3.1.5  -
 14.11.2011
 - bugfix allow space between function name and open bracket (forum topic 20375)

@@ -1546,7 +1648,7 @@
 - revert PHP4 constructor message
 - fixed PHP4 constructor message

-===== Smarty-3.1.4 =====
+## Smarty-3.1.4 -
 19.10.2011
 - added exception when using PHP4 style constructor

@@ -1575,7 +1677,7 @@
 - bugfix <?xml> tag did create wrong output when caching enabled and the tag was in included subtemplate
 - bugfix Smarty_CacheResource_mysql example was missing strtotime() calls

-===== Smarty-3.1.3  =====
+## Smarty-3.1.3  -
 07.10.2011
 - improvement removed html comments from {mailto} (Forum Topic 20092)
 - bugfix testInstall() would not show path to internal plugins_dir (Forum Post 74627)
@@ -1602,7 +1704,7 @@
 - add unloadFilter() method
 - bugfix has_nocache_code flag was not reset before compilation

-===== Smarty-3.1.2  =====
+## Smarty-3.1.2  -
 03.10.2011
 - improvement add internal $joined_template_dir property instead computing it on the fly several times

@@ -1642,7 +1744,7 @@
  extended Smarty class created problems
 - bugfix error muting was not implemented for cache locking

-===== Smarty 3.1.1  =====
+## Smarty 3.1.1  -
 22.09.2011
 - bugfix {foreachelse} does fail if {section} was nested inside {foreach}
 - bugfix debug.tpl did not display correctly when it was compiled with escape_html = true
@@ -1675,7 +1777,7 @@
 - bugfix lock_id for file resource would create invalid filepath
 - bugfix resource caching did not care about file.tpl in different template_dir

-===== Smarty 3.1.0  =====
+## Smarty 3.1.0  -
 15/09/2011
 - optimization of {foreach}; call internal _count() method only when "total" or "last" {foreach} properties are used

@@ -1768,7 +1870,7 @@
 - update of README_3_1_DEV.txt and moved into the distribution folder
 - improvement show first characters of eval and string templates instead sha1 Uid in debug window

-===== Smarty 3.1-RC1 =====
+## Smarty 3.1-RC1 -
 25/06/2011
 - revert change of 17/06/2011. $_smarty varibale removed. call loadPlugin() from inside plugin code if required
 - code cleanup, remove no longer used properties and methods
@@ -1969,7 +2071,7 @@
 24/12/2010
 - optimize smarty_function_escape_special_chars() for PHP >= 5.2.3

-===== SVN 3.0 trunk  =====
+## SVN 3.0 trunk  -
 14/05/2011
 - bugfix error handling at stream resources

@@ -2029,7 +2131,7 @@
 - removed obsolete {popup_init..} plugin from demo templates
 - bugfix replace $smarty->triggerError() by exception in smarty_internal_resource_extends.php

-===== Smarty 3.0.7  =====
+## Smarty 3.0.7  -
 09/02/2011
 - patched vulnerability when using {$smarty.template}

@@ -2083,7 +2185,7 @@
 - bugfix {$smarty.template} in child template did not return right content
 - bugfix Smarty3 did not search the PHP include_path for template files

-===== Smarty 3.0.6  =====
+## Smarty 3.0.6  -

 12/12/2010
 - bugfix fixed typo regarding yesterdays change to allow streamWrapper
@@ -2118,7 +2220,7 @@
 - bugfix on template inheritance when an {extends} tag was inserted by a prefilter
 - added error message for illegal variable file attributes at {extends...} tags

-===== Smarty 3.0.5  =====
+## Smarty 3.0.5  -


 19/11/2010
@@ -2145,7 +2247,7 @@
 - bugfix captured content could not be accessed globally
 - bugfix Smarty2 wrapper functions could not be call from within plugins

-===== Smarty 3.0.4  =====
+## Smarty 3.0.4  -

 14/11/2010
 - bugfix isset() did not allow multiple parameter
@@ -2158,7 +2260,7 @@
 				(introduced with 3.0.2)
 - code cleanup
 								
-===== Smarty 3.0.3  =====
+## Smarty 3.0.3  -

 13/11/2010
 - bugfix on {debug}
@@ -2167,7 +2269,7 @@
 - fixed internal_config (removed unwanted code line)
 - improvement  remove last linebreak from {function} definition

-===== Smarty 3.0.2  =====
+## Smarty 3.0.2  -

 12/11/2010
 - reactivated $error_reporting property handling
@@ -2177,7 +2279,7 @@
  with transparent access to Smarty object
 - fixed {config_load} scoping form compile time to run time

-===== Smarty 3.0.0  =====
+## Smarty 3.0.0  -



@@ -2219,7 +2321,7 @@ request_use_auto_globals
 - bugfix on template inheritance using nested eval or string resource in {extends} tags
 - bugfix on output buffer handling in isCached() method

-=====  RC4 =====
+##  RC4 -

 01/10/2010
 - added {break} and {continue} tags for flow control of {foreach},{section},{for} and {while} loops
@@ -2316,7 +2418,7 @@ request_use_auto_globals
 15/07/2010
 - bufix  {$smarty.template} does include now the relative path, not just filename

-=====  RC3 =====
+##  RC3 -



@@ -2370,7 +2472,7 @@ request_use_auto_globals
 - make handling of Smarty comments followed by newline BC to Smarty2


-=====  RC2 =====
+##  RC2 -



@@ -2442,7 +2544,7 @@ request_use_auto_globals
 - bugfix on {function} tag with name attribute in doublequoted strings
 - fix to make calling of template functions unambiguously by madatory usage of the {call} tag

-=====  RC1 =====
+##  RC1 -

 27/04/2010
 - change default of $debugging_ctrl to 'NONE'
@@ -3,7 +3,7 @@ Smarty: the PHP compiling template engine
 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 2.1 of the License, or (at your option) any later version.
+ 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
@@ -18,7 +18,7 @@ Smarty can be run with PHP 5.2 to PHP 7.4.

 > Read the NEW_FEATURES and INHERITANCE_RELEASE_NOTES file for recent extensions to Smarty 3.1 functionality

-Smarty versions 3.1.11 or later are now on github and can be installed with Composer.
+Smarty versions 3.1.11 or later are now on GitHub and can be installed with Composer.


 The "smarty/smarty" package will start at libs/....   subfolder.
@@ -0,0 +1,19 @@
+# Security Policy
+
+## Supported Versions
+
+Smarty currently supports the latest minor version of Smarty 3 and Smarty 4. (Smarty 4 has not been released yet.)
+
+| Version | Supported          |
+| ------- | ------------------ |
+| 4.0.x   | :white_check_mark: |
+| 3.1.x   | :white_check_mark: |
+| < 3.1   | :x:                |
+
+## Reporting a Vulnerability
+
+ If you have discovered a security issue with Smarty, please contact us at mail [at] simonwisselink.nl. Do not 
+ disclose your findings publicly and PLEASE PLEASE do not file an Issue.
+ 
+We will try to confirm the vulnerability and develop a fix if appropriate. When we release the fix, we will publish 
+a security release. Please let us know if you want to be credited.
@@ -1,69 +1,2 @@
-# Todo
+# Pre-release Todos

-## Add unit test for strip issue in correct branch
-tests/UnitTests/TemplateSource/TagTests/Strip/CompileStripTest.php 
-```
-@@ -76,6 +76,7 @@ class CompileStripTest extends PHPUnit_Smarty
-                      array("{'Var'}\n <b></b> <c></c>", 'Var<b></b> <c></c>', '', $i ++),
-                      array("\n<b></b>  <c></c>", '<b></b> <c></c>', '', $i ++),
-                      array("\n<b></b>\n  <c></c>", '<b></b><c></c>', '', $i ++),
-+                     array("\n<b>\n  {* a comment *}\n   <c>", '<b><c>', '', $i ++),
-
-         );
-     }
-```
-
-## Add unit test for isset issue in correct branch
-tests/UnitTests/TemplateSource/ValueTests/PHPfunctions/PhpFunctionTest.php
-```php
-    /**
-     * test PHP isset() on (non-)variables
-     * @dataProvider        dataTestIsset3
-     * @param string $strTemplate template to test
-     * @param string $result expected result
-     */
-    public function testIsset3($strTemplate, $result)
-    {
-        $this->smarty->disableSecurity();
-
-        $this->smarty->assign('varobject', new TestIsset());
-        $this->smarty->assign('vararray', $vararray = [
-            'keythatexists' => false,
-            'keywitharray' => [1 => 1],
-            'keywithobject' => new TestIsset()]
-        );
-
-        $this->smarty->assign('key', 'A');
-        $this->smarty->assign('_varsimpleA', 1);
-        $this->smarty->assign('varsimpleB', 0);
-        $this->smarty->assign('varsimpleC', null);
-
-        $this->assertEquals($result, $this->smarty->fetch('string:' . $strTemplate));
-    }
-
-    /**
-     * Data provider for testIsset3
-     */
-    public function dataTestIsset3()
-    {
-        return array(
-            array('{if isset($varobject->arr)}true{else}false{/if}', 'true'),
-            array('{if isset($vararray["keywitharray"])}true{else}false{/if}', 'true'),
-            array('{if isset($vararray["keythatexists"])}true{else}false{/if}', 'true'),
-            array('{if isset($vararray["nonexistingkey"])}true{else}false{/if}', 'false'),
-            array('{if isset($_GET["sscr6hr6cz34j6"])}true{else}false{/if}', 'false'),
-            array('{if isset(count([\'hi\']))}true{else}false{/if}', 'true'),
-            array('{if isset($vararray[\'keywitharray\'][intval(\'1\')])}true{else}false{/if}', 'true'),
-            array('{if isset($vararray[\'keywithobject\']->arr[\'isSet\'])}true{else}false{/if}', 'true'),
-            array('{if isset($vararray[\'keywithobject\']->arr[\'isNull\'])}true{else}false{/if}', 'false'),
-            array('{if isset($varobject->arr[\'isSet\'])}true{else}false{/if}', 'true'),
-            array('{if isset($varobject->arr[\'isNull\'])}true{else}false{/if}', 'false'),
-            array('{if isset($_varsimpleA)}true{else}false{/if}', 'true'),
-            array('{if isset($varsimpleB)}true{else}false{/if}', 'true'),
-            array('{if isset($varsimpleC)}true{else}false{/if}', 'false'),
-            array('{if isset($_varsimpleA && varsimpleB)}true{else}false{/if}', 'true'),
-            array('{if isset($_varsimpleA && varsimpleC)}true{else}false{/if}', 'true'),
-            array('{if isset($_varsimple{$key})}true{else}false{/if}', 'true'),
-        );
-    }
-```
@@ -27,7 +27,7 @@
        "forum": "http://www.smarty.net/forums/"
    },
    "require": {
-        "php": ">=5.2"
+        "php": "^5.2 || ^7.0"
    },
    "autoload": {
        "classmap": [
@@ -40,6 +40,7 @@
        }
    },
    "require-dev": {
-        "phpunit/phpunit": "6.4.1"
+        "phpunit/phpunit": "^7.5 || ^6.5 || ^5.7 || ^4.8",
+        "smarty/smarty-lexer": "^3.1"
    }
 }
@@ -0,0 +1,51 @@
+version: "2"
+services:
+  base:
+    build:
+      context: .
+      dockerfile: ./utilities/testrunners/php54/Dockerfile
+    volumes:
+      - .:/app
+    working_dir: /app
+    entrypoint: sh ./run-tests.sh
+  php54:
+    extends:
+      service: base
+    build:
+      dockerfile: ./utilities/testrunners/php54/Dockerfile
+  php55:
+    extends:
+      service: base
+    build:
+      dockerfile: ./utilities/testrunners/php55/Dockerfile
+  php56:
+    extends:
+      service: base
+    build:
+      dockerfile: ./utilities/testrunners/php56/Dockerfile
+  php70:
+    extends:
+      service: base
+    build:
+      dockerfile: ./utilities/testrunners/php70/Dockerfile
+  php71:
+    extends:
+      service: base
+    build:
+      dockerfile: ./utilities/testrunners/php71/Dockerfile
+  php72:
+    extends:
+      service: base
+    build:
+      dockerfile: ./utilities/testrunners/php72/Dockerfile
+  php73:
+    extends:
+      service: base
+    build:
+      dockerfile: ./utilities/testrunners/php73/Dockerfile
+  php74:
+    extends:
+      service: base
+    build:
+      dockerfile: ./utilities/testrunners/php74/Dockerfile
+
@@ -1 +0,0 @@
-error_reporting = E_ALL & ~E_DEPRECATED & ~E_STRICT
@@ -249,7 +249,13 @@ template       ::= template PHP(B). {

                      // template text
 template       ::= template  TEXT(B). {
-         $this->current_buffer->append_subtree($this, $this->compiler->processText(B));
+         $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));
 }
                      // strip on
 template       ::= template  STRIPON. {
@@ -308,7 +314,7 @@ smartytag(A)::= SIMPLETAG(B). {
    $tag = trim(substr(B, $this->compiler->getLdelLength(), -$this->compiler->getRdelLength()));
    if ($tag == 'strip') {
        $this->strip = true;
-        A = null;;
+        A = null;
    } else {
        if (defined($tag)) {
            if ($this->security) {
@@ -752,6 +758,9 @@ value(res)       ::= doublequoted_with_quotes(s). {


 value(res)    ::= varindexed(vi) DOUBLECOLON static_class_access(r). {
+    if ($this->security && $this->security->static_classes !== array()) {
+        $this->compiler->trigger_template_error('dynamic static class not allowed by security setting');
+    }
    $prefixVar = $this->compiler->getNewPrefixVariable();
    if (vi['var'] === '\'smarty\'') {
        $this->compiler->appendPrefixCode("<?php {$prefixVar} = ". $this->compiler->compileTag('private_special_variable',array(),vi['smarty_internal_index']).';?>');
@@ -6,7 +6,7 @@
 * 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 2.1 of the License, or (at your option) any later version.
+ * 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
@@ -27,7 +27,6 @@
 * @author    Uwe Tews   <uwe dot tews at gmail dot com>
 * @author    Rodney Rehm
 * @package   Smarty
- * @version   3.1.34-dev
 */
 /**
 * set SMARTY_DIR to absolute path to Smarty library files.
@@ -112,7 +111,7 @@ class Smarty extends Smarty_Internal_TemplateBase
    /**
     * smarty version
     */
-    const SMARTY_VERSION = '3.1.34-dev-7';
+    const SMARTY_VERSION = '3.1.48';
    /**
     * define variable scopes
     */
@@ -800,7 +799,7 @@ class Smarty extends Smarty_Internal_TemplateBase
     * @param mixed $index    index of directory to get, null to get all
     * @param bool  $isConfig true for config_dir
     *
-     * @return array list of template directories, or directory of $index
+     * @return array|string list of template directories, or directory of $index
     */
    public function getTemplateDir($index = null, $isConfig = false)
    {
@@ -6,7 +6,7 @@
 * 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 2.1 of the License, or (at your option) any later version.
+ * 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
@@ -101,6 +101,7 @@ function smarty_function_html_select_date($params, Smarty_Internal_Template $tem
    $field_separator = "\n";
    $option_separator = "\n";
    $time = null;
+
    // $all_empty = null;
    // $day_empty = null;
    // $month_empty = null;
@@ -113,17 +114,7 @@ function smarty_function_html_select_date($params, Smarty_Internal_Template $tem
    foreach ($params as $_key => $_value) {
        switch ($_key) {
            case 'time':
-                if (!is_array($_value) && $_value !== null) {
-                    $template->_checkPlugins(
-                        array(
-                            array(
-                                'function' => 'smarty_make_timestamp',
-                                'file'     => SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php'
-                            )
-                        )
-                    );
-                    $time = smarty_make_timestamp($_value);
-                }
+                $$_key = $_value; // we'll handle conversion below
                break;
            case 'month_names':
                if (is_array($_value) && count($_value) === 12) {
@@ -178,43 +169,59 @@ function smarty_function_html_select_date($params, Smarty_Internal_Template $tem
    }
    // Note: date() is faster than strftime()
    // Note: explode(date()) is faster than date() date() date()
-    if (isset($params[ 'time' ]) && is_array($params[ 'time' ])) {
-        if (isset($params[ 'time' ][ $prefix . 'Year' ])) {
+
+    if (isset($time) && is_array($time)) {
+        if (isset($time[$prefix . 'Year'])) {
            // $_REQUEST[$field_array] given
            foreach (array(
-                'Y' => 'Year',
-                'm' => 'Month',
-                'd' => 'Day'
-            ) as $_elementKey => $_elementName) {
+                         'Y' => 'Year',
+                         'm' => 'Month',
+                         'd' => 'Day'
+                     ) as $_elementKey => $_elementName) {
                $_variableName = '_' . strtolower($_elementName);
                $$_variableName =
-                    isset($params[ 'time' ][ $prefix . $_elementName ]) ? $params[ 'time' ][ $prefix . $_elementName ] :
+                    isset($time[$prefix . $_elementName]) ? $time[$prefix . $_elementName] :
                        date($_elementKey);
            }
-        } elseif (isset($params[ 'time' ][ $field_array ][ $prefix . 'Year' ])) {
+        } elseif (isset($time[$field_array][$prefix . 'Year'])) {
            // $_REQUEST given
            foreach (array(
-                'Y' => 'Year',
-                'm' => 'Month',
-                'd' => 'Day'
-            ) as $_elementKey => $_elementName) {
+                         'Y' => 'Year',
+                         'm' => 'Month',
+                         'd' => 'Day'
+                     ) as $_elementKey => $_elementName) {
                $_variableName = '_' . strtolower($_elementName);
-                $$_variableName = isset($params[ 'time' ][ $field_array ][ $prefix . $_elementName ]) ?
-                    $params[ 'time' ][ $field_array ][ $prefix . $_elementName ] : date($_elementKey);
+                $$_variableName = isset($time[$field_array][$prefix . $_elementName]) ?
+                    $time[$field_array][$prefix . $_elementName] : date($_elementKey);
            }
        } else {
            // no date found, use NOW
-            list($_year, $_month, $_day) = $time = explode('-', date('Y-m-d'));
+            list($_year, $_month, $_day) = explode('-', date('Y-m-d'));
        }
+    } elseif (isset($time) && preg_match("/(\d*)-(\d*)-(\d*)/", $time, $matches)) {
+        $_year = $_month = $_day = null;
+        if ($matches[1] > '') $_year = (int) $matches[1];
+        if ($matches[2] > '') $_month = (int) $matches[2];
+        if ($matches[3] > '') $_day = (int) $matches[3];
    } elseif ($time === null) {
        if (array_key_exists('time', $params)) {
-            $_year = $_month = $_day = $time = null;
+            $_year = $_month = $_day = null;
        } else {
-            list($_year, $_month, $_day) = $time = explode('-', date('Y-m-d'));
+            list($_year, $_month, $_day) = explode('-', date('Y-m-d'));
        }
    } else {
-        list($_year, $_month, $_day) = $time = explode('-', date('Y-m-d', $time));
+        $template->_checkPlugins(
+            array(
+                array(
+                    'function' => 'smarty_make_timestamp',
+                    'file'     => SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php'
+                )
+            )
+        );
+        $time = smarty_make_timestamp($time);
+	    list($_year, $_month, $_day) = explode('-', date('Y-m-d', $time));
    }
+
    // make syntax "+N" or "-N" work with $start_year and $end_year
    // Note preg_match('!^(\+|\-)\s*(\d+)$!', $end_year, $match) is slower than trim+substr
    foreach (array(
@@ -48,8 +48,13 @@
 */
 function smarty_function_mailto($params)
 {
-    static $_allowed_encoding =
-        array('javascript' => true, 'javascript_charcode' => true, 'hex' => true, 'none' => true);
+    static $_allowed_encoding = array(
+        'javascript' => true,
+        'javascript_charcode' => true,
+        'hex' => true,
+        'none' => true
+    );
+
    $extra = '';
    if (empty($params[ 'address' ])) {
        trigger_error("mailto: missing 'address' parameter", E_USER_WARNING);
@@ -57,11 +62,11 @@ function smarty_function_mailto($params)
    } else {
        $address = $params[ 'address' ];
    }
+
    $text = $address;
+
    // netscape and mozilla do not decode %40 (@) in BCC field (bug?)
    // so, don't encode it.
-    $search = array('%40', '%2C');
-    $replace = array('@', ',');
    $mail_parms = array();
    foreach ($params as $var => $value) {
        switch ($var) {
@@ -69,7 +74,7 @@ function smarty_function_mailto($params)
            case 'bcc':
            case 'followupto':
                if (!empty($value)) {
-                    $mail_parms[] = $var . '=' . str_replace($search, $replace, rawurlencode($value));
+                    $mail_parms[] = $var . '=' . str_replace(array('%40', '%2C'), array('@', ','), rawurlencode($value));
                }
                break;
            case 'subject':
@@ -83,6 +88,7 @@ function smarty_function_mailto($params)
            default:
        }
    }
+
    if ($mail_parms) {
        $address .= '?' . join('&', $mail_parms);
    }
@@ -94,22 +100,26 @@ function smarty_function_mailto($params)
        );
        return;
    }
-    // FIXME: (rodneyrehm) document.write() excues me what? 1998 has passed!
+
+    $flags = ENT_QUOTES;
+    if (defined('ENT_SUBSTITUTE') && defined('ENT_HTML401')) {
+        $flags |= ENT_SUBSTITUTE | ENT_HTML401;
+    }
+
+    $string = '<a href="mailto:' . htmlspecialchars($address, $flags, Smarty::$_CHARSET) .
+        '" ' . $extra . '>' . htmlspecialchars($text, $flags, Smarty::$_CHARSET) . '</a>';
+
    if ($encode === 'javascript') {
-        $string = 'document.write(\'<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>\');';
        $js_encode = '';
        for ($x = 0, $_length = strlen($string); $x < $_length; $x++) {
            $js_encode .= '%' . bin2hex($string[ $x ]);
        }
-        return '<script type="text/javascript">eval(unescape(\'' . $js_encode . '\'))</script>';
+        return '<script type="text/javascript">document.write(unescape(\'' . $js_encode . '\'))</script>';
    } elseif ($encode === 'javascript_charcode') {
-        $string = '<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>';
-        for ($x = 0, $y = strlen($string); $x < $y; $x++) {
+        for ($x = 0, $_length = strlen($string); $x < $_length; $x++) {
            $ord[] = ord($string[ $x ]);
        }
-        $_ret = "<script type=\"text/javascript\" language=\"javascript\">\n" . "{document.write(String.fromCharCode(" .
-                implode(',', $ord) . "))" . "}\n" . "</script>\n";
-        return $_ret;
+        return '<script type="text/javascript">document.write(String.fromCharCode(' . implode(',', $ord) . '))</script>';
    } elseif ($encode === 'hex') {
        preg_match('!^(.*)(\?.*)$!', $address, $match);
        if (!empty($match[ 2 ])) {
@@ -132,6 +142,6 @@ function smarty_function_mailto($params)
        return '<a href="' . $mailto . $address_encode . '" ' . $extra . '>' . $text_encode . '</a>';
    } else {
        // no encoding
-        return '<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>';
+        return $string;
    }
 }
@@ -28,7 +28,12 @@ function smarty_function_math($params, $template)
            'int'   => true,
            'abs'   => true,
            'ceil'  => true,
+            'acos'   => true,
+            'acosh'   => true,
            'cos'   => true,
+            'cosh'   => true,
+            'deg2rad'   => true,
+            'rad2deg'   => true,
            'exp'   => true,
            'floor' => true,
            'log'   => true,
@@ -39,27 +44,51 @@ function smarty_function_math($params, $template)
            'pow'   => true,
            'rand'  => true,
            'round' => true,
+            'asin'   => true,
+            'asinh'   => true,
            'sin'   => true,
+            'sinh'   => true,
            'sqrt'  => true,
            'srand' => true,
-            'tan'   => true
+            'atan'   => true,
+            'atanh'   => true,
+            'tan'   => true,
+            'tanh'   => true
        );
+
    // be sure equation parameter is present
    if (empty($params[ 'equation' ])) {
        trigger_error("math: missing equation parameter", E_USER_WARNING);
        return;
    }
    $equation = $params[ 'equation' ];
+
+    // Remove whitespaces
+    $equation = preg_replace('/\s+/', '', $equation);
+
+    // Adapted from https://www.php.net/manual/en/function.eval.php#107377
+    $number = '(?:\d+(?:[,.]\d+)?|pi|π)'; // What is a number
+    $functionsOrVars = '((?:0x[a-fA-F0-9]+)|([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*))';
+    $operators = '[,+\/*\^%-]'; // Allowed math operators
+    $regexp = '/^(('.$number.'|'.$functionsOrVars.'|('.$functionsOrVars.'\s*\((?1)*\)|\((?1)*\)))(?:'.$operators.'(?1))?)+$/';
+
+    if (!preg_match($regexp, $equation)) {
+        trigger_error("math: illegal characters", E_USER_WARNING);
+        return;
+    }
+
    // make sure parenthesis are balanced
    if (substr_count($equation, '(') !== substr_count($equation, ')')) {
        trigger_error("math: unbalanced parenthesis", E_USER_WARNING);
        return;
    }
+
    // disallow backticks
    if (strpos($equation, '`') !== false) {
        trigger_error("math: backtick character not allowed in equation", E_USER_WARNING);
        return;
    }
+
    // also disallow dollar signs
    if (strpos($equation, '$') !== false) {
        trigger_error("math: dollar signs not allowed in equation", E_USER_WARNING);
@@ -96,6 +125,7 @@ function smarty_function_math($params, $template)
    }
    $smarty_math_result = null;
    eval("\$smarty_math_result = " . $equation . ";");
+
    if (empty($params[ 'format' ])) {
        if (empty($params[ 'assign' ])) {
            return $smarty_math_result;
@@ -184,7 +184,13 @@ function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $
                    '"'  => '\\"',
                    "\r" => '\\r',
                    "\n" => '\\n',
-                    '</' => '<\/'
+                    '</' => '<\/',
+                    // see https://html.spec.whatwg.org/multipage/scripting.html#restrictions-for-contents-of-script-elements
+                    '<!--' => '<\!--',
+                    '<s'   => '<\s',
+                    '<S'   => '<\S',
+	                "`" => "\\\\`",
+	                "\${" => "\\\\\\$\\{"
                )
            );
        case 'mail':
@@ -250,6 +256,7 @@ function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $
            }
            return $return;
        default:
+            trigger_error("escape: unsupported type: $esc_type - returning unmodified string", E_USER_NOTICE);
            return $string;
    }
 }
@@ -89,9 +89,12 @@ function smarty_modifiercompiler_escape($params, Smarty_Internal_TemplateCompile
                return 'preg_replace("%(?<!\\\\\\\\)\'%", "\\\'",' . $params[ 0 ] . ')';
            case 'javascript':
                // escape quotes and backslashes, newlines, etc.
+                // see https://html.spec.whatwg.org/multipage/scripting.html#restrictions-for-contents-of-script-elements
                return 'strtr(' .
                       $params[ 0 ] .
-                       ', array("\\\\" => "\\\\\\\\", "\'" => "\\\\\'", "\"" => "\\\\\"", "\\r" => "\\\\r", "\\n" => "\\\n", "</" => "<\/" ))';
+                       ', array("\\\\" => "\\\\\\\\", "\'" => "\\\\\'", "\"" => "\\\\\"", "\\r" => "\\\\r", 
+                       "\\n" => "\\\n", "</" => "<\/", "<!--" => "<\!--", "<s" => "<\s", "<S" => "<\S",
+                       "`" => "\\\\`", "\${" => "\\\\\\$\\{"))';
        }
    } catch (SmartyException $e) {
        // pass through to regular plugin fallback
@@ -14,20 +14,28 @@
 * @author Rodney Rehm
 *
 * @param array $params parameters
+ * @param Smarty_Internal_TemplateCompilerBase $compiler
 *
 * @return string with compiled code
 */
-function smarty_modifiercompiler_unescape($params)
+function smarty_modifiercompiler_unescape($params, Smarty_Internal_TemplateCompilerBase $compiler)
 {
-    if (!isset($params[ 1 ])) {
-        $params[ 1 ] = 'html';
-    }
+    $compiler->template->_checkPlugins(
+        array(
+            array(
+                'function' => 'smarty_literal_compiler_param',
+                'file'     => SMARTY_PLUGINS_DIR . 'shared.literal_compiler_param.php'
+            )
+        )
+    );
+
+    $esc_type = smarty_literal_compiler_param($params, 1, 'html');
+
    if (!isset($params[ 2 ])) {
        $params[ 2 ] = '\'' . addslashes(Smarty::$_CHARSET) . '\'';
-    } else {
-        $params[ 2 ] = "'{$params[ 2 ]}'";
    }
-    switch (trim($params[ 1 ], '"\'')) {
+
+    switch ($esc_type) {
        case 'entity':
        case 'htmlall':
            if (Smarty::$_MBSTRING) {
@@ -44,9 +44,43 @@ if (!function_exists('smarty_mb_str_replace')) {
                }
            }
        } else {
+            $mb_reg_charset = mb_regex_encoding();
+            // Check if mbstring regex is using UTF-8
+            $reg_is_unicode = !strcasecmp($mb_reg_charset, "UTF-8");
+            if(!$reg_is_unicode) {
+                // ...and set to UTF-8 if not
+                mb_regex_encoding("UTF-8");
+            }
+
+            // See if charset used by Smarty is matching one used by regex...
+            $current_charset = mb_regex_encoding();
+            $convert_result = (bool)strcasecmp(Smarty::$_CHARSET, $current_charset);
+            if($convert_result) {
+                // ...convert to it if not.
+                $subject = mb_convert_encoding($subject, $current_charset, Smarty::$_CHARSET);
+                $search = mb_convert_encoding($search, $current_charset, Smarty::$_CHARSET);
+                $replace = mb_convert_encoding($replace, $current_charset, Smarty::$_CHARSET);
+            }
+
            $parts = mb_split(preg_quote($search), $subject);
+            // If original regex encoding was not unicode...
+            if(!$reg_is_unicode) {
+                // ...restore original regex encoding to avoid breaking the system.
+                mb_regex_encoding($mb_reg_charset);
+            }
+            if($parts === false) {
+                // This exception is thrown if call to mb_split failed.
+                // Usually it happens, when $search or $replace are not valid for given mb_regex_encoding().
+                // There may be other cases for it to fail, please file an issue if you find a reproducible one.
+                throw new SmartyException("Source string is not a valid $current_charset sequence (probably)");
+            }
+
            $count = count($parts) - 1;
            $subject = implode($replace, $parts);
+            // Convert results back to charset used by Smarty, if needed.
+            if($convert_result) {
+                $subject = mb_convert_encoding($subject, Smarty::$_CHARSET, $current_charset);
+            }
        }
        return $subject;
    }
@@ -125,7 +125,7 @@ class Smarty_Internal_Compile_Blockclose extends Smarty_Internal_Compile_Shared_
        // setup buffer for template function code
        $compiler->parser->current_buffer = new Smarty_Internal_ParseTree_Template();
        $output = "<?php\n";
-        $output .= "/* {block {$_name}} */\n";
+        $output .= $compiler->cStyleComment(" {block {$_name}} ") . "\n";
        $output .= "class {$_className} extends Smarty_Internal_Block\n";
        $output .= "{\n";
        foreach ($_block as $property => $value) {
@@ -155,7 +155,7 @@ class Smarty_Internal_Compile_Blockclose extends Smarty_Internal_Compile_Shared_
        }
        $output .= "}\n";
        $output .= "}\n";
-        $output .= "/* {/block {$_name}} */\n\n";
+        $output .= $compiler->cStyleComment(" {/block {$_name}} ") . "\n\n";
        $output .= "?>\n";
        $compiler->parser->current_buffer->append_subtree(
            $compiler->parser,
@@ -58,6 +58,11 @@ class Smarty_Internal_Compile_Function extends Smarty_Internal_CompileBase
        }
        unset($_attr[ 'nocache' ]);
        $_name = trim($_attr[ 'name' ], '\'"');
+
+        if (!preg_match('/^[a-zA-Z0-9_\x80-\xff]+$/', $_name)) {
+	        $compiler->trigger_template_error("Function name contains invalid characters: {$_name}", null, true);
+        }
+
        $compiler->parent_compiler->tpl_function[ $_name ] = array();
        $save = array(
            $_attr, $compiler->parser->current_buffer, $compiler->template->compiled->has_nocache_code,
@@ -129,7 +134,7 @@ class Smarty_Internal_Compile_Functionclose extends Smarty_Internal_CompileBase
        if ($compiler->template->compiled->has_nocache_code) {
            $compiler->parent_compiler->tpl_function[ $_name ][ 'call_name_caching' ] = $_funcNameCaching;
            $output = "<?php\n";
-            $output .= "/* {$_funcNameCaching} */\n";
+            $output .= $compiler->cStyleComment(" {$_funcNameCaching} ") . "\n";
            $output .= "if (!function_exists('{$_funcNameCaching}')) {\n";
            $output .= "function {$_funcNameCaching} (Smarty_Internal_Template \$_smarty_tpl,\$params) {\n";
            $output .= "ob_start();\n";
@@ -154,7 +159,7 @@ class Smarty_Internal_Compile_Functionclose extends Smarty_Internal_CompileBase
            $output .= "/*/%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%*/\";\n?>";
            $output .= "<?php echo str_replace('{$compiler->template->compiled->nocache_hash}', \$_smarty_tpl->compiled->nocache_hash, ob_get_clean());\n";
            $output .= "}\n}\n";
-            $output .= "/*/ {$_funcName}_nocache */\n\n";
+            $output .= $compiler->cStyleComment("/ {$_funcName}_nocache ") . "\n\n";
            $output .= "?>\n";
            $compiler->parser->current_buffer->append_subtree(
                $compiler->parser,
@@ -174,7 +179,7 @@ class Smarty_Internal_Compile_Functionclose extends Smarty_Internal_CompileBase
        }
        $compiler->parent_compiler->tpl_function[ $_name ][ 'call_name' ] = $_funcName;
        $output = "<?php\n";
-        $output .= "/* {$_funcName} */\n";
+        $output .= $compiler->cStyleComment(" {$_funcName} ") . "\n";
        $output .= "if (!function_exists('{$_funcName}')) {\n";
        $output .= "function {$_funcName}(Smarty_Internal_Template \$_smarty_tpl,\$params) {\n";
        $output .= $_paramsCode;
@@ -191,7 +196,7 @@ class Smarty_Internal_Compile_Functionclose extends Smarty_Internal_CompileBase
        );
        $compiler->parser->current_buffer->append_subtree($compiler->parser, $_functionCode);
        $output = "<?php\n}}\n";
-        $output .= "/*/ {$_funcName} */\n\n";
+        $output .= $compiler->cStyleComment("/ {$_funcName} ") . "\n\n";
        $output .= "?>\n";
        $compiler->parser->current_buffer->append_subtree(
            $compiler->parser,
@@ -318,14 +318,14 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase
            }
            // get compiled code
            $compiled_code = "<?php\n\n";
-            $compiled_code .= "/* Start inline template \"{$sourceInfo}\" =============================*/\n";
+            $compiled_code .= $compiler->cStyleComment(" Start inline template \"{$sourceInfo}\" =============================") . "\n";
            $compiled_code .= "function {$tpl->compiled->unifunc} (Smarty_Internal_Template \$_smarty_tpl) {\n";
            $compiled_code .= "?>\n" . $tpl->compiler->compileTemplateSource($tpl, null, $compiler->parent_compiler);
            $compiled_code .= "<?php\n";
            $compiled_code .= "}\n?>\n";
            $compiled_code .= $tpl->compiler->postFilter($tpl->compiler->blockOrFunctionCode);
            $compiled_code .= "<?php\n\n";
-            $compiled_code .= "/* End inline template \"{$sourceInfo}\" =============================*/\n";
+            $compiled_code .= $compiler->cStyleComment(" End inline template \"{$sourceInfo}\" =============================") . "\n";
            $compiled_code .= '?>';
            unset($tpl->compiler);
            if ($tpl->compiled->has_nocache_code) {
@@ -81,6 +81,10 @@ class Smarty_Internal_Compile_Private_Special_Variable extends Smarty_Internal_C
                case 'template':
                    return 'basename($_smarty_tpl->source->filepath)';
                case 'template_object':
+                    if (isset($compiler->smarty->security_policy)) {
+                        $compiler->trigger_template_error("(secure mode) template_object not permitted");
+                        break;
+                    }
                    return '$_smarty_tpl';
                case 'current_dir':
                    return 'dirname($_smarty_tpl->source->filepath)';
@@ -94,9 +98,9 @@ class Smarty_Internal_Compile_Private_Special_Variable extends Smarty_Internal_C
                        break;
                    }
                    if (strpos($_index[ 1 ], '$') === false && strpos($_index[ 1 ], '\'') === false) {
-                        return "@constant('{$_index[1]}')";
+                        return "(defined('{$_index[1]}') ? constant('{$_index[1]}') : null)";
                    } else {
-                        return "@constant({$_index[1]})";
+                        return "(defined({$_index[1]}) ? constant({$_index[1]}) : null)";
                    }
                // no break
                case 'config':
@@ -115,7 +115,7 @@ class Smarty_Internal_Config_File_Compiler
            $this->smarty->_debug->start_compile($this->template);
        }
        // init the lexer/parser to compile the config file
-        /* @var Smarty_Internal_ConfigFileLexer $this ->lex */
+        /* @var Smarty_Internal_ConfigFileLexer $this->lex */
        $this->lex = new $this->lexer_class(
            str_replace(
                array(
@@ -127,7 +127,7 @@ class Smarty_Internal_Config_File_Compiler
            ) . "\n",
            $this
        );
-        /* @var Smarty_Internal_ConfigFileParser $this ->parser */
+        /* @var Smarty_Internal_ConfigFileParser $this->parser */
        $this->parser = new $this->parser_class($this->lex, $this);
        if (function_exists('mb_internal_encoding')
            && function_exists('ini_get')
@@ -157,10 +157,12 @@ class Smarty_Internal_Config_File_Compiler
            $this->smarty->_debug->end_compile($this->template);
        }
        // template header code
-        $template_header =
-            "<?php /* Smarty version " . Smarty::SMARTY_VERSION . ", created on " . strftime("%Y-%m-%d %H:%M:%S") .
-            "\n";
-        $template_header .= "         compiled from '{$this->template->source->filepath}' */ ?>\n";
+        $template_header = sprintf(
+            "<?php /* Smarty version %s, created on %s\n         compiled from '%s' */ ?>\n",
+            Smarty::SMARTY_VERSION,
+            date("Y-m-d H:i:s"),
+            str_replace('*/', '* /' , $this->template->source->filepath)
+        );
        $code = '<?php $_smarty_tpl->smarty->ext->configLoad->_loadConfigVars($_smarty_tpl, ' .
                var_export($this->config_data, true) . '); ?>';
        return $template_header . $this->template->smarty->ext->_codeFrame->create($this->template, $code);
@@ -65,7 +65,7 @@ class Smarty_Internal_ErrorHandler
     *
     * @return bool
     */
-    public static function mutingErrorHandler($errno, $errstr, $errfile, $errline, $errcontext)
+    public static function mutingErrorHandler($errno, $errstr, $errfile, $errline, $errcontext = array())
    {
        $_is_muted_directory = false;
        // add the SMARTY_DIR to the list of muted directories
@@ -48,6 +48,8 @@ class Smarty_Internal_Method_RegisterPlugin
            throw new SmartyException("Plugin tag '{$name}' already registered");
        } elseif (!is_callable($callback)) {
            throw new SmartyException("Plugin '{$name}' not callable");
+        } elseif ($cacheable && $cache_attr) {
+            throw new SmartyException("Cannot set caching attributes for plugin '{$name}' when it is cacheable.");
        } else {
            $smarty->registered_plugins[ $type ][ $name ] = array($callback, (bool)$cacheable, (array)$cache_attr);
        }
@@ -85,45 +85,85 @@ class Smarty_Internal_ParseTree_Template extends Smarty_Internal_ParseTree
    public function to_smarty_php(Smarty_Internal_Templateparser $parser)
    {
        $code = '';
-        for ($key = 0, $cnt = count($this->subtrees); $key < $cnt; $key++) {
-            if ($this->subtrees[ $key ] instanceof Smarty_Internal_ParseTree_Text) {
-                $subtree = $this->subtrees[ $key ]->to_smarty_php($parser);
-                while ($key + 1 < $cnt && ($this->subtrees[ $key + 1 ] instanceof Smarty_Internal_ParseTree_Text ||
-                                           $this->subtrees[ $key + 1 ]->data === '')) {
-                    $key++;
-                    if ($this->subtrees[ $key ]->data === '') {
-                        continue;
-                    }
-                    $subtree .= $this->subtrees[ $key ]->to_smarty_php($parser);
-                }
-                if ($subtree === '') {
-                    continue;
-                }
-                $code .= preg_replace(
-                    '/((<%)|(%>)|(<\?php)|(<\?)|(\?>)|(<\/?script))/',
-                    "<?php echo '\$1'; ?>\n",
-                    $subtree
-                );
-                continue;
-            }
-            if ($this->subtrees[ $key ] instanceof Smarty_Internal_ParseTree_Tag) {
-                $subtree = $this->subtrees[ $key ]->to_smarty_php($parser);
-                while ($key + 1 < $cnt && ($this->subtrees[ $key + 1 ] instanceof Smarty_Internal_ParseTree_Tag ||
-                                           $this->subtrees[ $key + 1 ]->data === '')) {
-                    $key++;
-                    if ($this->subtrees[ $key ]->data === '') {
-                        continue;
-                    }
-                    $subtree = $parser->compiler->appendCode($subtree, $this->subtrees[ $key ]->to_smarty_php($parser));
-                }
-                if ($subtree === '') {
-                    continue;
-                }
-                $code .= $subtree;
-                continue;
-            }
-            $code .= $this->subtrees[ $key ]->to_smarty_php($parser);
+
+        foreach ($this->getChunkedSubtrees() as $chunk) {
+	        $text = '';
+	        switch ($chunk['mode']) {
+		        case 'textstripped':
+			        foreach ($chunk['subtrees'] as $subtree) {
+				        $text .= $subtree->to_smarty_php($parser);
+			        }
+			        $code .= preg_replace(
+				        '/((<%)|(%>)|(<\?php)|(<\?)|(\?>)|(<\/?script))/',
+				        "<?php echo '\$1'; ?>\n",
+				        $parser->compiler->processText($text)
+			        );
+			        break;
+		        case 'text':
+			        foreach ($chunk['subtrees'] as $subtree) {
+				        $text .= $subtree->to_smarty_php($parser);
+			        }
+			        $code .= preg_replace(
+				        '/((<%)|(%>)|(<\?php)|(<\?)|(\?>)|(<\/?script))/',
+				        "<?php echo '\$1'; ?>\n",
+				        $text
+			        );
+			        break;
+		        case 'tag':
+			        foreach ($chunk['subtrees'] as $subtree) {
+				        $text = $parser->compiler->appendCode($text, $subtree->to_smarty_php($parser));
+			        }
+			        $code .= $text;
+			        break;
+		        default:
+			        foreach ($chunk['subtrees'] as $subtree) {
+				        $text = $subtree->to_smarty_php($parser);
+			        }
+			        $code .= $text;
+
+	        }
        }
        return $code;
    }
+
+    private function getChunkedSubtrees() {
+    	$chunks = 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 ] 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;
+    }
 }
@@ -16,14 +16,31 @@
 */
 class Smarty_Internal_ParseTree_Text extends Smarty_Internal_ParseTree
 {
-    /**
-     * Create template text buffer
-     *
-     * @param string $data text
-     */
-    public function __construct($data)
+
+	/**
+	 * Wether this section should be stripped on output to smarty php
+	 * @var bool
+	 */
+	private $toBeStripped = false;
+
+	/**
+	 * Create template text buffer
+	 *
+	 * @param string $data text
+	 * @param bool $toBeStripped wether this section should be stripped on output to smarty php
+	 */
+    public function __construct($data, $toBeStripped = false)
    {
        $this->data = $data;
+        $this->toBeStripped = $toBeStripped;
+    }
+
+	/**
+	 * Wether this section should be stripped on output to smarty php
+	 * @return bool
+	 */
+	public function isToBeStripped() {
+    	return $this->toBeStripped;
    }

    /**
@@ -44,9 +44,12 @@ class Smarty_Internal_Runtime_CodeFrame
            $properties[ 'file_dependency' ] = $_template->cached->file_dependency;
            $properties[ 'cache_lifetime' ] = $_template->cache_lifetime;
        }
-        $output = "<?php\n";
-        $output .= "/* Smarty version {$properties[ 'version' ]}, created on " . strftime("%Y-%m-%d %H:%M:%S") .
-                   "\n  from '" . str_replace('*/', '* /', $_template->source->filepath) . "' */\n\n";
+        $output = sprintf(
+            "<?php\n/* Smarty version %s, created on %s\n  from '%s' */\n\n",
+            $properties[ 'version' ],
+            date("Y-m-d H:i:s"),
+            str_replace('*/', '* /', $_template->source->filepath)
+        );
        $output .= "/* @var Smarty_Internal_Template \$_smarty_tpl */\n";
        $dec = "\$_smarty_tpl->_decodeProperties(\$_smarty_tpl, " . var_export($properties, true) . ',' .
               ($cache ? 'true' : 'false') . ')';
@@ -246,7 +246,15 @@ abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data
                error_reporting($_smarty_old_error_level);
            }
            return $result;
-        } catch (Exception $e) {
+        } catch (Exception $e) { // PHP 5.x specific
+            while (ob_get_level() > $level) {
+                ob_end_clean();
+            }
+            if (isset($_smarty_old_error_level)) {
+                error_reporting($_smarty_old_error_level);
+            }
+            throw $e;
+        } catch (Throwable $e) { // For PHP ^7.0 this can also catch Errors
            while (ob_get_level() > $level) {
                ob_end_clean();
            }
@@ -680,73 +680,69 @@ abstract class Smarty_Internal_TemplateCompilerBase
    }

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

    /**
@@ -1459,6 +1455,10 @@ abstract class Smarty_Internal_TemplateCompilerBase
     */
    abstract protected function doCompile($_content, $isTemplateSource = false);

+    public function cStyleComment($string) {
+        return '/*' . str_replace('*/', '* /' , $string) . '*/';
+    }
+
    /**
     * Compile Tag
     *
@@ -2169,8 +2169,13 @@ class Smarty_Internal_Templateparser
    // line 255 "../smarty/lexer/smarty_internal_templateparser.y"
    public function yy_r2()
    {
-        $this->current_buffer->append_subtree($this,
-            $this->compiler->processText($this->yystack[ $this->yyidx + 0 ]->minor));
+    	$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 259 "../smarty/lexer/smarty_internal_templateparser.y"
@@ -2832,6 +2837,10 @@ class Smarty_Internal_Templateparser
    // line 765 "../smarty/lexer/smarty_internal_templateparser.y"
    public function yy_r95()
    {
+        if ($this->security && $this->security->static_classes !== array()) {
+            $this->compiler->trigger_template_error('dynamic static class not allowed by security setting');
+        }
+
        $prefixVar = $this->compiler->getNewPrefixVariable();
        if ($this->yystack[ $this->yyidx + -2 ]->minor[ 'var' ] === '\'smarty\'') {
            $this->compiler->appendPrefixCode("<?php {$prefixVar} = " .
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+if [[ "$1" =~ ^3\.[0-9\.-rc]+$ ]]; then
+   printf 'Creating release %s\n' "$1"
+else
+   echo "Invalid version number: $1. This script can only make v3.x.x releases."
+   exit 1;
+fi
+
+git checkout -b "release/$1"
+sed -i "s/## \\[Unreleased\\]/## \\[Unreleased\\]\\n\\n## \\[$1\\] - $(date +%Y-%m-%d)/" CHANGELOG.md
+sed -i "s/const SMARTY_VERSION = '[^']\+';/const SMARTY_VERSION = '$1';/" libs/Smarty.class.php
+
+git add CHANGELOG.md libs/Smarty.class.php
+git commit -m "version bump"
+
+git checkout support/3.1
+git pull
+git merge --no-ff "release/$1"
+git branch -d "release/$1"
+git tag -a "v$1" -m "Release $1"
+
+printf 'Done creating release %s\n' "$1"
+
+# shellcheck disable=SC2016
+printf 'Run `git push --follow-tags origin` to publish it.\n'
@@ -0,0 +1,46 @@
+#!/bin/bash
+Help()
+{
+   # Display Help
+   echo "Runs PHPUnit tests for all PHP versions supported by this version of Smarty."
+   echo
+   echo "Syntax: $0 [-e|h]"
+   echo "options:"
+   echo "e     Exclude a group of unit tests, e.g. -e 'slow'"
+   echo "h     Print this Help."
+   echo
+}
+
+Exclude=""
+
+# Get the options
+while getopts ":he:" option; do
+   case $option in
+      e) # Exclude
+        echo $OPTARG
+         Exclude=$OPTARG;;
+      h) # display Help
+         Help
+         exit;;
+     \?) # Invalid option
+         echo "Error: Invalid option"
+         exit;;
+   esac
+done
+
+if [ -z $Exclude ];
+then
+  Entrypoint="./run-tests.sh"
+else
+   Entrypoint="./run-tests.sh $Exclude"
+fi
+
+# Runs tests for all supported PHP versions
+docker-compose run --entrypoint "$Entrypoint" php54 && \
+docker-compose run --entrypoint "$Entrypoint" php55 && \
+docker-compose run --entrypoint "$Entrypoint" php56 && \
+docker-compose run --entrypoint "$Entrypoint" php70 && \
+docker-compose run --entrypoint "$Entrypoint" php71 && \
+docker-compose run --entrypoint "$Entrypoint" php72 && \
+docker-compose run --entrypoint "$Entrypoint" php73 && \
+docker-compose run --entrypoint "$Entrypoint" php74
@@ -0,0 +1,13 @@
+#!/bin/sh
+composer update
+
+php -r 'echo "\nPHP version " . phpversion() . ". ";';
+
+if [ -z $1 ];
+then
+  echo "Running all unit tests.\n"
+  php ./vendor/phpunit/phpunit/phpunit tests
+else
+  echo "Running all unit tests, except tests marked with @group $1.\n"
+  php ./vendor/phpunit/phpunit/phpunit --exclude-group $1 tests
+fi
@@ -16,7 +16,6 @@ if (!class_exists('\PHPUnit_Framework_TestCase') && class_exists('\PHPUnit\Frame
    class_alias('\PHPUnit\Framework\Error\Error', '\PHPUnit_Framework_Error_Error');
    class_alias('\PHPUnit\Framework\Error\Warning', '\PHPUnit_Framework_Error_Warning');
    class_alias('\PHPUnit\Framework\Error\Warning', '\PHPUnit_Framework_Error_Deprecated');
-    class_alias('\PHPUnit\Util\Configuration', '\PHPUnit_Util_Configuration');
 }

 require_once 'PHPUnit_Smarty.php';
@@ -24,34 +24,37 @@ class UndefinedTemplateVarTest extends PHPUnit_Smarty
        $this->cleanDirs();
    }
    /**
-     * Test E_NOTICE suppression template fetched by Smarty object
+     * Test Error suppression template fetched by Smarty object
     */
-    public function testE_NoticeDisabled()
+    public function testErrorDisabled()
    {
        $e1 = error_reporting();
-        $this->smarty->setErrorReporting(E_ALL & ~E_NOTICE);
+        $this->smarty->setErrorReporting(E_ALL & ~E_WARNING & ~E_NOTICE);
        $this->assertEquals('undefined = ', $this->smarty->fetch('001_main.tpl'));
        $e2 = error_reporting();
        $this->assertEquals($e1, $e2);
    }

    /**
-     * Test E_NOTICE suppression template fetched by template object
+     * Test Error suppression template fetched by template object
     */
-    public function testE_NoticeDisabledTplObject_1()
+    public function testErrorDisabledTplObject_1()
    {
        $e1 = error_reporting();
-        $this->smarty->setErrorReporting(E_ALL & ~E_NOTICE);
+        $this->smarty->setErrorReporting(E_ALL & ~E_WARNING & ~E_NOTICE);
        $tpl = $this->smarty->createTemplate('001_main.tpl');
        $this->assertEquals('undefined = ', $tpl->fetch());
        $e2 = error_reporting();
        $this->assertEquals($e1, $e2);
    }

-    public function testE_NoticeDisabledTplObject_2()
+	/**
+	 * Test Error suppression template object fetched by Smarty object
+	 */
+    public function testErrorDisabledTplObject_2()
    {
        $e1 = error_reporting();
-        $this->smarty->setErrorReporting(E_ALL & ~E_NOTICE);
+        $this->smarty->setErrorReporting(E_ALL & ~E_WARNING & ~E_NOTICE);
        $tpl = $this->smarty->createTemplate('001_main.tpl');
        $this->assertEquals('undefined = ', $this->smarty->fetch($tpl));
        $e2 = error_reporting();
@@ -59,16 +62,31 @@ class UndefinedTemplateVarTest extends PHPUnit_Smarty
    }

    /**
-     * Throw E_NOTICE message
-     *
-     * @expectedException PHPUnit_Framework_Error_Notice
-     * @expectedExceptionMessage Undefined index: foo
+     * Throw Error message
     */
-    public function testE_Notice()
+    public function testError()
    {
-            $e1 = error_reporting();
-            $this->assertEquals('undefined = ', $this->smarty->fetch('001_main.tpl'));
-            $e2 = error_reporting();
-            $this->assertEquals($e1, $e2);
+	    $exceptionThrown = false;
+
+        try {
+	        $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',
+		        )
+	        ));
+        }
+	    $this->assertTrue($exceptionThrown);
    }
 }
@@ -27,7 +27,7 @@ class MuteExpectedErrorsTest extends PHPUnit_Smarty
    {
        $this->cleanDirs();
    }
-    public function error_handler($errno, $errstr, $errfile, $errline, $errcontext)
+    public function error_handler($errno, $errstr, $errfile, $errline, $errcontext = array())
    {
        $this->_errors[] = $errfile . ' line ' . $errline;
    }
@@ -339,6 +339,10 @@ class CacheResourceTestCommon extends PHPUnit_Smarty
        $this->assertNull($tpl->cached->handler->getCachedContent($tpl3));
        $this->assertEquals('hello world', $tpl->cached->handler->getCachedContent($tpl4));
    }
+
+    /**
+     * @group slow
+     */
   public function testClearCacheExpired()
    {
        $this->smarty->caching = true;
@@ -399,7 +403,7 @@ class CacheResourceTestCommon extends PHPUnit_Smarty
     * @runInSeparateProcess
     * @preserveGlobalState disabled
     * @dataProvider data
-     *
+     * @group slow
     */
    public function testCache($lockTime, $lockTimeout, $compile_id, $cache_id, $isCached, $tmin, $tmax, $forceCompile, $forceCache, $update, $testNumber, $compileTestNumber, $renderTestNumber, $testName)
    {
@@ -403,7 +403,11 @@ class ConfigVarTest extends PHPUnit_Smarty
            $this->assertEquals("", $this->smarty->fetch('foo.tpl'));
        }
        catch (Exception $e) {
-            $this->assertEquals('Undefined variable: foo', $e->getMessage());
+	        if (PHP_VERSION_ID >= 80000) {
+		        $this->assertStringStartsWith('Undefined variable', $e->getMessage());
+	        } else {
+		        $this->assertStringStartsWith('Undefined variable', $e->getMessage());
+	        }
        }
    }
 }
@@ -125,7 +125,7 @@ class ExtendsResourceTest extends PHPUnit_Smarty
     * test  grandchild/child/parent dependency test2
     * @runInSeparateProcess
     * @preserveGlobalState disabled
-     *
+     * @group slow
     */
    public function testCompileBlockGrandChildMustCompile_021_2()
    {
@@ -193,7 +193,7 @@ class ExtendsResourceTest extends PHPUnit_Smarty
     * test  grandchild/child/parent dependency test4
     * @runInSeparateProcess
     * @preserveGlobalState disabled
-     *
+     * @group slow
     */
    public function testCompileBlockGrandChildMustCompile_021_4()
    {
@@ -298,18 +298,38 @@ class SecurityTest extends PHPUnit_Smarty
        $this->assertEquals('25', $this->smarty->fetch($tpl));
    }

-/**
- * 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->smarty->security_policy->static_classes = array('null');
-            $this->smarty->fetch('string:{mysecuritystaticclass::square(5)}');
-    }
+	/**
+	 * test not trusted PHP function
+	 * @expectedException        SmartyException
+	 * @expectedExceptionMessage   access to static class 'mysecuritystaticclass' not allowed by security setting
+	 */
+	public function testNotTrustedStaticClass()
+	{
+		$this->smarty->security_policy->static_classes = array('null');
+		$this->smarty->fetch('string:{mysecuritystaticclass::square(5)}');
+	}
+
+	/**
+	 * test not trusted PHP function
+	 * @expectedException        SmartyException
+	 * @expectedExceptionMessage   dynamic static class not allowed by security setting
+	 */
+	public function testNotTrustedStaticClassEval()
+	{
+		$this->smarty->security_policy->static_classes = array('null');
+		$this->smarty->fetch('string:{$test = "mysecuritystaticclass"}{$test::square(5)}');
+	}
+
+	/**
+	 * test not trusted PHP function
+	 * @expectedException        SmartyException
+	 * @expectedExceptionMessage   dynamic static class not allowed by security setting
+	 */
+	public function testNotTrustedStaticClassSmartyVar()
+	{
+		$this->smarty->security_policy->static_classes = array('null');
+		$this->smarty->fetch('string:{$smarty.template_object::square(5)}');
+	}

    public function testChangedTrustedDirectory()
    {
@@ -382,6 +402,15 @@ class SecurityTest extends PHPUnit_Smarty
        $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"}'));
    }
+
+    /**
+     * In security mode, accessing $smarty.template_object should be illegal.
+     * @expectedException SmartyCompilerException
+     */
+    public function testSmartyTemplateObject() {
+        $this->smarty->display('string:{$smarty.template_object}');
+    }
+
 }

 class mysecuritystaticclass
@@ -33,7 +33,7 @@ class ClearAllAssignBCTest extends PHPUnit_Smarty

    public function testSmarty2ClearAllAssignInSmarty()
    {
-        error_reporting((error_reporting() & ~(E_NOTICE | E_USER_NOTICE)));
+        error_reporting((error_reporting() & ~(E_NOTICE | E_WARNING | E_USER_NOTICE)));
        $this->smartyBC->clear_all_assign();
        $this->assertEquals('barblar', $this->smartyBC->fetch($this->_tplBC));
    }
@@ -46,7 +46,7 @@ class ClearAllAssignTest extends PHPUnit_Smarty
     */
    public function testClearAllAssignInTemplate()
    {
-        error_reporting((error_reporting() & ~(E_NOTICE | E_USER_NOTICE)));
+        error_reporting((error_reporting() & ~(E_NOTICE | E_USER_NOTICE | E_WARNING)));
        $this->_tpl->clearAllAssign();
        $this->assertEquals('foobar', $this->smarty->fetch($this->_tpl));
    }
@@ -56,7 +56,7 @@ class ClearAllAssignTest extends PHPUnit_Smarty
     */
    public function testClearAllAssignInData()
    {
-        error_reporting((error_reporting() & ~(E_NOTICE | E_USER_NOTICE)));
+        error_reporting((error_reporting() & ~(E_NOTICE | E_USER_NOTICE | E_WARNING)));
        $this->_data->clearAllAssign();
        $this->assertEquals('fooblar', $this->smarty->fetch($this->_tpl));
    }
@@ -66,7 +66,7 @@ class ClearAllAssignTest extends PHPUnit_Smarty
     */
    public function testClearAllAssignInSmarty()
    {
-        error_reporting((error_reporting() & ~(E_NOTICE | E_USER_NOTICE)));
+        error_reporting((error_reporting() & ~(E_NOTICE | E_USER_NOTICE | E_WARNING)));
        $this->smarty->clearAllAssign();
        $this->assertEquals('barblar', $this->smarty->fetch($this->_tpl));
    }
@@ -33,14 +33,14 @@ class ClearAssignBCTest extends PHPUnit_Smarty
    }
    public function testSmarty2ClearAssign()
    {
-        $this->smartyBC->setErrorReporting(error_reporting() & ~(E_NOTICE | E_USER_NOTICE));
+        $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));
+        $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}'));
    }
@@ -36,7 +36,7 @@ class ClearAssignTest extends PHPUnit_Smarty
     */
    public function testClearAssign()
    {
-        $this->smarty->setErrorReporting(error_reporting() & ~(E_NOTICE | E_USER_NOTICE));
+        $this->smarty->setErrorReporting(error_reporting() & ~(E_NOTICE | E_USER_NOTICE | E_WARNING));
        $this->smarty->clearAssign('blar');
        $this->assertEquals('foobar', $this->smarty->fetch('eval:{$foo}{$bar}{$blar}'));
    }
@@ -46,7 +46,7 @@ class ClearAssignTest extends PHPUnit_Smarty
     */
    public function testArrayClearAssign()
    {
-        $this->smarty->setErrorReporting(error_reporting() & ~(E_NOTICE | E_USER_NOTICE));
+        $this->smarty->setErrorReporting(error_reporting() & ~(E_NOTICE | E_USER_NOTICE | E_WARNING));
        $this->smarty->clearAssign(array('blar', 'foo'));
        $this->assertEquals('bar', $this->smarty->fetch('eval:{$foo}{$bar}{$blar}'));
    }
@@ -610,7 +610,7 @@ class CompileBlockExtendsTest extends PHPUnit_Smarty
     *
     * @runInSeparateProcess
     * @preserveGlobalState disabled
-     *
+     * @group slow
     */
    public function testCompileBlockGrandChildMustCompile_021_2()
    {
@@ -645,7 +645,7 @@ class CompileBlockExtendsTest extends PHPUnit_Smarty
     *
     * @runInSeparateProcess
     * @preserveGlobalState disabled
-     *
+     * @group slow
     */
    public function testCompileBlockGrandChildMustCompile_021_3()
    {
@@ -670,7 +670,7 @@ class CompileBlockExtendsTest extends PHPUnit_Smarty
     *
     * @runInSeparateProcess
     * @preserveGlobalState disabled
-     *
+     * @group slow
     */
    public function testCompileBlockGrandChildMustCompile_021_32()
    {
@@ -692,6 +692,7 @@ class CompileBlockExtendsTest extends PHPUnit_Smarty
     *
     * @runInSeparateProcess
     * @preserveGlobalState disabled
+     * @group slow
     */
    public function testCompileBlockGrandChildMustCompile_021_4()
    {
@@ -716,6 +717,7 @@ class CompileBlockExtendsTest extends PHPUnit_Smarty
     *
     * @runInSeparateProcess
     * @preserveGlobalState disabled
+     * @group slow
     */
    public function testCompileBlockGrandChildMustCompile_021_42()
    {
@@ -44,7 +44,7 @@ class CompileForeachTest extends PHPUnit_Smarty
            $this->smarty->assign('foo', $foo);
        } else {
            // unassigned $from parameter
-            $this->smarty->setErrorReporting(error_reporting() & ~(E_NOTICE | E_USER_NOTICE));
+            $this->smarty->setErrorReporting(error_reporting() & ~(E_NOTICE | E_USER_NOTICE | E_WARNING));
        }

        $this->assertEquals($result, $this->smarty->fetch($file), "testForeach - {$code} - {$testName}");
@@ -95,7 +95,7 @@ class CompileForeachTest extends PHPUnit_Smarty
            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}', [], '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 ++),
        );
    }
@@ -210,6 +210,7 @@ class CompileInsertTest extends PHPUnit_Smarty
     * test insert plugin caching 2
     * @runInSeparateProcess
     * @preserveGlobalState disabled
+     * @group slow
     */
    public function testInsertPluginCaching3_2()
    {
@@ -275,7 +275,7 @@ class PluginFunctionHtmlCheckboxesTest extends PHPUnit_Smarty

    protected $_errors = array();

-    public function error_handler($errno, $errstr, $errfile, $errline, $errcontext)
+    public function error_handler($errno, $errstr, $errfile, $errline, $errcontext = array())
    {
        $this->_errors[] = $errstr;
    }
@@ -369,7 +369,7 @@ class PluginFunctionHtmlOptionsTest extends PHPUnit_Smarty

    protected $_errors = array();

-    public function error_handler($errno, $errstr, $errfile, $errline, $errcontext)
+    public function error_handler($errno, $errstr, $errfile, $errline, $errcontext = array())
    {
        $this->_errors[] = $errstr;
    }
@@ -275,7 +275,7 @@ class PluginFunctionHtmlRadiosTest extends PHPUnit_Smarty

    protected $_errors = array();

-    public function error_handler($errno, $errstr, $errfile, $errline, $errcontext)
+    public function error_handler($errno, $errstr, $errfile, $errline, $errcontext = array())
    {
        $this->_errors[] = $errstr;
    }
@@ -238,6 +238,7 @@ class PluginFunctionHtmlSelectDateTest extends PHPUnit_Smarty

        $this->years['default'] = "<option value=\"{$year}\" selected=\"selected\">{$year}</option>";
        $this->years['none'] = "<option value=\"{$year}\">{$year}</option>";
+
    }

    protected function reverse($string)
@@ -394,6 +395,33 @@ class PluginFunctionHtmlSelectDateTest extends PHPUnit_Smarty
        $this->assertEquals($result, $tpl->fetch());
    }

+    public function testEmptyDayWithDateString() {
+        $n = "\n";
+        $result = '<select name="Date_Month">' . $n . $this->months['default'] . $n . '</select>'
+            . $n . '<select name="Date_Day">' . $n . '<option value="">day</option>' . $n . $this->days['none'] . $n . '</select>'
+            . $n . '<select name="Date_Year">' . $n . $this->years['start_2005'] . $n . '</select>';
+        $tpl = $this->smarty->createTemplate('eval:{html_select_date time="2022-02-" day_empty="day" start_year=2005}');
+        $this->assertEquals($result, $tpl->fetch());
+    }
+
+    public function testEmptyMonthWithDateStrings() {
+        $n = "\n";
+        $result = '<select name="Date_Month">' . $n . '<option value="">month</option>' . $n . $this->months['none'] . $n . '</select>'
+            . $n . '<select name="Date_Day">' . $n . $this->days['default'] . $n . '</select>'
+            . $n . '<select name="Date_Year">' . $n . $this->years['start_2005'] . $n . '</select>';
+        $tpl = $this->smarty->createTemplate('eval:{html_select_date time="2022--20" month_empty="month" start_year=2005}');
+        $this->assertEquals($result, $tpl->fetch());
+    }
+
+    public function testEmptyYearWithDateStrings() {
+        $n = "\n";
+        $result = '<select name="Date_Month">' . $n . $this->months['default'] . $n . '</select>'
+            . $n . '<select name="Date_Day">' . $n . $this->days['default'] . $n . '</select>'
+            . $n . '<select name="Date_Year">' . $n . '<option value="">year</option>' . $n . $this->years['none'] . $n . '</select>';
+        $tpl = $this->smarty->createTemplate('eval:{html_select_date time="-02-20" year_empty="year"}');
+        $this->assertEquals($result, $tpl->fetch());
+    }
+
    public function testId()
    {
        $n = "\n";
@@ -54,7 +54,7 @@ class PluginFunctionMailtoTest extends PHPUnit_Smarty

    public function testEncodeJavascript()
    {
-        $result = '<script type="text/javascript">eval(unescape(\'%64%6f%63%75%6d%65%6e%74%2e%77%72%69%74%65%28%27%3c%61%20%68%72%65%66%3d%22%6d%61%69%6c%74%6f%3a%6d%65%40%65%78%61%6d%70%6c%65%2e%63%6f%6d%22%20%3e%6d%65%40%65%78%61%6d%70%6c%65%2e%63%6f%6d%3c%2f%61%3e%27%29%3b\'))</script>';
+        $result = '<script type="text/javascript">document.write(unescape(\'%3c%61%20%68%72%65%66%3d%22%6d%61%69%6c%74%6f%3a%6d%65%40%65%78%61%6d%70%6c%65%2e%63%6f%6d%22%20%3e%6d%65%40%65%78%61%6d%70%6c%65%2e%63%6f%6d%3c%2f%61%3e\'))</script>';
        $tpl = $this->smarty->createTemplate('eval:{mailto address="me@example.com" encode="javascript"}');
        $this->assertEquals(str_replace("\r", '', $result), $this->smarty->fetch($tpl));
    }
@@ -62,7 +62,7 @@ class PluginFunctionMailtoTest extends PHPUnit_Smarty
    public function testEncodeJavascriptWithoutMbstring()
    {
        Smarty::$_MBSTRING = false;
-        $result = '<script type="text/javascript">eval(unescape(\'%64%6f%63%75%6d%65%6e%74%2e%77%72%69%74%65%28%27%3c%61%20%68%72%65%66%3d%22%6d%61%69%6c%74%6f%3a%6d%65%40%65%78%61%6d%70%6c%65%2e%63%6f%6d%22%20%3e%6d%65%40%65%78%61%6d%70%6c%65%2e%63%6f%6d%3c%2f%61%3e%27%29%3b\'))</script>';
+        $result = '<script type="text/javascript">document.write(unescape(\'%3c%61%20%68%72%65%66%3d%22%6d%61%69%6c%74%6f%3a%6d%65%40%65%78%61%6d%70%6c%65%2e%63%6f%6d%22%20%3e%6d%65%40%65%78%61%6d%70%6c%65%2e%63%6f%6d%3c%2f%61%3e\'))</script>';
        $tpl = $this->smarty->createTemplate('eval:{mailto address="me@example.com" encode="javascript"}');
        $this->assertEquals(str_replace("\r", '', $result), $this->smarty->fetch($tpl));
        Smarty::$_MBSTRING = true;
@@ -70,7 +70,7 @@ class PluginFunctionMailtoTest extends PHPUnit_Smarty

    public function testEncodeJavascriptCharcode()
    {
-        $result = "<script type=\"text/javascript\" language=\"javascript\">\n{document.write(String.fromCharCode(60,97,32,104,114,101,102,61,34,109,97,105,108,116,111,58,109,101,64,101,120,97,109,112,108,101,46,99,111,109,34,32,62,109,101,64,101,120,97,109,112,108,101,46,99,111,109,60,47,97,62))}\n</script>\n";
+        $result = '<script type="text/javascript">document.write(String.fromCharCode(60,97,32,104,114,101,102,61,34,109,97,105,108,116,111,58,109,101,64,101,120,97,109,112,108,101,46,99,111,109,34,32,62,109,101,64,101,120,97,109,112,108,101,46,99,111,109,60,47,97,62))</script>';
        $tpl = $this->smarty->createTemplate('eval:{mailto address="me@example.com" encode="javascript_charcode"}');
        $this->assertEquals(str_replace("\r", '', $result), $this->smarty->fetch($tpl));
    }
@@ -78,7 +78,7 @@ class PluginFunctionMailtoTest extends PHPUnit_Smarty
    public function testEncodeJavascriptCharcodeWithoutMbstring()
    {
        Smarty::$_MBSTRING = false;
-        $result = "<script type=\"text/javascript\" language=\"javascript\">\n{document.write(String.fromCharCode(60,97,32,104,114,101,102,61,34,109,97,105,108,116,111,58,109,101,64,101,120,97,109,112,108,101,46,99,111,109,34,32,62,109,101,64,101,120,97,109,112,108,101,46,99,111,109,60,47,97,62))}\n</script>\n";
+        $result = '<script type="text/javascript">document.write(String.fromCharCode(60,97,32,104,114,101,102,61,34,109,97,105,108,116,111,58,109,101,64,101,120,97,109,112,108,101,46,99,111,109,34,32,62,109,101,64,101,120,97,109,112,108,101,46,99,111,109,60,47,97,62))</script>';
        $tpl = $this->smarty->createTemplate('eval:{mailto address="me@example.com" encode="javascript_charcode"}');
        $this->assertEquals(str_replace("\r", '', $result), $this->smarty->fetch($tpl));
        Smarty::$_MBSTRING = true;
@@ -150,7 +150,7 @@ class PluginFunctionMailtoTest extends PHPUnit_Smarty

    public function testUmlauts()
    {
-        $result = '<a href="mailto:me+smtpext@example.com?cc=you@example.com,they@example.com&subject=h%C3%A4llo%20w%C3%B6rld" >me+smtpext@example.com</a>';
+        $result = '<a href="mailto:me+smtpext@example.com?cc=you@example.com,they@example.com&amp;subject=h%C3%A4llo%20w%C3%B6rld" >me+smtpext@example.com</a>';
        $tpl = $this->smarty->createTemplate('eval:{mailto address="me+smtpext@example.com" cc="you@example.com,they@example.com" subject="hällo wörld"}');
        $this->assertEquals(str_replace("\r", '', $result), $this->smarty->fetch($tpl));
    }
@@ -158,9 +158,26 @@ class PluginFunctionMailtoTest extends PHPUnit_Smarty
    public function testUmlautsWithoutMbstring()
    {
        Smarty::$_MBSTRING = false;
-        $result = '<a href="mailto:me+smtpext@example.com?cc=you@example.com,they@example.com&subject=h%C3%A4llo%20w%C3%B6rld" >me+smtpext@example.com</a>';
+        $result = '<a href="mailto:me+smtpext@example.com?cc=you@example.com,they@example.com&amp;subject=h%C3%A4llo%20w%C3%B6rld" >me+smtpext@example.com</a>';
        $tpl = $this->smarty->createTemplate('eval:{mailto address="me+smtpext@example.com" cc="you@example.com,they@example.com" subject="hällo wörld"}');
        $this->assertEquals(str_replace("\r", '', $result), $this->smarty->fetch($tpl));
        Smarty::$_MBSTRING = true;
    }
+
+	public function testJavascriptChars()
+	{
+		$result = '<script type="text/javascript">document.write(unescape(\'%3c%61%20%68%72%65%66%3d%22%6d%61%69%6c%74%6f%3a%6d%65%40%65%78%61%6d%70%6c%65%2e%63%6f%6d%26%71%75%6f%74%3b%26%67%74%3b%6d%65%40%65%78%61%6d%70%6c%65%2e%63%6f%6d%26%23%30%33%39%3b%29%3b%20%61%6c%65%72%74%28%26%71%75%6f%74%3b%69%6e%6a%65%63%74%69%6f%6e%26%71%75%6f%74%3b%29%3b%20%2f%2f%22%20%3e%6d%65%40%65%78%61%6d%70%6c%65%2e%63%6f%6d%26%71%75%6f%74%3b%26%67%74%3b%6d%65%40%65%78%61%6d%70%6c%65%2e%63%6f%6d%26%23%30%33%39%3b%29%3b%20%61%6c%65%72%74%28%26%71%75%6f%74%3b%69%6e%6a%65%63%74%69%6f%6e%26%71%75%6f%74%3b%29%3b%20%2f%2f%3c%2f%61%3e\'))</script>';
+		$this->smarty->assign('address', 'me@example.com">me@example.com\'); alert("injection"); //');
+		$tpl = $this->smarty->createTemplate('eval:{mailto address=$address encode=javascript}');
+		$this->assertEquals(str_replace("\r", '', $result), $this->smarty->fetch($tpl));
+	}
+
+	public function testHtmlChars()
+	{
+		$result = '<a href="mailto:me@example.com&quot;&gt;&lt;h1&gt;" class="email">me@example.com&quot;&gt;&lt;h1&gt;</a>';
+		$this->smarty->assign('address', 'me@example.com"><h1>');
+		$tpl = $this->smarty->createTemplate('eval:{mailto address=$address extra=\'class="email"\'}');
+		$this->assertEquals(str_replace("\r", '', $result), $this->smarty->fetch($tpl));
+	}
+
 }
@@ -207,4 +207,25 @@ class PluginModifierEscapeTest extends PHPUnit_Smarty
        $this->assertEquals("sma'rty@&#187;example&#171;.com", $this->smarty->fetch($tpl));
        Smarty::$_MBSTRING = true;
    }
+
+	public function testTemplateLiteralBackticks()
+	{
+		$tpl = $this->smarty->createTemplate('string:{"`Hello, World!`"|escape:"javascript"}');
+		$this->assertEquals("\\`Hello, World!\\`", $this->smarty->fetch($tpl));
+	}
+
+	public function testTemplateLiteralInterpolation()
+	{
+		$tpl = $this->smarty->createTemplate('string:{$vector|escape:"javascript"}');
+		$this->smarty->assign('vector', "`Hello, \${name}!`");
+		$this->assertEquals("\\`Hello, \\\$\\{name}!\\`", $this->smarty->fetch($tpl));
+	}
+
+	public function testTemplateLiteralBackticksAndInterpolation()
+	{
+		$this->smarty->assign('vector', '`${alert(`Hello, ${name}!`)}${`\n`}`');
+		$tpl = $this->smarty->createTemplate('string:{$vector|escape:"javascript"}');
+		$this->assertEquals("\\`\\\$\\{alert(\\`Hello, \\\$\\{name}!\\`)}\\\$\\{\\`\\\\n\\`}\\`", $this->smarty->fetch($tpl));
+	}
+
 }
@@ -63,6 +63,11 @@ class PluginModifierUnescapeTest extends PHPUnit_Smarty
        $tpl = $this->smarty->createTemplate('string:{"' . $encoded . '"|unescape:"url"}');
        $this->assertEquals($result, $this->smarty->fetch($tpl));
    }
-}

-?>
+    public function testCharset()
+    {
+        $tpl = $this->smarty->createTemplate("string:{'&#039;Stiff Opposition Expected to Casketless Funeral Plan&#039;'|unescape:'htmlall':'utf-8'}");
+        $this->assertEquals("'Stiff Opposition Expected to Casketless Funeral Plan'", $this->smarty->fetch($tpl));
+    }
+
+}
@@ -76,7 +76,7 @@ class CompileStripTest extends PHPUnit_Smarty
                     array("{'Var'}\n <b></b> <c></c>", 'Var<b></b> <c></c>', '', $i ++),
                     array("\n<b></b>  <c></c>", '<b></b> <c></c>', '', $i ++),
                     array("\n<b></b>\n  <c></c>", '<b></b><c></c>', '', $i ++),
-
+                     array("\n<b>\n  {* a comment *}\n   <c>", '<b><c>', '', $i ++),
        );
    }

@@ -297,7 +297,7 @@ class CompileFunctionTest extends PHPUnit_Smarty
     */
    public function testExternalDefinedFunctionRecursion($text)
    {
-        $this->assertEquals('12345', $this->smarty->fetch('test_template_function_recursion2.tpl'), $text);
+        $this->assertEquals('012345', $this->smarty->fetch('test_template_function_recursion2.tpl'), $text);
    }

    /**
@@ -431,5 +431,14 @@ class CompileFunctionTest extends PHPUnit_Smarty
                     array("{function name=simple}A{\$foo}\nC{/function}{call name='simple'}", "Abar\nC", 'T14', $i++),
                     array("{function name=simple}A\n{\$foo}\nC{/function}{call name='simple'}", "A\nbar\nC", 'T15', $i++),
        );
-            }
+    }
+
+    /**
+     * Test handling of function names that are a security risk
+     * @expectedException        SmartyCompilerException
+     */
+    public function testIllegalFunctionName() {
+	    $this->smarty->fetch('string:{function name=\'rce(){};echo "hi";function \'}{/function}');
+    }
+
 }
@@ -78,11 +78,13 @@ class ConstantsTest extends PHPUnit_Smarty
    }
    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));
    }
@@ -44,6 +44,30 @@ class MathTest extends PHPUnit_Smarty
        $this->assertEquals($expected, $this->smarty->fetch($tpl));
    }

+    public function testMultipleOperators()
+    {
+        $this->smarty->disableSecurity();
+        $expected = "2 -- 2";
+        $tpl = $this->smarty->createTemplate('eval:{$x = 5}{$y = 4}{math equation="x - y + 1" x=$x y=$y} -- {math equation="5 - 4 + 1"}');
+        $this->assertEquals($expected, $this->smarty->fetch($tpl));
+    }
+
+    public function testMathMaxFunctionParameters()
+    {
+        $this->smarty->disableSecurity();
+        $expected = max(0, 2) . ' -- ' . max(0, 2, 3);
+        $tpl = $this->smarty->createTemplate('eval:{$x = 0}{$y = 2}{$z = 3}{math equation="max(x, y)" x=$x y=$y} -- {math equation="max(x, y, z)" x=$x y=$y z=$z}');
+        $this->assertEquals($expected, $this->smarty->fetch($tpl));
+    }
+
+    public function testMathMinFunctionParameters()
+    {
+        $this->smarty->disableSecurity();
+        $expected = min(1, 2) . ' -- ' . min(1, 2, 0);
+        $tpl = $this->smarty->createTemplate('eval:{$x = 1}{$y = 2}{$z = 0}{math equation="min(x, y)" x=$x y=$y} -- {math equation="min(x, y, z)" x=$x y=$y z=$z}');
+        $this->assertEquals($expected, $this->smarty->fetch($tpl));
+    }
+
    public function testSyntaxSin()
    {
        $this->smarty->disableSecurity();
@@ -107,4 +131,43 @@ class MathTest extends PHPUnit_Smarty
        $tpl = $this->smarty->createTemplate('eval:{$x = "4"}{$y = "5.5"}{math equation="x * y" x=$x y=$y format="%0.2f"} -- {math equation="20.5 / 5" format="%0.2f"}');
        $this->assertEquals($expected, $this->smarty->fetch($tpl));
    }
+
+	/**
+	 * @expectedException PHPUnit_Framework_Error_Warning
+	 */
+	public function testBackticksIllegal()
+	{
+		$expected = "22.00";
+		$tpl = $this->smarty->createTemplate('eval:{$x = "4"}{$y = "5.5"}{math equation="`ls` x * y" x=$x y=$y}');
+		$this->assertEquals($expected, $this->smarty->fetch($tpl));
+	}
+
+	/**
+	 * @expectedException PHPUnit_Framework_Error_Warning
+	 */
+	public function testDollarSignsIllegal()
+	{
+		$expected = "22.00";
+		$tpl = $this->smarty->createTemplate('eval:{$x = "4"}{$y = "5.5"}{math equation="$" x=$x y=$y}');
+		$this->assertEquals($expected, $this->smarty->fetch($tpl));
+	}
+
+	/**
+	 * @expectedException PHPUnit_Framework_Error_Warning
+	 */
+	public function testBracketsIllegal()
+	{
+		$expected = "I";
+		$tpl = $this->smarty->createTemplate('eval:{$x = "0"}{$y = "1"}{math equation="((y/x).(x))[x]" x=$x y=$y}');
+		$this->assertEquals($expected, $this->smarty->fetch($tpl));
+	}
+
+	public function testRand()
+	{
+		$tpl = $this->smarty->createTemplate('eval:{$x = "0"}{math equation="x * rand()" x=$x}');
+		// this assertion may seem silly, but it serves to prove that using rand() without a parameter
+		// will not trigger a security error (see https://github.com/smarty-php/smarty/issues/794)
+		$this->assertEquals("0", $this->smarty->fetch($tpl));
+	}
+
 }
@@ -0,0 +1,2 @@
+# Ignore anything in here, but keep this directory
+*
@@ -57,7 +57,7 @@ class PhpFunctionTest extends PHPUnit_Smarty
    public function testEmpty2()
    {
        if (version_compare(phpversion(), '5.5', '<')) {
-            $this->markTestSkipped('runs only on PHP > 5.5');
+            $this->markTestSkipped('runs only on PHP >= 5.5');
        }

        $this->smarty->disableSecurity();
@@ -82,7 +82,7 @@ class PhpFunctionTest extends PHPUnit_Smarty
    public function testEmpty3()
    {
        if (version_compare(phpversion(), '5.5', '<')) {
-            $this->markTestSkipped('runs only on PHP > 5.5');
+            $this->markTestSkipped('runs only on PHP >= 5.5');
        }
        $this->smarty->disableSecurity();
        $this->smarty->assign('var', array(true,
@@ -104,7 +104,7 @@ class PhpFunctionTest extends PHPUnit_Smarty
    public function testEmpty4()
    {
        if (version_compare(phpversion(), '5.5', '<')) {
-        $this->markTestSkipped('runs only on PHP > 5.5');
+        $this->markTestSkipped('runs only on PHP >= 5.5');
        }

        $this->smarty->disableSecurity();
@@ -156,6 +156,57 @@ class PhpFunctionTest extends PHPUnit_Smarty
        ,{if isset($var->pass(1))} true {else} false {/IF}
        '));
    }
+
+	/**
+	 * 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('key', 'A');
+		$this->smarty->assign('_varsimpleA', 1);
+		$this->smarty->assign('varsimpleB', 0);
+		$this->smarty->assign('varsimpleC', null);
+
+		$this->assertEquals($result, $this->smarty->fetch('string:' . $strTemplate));
+	}
+
+	/**
+	 * Data provider for testIsset3
+	 */
+	public function dataTestIsset3()
+	{
+		return array(
+			array('{if isset($varobject->arr)}true{else}false{/if}', 'true'),
+			array('{if isset($vararray["keywitharray"])}true{else}false{/if}', 'true'),
+			array('{if isset($vararray["keythatexists"])}true{else}false{/if}', 'true'),
+			array('{if isset($vararray["nonexistingkey"])}true{else}false{/if}', 'false'),
+			array('{if isset($_GET["sscr6hr6cz34j6"])}true{else}false{/if}', 'false'),
+			array('{if isset(count([\'hi\']))}true{else}false{/if}', 'true'),
+			array('{if isset($vararray[\'keywitharray\'][intval(\'1\')])}true{else}false{/if}', 'true'),
+			array('{if isset($vararray[\'keywithobject\']->arr[\'isSet\'])}true{else}false{/if}', 'true'),
+			array('{if isset($vararray[\'keywithobject\']->arr[\'isNull\'])}true{else}false{/if}', 'false'),
+			array('{if isset($varobject->arr[\'isSet\'])}true{else}false{/if}', 'true'),
+			array('{if isset($varobject->arr[\'isNull\'])}true{else}false{/if}', 'false'),
+			array('{if isset($_varsimpleA)}true{else}false{/if}', 'true'),
+			array('{if isset($varsimpleB)}true{else}false{/if}', 'true'),
+			array('{if isset($varsimpleC)}true{else}false{/if}', 'false'),
+			array('{if isset($_varsimpleA && varsimpleB)}true{else}false{/if}', 'true'),
+			array('{if isset($_varsimpleA && varsimpleC)}true{else}false{/if}', 'true'),
+			array('{if isset($_varsimple{$key})}true{else}false{/if}', 'true'),
+		);
+	}
 }

 /**
@@ -183,4 +234,4 @@ class TestIsset {
    public function pass($v) {
        return $v;
    }
-}
+}
@@ -35,7 +35,7 @@ class SmartyNowTest extends PHPUnit_Smarty
    }
    /**
     * test {$smarty.now nocache}
-     *
+     * @group slow
     */
    public function testSmartyNowNocache() {
        $this->smarty->setCaching(true);
@@ -59,7 +59,7 @@ class StreamVariableTest extends PHPUnit_Smarty
        }
    */
    /**
-     * test no existant stream variable
+     * test no existent stream variable
     */
    //    public function testStreamVariable2()
    //    {
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Smarty PHPunit tests - issue #549 regression tests
+ *
+ * @package PHPunit
+ * @author  Andrey Repin <anrdaemon@yandex.ru>
+ */
+
+/**
+ * class for compiler tests
+ *
+ * @runTestsInSeparateProcess
+ * @preserveGlobalState    disabled
+ * @backupStaticAttributes enabled
+ *
+ * mb_split breaks if Smarty encoding is not the same as mbstring regex encoding.
+ */
+class MbSplitEncodingIssue549Test extends PHPUnit_Smarty
+{
+    /** @var string Saved Smarty charset */
+    private $charset;
+
+    /** @var array Source data for tests, hexed to protect from accidental reencoding */
+    private $data = array(
+        "subject" => '4772c3bc6e6577616c64', // "Grünewald"
+        "pattern" => '77616c64', // "wald"
+        "replacement" => '7374c3bc726d', // "stürm"
+        "result" => '4772c3bc6e657374c3bc726d', // "Grünestürm"
+    );
+
+    public function setUp()
+    {
+        if(!\Smarty::$_MBSTRING)
+        {
+            return $this->markTestSkipped("mbstring extension is not in use by Smarty");
+        }
+
+        $this->charset = \Smarty::$_CHARSET;
+        $this->setUpSmarty(dirname(__FILE__));
+    }
+
+    public function tearDown()
+    {
+        \Smarty::$_CHARSET = $this->charset ?: \Smarty::$_CHARSET;
+        $this->cleanDirs();
+    }
+
+    /** Provider for testReplaceModifier
+     */
+    public function encodingPairsProvider()
+    {
+        return array(
+            "with non-UNICODE src/non-UNICODE regex (PHP < 5.6 default)" => array("Windows-1252", "EUC-JP"),
+            "with UTF-8 src/non-UNICODE regex (PHP < 5.6 default)" => array("UTF-8", "EUC-JP"),
+            "with UTF-8 src/UTF-8 regex (PHP >= 5.6)" => array("UTF-8", "UTF-8"),
+            "with non-UNICODE src/UTF-8 regex" => array("Windows-1252", "UTF-8"),
+        );
+    }
+
+    /** Test behavior of `replace` modifier with different source and regex encodings
+     *
+     * @dataProvider encodingPairsProvider
+     */
+    public function testReplaceModifier($mb_int_encoding, $mb_regex_encoding)
+    {
+        $data = $this->data;
+        \array_walk($data, function(&$value, $key) use($mb_int_encoding) {
+            $value = \mb_convert_encoding(pack("H*", $value), $mb_int_encoding, "UTF-8");
+        });
+        \extract($data, \EXTR_SKIP);
+
+        \mb_regex_encoding($mb_regex_encoding);
+        \Smarty::$_CHARSET = $mb_int_encoding;
+        $this->assertEquals($result, $this->smarty->fetch("string:{\"$subject\"|replace:\"$pattern\":\"$replacement\"}"));
+    }
+
+}
@@ -0,0 +1,2 @@
+# Ignore anything in here, but keep this directory
+*
@@ -0,0 +1,2 @@
+# Ignore anything in here, but keep this directory
+*
@@ -0,0 +1,65 @@
+<?php
+
+class ArgumentMustBePassedByReference961Test extends PHPUnit_Smarty
+{
+
+	/**
+	 * @group issue961
+	 */
+	public function testReset()
+	{
+		$smarty = new Smarty();
+		$smarty->registerPlugin('modifier', 'reset', 'reset');
+		$templateStr = "string:{reset(\$ar)}";
+		$smarty->assign('ar', [1,2,3]);
+		$this->assertEquals(
+			'1',
+			$smarty->fetch($templateStr)
+		);
+	}
+
+	/**
+	 * @group issue961
+	 */
+	public function testResetAsModifier()
+	{
+		$smarty = new Smarty();
+		$templateStr = "string:{\$ar|reset}";
+		$smarty->assign('ar', [1,2,3]);
+		$this->assertEquals(
+			'1',
+			$smarty->fetch($templateStr)
+		);
+	}
+
+	/**
+	 * @group issue961
+	 */
+	public function testResetInExpression()
+	{
+		$smarty = new Smarty();
+		$smarty->registerPlugin('modifier', 'reset', 'reset');
+		$templateStr = "string:{if reset(\$ar)}ok{/if}";
+		$smarty->assign('ar', [1,2,3]);
+		$this->assertEquals(
+			'ok',
+			$smarty->fetch($templateStr)
+		);
+	}
+
+	/**
+	 * @group issue961
+	 * @deprecated
+	 */
+	public function testMatch()
+	{
+		$smarty = new Smarty();
+		$smarty->setErrorReporting(E_ALL & ~ E_USER_DEPRECATED);
+		$smarty->registerPlugin('modifier', 'preg_match', 'preg_match');
+		$templateStr = 'string:{assign var="match" value=null}{if preg_match(\'/([a-z]{4})/\', "a test", $match)}{$match.1}{/if}';
+		$this->assertEquals(
+			'test',
+			$smarty->fetch($templateStr)
+		);
+	}
+}
@@ -0,0 +1,13 @@
+FROM php:5.4-cli
+
+## Upgrade CA certificates
+RUN curl -k https://curl.se/ca/cacert.pem > cacert.crt && cp cacert.crt /usr/local/share/ca-certificates/ && update-ca-certificates
+
+## Basic utilities
+RUN apt-get update -yqq && apt-get install --force-yes -y curl apt-utils git zip unzip
+
+## Composer
+COPY ./utilities/testrunners/shared/install-composer.sh /root/install-composer.sh
+WORKDIR /root
+RUN sh ./install-composer.sh
+RUN mv ./composer.phar /usr/local/bin/composer
@@ -0,0 +1,13 @@
+FROM php:5.5-cli
+
+## Upgrade CA certificates
+RUN curl -k https://curl.se/ca/cacert.pem > cacert.crt && cp cacert.crt /usr/local/share/ca-certificates/ && update-ca-certificates
+
+## Basic utilities
+RUN apt-get update -yqq && apt-get install --force-yes -y curl apt-utils git zip unzip
+
+## Composer
+COPY ./utilities/testrunners/shared/install-composer.sh /root/install-composer.sh
+WORKDIR /root
+RUN sh ./install-composer.sh
+RUN mv ./composer.phar /usr/local/bin/composer
@@ -0,0 +1,13 @@
+FROM php:5.6-cli
+
+## Upgrade CA certificates
+RUN curl -k https://curl.se/ca/cacert.pem > cacert.crt && cp cacert.crt /usr/local/share/ca-certificates/ && update-ca-certificates
+
+## Basic utilities
+RUN apt-get update -yqq && apt-get install --force-yes -y curl apt-utils git zip unzip
+
+## Composer
+COPY ./utilities/testrunners/shared/install-composer.sh /root/install-composer.sh
+WORKDIR /root
+RUN sh ./install-composer.sh
+RUN mv ./composer.phar /usr/local/bin/composer
@@ -0,0 +1,10 @@
+FROM php:7.0-cli
+
+## Basic utilities
+RUN apt-get update -yqq && apt-get install -y curl apt-utils git zip unzip
+
+## Composer
+COPY ./utilities/testrunners/shared/install-composer.sh /root/install-composer.sh
+WORKDIR /root
+RUN sh ./install-composer.sh
+RUN mv ./composer.phar /usr/local/bin/composer
@@ -0,0 +1,10 @@
+FROM php:7.1-cli
+
+## Basic utilities
+RUN apt-get update -yqq && apt-get install -y curl apt-utils git zip unzip
+
+## Composer
+COPY ./utilities/testrunners/shared/install-composer.sh /root/install-composer.sh
+WORKDIR /root
+RUN sh ./install-composer.sh
+RUN mv ./composer.phar /usr/local/bin/composer
@@ -0,0 +1,10 @@
+FROM php:7.2-cli
+
+## Basic utilities
+RUN apt-get update -yqq && apt-get install -y curl apt-utils git zip unzip
+
+## Composer
+COPY ./utilities/testrunners/shared/install-composer.sh /root/install-composer.sh
+WORKDIR /root
+RUN sh ./install-composer.sh
+RUN mv ./composer.phar /usr/local/bin/composer
@@ -0,0 +1,10 @@
+FROM php:7.3-cli
+
+## Basic utilities
+RUN apt-get update -yqq && apt-get install -y curl apt-utils git zip unzip
+
+## Composer
+COPY ./utilities/testrunners/shared/install-composer.sh /root/install-composer.sh
+WORKDIR /root
+RUN sh ./install-composer.sh
+RUN mv ./composer.phar /usr/local/bin/composer
@@ -0,0 +1,10 @@
+FROM php:7.4-cli
+
+## Basic utilities
+RUN apt-get update -yqq && apt-get install -y curl apt-utils git zip unzip
+
+## Composer
+COPY ./utilities/testrunners/shared/install-composer.sh /root/install-composer.sh
+WORKDIR /root
+RUN sh ./install-composer.sh
+RUN mv ./composer.phar /usr/local/bin/composer
@@ -0,0 +1,2 @@
+#!/bin/sh
+composer update && php ./vendor/phpunit/phpunit/phpunit -c phpunit.xml tests
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+EXPECTED_CHECKSUM="$(php -r 'copy("https://composer.github.io/installer.sig", "php://stdout");')"
+php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
+ACTUAL_CHECKSUM="$(php -r "echo hash_file('sha384', 'composer-setup.php');")"
+
+if [ "$EXPECTED_CHECKSUM" != "$ACTUAL_CHECKSUM" ]
+then
+    >&2 echo 'ERROR: Invalid installer checksum'
+    rm composer-setup.php
+    exit 1
+fi
+
+php composer-setup.php --quiet
+RESULT=$?
+rm composer-setup.php
+exit $RESULT
Author	SHA1	Message	Date
Simon Wisselink	c1642490f0	Added some unit test to study consistent behavior on passing argument by reference.	2024-04-05 17:04:03 +02:00
Simon Wisselink	2fc443806c	Merge branch 'release/3.1.48' into support/3.1	2023-03-28 21:45:54 +02:00
Simon Wisselink	e4cbb1ddc1	version bump	2023-03-28 21:45:52 +02:00
Simon Wisselink	df9b93df67	Add changelog	2023-03-28 21:43:12 +02:00
Simon Wisselink	e09df8d851	Merge branch 'js_escape_security_fix_31' into support/3.1	2023-03-28 21:41:31 +02:00
Simon Wisselink	7677db7bc9	Implement fix and tests	2023-03-24 12:21:08 +01:00
Simon Wisselink	e58c3dde4d	Update changelog	2022-09-22 15:05:26 +02:00
Simon Wisselink	e1fb2ad688	clean output buffer for Throwable instead of just Exception (#798 ) * clean output buffer for Throwable instead of just Exception	2022-09-22 14:56:33 +02:00
Simon Wisselink	1a69f4e4c7	Re-organize testrunners to use the same script(s).	2022-09-22 14:53:56 +02:00
Simon Wisselink	a09364fe17	Merge branch 'release/3.1.47' into support/3.1	2022-09-14 13:29:00 +02:00
Simon Wisselink	c51719bdfe	version bump	2022-09-14 13:28:58 +02:00
Simon Wisselink	3f426c498e	Test for existence of htmlspecialchars flag (PHP < 5.4)	2022-09-14 13:19:53 +02:00
Simon Wisselink	4d316d37a9	Smarty5 syntax fix	2022-09-14 13:09:50 +02:00
Simon Wisselink	80e45491e1	Smarty5 syntax fix	2022-09-14 12:58:07 +02:00
Simon Wisselink	08afb5150e	Fixed unselected year/month/day not working in html_select_date Fixes #395	2022-09-14 12:49:31 +02:00
Simon Wisselink	f1f7ee6e34	Applied appropriate javascript and html escaping in mailto plugin to counter injection attacks Fixes #454	2022-09-14 11:53:34 +02:00
Simon Wisselink	25051e6e88	Bugfix/rand without param v3 (#796 ) * Fixed use of `rand()` without a parameter in math function (for v3.1) Fixes #794 * Add change in regex for PRCE (PHP < 7.3) * Add unit tests and correctly set PHP supported versions * Drop PHP5.2 from CI workflows because it cannot be build anymore * Fix CI workflow for PHP7.2 and up * re-add compose packages cache with specific key * Exclude unit test files from git export * prevent double CI workflows in PRs	2022-09-12 16:03:27 +02:00
Simon Wisselink	b3ade90dec	Merge branch 'release/3.1.46' into support/3.1	2022-08-01 23:58:13 +02:00
Simon Wisselink	4bcca1a2b4	version bump	2022-08-01 23:58:11 +02:00
Simon Wisselink	0f7037d7ee	Fixed second param of unescape modifier (#779 ) Fixes #777	2022-08-01 23:49:30 +02:00
Simon Wisselink	459bd4adbd	Merge branch 'AnrDaemon-fix-issue-549-v3' into support/3.1	2022-07-15 10:45:57 +02:00
Simon Wisselink	71c063d0b2	Added changelog	2022-07-15 10:44:38 +02:00
Simon Wisselink	c7c2d476aa	Merge branch 'fix-issue-549-v3' of github.com:AnrDaemon/smarty into AnrDaemon-fix-issue-549-v3	2022-07-15 10:33:38 +02:00
Simon Wisselink	a2713ab89e	Merge branch 'release/3.1.45' into support/3.1	2022-05-17 14:57:52 +02:00
Simon Wisselink	28ea4f078c	version bump	2022-05-17 14:57:50 +02:00
Simon Wisselink	b96c3060d5	Add CVE to changelog	2022-05-17 14:57:30 +02:00
Simon Wisselink	3606c4717e	Merge branch 'security/blockfunctioninjection_v3' into support/3.1	2022-05-17 14:55:24 +02:00
Simon Wisselink	8a8cf58c5a	Changelog	2022-05-16 13:38:45 +02:00
Simon Wisselink	4eb86a6770	Replace '/' in user supplied input in C-style comments with ' /'.	2022-05-16 13:36:03 +02:00
Simon Wisselink	5f59e14fc1	Added change to changelog	2022-04-26 21:59:46 +02:00
AnrDaemon	ed14f5269a	Fixed replace modifier by converting encoding if needed `mb_split` will fail if `$pattern` or `$string` contains byte sequences not valid for `mb_regex_encoding()`. Convert both strings and set regex encoding before calling `mb_split()` if needed. Fixes smarty-php#549	2022-03-04 10:45:57 +03:00
Pavel Kochman	9f47b059ed	math equation return warning: math: illegal character for : {math equation="max(x, y)" x=$x y=$y}	2022-02-07 09:45:14 +01:00
Simon Wisselink	99085d8dc6	Merge branch 'release/3.1.44' into support/3.1	2022-01-18 00:12:04 +01:00
Simon Wisselink	eed1e07128	version bump	2022-01-18 00:12:03 +01:00
Simon Wisselink	208f881d06	Bugfix/702 (#709 ) * fix(math): fix equation regexp Fixes #702.	2022-01-18 00:10:25 +01:00
Simon Wisselink	273f7e00fe	Merge branch 'release/3.1.43' into support/3.1	2022-01-10 10:52:40 +01:00
Simon Wisselink	ce1ff003d7	version bump	2022-01-10 10:52:39 +01:00
Simon Wisselink	28519ca00f	Merge pull request from GHSA-4h9c-v5vg-5m6m	2022-01-10 10:48:27 +01:00
Simon Wisselink	b674cba13d	Merge branch 'release/3.1.42' into support/3.1	2022-01-10 00:08:36 +01:00
Simon Wisselink	a52a5b72ba	version bump	2022-01-10 00:08:34 +01:00
Simon Wisselink	7ad97ad030	Merge pull request from GHSA-29gp-2c3m-3j6m * Temporary fix. Waiting for CVE * Add CVE	2022-01-10 00:07:57 +01:00
Simon Wisselink	d8fa8c982f	Fixed unit tests	2022-01-09 23:29:58 +01:00
Simon Wisselink	de7e15d423	Merge branch 'release/3.1.41' into support/3.1	2022-01-09 23:21:20 +01:00
Simon Wisselink	1b6919da85	version bump	2022-01-09 23:21:19 +01:00
Simon Wisselink	457284283a	Rewrote the mailto function to not use `eval` when encoding with javascript (cherry picked from commit `c7576eb1a1`)	2022-01-09 23:18:17 +01:00
Simon Wisselink	9ffca4a093	Make make-release.sh safer by checking for version number.	2021-10-22 16:00:25 +02:00
Simon Wisselink	0c8a549603	Make make-release.sh safer by checking for version number.	2021-10-22 15:58:10 +02:00
Simon Wisselink	9d4f8309ed	Merge branch 'release/3.1.40'	2021-10-13 12:04:31 +02:00
Simon Wisselink	7c4354e7b8	version bump	2021-10-13 12:04:29 +02:00
Simon Wisselink	770bc4aae2	Merge branch 'm-haritonov-escape'	2021-08-19 16:15:57 +02:00
Simon Wisselink	0ff7ba5ab6	Add changelog	2021-08-19 16:13:30 +02:00
Simon Wisselink	3b0fd82849	Merge branch 'escape' of https://github.com/m-haritonov/smarty into m-haritonov-escape	2021-08-19 15:26:27 +02:00
Ikko Ashimine	1a68b79b6c	Update README.md (#668 ) github -> GitHub	2021-08-18 23:23:36 +02:00
Michael Voříšek	e3eabe0b96	Delete uninted file expectException (#664 )	2021-05-25 21:18:07 +02:00
Simon Wisselink	4698dd9fb0	Changelog	2021-03-21 21:24:32 +01:00
David Goodwin	039043e5a2	Update modifier.escape.php (#649 ) trigger a notice if an incorrect modifier was used (E.g.\|escape:quotes vs \|escape:quote).	2021-03-21 21:21:55 +01:00
Mihail Haritonov	9cde36e3bc	plugins: escape: javascript escaping secure fix	2021-02-28 16:44:56 +03:00
Simon Wisselink	290aee6db3	Update CHANGELOG.md Add CVE's	2021-02-21 22:23:45 +01:00
Simon Wisselink	e2485fa45e	Create SECURITY.md	2021-02-21 22:03:44 +01:00
Simon Wisselink	e27da524f7	Merge branch 'release/3.1.39'	2021-02-17 22:57:51 +01:00
Simon Wisselink	a21f59663c	version bump	2021-02-17 22:57:50 +01:00
Simon Wisselink	3148d406a0	changelog	2021-02-17 22:57:33 +01:00
Simon Wisselink	4f634c0097	Merge branch 'bugfix/tplfunction_sandbox_escape'	2021-02-17 22:52:34 +01:00
Simon Wisselink	c9272058d9	Merge branch 'bugfix/template_object_sandbox_escape'	2021-02-17 22:51:38 +01:00
Simon Wisselink	e66e293a8a	Do not push release automatically in make release script, to enable a chance to catch any errors.	2021-02-17 22:50:52 +01:00
Simon Wisselink	74cab5a56b	updated changelog header to security	2021-02-17 22:30:35 +01:00
Simon Wisselink	8fc66e27a7	Cannot use in Smarty3 yet, revert to @expectedException	2021-02-01 10:33:00 +01:00
Simon Wisselink	2543174460	Cannot use in Smarty3 yet, revert to @expectedException	2021-02-01 10:31:20 +01:00
Simon Wisselink	288a54f6b0	Add unit test	2021-01-24 23:52:45 +01:00
Simon Wisselink	165f1bd4d2	Fixed Code injection vulnerability by using illegal function names	2021-01-24 23:44:07 +01:00
Simon Wisselink	6463519a6c	Prevent access to .template_object when in security mode to prevent PHP code injection vulnerability	2021-01-24 23:13:26 +01:00
Simon Wisselink	fedc127057	Mark tests that use sleep calls as slow, so we can ignore them when running unit tests in development	2021-01-16 23:01:15 +01:00
Ikko Ashimine	3af2df20a4	Fix typo in StreamVariableTest.php (#616 ) existant -> existent	2021-01-08 17:28:33 +01:00
Simon Wisselink	63b3c0aed0	Merge branch 'release/3.1.38'	2021-01-08 15:05:42 +01:00
Simon Wisselink	2af2a07906	version bump	2021-01-08 15:05:40 +01:00
Simon Wisselink	cb4254355e	Removed unused error_reporting.ini file, updated version number in Smarty::SMARTY_VERSION, fixed inline phpdoc that caused an IDE error	2021-01-08 15:05:10 +01:00
Simon Wisselink	f65e7ddd22	fixed changelog	2021-01-07 00:34:08 +01:00
Simon Wisselink	92e05d4f8d	Brought lexer source functionally up-to-date with compiled version (#625 ) Fixes #621	2021-01-07 00:26:28 +01:00
Simon Wisselink	e2b28167f8	Clarify correct LGPL version. Fixes #612	2021-01-05 22:23:13 +01:00
Libor M	820782cd80	const fix for usage with comparison operators (#618 ) Fixes #609 #613	2021-01-05 22:07:44 +01:00
Simon Wisselink	c295786e43	Fixes for php8.0.0beta3 (#608 ) * Set $errcontext argument optional to support PHP 8 - Argument is optional and deprecated in PHP 7.2 * Getting ready for PHP8, handling changed error levels/handlers mostly * php5 compat syntax * Updated UndefinedTemplateVarTest for PHP8 (and disabled a check for PHP<5.6) and re-enabled php:nightly in travis config * Attempt to fix travis runs for (almost) all php versions supported * Fix unit tests for php8, force composer to think we are still php7 to pick a supported phpunit and being less specific about an error msg because PHP8 is in active development and the exact wording is changing. * Fixed a unit test that accidentally passed on phpunit < 7 because of sloppy string comparison. * changelog * run travis in xenial where possible for latest php versions. Fix unit tests from freakingo over inconsistent error messages in php8-beta. * Incorporated AnrDaemons suggestions, making composer figure out the required phpunit version instead of specifying it explicitly and removing a unneeded error supression (@). Co-authored-by: Jorge Sá Pereira <me@jorgesapereira.com>	2020-09-12 21:37:31 +02:00
♚ PH⑦ de Soria™♛	859a09e1bb	Bumped phpdoc @version tag to 3.1.36 (#598 ) Although this could be removed, since the header comment is still there, it's good to keep the @version tag updated in order to avoid confusion for those who read it :)	2020-09-11 13:34:15 +02:00
Simon Wisselink	a5934a755d	Fixed a unit test that accidentally passed on phpunit < 7 because of sloppy string comparison.	2020-09-11 13:22:45 +02:00
Simon Wisselink	5a72624380	Test travis config for PHP5 versions (#592 ) * Run tests for PHP5.x * Start from 5.3 since composer requires it and without it we cannot install phpunit * Specify dist for 5.3 * Disabled nightly testing because phpunit doesn't support php8 yet.	2020-05-05 15:08:31 +02:00
Simon Wisselink	1418c8c422	Merge branch 'AnrDaemon-fix-php5.3-compat'	2020-05-05 09:21:07 +02:00
Simon Wisselink	f46c13b32a	Updated changelog	2020-05-05 09:20:56 +02:00
AnrDaemon	eae19f23b9	PHP 5.3 compatibility fixes	2020-05-05 01:37:36 +03:00
Sławomir Kaleta	e1c050a32c	Fix comment - Method can return string (#583 )	2020-04-14 17:26:20 +02:00
Simon Wisselink	fd148f7ade	Merge branch 'release/3.1.36'	2020-04-14 16:44:26 +02:00
Simon Wisselink	07772aac90	version bump	2020-04-14 16:44:24 +02:00
Simon Wisselink	08227651fc	Fixed #584	2020-04-14 16:44:09 +02:00
Simon Wisselink	e0ea6899c8	fixed version of Smarty::SMARTY_VERSION and updates make-release script to do so automatically from now on	2020-04-14 16:40:44 +02:00
Simon Wisselink	97f700971f	Merge branch 'release/3.1.35'	2020-04-14 00:02:48 +02:00
Simon Wisselink	a0abc47588	version bump	2020-04-14 00:02:39 +02:00
Simon Wisselink	728a584ad5	Moved changelog to a keepachangelog.com format and added a release script	2020-04-14 00:02:18 +02:00
Simon Wisselink	290f7cfc3d	Moved the isset tests into the test suite	2020-04-13 23:44:39 +02:00
Simon Wisselink	48d24b7ad1	Fix repo layout for package maintainers (#571 ) * Do not ignore lexer subfolder for export as this contains source files and add smarty-lexer as a composer dev-dependency. * Remove unit tests etc from archive export Please note that the generated lexer / parser classes are not exactly equivalent, as they have been editing to conform to coding standards afterwards. I did a quick review and there don't seem to be any differences in semantics though.	2020-04-13 22:32:23 +02:00
Simon Wisselink	19ef8342aa	Strip now removes whitespaces after comment (#582 ) * Mark text sections as to be stripped, but do not strip them right away. Combine equivalent sections in chunks at the template level and strip combined chunks where possible. - simplified Smarty_Internal_TemplateCompilerBase::processText along the way Fixes #447	2020-04-13 22:27:42 +02:00
Simon Wisselink	4f89f6d84f	Throw SmartyException when setting caching attributes for cacheable plugin as compiling this would fail (#573 ) Fixes #457	2020-04-13 22:26:24 +02:00
				`@@ -1 +0,0 @@`
				`error_reporting = E_ALL & ~E_DEPRECATED & ~E_STRICT`