From f9f2809a380628c7043d581ed22290b6b0e0eaf8 Mon Sep 17 00:00:00 2001 From: Derick Alangi Date: Fri, 19 Apr 2019 18:41:34 +0100 Subject: [PATCH] SearchEngine: Hard deprecate SearchEngine::transformSearchTerm() As a follow up of it's soft deprecation in 1.32, this method should be hard deprecated and removed. Also, remove related code that calls this method. Usage: https://codesearch.wmflabs.org/search/?q=(%3A%3A%7C-%3E)transformSearchTerm&i=nope&files=&repos= Bug: T221431 Change-Id: I623b39e7ec791a66c4cf40178edb80b2ebf4bb06 --- includes/api/ApiQuerySearch.php | 7 ------- includes/search/SearchEngine.php | 1 + includes/specials/SpecialSearch.php | 7 ------- 3 files changed, 1 insertion(+), 14 deletions(-) diff --git a/includes/api/ApiQuerySearch.php b/includes/api/ApiQuerySearch.php index e6403f3d2f..98c65516c9 100644 --- a/includes/api/ApiQuerySearch.php +++ b/includes/api/ApiQuerySearch.php @@ -67,13 +67,6 @@ class ApiQuerySearch extends ApiQueryGeneratorBase { $search->setFeatureData( 'rewrite', (bool)$params['enablerewrites'] ); $search->setFeatureData( 'interwiki', (bool)$interwiki ); - $nquery = $search->transformSearchTerm( $query ); - if ( $nquery !== $query ) { - $query = $nquery; - wfDeprecated( 'SearchEngine::transformSearchTerm() (overridden by ' . - get_class( $search ) . ')', '1.32' ); - } - $nquery = $search->replacePrefixes( $query ); if ( $nquery !== $query ) { $query = $nquery; diff --git a/includes/search/SearchEngine.php b/includes/search/SearchEngine.php index d0912c55b2..65a3e6a54e 100644 --- a/includes/search/SearchEngine.php +++ b/includes/search/SearchEngine.php @@ -245,6 +245,7 @@ abstract class SearchEngine { * search engine */ public function transformSearchTerm( $term ) { + wfDeprecated( __METHOD__, '1.34' ); return $term; } diff --git a/includes/specials/SpecialSearch.php b/includes/specials/SpecialSearch.php index f27a73631b..c88fb2733b 100644 --- a/includes/specials/SpecialSearch.php +++ b/includes/specials/SpecialSearch.php @@ -330,13 +330,6 @@ class SpecialSearch extends SpecialPage { $showSuggestion = $title === null || !$title->isKnown(); $search->setShowSuggestion( $showSuggestion ); - $rewritten = $search->transformSearchTerm( $term ); - if ( $rewritten !== $term ) { - $term = $rewritten; - wfDeprecated( 'SearchEngine::transformSearchTerm() (overridden by ' . - get_class( $search ) . ')', '1.32' ); - } - $rewritten = $search->replacePrefixes( $term ); if ( $rewritten !== $term ) { wfDeprecated( 'SearchEngine::replacePrefixes() (overridden by ' . -- 2.20.1