From 497fddfe11e9d0ed1713d4325b48cc8aa2128ac1 Mon Sep 17 00:00:00 2001 From: umherirrender Date: Fri, 7 Dec 2012 09:18:41 +0100 Subject: [PATCH] Fix method declaration in UploadFromStash 1) UploadStashTest::testValidRequest Declaration of UploadFromStash::stashFile() should be compatible with that of UploadBase::stashFile() Change-Id: If94ab8b718e23b50a1b67ba0fac3ea24926d5950 --- includes/upload/UploadFromStash.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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; } -- 2.20.1