From 8d5a8fb1819925d955b6f23f610ecf9f90d5bb54 Mon Sep 17 00:00:00 2001
From: Umherirrender <umherirrender_de.wp@web.de>
Date: Wed, 27 Mar 2019 21:40:33 +0100
Subject: [PATCH] Move PrefixSearch classes to own files

Move all into search subfolder

Change-Id: I4097b9745d22545afe6761da1fa67cf98af5b811
---
 .phpcs.xml                             |  1 -
 autoload.php                           |  6 ++--
 includes/{ => search}/PrefixSearch.php | 38 ------------------------
 includes/search/StringPrefixSearch.php | 39 ++++++++++++++++++++++++
 includes/search/TitlePrefixSearch.php  | 41 ++++++++++++++++++++++++++
 5 files changed, 83 insertions(+), 42 deletions(-)
 rename includes/{ => search}/PrefixSearch.php (92%)
 create mode 100644 includes/search/StringPrefixSearch.php
 create mode 100644 includes/search/TitlePrefixSearch.php

diff --git a/.phpcs.xml b/.phpcs.xml
index d1e54a706c..33b66bf778 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -228,7 +228,6 @@
 		<exclude-pattern>*/includes/parser/Preprocessor_Hash\.php</exclude-pattern>
 		<exclude-pattern>*/includes/parser/Preprocessor\.php</exclude-pattern>
 		<exclude-pattern>*/includes/PathRouter\.php</exclude-pattern>
-		<exclude-pattern>*/includes/PrefixSearch\.php</exclude-pattern>
 		<exclude-pattern>*/includes/profiler/SectionProfiler\.php</exclude-pattern>
 		<exclude-pattern>*/includes/search/SearchEngine\.php</exclude-pattern>
 		<exclude-pattern>*/includes/specialpage/LoginSignupSpecialPage\.php</exclude-pattern>
diff --git a/autoload.php b/autoload.php
index 528b7fe372..5af1b1b8b3 100644
--- a/autoload.php
+++ b/autoload.php
@@ -1138,7 +1138,7 @@ $wgAutoloadLocalClasses = [
 	'PreferencesForm' => __DIR__ . '/includes/specials/forms/PreferencesFormLegacy.php',
 	'PreferencesFormLegacy' => __DIR__ . '/includes/specials/forms/PreferencesFormLegacy.php',
 	'PreferencesFormOOUI' => __DIR__ . '/includes/specials/forms/PreferencesFormOOUI.php',
-	'PrefixSearch' => __DIR__ . '/includes/PrefixSearch.php',
+	'PrefixSearch' => __DIR__ . '/includes/search/PrefixSearch.php',
 	'PrefixingStatsdDataFactoryProxy' => __DIR__ . '/includes/libs/stats/PrefixingStatsdDataFactoryProxy.php',
 	'PreprocessDump' => __DIR__ . '/maintenance/preprocessDump.php',
 	'Preprocessor' => __DIR__ . '/includes/parser/Preprocessor.php',
@@ -1450,7 +1450,7 @@ $wgAutoloadLocalClasses = [
 	'StorageTypeStats' => __DIR__ . '/maintenance/storage/storageTypeStats.php',
 	'StoreFileOp' => __DIR__ . '/includes/libs/filebackend/fileop/StoreFileOp.php',
 	'StreamFile' => __DIR__ . '/includes/StreamFile.php',
-	'StringPrefixSearch' => __DIR__ . '/includes/PrefixSearch.php',
+	'StringPrefixSearch' => __DIR__ . '/includes/search/StringPrefixSearch.php',
 	'StringUtils' => __DIR__ . '/includes/libs/StringUtils.php',
 	'StripState' => __DIR__ . '/includes/parser/StripState.php',
 	'StubObject' => __DIR__ . '/includes/StubObject.php',
@@ -1491,7 +1491,7 @@ $wgAutoloadLocalClasses = [
 	'TitleCleanup' => __DIR__ . '/maintenance/cleanupTitles.php',
 	'TitleFormatter' => __DIR__ . '/includes/title/TitleFormatter.php',
 	'TitleParser' => __DIR__ . '/includes/title/TitleParser.php',
-	'TitlePrefixSearch' => __DIR__ . '/includes/PrefixSearch.php',
+	'TitlePrefixSearch' => __DIR__ . '/includes/search/TitlePrefixSearch.php',
 	'TitleValue' => __DIR__ . '/includes/title/TitleValue.php',
 	'TrackBlobs' => __DIR__ . '/maintenance/storage/trackBlobs.php',
 	'TrackingCategories' => __DIR__ . '/includes/TrackingCategories.php',
diff --git a/includes/PrefixSearch.php b/includes/search/PrefixSearch.php
similarity index 92%
rename from includes/PrefixSearch.php
rename to includes/search/PrefixSearch.php
index 7bc7a084a5..aa429b269d 100644
--- a/includes/PrefixSearch.php
+++ b/includes/search/PrefixSearch.php
@@ -325,41 +325,3 @@ abstract class PrefixSearch {
 		return [ NS_MAIN ];
 	}
 }
-
-/**
- * Performs prefix search, returning Title objects
- * @deprecated Since 1.27, Use SearchEngine::defaultPrefixSearch or SearchEngine::completionSearch
- * @ingroup Search
- */
-class TitlePrefixSearch extends PrefixSearch {
-
-	protected function titles( array $titles ) {
-		return $titles;
-	}
-
-	protected function strings( array $strings ) {
-		$titles = array_map( 'Title::newFromText', $strings );
-		$lb = new LinkBatch( $titles );
-		$lb->setCaller( __METHOD__ );
-		$lb->execute();
-		return $titles;
-	}
-}
-
-/**
- * Performs prefix search, returning strings
- * @deprecated Since 1.27, Use SearchEngine::prefixSearchSubpages or SearchEngine::completionSearch
- * @ingroup Search
- */
-class StringPrefixSearch extends PrefixSearch {
-
-	protected function titles( array $titles ) {
-		return array_map( function ( Title $t ) {
-			return $t->getPrefixedText();
-		}, $titles );
-	}
-
-	protected function strings( array $strings ) {
-		return $strings;
-	}
-}
diff --git a/includes/search/StringPrefixSearch.php b/includes/search/StringPrefixSearch.php
new file mode 100644
index 0000000000..517518e7fa
--- /dev/null
+++ b/includes/search/StringPrefixSearch.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Prefix search of page names.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ */
+
+/**
+ * Performs prefix search, returning strings
+ * @deprecated Since 1.27, Use SearchEngine::prefixSearchSubpages or SearchEngine::completionSearch
+ * @ingroup Search
+ */
+class StringPrefixSearch extends PrefixSearch {
+
+	protected function titles( array $titles ) {
+		return array_map( function ( Title $t ) {
+			return $t->getPrefixedText();
+		}, $titles );
+	}
+
+	protected function strings( array $strings ) {
+		return $strings;
+	}
+}
diff --git a/includes/search/TitlePrefixSearch.php b/includes/search/TitlePrefixSearch.php
new file mode 100644
index 0000000000..a548dbf920
--- /dev/null
+++ b/includes/search/TitlePrefixSearch.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Prefix search of page names.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ */
+
+/**
+ * Performs prefix search, returning Title objects
+ * @deprecated Since 1.27, Use SearchEngine::defaultPrefixSearch or SearchEngine::completionSearch
+ * @ingroup Search
+ */
+class TitlePrefixSearch extends PrefixSearch {
+
+	protected function titles( array $titles ) {
+		return $titles;
+	}
+
+	protected function strings( array $strings ) {
+		$titles = array_map( 'Title::newFromText', $strings );
+		$lb = new LinkBatch( $titles );
+		$lb->setCaller( __METHOD__ );
+		$lb->execute();
+		return $titles;
+	}
+}
-- 
2.20.1