[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: build: Updating mediawiki/mediawiki-codesniffer to 13.0.0

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

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


build: Updating mediawiki/mediawiki-codesniffer to 13.0.0

Change-Id: I51d6a9d4f6af002e02d57677cf47f5231f16eee7
---
M composer.json
M includes/MobileContext.php
M includes/MobileFrontend.hooks.php
M includes/content-providers/DefaultContentProvider.php
M includes/content-providers/McsContentProvider.php
M includes/content-providers/MwApiContentProvider.php
M includes/specials/SpecialMobileContributions.php
M includes/specials/SpecialMobileHistory.php
M includes/specials/SpecialMobileWatchlist.php
M includes/specials/SpecialUploads.php
10 files changed, 9 insertions(+), 15 deletions(-)

Approvals:
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/composer.json b/composer.json
index daa26e1..1c8beff 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
-   "mediawiki/mediawiki-codesniffer": "0.12.0",
+   "mediawiki/mediawiki-codesniffer": "13.0.0",
"jakub-onderka/php-console-highlighter": "0.3.2"
},
"scripts": {
diff --git a/includes/MobileContext.php b/includes/MobileContext.php
index a4078df..6fa37f5 100644
--- a/includes/MobileContext.php
+++ b/includes/MobileContext.php
@@ -513,7 +513,7 @@
if ( $noMobileCategory && $title ) {
$id = $title->getArticleID();
if ( $id ) {
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
if ( $dbr->selectField( 'categorylinks',
'cl_from',
[ 'cl_from' => $id, 'cl_to' => 
$noMobileCategory ],
diff --git a/includes/MobileFrontend.hooks.php 
b/includes/MobileFrontend.hooks.php
index 747dacb..e63b4ca 100644
--- a/includes/MobileFrontend.hooks.php
+++ b/includes/MobileFrontend.hooks.php
@@ -4,8 +4,6 @@
  */
 
 use MediaWiki\Auth\AuthManager;
-use MediaWiki\MediaWikiServices;
-use MediaWiki\Logger\LoggerFactory;
 
 /**
  * Hook handlers for MobileFrontend extension
diff --git a/includes/content-providers/DefaultContentProvider.php 
b/includes/content-providers/DefaultContentProvider.php
index ad10e2f..9b5d77e 100644
--- a/includes/content-providers/DefaultContentProvider.php
+++ b/includes/content-providers/DefaultContentProvider.php
@@ -2,8 +2,6 @@
 
 namespace MobileFrontend\ContentProviders;
 
-use MobileFrontend\ContentProviders\IContentProvider;
-
 class DefaultContentProvider implements IContentProvider {
/**
 * Constructor
diff --git a/includes/content-providers/McsContentProvider.php 
b/includes/content-providers/McsContentProvider.php
index bcf44a3..3c8307d 100644
--- a/includes/content-providers/McsContentProvider.php
+++ b/includes/content-providers/McsContentProvider.php
@@ -2,7 +2,6 @@
 
 namespace MobileFrontend\ContentProviders;
 
-use MobileFrontend\ContentProviders\IContentProvider;
 use OutputPage;
 
 /**
diff --git a/includes/content-providers/MwApiContentProvider.php 
b/includes/content-providers/MwApiContentProvider.php
index 737b234..463b94a 100644
--- a/includes/content-providers/MwApiContentProvider.php
+++ b/includes/content-providers/MwApiContentProvider.php
@@ -2,7 +2,6 @@
 
 namespace MobileFrontend\ContentProviders;
 
-use MobileFrontend\ContentProviders\IContentProvider;
 use OutputPage;
 
 class MwApiContentProvider implements IContentProvider {
diff --git a/includes/specials/SpecialMobileContributions.php 
b/includes/specials/SpecialMobileContributions.php
index 95eeedc..769f126 100644
--- a/includes/specials/SpecialMobileContributions.php
+++ b/includes/specials/SpecialMobileContributions.php
@@ -99,7 +99,7 @@
$prevRevs[] = $rev->getParentId();
}
}
-   $this->prevLengths = Revision::getParentLengths( wfGetDB( 
DB_SLAVE ), $prevRevs );
+   $this->prevLengths = Revision::getParentLengths( wfGetDB( 
DB_REPLICA ), $prevRevs );
if ( $numRows > 0 ) {
$count = 0;
foreach ( $revs as $rev ) {
@@ -174,7 +174,7 @@
 */
protected function getQueryConditions() {
$conds = [];
-   $dbr = wfGetDB( DB_SLAVE, self::DB_REVISIONS_TABLE );
+   $dbr = wfGetDB( DB_REPLICA, self::DB_REVISIONS_TABLE );
 
if ( $this->user ) {
if ( $this->user->getId() ) {
diff --git a/includes/specials/SpecialMobileHistory.php 
b/includes/specials/SpecialMobileHistory.php
index 3a1dc5d..d8760dd 100644
--- a/includes/specials/SpecialMobileHistory.php
+++ b/includ

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: build: Updating mediawiki/mediawiki-codesniffer to 13.0.0

2017-09-23 Thread Libraryupgrader (Code Review) 
Libraryupgrader has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/380195 )

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

build: Updating mediawiki/mediawiki-codesniffer to 13.0.0

Change-Id: I51d6a9d4f6af002e02d57677cf47f5231f16eee7
---
M composer.json
M includes/MobileContext.php
M includes/MobileFrontend.hooks.php
M includes/content-providers/DefaultContentProvider.php
M includes/content-providers/McsContentProvider.php
M includes/content-providers/MwApiContentProvider.php
M includes/specials/SpecialMobileContributions.php
M includes/specials/SpecialMobileHistory.php
M includes/specials/SpecialMobileWatchlist.php
M includes/specials/SpecialUploads.php
10 files changed, 9 insertions(+), 15 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend 
refs/changes/95/380195/1

diff --git a/composer.json b/composer.json
index daa26e1..1c8beff 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
-   "mediawiki/mediawiki-codesniffer": "0.12.0",
+   "mediawiki/mediawiki-codesniffer": "13.0.0",
"jakub-onderka/php-console-highlighter": "0.3.2"
},
"scripts": {
diff --git a/includes/MobileContext.php b/includes/MobileContext.php
index a4078df..6fa37f5 100644
--- a/includes/MobileContext.php
+++ b/includes/MobileContext.php
@@ -513,7 +513,7 @@
if ( $noMobileCategory && $title ) {
$id = $title->getArticleID();
if ( $id ) {
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
if ( $dbr->selectField( 'categorylinks',
'cl_from',
[ 'cl_from' => $id, 'cl_to' => 
$noMobileCategory ],
diff --git a/includes/MobileFrontend.hooks.php 
b/includes/MobileFrontend.hooks.php
index 747dacb..e63b4ca 100644
--- a/includes/MobileFrontend.hooks.php
+++ b/includes/MobileFrontend.hooks.php
@@ -4,8 +4,6 @@
  */
 
 use MediaWiki\Auth\AuthManager;
-use MediaWiki\MediaWikiServices;
-use MediaWiki\Logger\LoggerFactory;
 
 /**
  * Hook handlers for MobileFrontend extension
diff --git a/includes/content-providers/DefaultContentProvider.php 
b/includes/content-providers/DefaultContentProvider.php
index ad10e2f..9b5d77e 100644
--- a/includes/content-providers/DefaultContentProvider.php
+++ b/includes/content-providers/DefaultContentProvider.php
@@ -2,8 +2,6 @@
 
 namespace MobileFrontend\ContentProviders;
 
-use MobileFrontend\ContentProviders\IContentProvider;
-
 class DefaultContentProvider implements IContentProvider {
/**
 * Constructor
diff --git a/includes/content-providers/McsContentProvider.php 
b/includes/content-providers/McsContentProvider.php
index bcf44a3..3c8307d 100644
--- a/includes/content-providers/McsContentProvider.php
+++ b/includes/content-providers/McsContentProvider.php
@@ -2,7 +2,6 @@
 
 namespace MobileFrontend\ContentProviders;
 
-use MobileFrontend\ContentProviders\IContentProvider;
 use OutputPage;
 
 /**
diff --git a/includes/content-providers/MwApiContentProvider.php 
b/includes/content-providers/MwApiContentProvider.php
index 737b234..463b94a 100644
--- a/includes/content-providers/MwApiContentProvider.php
+++ b/includes/content-providers/MwApiContentProvider.php
@@ -2,7 +2,6 @@
 
 namespace MobileFrontend\ContentProviders;
 
-use MobileFrontend\ContentProviders\IContentProvider;
 use OutputPage;
 
 class MwApiContentProvider implements IContentProvider {
diff --git a/includes/specials/SpecialMobileContributions.php 
b/includes/specials/SpecialMobileContributions.php
index 95eeedc..769f126 100644
--- a/includes/specials/SpecialMobileContributions.php
+++ b/includes/specials/SpecialMobileContributions.php
@@ -99,7 +99,7 @@
$prevRevs[] = $rev->getParentId();
}
}
-   $this->prevLengths = Revision::getParentLengths( wfGetDB( 
DB_SLAVE ), $prevRevs );
+   $this->prevLengths = Revision::getParentLengths( wfGetDB( 
DB_REPLICA ), $prevRevs );
if ( $numRows > 0 ) {
$count = 0;
foreach ( $revs as $rev ) {
@@ -174,7 +174,7 @@
 */
protected function getQueryConditions() {
$conds = [];
-   $dbr = wfGetDB( DB_SLAVE, self::DB_REVISIONS_TABLE );
+   $dbr = wfGetDB( DB_REPLICA, self::DB_REVISIONS_TABLE );
 
if ( $this->user ) {
if ( $this->user->getId() ) {
diff --git a/includes/specials/SpecialMobileHistory.php 
b/includes/specials/SpecialMobileHistory.php
index 3a1dc5d..d8760dd 100644
--- a/includes/specials/SpecialMo