Merge pull request #36375 from nextcloud/enh/allow-php-8.2

Allow php 8.2
nextcloud · Feb 2, 2023 · 970f393 · 970f393
2 parents bbd3e2b + 4bdc583
commit 970f393
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/.github/workflows/oci.yml b/.github/workflows/oci.yml
@@ -15,7 +15,7 @@ jobs:
 
     strategy:
       matrix:
-        php-versions: ['8.0', '8.1']
+        php-versions: ['8.0', '8.1', '8.2']
 
     services:
       oracle:
@@ -36,6 +36,7 @@ jobs:
           extensions: ctype, curl, dom, fileinfo, gd, imagick, intl, json, mbstring, oci8, openssl, pdo_sqlite, posix, sqlite, xml, zip
           tools: phpunit:9
           coverage: none
+          ini-file: development
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 

diff --git a/lib/private/Files/Cache/Cache.php b/lib/private/Files/Cache/Cache.php
@@ -186,6 +186,8 @@ public function get($file) {
 	 */
 	public static function cacheEntryFromData($data, IMimeTypeLoader $mimetypeLoader) {
 		//fix types
+		$data['name'] = (string)$data['name'];
+		$data['path'] = (string)$data['path'];
 		$data['fileid'] = (int)$data['fileid'];
 		$data['parent'] = (int)$data['parent'];
 		$data['size'] = 0 + $data['size'];
@@ -977,7 +979,12 @@ public function getIncomplete() {
 		$path = $result->fetchOne();
 		$result->closeCursor();
 
-		return $path;
+		if ($path === false) {
+			return false;
+		}
+
+		// Make sure Oracle does not continue with null for empty strings
+		return (string)$path;
 	}
 
 	/**

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