Browse Source

fix: use \OCP\Image instead of \OC_Image

Signed-off-by: Antreesy <antreesy.web@gmail.com>

Signed-off-by: Alexander Piskun <bigcat88@icloud.com>
pull/13207/head
Antreesy 1 year ago
parent
commit
d397a93771
  1. 2
      lib/Controller/TempAvatarController.php
  2. 4
      lib/Service/AvatarService.php
  3. 4
      tests/psalm-baseline.xml

2
lib/Controller/TempAvatarController.php

@ -74,7 +74,7 @@ class TempAvatarController extends OCSController {
}
try {
$image = new \OC_Image();
$image = new \OCP\Image();
$image->loadFromData($content);
$image->readExif($content);
$image->fixOrientation();

4
lib/Service/AvatarService.php

@ -62,7 +62,7 @@ class AvatarService {
$content = file_get_contents($file['tmp_name']);
unlink($file['tmp_name']);
$image = new \OC_Image();
$image = new \OCP\Image();
$image->loadFromData($content);
$image->readExif($content);
$this->setAvatar($room, $image);
@ -98,7 +98,7 @@ class AvatarService {
$this->roomService->setAvatar($room, $avatarName);
}
public function setAvatar(Room $room, \OC_Image $image): void {
public function setAvatar(Room $room, \OCP\Image $image): void {
if ($room->getType() === Room::TYPE_ONE_TO_ONE || $room->getType() === Room::TYPE_ONE_TO_ONE_FORMER) {
throw new InvalidArgumentException($this->l->t('One-to-one rooms always need to show the other users avatar'));
}

4
tests/psalm-baseline.xml

@ -67,9 +67,11 @@
</UndefinedClass>
</file>
<file src="lib/Service/AvatarService.php">
<MissingDependency>
<code><![CDATA[\OCP\Image]]></code>
</MissingDependency>
<UndefinedClass>
<code><![CDATA[Filesystem]]></code>
<code><![CDATA[\OC_Image]]></code>
</UndefinedClass>
</file>
<file src="lib/Service/RecordingService.php">

Loading…
Cancel
Save