From 5ffbead176af41ca9f55f4d2edce5cb7f8c39803 Mon Sep 17 00:00:00 2001
From: provokateurin <kate@provokateurin.de>
Date: Wed, 10 Jun 2026 15:50:19 +0200
Subject: [PATCH 1/3] ci(PHP): Remove coverage collection and upload

Signed-off-by: provokateurin <kate@provokateurin.de>
---
 .github/workflows/files-external-ftp.yml     | 15 ++-------
 .github/workflows/files-external-s3.yml      | 34 ++++----------------
 .github/workflows/files-external-sftp.yml    | 15 ++-------
 .github/workflows/files-external-smb.yml     | 16 ++-------
 .github/workflows/files-external-webdav.yml  | 17 ++--------
 .github/workflows/files-external.yml         | 17 ++--------
 .github/workflows/integration-dav.yml        |  2 +-
 .github/workflows/integration-litmus.yml     |  2 +-
 .github/workflows/integration-s3-primary.yml |  2 +-
 .github/workflows/object-storage-azure.yml   | 16 ++-------
 .github/workflows/object-storage-s3.yml      | 16 ++-------
 .github/workflows/object-storage-swift.yml   | 16 ++-------
 .github/workflows/phpunit-mariadb.yml        | 12 ++-----
 .github/workflows/phpunit-memcached.yml      | 16 ++-------
 .github/workflows/phpunit-mysql-sharding.yml | 11 ++-----
 .github/workflows/phpunit-mysql.yml          | 12 ++-----
 .github/workflows/phpunit-nodb.yml           | 16 ++-------
 .github/workflows/phpunit-oci.yml            | 12 ++-----
 .github/workflows/phpunit-pgsql.yml          | 12 ++-----
 .github/workflows/phpunit-sqlite.yml         | 15 ++-------
 20 files changed, 50 insertions(+), 224 deletions(-)

diff --git a/.github/workflows/files-external-ftp.yml b/.github/workflows/files-external-ftp.yml
index 9b0e170ac28bd..9874a1e87e6e6 100644
--- a/.github/workflows/files-external-ftp.yml
+++ b/.github/workflows/files-external-ftp.yml
@@ -57,9 +57,6 @@ jobs:
       matrix:
         php-versions: ['8.2', '8.4']
         ftpd: ['proftpd', 'vsftpd', 'pure-ftpd']
-        include:
-          - php-versions: '8.2'
-            coverage: ${{ github.event_name != 'pull_request' }}
 
     name: php${{ matrix.php-versions }}-${{ matrix.ftpd }}
 
@@ -87,7 +84,7 @@ jobs:
           php-version: ${{ matrix.php-versions }}
           # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
           extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, redis, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite
-          coverage: ${{ matrix.coverage && 'xdebug' || 'none' }}
+          coverage: none
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -110,15 +107,7 @@ jobs:
       - name: PHPUnit
         run: composer run test:files_external -- \
           apps/files_external/tests/Storage/FtpTest.php \
-          --log-junit junit.xml \
-          ${{ matrix.coverage && '--coverage-clover ./clover.xml' || '' }}
-
-      - name: Upload code coverage
-        if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1
-        with:
-          files: ./clover.xml
-          flags: phpunit-files-external-ftp
+          --log-junit junit.xml
 
       - name: Upload test results
         if: ${{ !cancelled() }}
diff --git a/.github/workflows/files-external-s3.yml b/.github/workflows/files-external-s3.yml
index b516d74020659..ad21858682ef6 100644
--- a/.github/workflows/files-external-s3.yml
+++ b/.github/workflows/files-external-s3.yml
@@ -55,10 +55,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.2', '8.4']
-        include:
-          - php-versions: '8.3'
-            coverage: ${{ github.event_name != 'pull_request' }}
+        php-versions: ['8.2', '8.3', '8.4']
 
     name: php${{ matrix.php-versions }}-s3-minio
 
@@ -86,7 +83,7 @@ jobs:
           php-version: ${{ matrix.php-versions }}
           # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
           extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, redis, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite
-          coverage: ${{ matrix.coverage && 'xdebug' || 'none' }}
+          coverage: none
           ini-file: development
           ini-values: disable_functions=""
         env:
@@ -111,15 +108,7 @@ jobs:
           composer run test:files_external -- \
             --group S3 \
             --log-junit junit.xml \
-            apps/files_external/tests/Storage \
-            ${{ matrix.coverage && '--coverage-clover ./clover.xml' || '' }}
-
-      - name: Upload code coverage
-        if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1
-        with:
-          files: ./clover.xml
-          flags: phpunit-files-external-s3
+            apps/files_external/tests/Storage
 
       - name: Upload test results
         if: ${{ !cancelled() }}
@@ -146,10 +135,7 @@ jobs:
 
     strategy:
       matrix:
-        php-versions: ['8.2', '8.4']
-        include:
-          - php-versions: '8.3'
-            coverage: ${{ github.event_name != 'pull_request' }}
+        php-versions: ['8.2', '8.3', '8.4']
 
     name: php${{ matrix.php-versions }}-s3-localstack
 
@@ -176,7 +162,7 @@ jobs:
           php-version: ${{ matrix.php-versions }}
           # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
           extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, redis, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite
-          coverage: ${{ matrix.coverage && 'xdebug' || 'none' }}
+          coverage: none
           ini-file: development
           ini-values: disable_functions=""
         env:
@@ -194,15 +180,7 @@ jobs:
           composer run test:files_external -- \
             --group S3 \
             --log-junit junit.xml \
-            apps/files_external/tests/Storage \
-            ${{ matrix.coverage && '--coverage-clover ./clover.xml' || '' }}
-
-      - name: Upload code coverage
-        if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1
-        with:
-          files: ./clover.xml
-          flags: phpunit-files-external-s3
+            apps/files_external/tests/Storage
 
       - name: Upload test results
         if: ${{ !cancelled() }}
diff --git a/.github/workflows/files-external-sftp.yml b/.github/workflows/files-external-sftp.yml
index 553088d8eb6f4..dfe66155c38c3 100644
--- a/.github/workflows/files-external-sftp.yml
+++ b/.github/workflows/files-external-sftp.yml
@@ -57,9 +57,6 @@ jobs:
       matrix:
         php-versions: ['8.2', '8.4']
         sftpd: ['openssh']
-        include:
-          - php-versions: '8.2'
-            coverage: ${{ github.event_name != 'pull_request' }}
 
     name: php${{ matrix.php-versions }}-${{ matrix.sftpd }}
 
@@ -83,7 +80,7 @@ jobs:
           php-version: ${{ matrix.php-versions }}
           # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
           extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, redis, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite
-          coverage: ${{ matrix.coverage && 'xdebug' || 'none' }}
+          coverage: none
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -98,15 +95,7 @@ jobs:
       - name: PHPUnit
         run: composer run test:files_external -- \
           apps/files_external/tests/Storage/SftpTest.php \
-          --log-junit junit.xml \
-          ${{ matrix.coverage && '--coverage-clover ./clover.xml' || '' }}
-
-      - name: Upload code coverage
-        if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1
-        with:
-          files: ./clover.xml
-          flags: phpunit-files-external-sftp
+          --log-junit junit.xml
 
       - name: Upload test results
         if: ${{ !cancelled() }}
diff --git a/.github/workflows/files-external-smb.yml b/.github/workflows/files-external-smb.yml
index 5754a82c357f7..02e740d857f57 100644
--- a/.github/workflows/files-external-smb.yml
+++ b/.github/workflows/files-external-smb.yml
@@ -55,9 +55,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        include:
-          - php-versions: '8.2'
-            coverage: ${{ github.event_name != 'pull_request' }}
+        php-versions: ['8.2']
 
     name: php${{ matrix.php-versions }}-smb
 
@@ -87,7 +85,7 @@ jobs:
           php-version: ${{ matrix.php-versions }}
           # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
           extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, redis, session, simplexml, xmlreader, xmlwriter, zip, zlib, smbclient, sqlite, pdo_sqlite
-          coverage: ${{ matrix.coverage && 'xdebug' || 'none' }}
+          coverage: none
           ini-file: development
           ini-values: disable_functions=""
         env:
@@ -114,15 +112,7 @@ jobs:
       - name: PHPUnit
         run: composer run test:files_external -- \
           apps/files_external/tests/Storage/SmbTest.php \
-          --log-junit junit.xml \
-          ${{ matrix.coverage && '--coverage-clover ./clover.xml' || '' }}
-
-      - name: Upload code coverage
-        if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1
-        with:
-          files: ./clover.xml
-          flags: phpunit-files-external-smb
+          --log-junit junit.xml
 
       - name: Upload test results
         if: ${{ !cancelled() }}
diff --git a/.github/workflows/files-external-webdav.yml b/.github/workflows/files-external-webdav.yml
index 9066dd33d3156..e147c9e68500f 100644
--- a/.github/workflows/files-external-webdav.yml
+++ b/.github/workflows/files-external-webdav.yml
@@ -55,10 +55,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.3', '8.4']
-        include:
-          - php-versions: '8.2'
-            coverage: ${{ github.event_name != 'pull_request' }}
+        php-versions: ['8.2', '8.3', '8.4']
 
     name: php${{ matrix.php-versions }}-webdav
 
@@ -82,7 +79,7 @@ jobs:
           php-version: ${{ matrix.php-versions }}
           # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
           extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, redis, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite
-          coverage: ${{ matrix.coverage && 'xdebug' || 'none' }}
+          coverage: none
           ini-file: development
           ini-values: disable_functions=""
         env:
@@ -104,15 +101,7 @@ jobs:
       - name: PHPUnit
         run: composer run test:files_external -- \
           apps/files_external/tests/Storage/WebdavTest.php \
-          --log-junit junit.xml \
-          ${{ matrix.coverage && '--coverage-clover ./clover.xml' || '' }}
-
-      - name: Upload code coverage
-        if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1
-        with:
-          files: ./clover.xml
-          flags: phpunit-files-external-webdav
+          --log-junit junit.xml
 
       - name: Upload test results
         if: ${{ !cancelled() }}
diff --git a/.github/workflows/files-external.yml b/.github/workflows/files-external.yml
index ac33cdac83829..8c5c542c608bf 100644
--- a/.github/workflows/files-external.yml
+++ b/.github/workflows/files-external.yml
@@ -55,10 +55,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.3', '8.4']
-        include:
-          - php-versions: '8.2'
-            coverage: ${{ github.event_name != 'pull_request' }}
+        php-versions: ['8.2', '8.3', '8.4']
 
     name: php${{ matrix.php-versions }}-generic
 
@@ -76,7 +73,7 @@ jobs:
           php-version: ${{ matrix.php-versions }}
           # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
           extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, redis, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite
-          coverage: ${{ matrix.coverage && 'xdebug' || 'none' }}
+          coverage: none
           ini-file: development
           ini-values: disable_functions=""
         env:
@@ -93,15 +90,7 @@ jobs:
 
       - name: PHPUnit
         run: composer run test:files_external -- \
-          --log-junit junit.xml \
-          ${{ matrix.coverage && '--coverage-clover ./clover.xml' || '' }}
-
-      - name: Upload code coverage
-        if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1
-        with:
-          files: ./clover.xml
-          flags: phpunit-files-external-generic
+          --log-junit junit.xml
 
       - name: Upload test results
         if: ${{ !cancelled() }}
diff --git a/.github/workflows/integration-dav.yml b/.github/workflows/integration-dav.yml
index df62ac369f1d2..977cf263be9f6 100644
--- a/.github/workflows/integration-dav.yml
+++ b/.github/workflows/integration-dav.yml
@@ -65,7 +65,7 @@ jobs:
           php-version: ${{ matrix.php-versions }}
           # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
           extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, redis, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite
-          coverage: 'none'
+          coverage: none
           ini-file: development
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/integration-litmus.yml b/.github/workflows/integration-litmus.yml
index 632f0febc53f9..61f9db6c28e6b 100644
--- a/.github/workflows/integration-litmus.yml
+++ b/.github/workflows/integration-litmus.yml
@@ -64,7 +64,7 @@ jobs:
             php-version: ${{ matrix.php-versions }}
             # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
             extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, redis, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite
-            coverage: 'none'
+            coverage: none
             ini-file: development
           env:
             GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/integration-s3-primary.yml b/.github/workflows/integration-s3-primary.yml
index 42522d89f5d6f..2dfc3f5df3374 100644
--- a/.github/workflows/integration-s3-primary.yml
+++ b/.github/workflows/integration-s3-primary.yml
@@ -88,7 +88,7 @@ jobs:
           php-version: ${{ matrix.php-versions }}
           # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
           extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, redis, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite
-          coverage: 'none'
+          coverage: none
           ini-file: development
           ini-values: disable_functions=""
         env:
diff --git a/.github/workflows/object-storage-azure.yml b/.github/workflows/object-storage-azure.yml
index 82701d6be38b5..95d78ef0742b7 100644
--- a/.github/workflows/object-storage-azure.yml
+++ b/.github/workflows/object-storage-azure.yml
@@ -55,10 +55,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.2', '8.3']
-        include:
-          - php-versions: '8.4'
-            coverage: ${{ github.event_name != 'pull_request' }}
+        php-versions: ['8.2', '8.3', '8.4']
 
     name: php${{ matrix.php-versions }}-azure
 
@@ -91,7 +88,7 @@ jobs:
           php-version: ${{ matrix.php-versions }}
           # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
           extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, redis, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite
-          coverage: ${{ matrix.coverage && 'xdebug' || 'none' }}
+          coverage: none
           ini-file: development
           ini-values: disable_functions=""
         env:
@@ -114,14 +111,7 @@ jobs:
           OBJECT_STORE: azure
           OBJECT_STORE_KEY: nextcloud
           OBJECT_STORE_SECRET: bmV4dGNsb3Vk
-        run: composer run test -- --group PRIMARY-azure --log-junit junit.xml ${{ matrix.coverage && '--coverage-clover ./clover.xml' || '' }}
-
-      - name: Upload code coverage
-        if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1
-        with:
-          files: ./clover.xml
-          flags: phpunit-azure
+        run: composer run test -- --group PRIMARY-azure --log-junit junit.xml
 
       - name: Upload test results
         if: ${{ !cancelled() }}
diff --git a/.github/workflows/object-storage-s3.yml b/.github/workflows/object-storage-s3.yml
index f55dcf78e31c7..99fe868083756 100644
--- a/.github/workflows/object-storage-s3.yml
+++ b/.github/workflows/object-storage-s3.yml
@@ -55,10 +55,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.2']
-        include:
-          - php-versions: '8.3'
-            coverage: ${{ github.event_name != 'pull_request' }}
+        php-versions: ['8.2', '8.3']
 
     name: php${{ matrix.php-versions }}-s3
 
@@ -92,7 +89,7 @@ jobs:
           php-version: ${{ matrix.php-versions }}
           # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
           extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, redis, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite
-          coverage: ${{ matrix.coverage && 'xdebug' || 'none' }}
+          coverage: none
           ini-file: development
           ini-values: disable_functions=""
         env:
@@ -119,14 +116,7 @@ jobs:
           OBJECT_STORE: s3
           OBJECT_STORE_KEY: nextcloud
           OBJECT_STORE_SECRET: bWluaW8tc2VjcmV0LWtleS1uZXh0Y2xvdWQ=
-        run: composer run test -- --group PRIMARY-s3 --log-junit junit.xml ${{ matrix.coverage && '--coverage-clover ./clover.xml' || '' }}
-
-      - name: Upload code coverage
-        if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1
-        with:
-          files: ./clover.xml
-          flags: phpunit-s3
+        run: composer run test -- --group PRIMARY-s3 --log-junit junit.xml
 
       - name: Upload test results
         if: ${{ !cancelled() }}
diff --git a/.github/workflows/object-storage-swift.yml b/.github/workflows/object-storage-swift.yml
index f34f850cc14b9..5edad170264a9 100644
--- a/.github/workflows/object-storage-swift.yml
+++ b/.github/workflows/object-storage-swift.yml
@@ -55,10 +55,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.2']
-        include:
-          - php-versions: '8.3'
-            coverage: ${{ github.event_name != 'pull_request' }}
+        php-versions: ['8.2', '8.3']
 
     name: php${{ matrix.php-versions }}-swift
 
@@ -89,7 +86,7 @@ jobs:
           php-version: ${{ matrix.php-versions }}
           # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
           extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, redis, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite
-          coverage: ${{ matrix.coverage && 'xdebug' || 'none' }}
+          coverage: none
           ini-file: development
           ini-values: disable_functions=""
         env:
@@ -110,14 +107,7 @@ jobs:
         env:
           OBJECT_STORE: swift
           OBJECT_STORE_SECRET: veryfast
-        run: composer run test -- --group PRIMARY-swift --log-junit junit.xml ${{ matrix.coverage && '--coverage-clover ./clover.xml' || '' }}
-
-      - name: Upload code coverage
-        if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1
-        with:
-          files: ./clover.xml
-          flags: phpunit-swift
+        run: composer run test -- --group PRIMARY-swift --log-junit junit.xml
 
       - name: Upload test results
         if: ${{ !cancelled() }}
diff --git a/.github/workflows/phpunit-mariadb.yml b/.github/workflows/phpunit-mariadb.yml
index 9a9b646792fb5..1fa09760110af 100644
--- a/.github/workflows/phpunit-mariadb.yml
+++ b/.github/workflows/phpunit-mariadb.yml
@@ -64,7 +64,6 @@ jobs:
             mariadb-versions: '10.6'
           - php-versions: '8.5'
             mariadb-versions: '11.8'
-            coverage: ${{ github.event_name != 'pull_request' }}
 
     name: MariaDB ${{ matrix.mariadb-versions }} (PHP ${{ matrix.php-versions }}) - database tests
 
@@ -100,7 +99,7 @@ jobs:
           php-version: ${{ matrix.php-versions }}
           # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
           extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, redis, session, simplexml, xmlreader, xmlwriter, zip, zlib, mysql, pdo_mysql
-          coverage: ${{ matrix.coverage && 'xdebug' || 'none' }}
+          coverage: none
           ini-file: development
           ini-values: disable_functions=""
         env:
@@ -125,18 +124,11 @@ jobs:
           php -f tests/enable_all.php
 
       - name: PHPUnit
-        run: composer run test:db -- --log-junit junit.xml ${{ matrix.coverage && '--coverage-clover ./clover.db.xml' || '' }}
+        run: composer run test:db -- --log-junit junit.xml
         env:
           DB_ROOT_USER: root
           DB_ROOT_PASS: rootpassword
 
-      - name: Upload db code coverage
-        if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1
-        with:
-          files: ./clover.db.xml
-          flags: phpunit-mariadb
-
       - name: Upload test results
         if: ${{ !cancelled() }}
         uses: codecov/test-results-action@0fa95f0e1eeaafde2c782583b36b28ad0d8c77d3 # v1.2.1
diff --git a/.github/workflows/phpunit-memcached.yml b/.github/workflows/phpunit-memcached.yml
index 96729c1e8dd58..18f0b576398bd 100644
--- a/.github/workflows/phpunit-memcached.yml
+++ b/.github/workflows/phpunit-memcached.yml
@@ -56,10 +56,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.3', '8.4', '8.5']
-        include:
-          - php-versions: '8.2'
-            coverage: ${{ github.event_name != 'pull_request' }}
+        php-versions: ['8.2', '8.3', '8.4', '8.5']
 
     name: Memcached (PHP ${{ matrix.php-versions }})
 
@@ -84,7 +81,7 @@ jobs:
           php-version: ${{ matrix.php-versions }}
           # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
           extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, memcached, openssl, pcntl, posix, redis, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite
-          coverage: ${{ matrix.coverage && 'xdebug' || 'none' }}
+          coverage: none
           ini-file: development
           ini-values: disable_functions=""
         env:
@@ -101,14 +98,7 @@ jobs:
           php -f tests/enable_all.php
 
       - name: PHPUnit memcached tests
-        run: composer run test -- --group Memcache --group Memcached --log-junit junit.xml ${{ matrix.coverage && '--coverage-clover ./clover.xml' || '' }}
-
-      - name: Upload code coverage
-        if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1
-        with:
-          files: ./clover.xml
-          flags: phpunit-memcached
+        run: composer run test -- --group Memcache --group Memcached --log-junit junit.xml
 
       - name: Upload test results
         if: ${{ !cancelled() }}
diff --git a/.github/workflows/phpunit-mysql-sharding.yml b/.github/workflows/phpunit-mysql-sharding.yml
index f8c458b8e961a..3bf32bb431494 100644
--- a/.github/workflows/phpunit-mysql-sharding.yml
+++ b/.github/workflows/phpunit-mysql-sharding.yml
@@ -133,7 +133,7 @@ jobs:
           php-version: ${{ matrix.php-versions }}
           # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
           extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, redis, session, simplexml, xmlreader, xmlwriter, zip, zlib, mysql, pdo_mysql
-          coverage: ${{ matrix.coverage && 'xdebug' || 'none' }}
+          coverage: none
           ini-file: development
           ini-values: disable_functions=""
         env:
@@ -159,14 +159,7 @@ jobs:
           php -f tests/enable_all.php
 
       - name: PHPUnit
-        run: composer run test:db -- --log-junit junit.xml ${{ matrix.coverage && '--coverage-clover ./clover.db.xml' || '' }}
-
-      - name: Upload db code coverage
-        if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1
-        with:
-          files: ./clover.db.xml
-          flags: phpunit-mysql
+        run: composer run test:db -- --log-junit junit.xml
 
       - name: Upload test results
         if: ${{ !cancelled() }}
diff --git a/.github/workflows/phpunit-mysql.yml b/.github/workflows/phpunit-mysql.yml
index ffc1f9d90a3c0..efead4134212f 100644
--- a/.github/workflows/phpunit-mysql.yml
+++ b/.github/workflows/phpunit-mysql.yml
@@ -64,7 +64,6 @@ jobs:
             php-versions: '8.2'
           - mysql-versions: '8.4'
             php-versions: '8.5'
-            coverage: ${{ github.event_name != 'pull_request' }}
 
     name: MySQL ${{ matrix.mysql-versions }} (PHP ${{ matrix.php-versions }}) - database tests
 
@@ -100,7 +99,7 @@ jobs:
           php-version: ${{ matrix.php-versions }}
           # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
           extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, redis, session, simplexml, xmlreader, xmlwriter, zip, zlib, mysql, pdo_mysql
-          coverage: ${{ matrix.coverage && 'xdebug' || 'none' }}
+          coverage: none
           ini-file: development
           ini-values: disable_functions=""
         env:
@@ -125,18 +124,11 @@ jobs:
           php -f tests/enable_all.php
 
       - name: PHPUnit
-        run: composer run test:db -- --log-junit junit.xml ${{ matrix.coverage && '--coverage-clover ./clover.db.xml' || '' }}
+        run: composer run test:db -- --log-junit junit.xml
         env:
           DB_ROOT_USER: root
           DB_ROOT_PASS: rootpassword
 
-      - name: Upload db code coverage
-        if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1
-        with:
-          files: ./clover.db.xml
-          flags: phpunit-mysql
-
       - name: Upload test results
         if: ${{ !cancelled() }}
         uses: codecov/test-results-action@0fa95f0e1eeaafde2c782583b36b28ad0d8c77d3 # v1.2.1
diff --git a/.github/workflows/phpunit-nodb.yml b/.github/workflows/phpunit-nodb.yml
index 3c7af086a4bd1..2a472ea1dc3cc 100644
--- a/.github/workflows/phpunit-nodb.yml
+++ b/.github/workflows/phpunit-nodb.yml
@@ -59,10 +59,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.3', '8.4', '8.5']
-        include:
-          - php-versions: '8.2'
-            coverage: ${{ github.event_name != 'pull_request' }}
+        php-versions: ['8.2', '8.3', '8.4', '8.5']
 
     name: No DB unit tests (PHP ${{ matrix.php-versions }})
 
@@ -87,7 +84,7 @@ jobs:
           php-version: ${{ matrix.php-versions }}
           # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
           extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, imagick, intl, json, libxml, mbstring, openssl, pcntl, posix, redis, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite
-          coverage: ${{ matrix.coverage && 'xdebug' || 'none' }}
+          coverage: none
           ini-file: development
           # Required for tests that use pcntl
           ini-values: disable_functions=""
@@ -106,14 +103,7 @@ jobs:
           php -f tests/enable_all.php
 
       - name: PHPUnit nodb testsuite
-        run: composer run test -- --exclude-group DB --exclude-group SLOWDB --log-junit junit.xml ${{ matrix.coverage && '--coverage-clover ./clover.nodb.xml' || '' }}
-
-      - name: Upload nodb code coverage
-        if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1
-        with:
-          files: ./clover.nodb.xml
-          flags: phpunit-nodb
+        run: composer run test -- --exclude-group DB --exclude-group SLOWDB --log-junit junit.xml
 
       - name: Upload test results
         if: ${{ !cancelled() }}
diff --git a/.github/workflows/phpunit-oci.yml b/.github/workflows/phpunit-oci.yml
index c53687707d943..c49a98bcc899f 100644
--- a/.github/workflows/phpunit-oci.yml
+++ b/.github/workflows/phpunit-oci.yml
@@ -64,7 +64,6 @@ jobs:
             php-versions: '8.2'
           - oracle-versions: '23'
             php-versions: '8.5'
-            coverage: ${{ github.event_name != 'pull_request' }}
 
     name: Oracle ${{ matrix.oracle-versions }} (PHP ${{ matrix.php-versions }}) - database tests
 
@@ -107,7 +106,7 @@ jobs:
           php-version: ${{ matrix.php-versions }}
           # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
           extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, redis, session, simplexml, xmlreader, xmlwriter, zip, zlib, oci8
-          coverage: ${{ matrix.coverage && 'xdebug' || 'none' }}
+          coverage: none
           ini-file: development
           ini-values: disable_functions=""
         env:
@@ -125,14 +124,7 @@ jobs:
           php -f tests/enable_all.php
 
       - name: PHPUnit
-        run: composer run test:db -- --log-junit junit.xml ${{ matrix.coverage && '--coverage-clover ./clover.db.xml' || '' }}
-
-      - name: Upload db code coverage
-        if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1
-        with:
-          files: ./clover.db.xml
-          flags: phpunit-oci
+        run: composer run test:db -- --log-junit junit.xml
 
       - name: Upload test results
         if: ${{ !cancelled() }}
diff --git a/.github/workflows/phpunit-pgsql.yml b/.github/workflows/phpunit-pgsql.yml
index a7c3814315604..8f82b5bd74599 100644
--- a/.github/workflows/phpunit-pgsql.yml
+++ b/.github/workflows/phpunit-pgsql.yml
@@ -68,7 +68,6 @@ jobs:
             postgres-versions: '18'
           - php-versions: '8.5'
             postgres-versions: '18'
-            coverage: ${{ github.event_name != 'pull_request' }}
 
     name: PostgreSQL ${{ matrix.postgres-versions }} (PHP ${{ matrix.php-versions }}) - database tests
 
@@ -103,7 +102,7 @@ jobs:
           php-version: ${{ matrix.php-versions }}
           # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
           extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, redis, session, simplexml, xmlreader, xmlwriter, zip, zlib, pgsql, pdo_pgsql
-          coverage: ${{ matrix.coverage && 'xdebug' || 'none' }}
+          coverage: none
           ini-file: development
           ini-values: disable_functions=""
         env:
@@ -123,14 +122,7 @@ jobs:
           php -f tests/enable_all.php
 
       - name: PHPUnit database tests
-        run: composer run test:db -- --log-junit junit.xml ${{ matrix.coverage && '--coverage-clover ./clover.db.xml' || '' }}
-
-      - name: Upload db code coverage
-        if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1
-        with:
-          files: ./clover.db.xml
-          flags: phpunit-postgres
+        run: composer run test:db -- --log-junit junit.xml
 
       - name: Upload test results
         if: ${{ !cancelled() }}
diff --git a/.github/workflows/phpunit-sqlite.yml b/.github/workflows/phpunit-sqlite.yml
index 22236155fec3d..8df4a93ee4fc4 100644
--- a/.github/workflows/phpunit-sqlite.yml
+++ b/.github/workflows/phpunit-sqlite.yml
@@ -59,9 +59,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        include:
-          - php-versions: '8.5'
-            coverage: ${{ github.event_name != 'pull_request' }}
+        php-versions: ['8.5']
 
     name: SQLite (PHP ${{ matrix.php-versions }})
 
@@ -86,7 +84,7 @@ jobs:
           php-version: ${{ matrix.php-versions }}
           # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
           extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, imagick, intl, json, libxml, mbstring, openssl, pcntl, posix, redis, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite
-          coverage: ${{ matrix.coverage && 'xdebug' || 'none' }}
+          coverage: none
           ini-file: development
           ini-values: disable_functions=""
         env:
@@ -110,14 +108,7 @@ jobs:
         run: ./occ app:list && echo "======= System config =======" && ./occ config:list system
 
       - name: PHPUnit database tests
-        run: composer run test:db -- --log-junit junit.xml ${{ matrix.coverage && '--coverage-clover ./clover.db.xml' || '' }} tests/lib/Preview/PostscriptTest.php
-
-      - name: Upload db code coverage
-        if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1
-        with:
-          files: ./clover.db.xml
-          flags: phpunit-sqlite
+        run: composer run test:db -- --log-junit junit.xml tests/lib/Preview/PostscriptTest.php
 
       - name: Upload test results
         if: ${{ !cancelled() }}

From 77aba0704880cedf9d411b05804ada1398f95419 Mon Sep 17 00:00:00 2001
From: provokateurin <kate@provokateurin.de>
Date: Wed, 10 Jun 2026 16:38:49 +0200
Subject: [PATCH 2/3] ci(PHP): Only test against highest and lowest supported
 PHP versions

Signed-off-by: provokateurin <kate@provokateurin.de>
---
 .github/workflows/autocheckers.yml               | 16 ++++------------
 .github/workflows/files-external-ftp.yml         |  2 +-
 .github/workflows/files-external-s3.yml          |  4 ++--
 .github/workflows/files-external-sftp.yml        |  2 +-
 .github/workflows/files-external-smb.yml         |  2 +-
 .github/workflows/files-external-webdav.yml      |  2 +-
 .github/workflows/files-external.yml             |  2 +-
 .github/workflows/integration-dav.yml            |  2 +-
 .github/workflows/integration-litmus.yml         |  2 +-
 .github/workflows/integration-s3-primary.yml     |  2 +-
 .github/workflows/integration-sqlite.yml         |  2 +-
 .github/workflows/lint-php.yml                   |  2 +-
 .github/workflows/object-storage-azure.yml       |  2 +-
 .github/workflows/object-storage-s3.yml          |  2 +-
 .github/workflows/object-storage-swift.yml       |  2 +-
 .github/workflows/performance.yml                | 11 +++--------
 .github/workflows/phpunit-32bits.yml             |  2 +-
 .github/workflows/phpunit-mariadb.yml            |  8 ++++----
 .github/workflows/phpunit-memcached.yml          |  2 +-
 .github/workflows/phpunit-mysql-sharding.yml     |  7 +++++--
 .github/workflows/phpunit-nodb.yml               |  2 +-
 .../workflows/phpunit-object-store-primary.yml   |  2 +-
 .github/workflows/phpunit-pgsql.yml              | 12 ++++--------
 .github/workflows/phpunit-sqlite.yml             |  2 +-
 .github/workflows/rector-apply.yml               |  9 ++-------
 25 files changed, 42 insertions(+), 61 deletions(-)

diff --git a/.github/workflows/autocheckers.yml b/.github/workflows/autocheckers.yml
index c689bb7cccc03..b213d2b3d7846 100644
--- a/.github/workflows/autocheckers.yml
+++ b/.github/workflows/autocheckers.yml
@@ -44,10 +44,6 @@ jobs:
     needs: changes
     if: needs.changes.outputs.src != 'false'
 
-    strategy:
-      matrix:
-        php-versions: ['8.2']
-
     name: PHP checkers
 
     steps:
@@ -57,11 +53,11 @@ jobs:
           persist-credentials: false
           submodules: true
 
-      - name: Set up php ${{ matrix.php-versions }}
+      - name: Set up php
         uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc #v2.37.1
         timeout-minutes: 5
         with:
-          php-version: ${{ matrix.php-versions }}
+          php-version: '8.2'
           extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite
           coverage: none
           ini-file: development
@@ -77,10 +73,6 @@ jobs:
     needs: changes
     if: needs.changes.outputs.src != 'false'
 
-    strategy:
-      matrix:
-        php-versions: ['8.2']
-
     name: Translation and Files checkers
 
     steps:
@@ -90,11 +82,11 @@ jobs:
           persist-credentials: false
           submodules: true
 
-      - name: Set up php ${{ matrix.php-versions }}
+      - name: Set up php
         uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc #v2.37.1
         timeout-minutes: 5
         with:
-          php-version: ${{ matrix.php-versions }}
+          php-version: '8.2'
           extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite
           coverage: none
           ini-file: development
diff --git a/.github/workflows/files-external-ftp.yml b/.github/workflows/files-external-ftp.yml
index 9874a1e87e6e6..78693968e8392 100644
--- a/.github/workflows/files-external-ftp.yml
+++ b/.github/workflows/files-external-ftp.yml
@@ -55,7 +55,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.2', '8.4']
+        php-versions: ['8.2', '8.5']
         ftpd: ['proftpd', 'vsftpd', 'pure-ftpd']
 
     name: php${{ matrix.php-versions }}-${{ matrix.ftpd }}
diff --git a/.github/workflows/files-external-s3.yml b/.github/workflows/files-external-s3.yml
index ad21858682ef6..76c90dd3e1976 100644
--- a/.github/workflows/files-external-s3.yml
+++ b/.github/workflows/files-external-s3.yml
@@ -55,7 +55,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.2', '8.3', '8.4']
+        php-versions: ['8.2', '8.5']
 
     name: php${{ matrix.php-versions }}-s3-minio
 
@@ -135,7 +135,7 @@ jobs:
 
     strategy:
       matrix:
-        php-versions: ['8.2', '8.3', '8.4']
+        php-versions: ['8.2', '8.5']
 
     name: php${{ matrix.php-versions }}-s3-localstack
 
diff --git a/.github/workflows/files-external-sftp.yml b/.github/workflows/files-external-sftp.yml
index dfe66155c38c3..99f0bc687a2a9 100644
--- a/.github/workflows/files-external-sftp.yml
+++ b/.github/workflows/files-external-sftp.yml
@@ -55,7 +55,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.2', '8.4']
+        php-versions: ['8.2', '8.5']
         sftpd: ['openssh']
 
     name: php${{ matrix.php-versions }}-${{ matrix.sftpd }}
diff --git a/.github/workflows/files-external-smb.yml b/.github/workflows/files-external-smb.yml
index 02e740d857f57..8959b3230712d 100644
--- a/.github/workflows/files-external-smb.yml
+++ b/.github/workflows/files-external-smb.yml
@@ -55,7 +55,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.2']
+        php-versions: ['8.2', '8.5']
 
     name: php${{ matrix.php-versions }}-smb
 
diff --git a/.github/workflows/files-external-webdav.yml b/.github/workflows/files-external-webdav.yml
index e147c9e68500f..1fe24ef23d7ed 100644
--- a/.github/workflows/files-external-webdav.yml
+++ b/.github/workflows/files-external-webdav.yml
@@ -55,7 +55,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.2', '8.3', '8.4']
+        php-versions: ['8.2', '8.5']
 
     name: php${{ matrix.php-versions }}-webdav
 
diff --git a/.github/workflows/files-external.yml b/.github/workflows/files-external.yml
index 8c5c542c608bf..f4f8a3bc44d69 100644
--- a/.github/workflows/files-external.yml
+++ b/.github/workflows/files-external.yml
@@ -55,7 +55,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.2', '8.3', '8.4']
+        php-versions: ['8.2', '8.5']
 
     name: php${{ matrix.php-versions }}-generic
 
diff --git a/.github/workflows/integration-dav.yml b/.github/workflows/integration-dav.yml
index 977cf263be9f6..8d7f047409774 100644
--- a/.github/workflows/integration-dav.yml
+++ b/.github/workflows/integration-dav.yml
@@ -45,7 +45,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.2']
+        php-versions: ['8.2', '8.5']
         endpoint: ['old', 'new']
         service: ['CalDAV', 'CardDAV']
 
diff --git a/.github/workflows/integration-litmus.yml b/.github/workflows/integration-litmus.yml
index 61f9db6c28e6b..870694cad34ab 100644
--- a/.github/workflows/integration-litmus.yml
+++ b/.github/workflows/integration-litmus.yml
@@ -45,7 +45,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.2']
+        php-versions: ['8.2', '8.5']
         endpoint: ['webdav', 'dav']
 
     name: Litmus WebDAV ${{ matrix.endpoint }}
diff --git a/.github/workflows/integration-s3-primary.yml b/.github/workflows/integration-s3-primary.yml
index 2dfc3f5df3374..9ffe860523fbc 100644
--- a/.github/workflows/integration-s3-primary.yml
+++ b/.github/workflows/integration-s3-primary.yml
@@ -54,7 +54,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.2']
+        php-versions: ['8.2', '8.5']
         key: ['objectstore', 'objectstore_multibucket']
 
     name: php${{ matrix.php-versions }}-${{ matrix.key }}-minio
diff --git a/.github/workflows/integration-sqlite.yml b/.github/workflows/integration-sqlite.yml
index d60faba595a9b..a8d183d850faa 100644
--- a/.github/workflows/integration-sqlite.yml
+++ b/.github/workflows/integration-sqlite.yml
@@ -74,7 +74,7 @@ jobs:
           - 'videoverification_features'
           - 'guests_features'
 
-        php-versions: ['8.4']
+        php-versions: ['8.2', '8.5']
         guests-versions: ['main']
         spreed-versions: ['main']
         activity-versions: ['master']
diff --git a/.github/workflows/lint-php.yml b/.github/workflows/lint-php.yml
index 690be87da90dd..a0f2e79d8754f 100644
--- a/.github/workflows/lint-php.yml
+++ b/.github/workflows/lint-php.yml
@@ -47,7 +47,7 @@ jobs:
 
     strategy:
       matrix:
-        php-versions: [ '8.2', '8.3', '8.4', '8.5' ]
+        php-versions: ['8.2', '8.5']
 
     name: php-lint
 
diff --git a/.github/workflows/object-storage-azure.yml b/.github/workflows/object-storage-azure.yml
index 95d78ef0742b7..feb1fefbdd49e 100644
--- a/.github/workflows/object-storage-azure.yml
+++ b/.github/workflows/object-storage-azure.yml
@@ -55,7 +55,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.2', '8.3', '8.4']
+        php-versions: ['8.2', '8.5']
 
     name: php${{ matrix.php-versions }}-azure
 
diff --git a/.github/workflows/object-storage-s3.yml b/.github/workflows/object-storage-s3.yml
index 99fe868083756..c006016320cd5 100644
--- a/.github/workflows/object-storage-s3.yml
+++ b/.github/workflows/object-storage-s3.yml
@@ -55,7 +55,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.2', '8.3']
+        php-versions: ['8.2', '8.5']
 
     name: php${{ matrix.php-versions }}-s3
 
diff --git a/.github/workflows/object-storage-swift.yml b/.github/workflows/object-storage-swift.yml
index 5edad170264a9..248d7a030bd49 100644
--- a/.github/workflows/object-storage-swift.yml
+++ b/.github/workflows/object-storage-swift.yml
@@ -55,7 +55,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.2', '8.3']
+        php-versions: ['8.2', '8.5']
 
     name: php${{ matrix.php-versions }}-swift
 
diff --git a/.github/workflows/performance.yml b/.github/workflows/performance.yml
index 6aec70583b646..b366f42b9033d 100644
--- a/.github/workflows/performance.yml
+++ b/.github/workflows/performance.yml
@@ -26,12 +26,7 @@ jobs:
     permissions:
       pull-requests: write
 
-    strategy:
-      fail-fast: false
-      matrix:
-        php-versions: ['8.2']
-
-    name: performance-${{ matrix.php-versions }}
+    name: performance
 
     steps:
 
@@ -42,11 +37,11 @@ jobs:
           submodules: true
           ref: ${{ github.event.pull_request.base.ref }}
 
-      - name: Set up php ${{ matrix.php-versions }}
+      - name: Set up php
         uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc # v2.37.1
         timeout-minutes: 5
         with:
-          php-version: ${{ matrix.php-versions }}
+          php-version: '8.2'
           extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, redis, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/phpunit-32bits.yml b/.github/workflows/phpunit-32bits.yml
index fb6aa7bd4b474..6a6b79cfab40d 100644
--- a/.github/workflows/phpunit-32bits.yml
+++ b/.github/workflows/phpunit-32bits.yml
@@ -30,7 +30,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ["8.4"]
+        php-versions: ['8.2', '8,5']
 
     steps:
       - name: Checkout server
diff --git a/.github/workflows/phpunit-mariadb.yml b/.github/workflows/phpunit-mariadb.yml
index 1fa09760110af..5da9d8c1cb87a 100644
--- a/.github/workflows/phpunit-mariadb.yml
+++ b/.github/workflows/phpunit-mariadb.yml
@@ -60,10 +60,10 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - php-versions: '8.2'
-            mariadb-versions: '10.6'
-          - php-versions: '8.5'
-            mariadb-versions: '11.8'
+          - mariadb-versions: '10.6'
+            php-versions: '8.2'
+          - mariadb-versions: '11.8'
+            php-versions: '8.5'
 
     name: MariaDB ${{ matrix.mariadb-versions }} (PHP ${{ matrix.php-versions }}) - database tests
 
diff --git a/.github/workflows/phpunit-memcached.yml b/.github/workflows/phpunit-memcached.yml
index 18f0b576398bd..d54cb2333992a 100644
--- a/.github/workflows/phpunit-memcached.yml
+++ b/.github/workflows/phpunit-memcached.yml
@@ -56,7 +56,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.2', '8.3', '8.4', '8.5']
+        php-versions: ['8.2', '8.5']
 
     name: Memcached (PHP ${{ matrix.php-versions }})
 
diff --git a/.github/workflows/phpunit-mysql-sharding.yml b/.github/workflows/phpunit-mysql-sharding.yml
index 3bf32bb431494..2879c4668a6be 100644
--- a/.github/workflows/phpunit-mysql-sharding.yml
+++ b/.github/workflows/phpunit-mysql-sharding.yml
@@ -56,8 +56,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.2']
-        mysql-versions: ['8.4']
+        include:
+          - mysql-versions: '8.0'
+            php-versions: '8.2'
+          - mysql-versions: '8.4'
+            php-versions: '8.5'
 
     name: Sharding - MySQL ${{ matrix.mysql-versions }} (PHP ${{ matrix.php-versions }}) - database tests
 
diff --git a/.github/workflows/phpunit-nodb.yml b/.github/workflows/phpunit-nodb.yml
index 2a472ea1dc3cc..d29a503fc3a3c 100644
--- a/.github/workflows/phpunit-nodb.yml
+++ b/.github/workflows/phpunit-nodb.yml
@@ -59,7 +59,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.2', '8.3', '8.4', '8.5']
+        php-versions: ['8.2', '8.5']
 
     name: No DB unit tests (PHP ${{ matrix.php-versions }})
 
diff --git a/.github/workflows/phpunit-object-store-primary.yml b/.github/workflows/phpunit-object-store-primary.yml
index b7187d349a0a0..7a8f82853213f 100644
--- a/.github/workflows/phpunit-object-store-primary.yml
+++ b/.github/workflows/phpunit-object-store-primary.yml
@@ -49,7 +49,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.2']
+        php-versions: ['8.2', '8.5']
         key: ['s3', 's3-multibucket']
 
     name: php${{ matrix.php-versions }}-${{ matrix.key }}-minio
diff --git a/.github/workflows/phpunit-pgsql.yml b/.github/workflows/phpunit-pgsql.yml
index 8f82b5bd74599..23df450755bb6 100644
--- a/.github/workflows/phpunit-pgsql.yml
+++ b/.github/workflows/phpunit-pgsql.yml
@@ -60,14 +60,10 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - php-versions: '8.2'
-            postgres-versions: '14'
-          - php-versions: '8.3'
-            postgres-versions: '18'
-          - php-versions: '8.4'
-            postgres-versions: '18'
-          - php-versions: '8.5'
-            postgres-versions: '18'
+          - postgres-versions: '14'
+            php-versions: '8.2'
+          - postgres-versions: '18'
+            php-versions: '8.5'
 
     name: PostgreSQL ${{ matrix.postgres-versions }} (PHP ${{ matrix.php-versions }}) - database tests
 
diff --git a/.github/workflows/phpunit-sqlite.yml b/.github/workflows/phpunit-sqlite.yml
index 8df4a93ee4fc4..acd821d1c1e42 100644
--- a/.github/workflows/phpunit-sqlite.yml
+++ b/.github/workflows/phpunit-sqlite.yml
@@ -59,7 +59,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.5']
+        php-versions: ['8.2', '8.5']
 
     name: SQLite (PHP ${{ matrix.php-versions }})
 
diff --git a/.github/workflows/rector-apply.yml b/.github/workflows/rector-apply.yml
index d6f72e31d5808..48a7a1faad82c 100644
--- a/.github/workflows/rector-apply.yml
+++ b/.github/workflows/rector-apply.yml
@@ -21,11 +21,6 @@ jobs:
   build:
     runs-on: ubuntu-latest
 
-    strategy:
-      fail-fast: false
-      matrix:
-        php-versions: [ '8.2' ]
-
     name: rector-apply
 
     steps:
@@ -36,10 +31,10 @@ jobs:
           persist-credentials: false
           ref: ${{ github.event.repository.default_branch }}
 
-      - name: Set up php${{ matrix.php-versions }}
+      - name: Set up php
         uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc # v2.37.1
         with:
-          php-version: ${{ matrix.php-versions }}
+          php-version: '8.2'
           extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite
           coverage: none
           ini-file: development

From c86da9f793b0a72a7049dfab27b5892e590c2821 Mon Sep 17 00:00:00 2001
From: provokateurin <kate@provokateurin.de>
Date: Wed, 10 Jun 2026 11:15:15 +0200
Subject: [PATCH 3/3] chore(PHP): Drop 8.2 for Nextcloud 35

Signed-off-by: provokateurin <kate@provokateurin.de>
---
 .github/workflows/autocheckers.yml                 |  4 ++--
 .github/workflows/files-external-ftp.yml           |  2 +-
 .github/workflows/files-external-s3.yml            |  4 ++--
 .github/workflows/files-external-sftp.yml          |  2 +-
 .github/workflows/files-external-smb.yml           |  2 +-
 .github/workflows/files-external-webdav.yml        |  2 +-
 .github/workflows/files-external.yml               |  2 +-
 .github/workflows/integration-dav.yml              |  2 +-
 .github/workflows/integration-litmus.yml           |  2 +-
 .github/workflows/integration-s3-primary.yml       |  2 +-
 .github/workflows/integration-sqlite.yml           |  2 +-
 .github/workflows/lint-php-cs.yml                  |  2 +-
 .github/workflows/lint-php.yml                     |  2 +-
 .github/workflows/object-storage-azure.yml         |  2 +-
 .github/workflows/object-storage-s3.yml            |  2 +-
 .github/workflows/object-storage-swift.yml         |  2 +-
 .github/workflows/openapi.yml                      |  2 +-
 .github/workflows/performance.yml                  |  2 +-
 .github/workflows/phpunit-32bits.yml               |  2 +-
 .github/workflows/phpunit-mariadb.yml              |  2 +-
 .github/workflows/phpunit-memcached.yml            |  2 +-
 .github/workflows/phpunit-mysql-sharding.yml       |  2 +-
 .github/workflows/phpunit-mysql.yml                |  2 +-
 .github/workflows/phpunit-nodb.yml                 |  2 +-
 .github/workflows/phpunit-object-store-primary.yml |  2 +-
 .github/workflows/phpunit-oci.yml                  |  2 +-
 .github/workflows/phpunit-pgsql.yml                |  2 +-
 .github/workflows/phpunit-sqlite.yml               |  2 +-
 .github/workflows/rector-apply.yml                 |  2 +-
 .github/workflows/rector.yml                       |  2 +-
 .github/workflows/static-code-analysis.yml         | 10 +++++-----
 apps/settings/lib/SetupChecks/PhpOutdated.php      | 10 +++++-----
 composer.json                                      | 12 ++++++------
 composer.lock                                      |  6 +++---
 lib/composer/composer/platform_check.php           |  4 ++--
 lib/versioncheck.php                               |  6 +++---
 36 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/.github/workflows/autocheckers.yml b/.github/workflows/autocheckers.yml
index b213d2b3d7846..ca4a5cc1371bc 100644
--- a/.github/workflows/autocheckers.yml
+++ b/.github/workflows/autocheckers.yml
@@ -57,7 +57,7 @@ jobs:
         uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc #v2.37.1
         timeout-minutes: 5
         with:
-          php-version: '8.2'
+          php-version: '8.3'
           extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite
           coverage: none
           ini-file: development
@@ -86,7 +86,7 @@ jobs:
         uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc #v2.37.1
         timeout-minutes: 5
         with:
-          php-version: '8.2'
+          php-version: '8.3'
           extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite
           coverage: none
           ini-file: development
diff --git a/.github/workflows/files-external-ftp.yml b/.github/workflows/files-external-ftp.yml
index 78693968e8392..47d6bdfa0604e 100644
--- a/.github/workflows/files-external-ftp.yml
+++ b/.github/workflows/files-external-ftp.yml
@@ -55,7 +55,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.2', '8.5']
+        php-versions: ['8.3', '8.5']
         ftpd: ['proftpd', 'vsftpd', 'pure-ftpd']
 
     name: php${{ matrix.php-versions }}-${{ matrix.ftpd }}
diff --git a/.github/workflows/files-external-s3.yml b/.github/workflows/files-external-s3.yml
index 76c90dd3e1976..eff958216e20b 100644
--- a/.github/workflows/files-external-s3.yml
+++ b/.github/workflows/files-external-s3.yml
@@ -55,7 +55,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.2', '8.5']
+        php-versions: ['8.3', '8.5']
 
     name: php${{ matrix.php-versions }}-s3-minio
 
@@ -135,7 +135,7 @@ jobs:
 
     strategy:
       matrix:
-        php-versions: ['8.2', '8.5']
+        php-versions: ['8.3', '8.5']
 
     name: php${{ matrix.php-versions }}-s3-localstack
 
diff --git a/.github/workflows/files-external-sftp.yml b/.github/workflows/files-external-sftp.yml
index 99f0bc687a2a9..6c8bb09e3191b 100644
--- a/.github/workflows/files-external-sftp.yml
+++ b/.github/workflows/files-external-sftp.yml
@@ -55,7 +55,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.2', '8.5']
+        php-versions: ['8.3', '8.5']
         sftpd: ['openssh']
 
     name: php${{ matrix.php-versions }}-${{ matrix.sftpd }}
diff --git a/.github/workflows/files-external-smb.yml b/.github/workflows/files-external-smb.yml
index 8959b3230712d..6a72f9a7a1ea5 100644
--- a/.github/workflows/files-external-smb.yml
+++ b/.github/workflows/files-external-smb.yml
@@ -55,7 +55,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.2', '8.5']
+        php-versions: ['8.3', '8.5']
 
     name: php${{ matrix.php-versions }}-smb
 
diff --git a/.github/workflows/files-external-webdav.yml b/.github/workflows/files-external-webdav.yml
index 1fe24ef23d7ed..e388bf95157f2 100644
--- a/.github/workflows/files-external-webdav.yml
+++ b/.github/workflows/files-external-webdav.yml
@@ -55,7 +55,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.2', '8.5']
+        php-versions: ['8.3', '8.5']
 
     name: php${{ matrix.php-versions }}-webdav
 
diff --git a/.github/workflows/files-external.yml b/.github/workflows/files-external.yml
index f4f8a3bc44d69..473db996da9e3 100644
--- a/.github/workflows/files-external.yml
+++ b/.github/workflows/files-external.yml
@@ -55,7 +55,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.2', '8.5']
+        php-versions: ['8.3', '8.5']
 
     name: php${{ matrix.php-versions }}-generic
 
diff --git a/.github/workflows/integration-dav.yml b/.github/workflows/integration-dav.yml
index 8d7f047409774..aec34cbf9917c 100644
--- a/.github/workflows/integration-dav.yml
+++ b/.github/workflows/integration-dav.yml
@@ -45,7 +45,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.2', '8.5']
+        php-versions: ['8.3', '8.5']
         endpoint: ['old', 'new']
         service: ['CalDAV', 'CardDAV']
 
diff --git a/.github/workflows/integration-litmus.yml b/.github/workflows/integration-litmus.yml
index 870694cad34ab..461a029220e81 100644
--- a/.github/workflows/integration-litmus.yml
+++ b/.github/workflows/integration-litmus.yml
@@ -45,7 +45,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.2', '8.5']
+        php-versions: ['8.3', '8.5']
         endpoint: ['webdav', 'dav']
 
     name: Litmus WebDAV ${{ matrix.endpoint }}
diff --git a/.github/workflows/integration-s3-primary.yml b/.github/workflows/integration-s3-primary.yml
index 9ffe860523fbc..c30a2c2a0b3ef 100644
--- a/.github/workflows/integration-s3-primary.yml
+++ b/.github/workflows/integration-s3-primary.yml
@@ -54,7 +54,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.2', '8.5']
+        php-versions: ['8.3', '8.5']
         key: ['objectstore', 'objectstore_multibucket']
 
     name: php${{ matrix.php-versions }}-${{ matrix.key }}-minio
diff --git a/.github/workflows/integration-sqlite.yml b/.github/workflows/integration-sqlite.yml
index a8d183d850faa..52bc6d59eb6ba 100644
--- a/.github/workflows/integration-sqlite.yml
+++ b/.github/workflows/integration-sqlite.yml
@@ -74,7 +74,7 @@ jobs:
           - 'videoverification_features'
           - 'guests_features'
 
-        php-versions: ['8.2', '8.5']
+        php-versions: ['8.3', '8.5']
         guests-versions: ['main']
         spreed-versions: ['main']
         activity-versions: ['master']
diff --git a/.github/workflows/lint-php-cs.yml b/.github/workflows/lint-php-cs.yml
index 22c41a7414cd3..61156d4c9984a 100644
--- a/.github/workflows/lint-php-cs.yml
+++ b/.github/workflows/lint-php-cs.yml
@@ -59,7 +59,7 @@ jobs:
         uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc # v2.37.1
         timeout-minutes: 5
         with:
-          php-version: 8.2
+          php-version: 8.3
           extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite
           coverage: none
           ini-file: development
diff --git a/.github/workflows/lint-php.yml b/.github/workflows/lint-php.yml
index a0f2e79d8754f..fbbd4e161083b 100644
--- a/.github/workflows/lint-php.yml
+++ b/.github/workflows/lint-php.yml
@@ -47,7 +47,7 @@ jobs:
 
     strategy:
       matrix:
-        php-versions: ['8.2', '8.5']
+        php-versions: ['8.3', '8.5']
 
     name: php-lint
 
diff --git a/.github/workflows/object-storage-azure.yml b/.github/workflows/object-storage-azure.yml
index feb1fefbdd49e..f5b2b4f55fd42 100644
--- a/.github/workflows/object-storage-azure.yml
+++ b/.github/workflows/object-storage-azure.yml
@@ -55,7 +55,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.2', '8.5']
+        php-versions: ['8.3', '8.5']
 
     name: php${{ matrix.php-versions }}-azure
 
diff --git a/.github/workflows/object-storage-s3.yml b/.github/workflows/object-storage-s3.yml
index c006016320cd5..c090d35d4ac46 100644
--- a/.github/workflows/object-storage-s3.yml
+++ b/.github/workflows/object-storage-s3.yml
@@ -55,7 +55,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.2', '8.5']
+        php-versions: ['8.3', '8.5']
 
     name: php${{ matrix.php-versions }}-s3
 
diff --git a/.github/workflows/object-storage-swift.yml b/.github/workflows/object-storage-swift.yml
index 248d7a030bd49..8903953ac1e85 100644
--- a/.github/workflows/object-storage-swift.yml
+++ b/.github/workflows/object-storage-swift.yml
@@ -55,7 +55,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.2', '8.5']
+        php-versions: ['8.3', '8.5']
 
     name: php${{ matrix.php-versions }}-swift
 
diff --git a/.github/workflows/openapi.yml b/.github/workflows/openapi.yml
index 97895cca42574..6545eb3134c8e 100644
--- a/.github/workflows/openapi.yml
+++ b/.github/workflows/openapi.yml
@@ -34,7 +34,7 @@ jobs:
         uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc # v2.37.1
         timeout-minutes: 5
         with:
-          php-version: '8.2'
+          php-version: '8.3'
           extensions: ctype, curl, dom, fileinfo, gd, json, libxml, mbstring, openssl, pcntl, pdo, posix, session, simplexml, xml, xmlreader, xmlwriter, zip, zlib
           coverage: none
           ini-file: development
diff --git a/.github/workflows/performance.yml b/.github/workflows/performance.yml
index b366f42b9033d..e2ea3ef4c2158 100644
--- a/.github/workflows/performance.yml
+++ b/.github/workflows/performance.yml
@@ -41,7 +41,7 @@ jobs:
         uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc # v2.37.1
         timeout-minutes: 5
         with:
-          php-version: '8.2'
+          php-version: '8.3'
           extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, redis, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/phpunit-32bits.yml b/.github/workflows/phpunit-32bits.yml
index 6a6b79cfab40d..b5acf5f378169 100644
--- a/.github/workflows/phpunit-32bits.yml
+++ b/.github/workflows/phpunit-32bits.yml
@@ -30,7 +30,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.2', '8,5']
+        php-versions: ['8.3', '8,5']
 
     steps:
       - name: Checkout server
diff --git a/.github/workflows/phpunit-mariadb.yml b/.github/workflows/phpunit-mariadb.yml
index 5da9d8c1cb87a..86a2afe49aa3d 100644
--- a/.github/workflows/phpunit-mariadb.yml
+++ b/.github/workflows/phpunit-mariadb.yml
@@ -61,7 +61,7 @@ jobs:
       matrix:
         include:
           - mariadb-versions: '10.6'
-            php-versions: '8.2'
+            php-versions: '8.3'
           - mariadb-versions: '11.8'
             php-versions: '8.5'
 
diff --git a/.github/workflows/phpunit-memcached.yml b/.github/workflows/phpunit-memcached.yml
index d54cb2333992a..5090f5ff630ef 100644
--- a/.github/workflows/phpunit-memcached.yml
+++ b/.github/workflows/phpunit-memcached.yml
@@ -56,7 +56,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.2', '8.5']
+        php-versions: ['8.3', '8.5']
 
     name: Memcached (PHP ${{ matrix.php-versions }})
 
diff --git a/.github/workflows/phpunit-mysql-sharding.yml b/.github/workflows/phpunit-mysql-sharding.yml
index 2879c4668a6be..8893a604a76ba 100644
--- a/.github/workflows/phpunit-mysql-sharding.yml
+++ b/.github/workflows/phpunit-mysql-sharding.yml
@@ -58,7 +58,7 @@ jobs:
       matrix:
         include:
           - mysql-versions: '8.0'
-            php-versions: '8.2'
+            php-versions: '8.3'
           - mysql-versions: '8.4'
             php-versions: '8.5'
 
diff --git a/.github/workflows/phpunit-mysql.yml b/.github/workflows/phpunit-mysql.yml
index efead4134212f..51cd1582c1fe2 100644
--- a/.github/workflows/phpunit-mysql.yml
+++ b/.github/workflows/phpunit-mysql.yml
@@ -61,7 +61,7 @@ jobs:
       matrix:
         include:
           - mysql-versions: '8.0'
-            php-versions: '8.2'
+            php-versions: '8.3'
           - mysql-versions: '8.4'
             php-versions: '8.5'
 
diff --git a/.github/workflows/phpunit-nodb.yml b/.github/workflows/phpunit-nodb.yml
index d29a503fc3a3c..005c4c8239ca0 100644
--- a/.github/workflows/phpunit-nodb.yml
+++ b/.github/workflows/phpunit-nodb.yml
@@ -59,7 +59,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.2', '8.5']
+        php-versions: ['8.3', '8.5']
 
     name: No DB unit tests (PHP ${{ matrix.php-versions }})
 
diff --git a/.github/workflows/phpunit-object-store-primary.yml b/.github/workflows/phpunit-object-store-primary.yml
index 7a8f82853213f..97916e70ca51f 100644
--- a/.github/workflows/phpunit-object-store-primary.yml
+++ b/.github/workflows/phpunit-object-store-primary.yml
@@ -49,7 +49,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.2', '8.5']
+        php-versions: ['8.3', '8.5']
         key: ['s3', 's3-multibucket']
 
     name: php${{ matrix.php-versions }}-${{ matrix.key }}-minio
diff --git a/.github/workflows/phpunit-oci.yml b/.github/workflows/phpunit-oci.yml
index c49a98bcc899f..f8a98040fd831 100644
--- a/.github/workflows/phpunit-oci.yml
+++ b/.github/workflows/phpunit-oci.yml
@@ -61,7 +61,7 @@ jobs:
       matrix:
         include:
           - oracle-versions: '18'
-            php-versions: '8.2'
+            php-versions: '8.3'
           - oracle-versions: '23'
             php-versions: '8.5'
 
diff --git a/.github/workflows/phpunit-pgsql.yml b/.github/workflows/phpunit-pgsql.yml
index 23df450755bb6..bb493ecfe6947 100644
--- a/.github/workflows/phpunit-pgsql.yml
+++ b/.github/workflows/phpunit-pgsql.yml
@@ -61,7 +61,7 @@ jobs:
       matrix:
         include:
           - postgres-versions: '14'
-            php-versions: '8.2'
+            php-versions: '8.3'
           - postgres-versions: '18'
             php-versions: '8.5'
 
diff --git a/.github/workflows/phpunit-sqlite.yml b/.github/workflows/phpunit-sqlite.yml
index acd821d1c1e42..961f463fe0d03 100644
--- a/.github/workflows/phpunit-sqlite.yml
+++ b/.github/workflows/phpunit-sqlite.yml
@@ -59,7 +59,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.2', '8.5']
+        php-versions: ['8.3', '8.5']
 
     name: SQLite (PHP ${{ matrix.php-versions }})
 
diff --git a/.github/workflows/rector-apply.yml b/.github/workflows/rector-apply.yml
index 48a7a1faad82c..7f7074494b909 100644
--- a/.github/workflows/rector-apply.yml
+++ b/.github/workflows/rector-apply.yml
@@ -34,7 +34,7 @@ jobs:
       - name: Set up php
         uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc # v2.37.1
         with:
-          php-version: '8.2'
+          php-version: '8.3'
           extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite
           coverage: none
           ini-file: development
diff --git a/.github/workflows/rector.yml b/.github/workflows/rector.yml
index 31e7802003537..4ae41dae17743 100644
--- a/.github/workflows/rector.yml
+++ b/.github/workflows/rector.yml
@@ -52,7 +52,7 @@ jobs:
       - name: Set up php
         uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc #v2.37.1
         with:
-          php-version: '8.2'
+          php-version: '8.3'
           extensions: apcu,ctype,curl,dom,fileinfo,ftp,gd,imagick,intl,json,ldap,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
           coverage: none
         env:
diff --git a/.github/workflows/static-code-analysis.yml b/.github/workflows/static-code-analysis.yml
index f71a22c9f49d3..61e0cbaf6de3e 100644
--- a/.github/workflows/static-code-analysis.yml
+++ b/.github/workflows/static-code-analysis.yml
@@ -64,7 +64,7 @@ jobs:
         uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc #v2.37.1
         timeout-minutes: 5
         with:
-          php-version: '8.2'
+          php-version: '8.3'
           extensions: apcu,ctype,curl,dom,fileinfo,ftp,gd,imagick,intl,json,ldap,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
           coverage: none
         env:
@@ -100,7 +100,7 @@ jobs:
         uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc #v2.37.1
         timeout-minutes: 5
         with:
-          php-version: '8.2'
+          php-version: '8.3'
           extensions: ctype,curl,dom,fileinfo,ftp,gd,imagick,intl,json,ldap,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
           coverage: none
 
@@ -137,7 +137,7 @@ jobs:
         uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc #v2.37.1
         timeout-minutes: 5
         with:
-          php-version: '8.2'
+          php-version: '8.3'
           extensions: ctype,curl,dom,fileinfo,gd,imagick,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
           coverage: none
         env:
@@ -170,7 +170,7 @@ jobs:
         uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc #v2.37.1
         timeout-minutes: 5
         with:
-          php-version: '8.2'
+          php-version: '8.3'
           extensions: ctype,curl,dom,fileinfo,gd,imagick,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
           coverage: none
         env:
@@ -198,7 +198,7 @@ jobs:
       - name: Set up php
         uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc #v2.37.1
         with:
-          php-version: '8.2'
+          php-version: '8.3'
           extensions: ctype,curl,dom,fileinfo,gd,imagick,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
           coverage: none
         env:
diff --git a/apps/settings/lib/SetupChecks/PhpOutdated.php b/apps/settings/lib/SetupChecks/PhpOutdated.php
index 287b937070fc3..6e7504c9e5aac 100644
--- a/apps/settings/lib/SetupChecks/PhpOutdated.php
+++ b/apps/settings/lib/SetupChecks/PhpOutdated.php
@@ -14,10 +14,10 @@
 use OCP\SetupCheck\SetupResult;
 
 class PhpOutdated implements ISetupCheck {
-	public const DEPRECATED_PHP_VERSION = '8.2';
-	public const DEPRECATED_SINCE = '33';
-	public const FUTURE_REQUIRED_PHP_VERSION = '8.3';
-	public const FUTURE_REQUIRED_STARTING = '34';
+	public const DEPRECATED_PHP_VERSION = '8.3';
+	public const DEPRECATED_SINCE = '35';
+	public const FUTURE_REQUIRED_PHP_VERSION = '8.4';
+	public const FUTURE_REQUIRED_STARTING = '36';
 
 	public function __construct(
 		private IL10N $l10n,
@@ -36,7 +36,7 @@ public function getName(): string {
 
 	#[\Override]
 	public function run(): SetupResult {
-		if (PHP_VERSION_ID < 80300) {
+		if (PHP_VERSION_ID < 80400) {
 			return SetupResult::warning($this->l10n->t('You are currently running PHP %1$s. PHP %2$s is deprecated since Nextcloud %3$s. Nextcloud %4$s may require at least PHP %5$s. Please upgrade to one of the officially supported PHP versions provided by the PHP Group as soon as possible.', [
 				PHP_VERSION,
 				self::DEPRECATED_PHP_VERSION,
diff --git a/composer.json b/composer.json
index 03881a15fc071..ec9ea32522185 100644
--- a/composer.json
+++ b/composer.json
@@ -4,7 +4,7 @@
 		"optimize-autoloader": true,
 		"sort-packages": true,
 		"platform": {
-			"php": "8.2"
+			"php": "8.3"
 		},
 		"allow-plugins": {
 			"bamarni/composer-bin-plugin": true
@@ -26,7 +26,7 @@
 		}
 	},
 	"require": {
-		"php": "^8.2",
+		"php": "^8.3",
 		"ext-apcu": "*",
 		"ext-ctype": "*",
 		"ext-curl": "*",
@@ -65,11 +65,11 @@
 		"cs:fix": "php-cs-fixer fix",
 		"cs:check": "php-cs-fixer fix --dry-run --diff",
 		"lint": [
-			"@lint-8.2-or-earlier",
-			"@lint-8.3-or-later"
+			"@lint-8.3-or-earlier",
+			"@lint-8.4-or-later"
 		],
-		"lint-8.2-or-earlier": "[ $(php -r \"echo PHP_VERSION_ID;\") -ge 80300 ] || find . -type f -name '*.php' -not -path './3rdparty/*' -not -path '*/composer/*' -not -path '*/stubs/*' -not -path '*/vendor-bin/*' -not -path '*/vendor/*' -print0 | xargs -0 -n1 -P$(nproc) php -l",
-		"lint-8.3-or-later": "[ $(php -r \"echo PHP_VERSION_ID;\") -lt 80300 ] || find . -type f -name '*.php' -not -path './3rdparty/*' -not -path '*/composer/*' -not -path '*/stubs/*' -not -path '*/vendor-bin/*' -not -path '*/vendor/*' -print0 | xargs -0 -n200 -P$(nproc) php -l",
+		"lint-8.3-or-earlier": "[ $(php -r \"echo PHP_VERSION_ID;\") -ge 80400 ] || find . -type f -name '*.php' -not -path './3rdparty/*' -not -path '*/composer/*' -not -path '*/stubs/*' -not -path '*/vendor-bin/*' -not -path '*/vendor/*' -print0 | xargs -0 -n1 -P$(nproc) php -l",
+		"lint-8.4-or-later": "[ $(php -r \"echo PHP_VERSION_ID;\") -lt 80400 ] || find . -type f -name '*.php' -not -path './3rdparty/*' -not -path '*/composer/*' -not -path '*/stubs/*' -not -path '*/vendor-bin/*' -not -path '*/vendor/*' -print0 | xargs -0 -n200 -P$(nproc) php -l",
 		"psalm": "psalm --no-cache --threads=$(nproc)",
 		"psalm:ocp": "psalm --no-cache --threads=$(nproc) -c psalm-ocp.xml",
 		"psalm:ncu": "psalm --no-cache --threads=$(nproc) -c psalm-ncu.xml",
diff --git a/composer.lock b/composer.lock
index 7301359b75857..02886ad96ab5d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "6ddd830a124a1e3f11c8f73901b0d0e6",
+    "content-hash": "26ed3c81563b32a9dc58b662210df33c",
     "packages": [],
     "packages-dev": [
         {
@@ -71,7 +71,7 @@
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": "^8.2",
+        "php": "^8.3",
         "ext-apcu": "*",
         "ext-ctype": "*",
         "ext-curl": "*",
@@ -94,7 +94,7 @@
     },
     "platform-dev": {},
     "platform-overrides": {
-        "php": "8.2"
+        "php": "8.3"
     },
     "plugin-api-version": "2.9.0"
 }
diff --git a/lib/composer/composer/platform_check.php b/lib/composer/composer/platform_check.php
index 14bf88da3a275..af033b94960e0 100644
--- a/lib/composer/composer/platform_check.php
+++ b/lib/composer/composer/platform_check.php
@@ -4,8 +4,8 @@
 
 $issues = array();
 
-if (!(PHP_VERSION_ID >= 80200)) {
-    $issues[] = 'Your Composer dependencies require a PHP version ">= 8.2.0". You are running ' . PHP_VERSION . '.';
+if (!(PHP_VERSION_ID >= 80300)) {
+    $issues[] = 'Your Composer dependencies require a PHP version ">= 8.3.0". You are running ' . PHP_VERSION . '.';
 }
 
 if ($issues) {
diff --git a/lib/versioncheck.php b/lib/versioncheck.php
index dd7790ff9616e..cfc1dda5bbe09 100644
--- a/lib/versioncheck.php
+++ b/lib/versioncheck.php
@@ -5,10 +5,10 @@
  * SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-// Show warning if a PHP version below 8.2 is used,
-if (PHP_VERSION_ID < 80200) {
+// Show warning if a PHP version below 8.3 is used,
+if (PHP_VERSION_ID < 80300) {
 	http_response_code(500);
-	echo 'This version of Nextcloud requires at least PHP 8.2<br/>';
+	echo 'This version of Nextcloud requires at least PHP 8.3<br/>';
 	echo 'You are currently running ' . PHP_VERSION . '. Please update your PHP version.';
 	exit(1);
 }