Merge pull request #40630 from nextcloud/enh/enable-php-8.3

nextcloud · Sep 30, 2023 · 83cbd9c · 83cbd9c
2 parents ee590ab + 7e0ed6b
commit 83cbd9c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/lint-php.yml b/.github/workflows/lint-php.yml
@@ -25,7 +25,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-versions: [ "8.0", "8.1", "8.2" ]
+        php-versions: [ "8.0", "8.1", "8.2", "8.3" ]
 
     name: php-lint
 

diff --git a/.github/workflows/phpunit-32bits.yml b/.github/workflows/phpunit-32bits.yml
@@ -26,7 +26,7 @@ jobs:
 
     strategy:
       matrix:
-        php-versions: ['8.0']
+        php-versions: ['8.0','8.3']
 
     steps:
       - name: Checkout server
@@ -40,15 +40,15 @@ jobs:
           sudo apt-get install -y ffmpeg imagemagick libmagickcore-6.q16-3-extra
 
       - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@9c77701ae57b0c47f6732beebfbdec76e4e5c90a #debian bookworm fix
+        uses: shivammathur/setup-php@72ae4ccbe57f82bbe08411e84e2130bd4ba1c10f #v2.25.5
         with:
           php-version: ${{ matrix.php-versions }}
           extensions: ctype, curl, dom, fileinfo, gd, imagick, intl, json, mbstring, openssl, pdo_sqlite, posix, sqlite, xml, zip, apcu
           tools: phpunit:9
           coverage: none
+          ini-file: development
           ini-values:
-            apc.enabled=on,
-            apc.enable_cli=on
+            apc.enabled=on, apc.enable_cli=on, disable_functions= # https://github.com/shivammathur/setup-php/discussions/573
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 

diff --git a/lib/versioncheck.php b/lib/versioncheck.php
@@ -33,10 +33,10 @@
 	exit(1);
 }
 
-// Show warning if >= PHP 8.3 is used as Nextcloud is not compatible with >= PHP 8.3 for now
-if (PHP_VERSION_ID >= 80300) {
+// Show warning if >= PHP 8.4 is used as Nextcloud is not compatible with >= PHP 8.4 for now
+if (PHP_VERSION_ID >= 80400) {
 	http_response_code(500);
-	echo 'This version of Nextcloud is not compatible with PHP>=8.3.<br/>';
+	echo 'This version of Nextcloud is not compatible with PHP>=8.4.<br/>';
 	echo 'You are currently running ' . PHP_VERSION . '.';
 	exit(1);
 }