X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=blobdiff_plain;f=includes%2Fupload%2FUploadBase.php;h=ea805fb970ddd801bc8bd2c26c0dee266cbcff09;hb=c6ad2554f40f8ebbe9e38ac64ea933076f348729;hp=87b96acc791ba2a7bc041c7d5b00aac5781b3c8d;hpb=23b7f3bbd553183a21d785bae175249efad5ee5d;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/upload/UploadBase.php b/includes/upload/UploadBase.php
index 87b96acc79..ea805fb970 100644
--- a/includes/upload/UploadBase.php
+++ b/includes/upload/UploadBase.php
@@ -98,11 +98,7 @@ abstract class UploadBase {
 			self::WINDOWS_NONASCII_FILENAME => 'windows-nonascii-filename',
 			self::FILENAME_TOO_LONG => 'filename-toolong',
 		];
-		if ( isset( $code_to_status[$error] ) ) {
-			return $code_to_status[$error];
-		}
-
-		return 'unknown-error';
+		return $code_to_status[$error] ?? 'unknown-error';
 	}
 
 	/**
@@ -247,7 +243,7 @@ abstract class UploadBase {
 
 	/**
 	 * @param string $tempPath File system path to temporary file containing the upload
-	 * @param int $fileSize
+	 * @param int|null $fileSize
 	 */
 	protected function setTempFile( $tempPath, $fileSize = null ) {
 		$this->mTempPath = $tempPath;
@@ -1103,7 +1099,7 @@ abstract class UploadBase {
 	 * file again.
 	 *
 	 * @deprecated since 1.28 Use tryStashFile() instead
-	 * @param User $user
+	 * @param User|null $user
 	 * @return UploadStashFile Stashed file
 	 * @throws UploadStashBadPathException
 	 * @throws UploadStashFileException
@@ -1116,7 +1112,7 @@ abstract class UploadBase {
 	/**
 	 * Implementation for stashFile() and tryStashFile().
 	 *
-	 * @param User $user
+	 * @param User|null $user
 	 * @return UploadStashFile Stashed file
 	 */
 	protected function doStashFile( User $user = null ) {
@@ -1529,7 +1525,7 @@ abstract class UploadBase {
 	 * @todo Replace this with a whitelist filter!
 	 * @param string $element
 	 * @param array $attribs
-	 * @param array $data
+	 * @param array|null $data
 	 * @return bool
 	 */
 	public function checkSvgScriptCallback( $element, $attribs, $data = null ) {