Skip to content

Support PHP 8.1 - Second batch #29862

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
come-nc merged 12 commits into from
Dec 16, 2021
Merged

Support PHP 8.1 - Second batch #29862

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
260be93
Allow running Nextcloud with PHP 8.1
come-nc Oct 19, 2021
6b770eb
Fix theming tests on PHP 8.1
come-nc Oct 26, 2021
37f8f7a
Fix tests on PHP 8.1 for encryption, files_sharing, files_version,
come-nc Oct 26, 2021
f3dcbfe
Fix PHP 8.1 support for user_ldap application
come-nc Oct 26, 2021
dc8b79c
Fix OCA\Settings\Tests\Settings\Admin\SharingTest
come-nc Oct 28, 2021
24e9a29
Add PHP 8.1 LDAP classes to ignored missing classes in psalm for docb…
come-nc Nov 29, 2021
743267e
Fix LDAP related docblocks types
come-nc Nov 29, 2021
4f7b9cc
Add 8.1 tests to CI
come-nc Nov 29, 2021
72baee9
Allow minor release of PHP 8.1 to be used as well
come-nc Dec 2, 2021
e053feb
Fix PHP deprecation warning in File/ViewTest
come-nc Dec 6, 2021
ec4fff2
Avoid Deprecation warning from Zip tests on PHP 8.1
come-nc Dec 16, 2021
c3a1a66
Avoid deprecation warnings about libxml_disable_entity_loader in PHP 8.1
come-nc Dec 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Avoid deprecation warnings about libxml_disable_entity_loader in PHP 8.1 
Signed-off-by: Côme Chilliet <[email protected]>
  • Loading branch information
@come-nc
come-nc committed Dec 16, 2021
commit c3a1a66eaefac9e06385d125dd4edae3117cc9eb
10 changes: 7 additions & 3 deletions lib/private/Updater/ChangesCheck.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,13 @@ protected function queryChangesServer(string $uri, ChangesResult $entry): IRespo
protected function extractData($body):array {
$data = [];
if ($body) {
$loadEntities = libxml_disable_entity_loader(true);
$xml = @simplexml_load_string($body);
libxml_disable_entity_loader($loadEntities);
if (\LIBXML_VERSION < 20900) {
$loadEntities = libxml_disable_entity_loader(true);
$xml = @simplexml_load_string($body);
libxml_disable_entity_loader($loadEntities);
} else {
$xml = @simplexml_load_string($body);
}
if ($xml !== false) {
$data['changelogURL'] = (string)$xml->changelog['href'];
$data['whatsNew'] = [];
Expand Down
10 changes: 7 additions & 3 deletions lib/private/Updater/VersionCheck.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,13 @@ public function check() {
}

if ($xml) {
$loadEntities = libxml_disable_entity_loader(true);
$data = @simplexml_load_string($xml);
libxml_disable_entity_loader($loadEntities);
if (\LIBXML_VERSION < 20900) {
$loadEntities = libxml_disable_entity_loader(true);
$data = @simplexml_load_string($xml);
libxml_disable_entity_loader($loadEntities);
} else {
$data = @simplexml_load_string($xml);
}
if ($data !== false) {
$tmp['version'] = (string)$data->version;
$tmp['versionstring'] = (string)$data->versionstring;
Expand Down