From: Umherirrender <umherirrender_de.wp@web.de>
Date: Tue, 4 Jun 2019 19:33:37 +0000 (+0200)
Subject: Allow int as return type of MediaHandler::isMetadataValid
X-Git-Tag: 1.34.0-rc.0~1525^2
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dcompta/operations/supprimer.php?a=commitdiff_plain;h=1ba94a9e5b2ee3e2623d42080a5cc867fc69c92b;p=lhc%2Fweb%2Fwiklou.git

Allow int as return type of MediaHandler::isMetadataValid

MediaHandler::METADATA_COMPATIBLE is a int,
which is a possible return value here

Change-Id: Ia84139ee8e09839e1f46a6d34738612dfd365415
---

diff --git a/includes/media/MediaHandler.php b/includes/media/MediaHandler.php
index 1a96c1da43..7dd04918e6 100644
--- a/includes/media/MediaHandler.php
+++ b/includes/media/MediaHandler.php
@@ -193,7 +193,7 @@ abstract class MediaHandler {
 	 *  performance problems.
 	 * @param File $image
 	 * @param string $metadata The metadata in serialized form
-	 * @return bool
+	 * @return bool|int
 	 */
 	public function isMetadataValid( $image, $metadata ) {
 		return self::METADATA_GOOD;
diff --git a/includes/media/XCFHandler.php b/includes/media/XCFHandler.php
index e47cc371aa..e2cc1b2c8b 100644
--- a/includes/media/XCFHandler.php
+++ b/includes/media/XCFHandler.php
@@ -186,7 +186,7 @@ class XCFHandler extends BitmapHandler {
 	 *
 	 * @param File $file The file object for the file in question
 	 * @param string $metadata Serialized metadata
-	 * @return bool One of the self::METADATA_(BAD|GOOD|COMPATIBLE) constants
+	 * @return bool|int One of the self::METADATA_(BAD|GOOD|COMPATIBLE) constants
 	 */
 	public function isMetadataValid( $file, $metadata ) {
 		if ( !$metadata ) {