From b4bbc17f1c577516c9d6434f8cfb57de526eec48 Mon Sep 17 00:00:00 2001
From: Simon Wisselink <wisskid@users.noreply.github.com>
Date: Tue, 23 Jan 2024 11:45:13 +0100
Subject: [PATCH 01/10] Add PHP8.3 support for Smarty 4.3. (#927)

See #925
---
 .github/workflows/ci.yml                         |  5 ++++-
 CHANGELOG.md                                     |  3 +++
 docker-compose.yml                               |  5 +++++
 libs/sysplugins/smarty_internal_errorhandler.php |  2 +-
 run-tests-for-all-php-versions.sh                |  4 +++-
 utilities/testrunners/php83/Dockerfile           | 10 ++++++++++
 6 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 utilities/testrunners/php83/Dockerfile

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 00072c8c..04624c0f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -32,6 +32,7 @@ jobs:
           - "8.0"
           - "8.1"
           - "8.2"
+          - "8.3"
 
         compiler:
           - default
@@ -46,7 +47,9 @@ 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
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 04be00ec..d08653d8 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]
 
+### 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
diff --git a/docker-compose.yml b/docker-compose.yml
index 4f940b2c..ff759f5f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -42,3 +42,8 @@ services:
       service: base
     build:
       dockerfile: ./utilities/testrunners/php82/Dockerfile
+  php83:
+    extends:
+      service: base
+    build:
+      dockerfile: ./utilities/testrunners/php83/Dockerfile 
\ No newline at end of file
diff --git a/libs/sysplugins/smarty_internal_errorhandler.php b/libs/sysplugins/smarty_internal_errorhandler.php
index 6f526c38..4ddcfcd1 100644
--- a/libs/sysplugins/smarty_internal_errorhandler.php
+++ b/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 value of type)/',
+            '/^(Undefined index|Undefined array key|Trying to access array offset on)/',
             $errstr
         )) {
             return; // suppresses this error
diff --git a/run-tests-for-all-php-versions.sh b/run-tests-for-all-php-versions.sh
index b64f01e4..79bebb8a 100755
--- a/run-tests-for-all-php-versions.sh
+++ b/run-tests-for-all-php-versions.sh
@@ -10,4 +10,6 @@ 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 php81 ./run-tests.sh $@ && \
+docker-compose run php82 ./run-tests.sh $@ && \
+docker-compose run php83 ./run-tests.sh $@
diff --git a/utilities/testrunners/php83/Dockerfile b/utilities/testrunners/php83/Dockerfile
new file mode 100644
index 00000000..83cd8255
--- /dev/null
+++ b/utilities/testrunners/php83/Dockerfile
@@ -0,0 +1,10 @@
+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

From e0cbbdf6ea21768d0194e59d2f8c2e20d5f0868c Mon Sep 17 00:00:00 2001
From: Simon Wisselink <s.wisselink@iwink.nl>
Date: Tue, 23 Jan 2024 11:47:54 +0100
Subject: [PATCH 02/10] Update php version number in docs

---
 README.md               | 2 +-
 docs/getting-started.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 0ef3cfab..9b8706d4 100644
--- a/README.md
+++ b/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.2.
+Smarty can be run with PHP 7.1 to PHP 8.3.
 
 ## Installation
 Smarty versions 3.1.11 or later can be installed with [Composer](https://getcomposer.org/).
diff --git a/docs/getting-started.md b/docs/getting-started.md
index 2ffbbd11..f549e50e 100644
--- a/docs/getting-started.md
+++ b/docs/getting-started.md
@@ -1,7 +1,7 @@
 # Getting started
 
 ## Requirements
-Smarty can be run with PHP 7.1 to PHP 8.2.
+Smarty can be run with PHP 7.1 to PHP 8.3.
 
 ## Installation
 Smarty can be installed with [Composer](https://getcomposer.org/).

From 326b2da8da3cb843de1211d507ba4dea3aa49688 Mon Sep 17 00:00:00 2001
From: Simon Wisselink <wisskid@users.noreply.github.com>
Date: Mon, 5 Feb 2024 14:37:52 +0100
Subject: [PATCH 03/10] Fix incorrect compilation of expressions when
 escape_html=true (#932)

Fixes #930
---
 CHANGELOG.md                                                   | 3 +++
 .../smarty_internal_compile_private_print_expression.php       | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d08653d8..c54f7872 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - PHP8.3 support [#925](https://github.com/smarty-php/smarty/issues/925)
 
+### Fixed
+- Incorrect compilation of expressions when escape_html=true [#930](https://github.com/smarty-php/smarty/pull/930)
+
 ## [4.3.4] - 2023-09-14
 
 ## [4.3.3] - 2023-09-14
diff --git a/libs/sysplugins/smarty_internal_compile_private_print_expression.php b/libs/sysplugins/smarty_internal_compile_private_print_expression.php
index 96bd3724..78f1c076 100644
--- a/libs/sysplugins/smarty_internal_compile_private_print_expression.php
+++ b/libs/sysplugins/smarty_internal_compile_private_print_expression.php
@@ -93,7 +93,7 @@ class Smarty_Internal_Compile_Private_Print_Expression extends Smarty_Internal_C
                 }
                 // autoescape html
                 if ($compiler->template->smarty->escape_html) {
-                    $output = "htmlspecialchars((string) {$output}, ENT_QUOTES, '" . addslashes(Smarty::$_CHARSET) . "')";
+                    $output = "htmlspecialchars((string) ({$output}), ENT_QUOTES, '" . addslashes(Smarty::$_CHARSET) . "')";
                 }
                 // loop over registered filters
                 if (!empty($compiler->template->smarty->registered_filters[ Smarty::FILTER_VARIABLE ])) {

From de1bc77f7fad0500a8b654203c72bbb49554f55c Mon Sep 17 00:00:00 2001
From: Simon Wisselink <wisskid@users.noreply.github.com>
Date: Mon, 26 Feb 2024 14:33:47 +0100
Subject: [PATCH 04/10] Prevent deprecation notices for implode, json_encode
 and substr modifiers

* Prevent deprecation notices for implode, json_encode and substr modifiers.
* unit tests
---
 CHANGELOG.md                                  |  3 +
 libs/plugins/modifier.implode.php             | 15 ++++
 libs/plugins/modifiercompiler.json_encode.php | 11 +++
 libs/plugins/modifiercompiler.substr.php      | 12 +++
 .../PluginModifierImplodeTest.php             | 44 +++++++++++
 .../PluginModifierJsonEncodeTest.php          | 76 +++++++++++++++++++
 .../PluginModifierSubstrTest.php              | 48 ++++++++++++
 7 files changed, 209 insertions(+)
 create mode 100644 libs/plugins/modifier.implode.php
 create mode 100644 libs/plugins/modifiercompiler.json_encode.php
 create mode 100644 libs/plugins/modifiercompiler.substr.php
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierImplodeTest.php
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierJsonEncodeTest.php
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierSubstrTest.php

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c54f7872..acd4981b 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]
 
+### Changed
+- Using the `|implode`, `|json_encode` and `|substr` modifiers does not generate a deprecation warning anymore as they will continue to be supported in v5 [#939](https://github.com/smarty-php/smarty/issues/939) 
+
 ### Added
 - PHP8.3 support [#925](https://github.com/smarty-php/smarty/issues/925)
 
diff --git a/libs/plugins/modifier.implode.php b/libs/plugins/modifier.implode.php
new file mode 100644
index 00000000..679d71d7
--- /dev/null
+++ b/libs/plugins/modifier.implode.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsModifier
+ */
+
+function smarty_modifier_implode($values, $separator = '')
+{
+	if (is_array($separator)) {
+		return implode((string) ($values ?? ''), (array) $separator);
+	}
+	return implode((string) ($separator ?? ''), (array) $values);
+}
diff --git a/libs/plugins/modifiercompiler.json_encode.php b/libs/plugins/modifiercompiler.json_encode.php
new file mode 100644
index 00000000..629277f2
--- /dev/null
+++ b/libs/plugins/modifiercompiler.json_encode.php
@@ -0,0 +1,11 @@
+<?php
+
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsModifierCompiler
+ */
+function smarty_modifiercompiler_json_encode($params) {
+	return 'json_encode(' . $params[0] . (isset($params[1]) ? ', (int) ' . $params[1] : '') . ')';
+}
diff --git a/libs/plugins/modifiercompiler.substr.php b/libs/plugins/modifiercompiler.substr.php
new file mode 100644
index 00000000..17721f52
--- /dev/null
+++ b/libs/plugins/modifiercompiler.substr.php
@@ -0,0 +1,12 @@
+<?php
+
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsModifierCompiler
+ */
+function smarty_modifiercompiler_substr($params) {
+	return 'substr((string) ' . $params[0] . ', (int) ' . $params[1] .
+		(isset($params[2]) ? ', (int) ' . $params[2] : '') . ')';
+}
diff --git a/tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierImplodeTest.php b/tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierImplodeTest.php
new file mode 100644
index 00000000..5b816aaf
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierImplodeTest.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Smarty PHPunit tests of modifier
+ */
+
+/**
+ * class for modifier tests
+ *
+ * @runTestsInSeparateProcess
+ * @preserveGlobalState    disabled
+ * @backupStaticAttributes enabled
+ */
+class PluginModifierImplodeTest extends PHPUnit_Smarty
+{
+	public function setUp(): void
+	{
+		$this->setUpSmarty(__DIR__);
+	}
+
+	public function testDefault()
+	{
+		$tpl = $this->smarty->createTemplate('string:{""|implode:$v}');
+		$tpl->assign("v", ["1", "2"]);
+		$this->assertEquals("12", $this->smarty->fetch($tpl));
+	}
+	public function testWithSeparator()
+	{
+		$tpl = $this->smarty->createTemplate('string:{","|implode:$v}');
+		$tpl->assign("v", ["a", "b"]);
+		$this->assertEquals("a,b", $this->smarty->fetch($tpl));
+	}
+	public function testInConditional()
+	{
+		$tpl = $this->smarty->createTemplate('string:{if implode("", $v) == "abc"}good{else}bad{/if}');
+		$tpl->assign("v", ['a','b','c']);
+		$this->assertEquals("good", $this->smarty->fetch($tpl));
+	}
+	public function testInConditionalWithSeparator()
+	{
+		$tpl = $this->smarty->createTemplate('string:{if implode("-", $v) == "a-b-c"}good{else}bad{/if}');
+		$tpl->assign("v", ['a','b','c']);
+		$this->assertEquals("good", $this->smarty->fetch($tpl));
+	}
+}
diff --git a/tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierJsonEncodeTest.php b/tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierJsonEncodeTest.php
new file mode 100644
index 00000000..965c8a6d
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierJsonEncodeTest.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Smarty PHPunit tests of modifier
+ */
+
+/**
+ * class for modifier tests
+ *
+ * @runTestsInSeparateProcess
+ * @preserveGlobalState    disabled
+ * @backupStaticAttributes enabled
+ */
+class PluginModifierJsonEncodeTest extends PHPUnit_Smarty
+{
+	public function setUp(): void
+	{
+		$this->setUpSmarty(__DIR__);
+	}
+
+	/**
+	 * @dataProvider dataForDefault
+	 */
+	public function testDefault($value, $expected)
+	{
+		$tpl = $this->smarty->createTemplate('string:{$v|json_encode}');
+		$tpl->assign("v", $value);
+		$this->assertEquals($expected, $this->smarty->fetch($tpl));
+	}
+
+	/**
+	 * @dataProvider dataForDefault
+	 */
+	public function testDefaultAsFunction($value, $expected)
+	{
+		$tpl = $this->smarty->createTemplate('string:{json_encode($v)}');
+		$tpl->assign("v", $value);
+		$this->assertEquals($expected, $this->smarty->fetch($tpl));
+	}
+
+	public function dataForDefault() {
+		return [
+			["abc", '"abc"'],
+			[["abc"], '["abc"]'],
+			[["abc",["a"=>2]], '["abc",{"a":2}]'],
+		];
+	}
+
+	/**
+	 * @dataProvider dataForForceObject
+	 */
+	public function testForceObject($value, $expected)
+	{
+		$tpl = $this->smarty->createTemplate('string:{$v|json_encode:16}');
+		$tpl->assign("v", $value);
+		$this->assertEquals($expected, $this->smarty->fetch($tpl));
+	}
+
+	/**
+	 * @dataProvider dataForForceObject
+	 */
+	public function testForceObjectAsFunction($value, $expected)
+	{
+		$tpl = $this->smarty->createTemplate('string:{json_encode($v,16)}');
+		$tpl->assign("v", $value);
+		$this->assertEquals($expected, $this->smarty->fetch($tpl));
+	}
+
+	public function dataForForceObject() {
+		return [
+			["abc", '"abc"'],
+			[["abc"], '{"0":"abc"}'],
+			[["abc",["a"=>2]], '{"0":"abc","1":{"a":2}}'],
+		];
+	}
+
+}
diff --git a/tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierSubstrTest.php b/tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierSubstrTest.php
new file mode 100644
index 00000000..42abf869
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierSubstrTest.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Smarty PHPunit tests of modifier
+ */
+
+/**
+ * class for modifier tests
+ *
+ * @runTestsInSeparateProcess
+ * @preserveGlobalState    disabled
+ * @backupStaticAttributes enabled
+ */
+class PluginModifierSubstrTest extends PHPUnit_Smarty
+{
+	public function setUp(): void
+	{
+		$this->setUpSmarty(__DIR__);
+	}
+
+	public function testDefault()
+	{
+		$tpl = $this->smarty->createTemplate('string:{$v|substr:1}');
+		$tpl->assign("v", "abc");
+		$this->assertEquals("bc", $this->smarty->fetch($tpl));
+	}
+
+	public function testTwoArguments()
+	{
+		$tpl = $this->smarty->createTemplate('string:{$v|substr:1:1}');
+		$tpl->assign("v", "abc");
+		$this->assertEquals("b", $this->smarty->fetch($tpl));
+	}
+
+	public function testNegativeOffset()
+	{
+		$tpl = $this->smarty->createTemplate('string:{$v|substr:-1}');
+		$tpl->assign("v", "abc");
+		$this->assertEquals("c", $this->smarty->fetch($tpl));
+	}
+
+	public function testInConditional()
+	{
+		$tpl = $this->smarty->createTemplate('string:{if substr($v, -1) == "c"}good{else}bad{/if}');
+		$tpl->assign("v", "abc");
+		$this->assertEquals("good", $this->smarty->fetch($tpl));
+	}
+
+}

From 29dd621b536017b17588674e92ab7404cb644205 Mon Sep 17 00:00:00 2001
From: Simon Wisselink <s.wisselink@iwink.nl>
Date: Mon, 26 Feb 2024 14:45:43 +0100
Subject: [PATCH 05/10] Add some guidance on upgrading from v3 to v4

---
 docs/upgrading.md | 38 ++++++++++++++++++++++++++++++++++++++
 mkdocs.yml        |  4 +++-
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 docs/upgrading.md

diff --git a/docs/upgrading.md b/docs/upgrading.md
new file mode 100644
index 00000000..667a1422
--- /dev/null
+++ b/docs/upgrading.md
@@ -0,0 +1,38 @@
+# Upgrading from an older version
+
+## Upgrading from v3 to v4
+
+Smarty 4 is mostly identical to Smarty 3. Most notably, it adds support for PHP8 and drops support for PHP7.0 and below.
+Additionally, some deprecated features that have long been discouraged have been dropped from the language.
+
+### Muting PHP8 warnings
+If you simultaneously upgrade Smarty to v4 van PHP to v8, you may notice your error logs filling up with warnings about undefined or null template vars
+due to a change in how PHP handles these. This may be helpful to spot errors, but if you find this annoying, you can use
+`$smarty->muteUndefinedOrNullWarnings()` to make Smarty convert these warnings into notices.
+
+### ASP tags
+You can no longer user ASP-style tags like `<% %>` and `<%= %>` in your templates.
+Replace them with `{...}` tags.
+
+### SmartyBC
+Check your codebase for `SmartyBC`.
+We have dropped deprecated API calls that where only accessible through the SmartyBC class.
+
+### No more embedded PHP
+We have completely dropped support for `{php}` and `{include_php}` tags and embedded PHP in templates.
+Check your templates for this, and rewrite any embedded PHP blocks, by moving logic to your PHP files or by
+creating a [plugin function](./programmers/plugins/plugins-functions.md).
+
+### Other changes
+
+Search your code for the following changes:
+
+- `SMARTY_RESOURCE_CHAR_SET` and `SMARTY_RESOURCE_DATE_FORMAT` constants have been removed
+- `Smarty::muteExpectedErrors` and `Smarty::unmuteExpectedErrors` API methods have been removed
+- `Smarty::getVariable` method has been removed. Use [Smarty::getTemplateVars](programmers/api-functions/api-get-template-vars.md) instead.
+- [Smarty::registerResource](programmers/api-functions/api-register-resource.md) no longer accepts an array of callback functions
+
+
+
+
+
diff --git a/mkdocs.yml b/mkdocs.yml
index 7762cd75..66949b80 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -26,7 +26,9 @@ markdown_extensions:
 
 nav:
   - Home: 'index.md'
-  - 'Getting started': 'getting-started.md'
+  - 'Getting started':
+    - Introduction: 'getting-started.md'
+    - 'Upgrading from an older version': 'upgrading.md'
   - 'Designers':
     - 'Basic Syntax':
         - Introduction: 'designers/language-basic-syntax/index.md'

From ee58a2173b73baea22b430a66aa312678f6b4f1a Mon Sep 17 00:00:00 2001
From: Simon Wisselink <s.wisselink@iwink.nl>
Date: Mon, 26 Feb 2024 14:55:24 +0100
Subject: [PATCH 06/10] Updated release tooling

---
 changelog/.gitkeep                         |  0
 make-release.sh                            |  5 +--
 utilities/update-changelog.php             | 42 ++++++++++++++++++++++
 utilities/update-smarty-version-number.php | 11 ++++++
 4 files changed, 56 insertions(+), 2 deletions(-)
 create mode 100644 changelog/.gitkeep
 create mode 100644 utilities/update-changelog.php
 create mode 100644 utilities/update-smarty-version-number.php

diff --git a/changelog/.gitkeep b/changelog/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/make-release.sh b/make-release.sh
index e893deb3..9b9f05b4 100755
--- a/make-release.sh
+++ b/make-release.sh
@@ -8,8 +8,9 @@ else
 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
+
+php utilities/update-changelog.php $1
+php utilities/update-smarty-version-number.php $1
 
 git add CHANGELOG.md libs/Smarty.class.php
 git commit -m "version bump"
diff --git a/utilities/update-changelog.php b/utilities/update-changelog.php
new file mode 100644
index 00000000..f5b9534f
--- /dev/null
+++ b/utilities/update-changelog.php
@@ -0,0 +1,42 @@
+<?php
+
+// This takes the *.md files in changelog/ dir and inserts them
+// right below the '## [Unreleased]' marker in CHANGELOG.md
+
+$path_to_main_changelog = 'CHANGELOG.md';
+$marker = '## [Unreleased]';
+$changelog_files_pattern = 'changelog/*.md';
+$new_version = $argv[1];
+
+$file_contents = file_get_contents($path_to_main_changelog);
+
+foreach (glob($changelog_files_pattern) as $filename) {
+    $content_to_insert = file_get_contents($filename);
+
+    if (!endsWithNewline($content_to_insert)) {
+        $content_to_insert .= "\n";
+    }
+
+    $file_contents = str_replace(
+        $marker,
+        $marker . $content_to_insert,
+        $file_contents
+    );
+    unlink($filename);
+}
+
+
+// add the version number and date
+$file_contents = str_replace(
+    $marker,
+    $marker . sprintf("\n\n## [%s] - %s\n", $new_version, date('Y-m-d')),
+    $file_contents
+);
+
+file_put_contents($path_to_main_changelog, $file_contents);
+
+
+function endsWithNewline($str): bool
+{
+    return preg_match('/[\r\n]$/', $str) === 1;
+}
\ No newline at end of file
diff --git a/utilities/update-smarty-version-number.php b/utilities/update-smarty-version-number.php
new file mode 100644
index 00000000..c85e850f
--- /dev/null
+++ b/utilities/update-smarty-version-number.php
@@ -0,0 +1,11 @@
+<?php
+
+// This takes the Smarty class file and updates the SMARTY_VERSION constant
+
+$path_to_smarty_class = 'libs/Smarty.class.php';
+$pattern = "/const SMARTY_VERSION = '[^']+'/";
+$replacement = "const SMARTY_VERSION = '" . $argv[1] . "'";
+
+$file_contents = preg_replace($pattern, $replacement, file_get_contents($path_to_smarty_class));
+
+file_put_contents($path_to_smarty_class, $file_contents);

From 9614a591994ab2c2e51c0bdcc4fe8e632e9ee47a Mon Sep 17 00:00:00 2001
From: Simon Wisselink <s.wisselink@iwink.nl>
Date: Mon, 26 Feb 2024 14:56:15 +0100
Subject: [PATCH 07/10] changelog

---
 changelog/release-tooling.md | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog/release-tooling.md

diff --git a/changelog/release-tooling.md b/changelog/release-tooling.md
new file mode 100644
index 00000000..6d21343a
--- /dev/null
+++ b/changelog/release-tooling.md
@@ -0,0 +1 @@
+- Fixed internal release-tooling
\ No newline at end of file

From 5e2a9fbb26b7ee6b4b4f8fc852dca21c66cbcdfb Mon Sep 17 00:00:00 2001
From: Simon Wisselink <s.wisselink@iwink.nl>
Date: Mon, 26 Feb 2024 14:56:21 +0100
Subject: [PATCH 08/10] version bump

---
 CHANGELOG.md          | 4 ++++
 libs/Smarty.class.php | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index acd4981b..57128baf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [4.4.1] - 2024-02-26
+- Fixed internal release-tooling
+
+
 ### Changed
 - Using the `|implode`, `|json_encode` and `|substr` modifiers does not generate a deprecation warning anymore as they will continue to be supported in v5 [#939](https://github.com/smarty-php/smarty/issues/939) 
 
diff --git a/libs/Smarty.class.php b/libs/Smarty.class.php
index f102d889..0a47c835 100644
--- a/libs/Smarty.class.php
+++ b/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.4.1';
     /**
      * define variable scopes
      */

From 5d0dd09632d2421a380a9c1edde0b572b7a70b07 Mon Sep 17 00:00:00 2001
From: Simon Wisselink <s.wisselink@iwink.nl>
Date: Mon, 26 Feb 2024 14:58:17 +0100
Subject: [PATCH 09/10] changelog update

---
 CHANGELOG.md                 | 2 +-
 changelog/release-tooling.md | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)
 delete mode 100644 changelog/release-tooling.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 57128baf..69d41e7a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [4.4.1] - 2024-02-26
 - Fixed internal release-tooling
 
-
+## [4.4.0] - 2024-02-26
 ### Changed
 - Using the `|implode`, `|json_encode` and `|substr` modifiers does not generate a deprecation warning anymore as they will continue to be supported in v5 [#939](https://github.com/smarty-php/smarty/issues/939) 
 
diff --git a/changelog/release-tooling.md b/changelog/release-tooling.md
deleted file mode 100644
index 6d21343a..00000000
--- a/changelog/release-tooling.md
+++ /dev/null
@@ -1 +0,0 @@
-- Fixed internal release-tooling
\ No newline at end of file

From f4152e9b814ae2369b6e4935c05e1e0c3654318d Mon Sep 17 00:00:00 2001
From: Simon Wisselink <s.wisselink@iwink.nl>
Date: Mon, 26 Feb 2024 14:58:37 +0100
Subject: [PATCH 10/10] auto-delete changelog files

---
 make-release.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/make-release.sh b/make-release.sh
index 9b9f05b4..64268e83 100755
--- a/make-release.sh
+++ b/make-release.sh
@@ -12,7 +12,7 @@ git checkout -b "release/$1"
 php utilities/update-changelog.php $1
 php utilities/update-smarty-version-number.php $1
 
-git add CHANGELOG.md libs/Smarty.class.php
+git add changelog CHANGELOG.md libs/Smarty.class.php
 git commit -m "version bump"
 
 git checkout support/4.3