Merge "Remove HWLDFWordAccumulator, deprecated in 1.28"

diff --git a/RELEASE-NOTES-1.34 b/RELEASE-NOTES-1.34
index 635152b..576d60e 100644 (file)
--- a/RELEASE-NOTES-1.34
+++ b/RELEASE-NOTES-1.34
@@ -87,6 +87,7 @@ because of Phabricator reports.
 * PreferencesFormLegacy and PreferencesForm classes, deprecated in 1.32, have
   been removed.
 * ObjectFactory class, deprecated in 1.31, has been removed.
+* HWLDFWordAccumudlator class, deprecated in 1.28, has been removed.
 
 === Deprecations in 1.34 ===
 * The MWNamespace class is deprecated. Use MediaWikiServices::getNamespaceInfo.

diff --git a/autoload.php b/autoload.php
index 96adfef..0ec2ca6 100644 (file)
--- a/autoload.php
+++ b/autoload.php
@@ -622,7 +622,6 @@ $wgAutoloadLocalClasses = [
        'HTMLUserTextField' => __DIR__ . '/includes/htmlform/fields/HTMLUserTextField.php',
        'HTMLUsersMultiselectField' => __DIR__ . '/includes/htmlform/fields/HTMLUsersMultiselectField.php',
        'HTTPFileStreamer' => __DIR__ . '/includes/libs/filebackend/HTTPFileStreamer.php',
-       'HWLDFWordAccumulator' => __DIR__ . '/includes/diff/DairikiDiff.php',
        'HashBagOStuff' => __DIR__ . '/includes/libs/objectcache/HashBagOStuff.php',
        'HashConfig' => __DIR__ . '/includes/config/HashConfig.php',
        'HashRing' => __DIR__ . '/includes/libs/HashRing.php',

diff --git a/includes/diff/DairikiDiff.php b/includes/diff/DairikiDiff.php
index 063f826..4e919bc 100644 (file)
--- a/includes/diff/DairikiDiff.php
+++ b/includes/diff/DairikiDiff.php
@@ -326,9 +326,3 @@ class Diff {
                return $lines;
        }
 }
-
-/**
- * @deprecated Alias for WordAccumulator, to be soon removed
- */
-class HWLDFWordAccumulator extends MediaWiki\Diff\WordAccumulator {
-}