diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2021-04-26 12:44:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-26 12:44:38 +0200 |
| commit | e1a3000cbed2e0bfa29e53b8bbcb858604540da2 (patch) | |
| tree | f9fa3bc7503e07a3acc3477e5f6ba5dac1efb0e5 /lib | |
| parent | 8f3a0705d46c1c196521cdb33c75acf92ea05026 (diff) | |
| parent | 3d900b1e5826c1a0fb3b0de99c29306f5e2ae4e7 (diff) | |
| download | nextcloud-server-e1a3000cbed2e0bfa29e53b8bbcb858604540da2.tar.gz nextcloud-server-e1a3000cbed2e0bfa29e53b8bbcb858604540da2.zip | |
Merge pull request #26747 from nextcloud/php8-libxml
Fix installer deprecation warnings for PHP 8
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/Installer.php | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/lib/private/Installer.php b/lib/private/Installer.php index fdf9af7446b..da3cef7d1e7 100644 --- a/lib/private/Installer.php +++ b/lib/private/Installer.php @@ -307,7 +307,10 @@ class Installer { // Check if the signature actually matches the downloaded content $certificate = openssl_get_publickey($app['certificate']); $verified = (bool)openssl_verify(file_get_contents($tempFile), base64_decode($app['releases'][0]['signature']), $certificate, OPENSSL_ALGO_SHA512); - openssl_free_key($certificate); + // PHP 8+ deprecates openssl_free_key and automatically destroys the key instance when it goes out of scope + if ((PHP_VERSION_ID < 80000)) { + openssl_free_key($certificate); + } if ($verified === true) { // Seems to match, let's proceed @@ -339,9 +342,13 @@ class Installer { } // Check if appinfo/info.xml has the same app ID as well - $loadEntities = libxml_disable_entity_loader(false); - $xml = simplexml_load_file($extractDir . '/' . $folders[0] . '/appinfo/info.xml'); - libxml_disable_entity_loader($loadEntities); + if ((PHP_VERSION_ID < 80000)) { + $loadEntities = libxml_disable_entity_loader(false); + $xml = simplexml_load_file($extractDir . '/' . $folders[0] . '/appinfo/info.xml'); + libxml_disable_entity_loader($loadEntities); + } else { + $xml = simplexml_load_file($extractDir . '/' . $folders[0] . '/appinfo/info.xml'); + } if ((string)$xml->id !== $appId) { throw new \Exception( sprintf( |