From 6745cb572a1dcffc838f61c7cd4234175b7f9bce Mon Sep 17 00:00:00 2001 From: Umherirrender Date: Fri, 29 Mar 2019 20:35:35 +0100 Subject: [PATCH] Move class SearchEngineDummy to own file Each class should have its own file, even it is a no-op Change-Id: I90124ed35e354c546fcd69d52dc1febb71b2c71f --- .phpcs.xml | 1 - autoload.php | 2 +- includes/search/SearchEngine.php | 10 --------- includes/search/SearchEngineDummy.php | 32 +++++++++++++++++++++++++++ 4 files changed, 33 insertions(+), 12 deletions(-) create mode 100644 includes/search/SearchEngineDummy.php diff --git a/.phpcs.xml b/.phpcs.xml index 2436fa7be8..80b3e411a2 100644 --- a/.phpcs.xml +++ b/.phpcs.xml @@ -228,7 +228,6 @@ */includes/parser/Preprocessor\.php */includes/PathRouter\.php */includes/profiler/SectionProfiler\.php - */includes/search/SearchEngine\.php */includes/specialpage/LoginSignupSpecialPage\.php */includes/specials/forms/PreferencesFormLegacy\.php */includes/StubObject\.php diff --git a/autoload.php b/autoload.php index 2abf2f8829..6f25ebe0f5 100644 --- a/autoload.php +++ b/autoload.php @@ -1300,7 +1300,7 @@ $wgAutoloadLocalClasses = [ 'SearchDump' => __DIR__ . '/maintenance/dumpIterator.php', 'SearchEngine' => __DIR__ . '/includes/search/SearchEngine.php', 'SearchEngineConfig' => __DIR__ . '/includes/search/SearchEngineConfig.php', - 'SearchEngineDummy' => __DIR__ . '/includes/search/SearchEngine.php', + 'SearchEngineDummy' => __DIR__ . '/includes/search/SearchEngineDummy.php', 'SearchEngineFactory' => __DIR__ . '/includes/search/SearchEngineFactory.php', 'SearchExactMatchRescorer' => __DIR__ . '/includes/search/SearchExactMatchRescorer.php', 'SearchHighlighter' => __DIR__ . '/includes/search/SearchHighlighter.php', diff --git a/includes/search/SearchEngine.php b/includes/search/SearchEngine.php index 0b29dd7480..4cba19e147 100644 --- a/includes/search/SearchEngine.php +++ b/includes/search/SearchEngine.php @@ -894,13 +894,3 @@ abstract class SearchEngine { } } } - -/** - * Dummy class to be used when non-supported Database engine is present. - * @todo FIXME: Dummy class should probably try something at least mildly useful, - * such as a LIKE search through titles. - * @ingroup Search - */ -class SearchEngineDummy extends SearchEngine { - // no-op -} diff --git a/includes/search/SearchEngineDummy.php b/includes/search/SearchEngineDummy.php new file mode 100644 index 0000000000..b3db28bd3a --- /dev/null +++ b/includes/search/SearchEngineDummy.php @@ -0,0 +1,32 @@ +