diff options
| -rw-r--r-- | .github/workflows/oci.yml | 3 | ||||
| -rw-r--r-- | lib/private/Files/Cache/Cache.php | 9 | ||||
| -rw-r--r-- | lib/versioncheck.php | 6 |
3 files changed, 13 insertions, 5 deletions
diff --git a/.github/workflows/oci.yml b/.github/workflows/oci.yml index bdf6da52bed..12bef5b1ed8 100644 --- 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 index ec284282178..6440bf05a1d 100644 --- a/lib/private/Files/Cache/Cache.php +++ b/lib/private/Files/Cache/Cache.php @@ -186,6 +186,8 @@ class Cache implements ICache { */ 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 @@ class Cache implements ICache { $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 index 7c95b333102..8869fe95453 100644 --- a/lib/versioncheck.php +++ b/lib/versioncheck.php @@ -33,10 +33,10 @@ if (PHP_VERSION_ID < 80000) { 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); } |