From 03e4248def56120ca8856e5ffdfb7abe40fe2a26 Mon Sep 17 00:00:00 2001
From: Sam Reed <reedy@users.mediawiki.org>
Date: Wed, 22 Dec 2010 00:25:16 +0000
Subject: [PATCH] Properly qualify usage of class constants

---
 includes/upload/UploadFromFile.php    |  2 +-
 includes/upload/UploadFromStash.php   |  6 +++---
 includes/upload/UploadFromUrl.php     |  2 +-
 tests/phpunit/includes/UploadTest.php | 14 +++++++-------
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/includes/upload/UploadFromFile.php b/includes/upload/UploadFromFile.php
index 79932088a4..e67ec191b0 100644
--- a/includes/upload/UploadFromFile.php
+++ b/includes/upload/UploadFromFile.php
@@ -40,7 +40,7 @@ class UploadFromFile extends UploadBase {
 			if ( $this->mUpload->isIniSizeOverflow() ) {
 				global $wgMaxUploadSize;
 				return array( 
-					'status' => self::FILE_TOO_LARGE,
+					'status' => UploadBase::FILE_TOO_LARGE,
 					'max' => min( 
 						$wgMaxUploadSize, 
 						wfShorthandToInteger( ini_get( 'upload_max_filesize' ) ), 
diff --git a/includes/upload/UploadFromStash.php b/includes/upload/UploadFromStash.php
index 646a6fc5a7..9b386b9b27 100644
--- a/includes/upload/UploadFromStash.php
+++ b/includes/upload/UploadFromStash.php
@@ -13,11 +13,11 @@ class UploadFromStash extends UploadBase {
 			is_array( $sessionData ) &&
 			isset( $sessionData[$key] ) &&
 			isset( $sessionData[$key]['version'] ) &&
-			$sessionData[$key]['version'] == self::SESSION_VERSION;
+			$sessionData[$key]['version'] == UploadBase::SESSION_VERSION;
 	}
 
 	public static function isValidRequest( $request ) {
-		$sessionData = $request->getSessionData( self::SESSION_KEYNAME );
+		$sessionData = $request->getSessionData( UploadBase::SESSION_KEYNAME );
 		return self::isValidSessionKey(
 			$request->getInt( 'wpSessionKey' ),
 			$sessionData
@@ -45,7 +45,7 @@ class UploadFromStash extends UploadBase {
 
 	public function initializeFromRequest( &$request ) {
 		$sessionKey = $request->getInt( 'wpSessionKey' );
-		$sessionData = $request->getSessionData( self::SESSION_KEYNAME );
+		$sessionData = $request->getSessionData( UploadBase::SESSION_KEYNAME );
 
 		$desiredDestName = $request->getText( 'wpDestFile' );
 		if( !$desiredDestName )
diff --git a/includes/upload/UploadFromUrl.php b/includes/upload/UploadFromUrl.php
index 907e09634d..01f201dbf2 100644
--- a/includes/upload/UploadFromUrl.php
+++ b/includes/upload/UploadFromUrl.php
@@ -142,7 +142,7 @@ class UploadFromUrl extends UploadBase {
 	 */
 	public function verifyUpload() {
 		if ( $this->mAsync ) {
-			return array( 'status' => self::OK );
+			return array( 'status' => UploadBase::OK );
 		}
 		return parent::verifyUpload();
 	}
diff --git a/tests/phpunit/includes/UploadTest.php b/tests/phpunit/includes/UploadTest.php
index cf8e4d3cc7..d9edd8eaf8 100644
--- a/tests/phpunit/includes/UploadTest.php
+++ b/tests/phpunit/includes/UploadTest.php
@@ -21,27 +21,27 @@ class UploadTest extends PHPUnit_Framework_TestCase {
 
 		/* Test a valid title */
 		$this->assertUploadTitleAndCode( 'ValidTitle.jpg',
-			'ValidTitle.jpg', UploadTestHandler::OK,
+			'ValidTitle.jpg', UploadBase::OK,
 			'upload valid title' );
 
 		/* A title with a slash */
 		$this->assertUploadTitleAndCode( 'A/B.jpg',
-			'B.jpg', UploadTestHandler::OK,
+			'B.jpg', UploadBase::OK,
 			'upload title with slash' );
 
 		/* A title with illegal char */
 		$this->assertUploadTitleAndCode( 'A:B.jpg',
-			'A-B.jpg', UploadTestHandler::OK,
+			'A-B.jpg', UploadBase::OK,
 			'upload title with colon' );
 
 		/* A title without extension */
 		$this->assertUploadTitleAndCode( 'A',
-			null, UploadTestHandler::FILETYPE_MISSING,
+			null, UploadBase::FILETYPE_MISSING,
 			'upload title without extension' );
 
 		/* A title with no basename */
 		$this->assertUploadTitleAndCode( '.jpg',
-			null, UploadTestHandler::MIN_LENGTH_PARTNAME,
+			null, UploadBase::MIN_LENGTH_PARTNAME,
 			'upload title without basename' );
 
 	}
@@ -56,7 +56,7 @@ class UploadTest extends PHPUnit_Framework_TestCase {
 			"$msg code" );
 
 		/* If we expect a valid title, check the title itself. */
-		if ( $code == UploadTestHandler::OK ) {
+		if ( $code == UploadBase::OK ) {
 			$this->assertEquals( $dstFilename,
 				$this->upload->getTitle()->getText(),
 				"$msg text" );
@@ -70,7 +70,7 @@ class UploadTest extends PHPUnit_Framework_TestCase {
 		/* Setup with zero file size */
 		$this->upload->initializePathInfo( '', '', 0 );
 		$result = $this->upload->verifyUpload();
-		$this->assertEquals( UploadTestHandler::EMPTY_FILE,
+		$this->assertEquals( UploadBase::EMPTY_FILE,
 			$result['status'],
 			'upload empty file' );
 	}
-- 
2.20.1