ci(PHP): Test against 8.5 on CI

Signed-off-by: Joas Schilling <[email protected]>

Author: nickvergessen

.github/workflows/lint-php.yml

@@ -47,7 +47,7 @@ jobs:
 
     strategy:
       matrix:
-        php-versions: [ '8.2', '8.3', '8.4' ]
+        php-versions: [ '8.2', '8.3', '8.4', '8.5' ]
 
     name: php-lint
 

.github/workflows/phpunit-mariadb.yml

@@ -60,13 +60,15 @@ jobs:
       fail-fast: false
       matrix:
         php-versions: ['8.2']
-        mariadb-versions: ['10.3', '10.6', '10.11', '11.4', '11.8']
+        mariadb-versions: ['10.6', '10.11', '11.4', '11.8']
         include:
           - php-versions: '8.3'
             mariadb-versions: '10.11'
             coverage: ${{ github.event_name != 'pull_request' }}
           - php-versions: '8.4'
             mariadb-versions: '11.8'
+          - php-versions: '8.5'
+            mariadb-versions: '11.8'
 
     name: MariaDB ${{ matrix.mariadb-versions }} (PHP ${{ matrix.php-versions }}) - database tests
 

.github/workflows/phpunit-memcached.yml

@@ -56,7 +56,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.3', '8.4']
+        php-versions: ['8.3', '8.4', '8.5']
         include:
           - php-versions: '8.2'
             coverage: ${{ github.event_name != 'pull_request' }}

.github/workflows/phpunit-mysql.yml

@@ -67,6 +67,8 @@ jobs:
             coverage: ${{ github.event_name != 'pull_request' }}
           - mysql-versions: '8.4'
             php-versions: '8.4'
+          - mysql-versions: '8.4'
+            php-versions: '8.5'
 
     name: MySQL ${{ matrix.mysql-versions }} (PHP ${{ matrix.php-versions }}) - database tests
 

.github/workflows/phpunit-nodb.yml

@@ -59,7 +59,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.3', '8.4']
+        php-versions: ['8.3', '8.4', '8.5']
         include:
           - php-versions: '8.2'
             coverage: ${{ github.event_name != 'pull_request' }}

.github/workflows/phpunit-oci.yml

@@ -69,6 +69,8 @@ jobs:
             php-versions: '8.3'
           - oracle-versions: '23'
             php-versions: '8.4'
+          - oracle-versions: '23'
+            php-versions: '8.5'
 
     name: Oracle ${{ matrix.oracle-versions }} (PHP ${{ matrix.php-versions }}) - database tests
 

.github/workflows/phpunit-pgsql.yml

@@ -68,6 +68,8 @@ jobs:
             coverage: ${{ github.event_name != 'pull_request' }}
           - php-versions: '8.4'
             postgres-versions: '18'
+          - php-versions: '8.5'
+            postgres-versions: '18'
 
     name: PostgreSQL ${{ matrix.postgres-versions }} (PHP ${{ matrix.php-versions }}) - database tests
 

.github/workflows/phpunit-sqlite.yml

@@ -59,7 +59,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.3', '8.4']
+        php-versions: ['8.3', '8.4', '8.5']
         include:
           - php-versions: '8.2'
             coverage: ${{ github.event_name != 'pull_request' }}

lib/versioncheck.php

@@ -5,18 +5,18 @@
  * SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-// Show warning if a PHP version below 8.1 is used,
+// Show warning if a PHP version below 8.2 is used,
 if (PHP_VERSION_ID < 80200) {
 	http_response_code(500);
 	echo 'This version of Nextcloud requires at least PHP 8.2<br/>';
 	echo 'You are currently running ' . PHP_VERSION . '. Please update your PHP version.';
 	exit(1);
 }
 
-// Show warning if >= PHP 8.5 is used as Nextcloud is not compatible with >= PHP 8.5 for now
-if (PHP_VERSION_ID >= 80500) {
+// Show warning if >= PHP 8.6 is used as Nextcloud is not compatible with >= PHP 8.6 for now
+if (PHP_VERSION_ID >= 80600) {
 	http_response_code(500);
-	echo 'This version of Nextcloud is not compatible with PHP>=8.5.<br/>';
+	echo 'This version of Nextcloud is not compatible with PHP>=8.6.<br/>';
 	echo 'You are currently running ' . PHP_VERSION . '.';
 	exit(1);
 }