From b0c81a3e091d6695d9e2ad101a48edec2fd5d807 Mon Sep 17 00:00:00 2001
From: aude <aude.wiki@gmail.com>
Date: Wed, 4 Nov 2015 13:16:10 +0100
Subject: [PATCH] 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
---
 RELEASE-NOTES-1.27                           | 1 +
 autoload.php                                 | 2 --
 includes/site/Site.php                       | 6 ------
 includes/site/SiteList.php                   | 6 ------
 tests/phpunit/includes/site/SiteListTest.php | 2 +-
 5 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/RELEASE-NOTES-1.27 b/RELEASE-NOTES-1.27
index ca8124235f..ec49ffb019 100644
--- a/RELEASE-NOTES-1.27
+++ b/RELEASE-NOTES-1.27
@@ -97,6 +97,7 @@ changes to languages because of Bugzilla reports.
 * 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 1c3bf20567..b27ce46b04 100644
--- a/autoload.php
+++ b/autoload.php
@@ -1104,13 +1104,11 @@ $wgAutoloadLocalClasses = array(
 	'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 5aa39c75c1..c0246bcca6 100644
--- a/includes/site/Site.php
+++ b/includes/site/Site.php
@@ -698,9 +698,3 @@ class Site implements Serializable {
 		$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 da883d9b0b..691e24b2ef 100644
--- a/includes/site/SiteList.php
+++ b/includes/site/SiteList.php
@@ -350,9 +350,3 @@ class SiteList extends GenericArrayObject {
 		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 d6c58cf616..c7562f56ef 100644
--- a/tests/phpunit/includes/site/SiteListTest.php
+++ b/tests/phpunit/includes/site/SiteListTest.php
@@ -216,7 +216,7 @@ class SiteListTest extends MediaWikiTestCase {
 	public function testSerialization( SiteList $list ) {
 		$serialization = serialize( $list );
 		/**
-		 * @var SiteArray $copy
+		 * @var SiteList $copy
 		 */
 		$copy = unserialize( $serialization );
 
-- 
2.20.1