From e03e324f9fd9c646c07908bd598708d59cf98609 Mon Sep 17 00:00:00 2001 From: Lucas Werkmeister Date: Wed, 12 Jun 2019 17:28:28 +0200 Subject: [PATCH] Clarify WikiRevision::downloadSource() and related code MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 --- includes/import/ImportableUploadRevisionImporter.php | 6 +++--- includes/import/WikiRevision.php | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) 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() { -- 2.20.1