jenkins-bot has submitted this change and it was merged.
Change subject: Remove deprecated SiteObject and SiteArray classes
......................................................................
Remove deprecated SiteObject and SiteArray classes
SiteObject and SiteArray were deprecated in 1.21 and
can't find any use of them anywhere else in gerrit.
Change-Id: Iff3ba8a60ac9566998cce828c4034066fdefe804
---
M RELEASE-NOTES-1.27
M autoload.php
M includes/site/Site.php
M includes/site/SiteList.php
M tests/phpunit/includes/site/SiteListTest.php
5 files changed, 2 insertions(+), 15 deletions(-)
Approvals:
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git a/RELEASE-NOTES-1.27 b/RELEASE-NOTES-1.27
index ca81242..ec49ffb 100644
--- a/RELEASE-NOTES-1.27
+++ b/RELEASE-NOTES-1.27
@@ -97,6 +97,7 @@
* Removed ORM-like wrapper added in 1.20.
* LinkCache::getGoodLinks and LinkCache::getBadLinks were removed (deprecated
in 1.26).
* WikiPage::doQuickEdit() was removed (deprecated since 1.21).
+* Removed SiteObject and SiteArray classes (deprecated in 1.21).
== Compatibility ==
diff --git a/autoload.php b/autoload.php
index 1c3bf20..b27ce46 100644
--- a/autoload.php
+++ b/autoload.php
@@ -1104,13 +1104,11 @@
'ShowJobs' => __DIR__ . '/maintenance/showJobs.php',
'ShowSiteStats' => __DIR__ . '/maintenance/showSiteStats.php',
'Site' => __DIR__ . '/includes/site/Site.php',
- 'SiteArray' => __DIR__ . '/includes/site/SiteList.php',
'SiteConfiguration' => __DIR__ . '/includes/SiteConfiguration.php',
'SiteExporter' => __DIR__ . '/includes/site/SiteExporter.php',
'SiteImporter' => __DIR__ . '/includes/site/SiteImporter.php',
'SiteList' => __DIR__ . '/includes/site/SiteList.php',
'SiteLookup' => __DIR__ . '/includes/site/SiteLookup.php',
- 'SiteObject' => __DIR__ . '/includes/site/Site.php',
'SiteSQLStore' => __DIR__ . '/includes/site/SiteSQLStore.php',
'SiteStats' => __DIR__ . '/includes/SiteStats.php',
'SiteStatsInit' => __DIR__ . '/includes/SiteStats.php',
diff --git a/includes/site/Site.php b/includes/site/Site.php
index 5aa39c7..c0246bc 100644
--- a/includes/site/Site.php
+++ b/includes/site/Site.php
@@ -698,9 +698,3 @@
$this->setInternalId( $fields['internalid'] );
}
}
-
-/**
- * @deprecated since 1.21
- */
-class SiteObject extends Site {
-}
diff --git a/includes/site/SiteList.php b/includes/site/SiteList.php
index da883d9..691e24b 100644
--- a/includes/site/SiteList.php
+++ b/includes/site/SiteList.php
@@ -350,9 +350,3 @@
return $serializationData;
}
}
-
-/**
- * @deprecated since 1.21
- */
-class SiteArray extends SiteList {
-}
diff --git a/tests/phpunit/includes/site/SiteListTest.php
b/tests/phpunit/includes/site/SiteListTest.php
index d6c58cf..c7562f5 100644
--- a/tests/phpunit/includes/site/SiteListTest.php
+++ b/tests/phpunit/includes/site/SiteListTest.php
@@ -216,7 +216,7 @@
public function testSerialization( SiteList $list ) {
$serialization = serialize( $list );
/**
- * @var SiteArray $copy
+ * @var SiteList $copy
*/
$copy = unserialize( $serialization );
--
To view, visit https://gerrit.wikimedia.org/r/250953
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iff3ba8a60ac9566998cce828c4034066fdefe804
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aude <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Daniel Kinzler <[email protected]>
Gerrit-Reviewer: Hoo man <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
