From: James D. Forrester <jforrester@wikimedia.org>
Date: Thu, 18 Apr 2019 22:57:12 +0000 (-0700)
Subject: SearchEngine: Hard deprecate unused static methods deprecated in 1.27
X-Git-Tag: 1.34.0-rc.0~1928^2
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=f84457f8bd14618da7c7503991ff8d6a96536c61

SearchEngine: Hard deprecate unused static methods deprecated in 1.27

Change-Id: I96c4454a2f89df0be5de20ca0506c3ce2c75cf7c
---

diff --git a/includes/search/SearchEngine.php b/includes/search/SearchEngine.php
index a3a8abeb16..3e3f96cff4 100644
--- a/includes/search/SearchEngine.php
+++ b/includes/search/SearchEngine.php
@@ -276,6 +276,8 @@ abstract class SearchEngine {
 	 * @return Title
 	 */
 	public static function getNearMatch( $searchterm ) {
+		wfDeprecated( __METHOD__, '1.27' );
+
 		return static::defaultNearMatcher()->getNearMatch( $searchterm );
 	}
 
@@ -310,7 +312,7 @@ abstract class SearchEngine {
 	function setNamespaces( $namespaces ) {
 		if ( $namespaces ) {
 			// Filter namespaces to only keep valid ones
-			$validNs = $this->searchableNamespaces();
+			$validNs = MediaWikiServices::getInstance()->getSearchEngineConfig()->searchableNamespaces();
 			$namespaces = array_filter( $namespaces, function ( $ns ) use( $validNs ) {
 				return $ns < 0 || isset( $validNs[$ns] );
 			} );
@@ -735,6 +737,8 @@ abstract class SearchEngine {
 	 * @return array
 	 */
 	public static function searchableNamespaces() {
+		wfDeprecated( __METHOD__, '1.27' );
+
 		return MediaWikiServices::getInstance()->getSearchEngineConfig()->searchableNamespaces();
 	}
 
@@ -746,6 +750,8 @@ abstract class SearchEngine {
 	 * @return array
 	 */
 	public static function userNamespaces( $user ) {
+		wfDeprecated( __METHOD__, '1.27' );
+
 		return MediaWikiServices::getInstance()->getSearchEngineConfig()->userNamespaces( $user );
 	}
 
@@ -755,6 +761,8 @@ abstract class SearchEngine {
 	 * @return array
 	 */
 	public static function defaultNamespaces() {
+		wfDeprecated( __METHOD__, '1.27' );
+
 		return MediaWikiServices::getInstance()->getSearchEngineConfig()->defaultNamespaces();
 	}
 
@@ -766,6 +774,8 @@ abstract class SearchEngine {
 	 * @return array
 	 */
 	public static function namespacesAsText( $namespaces ) {
+		wfDeprecated( __METHOD__, '1.27' );
+
 		return MediaWikiServices::getInstance()->getSearchEngineConfig()->namespacesAsText( $namespaces );
 	}
 
@@ -777,6 +787,8 @@ abstract class SearchEngine {
 	 * @return SearchEngine
 	 */
 	public static function create( $type = null ) {
+		wfDeprecated( __METHOD__, '1.27' );
+
 		return MediaWikiServices::getInstance()->getSearchEngineFactory()->create( $type );
 	}
 
@@ -787,6 +799,8 @@ abstract class SearchEngine {
 	 * @return array
 	 */
 	public static function getSearchTypes() {
+		wfDeprecated( __METHOD__, '1.27' );
+
 		return MediaWikiServices::getInstance()->getSearchEngineConfig()->getSearchTypes();
 	}