From: James D. Forrester <jforrester@wikimedia.org>
Date: Sat, 9 Feb 2019 01:26:04 +0000 (-0800)
Subject: Drop SiteSQLStore, deprecated in 1.27, unused
X-Git-Tag: 1.34.0-rc.0~2890
X-Git-Url: http://git.cyclocoop.org/data/%24self?a=commitdiff_plain;h=edba8aaf5a0cfa9a2599835eef1ddc8808c93a8a;p=lhc%2Fweb%2Fwiklou.git

Drop SiteSQLStore, deprecated in 1.27, unused

Change-Id: I6743417c3aafbba59ac02350e0190fbf688a5a40
---

diff --git a/RELEASE-NOTES-1.33 b/RELEASE-NOTES-1.33
index ccf0041290..e7251989c7 100644
--- a/RELEASE-NOTES-1.33
+++ b/RELEASE-NOTES-1.33
@@ -206,6 +206,9 @@ because of Phabricator reports.
   * Title->getSkinFromCssJsSubpage() – Use Title->getSkinFromConfigSubpage()
   * Title->isCssSubpage() – Use Title->isUserCssConfigPage()
   * Title->isJsSubpage() – Use Title->isUserJsConfigPage()
+* SiteSQLStore, deprecated in 1.27 and whose only method, ::newInstance(),
+  would return the global SiteStore instance, has been removed. You can get to
+  this via MediaWiki\MediaWikiServices::getInstance()->getSiteStore() directly.
 
 === Deprecations in 1.33 ===
 * The configuration option $wgUseESI has been deprecated, and is expected
diff --git a/autoload.php b/autoload.php
index 37d113bba0..471fdd7d67 100644
--- a/autoload.php
+++ b/autoload.php
@@ -1330,7 +1330,6 @@ $wgAutoloadLocalClasses = [
 	'SiteImporter' => __DIR__ . '/includes/site/SiteImporter.php',
 	'SiteList' => __DIR__ . '/includes/site/SiteList.php',
 	'SiteLookup' => __DIR__ . '/includes/site/SiteLookup.php',
-	'SiteSQLStore' => __DIR__ . '/includes/site/SiteSQLStore.php',
 	'SiteStats' => __DIR__ . '/includes/SiteStats.php',
 	'SiteStatsInit' => __DIR__ . '/includes/SiteStatsInit.php',
 	'SiteStatsUpdate' => __DIR__ . '/includes/deferred/SiteStatsUpdate.php',
diff --git a/includes/site/SiteSQLStore.php b/includes/site/SiteSQLStore.php
deleted file mode 100644
index b106d11794..0000000000
--- a/includes/site/SiteSQLStore.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-/**
- * Dummy class for accessing the global SiteStore instance.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @since 1.21
- *
- * @file
- * @ingroup Site
- *
- * @license GPL-2.0-or-later
- * @author Daniel Kinzler
- */
-class SiteSQLStore {
-
-	/**
-	 * Returns the global SiteStore instance. This is a relict of the first implementation
-	 * of SiteStore, and is kept around for compatibility.
-	 *
-	 * @note This does not return an instance of SiteSQLStore!
-	 *
-	 * @since 1.21
-	 * @deprecated since 1.27 use MediaWikiServices::getSiteStore()
-	 *             or MediaWikiServices::getSiteLookup() instead.
-	 *
-	 * @param null $sitesTable IGNORED
-	 * @param BagOStuff|null $cache IGNORED
-	 *
-	 * @return SiteStore
-	 */
-	public static function newInstance( $sitesTable = null, BagOStuff $cache = null ) {
-		wfDeprecated( __METHOD__, '1.27' );
-		if ( $sitesTable !== null ) {
-			throw new InvalidArgumentException(
-				__METHOD__ . ': $sitesTable parameter is unused and must be null'
-			);
-		}
-
-		// NOTE: we silently ignore $cache for now, since some existing callers
-		// specify it. If we break compatibility with them, we could just as
-		// well just remove this class.
-
-		return \MediaWiki\MediaWikiServices::getInstance()->getSiteStore();
-	}
-
-}