X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fimport%2FWikiRevision.php;h=cae954215af9e98930c457ee91930c2ec750d3e3;hb=82bd6b026ef6ecb7f2fe15acaa40c608680dfff1;hp=55a7b2d38608f4e82cdc09df64f1c4b0622d00a7;hpb=f1d64e2fc641673c0b3c15a591b522f4ce813be9;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/import/WikiRevision.php b/includes/import/WikiRevision.php
index 55a7b2d386..e0799c0909 100644
--- a/includes/import/WikiRevision.php
+++ b/includes/import/WikiRevision.php
@@ -36,13 +36,6 @@ use MediaWiki\MediaWikiServices;
  */
 class WikiRevision implements ImportableUploadRevision, ImportableOldRevision {
 
-	/**
-	 * @since 1.17
-	 * @deprecated in 1.29. Unused.
-	 * @note Introduced in 9b3128eb2b654761f21fd4ca1d5a1a4b796dc912, unused there, unused now.
-	 */
-	public $importer = null;
-
 	/**
 	 * @since 1.2
 	 * @var Title
@@ -61,14 +54,6 @@ class WikiRevision implements ImportableUploadRevision, ImportableOldRevision {
 	 */
 	public $timestamp = "20010115000000";
 
-	/**
-	 * @since 1.2
-	 * @var int
-	 * @deprecated in 1.29. Unused.
-	 * @note Introduced in 436a028086fb3f01c4605c5ad2964d56f9306aca, unused there, unused now.
-	 */
-	public $user = 0;
-
 	/**
 	 * @since 1.2
 	 * @var string
@@ -159,6 +144,12 @@ class WikiRevision implements ImportableUploadRevision, ImportableOldRevision {
 	 */
 	public $sha1base36 = false;
 
+	/**
+	 * @since 1.34
+	 * @var string[]
+	 */
+	protected $tags = [];
+
 	/**
 	 * @since 1.17
 	 * @var string
@@ -194,9 +185,16 @@ class WikiRevision implements ImportableUploadRevision, ImportableOldRevision {
 	/** @var bool */
 	private $mNoUpdates = false;
 
-	/** @var Config $config */
+	/**
+	 * @deprecated since 1.31, along with self::downloadSource()
+	 * @var Config $config
+	 */
 	private $config;
 
+	/**
+	 * @param Config $config Deprecated since 1.31, along with self::downloadSource(). Just pass an
+	 *  empty HashConfig.
+	 */
 	public function __construct( Config $config ) {
 		$this->config = $config;
 	}
@@ -325,6 +323,14 @@ class WikiRevision implements ImportableUploadRevision, ImportableOldRevision {
 		$this->sha1base36 = $sha1base36;
 	}
 
+	/**
+	 * @since 1.34
+	 * @param string[] $tags
+	 */
+	public function setTags( array $tags ) {
+		$this->tags = $tags;
+	}
+
 	/**
 	 * @since 1.12.2
 	 * @param string $filename
@@ -367,7 +373,7 @@ class WikiRevision implements ImportableUploadRevision, ImportableOldRevision {
 
 	/**
 	 * @since 1.12.2
-	 * @param array $params
+	 * @param string $params
 	 */
 	public function setParams( $params ) {
 		$this->params = $params;
@@ -524,6 +530,14 @@ class WikiRevision implements ImportableUploadRevision, ImportableOldRevision {
 		return false;
 	}
 
+	/**
+	 * @since 1.34
+	 * @return string[]
+	 */
+	public function getTags() {
+		return $this->tags;
+	}
+
 	/**
 	 * @since 1.17
 	 * @return string
@@ -651,7 +665,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() {
@@ -662,7 +676,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() {