[MediaWiki-commits] [Gerrit] mediawiki...PageImages[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/380212 )

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


build: Updating mediawiki/mediawiki-codesniffer to 13.0.0

Change-Id: Ide53c76f5c1cf7ae0313d06eeabc90de259e
---
M composer.json
M includes/LinksUpdateHookHandler.php
M includes/PageImages.php
M maintenance/initImageData.php
4 files changed, 4 insertions(+), 5 deletions(-)

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



diff --git a/composer.json b/composer.json
index 1f40cca..9a19236 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"jakub-onderka/php-console-highlighter": "0.3.2",
-   "mediawiki/mediawiki-codesniffer": "0.12.0"
+   "mediawiki/mediawiki-codesniffer": "13.0.0"
},
"scripts": {
"fix": "phpcbf",
diff --git a/includes/LinksUpdateHookHandler.php 
b/includes/LinksUpdateHookHandler.php
index da6de5f..41c905b 100644
--- a/includes/LinksUpdateHookHandler.php
+++ b/includes/LinksUpdateHookHandler.php
@@ -266,7 +266,7 @@
 * @return string[]
 */
private function getDbBlacklist( $dbName, $page ) {
-   $dbr = wfGetDB( DB_SLAVE, [], $dbName );
+   $dbr = wfGetDB( DB_REPLICA, [], $dbName );
$title = Title::newFromText( $page );
$list = [];
 
diff --git a/includes/PageImages.php b/includes/PageImages.php
index 16c9e5f..dacb748 100644
--- a/includes/PageImages.php
+++ b/includes/PageImages.php
@@ -47,7 +47,7 @@
 * @return File|bool
 */
public static function getPageImage( Title $title ) {
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
$fileName = $dbr->selectField( 'page_props',
[ 'pp_value' ],
[
diff --git a/maintenance/initImageData.php b/maintenance/initImageData.php
index 5bfd79c..776d55a 100644
--- a/maintenance/initImageData.php
+++ b/maintenance/initImageData.php
@@ -6,7 +6,6 @@
 }
 require_once "$IP/maintenance/Maintenance.php";
 
-use MediaWiki\MediaWikiServices;
 use PageImages\Job\InitImageDataJob;
 
 /**
@@ -51,7 +50,7 @@
'LEFT JOIN', 'page_id = il_from',
] ];
 
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
if ( $this->hasOption( 'namespaces' ) ) {
$ns = explode( ',', $this->getOption( 
'namespaces' ) );
$conds['page_namespace'] = $ns;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ide53c76f5c1cf7ae0313d06eeabc90de259e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageImages
Gerrit-Branch: master
Gerrit-Owner: Libraryupgrader 
Gerrit-Reviewer: Umherirrender 
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...PageImages[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/380212 )

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

build: Updating mediawiki/mediawiki-codesniffer to 13.0.0

Change-Id: Ide53c76f5c1cf7ae0313d06eeabc90de259e
---
M composer.json
M includes/LinksUpdateHookHandler.php
M includes/PageImages.php
M maintenance/initImageData.php
4 files changed, 4 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageImages 
refs/changes/12/380212/1

diff --git a/composer.json b/composer.json
index 1f40cca..9a19236 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"jakub-onderka/php-console-highlighter": "0.3.2",
-   "mediawiki/mediawiki-codesniffer": "0.12.0"
+   "mediawiki/mediawiki-codesniffer": "13.0.0"
},
"scripts": {
"fix": "phpcbf",
diff --git a/includes/LinksUpdateHookHandler.php 
b/includes/LinksUpdateHookHandler.php
index da6de5f..41c905b 100644
--- a/includes/LinksUpdateHookHandler.php
+++ b/includes/LinksUpdateHookHandler.php
@@ -266,7 +266,7 @@
 * @return string[]
 */
private function getDbBlacklist( $dbName, $page ) {
-   $dbr = wfGetDB( DB_SLAVE, [], $dbName );
+   $dbr = wfGetDB( DB_REPLICA, [], $dbName );
$title = Title::newFromText( $page );
$list = [];
 
diff --git a/includes/PageImages.php b/includes/PageImages.php
index 16c9e5f..dacb748 100644
--- a/includes/PageImages.php
+++ b/includes/PageImages.php
@@ -47,7 +47,7 @@
 * @return File|bool
 */
public static function getPageImage( Title $title ) {
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
$fileName = $dbr->selectField( 'page_props',
[ 'pp_value' ],
[
diff --git a/maintenance/initImageData.php b/maintenance/initImageData.php
index 5bfd79c..776d55a 100644
--- a/maintenance/initImageData.php
+++ b/maintenance/initImageData.php
@@ -6,7 +6,6 @@
 }
 require_once "$IP/maintenance/Maintenance.php";
 
-use MediaWiki\MediaWikiServices;
 use PageImages\Job\InitImageDataJob;
 
 /**
@@ -51,7 +50,7 @@
'LEFT JOIN', 'page_id = il_from',
] ];
 
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
if ( $this->hasOption( 'namespaces' ) ) {
$ns = explode( ',', $this->getOption( 
'namespaces' ) );
$conds['page_namespace'] = $ns;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ide53c76f5c1cf7ae0313d06eeabc90de259e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageImages
Gerrit-Branch: master
Gerrit-Owner: Libraryupgrader 

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