dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SearchEngine: Hard deprecate unused static methods deprecated in 1.27
[lhc/web/wiklou.git]
/
includes
/
search
/
SearchEngine.php
diff --git
a/includes/search/SearchEngine.php
b/includes/search/SearchEngine.php
index
a3a8abe
..
3e3f96c
100644
(file)
--- a/
includes/search/SearchEngine.php
+++ b/
includes/search/SearchEngine.php
@@
-276,6
+276,8
@@
abstract class SearchEngine {
* @return Title
*/
public static function getNearMatch( $searchterm ) {
* @return Title
*/
public static function getNearMatch( $searchterm ) {
+ wfDeprecated( __METHOD__, '1.27' );
+
return static::defaultNearMatcher()->getNearMatch( $searchterm );
}
return static::defaultNearMatcher()->getNearMatch( $searchterm );
}
@@
-310,7
+312,7
@@
abstract class SearchEngine {
function setNamespaces( $namespaces ) {
if ( $namespaces ) {
// Filter namespaces to only keep valid ones
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] );
} );
$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() {
* @return array
*/
public static function searchableNamespaces() {
+ wfDeprecated( __METHOD__, '1.27' );
+
return MediaWikiServices::getInstance()->getSearchEngineConfig()->searchableNamespaces();
}
return MediaWikiServices::getInstance()->getSearchEngineConfig()->searchableNamespaces();
}
@@
-746,6
+750,8
@@
abstract class SearchEngine {
* @return array
*/
public static function userNamespaces( $user ) {
* @return array
*/
public static function userNamespaces( $user ) {
+ wfDeprecated( __METHOD__, '1.27' );
+
return MediaWikiServices::getInstance()->getSearchEngineConfig()->userNamespaces( $user );
}
return MediaWikiServices::getInstance()->getSearchEngineConfig()->userNamespaces( $user );
}
@@
-755,6
+761,8
@@
abstract class SearchEngine {
* @return array
*/
public static function defaultNamespaces() {
* @return array
*/
public static function defaultNamespaces() {
+ wfDeprecated( __METHOD__, '1.27' );
+
return MediaWikiServices::getInstance()->getSearchEngineConfig()->defaultNamespaces();
}
return MediaWikiServices::getInstance()->getSearchEngineConfig()->defaultNamespaces();
}
@@
-766,6
+774,8
@@
abstract class SearchEngine {
* @return array
*/
public static function namespacesAsText( $namespaces ) {
* @return array
*/
public static function namespacesAsText( $namespaces ) {
+ wfDeprecated( __METHOD__, '1.27' );
+
return MediaWikiServices::getInstance()->getSearchEngineConfig()->namespacesAsText( $namespaces );
}
return MediaWikiServices::getInstance()->getSearchEngineConfig()->namespacesAsText( $namespaces );
}
@@
-777,6
+787,8
@@
abstract class SearchEngine {
* @return SearchEngine
*/
public static function create( $type = null ) {
* @return SearchEngine
*/
public static function create( $type = null ) {
+ wfDeprecated( __METHOD__, '1.27' );
+
return MediaWikiServices::getInstance()->getSearchEngineFactory()->create( $type );
}
return MediaWikiServices::getInstance()->getSearchEngineFactory()->create( $type );
}
@@
-787,6
+799,8
@@
abstract class SearchEngine {
* @return array
*/
public static function getSearchTypes() {
* @return array
*/
public static function getSearchTypes() {
+ wfDeprecated( __METHOD__, '1.27' );
+
return MediaWikiServices::getInstance()->getSearchEngineConfig()->getSearchTypes();
}
return MediaWikiServices::getInstance()->getSearchEngineConfig()->getSearchTypes();
}