diff options
Diffstat (limited to 'includes/search')
| -rw-r--r-- | includes/search/FauxSearchResultSet.php | 2 | ||||
| -rw-r--r-- | includes/search/PrefixSearch.php | 2 | ||||
| -rw-r--r-- | includes/search/SearchEngine.php | 10 | ||||
| -rw-r--r-- | includes/search/SearchResultSet.php | 2 | ||||
| -rw-r--r-- | includes/search/SearchResultTrait.php | 2 | ||||
| -rw-r--r-- | includes/search/SearchSuggestionSet.php | 4 | ||||
| -rw-r--r-- | includes/search/StringPrefixSearch.php | 2 |
7 files changed, 12 insertions, 12 deletions
diff --git a/includes/search/FauxSearchResultSet.php b/includes/search/FauxSearchResultSet.php index 20db0c45582a..c5585567b776 100644 --- a/includes/search/FauxSearchResultSet.php +++ b/includes/search/FauxSearchResultSet.php @@ -21,7 +21,7 @@ class FauxSearchResultSet extends SearchResultSet { $totalHits = max( count( $results ), $totalHits ); $hasMoreResults = count( $results ) < $totalHits; parent::__construct( false, $hasMoreResults ); - $this->results = array_map( function ( $result ) { + $this->results = array_map( static function ( $result ) { if ( $result instanceof SearchResult ) { return $result; } elseif ( $result instanceof Title ) { diff --git a/includes/search/PrefixSearch.php b/includes/search/PrefixSearch.php index a28348bc1339..6a3a512ddbcd 100644 --- a/includes/search/PrefixSearch.php +++ b/includes/search/PrefixSearch.php @@ -167,7 +167,7 @@ abstract class PrefixSearch { $special = $spFactory->getPage( $specialTitle->getText() ); if ( $special ) { $subpages = $special->prefixSearchSubpages( $subpageSearch, $limit, $offset ); - return array_map( function ( $sub ) use ( $specialTitle ) { + return array_map( static function ( $sub ) use ( $specialTitle ) { return $specialTitle->getSubpage( $sub ); }, $subpages ); } else { diff --git a/includes/search/SearchEngine.php b/includes/search/SearchEngine.php index 26b527a1b901..64f4b8a380ee 100644 --- a/includes/search/SearchEngine.php +++ b/includes/search/SearchEngine.php @@ -309,7 +309,7 @@ abstract class SearchEngine { if ( $namespaces ) { // Filter namespaces to only keep valid ones $validNs = MediaWikiServices::getInstance()->getSearchEngineConfig()->searchableNamespaces(); - $namespaces = array_filter( $namespaces, function ( $ns ) use( $validNs ) { + $namespaces = array_filter( $namespaces, static function ( $ns ) use( $validNs ) { return $ns < 0 || isset( $validNs[$ns] ); } ); } else { @@ -642,7 +642,7 @@ abstract class SearchEngine { * @return Title[] */ public function extractTitles( SearchSuggestionSet $completionResults ) { - return $completionResults->map( function ( SearchSuggestion $sugg ) { + return $completionResults->map( static function ( SearchSuggestion $sugg ) { return $sugg->getSuggestedTitle(); } ); } @@ -662,13 +662,13 @@ abstract class SearchEngine { $search = trim( $search ); // preload the titles with LinkBatch $linkBatchFactory = MediaWikiServices::getInstance()->getLinkBatchFactory(); - $lb = $linkBatchFactory->newLinkBatch( $suggestions->map( function ( SearchSuggestion $sugg ) { + $lb = $linkBatchFactory->newLinkBatch( $suggestions->map( static function ( SearchSuggestion $sugg ) { return $sugg->getSuggestedTitle(); } ) ); $lb->setCaller( __METHOD__ ); $lb->execute(); - $diff = $suggestions->filter( function ( SearchSuggestion $sugg ) { + $diff = $suggestions->filter( static function ( SearchSuggestion $sugg ) { return $sugg->getSuggestedTitle()->isKnown(); } ); if ( $diff > 0 ) { @@ -676,7 +676,7 @@ abstract class SearchEngine { ->updateCount( 'search.completion.missing', $diff ); } - $results = $suggestions->map( function ( SearchSuggestion $sugg ) { + $results = $suggestions->map( static function ( SearchSuggestion $sugg ) { return $sugg->getSuggestedTitle()->getPrefixedText(); } ); diff --git a/includes/search/SearchResultSet.php b/includes/search/SearchResultSet.php index af8e1c966903..fe5537f16aec 100644 --- a/includes/search/SearchResultSet.php +++ b/includes/search/SearchResultSet.php @@ -229,7 +229,7 @@ class SearchResultSet extends BaseSearchResultSet { $this->titles = []; } else { $this->titles = array_map( - function ( SearchResult $result ) { + static function ( SearchResult $result ) { return $result->getTitle(); }, $this->extractResults() ); diff --git a/includes/search/SearchResultTrait.php b/includes/search/SearchResultTrait.php index 9a0df2560a4d..b4279d5db254 100644 --- a/includes/search/SearchResultTrait.php +++ b/includes/search/SearchResultTrait.php @@ -36,7 +36,7 @@ trait SearchResultTrait { $this->extensionData = $extensionData; } elseif ( is_array( $extensionData ) ) { wfDeprecated( __METHOD__ . ' with array argument', '1.32' ); - $this->extensionData = function () use ( $extensionData ) { + $this->extensionData = static function () use ( $extensionData ) { return $extensionData; }; } else { diff --git a/includes/search/SearchSuggestionSet.php b/includes/search/SearchSuggestionSet.php index ebaa133d4de7..9c3a3849f38b 100644 --- a/includes/search/SearchSuggestionSet.php +++ b/includes/search/SearchSuggestionSet.php @@ -208,7 +208,7 @@ class SearchSuggestionSet { */ public static function fromTitles( array $titles, $hasMoreResults = false ) { $score = count( $titles ); - $suggestions = array_map( function ( $title ) use ( &$score ) { + $suggestions = array_map( static function ( $title ) use ( &$score ) { return SearchSuggestion::fromTitle( $score--, $title ); }, $titles ); return new SearchSuggestionSet( $suggestions, $hasMoreResults ); @@ -225,7 +225,7 @@ class SearchSuggestionSet { */ public static function fromStrings( array $titles, $hasMoreResults = false ) { $score = count( $titles ); - $suggestions = array_map( function ( $title ) use ( &$score ) { + $suggestions = array_map( static function ( $title ) use ( &$score ) { return SearchSuggestion::fromText( $score--, $title ); }, $titles ); return new SearchSuggestionSet( $suggestions, $hasMoreResults ); diff --git a/includes/search/StringPrefixSearch.php b/includes/search/StringPrefixSearch.php index 433500bf9bda..fddbb67c3d79 100644 --- a/includes/search/StringPrefixSearch.php +++ b/includes/search/StringPrefixSearch.php @@ -32,7 +32,7 @@ class StringPrefixSearch extends PrefixSearch { * @return string[] */ protected function titles( array $titles ) { - return array_map( function ( Title $t ) { + return array_map( static function ( Title $t ) { return $t->getPrefixedText(); }, $titles ); } |