From 77863e8fba509665f750b2b01b258e13cc773636 Mon Sep 17 00:00:00 2001
From: aude <aude.wiki@gmail.com>
Date: Sat, 15 Nov 2014 13:12:26 +0100
Subject: [PATCH] Remove deprecated (since 1.21) Sites class

this is an 'alias' for SiteSQLStore and is unused
afaik in Wikibase and elsewhere.

Change-Id: Ibee3e2a89399b97fa4de48e52c3d527714cd0731
---
 RELEASE-NOTES-1.25             |  1 +
 autoload.php                   |  1 -
 includes/site/SiteSQLStore.php | 49 ----------------------------------
 3 files changed, 1 insertion(+), 50 deletions(-)

diff --git a/RELEASE-NOTES-1.25 b/RELEASE-NOTES-1.25
index f96044e5a3..e6d8e7dedb 100644
--- a/RELEASE-NOTES-1.25
+++ b/RELEASE-NOTES-1.25
@@ -193,6 +193,7 @@ changes to languages because of Bugzilla reports.
 * Deprecated the getInternalLinkAttributes, getInternalLinkAttributesObj,
   and getInternalLinkAttributes methods in Linker, and removed
   getExternalLinkAttributes method, which was deprecated in MediaWiki 1.18.
+* Removed Sites class, which was deprecated in 1.21 and replaced by SiteSQLStore.
 
 == Compatibility ==
 
diff --git a/autoload.php b/autoload.php
index 5239edcacc..091ba23742 100644
--- a/autoload.php
+++ b/autoload.php
@@ -1028,7 +1028,6 @@ $wgAutoloadLocalClasses = array(
 	'SiteStatsInit' => __DIR__ . '/includes/SiteStats.php',
 	'SiteStatsUpdate' => __DIR__ . '/includes/deferred/SiteStatsUpdate.php',
 	'SiteStore' => __DIR__ . '/includes/site/SiteStore.php',
-	'Sites' => __DIR__ . '/includes/site/SiteSQLStore.php',
 	'Skin' => __DIR__ . '/includes/skins/Skin.php',
 	'SkinApi' => __DIR__ . '/includes/skins/SkinApi.php',
 	'SkinApiTemplate' => __DIR__ . '/includes/skins/SkinApiTemplate.php',
diff --git a/includes/site/SiteSQLStore.php b/includes/site/SiteSQLStore.php
index e5d05bec54..fde22f1738 100644
--- a/includes/site/SiteSQLStore.php
+++ b/includes/site/SiteSQLStore.php
@@ -444,52 +444,3 @@ class SiteSQLStore implements SiteStore {
 	}
 
 }
-
-/**
- * @deprecated since 1.21
- */
-class Sites extends SiteSQLStore {
-
-	/**
-	 * Factory for creating new site objects.
-	 *
-	 * @since 1.21
-	 * @deprecated since 1.21
-	 *
-	 * @param string|bool $globalId
-	 *
-	 * @return Site
-	 */
-	public static function newSite( $globalId = false ) {
-		$site = new Site();
-
-		if ( $globalId !== false ) {
-			$site->setGlobalId( $globalId );
-		}
-
-		return $site;
-	}
-
-	/**
-	 * @deprecated since 1.21
-	 * @return SiteStore
-	 */
-	public static function singleton() {
-		static $singleton;
-
-		if ( $singleton === null ) {
-			$singleton = new static();
-		}
-
-		return $singleton;
-	}
-
-	/**
-	 * @deprecated since 1.21
-	 * @param string $group
-	 * @return SiteList
-	 */
-	public function getSiteGroup( $group ) {
-		return $this->getSites()->getGroup( $group );
-	}
-}
-- 
2.20.1