From 6a45c007420c27e502c8cd188b20954d004d6467 Mon Sep 17 00:00:00 2001
From: Reedy <reedy@wikimedia.org>
Date: Fri, 1 Jun 2018 00:30:07 +0100
Subject: [PATCH] Kill non namespaced ScopedCallback

Change-Id: I94d14e4bf60c6f3b2c359ac8da61b783f8375bd0
---
 RELEASE-NOTES-1.32                 |  2 ++
 autoload.php                       |  1 -
 includes/compat/ScopedCallback.php | 29 -----------------------------
 3 files changed, 2 insertions(+), 30 deletions(-)
 delete mode 100644 includes/compat/ScopedCallback.php

diff --git a/RELEASE-NOTES-1.32 b/RELEASE-NOTES-1.32
index dca8311d78..3f8d8e9570 100644
--- a/RELEASE-NOTES-1.32
+++ b/RELEASE-NOTES-1.32
@@ -131,6 +131,8 @@ because of Phabricator reports.
   values `true` and `false` respectively.
 * The $parserMemc global and wfGetParserCacheStorage(), deprecated since 1.30,
   were removed. Use the ParserCache class instead.
+* ScopedCallback (deprecated in 1.28) was removed. Use Wikimedia\ScopedCallback
+  instead.
 
 === Deprecations in 1.32 ===
 * Use of a StartProfiler.php file is deprecated in favour of placing
diff --git a/autoload.php b/autoload.php
index f1b3ae0cfb..7b8be1a715 100644
--- a/autoload.php
+++ b/autoload.php
@@ -1279,7 +1279,6 @@ $wgAutoloadLocalClasses = [
 	'SVGReader' => __DIR__ . '/includes/media/SVGMetadataExtractor.php',
 	'SamplingStatsdClient' => __DIR__ . '/includes/libs/stats/SamplingStatsdClient.php',
 	'Sanitizer' => __DIR__ . '/includes/parser/Sanitizer.php',
-	'ScopedCallback' => __DIR__ . '/includes/compat/ScopedCallback.php',
 	'ScopedLock' => __DIR__ . '/includes/libs/lockmanager/ScopedLock.php',
 	'SearchApi' => __DIR__ . '/includes/api/SearchApi.php',
 	'SearchDatabase' => __DIR__ . '/includes/search/SearchDatabase.php',
diff --git a/includes/compat/ScopedCallback.php b/includes/compat/ScopedCallback.php
deleted file mode 100644
index 4fd4bc7989..0000000000
--- a/includes/compat/ScopedCallback.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/**
- * Compatibility class for pre-namespace, pre-library class name
- *
- * 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
- */
-
-/**
- * @deprecated since 1.28 use Wikimedia\ScopedCallback
- *
- * @since 1.21
- */
-class ScopedCallback extends Wikimedia\ScopedCallback {
-}
-- 
2.20.1