jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/334018 )
Change subject: Fix indentation in CirrusSearchIndexFieldFactory
......................................................................
Fix indentation in CirrusSearchIndexFieldFactory
spaces -> tabs
Change-Id: I0588a14968386e9c3c94e2b79c5ee4c33992476d
---
M includes/Search/CirrusSearchIndexFieldFactory.php
1 file changed, 24 insertions(+), 24 deletions(-)
Approvals:
Smalyshev: Looks good to me, approved
Cindy-the-browser-test-bot: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/includes/Search/CirrusSearchIndexFieldFactory.php
b/includes/Search/CirrusSearchIndexFieldFactory.php
index ae91558..579990e 100644
--- a/includes/Search/CirrusSearchIndexFieldFactory.php
+++ b/includes/Search/CirrusSearchIndexFieldFactory.php
@@ -39,32 +39,32 @@
$this->searchConfig = $searchConfig;
}
- /**
- * Create a search field definition
- * @param string $name
- * @param int $type
- * @throws Exception
- * @return SearchIndexField
- */
- public function makeSearchFieldMapping( $name, $type ) {
- $overrides = $this->searchConfig->get(
'CirrusSearchFieldTypeOverrides' );
- $mappings = $this->searchConfig->get( 'CirrusSearchFieldTypes' );
- if ( !isset( $mappings[$type] ) ) {
- return new NullIndexField();
- }
- $klass = $mappings[$type];
+ /**
+ * Create a search field definition
+ * @param string $name
+ * @param int $type
+ * @throws Exception
+ * @return SearchIndexField
+ */
+ public function makeSearchFieldMapping( $name, $type ) {
+ $overrides = $this->searchConfig->get(
'CirrusSearchFieldTypeOverrides' );
+ $mappings = $this->searchConfig->get( 'CirrusSearchFieldTypes'
);
+ if ( !isset( $mappings[$type] ) ) {
+ return new NullIndexField();
+ }
+ $klass = $mappings[$type];
- // Check if a specific class is provided for this field
- if ( isset( $overrides[$name] ) ) {
- if ( $klass !== $overrides[$name] && !is_subclass_of(
$overrides[$name], $klass ) ) {
- throw new Exception( "Specialized class " . $overrides[$name] .
- " for field $name is not compatible with type class
$klass" );
- }
- $klass = $overrides[$name];
- }
+ // Check if a specific class is provided for this field
+ if ( isset( $overrides[$name] ) ) {
+ if ( $klass !== $overrides[$name] && !is_subclass_of(
$overrides[$name], $klass ) ) {
+ throw new Exception( "Specialized class " .
$overrides[$name] .
+ " for field $name is not compatible
with type class $klass" );
+ }
+ $klass = $overrides[$name];
+ }
- return new $klass( $name, $type, $this->searchConfig );
- }
+ return new $klass( $name, $type, $this->searchConfig );
+ }
/**
* Build a string field that does standard analysis for the language.
--
To view, visit https://gerrit.wikimedia.org/r/334018
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0588a14968386e9c3c94e2b79c5ee4c33992476d
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Aude <aude.w...@gmail.com>
Gerrit-Reviewer: Cindy-the-browser-test-bot <bernhardsone...@gmail.com>
Gerrit-Reviewer: DCausse <dcau...@wikimedia.org>
Gerrit-Reviewer: EBernhardson <ebernhard...@wikimedia.org>
Gerrit-Reviewer: Gehel <gleder...@wikimedia.org>
Gerrit-Reviewer: Smalyshev <smalys...@wikimedia.org>
Gerrit-Reviewer: Tjones <tjo...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
