From 1d461523ccd29837f6e6a522b6333ef4bceb6be6 Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Sat, 18 Jul 2026 17:13:40 +0200 Subject: [PATCH] chore: adjust for old PHP Signed-off-by: Ferdinand Thiessen --- tests/lib/Preview/Provider.php | 8 ++++++-- tests/lib/Preview/SVGTest.php | 16 +++++++++++----- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/tests/lib/Preview/Provider.php b/tests/lib/Preview/Provider.php index 77659ad0fc698..81a93195c8e9b 100644 --- a/tests/lib/Preview/Provider.php +++ b/tests/lib/Preview/Provider.php @@ -9,7 +9,9 @@ namespace Test\Preview; use OC\Files\Node\File; +use OC\Preview\Provider as PreviewProvider; use OCP\Files\IRootFolder; +use OCP\Preview\IProviderV2; abstract class Provider extends \Test\TestCase { /** @var string */ @@ -18,7 +20,7 @@ abstract class Provider extends \Test\TestCase { protected $width; /** @var int */ protected $height; - /** @var \OC\Preview\Provider */ + /** @var IProviderV2|PreviewProvider */ protected $provider; /** @var int */ protected $maxWidth = 1024; @@ -126,7 +128,9 @@ protected function prepareTestFile($fileName, $fileContent) { */ private function getPreview($provider) { $file = new File(\OC::$server->get(IRootFolder::class), $this->rootView, $this->imgPath); - $preview = $provider->getThumbnail($file, $this->maxWidth, $this->maxHeight, $this->scalingUp); + $preview = ($provider instanceof PreviewProvider) + ? $provider->getThumbnail($file, $this->maxWidth, $this->maxHeight, $this->scalingUp, $this->rootView) + : $provider->getThumbnail($file, $this->maxWidth, $this->maxHeight, $this->scalingUp); if (get_class($this) === BitmapTest::class && $preview === null) { $this->markTestSkipped('An error occured while operating with Imagick.'); diff --git a/tests/lib/Preview/SVGTest.php b/tests/lib/Preview/SVGTest.php index 2fe15b2cdb79d..0a497d99182f8 100644 --- a/tests/lib/Preview/SVGTest.php +++ b/tests/lib/Preview/SVGTest.php @@ -8,6 +8,8 @@ namespace Test\Preview; +use OCP\Files\File; + /** * Class SVGTest * @@ -53,15 +55,17 @@ public function testGetThumbnailSVGHref(string $content): void { '); rewind($handle); - $file = $this->createMock(\OCP\Files\File::class); + $file = $this->createMock(File::class); $file->method('fopen') ->willReturn($handle); self::assertNull($this->provider->getThumbnail($file, 512, 512)); } - #[\PHPUnit\Framework\Attributes\DataProvider('dataGetThumbnailSVGHrefNamespace')] - #[\PHPUnit\Framework\Attributes\RequiresPhpExtension('imagick')] + /** + * @dataProvider dataGetThumbnailSVGHrefNamespace + * @requires extension imagick + */ public function testGetThumbnailSvgHrefNamespace(string $namespace): void { $handle = fopen('php://temp', 'w+'); fwrite($handle, ' @@ -87,8 +91,10 @@ public static function dataGetThumbnailSVGHrefNamespace(): array { ]; } - #[\PHPUnit\Framework\Attributes\DataProvider('dataGetThumbnailSvgEncoded')] - #[\PHPUnit\Framework\Attributes\RequiresPhpExtension('imagick')] + /** + * @dataProvider dataGetThumbnailSvgEncoded + * @requires extension imagick + */ public function testGetThumbnailSvgEncoded(string $content): void { $handle = fopen('php://temp', 'w+'); fwrite($handle, $content);