dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Remove Revision::getRevisionText from migrateArchiveText"
[lhc/web/wiklou.git]
/
includes
/
import
/
WikiRevision.php
diff --git
a/includes/import/WikiRevision.php
b/includes/import/WikiRevision.php
index
55a7b2d
..
e0799c0
100644
(file)
--- a/
includes/import/WikiRevision.php
+++ b/
includes/import/WikiRevision.php
@@
-36,13
+36,6
@@
use MediaWiki\MediaWikiServices;
*/
class WikiRevision implements ImportableUploadRevision, ImportableOldRevision {
*/
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
/**
* @since 1.2
* @var Title
@@
-61,14
+54,6
@@
class WikiRevision implements ImportableUploadRevision, ImportableOldRevision {
*/
public $timestamp = "20010115000000";
*/
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
/**
* @since 1.2
* @var string
@@
-159,6
+144,12
@@
class WikiRevision implements ImportableUploadRevision, ImportableOldRevision {
*/
public $sha1base36 = false;
*/
public $sha1base36 = false;
+ /**
+ * @since 1.34
+ * @var string[]
+ */
+ protected $tags = [];
+
/**
* @since 1.17
* @var string
/**
* @since 1.17
* @var string
@@
-194,9
+185,16
@@
class WikiRevision implements ImportableUploadRevision, ImportableOldRevision {
/** @var bool */
private $mNoUpdates = false;
/** @var bool */
private $mNoUpdates = false;
- /** @var Config $config */
+ /**
+ * @deprecated since 1.31, along with self::downloadSource()
+ * @var Config $config
+ */
private $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;
}
public function __construct( Config $config ) {
$this->config = $config;
}
@@
-325,6
+323,14
@@
class WikiRevision implements ImportableUploadRevision, ImportableOldRevision {
$this->sha1base36 = $sha1base36;
}
$this->sha1base36 = $sha1base36;
}
+ /**
+ * @since 1.34
+ * @param string[] $tags
+ */
+ public function setTags( array $tags ) {
+ $this->tags = $tags;
+ }
+
/**
* @since 1.12.2
* @param string $filename
/**
* @since 1.12.2
* @param string $filename
@@
-367,7
+373,7
@@
class WikiRevision implements ImportableUploadRevision, ImportableOldRevision {
/**
* @since 1.12.2
/**
* @since 1.12.2
- * @param
array
$params
+ * @param
string
$params
*/
public function setParams( $params ) {
$this->params = $params;
*/
public function setParams( $params ) {
$this->params = $params;
@@
-524,6
+530,14
@@
class WikiRevision implements ImportableUploadRevision, ImportableOldRevision {
return false;
}
return false;
}
+ /**
+ * @since 1.34
+ * @return string[]
+ */
+ public function getTags() {
+ return $this->tags;
+ }
+
/**
* @since 1.17
* @return string
/**
* @since 1.17
* @return string
@@
-651,7
+665,7
@@
class WikiRevision implements ImportableUploadRevision, ImportableOldRevision {
/**
* @since 1.12.2
/**
* @since 1.12.2
- * @deprecated in 1.31. Use UploadImporter::import
+ * @deprecated in 1.31. Use Upload
Revision
Importer::import
* @return bool
*/
public function importUpload() {
* @return bool
*/
public function importUpload() {
@@
-662,7
+676,7
@@
class WikiRevision implements ImportableUploadRevision, ImportableOldRevision {
/**
* @since 1.12.2
/**
* @since 1.12.2
- * @deprecated in 1.31.
Use UploadImporter::downloadSource
+ * @deprecated in 1.31.
No replacement
* @return bool|string
*/
public function downloadSource() {
* @return bool|string
*/
public function downloadSource() {