From cb4254355e399265af2503f2dfc5566967369c7f Mon Sep 17 00:00:00 2001 From: Simon Wisselink Date: Fri, 8 Jan 2021 15:05:10 +0100 Subject: [PATCH] Removed unused error_reporting.ini file, updated version number in Smarty::SMARTY_VERSION, fixed inline phpdoc that caused an IDE error --- .gitattributes | 1 - CHANGELOG.md | 3 +++ error_reporting.ini | 1 - libs/Smarty.class.php | 3 +-- libs/sysplugins/smarty_internal_config_file_compiler.php | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 error_reporting.ini diff --git a/.gitattributes b/.gitattributes index f58d5806..2cda67b0 100644 --- a/.gitattributes +++ b/.gitattributes @@ -12,7 +12,6 @@ /.gitattributes export-ignore /.gitignore export-ignore /.travis.yml export-ignore -/error_reporting.ini export-ignore /make-release.sh export-ignore /phpunit.sh export-ignore /phpunit.xml export-ignore diff --git a/CHANGELOG.md b/CHANGELOG.md index 081d306f..177dc7af 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Fixed +- Smarty::SMARTY_VERSION wasn't updated https://github.com/smarty-php/smarty/issues/628 + ## [3.1.37] - 2021-01-07 ### Changed diff --git a/error_reporting.ini b/error_reporting.ini deleted file mode 100644 index 496bbf5c..00000000 --- a/error_reporting.ini +++ /dev/null @@ -1 +0,0 @@ -error_reporting = E_ALL & ~E_DEPRECATED & ~E_STRICT \ No newline at end of file diff --git a/libs/Smarty.class.php b/libs/Smarty.class.php index 30a0a140..7b33d0f5 100644 --- a/libs/Smarty.class.php +++ b/libs/Smarty.class.php @@ -27,7 +27,6 @@ * @author Uwe Tews * @author Rodney Rehm * @package Smarty - * @version 3.1.36 */ /** * 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.36'; + const SMARTY_VERSION = '3.1.37'; /** * define variable scopes */ diff --git a/libs/sysplugins/smarty_internal_config_file_compiler.php b/libs/sysplugins/smarty_internal_config_file_compiler.php index a842fa8f..90c5dcef 100644 --- a/libs/sysplugins/smarty_internal_config_file_compiler.php +++ b/libs/sysplugins/smarty_internal_config_file_compiler.php @@ -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')