From: Reedy <reedy@wikimedia.org>
Date: Sun, 14 Apr 2019 01:24:20 +0000 (+0100)
Subject: Remove PreferencesFormLegacy.php
X-Git-Tag: 1.34.0-rc.0~1998^2
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=d8f480bad341c445e7fa1b05f2e78deadd24a45f

Remove PreferencesFormLegacy.php

Now unused, deprecated in 1.32

Change-Id: I4fc4bdf36b3832786c0266786cff57d512140d8e
---

diff --git a/.phpcs.xml b/.phpcs.xml
index 7f4ec1b04d..ce74df70f9 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -218,7 +218,6 @@
 		<exclude-pattern>*/includes/parser/Preprocessor_Hash\.php</exclude-pattern>
 		<exclude-pattern>*/includes/parser/Preprocessor\.php</exclude-pattern>
 		<exclude-pattern>*/includes/profiler/SectionProfiler\.php</exclude-pattern>
-		<exclude-pattern>*/includes/specials/forms/PreferencesFormLegacy\.php</exclude-pattern>
 		<exclude-pattern>*/includes/StubObject\.php</exclude-pattern>
 		<exclude-pattern>*/includes/upload/UploadStash\.php</exclude-pattern>
 		<exclude-pattern>*/includes/utils/AutoloadGenerator\.php</exclude-pattern>
diff --git a/RELEASE-NOTES-1.34 b/RELEASE-NOTES-1.34
index ba4ac51a0a..da765c3b27 100644
--- a/RELEASE-NOTES-1.34
+++ b/RELEASE-NOTES-1.34
@@ -84,6 +84,8 @@ because of Phabricator reports.
   services after any configuration change. Even if your code works now, it is
   likely to break in future versions as more code is moved to services.
 * The ill-defined "DatabaseOraclePostInit" hook has been removed.
+* PreferencesFormLegacy and PreferencesForm classes, deprecated in 1.32, have
+  been removed.
 
 === Deprecations in 1.34 ===
 * The MWNamespace class is deprecated. Use MediaWikiServices::getNamespaceInfo.
diff --git a/autoload.php b/autoload.php
index 1bd32a74e6..71223348d3 100644
--- a/autoload.php
+++ b/autoload.php
@@ -1134,8 +1134,6 @@ $wgAutoloadLocalClasses = [
 	'PostgreSqlLockManager' => __DIR__ . '/includes/libs/lockmanager/PostgreSqlLockManager.php',
 	'PostgresInstaller' => __DIR__ . '/includes/installer/PostgresInstaller.php',
 	'PostgresUpdater' => __DIR__ . '/includes/installer/PostgresUpdater.php',
-	'PreferencesForm' => __DIR__ . '/includes/specials/forms/PreferencesFormLegacy.php',
-	'PreferencesFormLegacy' => __DIR__ . '/includes/specials/forms/PreferencesFormLegacy.php',
 	'PreferencesFormOOUI' => __DIR__ . '/includes/specials/forms/PreferencesFormOOUI.php',
 	'PrefixSearch' => __DIR__ . '/includes/search/PrefixSearch.php',
 	'PrefixingStatsdDataFactoryProxy' => __DIR__ . '/includes/libs/stats/PrefixingStatsdDataFactoryProxy.php',
diff --git a/includes/preferences/PreferencesFactory.php b/includes/preferences/PreferencesFactory.php
index 22d0a77562..6602a0ad02 100644
--- a/includes/preferences/PreferencesFactory.php
+++ b/includes/preferences/PreferencesFactory.php
@@ -29,7 +29,7 @@ use User;
  * A PreferencesFactory is a MediaWiki service that provides the definitions of preferences for a
  * given user. These definitions are in the form of an HTMLForm descriptor.
  *
- * PreferencesFormLegacy (a subclass of HTMLForm) is used to generate the Preferences form, and
+ * PreferencesFormOOUI (a subclass of HTMLForm) is used to generate the Preferences form, and
  * handles generic submission, CSRF protection, layout and other logic in a reusable manner.
  *
  * In order to generate the form, the HTMLForm object needs an array structure detailing the
diff --git a/includes/specials/forms/PreferencesFormLegacy.php b/includes/specials/forms/PreferencesFormLegacy.php
deleted file mode 100644
index 951e5cee6d..0000000000
--- a/includes/specials/forms/PreferencesFormLegacy.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * 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
- *
- * @file
- */
-
-/**
- * Form to edit user preferences.
- *
- * @since 1.32
- */
-class PreferencesFormLegacy extends PreferencesFormOOUI {
-	// No-op
-}
-
-/**
- * Retain the old class name for backwards compatibility.
- *
- * @deprecated since 1.32
- */
-class_alias( PreferencesFormLegacy::class, 'PreferencesForm' );