[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.10.1

2017-07-26 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/367945 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.10.1
..


build: Updating mediawiki/mediawiki-codesniffer to 0.10.1

Change-Id: I9b1a15b882925a572d2365d2cd442673d5a58cb5
---
M composer.json
M includes/Maintenance/Maintenance.php
M includes/OtherIndexes.php
M phpcs.xml
4 files changed, 7 insertions(+), 10 deletions(-)

Approvals:
  Tjones: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  Jforrester: Looks good to me, approved



diff --git a/composer.json b/composer.json
index c3e7bb5..b6cd741 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"jakub-onderka/php-console-highlighter": "0.3.2",
-   "mediawiki/mediawiki-codesniffer": "0.10.0"
+   "mediawiki/mediawiki-codesniffer": "0.10.1"
},
"scripts": {
"fix": "phpcbf",
diff --git a/includes/Maintenance/Maintenance.php 
b/includes/Maintenance/Maintenance.php
index 4ffd692..894049a 100644
--- a/includes/Maintenance/Maintenance.php
+++ b/includes/Maintenance/Maintenance.php
@@ -148,12 +148,12 @@
 */
public function loadSpecialVars() {
parent::loadSpecialVars();
-   if ( Maintenance::$indent === null ) {
+   if ( self::$indent === null ) {
// First script gets no indentation
-   Maintenance::$indent = '';
+   self::$indent = '';
} else {
// Others get one tab beyond the last
-   Maintenance::$indent = Maintenance::$indent . "\t";
+   self::$indent = self::$indent . "\t";
}
}
 
@@ -162,7 +162,7 @@
 * the next one gets the right indentation.
 */
public function done() {
-   Maintenance::$indent = substr( Maintenance::$indent, 1 );
+   self::$indent = substr( self::$indent, 1 );
}
 
/**
@@ -174,7 +174,7 @@
}
 
public function outputIndented( $message ) {
-   $this->output( Maintenance::$indent . $message );
+   $this->output( self::$indent . $message );
}
 
/**
diff --git a/includes/OtherIndexes.php b/includes/OtherIndexes.php
index a0a1617..075af0c 100644
--- a/includes/OtherIndexes.php
+++ b/includes/OtherIndexes.php
@@ -87,7 +87,7 @@
$findIdsMultiSearch = new MultiSearch( 
$this->connection->getClient() );
$findIdsClosures = [];
foreach ( $titles as $title ) {
-   foreach ( OtherIndexes::getExternalIndexes( $title ) as 
$otherIndex ) {
+   foreach ( self::getExternalIndexes( $title ) as 
$otherIndex ) {
if ( $otherIndex === null ) {
continue;
}
diff --git a/phpcs.xml b/phpcs.xml
index 631fadf..29d2435 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -6,7 +6,6 @@



-   



@@ -29,7 +28,5 @@
.


-   vendor
-   node_modules
tests/phan
 

-- 
To view, visit https://gerrit.wikimedia.org/r/367945
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I9b1a15b882925a572d2365d2cd442673d5a58cb5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: DCausse 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Gehel 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Smalyshev 
Gerrit-Reviewer: Tjones 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.10.1

2017-07-26 Thread Umherirrender (Code Review) 
Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/367945 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.10.1
..

build: Updating mediawiki/mediawiki-codesniffer to 0.10.1

Change-Id: I9b1a15b882925a572d2365d2cd442673d5a58cb5
---
M composer.json
M includes/Maintenance/Maintenance.php
M includes/OtherIndexes.php
M phpcs.xml
4 files changed, 7 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch 
refs/changes/45/367945/1

diff --git a/composer.json b/composer.json
index c3e7bb5..b6cd741 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"jakub-onderka/php-console-highlighter": "0.3.2",
-   "mediawiki/mediawiki-codesniffer": "0.10.0"
+   "mediawiki/mediawiki-codesniffer": "0.10.1"
},
"scripts": {
"fix": "phpcbf",
diff --git a/includes/Maintenance/Maintenance.php 
b/includes/Maintenance/Maintenance.php
index 4ffd692..894049a 100644
--- a/includes/Maintenance/Maintenance.php
+++ b/includes/Maintenance/Maintenance.php
@@ -148,12 +148,12 @@
 */
public function loadSpecialVars() {
parent::loadSpecialVars();
-   if ( Maintenance::$indent === null ) {
+   if ( self::$indent === null ) {
// First script gets no indentation
-   Maintenance::$indent = '';
+   self::$indent = '';
} else {
// Others get one tab beyond the last
-   Maintenance::$indent = Maintenance::$indent . "\t";
+   self::$indent = self::$indent . "\t";
}
}
 
@@ -162,7 +162,7 @@
 * the next one gets the right indentation.
 */
public function done() {
-   Maintenance::$indent = substr( Maintenance::$indent, 1 );
+   self::$indent = substr( self::$indent, 1 );
}
 
/**
@@ -174,7 +174,7 @@
}
 
public function outputIndented( $message ) {
-   $this->output( Maintenance::$indent . $message );
+   $this->output( self::$indent . $message );
}
 
/**
diff --git a/includes/OtherIndexes.php b/includes/OtherIndexes.php
index a0a1617..075af0c 100644
--- a/includes/OtherIndexes.php
+++ b/includes/OtherIndexes.php
@@ -87,7 +87,7 @@
$findIdsMultiSearch = new MultiSearch( 
$this->connection->getClient() );
$findIdsClosures = [];
foreach ( $titles as $title ) {
-   foreach ( OtherIndexes::getExternalIndexes( $title ) as 
$otherIndex ) {
+   foreach ( self::getExternalIndexes( $title ) as 
$otherIndex ) {
if ( $otherIndex === null ) {
continue;
}
diff --git a/phpcs.xml b/phpcs.xml
index 631fadf..29d2435 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -6,7 +6,6 @@



-   



@@ -29,7 +28,5 @@
.


-   vendor
-   node_modules
tests/phan
 

-- 
To view, visit https://gerrit.wikimedia.org/r/367945
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9b1a15b882925a572d2365d2cd442673d5a58cb5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits