Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/398630 )
Change subject: Move ApiFeatureUsageQueryEngineElasticaConnection to own file
......................................................................
Move ApiFeatureUsageQueryEngineElasticaConnection to own file
Makes MediaWiki.Files.OneClassPerFile.MultipleFound pass
Change-Id: I587ef41434d9bbca1de5869c9b9cd2f8083e7227
---
M .phpcs.xml
M ApiFeatureUsageQueryEngineElastica.php
A ApiFeatureUsageQueryEngineElasticaConnection.php
M extension.json
4 files changed, 30 insertions(+), 32 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ApiFeatureUsage
refs/changes/30/398630/1
diff --git a/.phpcs.xml b/.phpcs.xml
index 2005fa3..d87bc24 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -6,10 +6,8 @@
<exclude
name="MediaWiki.Commenting.FunctionComment.MissingParamComment" />
<exclude
name="MediaWiki.Commenting.FunctionComment.MissingParamTag" />
<exclude name="MediaWiki.Files.ClassMatchesFilename.NotMatch" />
- <exclude name="MediaWiki.Files.OneClassPerFile.MultipleFound" />
</rule>
<file>.</file>
<arg name="extensions" value="php,php5,inc"/>
<arg name="encoding" value="UTF-8"/>
- <exclude-pattern>vendor</exclude-pattern>
</ruleset>
diff --git a/ApiFeatureUsageQueryEngineElastica.php
b/ApiFeatureUsageQueryEngineElastica.php
index 2102dfe..fdc22c5 100644
--- a/ApiFeatureUsageQueryEngineElastica.php
+++ b/ApiFeatureUsageQueryEngineElastica.php
@@ -167,32 +167,3 @@
}
}
}
-
-/**
- * Class to create the connection
- */
-class ApiFeatureUsageQueryEngineElasticaConnection extends ElasticaConnection {
- private $options = [];
-
- public function __construct( $options = null ) {
- if ( !is_array( $options ) ) {
- $options = [];
- }
-
- if ( empty( $options['serverList'] ) || !is_array(
$options['serverList'] ) ) {
- throw new MWException( __METHOD__ . ': serverList is
not set or is not valid.' );
- }
-
- $this->options = $options + [
- 'maxConnectionAttempts' => 1,
- ];
- }
-
- public function getServerList() {
- return $this->options['serverList'];
- }
-
- public function getMaxConnectionAttempts() {
- return $this->options['maxConnectionAttempts'];
- }
-}
diff --git a/ApiFeatureUsageQueryEngineElasticaConnection.php
b/ApiFeatureUsageQueryEngineElasticaConnection.php
new file mode 100644
index 0000000..81e7a6e
--- /dev/null
+++ b/ApiFeatureUsageQueryEngineElasticaConnection.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Class to create the connection
+ */
+class ApiFeatureUsageQueryEngineElasticaConnection extends ElasticaConnection {
+ private $options = [];
+
+ public function __construct( $options = null ) {
+ if ( !is_array( $options ) ) {
+ $options = [];
+ }
+
+ if ( empty( $options['serverList'] ) || !is_array(
$options['serverList'] ) ) {
+ throw new MWException( __METHOD__ . ': serverList is
not set or is not valid.' );
+ }
+
+ $this->options = $options + [
+ 'maxConnectionAttempts' => 1,
+ ];
+ }
+
+ public function getServerList() {
+ return $this->options['serverList'];
+ }
+
+ public function getMaxConnectionAttempts() {
+ return $this->options['maxConnectionAttempts'];
+ }
+}
diff --git a/extension.json b/extension.json
index 8ffef14..7ae1b91 100644
--- a/extension.json
+++ b/extension.json
@@ -34,7 +34,7 @@
"ApiQueryFeatureUsage": "ApiQueryFeatureUsage.php",
"ApiFeatureUsageQueryEngine": "ApiFeatureUsageQueryEngine.php",
"ApiFeatureUsageQueryEngineElastica":
"ApiFeatureUsageQueryEngineElastica.php",
- "ApiFeatureUsageQueryEngineElasticaConnection":
"ApiFeatureUsageQueryEngineElastica.php",
+ "ApiFeatureUsageQueryEngineElasticaConnection":
"ApiFeatureUsageQueryEngineElasticaConnection.php",
"ApiFeatureUsageHooks": "ApiFeatureUsage.hooks.php"
},
"ResourceModules": {
--
To view, visit https://gerrit.wikimedia.org/r/398630
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I587ef41434d9bbca1de5869c9b9cd2f8083e7227
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ApiFeatureUsage
Gerrit-Branch: master
Gerrit-Owner: Umherirrender <umherirrender_de...@web.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
