From 5a19b52306c804bb0758633963977129c11899df Mon Sep 17 00:00:00 2001
From: Michael Schiemer <kontakt@michaelschiemer.de>
Date: Fri, 31 Oct 2025 04:00:11 +0100
Subject: [PATCH] fix: actually change PHP version from 8.3 to 8.5 in workflows

- Fix security-scan.yml to use php8.5 packages
- Fix production-deploy.yml to use php8.5 packages
- Previous commit only removed --ignore-platform-reqs flag
- Now correctly uses PHP 8.5 to match composer.json and Dockerfiles
---
 .gitea/workflows/production-deploy.yml | 26 +++++++++----------
 .gitea/workflows/security-scan.yml     | 36 +++++++++++++-------------
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/.gitea/workflows/production-deploy.yml b/.gitea/workflows/production-deploy.yml
index 95872263..edfdd75e 100644
--- a/.gitea/workflows/production-deploy.yml
+++ b/.gitea/workflows/production-deploy.yml
@@ -63,20 +63,20 @@ jobs:
           echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" | tee /etc/apt/sources.list.d/php.list
           apt-get update
           
-          # Install PHP 8.3 (closest stable version available) and extensions
+          # Install PHP 8.5 (matches composer.json requirement ^8.5 and Dockerfiles)
           apt-get install -y \
-            php8.3 \
-            php8.3-cli \
-            php8.3-mbstring \
-            php8.3-xml \
-            php8.3-pdo \
-            php8.3-pdo-mysql \
-            php8.3-zip \
-            php8.3-gd \
-            php8.3-intl \
-            php8.3-sodium \
-            php8.3-bcmath \
-            php8.3-redis \
+            php8.5 \
+            php8.5-cli \
+            php8.5-mbstring \
+            php8.5-xml \
+            php8.5-pdo \
+            php8.5-pdo-mysql \
+            php8.5-zip \
+            php8.5-gd \
+            php8.5-intl \
+            php8.5-sodium \
+            php8.5-bcmath \
+            php8.5-redis \
             composer
 
       - name: Cache Composer dependencies (simple)
diff --git a/.gitea/workflows/security-scan.yml b/.gitea/workflows/security-scan.yml
index 268fb40d..4ecfc8ee 100644
--- a/.gitea/workflows/security-scan.yml
+++ b/.gitea/workflows/security-scan.yml
@@ -51,25 +51,25 @@ jobs:
           echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" | tee /etc/apt/sources.list.d/php.list
           apt-get update
           
-          # Install PHP 8.3 (closest stable version available) and extensions
+          # Install PHP 8.5 (matches composer.json requirement ^8.5 and Dockerfiles)
           apt-get install -y \
-            php8.3 \
-            php8.3-cli \
-            php8.3-dom \
-            php8.3-curl \
-            php8.3-xml \
-            php8.3-mbstring \
-            php8.3-zip \
-            php8.3-pcntl \
-            php8.3-pdo \
-            php8.3-pdo-sqlite \
-            php8.3-bcmath \
-            php8.3-soap \
-            php8.3-intl \
-            php8.3-gd \
-            php8.3-exif \
-            php8.3-iconv \
-            php8.3-sodium \
+            php8.5 \
+            php8.5-cli \
+            php8.5-dom \
+            php8.5-curl \
+            php8.5-xml \
+            php8.5-mbstring \
+            php8.5-zip \
+            php8.5-pcntl \
+            php8.5-pdo \
+            php8.5-pdo-sqlite \
+            php8.5-bcmath \
+            php8.5-soap \
+            php8.5-intl \
+            php8.5-gd \
+            php8.5-exif \
+            php8.5-iconv \
+            php8.5-sodium \
             composer
 
       - name: Validate composer.json and composer.lock