From e0dedf43cbc253ecf94a91144857e6b86183c2c6 Mon Sep 17 00:00:00 2001
From: Simon Wisselink <s.wisselink@iwink.nl>
Date: Wed, 2 Jul 2025 10:01:28 +0200
Subject: [PATCH] PHP 8.5 support

---
 .github/workflows/ci.yml               |  1 +
 README.md                              |  2 +-
 changelog/1137.md                      |  1 +
 docs/getting-started.md                |  2 +-
 utilities/testrunners/php85/Dockerfile | 10 ++++++++++
 5 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 changelog/1137.md
 create mode 100644 utilities/testrunners/php85/Dockerfile

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0a6e63be..47c4aab4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -34,6 +34,7 @@ jobs:
           - "8.2"
           - "8.3"
           - "8.4"
+          - "8.5"
 
         compiler:
           - default
diff --git a/README.md b/README.md
index 1b44172d..3c6edc29 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 v5 can be run with PHP 7.2 to PHP 8.4.
+Smarty v5 can be run with PHP 7.2 to PHP 8.5.
 
 ## Installation
 Smarty versions 3.1.11 or later can be installed with [Composer](https://getcomposer.org/).
diff --git a/changelog/1137.md b/changelog/1137.md
new file mode 100644
index 00000000..0293b0f6
--- /dev/null
+++ b/changelog/1137.md
@@ -0,0 +1 @@
+- PHP 8.5 support
diff --git a/docs/getting-started.md b/docs/getting-started.md
index 1ea927e9..17a0042b 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.2 to PHP 8.4.
+Smarty can be run with PHP 7.2 to PHP 8.5.
 
 ## Installation
 Smarty can be installed with [Composer](https://getcomposer.org/).
diff --git a/utilities/testrunners/php85/Dockerfile b/utilities/testrunners/php85/Dockerfile
new file mode 100644
index 00000000..204c3038
--- /dev/null
+++ b/utilities/testrunners/php85/Dockerfile
@@ -0,0 +1,10 @@
+FROM php:8.5-cli-bullseye
+
+## 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