From: Aaron Schulz <aschulz@wikimedia.org>
Date: Fri, 12 Apr 2019 00:54:26 +0000 (-0700)
Subject: search: make legalSearchChars() non-static
X-Git-Tag: 1.34.0-rc.0~2037
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=449ad972241f8f53f3d5a9655951740ca1404c86

search: make legalSearchChars() non-static

No outside callers from code in gerrit are using this statically

Change-Id: I9513a5384bca71f419a9af09908678bcc86c0263
---

diff --git a/includes/search/SearchEngine.php b/includes/search/SearchEngine.php
index 4cba19e147..1f64dd4023 100644
--- a/includes/search/SearchEngine.php
+++ b/includes/search/SearchEngine.php
@@ -281,12 +281,11 @@ abstract class SearchEngine {
 
 	/**
 	 * Get chars legal for search
-	 * NOTE: usage as static is deprecated and preserved only as BC measure
 	 * @param int $type type of search chars (see self::CHARS_ALL
 	 * and self::CHARS_NO_SYNTAX). Defaults to CHARS_ALL
 	 * @return string
 	 */
-	public static function legalSearchChars( $type = self::CHARS_ALL ) {
+	public function legalSearchChars( $type = self::CHARS_ALL ) {
 		return "A-Za-z_'.0-9\\x80-\\xFF\\-";
 	}
 
diff --git a/includes/search/SearchMySQL.php b/includes/search/SearchMySQL.php
index 9f1069722b..cae342670e 100644
--- a/includes/search/SearchMySQL.php
+++ b/includes/search/SearchMySQL.php
@@ -149,7 +149,7 @@ class SearchMySQL extends SearchDatabase {
 		return $regex;
 	}
 
-	public static function legalSearchChars( $type = self::CHARS_ALL ) {
+	public function legalSearchChars( $type = self::CHARS_ALL ) {
 		$searchChars = parent::legalSearchChars( $type );
 		if ( $type === self::CHARS_ALL ) {
 			// " for phrase, * for wildcard
diff --git a/includes/search/SearchOracle.php b/includes/search/SearchOracle.php
index 0cbb41c471..6b2b4038dc 100644
--- a/includes/search/SearchOracle.php
+++ b/includes/search/SearchOracle.php
@@ -267,7 +267,7 @@ class SearchOracle extends SearchDatabase {
 			[] );
 	}
 
-	public static function legalSearchChars( $type = self::CHARS_ALL ) {
+	public function legalSearchChars( $type = self::CHARS_ALL ) {
 		$searchChars = parent::legalSearchChars( $type );
 		if ( $type === self::CHARS_ALL ) {
 			$searchChars = "\"" . $searchChars;
diff --git a/includes/search/SearchSqlite.php b/includes/search/SearchSqlite.php
index f653796a6f..c30479766e 100644
--- a/includes/search/SearchSqlite.php
+++ b/includes/search/SearchSqlite.php
@@ -142,7 +142,7 @@ class SearchSqlite extends SearchDatabase {
 		return $regex;
 	}
 
-	public static function legalSearchChars( $type = self::CHARS_ALL ) {
+	public function legalSearchChars( $type = self::CHARS_ALL ) {
 		$searchChars = parent::legalSearchChars( $type );
 		if ( $type === self::CHARS_ALL ) {
 			// " for phrase, * for wildcard