Merge "Kill non namespaced ScopedCallback"

diff --combined RELEASE-NOTES-1.32
index d399546,3f8d8e9..bd43daf
--- 1/RELEASE-NOTES-1.32
--- 2/RELEASE-NOTES-1.32
+++ b/RELEASE-NOTES-1.32
@@@ -39,11 -39,8 +39,11 @@@ production
  
  ==== Upgraded external libraries ====
  * Updated QUnit from 2.4.0 to 2.6.0.
 +* Updated wikimedia/scoped-callback from 1.0.0 to 2.0.0.
 +** ScopedCallback objects can no longer be serialized.
  
  ==== New external libraries ====
 +* Added wikimedia/xmp-reader 0.5.1
  * …
  
  ==== Removed and replaced external libraries ====
@@@ -134,6 -131,8 +134,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
@@@ -162,8 -161,6 +164,8 @@@
    constant INTL_ICU_VERSION directly in all versions that MediaWiki supports.
  * Parser::fetchFile() is deprecated. Use ::fetchFileAndTitle() instead.
  * The ApiQueryContributions class has been renamed to ApiQueryUserContribs.
 +* The XMPInfo, XMPReader, and XMPValidate classes have been deprecated in favor
 +  of the namespaced classes provided by the wikimedia/xmp-reader library.
  
  === Other changes in 1.32 ===
  * …

diff --combined autoload.php
index 5483744,7b8be1a..67cd3b9
--- 1/autoload.php
--- 2/autoload.php
+++ b/autoload.php
@@@ -1279,7 -1279,6 +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',
@@@ -1681,9 -1680,9 +1680,9 @@@
        'WrapOldPasswords' => __DIR__ . '/maintenance/wrapOldPasswords.php',
        'XCFHandler' => __DIR__ . '/includes/media/XCF.php',
        'XMLRCFeedFormatter' => __DIR__ . '/includes/rcfeed/XMLRCFeedFormatter.php',
 -      'XMPInfo' => __DIR__ . '/includes/libs/xmp/XMPInfo.php',
 -      'XMPReader' => __DIR__ . '/includes/libs/xmp/XMP.php',
 -      'XMPValidate' => __DIR__ . '/includes/libs/xmp/XMPValidate.php',
 +      'XMPInfo' => __DIR__ . '/includes/compat/XMPReader.php',
 +      'XMPReader' => __DIR__ . '/includes/compat/XMPReader.php',
 +      'XMPValidate' => __DIR__ . '/includes/compat/XMPReader.php',
        'Xhprof' => __DIR__ . '/includes/libs/Xhprof.php',
        'XhprofData' => __DIR__ . '/includes/libs/XhprofData.php',
        'Xml' => __DIR__ . '/includes/Xml.php',