refactor(image): modernize GD image helper and fix minor handling inconsistencies

apps/settings/lib/UserMigration/AccountMigrator.php

@@ -143,9 +143,11 @@ public function import(IUser $user, IImportSource $importSource, OutputInterface
 			$importPath = AccountMigrator::PATH_ROOT . reset($avatarFiles);
 
 			$output->writeln('Importing avatar from ' . $importPath . '…');
-			$stream = $importSource->getFileAsStream($importPath);
+			$data = $importSource->getFileContents($importPath);
 			$image = new Image();
-			$image->loadFromFileHandle($stream);
+			if ($image->loadFromData($data) === false) {
+				throw new AccountMigratorException('Failed to load avatar');
+			}
 
 			try {
 				$avatar = $this->avatarManager->getAvatar($user->getUID());

apps/theming/lib/Service/BackgroundService.php

@@ -22,6 +22,7 @@
 use OCP\IAppConfig;
 use OCP\IConfig;
 use OCP\Image;
+use OCP\IImage;
 use OCP\Lock\LockedException;
 use OCP\PreConditionNotMetException;
 use RuntimeException;
@@ -252,8 +253,8 @@ public function recalculateMeanColor(?string $userId = null): void {
 		$userId = $userId ?? $this->getUserId();
 
 		$image = new Image();
-		$handle = $this->getAppDataFolder($userId)->getFile('background.jpg')->read();
-		if ($handle === false || $image->loadFromFileHandle($handle) === false) {
+		$data = $this->getAppDataFolder($userId)->getFile('background.jpg')->getContent();
+		if ($image->loadFromData($data) === false) {
 			throw new InvalidArgumentException('Invalid image file');
 		}
 
@@ -322,23 +323,27 @@ public function getBackground(?string $userId = null): ?ISimpleFile {
 	 */
 	public function setGlobalBackground($path): ?string {
 		$image = new Image();
-		$handle = is_resource($path) ? $path : fopen($path, 'rb');
 
-		if ($handle && $image->loadFromFileHandle($handle) !== false) {
+		$rawImageData = is_resource($path)
+			? stream_get_contents($path)
+			: file_get_contents($path);
+
+		if ($rawImageData !== false && $image->loadFromData($rawImageData) !== false) {
 			$meanColor = $this->calculateMeanColor($image);
 			if ($meanColor !== false) {
 				$this->appConfig->setValueString(Application::APP_ID, 'background_color', $meanColor);
 				return $meanColor;
 			}
 		}
+
 		return null;
 	}
 
 	/**
-	 * Calculate mean color of an given image
+	 * Calculate mean color of a given image
 	 * It only takes the upper part into account so that a matching text color can be derived for the app menu
 	 */
-	private function calculateMeanColor(Image $image): false|string {
+	private function calculateMeanColor(IImage $image): false|string {
 		/**
 		 * Small helper to ensure one channel is returned as 8byte hex
 		 */
@@ -352,15 +357,18 @@ function toHex(int $channel): string {
 			};
 		}
 
-		$tempImage = new Image();
-
 		// Crop to only analyze top bar
-		$resource = $image->cropNew(0, 0, $image->width(), min(max(50, (int)($image->height() * 0.125)), $image->height()));
-		if ($resource === false) {
+		$tempImage = $image->cropCopy(
+			0,
+			0,
+			$image->width(),
+			min(max(50, (int)($image->height() * 0.125)), $image->height()),
+		);
+
+		if (!$tempImage->valid()) {
 			return false;
 		}
 
-		$tempImage->setResource($resource);
 		if (!$tempImage->preciseResize(100, 7)) {
 			return false;
 		}

apps/user_ldap/lib/User/User.php

@@ -637,7 +637,7 @@ public function updateAvatar(bool $force = false): bool {
 			return false;
 		}
 
-		if (!$this->image->loadFromBase64(base64_encode($avatarImage))) {
+		if (!$this->image->loadFromData($avatarImage)) {
 			return false;
 		}
 

apps/user_ldap/tests/User/UserTest.php

@@ -479,7 +479,7 @@ public function XtestUpdateAvatarJpegPhotoProvided() {
 
 		$this->image->expects($this->once())
 			->method('loadFromBase64')
-			->willReturn('imageResource');
+			->willReturn(imagecreatetruecolor(1, 1));
 		$this->image->expects($this->once())
 			->method('valid')
 			->willReturn(true);
@@ -531,7 +531,7 @@ public function testUpdateAvatarKnownJpegPhotoProvided(): void {
 
 		$this->image->expects($this->once())
 			->method('loadFromBase64')
-			->willReturn('imageResource');
+			->willReturn(imagecreatetruecolor(1, 1));
 		$this->image->expects($this->never())
 			->method('valid');
 		$this->image->expects($this->never())
@@ -590,7 +590,7 @@ public function XtestUpdateAvatarThumbnailPhotoProvided() {
 
 		$this->image->expects($this->once())
 			->method('loadFromBase64')
-			->willReturn('imageResource');
+			->willReturn(imagecreatetruecolor(1, 1));
 		$this->image->expects($this->once())
 			->method('valid')
 			->willReturn(true);
@@ -697,7 +697,7 @@ public function XtestUpdateAvatarUnsupportedThumbnailPhotoProvided() {
 
 		$this->image->expects($this->once())
 			->method('loadFromBase64')
-			->willReturn('imageResource');
+			->willReturn(imagecreatetruecolor(1, 1));
 		$this->image->expects($this->once())
 			->method('valid')
 			->willReturn(true);

lib/private/Avatar/UserAvatar.php

@@ -92,7 +92,10 @@ private function getAvatarImage($data): IImage {
 		) {
 			$img->setResource($data);
 		} elseif (is_resource($data)) {
-			$img->loadFromFileHandle($data);
+			$contents = stream_get_contents($data);
+			if ($contents !== false) {
+				$img->loadFromData($contents);
+			}
 		} else {
 			try {
 				// detect if it is a path or maybe the images as string