From c4d275b7d5e7049aac66c6cc185013e01d4e3624 Mon Sep 17 00:00:00 2001
From: Aaron Schulz <aschulz@wikimedia.org>
Date: Tue, 20 Dec 2016 22:21:34 -0800
Subject: [PATCH] Remove FileRepoStatus references

Change-Id: I03190273670f5c255423cf59019cbf12220c5498
---
 includes/filerepo/FileRepo.php                     |  4 ++--
 includes/filerepo/file/File.php                    |  2 +-
 includes/filerepo/file/LocalFile.php               | 10 +++++-----
 includes/upload/UploadFromChunks.php               |  4 ++--
 tests/phpunit/includes/filerepo/StoreBatchTest.php |  2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/includes/filerepo/FileRepo.php b/includes/filerepo/FileRepo.php
index be37011c65..0e4b2f0b50 100644
--- a/includes/filerepo/FileRepo.php
+++ b/includes/filerepo/FileRepo.php
@@ -1059,7 +1059,7 @@ class FileRepo {
 
 	/**
 	 * Pick a random name in the temp zone and store a file to it.
-	 * Returns a FileRepoStatus object with the file Virtual URL in the value,
+	 * Returns a Status object with the file Virtual URL in the value,
 	 * file can later be disposed using FileRepo::freeTemp().
 	 *
 	 * @param string $originalName The base name of the file as specified
@@ -1143,7 +1143,7 @@ class FileRepo {
 	 * Copy or move a file either from a storage path, virtual URL,
 	 * or file system path, into this repository at the specified destination location.
 	 *
-	 * Returns a FileRepoStatus object. On success, the value contains "new" or
+	 * Returns a Status object. On success, the value contains "new" or
 	 * "archived", to indicate whether the file was new with that name.
 	 *
 	 * Options to $options include:
diff --git a/includes/filerepo/file/File.php b/includes/filerepo/file/File.php
index 8be662f1f4..be784626d9 100644
--- a/includes/filerepo/file/File.php
+++ b/includes/filerepo/file/File.php
@@ -1792,7 +1792,7 @@ abstract class File implements IDBAccessObject {
 
 	/**
 	 * Move or copy a file to its public location. If a file exists at the
-	 * destination, move it to an archive. Returns a FileRepoStatus object with
+	 * destination, move it to an archive. Returns a Status object with
 	 * the archive name in the "value" member on success.
 	 *
 	 * The archive name should be passed through to recordUpload for database
diff --git a/includes/filerepo/file/LocalFile.php b/includes/filerepo/file/LocalFile.php
index 011ba87ee7..16fe72d37c 100644
--- a/includes/filerepo/file/LocalFile.php
+++ b/includes/filerepo/file/LocalFile.php
@@ -1572,7 +1572,7 @@ class LocalFile extends File {
 
 	/**
 	 * Move or copy a file to its public location. If a file exists at the
-	 * destination, move it to an archive. Returns a FileRepoStatus object with
+	 * destination, move it to an archive. Returns a Status object with
 	 * the archive name in the "value" member on success.
 	 *
 	 * The archive name should be passed through to recordUpload for database
@@ -1590,7 +1590,7 @@ class LocalFile extends File {
 	}
 
 	/**
-	 * Move or copy a file to a specified location. Returns a FileRepoStatus
+	 * Move or copy a file to a specified location. Returns a Status
 	 * object with the archive name in the "value" member on success.
 	 *
 	 * The archive name should be passed through to recordUpload for database
@@ -2086,7 +2086,7 @@ class LocalFileDeleteBatch {
 	/** @var bool Whether to suppress all suppressable fields when deleting */
 	private $suppress;
 
-	/** @var FileRepoStatus */
+	/** @var Status */
 	private $status;
 
 	/** @var User */
@@ -2993,7 +2993,7 @@ class LocalFileMoveBatch {
 	}
 
 	/**
-	 * Verify the database updates and return a new FileRepoStatus indicating how
+	 * Verify the database updates and return a new Status indicating how
 	 * many rows would be updated.
 	 *
 	 * @return Status
@@ -3036,7 +3036,7 @@ class LocalFileMoveBatch {
 	}
 
 	/**
-	 * Do the database updates and return a new FileRepoStatus indicating how
+	 * Do the database updates and return a new Status indicating how
 	 * many rows where updated.
 	 */
 	protected function doDBUpdates() {
diff --git a/includes/upload/UploadFromChunks.php b/includes/upload/UploadFromChunks.php
index 449fc05ec4..03b9821e77 100644
--- a/includes/upload/UploadFromChunks.php
+++ b/includes/upload/UploadFromChunks.php
@@ -113,7 +113,7 @@ class UploadFromChunks extends UploadFromFile {
 
 	/**
 	 * Append the final chunk and ready file for parent::performUpload()
-	 * @return FileRepoStatus
+	 * @return Status
 	 */
 	public function concatenateChunks() {
 		$chunkIndex = $this->getChunkIndex();
@@ -313,7 +313,7 @@ class UploadFromChunks extends UploadFromFile {
 	 *
 	 * @param string $chunkPath
 	 * @throws UploadChunkFileException
-	 * @return FileRepoStatus
+	 * @return Status
 	 */
 	private function outputChunk( $chunkPath ) {
 		// Key is fileKey + chunk index
diff --git a/tests/phpunit/includes/filerepo/StoreBatchTest.php b/tests/phpunit/includes/filerepo/StoreBatchTest.php
index 4dc8fecd7e..baf8687516 100644
--- a/tests/phpunit/includes/filerepo/StoreBatchTest.php
+++ b/tests/phpunit/includes/filerepo/StoreBatchTest.php
@@ -63,7 +63,7 @@ class StoreBatchTest extends MediaWikiTestCase {
 	 * @param string $originalName The title of the image
 	 * @param string $srcPath The filepath or virtual URL
 	 * @param int $flags Flags to pass into repo::store().
-	 * @return FileRepoStatus
+	 * @return Status
 	 */
 	private function storeit( $originalName, $srcPath, $flags ) {
 		$hashPath = $this->repo->getHashPath( $originalName );
-- 
2.20.1