From: umherirrender <umherirrender_de.wp@web.de>
Date: Fri, 7 Dec 2012 08:18:41 +0000 (+0100)
Subject: Fix method declaration in UploadFromStash
X-Git-Tag: 1.31.0-rc.0~21395^2
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/modifier.php?a=commitdiff_plain;h=497fddfe11e9d0ed1713d4325b48cc8aa2128ac1;p=lhc%2Fweb%2Fwiklou.git

Fix method declaration in UploadFromStash

1) UploadStashTest::testValidRequest
Declaration of UploadFromStash::stashFile() should be compatible with
that of UploadBase::stashFile()

Change-Id: If94ab8b718e23b50a1b67ba0fac3ea24926d5950
---

diff --git a/includes/upload/UploadFromStash.php b/includes/upload/UploadFromStash.php
index 55209d4840..c857f25466 100644
--- a/includes/upload/UploadFromStash.php
+++ b/includes/upload/UploadFromStash.php
@@ -141,12 +141,13 @@ class UploadFromStash extends UploadBase {
 	/**
 	 * Stash the file.
 	 *
+	 * @param $user User
 	 * @return UploadStashFile
 	 */
-	public function stashFile() {
+	public function stashFile( User $user = null ) {
 		// replace mLocalFile with an instance of UploadStashFile, which adds some methods
 		// that are useful for stashed files.
-		$this->mLocalFile = parent::stashFile();
+		$this->mLocalFile = parent::stashFile( $user );
 		return $this->mLocalFile;
 	}