Fix use of negative numbers in math equations.

Fixes #895

.github/workflows/ci.yml

@@ -32,7 +32,6 @@ jobs:
           - "8.0"
           - "8.1"
           - "8.2"
-          - "8.3"
 
         compiler:
           - default
@@ -47,9 +46,7 @@ jobs:
           - os: ubuntu-latest
             php-version: "8.2"
             compiler: jit
-          - os: ubuntu-latest
-            php-version: "8.3"
-            compiler: jit
+
     steps:
     - name: Checkout
       uses: actions/checkout@v3

CHANGELOG.md

@@ -6,13 +6,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-### Added
-- PHP8.3 support [#925](https://github.com/smarty-php/smarty/issues/925)
-
-## [4.3.4] - 2023-09-14
-
-## [4.3.3] - 2023-09-14
-
 ### Fixed
 - `|strip_tags` does not work if the input is 0 [#890](https://github.com/smarty-php/smarty/issues/890)
 - Use of negative numbers in {math} equations [#895](https://github.com/smarty-php/smarty/issues/895)

README.md

@@ -7,7 +7,7 @@ Smarty is a template engine for PHP, facilitating the separation of presentation
 Read the [documentation](https://smarty-php.github.io/smarty/) to find out how to use it. 
 
 ## Requirements
-Smarty can be run with PHP 7.1 to PHP 8.3.
+Smarty can be run with PHP 7.1 to PHP 8.2.
 
 ## Installation
 Smarty versions 3.1.11 or later can be installed with [Composer](https://getcomposer.org/).

docker-compose.yml

@@ -42,8 +42,3 @@ services:
       service: base
     build:
       dockerfile: ./utilities/testrunners/php82/Dockerfile
-  php83:
-    extends:
-      service: base
-    build:
-      dockerfile: ./utilities/testrunners/php83/Dockerfile 

docs/getting-started.md

@@ -1,7 +1,7 @@
 # Getting started
 
 ## Requirements
-Smarty can be run with PHP 7.1 to PHP 8.3.
+Smarty can be run with PHP 7.1 to PHP 8.2.
 
 ## Installation
 Smarty can be installed with [Composer](https://getcomposer.org/).

libs/Smarty.class.php

@@ -107,7 +107,7 @@ class Smarty extends Smarty_Internal_TemplateBase
     /**
      * smarty version
      */
-    const SMARTY_VERSION = '4.3.4';
+    const SMARTY_VERSION = '4.3.2';
     /**
      * define variable scopes
      */

libs/sysplugins/smarty_internal_errorhandler.php

@@ -94,7 +94,7 @@ class Smarty_Internal_ErrorHandler
         }
 
         if ($this->allowUndefinedArrayKeys && preg_match(
-            '/^(Undefined index|Undefined array key|Trying to access array offset on)/',
+            '/^(Undefined index|Undefined array key|Trying to access array offset on value of type)/',
             $errstr
         )) {
             return; // suppresses this error

make-release.sh

@@ -14,7 +14,7 @@ sed -i "s/const SMARTY_VERSION = '[^']\+';/const SMARTY_VERSION = '$1';/" libs/S
 git add CHANGELOG.md libs/Smarty.class.php
 git commit -m "version bump"
 
-git checkout support/4.3
+git checkout master
 git pull
 git merge --no-ff "release/$1"
 git branch -d "release/$1"

run-tests-for-all-php-versions.sh

@@ -10,6 +10,4 @@ docker-compose run php72 ./run-tests.sh $@ && \
 docker-compose run php73 ./run-tests.sh $@ && \
 docker-compose run php74 ./run-tests.sh $@ && \
 docker-compose run php80 ./run-tests.sh $@ && \
-docker-compose run php81 ./run-tests.sh $@ && \
-docker-compose run php82 ./run-tests.sh $@ && \
-docker-compose run php83 ./run-tests.sh $@
+docker-compose run php81 ./run-tests.sh $@

tests/UnitTests/A_Core/AutoEscape/AutoEscapeTest.php

@@ -30,36 +30,4 @@ class AutoEscapeTest extends PHPUnit_Smarty
         $tpl->assign('foo', '<a@b.c>');
         $this->assertEquals("&lt;a@b.c&gt;", $this->smarty->fetch($tpl));
     }
-
-
-    /**
-     * test 'escapeHtml' property
-     * @group issue906
-     */
-    public function testAutoEscapeDoesNotEscapeFunctionPlugins()
-    {
-        $this->smarty->registerPlugin(
-            Smarty::PLUGIN_FUNCTION,
-            'horizontal_rule',
-            function ($params, $smarty)	{ return "<hr>"; }
-        );
-        $tpl = $this->smarty->createTemplate('eval:{horizontal_rule}');
-        $this->assertEquals("<hr>", $this->smarty->fetch($tpl));
-    }
-
-    /**
-     * test 'escapeHtml' property
-     * @group issue906
-     */
-    public function testAutoEscapeDoesNotEscapeBlockPlugins()
-    {
-        $this->smarty->registerPlugin(
-            Smarty::PLUGIN_BLOCK,
-            'paragraphify',
-            function ($params, $content)	{ return $content == null ? null :  "<p>".$content."</p>"; }
-        );
-        $tpl = $this->smarty->createTemplate('eval:{paragraphify}hi{/paragraphify}');
-        $this->assertEquals("<p>hi</p>", $this->smarty->fetch($tpl));
-    }
-
 }

utilities/testrunners/php83/Dockerfile

@@ -1,10 +0,0 @@
-FROM php:8.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