summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/private/Avatar/UserAvatar.php7
-rw-r--r--lib/private/Preview/Bitmap.php2
-rw-r--r--lib/private/Preview/HEIC.php2
-rw-r--r--lib/private/Preview/SVG.php2
-rw-r--r--lib/private/legacy/OC_Image.php34
-rw-r--r--lib/public/IImage.php2
-rw-r--r--psalm-ocp.xml8
-rw-r--r--psalm.xml4
-rw-r--r--tests/lib/Avatar/UserAvatarTest.php20
-rw-r--r--tests/lib/ImageTest.php68
10 files changed, 38 insertions, 111 deletions
diff --git a/lib/private/Avatar/UserAvatar.php b/lib/private/Avatar/UserAvatar.php
index 027c83172c2..b46e4816fa2 100644
--- a/lib/private/Avatar/UserAvatar.php
+++ b/lib/private/Avatar/UserAvatar.php
@@ -122,7 +122,7 @@ class UserAvatar extends Avatar {
/**
* Returns an image from several sources.
*
- * @param IImage|resource|string $data An image object, imagedata or path to the avatar
+ * @param IImage|resource|string|\GdImage $data An image object, imagedata or path to the avatar
* @return IImage
*/
private function getAvatarImage($data) {
@@ -131,7 +131,10 @@ class UserAvatar extends Avatar {
}
$img = new OC_Image();
- if (is_resource($data) && get_resource_type($data) === 'gd') {
+ if (
+ (is_resource($data) && get_resource_type($data) === 'gd') ||
+ (is_object($data) && get_class($data) === \GdImage::class)
+ ) {
$img->setResource($data);
} elseif (is_resource($data)) {
$img->loadFromFileHandle($data);
diff --git a/lib/private/Preview/Bitmap.php b/lib/private/Preview/Bitmap.php
index 969fb948d94..57451da5725 100644
--- a/lib/private/Preview/Bitmap.php
+++ b/lib/private/Preview/Bitmap.php
@@ -60,7 +60,7 @@ abstract class Bitmap extends ProviderV2 {
//new bitmap image object
$image = new \OC_Image();
- $image->loadFromData($bp);
+ $image->loadFromData((string) $bp);
//check if image object is valid
return $image->valid() ? $image : null;
}
diff --git a/lib/private/Preview/HEIC.php b/lib/private/Preview/HEIC.php
index 68c83fad97d..0b5cd0bb5bd 100644
--- a/lib/private/Preview/HEIC.php
+++ b/lib/private/Preview/HEIC.php
@@ -76,7 +76,7 @@ class HEIC extends ProviderV2 {
//new bitmap image object
$image = new \OC_Image();
- $image->loadFromData($bp);
+ $image->loadFromData((string) $bp);
//check if image object is valid
return $image->valid() ? $image : null;
}
diff --git a/lib/private/Preview/SVG.php b/lib/private/Preview/SVG.php
index cee0f341716..690a6b50ffe 100644
--- a/lib/private/Preview/SVG.php
+++ b/lib/private/Preview/SVG.php
@@ -69,7 +69,7 @@ class SVG extends ProviderV2 {
//new image object
$image = new \OC_Image();
- $image->loadFromData($svg);
+ $image->loadFromData((string) $svg);
//check if image object is valid
if ($image->valid()) {
$image->scaleDownToFit($maxX, $maxY);
diff --git a/lib/private/legacy/OC_Image.php b/lib/private/legacy/OC_Image.php
index ab49370c5cd..86ea76221ae 100644
--- a/lib/private/legacy/OC_Image.php
+++ b/lib/private/legacy/OC_Image.php
@@ -101,7 +101,7 @@ class OC_Image implements \OCP\IImage {
if (is_resource($this->resource)) {
return true;
}
- if (is_object($this->resource) && get_class($this->resource) === 'GdImage') {
+ if (is_object($this->resource) && get_class($this->resource) === \GdImage::class) {
return true;
}
@@ -308,7 +308,7 @@ class OC_Image implements \OCP\IImage {
}
/**
- * @param resource Returns the image resource in any.
+ * @param resource|\GdImage $resource
* @throws \InvalidArgumentException in case the supplied resource does not have the type "gd"
*/
public function setResource($resource) {
@@ -318,7 +318,7 @@ class OC_Image implements \OCP\IImage {
return;
}
// PHP 8 has real objects for GD stuff
- if (is_object($resource) && get_class($resource) === 'GdImage') {
+ if (is_object($resource) && get_class($resource) === \GdImage::class) {
$this->resource = $resource;
return;
}
@@ -326,7 +326,7 @@ class OC_Image implements \OCP\IImage {
}
/**
- * @return resource Returns the image resource in any.
+ * @return resource|\GdImage Returns the image resource in any.
*/
public function resource() {
return $this->resource;
@@ -536,7 +536,7 @@ class OC_Image implements \OCP\IImage {
* It is the responsibility of the caller to position the pointer at the correct place and to close the handle again.
*
* @param resource $handle
- * @return resource|false An image resource or false on error
+ * @return resource|\GdImage|false An image resource or false on error
*/
public function loadFromFileHandle($handle) {
$contents = stream_get_contents($handle);
@@ -550,7 +550,7 @@ class OC_Image implements \OCP\IImage {
* Loads an image from a local file.
*
* @param bool|string $imagePath The path to a local file.
- * @return bool|resource An image resource or false on error
+ * @return bool|resource|\GdImage An image resource or false on error
*/
public function loadFromFile($imagePath = false) {
// exif_imagetype throws "read error!" if file is less than 12 byte
@@ -666,17 +666,17 @@ class OC_Image implements \OCP\IImage {
* Loads an image from a string of data.
*
* @param string $str A string of image data as read from a file.
- * @return bool|resource An image resource or false on error
+ * @return bool|resource|\GdImage An image resource or false on error
*/
public function loadFromData($str) {
- if (is_resource($str)) {
+ if (!is_string($str)) {
return false;
}
$this->resource = @imagecreatefromstring($str);
if ($this->fileInfo) {
$this->mimeType = $this->fileInfo->buffer($str);
}
- if (is_resource($this->resource)) {
+ if ($this->valid()) {
imagealphablending($this->resource, false);
imagesavealpha($this->resource, true);
}
@@ -692,7 +692,7 @@ class OC_Image implements \OCP\IImage {
* Loads an image from a base64 encoded string.
*
* @param string $str A string base64 encoded string of image data.
- * @return bool|resource An image resource or false on error
+ * @return bool|resource|\GdImage An image resource or false on error
*/
public function loadFromBase64($str) {
if (!is_string($str)) {
@@ -722,7 +722,7 @@ class OC_Image implements \OCP\IImage {
* @param string $fileName <p>
* Path to the BMP image.
* </p>
- * @return bool|resource an image resource identifier on success, <b>FALSE</b> on errors.
+ * @return bool|resource|\GdImage an image resource identifier on success, <b>FALSE</b> on errors.
*/
private function imagecreatefrombmp($fileName) {
if (!($fh = fopen($fileName, 'rb'))) {
@@ -878,12 +878,12 @@ class OC_Image implements \OCP\IImage {
$result = $this->resizeNew($maxSize);
imagedestroy($this->resource);
$this->resource = $result;
- return is_resource($result);
+ return $this->valid();
}
/**
* @param $maxSize
- * @return resource | bool
+ * @return resource|bool|\GdImage
*/
private function resizeNew($maxSize) {
if (!$this->valid()) {
@@ -914,14 +914,14 @@ class OC_Image implements \OCP\IImage {
$result = $this->preciseResizeNew($width, $height);
imagedestroy($this->resource);
$this->resource = $result;
- return is_resource($result);
+ return $this->valid();
}
/**
* @param int $width
* @param int $height
- * @return resource | bool
+ * @return resource|bool|\GdImage
*/
public function preciseResizeNew(int $width, int $height) {
if (!$this->valid()) {
@@ -1023,7 +1023,7 @@ class OC_Image implements \OCP\IImage {
$result = $this->cropNew($x, $y, $w, $h);
imagedestroy($this->resource);
$this->resource = $result;
- return is_resource($result);
+ return $this->valid();
}
/**
@@ -1191,7 +1191,7 @@ if (!function_exists('imagebmp')) {
* @link http://www.programmierer-forum.de/imagebmp-gute-funktion-gefunden-t143716.htm
* @author mgutt <marc@gutt.it>
* @version 1.00
- * @param resource $im
+ * @param resource|\GdImage $im
* @param string $fileName [optional] <p>The path to save the file to.</p>
* @param int $bit [optional] <p>Bit depth, (default is 24).</p>
* @param int $compression [optional]
diff --git a/lib/public/IImage.php b/lib/public/IImage.php
index 459553de799..9d2b31e0e28 100644
--- a/lib/public/IImage.php
+++ b/lib/public/IImage.php
@@ -98,7 +98,7 @@ interface IImage {
public function save($filePath = null, $mimeType = null);
/**
- * @return resource Returns the image resource in any.
+ * @return resource|\GdImage Returns the image resource in any.
* @since 8.1.0
*/
public function resource();
diff --git a/psalm-ocp.xml b/psalm-ocp.xml
index 5574ae0fb5d..4519b7e9ca4 100644
--- a/psalm-ocp.xml
+++ b/psalm-ocp.xml
@@ -16,4 +16,12 @@
<extraFiles>
<directory name="3rdparty"/>
</extraFiles>
+ <issueHandlers>
+ <UndefinedDocblockClass>
+ <errorLevel type="suppress">
+ <!-- Classes from PHP>=8 -->
+ <referencedClass name="GdImage" />
+ </errorLevel>
+ </UndefinedDocblockClass>
+ </issueHandlers>
</psalm>
diff --git a/psalm.xml b/psalm.xml
index a075ceb24a7..4f75af61dde 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -81,6 +81,8 @@
<errorLevel type="suppress">
<referencedClass name="OCA\GroupFolders\Mount\GroupFolderStorage"/>
<referencedClass name="OCA\TwoFactorNextcloudNotification\Controller\APIController"/>
+ <!-- Classes from PHP>=8 (needed to be able to use \GdImage::class) -->
+ <referencedClass name="GdImage" />
</errorLevel>
</UndefinedClass>
<UndefinedFunction>
@@ -124,6 +126,8 @@
<!-- Helper classes for sharing API integration from other apps -->
<referencedClass name="OCA\Deck\Sharing\ShareAPIHelper" />
<referencedClass name="OCA\Talk\Share\Helper\DeletedShareAPIController" />
+ <!-- Classes from PHP>=8 -->
+ <referencedClass name="GdImage" />
</errorLevel>
</UndefinedDocblockClass>
</issueHandlers>
diff --git a/tests/lib/Avatar/UserAvatarTest.php b/tests/lib/Avatar/UserAvatarTest.php
index 3570f2017d5..7833e3a4953 100644
--- a/tests/lib/Avatar/UserAvatarTest.php
+++ b/tests/lib/Avatar/UserAvatarTest.php
@@ -52,10 +52,6 @@ class UserAvatarTest extends \Test\TestCase {
}
public function testGetNoAvatar() {
- if (PHP_MAJOR_VERSION > 7) {
- $this->markTestSkipped('Only run on php7');
- }
-
$file = $this->createMock(ISimpleFile::class);
$this->folder->method('newFile')
->willReturn($file);
@@ -91,10 +87,6 @@ class UserAvatarTest extends \Test\TestCase {
}
public function testGetAvatarSizeMatch() {
- if (PHP_MAJOR_VERSION > 7) {
- $this->markTestSkipped('Only run on php7');
- }
-
$this->folder->method('fileExists')
->willReturnMap([
['avatar.jpg', true],
@@ -112,10 +104,6 @@ class UserAvatarTest extends \Test\TestCase {
}
public function testGetAvatarSizeMinusOne() {
- if (PHP_MAJOR_VERSION > 7) {
- $this->markTestSkipped('Only run on php7');
- }
-
$this->folder->method('fileExists')
->willReturnMap([
['avatar.jpg', true],
@@ -132,10 +120,6 @@ class UserAvatarTest extends \Test\TestCase {
}
public function testGetAvatarNoSizeMatch() {
- if (PHP_MAJOR_VERSION > 7) {
- $this->markTestSkipped('Only run on php7');
- }
-
$this->folder->method('fileExists')
->willReturnMap([
['avatar.png', true],
@@ -200,10 +184,6 @@ class UserAvatarTest extends \Test\TestCase {
}
public function testSetAvatar() {
- if (PHP_MAJOR_VERSION > 7) {
- $this->markTestSkipped('Only run on php7');
- }
-
$avatarFileJPG = $this->createMock(File::class);
$avatarFileJPG->method('getName')
->willReturn('avatar.jpg');
diff --git a/tests/lib/ImageTest.php b/tests/lib/ImageTest.php
index ebf00392d87..5b83c4ac57f 100644
--- a/tests/lib/ImageTest.php
+++ b/tests/lib/ImageTest.php
@@ -20,10 +20,6 @@ class ImageTest extends \Test\TestCase {
}
public function testConstructDestruct() {
- if (PHP_MAJOR_VERSION > 7) {
- $this->markTestSkipped('Only run on php7');
- }
-
$img = new \OC_Image();
$img->loadFromFile(OC::$SERVERROOT.'/tests/data/testimage.png');
$this->assertInstanceOf('\OC_Image', $img);
@@ -51,10 +47,6 @@ class ImageTest extends \Test\TestCase {
}
public function testValid() {
- if (PHP_MAJOR_VERSION > 7) {
- $this->markTestSkipped('Only run on php7');
- }
-
$img = new \OC_Image();
$img->loadFromFile(OC::$SERVERROOT.'/tests/data/testimage.png');
$this->assertTrue($img->valid());
@@ -69,10 +61,6 @@ class ImageTest extends \Test\TestCase {
}
public function testMimeType() {
- if (PHP_MAJOR_VERSION > 7) {
- $this->markTestSkipped('Only run on php7');
- }
-
$img = new \OC_Image();
$img->loadFromFile(OC::$SERVERROOT.'/tests/data/testimage.png');
$this->assertEquals('image/png', $img->mimeType());
@@ -90,10 +78,6 @@ class ImageTest extends \Test\TestCase {
}
public function testWidth() {
- if (PHP_MAJOR_VERSION > 7) {
- $this->markTestSkipped('Only run on php7');
- }
-
$img = new \OC_Image();
$img->loadFromFile(OC::$SERVERROOT.'/tests/data/testimage.png');
$this->assertEquals(128, $img->width());
@@ -111,10 +95,6 @@ class ImageTest extends \Test\TestCase {
}
public function testHeight() {
- if (PHP_MAJOR_VERSION > 7) {
- $this->markTestSkipped('Only run on php7');
- }
-
$img = new \OC_Image();
$img->loadFromFile(OC::$SERVERROOT.'/tests/data/testimage.png');
$this->assertEquals(128, $img->height());
@@ -132,10 +112,6 @@ class ImageTest extends \Test\TestCase {
}
public function testSave() {
- if (PHP_MAJOR_VERSION > 7) {
- $this->markTestSkipped('Only run on php7');
- }
-
$img = new \OC_Image();
$img->loadFromFile(OC::$SERVERROOT.'/tests/data/testimage.png');
$img->resize(16);
@@ -150,10 +126,6 @@ class ImageTest extends \Test\TestCase {
}
public function testData() {
- if (PHP_MAJOR_VERSION > 7) {
- $this->markTestSkipped('Only run on php7');
- }
-
$img = new \OC_Image();
$img->loadFromFile(OC::$SERVERROOT.'/tests/data/testimage.png');
$raw = imagecreatefromstring(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.png'));
@@ -188,10 +160,6 @@ class ImageTest extends \Test\TestCase {
}
public function testDataNoResource() {
- if (PHP_MAJOR_VERSION > 7) {
- $this->markTestSkipped('Only run on php7');
- }
-
$img = new \OC_Image();
$this->assertNull($img->data());
}
@@ -200,10 +168,6 @@ class ImageTest extends \Test\TestCase {
* @depends testData
*/
public function testToString() {
- if (PHP_MAJOR_VERSION > 7) {
- $this->markTestSkipped('Only run on php7');
- }
-
$img = new \OC_Image();
$img->loadFromFile(OC::$SERVERROOT.'/tests/data/testimage.png');
$expected = base64_encode($img->data());
@@ -221,10 +185,6 @@ class ImageTest extends \Test\TestCase {
}
public function testResize() {
- if (PHP_MAJOR_VERSION > 7) {
- $this->markTestSkipped('Only run on php7');
- }
-
$img = new \OC_Image();
$img->loadFromFile(OC::$SERVERROOT.'/tests/data/testimage.png');
$this->assertTrue($img->resize(32));
@@ -245,10 +205,6 @@ class ImageTest extends \Test\TestCase {
}
public function testPreciseResize() {
- if (PHP_MAJOR_VERSION > 7) {
- $this->markTestSkipped('Only run on php7');
- }
-
$img = new \OC_Image();
$img->loadFromFile(OC::$SERVERROOT.'/tests/data/testimage.png');
$this->assertTrue($img->preciseResize(128, 512));
@@ -269,10 +225,6 @@ class ImageTest extends \Test\TestCase {
}
public function testCenterCrop() {
- if (PHP_MAJOR_VERSION > 7) {
- $this->markTestSkipped('Only run on php7');
- }
-
$img = new \OC_Image();
$img->loadFromFile(OC::$SERVERROOT.'/tests/data/testimage.png');
$img->centerCrop();
@@ -293,10 +245,6 @@ class ImageTest extends \Test\TestCase {
}
public function testCrop() {
- if (PHP_MAJOR_VERSION > 7) {
- $this->markTestSkipped('Only run on php7');
- }
-
$img = new \OC_Image();
$img->loadFromFile(OC::$SERVERROOT.'/tests/data/testimage.png');
$this->assertTrue($img->crop(0, 0, 50, 20));
@@ -332,10 +280,6 @@ class ImageTest extends \Test\TestCase {
* @param int[] $expected
*/
public function testFitIn($filename, $asked, $expected) {
- if (PHP_MAJOR_VERSION > 7) {
- $this->markTestSkipped('Only run on php7');
- }
-
$img = new \OC_Image();
$img->loadFromFile(OC::$SERVERROOT . '/tests/data/' . $filename);
$this->assertTrue($img->fitIn($asked[0], $asked[1]));
@@ -359,10 +303,6 @@ class ImageTest extends \Test\TestCase {
* @param string $filename
*/
public function testScaleDownToFitWhenSmallerAlready($filename) {
- if (PHP_MAJOR_VERSION > 7) {
- $this->markTestSkipped('Only run on php7');
- }
-
$img = new \OC_Image();
$img->loadFromFile(OC::$SERVERROOT.'/tests/data/' . $filename);
$currentWidth = $img->width();
@@ -396,10 +336,6 @@ class ImageTest extends \Test\TestCase {
* @param int[] $expected
*/
public function testScaleDownWhenBigger($filename, $asked, $expected) {
- if (PHP_MAJOR_VERSION > 7) {
- $this->markTestSkipped('Only run on php7');
- }
-
$img = new \OC_Image();
$img->loadFromFile(OC::$SERVERROOT.'/tests/data/' . $filename);
//$this->assertTrue($img->scaleDownToFit($asked[0], $asked[1]));
@@ -420,10 +356,6 @@ class ImageTest extends \Test\TestCase {
* @dataProvider convertDataProvider
*/
public function testConvert($mimeType) {
- if (PHP_MAJOR_VERSION > 7) {
- $this->markTestSkipped('Only run on php7');
- }
-
$img = new \OC_Image();
$img->loadFromFile(OC::$SERVERROOT.'/tests/data/testimage.png');
$tempFile = tempnam(sys_get_temp_dir(), 'img-test');
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-18 15:12:34 +0000