Drop SearchEngine::getNearMatchResultSet(), deprecated in 1.27 and unused

Change-Id: I87987af702b9b92c4d1b3578e69f1b2e68529b52

diff --git a/RELEASE-NOTES-1.33 b/RELEASE-NOTES-1.33
index 1f84421..c1fd2f7 100644 (file)
--- a/RELEASE-NOTES-1.33
+++ b/RELEASE-NOTES-1.33
@@ -220,7 +220,9 @@ because of Phabricator reports.
 * JsonContent->getJsonData(), deprecated in 1.25, has been removed. Instead, use
   JsonContent->getData().
 * MWExceptionHandler::getLogId(), deprecated in 1.27, has been removed, as the
 * JsonContent->getJsonData(), deprecated in 1.25, has been removed. Instead, use
   JsonContent->getData().
 * MWExceptionHandler::getLogId(), deprecated in 1.27, has been removed, as the

-  exception ID is the same as the request ID, from WebRequest::getRequestId()..
+  exception ID is the same as the request ID, from WebRequest::getRequestId().
+* SearchEngine::getNearMatchResultSet(), deprecated in 1.27, has been removed.
+  You can use SearchEngine::getNearMatcher() instead.

 
 === Deprecations in 1.33 ===
 * The configuration option $wgUseESI has been deprecated, and is expected
 
 === Deprecations in 1.33 ===
 * The configuration option $wgUseESI has been deprecated, and is expected

diff --git a/includes/search/SearchEngine.php b/includes/search/SearchEngine.php
index a0100ca..0b29dd7 100644 (file)
--- a/includes/search/SearchEngine.php
+++ b/includes/search/SearchEngine.php
@@ -279,18 +279,6 @@ abstract class SearchEngine {
                return static::defaultNearMatcher()->getNearMatch( $searchterm );
        }
 
                return static::defaultNearMatcher()->getNearMatch( $searchterm );
        }
 

-       /**
-        * Do a near match (see SearchEngine::getNearMatch) and wrap it into a
-        * SearchResultSet.
-        * @deprecated since 1.27; Use SearchEngine::getNearMatcher()
-        * @param string $searchterm
-        * @return SearchResultSet
-        */
-       public static function getNearMatchResultSet( $searchterm ) {
-               wfDeprecated( __METHOD__, '1.27' );
-               return static::defaultNearMatcher()->getNearMatchResultSet( $searchterm );
-       }
-

        /**
         * Get chars legal for search
         * NOTE: usage as static is deprecated and preserved only as BC measure
        /**
         * Get chars legal for search
         * NOTE: usage as static is deprecated and preserved only as BC measure