From f024fd414e38bec4fa404a641875bb866d0b9e26 Mon Sep 17 00:00:00 2001
From: Alejandro Celaya <alejandrocelaya@gmail.com>
Date: Sat, 1 Nov 2025 10:13:00 +0100
Subject: [PATCH] Add support for PHP 8.5

---
 .github/actions/ci-setup/action.yml   | 2 +-
 .github/workflows/ci-db-tests.yml     | 1 -
 .github/workflows/ci-tests.yml        | 1 -
 .github/workflows/publish-release.yml | 2 +-
 CHANGELOG.md                          | 2 ++
 5 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/actions/ci-setup/action.yml b/.github/actions/ci-setup/action.yml
index b45fa6c2..3a6a8642 100644
--- a/.github/actions/ci-setup/action.yml
+++ b/.github/actions/ci-setup/action.yml
@@ -43,5 +43,5 @@ runs:
         coverage: xdebug
     - name: Install dependencies
       if: ${{ inputs.install-deps == 'yes' }}
-      run: composer install --no-interaction --prefer-dist ${{ inputs.php-version == '8.5' && '--ignore-platform-req=php' || '' }}
+      run: composer install --no-interaction --prefer-dist
       shell: bash
diff --git a/.github/workflows/ci-db-tests.yml b/.github/workflows/ci-db-tests.yml
index 28ec4fd6..639481b8 100644
--- a/.github/workflows/ci-db-tests.yml
+++ b/.github/workflows/ci-db-tests.yml
@@ -14,7 +14,6 @@ jobs:
     strategy:
       matrix:
         php-version: ['8.3', '8.4', '8.5']
-    continue-on-error: ${{ matrix.php-version == '8.5' }}
     env:
       LC_ALL: C
     steps:
diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
index 1b196ac1..1ee23377 100644
--- a/.github/workflows/ci-tests.yml
+++ b/.github/workflows/ci-tests.yml
@@ -14,7 +14,6 @@ jobs:
     strategy:
       matrix:
         php-version: ['8.3', '8.4', '8.5']
-    continue-on-error: ${{ matrix.php-version == '8.5' }}
     env:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # rr get-binary picks this env automatically
     steps:
diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
index a6b923b4..61fc6940 100644
--- a/.github/workflows/publish-release.yml
+++ b/.github/workflows/publish-release.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-24.04
     strategy:
       matrix:
-        php-version: ['8.3', '8.4']
+        php-version: ['8.3', '8.4', '8.5']
     steps:
       - uses: actions/checkout@v4
       - uses: './.github/actions/ci-setup'
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 447d10a1..0402f290 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this
 
     This is done via the `domain` query parameter in API endpoints, and via the `--domain` option in console commands.
 
+* [#2472](https://github.com/shlinkio/shlink/issues/2472) Add support for PHP 8.5
+
 ### Changed
 * *Nothing*