Tweak documentation

Fix constant use in UploadTest

diff --git a/includes/filerepo/FileRepo.php b/includes/filerepo/FileRepo.php
index 6077722..eced312 100644 (file)
--- a/includes/filerepo/FileRepo.php
+++ b/includes/filerepo/FileRepo.php
@@ -701,6 +701,8 @@ abstract class FileRepo {
        
        /**
         * Get an UploadStash associated with this repo.
+        *
+        * @return UploadStash
         */
        function getUploadStash() {
                return new UploadStash( $this );

diff --git a/includes/upload/UploadBase.php b/includes/upload/UploadBase.php
index 037aa83..fdbd0fc 100644 (file)
--- a/includes/upload/UploadBase.php
+++ b/includes/upload/UploadBase.php
@@ -707,7 +707,7 @@ abstract class UploadBase {
         * API request to find this stashed file again.
         *
         * @param $key String: (optional) the session key used to find the file info again. If not supplied, a key will be autogenerated.
-        * @return File stashed file
+        * @return UploadStashFile stashed file
         */
        public function stashSessionFile( $key = null ) { 
                $stash = RepoGroup::singleton()->getLocalRepo()->getUploadStash();

diff --git a/tests/phpunit/includes/UploadTest.php b/tests/phpunit/includes/UploadTest.php
index ebec1b1..da19c90 100644 (file)
--- a/tests/phpunit/includes/UploadTest.php
+++ b/tests/phpunit/includes/UploadTest.php
@@ -106,7 +106,7 @@ class UploadTest extends MediaWikiTestCase {
                unlink( $filename );
 
                $this->assertEquals(
-                       array( 'status' => UploadTestHandler::OK ), $result );
+                       array( 'status' => UploadBase::OK ), $result );
 
                $wgMaxUploadSize = $savedGlobal;  // restore global
        }