Skip to content
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

Jump to bottom

fix: Drop workarounds for unsupported obsolete PHP versions #44968

Merged
merged 1 commit into from
Apr 29, 2024
Merged

fix: Drop workarounds for unsupported obsolete PHP versions #44968

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 1 addition & 8 deletions lib/private/App/InfoParser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
namespace OC\App;

use OCP\ICache;
use function libxml_disable_entity_loader;
use function simplexml_load_string;

class InfoParser {
Expand Down Expand Up @@ -59,13 +58,7 @@
}

libxml_use_internal_errors(true);
if ((PHP_VERSION_ID < 80000)) {
$loadEntities = libxml_disable_entity_loader(false);
$xml = simplexml_load_string(file_get_contents($file));
libxml_disable_entity_loader($loadEntities);
} else {
$xml = simplexml_load_string(file_get_contents($file));
}
$xml = simplexml_load_string(file_get_contents($file));
Dismissed Show dismissed Hide dismissed

if ($xml === false) {
libxml_clear_errors();
Expand Down
29 changes: 19 additions & 10 deletions lib/private/Installer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,10 +281,6 @@ public function downloadApp(string $appId, bool $allowUnstable = false): void {
// 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);
// 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
Expand All @@ -305,6 +301,15 @@ public function downloadApp(string $appId, bool $allowUnstable = false): void {
$folders = array_diff($allFiles, ['.', '..']);
$folders = array_values($folders);

if (count($folders) < 1) {
throw new \Exception(
sprintf(
'Extracted app %s has no folders',
$appId
)
);
}

if (count($folders) > 1) {
throw new \Exception(
sprintf(
Expand All @@ -315,13 +320,17 @@ public function downloadApp(string $appId, bool $allowUnstable = false): void {
}

// Check if appinfo/info.xml has the same app ID as well
if ((PHP_VERSION_ID < 80000)) {
$loadEntities = libxml_disable_entity_loader(false);
$xml = simplexml_load_string(file_get_contents($extractDir . '/' . $folders[0] . '/appinfo/info.xml'));
libxml_disable_entity_loader($loadEntities);
} else {
$xml = simplexml_load_string(file_get_contents($extractDir . '/' . $folders[0] . '/appinfo/info.xml'));
$xml = simplexml_load_string(file_get_contents($extractDir . '/' . $folders[0] . '/appinfo/info.xml'));

if ($xml === false) {
throw new \Exception(
sprintf(
'Failed to load info.xml for app id %s',
$appId,
)
);
}

if ((string)$xml->id !== $appId) {
throw new \Exception(
sprintf(
Expand Down
3 changes: 1 addition & 2 deletions lib/private/legacy/OC_Image.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,8 +294,7 @@ private function _output(?string $filePath = null, ?string $mimeType = null): bo
$retVal = imagegif($this->resource, $filePath);
break;
case IMAGETYPE_JPEG:
/** @psalm-suppress InvalidScalarArgument */
imageinterlace($this->resource, (PHP_VERSION_ID >= 80000 ? true : 1));
imageinterlace($this->resource, true);
$retVal = imagejpeg($this->resource, $filePath, $this->getJpegQuality());
break;
case IMAGETYPE_PNG:
Expand Down
2 changes: 1 addition & 1 deletion lib/public/AppFramework/App.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ public static function buildAppNamespace(string $appId, string $topNamespace = '
*/
public function __construct(string $appName, array $urlParams = []) {
$runIsSetupDirectly = \OC::$server->getConfig()->getSystemValueBool('debug')
&& (PHP_VERSION_ID < 70400 || (PHP_VERSION_ID >= 70400 && !ini_get('zend.exception_ignore_args')));
&& !ini_get('zend.exception_ignore_args');

if ($runIsSetupDirectly) {
$applicationClassName = get_class($this);
Expand Down
3 changes: 1 addition & 2 deletions tests/lib/ImageTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,7 @@ public function testData() {
$img = new \OC_Image(null, null, $config);
$img->loadFromFile(OC::$SERVERROOT.'/tests/data/testimage.jpg');
$raw = imagecreatefromstring(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.jpg'));
/** @psalm-suppress InvalidScalarArgument */
imageinterlace($raw, (PHP_VERSION_ID >= 80000 ? true : 1));
imageinterlace($raw, true);
ob_start();
imagejpeg($raw, null, 80);
$expected = ob_get_clean();
Expand Down
Loading