From 5d1ca7e25aee8264b3dff79eed10eba0568ce82f Mon Sep 17 00:00:00 2001 From: Côme Chilliet Date: Mon, 22 Apr 2024 16:55:42 +0200 Subject: fix: Drop workarounds for unsupported obsolete PHP versions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also improved error handling in Installer.php to be type safe. Signed-off-by: Côme Chilliet --- tests/lib/ImageTest.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'tests/lib') diff --git a/tests/lib/ImageTest.php b/tests/lib/ImageTest.php index f4da0275c2d..62d037d70c5 100644 --- a/tests/lib/ImageTest.php +++ b/tests/lib/ImageTest.php @@ -149,8 +149,7 @@ class ImageTest extends \Test\TestCase { $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(); -- cgit v1.2.3