Merge pull request #47676 from nextcloud/fix/ocp/image-interface

lib/private/Image.php

@@ -779,9 +779,7 @@ public function loadFromFile($imagePath = false) {
 	}
 
 	/**
-	 * Loads an image from a string of data.
-	 *
-	 * @param string $str A string of image data as read from a file.
+	 * @inheritDoc
 	 */
 	public function loadFromData(string $str): GdImage|false {
 		if (!$this->checkImageDataSize($str)) {

lib/private/StreamImage.php

@@ -133,4 +133,12 @@ public function preciseResizeCopy(int $width, int $height): IImage {
 	public function resizeCopy(int $maxSize): IImage {
 		throw new \BadMethodCallException('Not implemented');
 	}
+
+	public function loadFromData(string $str): \GdImage|false {
+		throw new \BadMethodCallException('Not implemented');
+	}
+
+	public function readExif(string $data): void {
+		throw new \BadMethodCallException('Not implemented');
+	}
 }

lib/public/IImage.php

@@ -8,6 +8,8 @@
  */
 namespace OCP;
 
+use GdImage;
+
 /**
  * Class for basic image manipulation
  * @since 8.1.0
@@ -202,4 +204,22 @@ public function preciseResizeCopy(int $width, int $height): IImage;
 	 * @since 19.0.0
 	 */
 	public function resizeCopy(int $maxSize): IImage;
+
+	/**
+	 * Loads an image from a string of data.
+	 *
+	 * @param string $str A string of image data as read from a file.
+	 *
+	 * @since 31.0.0
+	 */
+	public function loadFromData(string $str): GdImage|false;
+
+	/**
+	 * Reads the EXIF data for an image.
+	 *
+	 * @param string $data EXIF data
+	 *
+	 * @since 31.0.0
+	 */
+	public function readExif(string $data): void;
 }

lib/public/Image.php

@@ -14,5 +14,11 @@
  * This class provides functions to handle images
  * @since 6.0.0
  */
-class Image extends \OC\Image {
+class Image extends \OC\Image implements \OCP\IImage {
+	/**
+	 * @since 31.0.0
+	 */
+	public function __construct() {
+		parent::__construct();
+	}
 }