From: Lucas Werkmeister <lucas.werkmeister@wikimedia.de>
Date: Wed, 12 Jun 2019 15:28:28 +0000 (+0200)
Subject: Clarify WikiRevision::downloadSource() and related code
X-Git-Tag: 1.34.0-rc.0~949^2
X-Git-Url: http://git.cyclocoop.org/%28%28?a=commitdiff_plain;h=e03e324f9fd9c646c07908bd598708d59cf98609;p=lhc%2Fweb%2Fwiklou.git

Clarify WikiRevision::downloadSource() and related code

UploadImporter was the name of the new class in the first patch sets of
change I4a6c573fc0, but by the time it was merged as commit 25fbfd9b9c
it had been split into an UploadRevisionImporter interface with an
ImportableUploadRevisionImporter implementation; however, not all the
references to those methods were fully updated.

Also, downloadSource() is not actually intended as a replacement method
– it was introduced, already deprecated, only to avoid going through the
deprecation process, with the intention of removing it (and making the
implementation private) once enough time had passed. Update the comments
to clarify this as well.

Change-Id: I50a07c0db102cdc98e5b7c1a176f401b87d627c9
---

diff --git a/includes/import/ImportableUploadRevisionImporter.php b/includes/import/ImportableUploadRevisionImporter.php
index 40c9417c11..4be13b0a2c 100644
--- a/includes/import/ImportableUploadRevisionImporter.php
+++ b/includes/import/ImportableUploadRevisionImporter.php
@@ -139,9 +139,9 @@ class ImportableUploadRevisionImporter implements UploadRevisionImporter {
 
 	/**
 	 * @deprecated DO NOT CALL ME.
-	 * This method was introduced when factoring UploadImporter out of WikiRevision.
-	 * It only has 1 use by the deprecated downloadSource method in WikiRevision.
-	 * Do not use this in new code.
+	 * This method was introduced when factoring (Importable)UploadRevisionImporter out of
+	 * WikiRevision. It only has 1 use by the deprecated downloadSource method in WikiRevision.
+	 * Do not use this in new code, it will be made private soon.
 	 *
 	 * @param ImportableUploadRevision $wikiRevision
 	 *
diff --git a/includes/import/WikiRevision.php b/includes/import/WikiRevision.php
index c006874aec..cae954215a 100644
--- a/includes/import/WikiRevision.php
+++ b/includes/import/WikiRevision.php
@@ -636,7 +636,7 @@ class WikiRevision implements ImportableUploadRevision, ImportableOldRevision {
 
 	/**
 	 * @since 1.12.2
-	 * @deprecated in 1.31. Use UploadImporter::import
+	 * @deprecated in 1.31. Use UploadRevisionImporter::import
 	 * @return bool
 	 */
 	public function importUpload() {
@@ -647,7 +647,7 @@ class WikiRevision implements ImportableUploadRevision, ImportableOldRevision {
 
 	/**
 	 * @since 1.12.2
-	 * @deprecated in 1.31. Use UploadImporter::downloadSource
+	 * @deprecated in 1.31. No replacement
 	 * @return bool|string
 	 */
 	public function downloadSource() {