diff --git a/.gitignore b/.gitignore index b78ac2f5..f790af1c 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ lexer/*.out utilies/*.php /composer.lock /vendor +/tests diff --git a/ChangeLog b/ChangeLog index 02ab60f7..6232e904 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,43 +1,40 @@ -===== 2.6.31 === -2017-11-03 - * replace functions deprecated in PHP 7.2 +=== Unreleased === +=== 2.6.31 - 2017-11-03 === +- replace functions deprecated in PHP 7.2 +- {math} fix parameter checking order to avoid misleading message +- {math} replace wrong versiom -2016-09-11 Uwe Tews - * {math} fix parameter checking order to avoid misleading message - * {math} replace wrong versiom - -2016-07-19 Uwe Tews - * {math} shell injection vulnerability patch provided by Tim Weber - -2015-12-30 Uwe Tews - - * fixed plugin filepath cache must not be static, because of possible problem +=== 2.6.30 - 2016-07-19 === +- {math} shell injection vulnerability patch provided by Tim Weber +- fixed plugin filepath cache must not be static, because of possible problem when using multiple Smarty instances with diffrent plugins_dir settings https://github.com/smarty-php/smarty/issues/146 -2015-06-21 Uwe Tews +=== 2.6.29 - 2015-06-21 === +- PHP7 raises E_DEPRECATED use __construct for compatibility - * PHP7 raises E_DEPRECATED use __construct for compatibility +=== 2.6.28 - 2013-09-30 === +- Fixed old vulnerability bug https://bugs.gentoo.org/show_bug.cgi?id=356615 +- Fixed made Smarty_Compiler.class.php compatible with PHP 5.5 -2013-09-30 +=== 2.6.27 - 2012-09-24=== +- Fixed escape Smarty error messages to avoid possible script execution +- Fixed security hole in {math} plugin - * Fixed old vulnerability bug https://bugs.gentoo.org/show_bug.cgi?id=356615 +=== 2.6.26 - 2014-10-31 === +- revert super global access changes, and instead rely on +- USE_SUPER_GLOBALS for security -2013-07-16 Uwe Tews +=== 2.6.25 - 2009-05-19 === +- fix E_NOTICE when sessions are disabled (mohrt) - * Fixed made Smarty_Compiler.class.php compatible with PHP 5.5 +=== 2.6.24 - 2009-05-16 === +- fix problem introduced with super global changes (mohrt) -2012-09-24 Uwe Tews +=== Older versions === - * Fixed escape Smarty error messages to avoid possible script execution - - -2010-04-17 Uwe Tews - - * Fixed security hole in {math} plugin - 2007-09-27 TAKAGI Masahiro * docs/ja/designers/language-custom-functions/language-function-html-checkboxes.xml: diff --git a/QUICK_START b/QUICK_START index 6ae3e466..53a34fa8 100644 --- a/QUICK_START +++ b/QUICK_START @@ -10,9 +10,9 @@ Copy the Smarty library files to your system. In our example, we place them in /usr/local/lib/php/Smarty/ $> cd YOUR_DOWNLOAD_DIRECTORY -$> gtar -ztvf Smarty-2.6.7.tar.gz +$> gtar -ztvf Smarty-2.x.y.tar.gz $> mkdir /usr/local/lib/php/Smarty -$> cp -r Smarty-2.6.7/libs/* /usr/local/lib/php/Smarty +$> cp -r Smarty-2.x.y/libs/* /usr/local/lib/php/Smarty You should now have the following file structure: diff --git a/README b/README index b8be1789..9036ac37 100644 --- a/README +++ b/README @@ -3,8 +3,6 @@ NAME: Smarty - the PHP compiling template engine -VERSION: 2.6.18 - AUTHORS: Monte Ohrt diff --git a/README.md b/README.md index cfeb6b4f..79036190 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Starting with Smarty 2.6.23 Composer has been configured to load the packages fr **NOTE: Because of this change you must clear your local composer cache with the "composer clearcache" command** -To get the latest stable version use +To get the latest v2.6 release use "require": { "smarty/smarty": "~2.6" @@ -12,12 +12,6 @@ To get the latest stable version use in your composer.json file. - To get the trunk version use - - "require": { - "smarty/smarty": "~2.6@dev" - } - The "smarty/smarty" package will start at libs/.... subfolder. diff --git a/composer.json b/composer.json index 106bb281..ca92bf6c 100644 --- a/composer.json +++ b/composer.json @@ -30,10 +30,4 @@ "libs/Config_File.class.php" ] }, - "extra": { - "branch-alias": { - "dev-master": "2.6.x-dev" - } - } - } diff --git a/libs/Config_File.class.php b/libs/Config_File.class.php index 6d8c2987..2b46ddd4 100644 --- a/libs/Config_File.class.php +++ b/libs/Config_File.class.php @@ -22,7 +22,6 @@ * smarty-discussion-subscribe@googlegroups.com * * @link http://www.smarty.net/ - * @version 2.6.25-dev * @copyright Copyright: 2001-2005 New Digital Group, Inc. * @author Andrei Zmievski * @access public diff --git a/libs/Smarty.class.php b/libs/Smarty.class.php index 41814673..c383d4fc 100644 --- a/libs/Smarty.class.php +++ b/libs/Smarty.class.php @@ -27,7 +27,6 @@ * @author Monte Ohrt * @author Andrei Zmievski * @package Smarty - * @version 2.6.31-dev */ /* $Id$ */ @@ -465,7 +464,7 @@ class Smarty * * @var string */ - var $_version = '2.6.31'; + var $_version = '2.6.31'; /** * current template inclusion depth diff --git a/libs/Smarty_Compiler.class.php b/libs/Smarty_Compiler.class.php index ac8549f9..e6fe4129 100644 --- a/libs/Smarty_Compiler.class.php +++ b/libs/Smarty_Compiler.class.php @@ -21,7 +21,6 @@ * @link http://smarty.php.net/ * @author Monte Ohrt * @author Andrei Zmievski - * @version 2.6.25-dev * @copyright 2001-2005 New Digital Group, Inc. * @package Smarty */ diff --git a/make-release.sh b/make-release.sh new file mode 100755 index 00000000..e367cb12 --- /dev/null +++ b/make-release.sh @@ -0,0 +1,28 @@ +#!/bin/bash + +if [[ "$1" =~ ^2\.[0-9\.-rc]+$ ]]; then + printf 'Creating release %s\n' "$1" +else + echo "Invalid version number: $1. This script can only make v2.x.x releases." + exit 1; +fi + +git checkout -b "release/$1" +sed -i "s/=== Unreleased ===/=== Unreleased ===\\n\\n=== $1 - $(date +%Y-%m-%d) ===/" ChangeLog +sed -i "s/var \$_version = '[^']\+';/var \$_version = '$1';/" libs/Smarty.class.php + +exit; + +#git add ChangeLog libs/Smarty.class.php +#git commit -m "version bump" +# +#git checkout support/2.6 +#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' \ No newline at end of file