upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 54

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

Browse source 
Allow php 8.2
This commit is contained in:
blizzz 2023-02-02 13:47:16 +01:00 committed by GitHub
commit 970f3937e5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.github/workflows/oci.yml vendored
View file

@ -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 }}

9
lib/private/Files/Cache/Cache.php
View file

@ -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;
}
/**

6
lib/versioncheck.php
View file

@ -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);
}