From ebec274f17b0b9677c577fd4f1ced67aa61f06c8 Mon Sep 17 00:00:00 2001
From: Timo Tijhof <krinklemail@gmail.com>
Date: Sat, 18 Aug 2018 06:48:43 +0100
Subject: [PATCH] Remove support for StartProfiler.php

Bug: T201782
Bug: T189966
Change-Id: I6ef5af969b1d74a04d5d89370e6ac800c20be1ad
---
 .gitignore                   | 1 -
 .phpcs.xml                   | 1 -
 RELEASE-NOTES-1.32           | 4 ++--
 includes/DefaultSettings.php | 2 --
 includes/Setup.php           | 5 -----
 maintenance/Doxyfile         | 1 -
 6 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index d440e728ca..248931ea2a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,7 +43,6 @@ sftp-config.json
 /maintenance/dev/data
 /AdminSettings.php
 /LocalSettings.php
-/StartProfiler.php
 
 # Building & testing
 npm-debug.log
diff --git a/.phpcs.xml b/.phpcs.xml
index 65ddb73393..40101cbf9b 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -354,5 +354,4 @@
 	<exclude-pattern type="relative">^skins/</exclude-pattern>
 	<exclude-pattern>AdminSettings\.php</exclude-pattern>
 	<exclude-pattern>LocalSettings\.php</exclude-pattern>
-	<exclude-pattern>StartProfiler\.php</exclude-pattern>
 </ruleset>
diff --git a/RELEASE-NOTES-1.32 b/RELEASE-NOTES-1.32
index ec8c022af1..6f15d46b2c 100644
--- a/RELEASE-NOTES-1.32
+++ b/RELEASE-NOTES-1.32
@@ -276,10 +276,10 @@ because of Phabricator reports.
   a no-op function since 1.30.
 * SpecialPageFactory::resetList() is a no-op.  Call overrideMwServices()
   instead.
+* MediaWiki no longer supports a StartProfiler.php file.
+  Define $wgProfiler via LocalSettings.php instead.
 
 === Deprecations in 1.32 ===
-* Use of a StartProfiler.php file is deprecated in favour of placing
-  configuration in LocalSettings.php.
 * HTMLForm::setSubmitProgressive() is deprecated. No need to call it. Submit
   button is already marked as progressive.
 * Skin::setupSkinUserCss() is deprecated. Adding of modules to load
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 9b0899d96b..5672a274ee 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -6348,8 +6348,6 @@ $wgDeprecationReleaseLimit = false;
  * Profiler configuration.
  *
  * To use a profiler, set $wgProfiler in LocalSetings.php.
- * For backwards-compatibility, it is also allowed to set the variable from
- * a separate file called StartProfiler.php, which MediaWiki will include.
  *
  * Example:
  *
diff --git a/includes/Setup.php b/includes/Setup.php
index c015eacd5c..43bc2d8de3 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -86,11 +86,6 @@ MediaWiki\HeaderCallback::register();
  * Load LocalSettings.php
  */
 
-if ( is_readable( "$IP/StartProfiler.php" ) ) {
-	// @deprecated since 1.32: Use LocalSettings.php instead.
-	require "$IP/StartProfiler.php";
-}
-
 if ( defined( 'MW_CONFIG_CALLBACK' ) ) {
 	call_user_func( MW_CONFIG_CALLBACK );
 } else {
diff --git a/maintenance/Doxyfile b/maintenance/Doxyfile
index bb880401d1..2a0504667c 100644
--- a/maintenance/Doxyfile
+++ b/maintenance/Doxyfile
@@ -177,7 +177,6 @@ EXCLUDE                = {{EXCLUDE}}
 EXCLUDE_SYMLINKS       = YES
 EXCLUDE_PATTERNS       = LocalSettings.php \
                          AdminSettings.php \
-                         StartProfiler.php \
                          .svn \
                          */.git/* \
                          {{EXCLUDE_PATTERNS}}
-- 
2.20.1