Merge pull request #13207 from nextcloud/fix/noid/use-ocp-image

nextcloud · Sep 4, 2024 · cf99ec2 · cf99ec2
2 parents 52082e0 + d397a93
commit cf99ec2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/lib/Controller/TempAvatarController.php b/lib/Controller/TempAvatarController.php
@@ -74,7 +74,7 @@ public function postAvatar(): DataResponse {
 		}
 
 		try {
-			$image = new \OC_Image();
+			$image = new \OCP\Image();
 			$image->loadFromData($content);
 			$image->readExif($content);
 			$image->fixOrientation();

diff --git a/lib/Service/AvatarService.php b/lib/Service/AvatarService.php
@@ -62,7 +62,7 @@ public function setAvatarFromRequest(Room $room, ?array $file): void {
 
 		$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 @@ public function setAvatarFromEmoji(Room $room, string $emoji, ?string $color): v
 		$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'));
 		}

diff --git a/tests/psalm-baseline.xml b/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">