From 5966e5275594e142b3c6c210801965d99a61748b Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 11 Feb 2026 16:24:34 +0000
Subject: [PATCH 1/4] Initial plan


From d3c4de3901057ecec3b8b976c3a6524a54694099 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 11 Feb 2026 16:26:19 +0000
Subject: [PATCH 2/4] Update PHP version to 8.5 in all configuration files

Co-authored-by: samuelwei <4281791+samuelwei@users.noreply.github.com>
---
 .github/workflows/ci.yml             | 2 +-
 .github/workflows/pull-locales.yml   | 2 +-
 .github/workflows/upload-locales.yml | 2 +-
 composer.json                        | 2 +-
 docker/app/Dockerfile                | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a9601357a..e3edbc74c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,7 +8,7 @@ on:
   pull_request:
 
 env:
-  PHP_VERSION: 8.4
+  PHP_VERSION: 8.5
   CYPRESS_PROJECT_ID: w8t3fx
 
 jobs:
diff --git a/.github/workflows/pull-locales.yml b/.github/workflows/pull-locales.yml
index 4077a47ce..cacbf940d 100644
--- a/.github/workflows/pull-locales.yml
+++ b/.github/workflows/pull-locales.yml
@@ -11,7 +11,7 @@ on:
     - cron: "0 * * * *"
 
 env:
-  PHP_VERSION: 8.4
+  PHP_VERSION: 8.5
 
 jobs:
   pull-locales:
diff --git a/.github/workflows/upload-locales.yml b/.github/workflows/upload-locales.yml
index f93d39b66..674e4ec0b 100644
--- a/.github/workflows/upload-locales.yml
+++ b/.github/workflows/upload-locales.yml
@@ -12,7 +12,7 @@ on:
       - "develop"
 
 env:
-  PHP_VERSION: 8.4
+  PHP_VERSION: 8.5
 
 jobs:
   pull-locales:
diff --git a/composer.json b/composer.json
index 413779239..39fdcdb2d 100644
--- a/composer.json
+++ b/composer.json
@@ -8,7 +8,7 @@
   ],
   "license": "MIT",
   "require": {
-    "php": "^8.4",
+    "php": "^8.5",
     "ext-curl": "*",
     "ext-json": "*",
     "ext-redis": "*",
diff --git a/docker/app/Dockerfile b/docker/app/Dockerfile
index ae8d87534..a8118cefa 100644
--- a/docker/app/Dockerfile
+++ b/docker/app/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.4-fpm-alpine
+FROM php:8.5-fpm-alpine
 
 LABEL maintainer="Samuel Weirich"
 LABEL description="Development and production container for PILOS, compatible with laravel sail; heavily inspired by offical image"

From d6e3970439db11bb32a81cbc34c6b2ba4f21660a Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 11 Feb 2026 16:33:16 +0000
Subject: [PATCH 3/4] Update CHANGELOG.md for PHP 8.5 bump

Co-authored-by: samuelwei <4281791+samuelwei@users.noreply.github.com>
---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9a4b621f7..cf9475459 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- Bump base PHP image to 8.5
+
 ## [v4.12.0] - 2026-02-09
 
 ### Added

From 69b3ff682857b7a89bd649c75ddc50c4b9b34a47 Mon Sep 17 00:00:00 2001
From: Samuel Weirich <4281791+SamuelWei@users.noreply.github.com>
Date: Thu, 12 Feb 2026 14:53:24 +0100
Subject: [PATCH 4/4] Update changelog

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf9475459..61f31ac69 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
 
 ### Changed
 
-- Bump base PHP image to 8.5
+- Bump base PHP image to 8.5 ([#2814])
 
 ## [v4.12.0] - 2026-02-09
 
@@ -684,6 +684,7 @@ You can find the changelog for older versions there [here](https://github.com/TH
 [#2789]: https://github.com/THM-Health/PILOS/pull/2789
 [#2798]: https://github.com/THM-Health/PILOS/pull/2798
 [#2809]: https://github.com/THM-Health/PILOS/pull/2809
+[#2814]: https://github.com/THM-Health/PILOS/pull/2814
 [unreleased]: https://github.com/THM-Health/PILOS/compare/v4.12.0...develop
 [v3.0.0]: https://github.com/THM-Health/PILOS/releases/tag/v3.0.0
 [v3.0.1]: https://github.com/THM-Health/PILOS/releases/tag/v3.0.1