jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/357454 )
Change subject: Put static after visibility in functions
......................................................................
Put static after visibility in functions
And abstract before visibility
This order is usually used
Change-Id: I9fd1d33e1ceea15ef11954e14735ae9ea7ff6558
---
M includes/BaseInterwikiResolver.php
M includes/ElasticsearchIntermediary.php
M includes/Maintenance/Reindexer.php
M includes/Maintenance/Validators/IndexAliasValidator.php
M includes/Search/RescoreBuilders.php
M includes/UserTesting.php
M includes/Util.php
7 files changed, 9 insertions(+), 9 deletions(-)
Approvals:
Cindy-the-browser-test-bot: Looks good to me, but someone else must approve
jenkins-bot: Verified
DCausse: Looks good to me, approved
diff --git a/includes/BaseInterwikiResolver.php
b/includes/BaseInterwikiResolver.php
index 0b13c83..3389281 100644
--- a/includes/BaseInterwikiResolver.php
+++ b/includes/BaseInterwikiResolver.php
@@ -67,5 +67,5 @@
*
* return array[]
*/
- protected abstract function loadMatrix();
+ abstract protected function loadMatrix();
}
diff --git a/includes/ElasticsearchIntermediary.php
b/includes/ElasticsearchIntermediary.php
index 7b87ebb..beb3b2a 100644
--- a/includes/ElasticsearchIntermediary.php
+++ b/includes/ElasticsearchIntermediary.php
@@ -257,7 +257,7 @@
* @param string $key
* @param string $value
*/
- static public function appendLastLogPayload( $key, $value ) {
+ public static function appendLastLogPayload( $key, $value ) {
self::$requestLogger->appendLastLogPayload( $key, $value );
}
diff --git a/includes/Maintenance/Reindexer.php
b/includes/Maintenance/Reindexer.php
index 3f96f77..0b99cf9 100644
--- a/includes/Maintenance/Reindexer.php
+++ b/includes/Maintenance/Reindexer.php
@@ -404,7 +404,7 @@
* @param Connection $dest Connection to reindex data into
* @return array|null
*/
- static public function makeRemoteReindexInfo( Connection $source,
Connection $dest ) {
+ public static function makeRemoteReindexInfo( Connection $source,
Connection $dest ) {
if ( $source->getClusterName() === $dest->getClusterName() ) {
return null;
}
diff --git a/includes/Maintenance/Validators/IndexAliasValidator.php
b/includes/Maintenance/Validators/IndexAliasValidator.php
index 174e190..35b8d1e 100644
--- a/includes/Maintenance/Validators/IndexAliasValidator.php
+++ b/includes/Maintenance/Validators/IndexAliasValidator.php
@@ -102,7 +102,7 @@
* @param string $name
* @return bool
*/
- protected abstract function shouldRemoveFromAlias( $name );
+ abstract protected function shouldRemoveFromAlias( $name );
/**
* @param string[] $add Array of indices to add
diff --git a/includes/Search/RescoreBuilders.php
b/includes/Search/RescoreBuilders.php
index 13f3458..e4f07a5 100644
--- a/includes/Search/RescoreBuilders.php
+++ b/includes/Search/RescoreBuilders.php
@@ -388,7 +388,7 @@
*
* @param FunctionScore $container
*/
- public abstract function append( FunctionScore $container );
+ abstract public function append( FunctionScore $container );
/**
* Utility method to extract a factor (float) that can
diff --git a/includes/UserTesting.php b/includes/UserTesting.php
index e3c6a21..aee0a83 100644
--- a/includes/UserTesting.php
+++ b/includes/UserTesting.php
@@ -194,7 +194,7 @@
* @param string[] $buckets List of buckets to choose from.
* @return string The chosen bucket.
*/
- static public function chooseBucket( $probability, $buckets ) {
+ public static function chooseBucket( $probability, $buckets ) {
$num = count( $buckets );
$each = 1 / $num;
$current = 0;
@@ -216,7 +216,7 @@
* @param string $hash
* @return float Probability between 0 and 1
*/
- static public function hexToProbability( $hash ) {
+ public static function hexToProbability( $hash ) {
if ( strlen( $hash ) === 0 ) {
throw new \RuntimeException( 'Empty hash provided' );
}
@@ -238,7 +238,7 @@
* returns a stable probability between 0 and 1. for all other
* requests returns 0.
*/
- static public function oneIn( $testName, $sampleRate ) {
+ public static function oneIn( $testName, $sampleRate ) {
$hash = Util::generateIdentToken( $testName );
$probability = self::hexToProbability( $hash );
$rateThreshold = 1 / $sampleRate;
diff --git a/includes/Util.php b/includes/Util.php
index 592b311..00dd519 100644
--- a/includes/Util.php
+++ b/includes/Util.php
@@ -430,7 +430,7 @@
/**
* @return string The context the request is in. Either cli, api or web.
*/
- static public function getExecutionContext() {
+ public static function getExecutionContext() {
if ( PHP_SAPI === 'cli' ) {
return 'cli';
} elseif ( defined( 'MW_API' ) ) {
--
To view, visit https://gerrit.wikimedia.org/r/357454
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9fd1d33e1ceea15ef11954e14735ae9ea7ff6558
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Umherirrender <umherirrender_de...@web.de>
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 <guillaume.leder...@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
