aboutsummaryrefslogtreecommitdiffstats
path: root/lib/private/legacy
diff options
context:
space:
mode:
authorCôme Chilliet <come.chilliet@nextcloud.com>2024-04-22 16:55:42 +0200
committerCôme Chilliet <come.chilliet@nextcloud.com>2024-04-22 16:55:42 +0200
commit5d1ca7e25aee8264b3dff79eed10eba0568ce82f (patch)
tree648ff723576601c01bf99782e8b5c21a1ac95265 /lib/private/legacy
parent37c89f41918b316c8ba2961a6c7e8ab417161ba9 (diff)
downloadnextcloud-server-5d1ca7e25aee8264b3dff79eed10eba0568ce82f.tar.gz
nextcloud-server-5d1ca7e25aee8264b3dff79eed10eba0568ce82f.zip
fix: Drop workarounds for unsupported obsolete PHP versions
Also improved error handling in Installer.php to be type safe. Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
Diffstat (limited to 'lib/private/legacy')
-rw-r--r--lib/private/legacy/OC_Image.php3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/private/legacy/OC_Image.php b/lib/private/legacy/OC_Image.php
index 8807eef4b56..880bb1d42a9 100644
--- a/lib/private/legacy/OC_Image.php
+++ b/lib/private/legacy/OC_Image.php
@@ -294,8 +294,7 @@ class OC_Image implements \OCP\IImage {
$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: