Aaron Schulz has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/328464 )
Change subject: Remove FileRepoStatus references
......................................................................
Remove FileRepoStatus references
Change-Id: I03190273670f5c255423cf59019cbf12220c5498
---
D README.mediawiki
M includes/filerepo/FileRepo.php
M includes/filerepo/file/File.php
M includes/filerepo/file/LocalFile.php
M includes/upload/UploadFromChunks.php
M tests/phpunit/includes/filerepo/StoreBatchTest.php
6 files changed, 11 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/64/328464/1
diff --git a/README.mediawiki b/README.mediawiki
deleted file mode 120000
index 100b938..0000000
--- a/README.mediawiki
+++ /dev/null
@@ -1 +0,0 @@
-README
\ No newline at end of file
diff --git a/includes/filerepo/FileRepo.php b/includes/filerepo/FileRepo.php
index be37011..0e4b2f0 100644
--- a/includes/filerepo/FileRepo.php
+++ b/includes/filerepo/FileRepo.php
@@ -1059,7 +1059,7 @@
/**
* 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 @@
* 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 8be662f..be78462 100644
--- a/includes/filerepo/file/File.php
+++ b/includes/filerepo/file/File.php
@@ -1792,7 +1792,7 @@
/**
* 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 011ba87..16fe72d 100644
--- a/includes/filerepo/file/LocalFile.php
+++ b/includes/filerepo/file/LocalFile.php
@@ -1572,7 +1572,7 @@
/**
* 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 @@
}
/**
- * 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 @@
/** @var bool Whether to suppress all suppressable fields when deleting
*/
private $suppress;
- /** @var FileRepoStatus */
+ /** @var Status */
private $status;
/** @var User */
@@ -2993,7 +2993,7 @@
}
/**
- * 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 @@
}
/**
- * 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 449fc05..03b9821 100644
--- a/includes/upload/UploadFromChunks.php
+++ b/includes/upload/UploadFromChunks.php
@@ -113,7 +113,7 @@
/**
* Append the final chunk and ready file for parent::performUpload()
- * @return FileRepoStatus
+ * @return Status
*/
public function concatenateChunks() {
$chunkIndex = $this->getChunkIndex();
@@ -313,7 +313,7 @@
*
* @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 4dc8fec..baf8687 100644
--- a/tests/phpunit/includes/filerepo/StoreBatchTest.php
+++ b/tests/phpunit/includes/filerepo/StoreBatchTest.php
@@ -63,7 +63,7 @@
* @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 );
--
To view, visit https://gerrit.wikimedia.org/r/328464
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I03190273670f5c255423cf59019cbf12220c5498
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <asch...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
