date:20170924

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: Add deadLinkTag = { for sr wiki

2017-09-24 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/379976 )

Change subject: Add deadLinkTag = { for sr wiki
..


Add deadLinkTag = { for sr wiki

Bug: T175482
Change-Id: Iae444e6b7a868801b92340a23f800be3b265149d
---
M scripts/reflinks.py
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/scripts/reflinks.py b/scripts/reflinks.py
index c178b0c..7f39ae8 100755
--- a/scripts/reflinks.py
+++ b/scripts/reflinks.py
@@ -112,6 +112,7 @@
 'en': u'[%s] {{dead link}}',
 'pl': u'[%s] {{Martwy link}}',
 'ru': u'[%s] {{subst:dead}}',
+'sr': '[%s] {{dead link}}',
 }
 
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iae444e6b7a868801b92340a23f800be3b265149d
Gerrit-PatchSet: 6
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Zoranzoki21 
Gerrit-Reviewer: Dvorapa 
Gerrit-Reviewer: Framawiki 
Gerrit-Reviewer: Magul 
Gerrit-Reviewer: Xqt 
Gerrit-Reviewer: Zoranzoki21 
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...GlobalUserPage[master]: Delete deprecated PHP entrypoint shim

2017-09-24 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/380425 )

Change subject: Delete deprecated PHP entrypoint shim
..


Delete deprecated PHP entrypoint shim

This extension already requires 1.28+ too.

Change-Id: Ib283d75cad8f950021ae8ea201e52938a4be04c8
---
D GlobalUserPage.php
1 file changed, 0 insertions(+), 15 deletions(-)

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



diff --git a/GlobalUserPage.php b/GlobalUserPage.php
deleted file mode 100644
index 59a15a5..000
--- a/GlobalUserPage.php
+++ /dev/null
@@ -1,15 +0,0 @@
-https://www.mediawiki.org/wiki/Extension_registration for 
more details.'
-   ); */
-   return true;
-} else {
-   die( 'This version of the GlobalUserPage extension requires MediaWiki 
1.25+' );
-}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib283d75cad8f950021ae8ea201e52938a4be04c8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GlobalUserPage
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] analytics...WDCM[master]: WDCM Usage Dashboard

2017-09-24 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/380428 )

Change subject: WDCM Usage Dashboard
..


WDCM Usage Dashboard

Change-Id: I64588ca4965f855d569733dabcb1eb9178094071
---
A WDCM_UsageDashboard/server.R
A WDCM_UsageDashboard/ui.R
2 files changed, 1,048 insertions(+), 0 deletions(-)

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



diff --git a/WDCM_UsageDashboard/server.R b/WDCM_UsageDashboard/server.R
new file mode 100644
index 000..1f40e6a
--- /dev/null
+++ b/WDCM_UsageDashboard/server.R
@@ -0,0 +1,621 @@
+### ---
+### --- WDCM Usage Dashboard, v. Beta 0.1
+### --- Script: server.R, v. Beta 0.1
+### ---
+
+### --- Setup
+rm(list = ls())
+### 
+### --- general
+library(shiny)
+library(shinydashboard)
+library(RMySQL)
+library(data.table)
+library(DT)
+library(stringr)
+library(tidyr)
+library(dplyr)
+library(reshape2)
+### --- compute
+library(parallelDist)
+library(smacof)
+### --- visualization
+library(wordcloud)
+library(RColorBrewer)
+library(visNetwork)
+library(rbokeh)
+library(networkD3)
+library(ggplot2)
+library(ggrepel)
+library(scales)
+library(ggvis)
+
+### --- Server (Session) Scope
+### 
+
+### --- Credentials
+# setwd('/home/goransm/WMDE/WDCM/WDCM_RScripts/WDCM_Dashboard/aux')
+setwd('/srv/shiny-server/WDCM_Dashboard/aux')
+
+mySQLCreds <- fread("mySQLCreds.csv", 
+header = T,
+drop = 1)
+
+### -- Connect
+con <- dbConnect(MySQL(), 
+ host = "tools.labsdb", 
+ defult.file = 
"/home/goransm/mySQL_Credentials/replica.my.cnf",
+ dbname = "u16664__wdcm_p",
+ user = mySQLCreds$user,
+ password = mySQLCreds$password)
+
+### --- list existing tables
+q <- "SHOW TABLES;"
+res <- dbSendQuery(con, q)
+st <- fetch(res, -1)
+dbClearResult(res)
+colnames(st) <- "tables"
+
+### --- fetch wdcm2_project
+q <- "SELECT * FROM wdcm2_project;"
+res <- dbSendQuery(con, q)
+wdcmProject <- fetch(res, -1)
+dbClearResult(res)
+colnames(wdcmProject) <- c('Project', 'Usage', 'Project Type')
+
+### --- fetch wdcm2_project_category
+q <- "SELECT * FROM wdcm2_project_category;"
+res <- dbSendQuery(con, q)
+wdcmProjectCategory <- fetch(res, -1)
+dbClearResult(res) 
+colnames(wdcmProjectCategory) <- c('Project', 'Category', 'Usage', 'Project 
Type')
+
+### --- fetch wdcm2_project_item100
+q <- "SELECT * FROM wdcm2_project_item100;"
+res <- dbSendQuery(con, q)
+wdcmProjectItem100 <- fetch(res, -1)
+dbClearResult(res) 
+colnames(wdcmProjectItem100) <- c('Project', 'EntityID', 'Usage', 'Project 
Type', 'Label')
+
+### --- fetch wdcm2_project_category_item100
+q <- "SELECT * FROM wdcm2_project_category_item100;"
+res <- dbSendQuery(con, q)
+wdcmProjectCategoryItem100 <- fetch(res, -1)
+dbClearResult(res) 
+colnames(wdcmProjectCategoryItem100) <- c('Project', 'Category', 'EntityID', 
'Usage', 'Project Type', 'Label')
+
+### --- fetch wdcm2_category
+q <- "SELECT * FROM wdcm2_category;"
+res <- dbSendQuery(con, q)
+wdcmCategory <- fetch(res, -1)
+dbClearResult(res) 
+colnames(wdcmCategory) <- c('Category', 'Usage')
+
+### --- fetch wdcm2_category_item100
+q <- "SELECT * FROM wdcm2_category_item100;"
+res <- dbSendQuery(con, q)
+wdcmCategoryItem100 <- fetch(res, -1)
+dbClearResult(res) 
+colnames(wdcmCategoryItem100) <- c('EntityID', 'Usage', 'Category', 'Label')
+
+### --- Disconnect
+dbDisconnect(con)
+
+### --- Compute per `Project Type` tables
+# - wdcmProjectType
+wdcmProjectType <- wdcmProject %>% 
+  group_by(`Project Type`) %>% 
+  summarise(Usage = sum(Usage)) %>% 
+  arrange(desc(Usage))
+# - wdcmProjectTypeCategory
+wdcmProjectTypeCategory <- wdcmProjectCategory %>% 
+  group_by(`Project Type`, Category) %>% 
+  summarise(Usage = sum(Usage)) %>% 
+  arrange(desc(Usage))
+# - wdcmProjectTypeItem100
+wdcmProjectTypeItem100 <- wdcmProjectItem100 %>% 
+  select(`Project Type`, EntityID, Label, Usage) %>% 
+  group_by(`Project Type`, EntityID, Label) %>% 
+  summarise(Usage = sum(Usage)) %>% 
+  arrange(`Project Type`, desc(Usage))
+
+### --- Compute project similarity structure
+projectSimilarity <- wdcmProjectCategory %>% 
+  dplyr::select(Project, Category, Usage) %>% 
+  tidyr::spread(key = Category,
+ value = Usage,
+ fill = 0)
+projectNames <- projectSimilarity$Project
+projectSimilarity$Project <- NULL
+# - normalize:
+projectSimilarity <- t(apply(projectSimilarity, 1, function(x) {x/sum(x)}))
+# projectSimilarity[projectSimilarity > 0] <- 1
+projectSimilarity <- as.matrix(parDist(as.matrix(projectSimilarity), method = 
"kullback"))
+rownames(projectSimilarity) <- projectNames
+colnames(projectSimilarity) <-

[MediaWiki-commits] [Gerrit] analytics...WDCM[master]: 09/05/2016 commit to Gerrit from current WDCM official

2017-09-24 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/380427 )

Change subject: 09/05/2016 commit to Gerrit from current WDCM official
..


09/05/2016 commit to Gerrit from current WDCM official

Change-Id: Ib5f3c040ea9ff44a4c72d489d63e9e6c58520307
---
M README.md
A WDCM.Rproj
M WDCM_Collect_Items.R
A WDCM_Dahsboard/server.R
A WDCM_Dahsboard/ui.R
A WDCM_OverviewDashboard/server.R
A WDCM_OverviewDashboard/ui.R
M WDCM_Pre-Process.R
A WDCM_Process_v2.R
M WDCM_TechDocumentation/WikidataConcepts_TechDocumentation.odt
A WDC_Aux.R
A _misc/.directory
A _misc/SqoopRuntime.png
A _misc/WDCM_Navigate.html
A _misc/WDCM_OverviewDashboard_Description.html
A _misc/clienttables.tsv
A _misc/databasesTest.tsv
A _misc/hiveQLQuery.hql
A _misc/hiveQLQueryTest.hql
A _misc/projectsTracking.csv
A _misc/wdcmSearchReport_2017-08-01 08:18:50.csv
A _misc/wdcmSqoopReport_2017-07-21 10:31:45.csv
A creds.csv
A currentStats.csv
M server.R
M ui.R
26 files changed, 7,008 insertions(+), 56 deletions(-)

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib5f3c040ea9ff44a4c72d489d63e9e6c58520307
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wmde/WDCM
Gerrit-Branch: master
Gerrit-Owner: GoranSMilovanovic 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: GoranSMilovanovic 
Gerrit-Reviewer: Tobias Gritschacher 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] analytics...WDCM[master]: 09/05/2016 commit to Gerrit from current WDCM official

2017-09-24 Thread GoranSMilovanovic (Code Review)

GoranSMilovanovic has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/380427 )

Change subject: 09/05/2016 commit to Gerrit from current WDCM official
..

09/05/2016 commit to Gerrit from current WDCM official

Change-Id: Ib5f3c040ea9ff44a4c72d489d63e9e6c58520307
---
M README.md
A WDCM.Rproj
M WDCM_Collect_Items.R
A WDCM_Dahsboard/server.R
A WDCM_Dahsboard/ui.R
A WDCM_OverviewDashboard/server.R
A WDCM_OverviewDashboard/ui.R
M WDCM_Pre-Process.R
A WDCM_Process_v2.R
M WDCM_TechDocumentation/WikidataConcepts_TechDocumentation.odt
A WDC_Aux.R
A _misc/.directory
A _misc/SqoopRuntime.png
A _misc/WDCM_Navigate.html
A _misc/WDCM_OverviewDashboard_Description.html
A _misc/clienttables.tsv
A _misc/databasesTest.tsv
A _misc/hiveQLQuery.hql
A _misc/hiveQLQueryTest.hql
A _misc/projectsTracking.csv
A _misc/wdcmSearchReport_2017-08-01 08:18:50.csv
A _misc/wdcmSqoopReport_2017-07-21 10:31:45.csv
A creds.csv
A currentStats.csv
M server.R
M ui.R
26 files changed, 7,008 insertions(+), 56 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/wmde/WDCM 
refs/changes/27/380427/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib5f3c040ea9ff44a4c72d489d63e9e6c58520307
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wmde/WDCM
Gerrit-Branch: master
Gerrit-Owner: GoranSMilovanovic 

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

[MediaWiki-commits] [Gerrit] analytics...WDCM[master]: WDCM Usage Dashboard

2017-09-24 Thread GoranSMilovanovic (Code Review)

GoranSMilovanovic has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/380428 )

Change subject: WDCM Usage Dashboard
..

WDCM Usage Dashboard

Change-Id: I64588ca4965f855d569733dabcb1eb9178094071
---
A WDCM_UsageDashboard/server.R
A WDCM_UsageDashboard/ui.R
2 files changed, 1,048 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/wmde/WDCM 
refs/changes/28/380428/1

diff --git a/WDCM_UsageDashboard/server.R b/WDCM_UsageDashboard/server.R
new file mode 100644
index 000..1f40e6a
--- /dev/null
+++ b/WDCM_UsageDashboard/server.R
@@ -0,0 +1,621 @@
+### ---
+### --- WDCM Usage Dashboard, v. Beta 0.1
+### --- Script: server.R, v. Beta 0.1
+### ---
+
+### --- Setup
+rm(list = ls())
+### 
+### --- general
+library(shiny)
+library(shinydashboard)
+library(RMySQL)
+library(data.table)
+library(DT)
+library(stringr)
+library(tidyr)
+library(dplyr)
+library(reshape2)
+### --- compute
+library(parallelDist)
+library(smacof)
+### --- visualization
+library(wordcloud)
+library(RColorBrewer)
+library(visNetwork)
+library(rbokeh)
+library(networkD3)
+library(ggplot2)
+library(ggrepel)
+library(scales)
+library(ggvis)
+
+### --- Server (Session) Scope
+### 
+
+### --- Credentials
+# setwd('/home/goransm/WMDE/WDCM/WDCM_RScripts/WDCM_Dashboard/aux')
+setwd('/srv/shiny-server/WDCM_Dashboard/aux')
+
+mySQLCreds <- fread("mySQLCreds.csv", 
+header = T,
+drop = 1)
+
+### -- Connect
+con <- dbConnect(MySQL(), 
+ host = "tools.labsdb", 
+ defult.file = 
"/home/goransm/mySQL_Credentials/replica.my.cnf",
+ dbname = "u16664__wdcm_p",
+ user = mySQLCreds$user,
+ password = mySQLCreds$password)
+
+### --- list existing tables
+q <- "SHOW TABLES;"
+res <- dbSendQuery(con, q)
+st <- fetch(res, -1)
+dbClearResult(res)
+colnames(st) <- "tables"
+
+### --- fetch wdcm2_project
+q <- "SELECT * FROM wdcm2_project;"
+res <- dbSendQuery(con, q)
+wdcmProject <- fetch(res, -1)
+dbClearResult(res)
+colnames(wdcmProject) <- c('Project', 'Usage', 'Project Type')
+
+### --- fetch wdcm2_project_category
+q <- "SELECT * FROM wdcm2_project_category;"
+res <- dbSendQuery(con, q)
+wdcmProjectCategory <- fetch(res, -1)
+dbClearResult(res) 
+colnames(wdcmProjectCategory) <- c('Project', 'Category', 'Usage', 'Project 
Type')
+
+### --- fetch wdcm2_project_item100
+q <- "SELECT * FROM wdcm2_project_item100;"
+res <- dbSendQuery(con, q)
+wdcmProjectItem100 <- fetch(res, -1)
+dbClearResult(res) 
+colnames(wdcmProjectItem100) <- c('Project', 'EntityID', 'Usage', 'Project 
Type', 'Label')
+
+### --- fetch wdcm2_project_category_item100
+q <- "SELECT * FROM wdcm2_project_category_item100;"
+res <- dbSendQuery(con, q)
+wdcmProjectCategoryItem100 <- fetch(res, -1)
+dbClearResult(res) 
+colnames(wdcmProjectCategoryItem100) <- c('Project', 'Category', 'EntityID', 
'Usage', 'Project Type', 'Label')
+
+### --- fetch wdcm2_category
+q <- "SELECT * FROM wdcm2_category;"
+res <- dbSendQuery(con, q)
+wdcmCategory <- fetch(res, -1)
+dbClearResult(res) 
+colnames(wdcmCategory) <- c('Category', 'Usage')
+
+### --- fetch wdcm2_category_item100
+q <- "SELECT * FROM wdcm2_category_item100;"
+res <- dbSendQuery(con, q)
+wdcmCategoryItem100 <- fetch(res, -1)
+dbClearResult(res) 
+colnames(wdcmCategoryItem100) <- c('EntityID', 'Usage', 'Category', 'Label')
+
+### --- Disconnect
+dbDisconnect(con)
+
+### --- Compute per `Project Type` tables
+# - wdcmProjectType
+wdcmProjectType <- wdcmProject %>% 
+  group_by(`Project Type`) %>% 
+  summarise(Usage = sum(Usage)) %>% 
+  arrange(desc(Usage))
+# - wdcmProjectTypeCategory
+wdcmProjectTypeCategory <- wdcmProjectCategory %>% 
+  group_by(`Project Type`, Category) %>% 
+  summarise(Usage = sum(Usage)) %>% 
+  arrange(desc(Usage))
+# - wdcmProjectTypeItem100
+wdcmProjectTypeItem100 <- wdcmProjectItem100 %>% 
+  select(`Project Type`, EntityID, Label, Usage) %>% 
+  group_by(`Project Type`, EntityID, Label) %>% 
+  summarise(Usage = sum(Usage)) %>% 
+  arrange(`Project Type`, desc(Usage))
+
+### --- Compute project similarity structure
+projectSimilarity <- wdcmProjectCategory %>% 
+  dplyr::select(Project, Category, Usage) %>% 
+  tidyr::spread(key = Category,
+ value = Usage,
+ fill = 0)
+projectNames <- projectSimilarity$Project
+projectSimilarity$Project <- NULL
+# - normalize:
+projectSimilarity <- t(apply(projectSimilarity, 1, function(x) {x/sum(x)}))
+# projectSimilarity[projectSimilarity > 0] <- 1
+projectSimilarity <- as.matrix(parDist(as.matrix(projectSimilarity), method = 
"kullback"))
+rownames(projectSimilarity) <- projectNames
+colnames(projectSimilarity) <-

[MediaWiki-commits] [Gerrit] mediawiki...GlobalUserPage[master]: Delete deprecated PHP entrypoint shim

2017-09-24 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/380425 )

Change subject: Delete deprecated PHP entrypoint shim
..

Delete deprecated PHP entrypoint shim

This extension already requires 1.28+ too.

Change-Id: Ib283d75cad8f950021ae8ea201e52938a4be04c8
---
D GlobalUserPage.php
1 file changed, 0 insertions(+), 15 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GlobalUserPage 
refs/changes/25/380425/1

diff --git a/GlobalUserPage.php b/GlobalUserPage.php
deleted file mode 100644
index 59a15a5..000
--- a/GlobalUserPage.php
+++ /dev/null
@@ -1,15 +0,0 @@
-https://www.mediawiki.org/wiki/Extension_registration for 
more details.'
-   ); */
-   return true;
-} else {
-   die( 'This version of the GlobalUserPage extension requires MediaWiki 
1.25+' );
-}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib283d75cad8f950021ae8ea201e52938a4be04c8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GlobalUserPage
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] mediawiki...GlobalUserPage[master]: Namespace this extension

2017-09-24 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/380426 )

Change subject: Namespace this extension
..

Namespace this extension

Change-Id: I7756337a573de2a9187c31f8251e80c7f7d698f5
---
M extension.json
R includes/CacheInvalidator.php
R includes/GlobalUserPage.php
R includes/Hooks.php
R includes/LocalCacheUpdateJob.php
R includes/LocalJobSubmitJob.php
R includes/WikiGlobalUserPage.php
7 files changed, 95 insertions(+), 33 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GlobalUserPage 
refs/changes/26/380426/1

diff --git a/extension.json b/extension.json
index 36471ae..b44f07e 100644
--- a/extension.json
+++ b/extension.json
@@ -22,28 +22,28 @@
},
"Hooks": {
"GetPreferences": [
-   "GlobalUserPageHooks::onGetPreferences"
+   "MediaWiki\\GlobalUserPage\\Hooks::onGetPreferences"
],
"TitleIsAlwaysKnown": [
-   "GlobalUserPageHooks::onTitleIsAlwaysKnown"
+   "MediaWiki\\GlobalUserPage\\Hooks::onTitleIsAlwaysKnown"
],
"ArticleFromTitle": [
-   "GlobalUserPageHooks::onArticleFromTitle"
+   "MediaWiki\\GlobalUserPage\\Hooks::onArticleFromTitle"
],
"LinksUpdateComplete": [
-   "GlobalUserPageHooks::onLinksUpdateComplete"
+   
"MediaWiki\\GlobalUserPage\\Hooks::onLinksUpdateComplete"
],
"PageContentInsertComplete": [
-   "GlobalUserPageHooks::onPageContentInsertComplete"
+   
"MediaWiki\\GlobalUserPage\\Hooks::onPageContentInsertComplete"
],
"ArticleDeleteComplete": [
-   "GlobalUserPageHooks::onArticleDeleteComplete"
+   
"MediaWiki\\GlobalUserPage\\Hooks::onArticleDeleteComplete"
],
"TitleGetEditNotices": [
-   "GlobalUserPageHooks::onTitleGetEditNotices"
+   
"MediaWiki\\GlobalUserPage\\Hooks::onTitleGetEditNotices"
],
-   "GetDoubleUnderscoreIDs": 
"GlobalUserPageHooks::onGetDoubleUnderscoreIDs",
-   "WikiPageFactory": "GlobalUserPageHooks::onWikiPageFactory"
+   "GetDoubleUnderscoreIDs": 
"MediaWiki\\GlobalUserPage\\Hooks::onGetDoubleUnderscoreIDs",
+   "WikiPageFactory": 
"MediaWiki\\GlobalUserPage\\Hooks::onWikiPageFactory"
},
"config": {
"GlobalUserPageCacheExpiry": 604800,
@@ -63,19 +63,19 @@
"remoteExtPath": "GlobalUserPage"
},
"JobClasses": {
-   "GlobalUserPageLocalJobSubmitJob": 
"GlobalUserPageLocalJobSubmitJob",
-   "LocalGlobalUserPageCacheUpdateJob": 
"LocalGlobalUserPageCacheUpdateJob"
+   "GlobalUserPageLocalJobSubmitJob": 
"MediaWiki\\GlobalUserPage\\LocalJobSubmitJob",
+   "LocalGlobalUserPageCacheUpdateJob": 
"MediaWiki\\GlobalUserPage\\LocalCacheUpdateJob"
},
"DefaultUserOptions": {
"globaluserpage": true
},
"AutoloadClasses": {
-   "GlobalUserPage": "GlobalUserPage.body.php",
-   "GlobalUserPagePage": "GlobalUserPagePage.php",
-   "GlobalUserPageHooks": "GlobalUserPage.hooks.php",
-   "GlobalUserPageCacheInvalidator": 
"GlobalUserPageCacheInvalidator.php",
-   "GlobalUserPageLocalJobSubmitJob": 
"GlobalUserPageLocalJobSubmitJob.php",
-   "LocalGlobalUserPageCacheUpdateJob": 
"LocalGlobalUserPageCacheUpdateJob.php"
+   "MediaWiki\\GlobalUserPage\\GlobalUserPage": 
"includes/GlobalUserPage.php",
+   "MediaWiki\\GlobalUserPage\\WikiGlobalUserPage": 
"includes/WikiGlobalUserPage.php",
+   "MediaWiki\\GlobalUserPage\\Hooks": "includes/Hooks.php",
+   "MediaWiki\\GlobalUserPage\\CacheInvalidator": 
"includes/CacheInvalidator.php",
+   "MediaWiki\\GlobalUserPage\\LocalJobSubmitJob": 
"includes/LocalJobSubmitJob.php",
+   "MediaWiki\\GlobalUserPage\\LocalCacheUpdateJob": 
"includes/LocalCacheUpdateJob.php"
},
"ConfigRegistry": {
"globaluserpage": "GlobalVarConfig::newInstance"
diff --git a/GlobalUserPageCacheInvalidator.php b/includes/CacheInvalidator.php
similarity index 89%
rename from GlobalUserPageCacheInvalidator.php
rename to includes/CacheInvalidator.php
index f5bf77a..050759f 100644
--- a/GlobalUserPageCacheInvalidator.php
+++ b/includes/CacheInvalidator.php
@@ -14,7 +14,12 @@
  * along with this program.  If not, see .
  */
 
-class GlobalUserPageCacheInvalidator {
+namespace MediaWiki\GlobalUserPage;
+
+use JobQueueGroup;
+use Title;
+
+class

[MediaWiki-commits] [Gerrit] mediawiki...GlobalUserPage[master]: Relicense as GPLv3 or later

2017-09-24 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/380424 )

Change subject: Relicense as GPLv3 or later
..


Relicense as GPLv3 or later

Change-Id: I48d919680e6ef4ef45758a53e25e7a5dd2bd627f
---
M COPYING
M GlobalUserPage.body.php
M GlobalUserPage.hooks.php
M GlobalUserPageCacheInvalidator.php
M GlobalUserPageLocalJobSubmitJob.php
M GlobalUserPagePage.php
M LocalGlobalUserPageCacheUpdateJob.php
M extension.json
8 files changed, 747 insertions(+), 110 deletions(-)

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



diff --git a/COPYING b/COPYING
index 0e259d4..94a9ed0 100644
--- a/COPYING
+++ b/COPYING
@@ -1,121 +1,674 @@
-Creative Commons Legal Code
+GNU GENERAL PUBLIC LICENSE
+   Version 3, 29 June 2007
 
-CC0 1.0 Universal
+ Copyright (C) 2007 Free Software Foundation, Inc. 
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
 
-CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
-LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
-ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
-INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
-REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
-PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
-THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
-HEREUNDER.
+Preamble
 
-Statement of Purpose
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
 
-The laws of most jurisdictions throughout the world automatically confer
-exclusive Copyright and Related Rights (defined below) upon the creator
-and subsequent owner(s) (each and all, an "owner") of an original work of
-authorship and/or a database (each, a "Work").
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
 
-Certain owners wish to permanently relinquish those rights to a Work for
-the purpose of contributing to a commons of creative, cultural and
-scientific works ("Commons") that the public can reliably and without fear
-of later claims of infringement build upon, modify, incorporate in other
-works, reuse and redistribute as freely as possible in any form whatsoever
-and for any purposes, including without limitation commercial purposes.
-These owners may contribute to the Commons to promote the ideal of a free
-culture and the further production of creative, cultural and scientific
-works, or to gain reputation or greater distribution for their Work in
-part through the use and efforts of others.
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
 
-For these and/or other purposes and motivations, and without any
-expectation of additional consideration or compensation, the person
-associating CC0 with a Work (the "Affirmer"), to the extent that he or she
-is an owner of Copyright and Related Rights in the Work, voluntarily
-elects to apply CC0 to the Work and publicly distribute the Work under its
-terms, with knowledge of his or her Copyright and Related Rights in the
-Work and the meaning and intended legal effect of CC0 on those rights.
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
 
-1. Copyright and Related Rights. A Work made available under CC0 may be
-protected by copyright and related or neighboring rights ("Copyright and
-Related Rights"). Copyright and Related Rights include, but are not
-limited to, the following:
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them

[MediaWiki-commits] [Gerrit] mediawiki...GlobalUserPage[master]: Relicense as GPLv3 or later

2017-09-24 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/380424 )

Change subject: Relicense as GPLv3 or later
..

Relicense as GPLv3 or later

Change-Id: I48d919680e6ef4ef45758a53e25e7a5dd2bd627f
---
M COPYING
M GlobalUserPage.body.php
M GlobalUserPage.hooks.php
M GlobalUserPageCacheInvalidator.php
M GlobalUserPageLocalJobSubmitJob.php
M GlobalUserPagePage.php
M LocalGlobalUserPageCacheUpdateJob.php
M extension.json
8 files changed, 747 insertions(+), 110 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GlobalUserPage 
refs/changes/24/380424/1

diff --git a/COPYING b/COPYING
index 0e259d4..94a9ed0 100644
--- a/COPYING
+++ b/COPYING
@@ -1,121 +1,674 @@
-Creative Commons Legal Code
+GNU GENERAL PUBLIC LICENSE
+   Version 3, 29 June 2007
 
-CC0 1.0 Universal
+ Copyright (C) 2007 Free Software Foundation, Inc. 
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
 
-CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
-LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
-ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
-INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
-REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
-PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
-THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
-HEREUNDER.
+Preamble
 
-Statement of Purpose
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
 
-The laws of most jurisdictions throughout the world automatically confer
-exclusive Copyright and Related Rights (defined below) upon the creator
-and subsequent owner(s) (each and all, an "owner") of an original work of
-authorship and/or a database (each, a "Work").
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
 
-Certain owners wish to permanently relinquish those rights to a Work for
-the purpose of contributing to a commons of creative, cultural and
-scientific works ("Commons") that the public can reliably and without fear
-of later claims of infringement build upon, modify, incorporate in other
-works, reuse and redistribute as freely as possible in any form whatsoever
-and for any purposes, including without limitation commercial purposes.
-These owners may contribute to the Commons to promote the ideal of a free
-culture and the further production of creative, cultural and scientific
-works, or to gain reputation or greater distribution for their Work in
-part through the use and efforts of others.
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
 
-For these and/or other purposes and motivations, and without any
-expectation of additional consideration or compensation, the person
-associating CC0 with a Work (the "Affirmer"), to the extent that he or she
-is an owner of Copyright and Related Rights in the Work, voluntarily
-elects to apply CC0 to the Work and publicly distribute the Work under its
-terms, with knowledge of his or her Copyright and Related Rights in the
-Work and the meaning and intended legal effect of CC0 on those rights.
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
 
-1. Copyright and Related Rights. A Work made available under CC0 may be
-protected by copyright and related or neighboring rights ("Copyright and
-Related Rights"). Copyright and Related Rights include, but are not
-limited to, the following:
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you

[MediaWiki-commits] [Gerrit] wikidata...gui-deploy[production]: Merging from ef1fa0d759004c7b07b62e36bf8faa6620baa413:

2017-09-24 Thread Smalyshev (Code Review)

Smalyshev has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/380423 )

Change subject: Merging from ef1fa0d759004c7b07b62e36bf8faa6620baa413:
..


Merging from ef1fa0d759004c7b07b62e36bf8faa6620baa413:

Localisation updates from https://translatewiki.net.

Change-Id: Ia18825da6d40e4977945a5c5111c8dda6fdc461b
---
M i18n/ar.json
M i18n/ast.json
M i18n/bn.json
M i18n/br.json
M i18n/cyrl.json
M i18n/mwl.json
M i18n/nb.json
M i18n/ru.json
M i18n/sd.json
M i18n/uk.json
10 files changed, 10 insertions(+), 10 deletions(-)

Approvals:
  Smalyshev: Verified; Looks good to me, approved



diff --git a/i18n/ar.json b/i18n/ar.json
index 637e11e..8b930c3 100644
--- a/i18n/ar.json
+++ b/i18n/ar.json
@@ -1 +1 @@
-{"@metadata":{"authors":["Amire80","DRIHEM","ترجمان05","Hhaboh162002","Meno25","ديفيد"]},"wdqs-app-button-examples":"أمثلة","wdqs-app-button-prefixes":"البادئات","wdqs-app-button-tools":"أدوات","wdqs-app-button-help":"مساعدة","wdqs-app-button-run":"تشغيل","wdqs-app-button-run-title":"تنفيذ
 الاستعلام ( + 
)","wdqs-app-button-clear":"مسح","wdqs-app-button-clear-title":"امسح 
الاستعلام","wdqs-app-button-restore-title":"استعادة الاستعلام 
السابق","wdqs-app-button-fullscreen-title":"تبديل وضع ملء الشاشة 
للمحرر","wdqs-app-button-display":"عرض","wdqs-app-button-display-title":"إعرض 
النتيجة كجدول، صورة، 
...","wdqs-app-button-download":"تحميل","wdqs-app-button-download-title":"تنزيل 
النتيجة","wdqs-app-button-link":"رابط","wdqs-app-button-link-title":"أحصل على 
رابط للاستعلام","wdqs-app-help-feedback":"أرسل لنا 
ملاحظاتك!","wdqs-app-help-request-query":"اطلب 
استعلامًا","wdqs-app-help-portal":"بوابة المساعدة","wdqs-app-help-manual":"دليل 
المستخدم","wdqs-app-help-examples":"أمثلة 
للاستعلامات","wdqs-app-help-datamodel":"نموذج بيانات 
RDF","wdqs-app-help-prefixes":"قائمة البادئات","wdqs-app-help-copy":"معلومات 
الترخيص","wdqs-app-help-queryhelper":"مساعد 
الاستعلام","wdqs-app-footer-help":"اضغط [CTRL-SPACE] لتشغيل الإكتمال 
التلقائي.","wdqs-app-footer-updated":"تحديث البيانات قبل 
$1","wdqs-app-footer-updated-seconds":"تحديث البيانات قبل $1 
ثانية","wdqs-app-result-shorturl":"وصلة إلكترونيَّة قصيرة إلى النتيجة 
المرجُوَّة","wdqs-app-result-shorturl-title":"وصلة قصيرة إلى هذه 
النتيجة","wdqs-app-result-rawgraphs":"افتح في 
RAWGraphs.io","wdqs-app-result-rawgraphs-title":"إنشاء رسم بياني مع بيانات 
النتيجة الحالية باستخدام RAWGraphs.io","wdqs-app-result-embed":"تضمين 
النتيجة","wdqs-app-result-endpoint":"نقطة نهاية 
SPARQL","wdqs-app-result-endpoint-title":"وصلة إلى نقطة نهاية SPARQL التي تقوم 
بإرجاع نتيجة","wdqs-app-result-formatter-title-datetime":"الطابع الزمني ل ISO 
الخام","wdqs-app-result-json":"ملف JSON","wdqs-app-result-json-verbose":"ملف 
جسون JSON (مطول)","wdqs-app-result-tsv":"ملف 
TSV","wdqs-app-result-tsv-verbose":"ملف TSV (مطول)","wdqs-app-result-csv":"ملف 
CSV","wdqs-app-result-svg":"صورة SVG","wdqs-app-shorturl-page-title":"وصلة URL 
قصيرة إلى هذه الصفحة","wdqs-app-editor-placeholder":"(أدخل استعلام SPARQL أو قم 
بإختيار مثال استعلام)","wdqs-app-editor-addprefixes":"إضافة البادئات 
القياسية","wdqs-app-resultbrowser-stabilize":"استقرار 
الشبكة","wdqs-app-resultbrowser-hierarchical-lr":"تخطيط هرمي من اليسار إلى 
اليمين","wdqs-app-resultbrowser-hierarchical-ud":"تخطيط هرمي من الأعلى إلى 
الأسفل","wdqs-app-resultbrowser-hierarchical-rl":"تخطيط هرمي من اليمين إلى 
اليسار","wdqs-app-toast-leave-fullscreen":"اضغط على [esc] للخروج من وضع تكبير 
الشاشة","wdqs-dialog-examples-preview-query":"معاينة 
الاستعلام","wdqs-dialog-examples-preview-result":"معاينة 
النتيجة","wdqs-ve-filter":"فلتر","wdqs-ve-show":"إظهار","wdqs-ve-add-label-title":"إضافة
 متغير يحتوي على تسمية الكيان","wdqs-ve-remove-row-title":"أزل هذا 
الصف","wdqs-ve-with":"مع","wdqs-ve-anything":"أي 
شيء","wdqs-ve-any":"أي","wdqs-ve-or":"أو","wdqs-ve-subtype":"النوع 
الفرعي","wdqs-ve-sb-suggestions":"اقتراحات","wdqs-ve-sb-other":"أخرى","wdqs-action-query":"جارٍ
 تنفيذ الاستعلام","wdqs-action-render":"التجهيز 
للنتيجة","wdqs-action-error-display":"لا يمكن عرض 
النتيجة","wdqs-action-timeout":"الاستعلام استغرق الكثير من 
الوقت","wdqs-action-malformed-query":"الاستعلام 
تالف","wdqs-action-server-error":"خطأ بالخادم","wdqs-action-unknow-error":"خطأ 
غير معروف","wdqs-action-preview":"معاينة 
النتيجة","wdqs-result-map-layers-all":"كل 
الطبقات","wdqs-embed-button-edit-query":"عدل هذا الاستعلام","uls-region-WW":"في 
جميع أنحاء 
العالم","uls-region-SP":"الخاصة","uls-region-AM":"أمريكا","uls-region-AF":"أفريقيا","uls-region-EU":"أوروبا","uls-region-AS":"آسيا","uls-region-ME":"الشرق
 الأوسط","uls-region-PA":"المحيط الهادئ","uls-region-all":"جميع 
اللغات","uls-no-results-found":"لم يتم العثور على 
نتائج","uls-common-languages":"اللغات 
المقترحة","uls-no-results-suggestion-title":"قد تكون مهتما بما 
يلي:","uls-search-help":"يمكنك البحث مستخدما اسم اللغة، أو اسم السكريبت، أو رمز 
اللغة القياسي أو يمكنك التصفح حسب المنطقة.","uls-search-placeholder":"بحث عن 
لغة"}
\ No newline

[MediaWiki-commits] [Gerrit] wikidata...rdf[master]: Add stored query for category traversal

2017-09-24 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/379838 )

Change subject: Add stored query for category traversal
..


Add stored query for category traversal

Example:
 SELECT ?out ?depth WHERE {
  SERVICE mediawiki:categoryTree {
  bd:serviceParam mediawiki:start 
 .
  bd:serviceParam mediawiki:direction "Reverse" .
  bd:serviceParam mediawiki:depth 5 .
  }
} ORDER BY ASC(?depth)

Change-Id: Ice1615d3d75e47beb9943ca6ca9fb39f6fe27588
Bug: T157676
---
M 
blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/WikibaseContextListener.java
A 
blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/categories/CategoriesStoredQuery.java
M 
blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/mwapi/MWApiServiceFactory.java
A common/src/main/java/org/wikidata/query/rdf/common/uri/Mediawiki.java
M common/src/main/java/org/wikidata/query/rdf/common/uri/Ontology.java
M dist/src/script/loadCategoryDump.sh
M dist/src/script/prefixes.conf
7 files changed, 115 insertions(+), 7 deletions(-)

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



diff --git 
a/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/WikibaseContextListener.java
 
b/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/WikibaseContextListener.java
index 3a6abe7..d17a0d2 100644
--- 
a/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/WikibaseContextListener.java
+++ 
b/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/WikibaseContextListener.java
@@ -14,6 +14,7 @@
 import org.openrdf.query.resultio.TupleQueryResultFormat;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.wikidata.query.rdf.blazegraph.categories.CategoriesStoredQuery;
 import org.wikidata.query.rdf.blazegraph.constraints.CoordinatePartBOp;
 import org.wikidata.query.rdf.blazegraph.constraints.DecodeUriBOp;
 import org.wikidata.query.rdf.blazegraph.constraints.WikibaseCornerBOp;
@@ -88,6 +89,7 @@
 LabelService.register();
 GeoService.register();
 MWApiServiceFactory.register();
+CategoriesStoredQuery.register();
 
 // Whitelist services we like by default
 reg.addWhitelistURL(GASService.Options.SERVICE_KEY.toString());
diff --git 
a/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/categories/CategoriesStoredQuery.java
 
b/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/categories/CategoriesStoredQuery.java
new file mode 100644
index 000..5fe4719
--- /dev/null
+++ 
b/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/categories/CategoriesStoredQuery.java
@@ -0,0 +1,84 @@
+package org.wikidata.query.rdf.blazegraph.categories;
+
+import org.openrdf.model.URI;
+import org.openrdf.model.impl.URIImpl;
+import org.wikidata.query.rdf.common.uri.Mediawiki;
+
+import com.bigdata.rdf.sparql.ast.eval.ServiceParams;
+import com.bigdata.rdf.sparql.ast.service.ServiceCallCreateParams;
+import com.bigdata.rdf.sparql.ast.service.ServiceRegistry;
+import com.bigdata.rdf.sparql.ast.service.storedquery.SimpleStoredQueryService;
+
+/**
+ * Stored query for categories:
+ * SELECT ?out ?depth WHERE {
+ *  SERVICE mediawiki:categoryTree {
+ *  bd:serviceParam mediawiki:start 
 .
+ *  bd:serviceParam mediawiki:direction "Reverse" .
+ *  bd:serviceParam mediawiki:depth 5 .
+ *  }
+ * } ORDER BY ASC(?depth)
+ *
+ * Directions are:
+ * - Forward: get parent category tree
+ * - Reverse: get subcategory tree
+ * - Undirected: both directions
+ */
+public class CategoriesStoredQuery extends SimpleStoredQueryService {
+/**
+ * The URI service key.
+ */
+public static final URI SERVICE_KEY = new URIImpl(Mediawiki.NAMESPACE + 
"categoryTree");
+/**
+ * start parameter.
+ */
+public static final URI START_PARAM = new URIImpl(Mediawiki.NAMESPACE + 
"start");
+/**
+ * direction parameter.
+ */
+public static final URI DIRECTION_PARAM = new URIImpl(Mediawiki.NAMESPACE 
+ "direction");
+/**
+ * max depth parameter.
+ */
+public static final URI DEPTH_PARAM = new URIImpl(Mediawiki.NAMESPACE + 
"depth");
+/**
+ * Default max depth.
+ */
+public static final int MAX_DEPTH = 8;
+/**
+ * Register the service so it is recognized by Blazegraph.
+ */
+public static void register() {
+ServiceRegistry reg = ServiceRegistry.getInstance();
+reg.add(SERVICE_KEY, new CategoriesStoredQuery());
+reg.addWhitelistURL(SERVICE_KEY.toString());
+}
+
+@Override
+protected String getQuery(ServiceCallCreateParams createParams,
+ServiceParams serviceParams) {
+final StringBuilder sb = new StringBuilder();
+
+final URI start =

[MediaWiki-commits] [Gerrit] wikidata...gui-deploy[production]: Merging from ef1fa0d759004c7b07b62e36bf8faa6620baa413:

2017-09-24 Thread Smalyshev (Code Review)

Smalyshev has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/380423 )

Change subject: Merging from ef1fa0d759004c7b07b62e36bf8faa6620baa413:
..

Merging from ef1fa0d759004c7b07b62e36bf8faa6620baa413:

Localisation updates from https://translatewiki.net.

Change-Id: Ia18825da6d40e4977945a5c5111c8dda6fdc461b
---
M i18n/ar.json
M i18n/ast.json
M i18n/bn.json
M i18n/br.json
M i18n/cyrl.json
M i18n/mwl.json
M i18n/nb.json
M i18n/ru.json
M i18n/sd.json
M i18n/uk.json
10 files changed, 10 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui-deploy 
refs/changes/23/380423/1

diff --git a/i18n/ar.json b/i18n/ar.json
index 637e11e..8b930c3 100644
--- a/i18n/ar.json
+++ b/i18n/ar.json
@@ -1 +1 @@
-{"@metadata":{"authors":["Amire80","DRIHEM","ترجمان05","Hhaboh162002","Meno25","ديفيد"]},"wdqs-app-button-examples":"أمثلة","wdqs-app-button-prefixes":"البادئات","wdqs-app-button-tools":"أدوات","wdqs-app-button-help":"مساعدة","wdqs-app-button-run":"تشغيل","wdqs-app-button-run-title":"تنفيذ
 الاستعلام ( + 
)","wdqs-app-button-clear":"مسح","wdqs-app-button-clear-title":"امسح 
الاستعلام","wdqs-app-button-restore-title":"استعادة الاستعلام 
السابق","wdqs-app-button-fullscreen-title":"تبديل وضع ملء الشاشة 
للمحرر","wdqs-app-button-display":"عرض","wdqs-app-button-display-title":"إعرض 
النتيجة كجدول، صورة، 
...","wdqs-app-button-download":"تحميل","wdqs-app-button-download-title":"تنزيل 
النتيجة","wdqs-app-button-link":"رابط","wdqs-app-button-link-title":"أحصل على 
رابط للاستعلام","wdqs-app-help-feedback":"أرسل لنا 
ملاحظاتك!","wdqs-app-help-request-query":"اطلب 
استعلامًا","wdqs-app-help-portal":"بوابة المساعدة","wdqs-app-help-manual":"دليل 
المستخدم","wdqs-app-help-examples":"أمثلة 
للاستعلامات","wdqs-app-help-datamodel":"نموذج بيانات 
RDF","wdqs-app-help-prefixes":"قائمة البادئات","wdqs-app-help-copy":"معلومات 
الترخيص","wdqs-app-help-queryhelper":"مساعد 
الاستعلام","wdqs-app-footer-help":"اضغط [CTRL-SPACE] لتشغيل الإكتمال 
التلقائي.","wdqs-app-footer-updated":"تحديث البيانات قبل 
$1","wdqs-app-footer-updated-seconds":"تحديث البيانات قبل $1 
ثانية","wdqs-app-result-shorturl":"وصلة إلكترونيَّة قصيرة إلى النتيجة 
المرجُوَّة","wdqs-app-result-shorturl-title":"وصلة قصيرة إلى هذه 
النتيجة","wdqs-app-result-rawgraphs":"افتح في 
RAWGraphs.io","wdqs-app-result-rawgraphs-title":"إنشاء رسم بياني مع بيانات 
النتيجة الحالية باستخدام RAWGraphs.io","wdqs-app-result-embed":"تضمين 
النتيجة","wdqs-app-result-endpoint":"نقطة نهاية 
SPARQL","wdqs-app-result-endpoint-title":"وصلة إلى نقطة نهاية SPARQL التي تقوم 
بإرجاع نتيجة","wdqs-app-result-formatter-title-datetime":"الطابع الزمني ل ISO 
الخام","wdqs-app-result-json":"ملف JSON","wdqs-app-result-json-verbose":"ملف 
جسون JSON (مطول)","wdqs-app-result-tsv":"ملف 
TSV","wdqs-app-result-tsv-verbose":"ملف TSV (مطول)","wdqs-app-result-csv":"ملف 
CSV","wdqs-app-result-svg":"صورة SVG","wdqs-app-shorturl-page-title":"وصلة URL 
قصيرة إلى هذه الصفحة","wdqs-app-editor-placeholder":"(أدخل استعلام SPARQL أو قم 
بإختيار مثال استعلام)","wdqs-app-editor-addprefixes":"إضافة البادئات 
القياسية","wdqs-app-resultbrowser-stabilize":"استقرار 
الشبكة","wdqs-app-resultbrowser-hierarchical-lr":"تخطيط هرمي من اليسار إلى 
اليمين","wdqs-app-resultbrowser-hierarchical-ud":"تخطيط هرمي من الأعلى إلى 
الأسفل","wdqs-app-resultbrowser-hierarchical-rl":"تخطيط هرمي من اليمين إلى 
اليسار","wdqs-app-toast-leave-fullscreen":"اضغط على [esc] للخروج من وضع تكبير 
الشاشة","wdqs-dialog-examples-preview-query":"معاينة 
الاستعلام","wdqs-dialog-examples-preview-result":"معاينة 
النتيجة","wdqs-ve-filter":"فلتر","wdqs-ve-show":"إظهار","wdqs-ve-add-label-title":"إضافة
 متغير يحتوي على تسمية الكيان","wdqs-ve-remove-row-title":"أزل هذا 
الصف","wdqs-ve-with":"مع","wdqs-ve-anything":"أي 
شيء","wdqs-ve-any":"أي","wdqs-ve-or":"أو","wdqs-ve-subtype":"النوع 
الفرعي","wdqs-ve-sb-suggestions":"اقتراحات","wdqs-ve-sb-other":"أخرى","wdqs-action-query":"جارٍ
 تنفيذ الاستعلام","wdqs-action-render":"التجهيز 
للنتيجة","wdqs-action-error-display":"لا يمكن عرض 
النتيجة","wdqs-action-timeout":"الاستعلام استغرق الكثير من 
الوقت","wdqs-action-malformed-query":"الاستعلام 
تالف","wdqs-action-server-error":"خطأ بالخادم","wdqs-action-unknow-error":"خطأ 
غير معروف","wdqs-action-preview":"معاينة 
النتيجة","wdqs-result-map-layers-all":"كل 
الطبقات","wdqs-embed-button-edit-query":"عدل هذا الاستعلام","uls-region-WW":"في 
جميع أنحاء 
العالم","uls-region-SP":"الخاصة","uls-region-AM":"أمريكا","uls-region-AF":"أفريقيا","uls-region-EU":"أوروبا","uls-region-AS":"آسيا","uls-region-ME":"الشرق
 الأوسط","uls-region-PA":"المحيط الهادئ","uls-region-all":"جميع 
اللغات","uls-no-results-found":"لم يتم العثور على 
نتائج","uls-common-languages":"اللغات 
المقترحة","uls-no-results-suggestion-title":"قد تكون مهتما بما 
يلي:","uls-search-help":"يمكنك البحث مستخدما اسم اللغة، أو اسم السكريبت، أو رمز 
اللغة القياسي أو يمكنك التصفح حسب

[MediaWiki-commits] [Gerrit] mediawiki...GlobalUserPage[master]: Use MediaWikiServices to get DBLoadBalancerFactory instead o...

2017-09-24 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/378640 )

Change subject: Use MediaWikiServices to get DBLoadBalancerFactory instead of 
wfGetLB
..


Use MediaWikiServices to get DBLoadBalancerFactory instead of wfGetLB

wfGetLB has been deprecated since 1.27.

Change-Id: I8ef50e410520c2f08252c17e067d1b88146460d1
---
M GlobalUserPage.body.php
M extension.json
2 files changed, 7 insertions(+), 3 deletions(-)

Approvals:
  Jack Phoenix: Looks good to me, but someone else must approve
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/GlobalUserPage.body.php b/GlobalUserPage.body.php
index 18778b0..c491342 100644
--- a/GlobalUserPage.body.php
+++ b/GlobalUserPage.body.php
@@ -1,5 +1,7 @@
 getConnectionRef( DB_REPLICA, [], 
$wgGlobalUserPageDBname );
+   $factory = 
MediaWikiServices::getInstance()->getDBLoadBalancerFactory();
+   $mainLB = $factory->getMainLB( $wgGlobalUserPageDBname );
+
+   $dbr = $mainLB->getConnectionRef( DB_REPLICA, [], 
$wgGlobalUserPageDBname );
$row = $dbr->selectRow(
[ 'page', 'page_props' ],
[ 'page_touched', 'pp_propname' ],
diff --git a/extension.json b/extension.json
index 8e55626..627f8ac 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "GlobalUserPage",
-   "version": "0.11.0",
+   "version": "0.11.1",
"author": [
"Kunal Mehta",
"Jack Phoenix"

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8ef50e410520c2f08252c17e067d1b88146460d1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GlobalUserPage
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Legoktm 
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...ThrottleOverride[master]: Log when actions hit an exemption

2017-09-24 Thread EddieGP (Code Review)

EddieGP has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/380422 )

Change subject: Log when actions hit an exemption
..

Log when actions hit an exemption

Whenever a user performs an action which is allowed because of an
exemption set with ThrottleOverride, log this with wfDebug();

Bug: T176566
Change-Id: Iecd8b58d72cabecb61488e1e13f8093d2f34741e
---
M ThrottleOverride.hooks.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ThrottleOverride 
refs/changes/22/380422/1

diff --git a/ThrottleOverride.hooks.php b/ThrottleOverride.hooks.php
index 58dabd8..dc4110c 100644
--- a/ThrottleOverride.hooks.php
+++ b/ThrottleOverride.hooks.php
@@ -71,8 +71,8 @@
 
if ( $expiry > wfTimestampNow() ) {
// Valid exemption. Disable the throttle.
+   wfDebug( __METHOD__.": exempted user $user (ip: $ip) 
from $action throttle" );
$result = false;
-
return false;
} elseif ( $expiry !== false ) {
// Expired exemption. Delete it from the DB.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iecd8b58d72cabecb61488e1e13f8093d2f34741e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ThrottleOverride
Gerrit-Branch: master
Gerrit-Owner: EddieGP 

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

[MediaWiki-commits] [Gerrit] mediawiki...BlockAndNuke[master]: [WIP] Add composer.json and phpcs.xml

2017-09-24 Thread MarcoAurelio (Code Review)

MarcoAurelio has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/380421 )

Change subject: [WIP] Add composer.json and phpcs.xml
..

[WIP] Add composer.json and phpcs.xml

Bug: T176587
Change-Id: I79cae204fe1a58c05e64404225073004b9cc9ec1
---
A composer.json
1 file changed, 26 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlockAndNuke 
refs/changes/21/380421/1

diff --git a/composer.json b/composer.json
new file mode 100644
index 000..20ce90b
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,26 @@
+{
+   "name": "mediawiki/BlockAndNuke",
+   "description": "MediaWiki BlockAndNuke Extension",
+   "type": "mediawiki-extension",
+   "keywords": [
+   "mediawiki",
+   "blockandnuke"
+   ],
+   "homepage": "https://www.mediawiki.org/wiki/Extension:BlockAndNuke;,
+   "license": "GPL-3.0+",
+   "support": {
+"issues": "https://phabricator.wikimedia.org;,
+},
+   "require-dev": {
+   "jakub-onderka/php-console-highlighter": "0.3.2",
+   "jakub-onderka/php-parallel-lint": "0.9.2",
+   "mediawiki/mediawiki-codesniffer": "13.0.0"
+   },
+   "scripts": {
+   "test": [
+   "parallel-lint . --exclude vendor",
+   // "phpcs -p -s"
+   ],
+   //"fix": [
+   "phpcbf"
+   // ]
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I79cae204fe1a58c05e64404225073004b9cc9ec1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlockAndNuke
Gerrit-Branch: master
Gerrit-Owner: MarcoAurelio 

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

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

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


build: Updating mediawiki/mediawiki-codesniffer to 13.0.0

Change-Id: Ib651e881e77e5ba7ed1071b094cb965928b5b563
---
M composer.json
M maintenance/purge.php
M src/Api/ApiQueryReadingListEntries.php
M src/Api/ApiQueryReadingListOrder.php
M src/Api/ApiQueryReadingLists.php
M src/Api/ApiReadingLists.php
M src/Api/ApiReadingListsCreate.php
M src/Api/ApiReadingListsCreateEntry.php
M src/Api/ApiReadingListsDelete.php
M src/Api/ApiReadingListsDeleteEntry.php
M src/Api/ApiReadingListsOrder.php
M src/Api/ApiReadingListsOrderEntry.php
M src/Api/ApiReadingListsSetup.php
M src/Api/ApiReadingListsTeardown.php
M src/Api/ApiReadingListsUpdate.php
M src/Api/ApiTrait.php
M src/ReadingListRepository.php
17 files changed, 88 insertions(+), 106 deletions(-)

Approvals:
  Gergő Tisza: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/composer.json b/composer.json
index 7c63cad..6394fcf 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/maintenance/purge.php b/maintenance/purge.php
index 3af0e3a..6c4cce4 100644
--- a/maintenance/purge.php
+++ b/maintenance/purge.php
@@ -30,7 +30,7 @@
}
 
/**
-* @inheritdoc
+* @inheritDoc
 */
public function execute() {
$now = wfTimestampNow();
diff --git a/src/Api/ApiQueryReadingListEntries.php 
b/src/Api/ApiQueryReadingListEntries.php
index e90da94..ef6e9e5 100644
--- a/src/Api/ApiQueryReadingListEntries.php
+++ b/src/Api/ApiQueryReadingListEntries.php
@@ -37,7 +37,7 @@
private static $prefix = 'rle';
 
/**
-* @inheritdoc
+* @inheritDoc
 * @return void
 */
public function execute() {
@@ -49,7 +49,7 @@
}
 
/**
-* @inheritdoc
+* @inheritDoc
 * @param ApiPageSet $resultPageSet All output should be appended to 
this object
 * @return void
 */
@@ -120,7 +120,7 @@
}
 
/**
-* @inheritdoc
+* @inheritDoc
 * @return array
 */
protected function getAllowedParams() {
@@ -150,7 +150,7 @@
}
 
/**
-* @inheritdoc
+* @inheritDoc
 * @return array
 */
public function getHelpUrls() {
@@ -160,7 +160,7 @@
}
 
/**
-* @inheritdoc
+* @inheritDoc
 * @return array
 */
protected function getExamplesMessages() {
@@ -174,7 +174,7 @@
}
 
/**
-* @inheritdoc
+* @inheritDoc
 * @return bool
 */
public function isInternal() {
diff --git a/src/Api/ApiQueryReadingListOrder.php 
b/src/Api/ApiQueryReadingListOrder.php
index 9bb78f0..6d231f7 100644
--- a/src/Api/ApiQueryReadingListOrder.php
+++ b/src/Api/ApiQueryReadingListOrder.php
@@ -4,7 +4,6 @@
 
 use ApiQueryBase;
 use ApiResult;
-use MediaWiki\Extensions\ReadingLists\Doc\ReadingListRow;
 use MediaWiki\Extensions\ReadingLists\ReadingListRepositoryException;
 
 /**
@@ -18,7 +17,7 @@
private static $prefix = 'rlo';
 
/**
-* @inheritdoc
+* @inheritDoc
 * @return void
 */
public function execute() {
@@ -54,7 +53,7 @@
}
 
/**
-* @inheritdoc
+* @inheritDoc
 * @return array
 */
protected function getAllowedParams() {
@@ -70,7 +69,7 @@
}
 
/**
-* @inheritdoc
+* @inheritDoc
 * @return array
 */
public function getHelpUrls() {
@@ -80,7 +79,7 @@
}
 
/**
-* @inheritdoc
+* @inheritDoc
 * @return array
 */
protected function getExamplesMessages() {
@@ -94,7 +93,7 @@
}
 
/**
-* @inheritdoc
+* @inheritDoc
 * @return bool
 */
public function isInternal() {
diff --git a/src/Api/ApiQueryReadingLists.php b/src/Api/ApiQueryReadingLists.php
index 48bdb93..2a0ff1b 100644
--- a/src/Api/ApiQueryReadingLists.php
+++ b/src/Api/ApiQueryReadingLists.php
@@ -41,7 +41,7 @@
private static $prefix = 'rl';
 
/**
-* @inheritdoc
+* @inheritDoc
 * @return void
 */
public function execute() {
@@ -106,7 +106,7 @@
}
 
/**
-* @inheritdoc
+* @inheritDoc
 * @return array
 */
protected function getAllowedParams() {
@@ -138,7 +138,7 @@
}
 
/**
-

[MediaWiki-commits] [Gerrit] mediawiki...CheckUser[master]: CheckUser "contributions" link should be a red link for non-...

2017-09-24 Thread African Hope (Code Review)

African Hope has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/380420 )

Change subject: CheckUser "contributions" link should be a red link for 
non-existent accounts
..

CheckUser "contributions" link should be a red link for non-existent accounts

In Special:CheckUser, when a user had tried create and account while this was 
prevented by abusefilter, his or her "contributions" link was still blue 
instead of a red link (as if that user actually exists). The patch add takes 
advantage of the existing yet unsued css class .mw-anonuserlink, and turn the 
link to red.
Bug: T170507
Change-Id: I669affa176f6c5b0dbf61ac3ca4e77a4fb6eb3e5
---
M extension.json
A modules/ext.checkuser.links.js
2 files changed, 26 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CheckUser 
refs/changes/20/380420/1

diff --git a/extension.json b/extension.json
index 0803a14..a22c7e6 100644
--- a/extension.json
+++ b/extension.json
@@ -78,6 +78,12 @@
"mediawiki.util"
]
},
+   "ext.checkUser": {
+   "scripts": "modules/ext.checkuser.links.js",
+   "dependencies": [
+   "mediawiki.Title"
+   ]
+   },
"ext.checkUser.caMultiLock": {
"scripts": "modules/ext.checkuser.caMultiLock.js",
"dependencies": [
diff --git a/modules/ext.checkuser.links.js b/modules/ext.checkuser.links.js
new file mode 100644
index 000..96b0718
--- /dev/null
+++ b/modules/ext.checkuser.links.js
@@ -0,0 +1,20 @@
+/**
+ * Check existence of links and mark the missing ones red
+ */
+( function ( mw, $ ) {
+   
+   // Find all links with the .new.mw-userlink class, referring to 
unexisting users
+   $("form#checkuserblock #checkuserresults 
a.new.mw-userlink").each(function( i, urlObj  ) {
+
+   // Search for the sibling Contributions link 
+   
if($(urlObj).siblings().has("a[href*='Special:Contributions']")) {
+   
+   var contributionsLink = 
$(urlObj).siblings("a[href*='Special:Contributions']:first");
+
+   // Add class .new 
+   $(contributionsLink).addClass("new"); 
+
+   };
+
+   });
+}( mediaWiki, jQuery ) );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I669affa176f6c5b0dbf61ac3ca4e77a4fb6eb3e5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CheckUser
Gerrit-Branch: master
Gerrit-Owner: African Hope 

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: WindowManager: Remove `overflow: hidden` to enhance styling ...

2017-09-24 Thread VolkerE (Code Review)

VolkerE has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/380419 )

Change subject: WindowManager: Remove `overflow: hidden` to enhance styling 
flexibility
..

WindowManager: Remove `overflow: hidden` to enhance styling flexibility

Removing `overflow: hidden` from window frame as overflowing content
is taken care of in window body and it's limiting styling flexibility
on properties like `border-radius` and `box-shadow` used in
quick alerts or simple dialogs.

Bug: T176584
Change-Id: Ie1413808266e4d0beee7bc0ed63db48f2102e40a
---
M src/styles/WindowManager.less
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/19/380419/1

diff --git a/src/styles/WindowManager.less b/src/styles/WindowManager.less
index 1163487..a100a50 100644
--- a/src/styles/WindowManager.less
+++ b/src/styles/WindowManager.less
@@ -23,7 +23,6 @@
right: 0;
left: 0;
margin: auto;
-   overflow: hidden;
max-width: 100%;
max-height: 100%;
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie1413808266e4d0beee7bc0ed63db48f2102e40a
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: VolkerE 

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

[MediaWiki-commits] [Gerrit] mediawiki...MediaWikiFarm[master]: New function readAnyFile to read a file with any extension

2017-09-24 Thread Seb35 (Code Review)

Seb35 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/380394 )

Change subject: New function readAnyFile to read a file with any extension
..

New function readAnyFile to read a file with any extension

This is mainly used for the main config file farms.yml/.php/.json and will
be useful to implement T162737.

Also starting with this commit I will try to tag new tests (and possibly
some old tests) with “[unit]” when it is clearly a unit test (=assumes the
underlying functions are blackboxes and supposed to work as described) and
“[integration]” when it clearly test an entire stack. This is a step
forward to separate unit and integration tests (T162686).

Also starting with this commit it is recommended to use "@uses ClassName"
instead of "@uses ClassName::methodName" to reduce the burden of maintenance
on the tests. This does not cover "@covers" annotations, which must stay
"@covers ClassName::methodName".

I will document these test-related changes on
https://www.mediawiki.org/wiki/Extension:MediaWikiFarm and subpages.

Change-Id: If01341da9fd6d099baadb61bf51d86eadbbfc919
---
M src/MediaWikiFarm.php
M src/Utils.php
M tests/phpunit/ConfigurationTest.php
M tests/phpunit/ConstructionTest.php
M tests/phpunit/InstallationIndependantTest.php
M tests/phpunit/LoadingTest.php
M tests/phpunit/LoggingTest.php
M tests/phpunit/MediaWikiFarmTestCase.php
M tests/phpunit/MonoversionInstallationTest.php
M tests/phpunit/MultiversionInstallationTest.php
M tests/phpunit/bin/MediaWikiFarmScriptTest.php
A tests/phpunit/data/readAnyFile/success.json
A tests/phpunit/data/readAnyFile/success.php
13 files changed, 215 insertions(+), 65 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MediaWikiFarm 
refs/changes/94/380394/1

diff --git a/src/MediaWikiFarm.php b/src/MediaWikiFarm.php
index 7b6cb5e..365cbf8 100644
--- a/src/MediaWikiFarm.php
+++ b/src/MediaWikiFarm.php
@@ -837,17 +837,12 @@
 
# Read the farms configuration
if( !$farms ) {
-   // @codingStandardsIgnoreStart 
MediaWiki.ControlStructures.AssignmentInControlStructures.AssignmentInControlStructures
-   if( $farms = $this->readFile( 'farms.yml', 
$this->configDir ) ) {
-   $this->farmConfig['coreconfig'][] = 'farms.yml';
-   } elseif( $farms = $this->readFile( 'farms.php', 
$this->configDir ) ) {
-   $this->farmConfig['coreconfig'][] = 'farms.php';
-   } elseif( $farms = $this->readFile( 'farms.json', 
$this->configDir ) ) {
-   $this->farmConfig['coreconfig'][] = 
'farms.json';
+   list( $farms, $file ) = 
MediaWikiFarmUtils::readAnyFile( 'farms', $this->configDir, $this->cacheDir, 
$this->log );
+   if( $file ) {
+   $this->farmConfig['coreconfig'][] = $file;
} else {
return array( 'host' => $host, 'farm' => false, 
'config' => false, 'variables' => false, 'farms' => false, 'redirects' => 
$redirects );
}
-   // @codingStandardsIgnoreEnd 
MediaWiki.ControlStructures.AssignmentInControlStructures.AssignmentInControlStructures
}
 
# For each proposed farm, check if the host matches
diff --git a/src/Utils.php b/src/Utils.php
index 46a1ea9..dcb31ff 100644
--- a/src/Utils.php
+++ b/src/Utils.php
@@ -194,6 +194,36 @@
}
 
/**
+* Read a file with any of the listed extensions.
+*
+* If multiple files exist with different extensions, the first 
(without syntax error)
+* in the extensions list is returned. If some previous files had 
syntax errors, these
+* syntax errors appear in the log.
+*
+* The available extensions are listed in the function 
MediaWikiFarmUtils::readFile.
+*
+* @param string $filename File name without the extension.
+* @param string $directory Directory containing the file.
+* @param string $cacheDir Cache directory.
+* @param string[] $log Error log.
+* @param string[] $formats List of possible extensions of the file.
+* @param bool $cache The successfully file read must be cached.
+* @return array 2-tuple with the result (array) and file read 
(string); in case no files were found, the second value is an empty string.
+*/
+   static function readAnyFile( $filename, $directory, $cacheDir, array 
&$log, $formats = array( 'yml', 'php', 'json' ), $cache = true ) {
+
+   foreach( $formats as $format ) {
+
+   $array = self::readFile( $filename . '.' . $format, 
$cacheDir, $log, $directory, $cache );
+   if( is_array( $array ) ) {
+

[MediaWiki-commits] [Gerrit] labs...heritage[master]: Use isort to sort imports

2017-09-24 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/378741 )

Change subject: Use isort to sort imports
..


Use isort to sort imports

isort is a Python utility to sort imports alphabetically,
and automatically separated into sections.

This adds to `setup.cfg` an isort config closely mimicking
our current conventions (cf `multi_line_output`), and
updates the entire codebase.

Change-Id: Id37f2e645db0c93951916410f0fbd34fee0b62be
---
M bin/deploy_message_from_git_log.py
M erfgoedbot/add_coord_to_articles.py
M erfgoedbot/add_object_location_monuments.py
M erfgoedbot/categorize_images.py
M erfgoedbot/checkers.py
M erfgoedbot/common.py
M erfgoedbot/converters.py
M erfgoedbot/database_connection.py
M erfgoedbot/fill_table_monuments_all.py
M erfgoedbot/images_of_monuments_without_id.py
M erfgoedbot/missing_commonscat_links.py
M erfgoedbot/monument_tables.py
M erfgoedbot/monuments_config.py
M erfgoedbot/populate_image_table.py
M erfgoedbot/unused_monument_images.py
M erfgoedbot/update_database.py
M erfgoedbot/update_id_dump.py
M requirements-test.txt
M setup.cfg
M tests/test_categorization.py
M tests/test_checkers.py
M tests/test_common.py
M tests/test_converters.py
M tests/test_database_connection.py
M tests/test_database_statistics.py
M tests/test_fill_table.py
M tests/test_monument_tables.py
M tests/test_monuments_config.py
M tests/test_populate_image_table.py
M tests/test_update_database.py
M tox.ini
31 files changed, 103 insertions(+), 58 deletions(-)

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



diff --git a/bin/deploy_message_from_git_log.py 
b/bin/deploy_message_from_git_log.py
index fa609d4..8e6c8de 100644
--- a/bin/deploy_message_from_git_log.py
+++ b/bin/deploy_message_from_git_log.py
@@ -4,7 +4,6 @@
 import re
 import subprocess
 
-
 GIT_COMMIT_FIELDS = ['id', 'message']
 GIT_LOG_FORMAT_FIELDS = ['%h', '%b']
 GIT_LOG_FORMAT = '%x1f'.join(GIT_LOG_FORMAT_FIELDS) + '%x1e'
diff --git a/erfgoedbot/add_coord_to_articles.py 
b/erfgoedbot/add_coord_to_articles.py
index 58fa56e..3e1e963 100644
--- a/erfgoedbot/add_coord_to_articles.py
+++ b/erfgoedbot/add_coord_to_articles.py
@@ -19,12 +19,12 @@
 
 import pywikibot
 
-import monuments_config as mconfig
 import common as common
+import monuments_config as mconfig
 from database_connection import (
 close_database_connection,
-connect_to_monuments_database,
-connect_to_commons_database
+connect_to_commons_database,
+connect_to_monuments_database
 )
 
 # coordinate templates for different language wikipedias
diff --git a/erfgoedbot/add_object_location_monuments.py 
b/erfgoedbot/add_object_location_monuments.py
index 608df47..fe9158c 100644
--- a/erfgoedbot/add_object_location_monuments.py
+++ b/erfgoedbot/add_object_location_monuments.py
@@ -7,12 +7,12 @@
 '''
 import pywikibot
 
-import monuments_config as mconfig
 import common as common
+import monuments_config as mconfig
 from database_connection import (
 close_database_connection,
-connect_to_monuments_database,
-connect_to_commons_database
+connect_to_commons_database,
+connect_to_monuments_database
 )
 
 
diff --git a/erfgoedbot/categorize_images.py b/erfgoedbot/categorize_images.py
index f6df29c..f7c61e0 100644
--- a/erfgoedbot/categorize_images.py
+++ b/erfgoedbot/categorize_images.py
@@ -18,14 +18,14 @@
 '''
 import json
 import os
+
 import yaml
 
 import pywikibot
-from pywikibot import pagegenerators
-from pywikibot import textlib
+from pywikibot import pagegenerators, textlib
 
-import monuments_config as mconfig
 import common as common
+import monuments_config as mconfig
 from database_connection import (
 close_database_connection,
 connect_to_monuments_database
diff --git a/erfgoedbot/checkers.py b/erfgoedbot/checkers.py
index cf98240..fb31545 100644
--- a/erfgoedbot/checkers.py
+++ b/erfgoedbot/checkers.py
@@ -4,6 +4,7 @@
 """Checker methods"""
 
 import pywikibot
+
 import common as common
 
 _logger = "update_database"
diff --git a/erfgoedbot/common.py b/erfgoedbot/common.py
index 088b550..e737521 100644
--- a/erfgoedbot/common.py
+++ b/erfgoedbot/common.py
@@ -2,9 +2,11 @@
 # -*- coding: utf-8  -*-
 """Support library of commonly shared functions."""
 from __future__ import unicode_literals
-from builtins import open
+
 import os
 import re
+from builtins import open
+
 import pywikibot
 from pywikibot.exceptions import OtherPageSaveError, PageSaveRelatedError
 
diff --git a/erfgoedbot/converters.py b/erfgoedbot/converters.py
index 92abc44..6747319 100644
--- a/erfgoedbot/converters.py
+++ b/erfgoedbot/converters.py
@@ -4,6 +4,7 @@
 """Conversion methods"""
 
 import re
+
 from checkers import is_int
 
 
diff --git a/erfgoedbot/database_connection.py 
b/erfgoedbot/database_connection.py
index 741b061..1438e8a 100644
--- a/erfgoedbot/database_connection.py
+++ b/erfgoedbot/database_connection.py
@@

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: EditPage: Hard-deprecate isOouiEnabled(), getCheckboxes(), g...

2017-09-24 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/374868 )

Change subject: EditPage: Hard-deprecate isOouiEnabled(), getCheckboxes(), 
getCheckboxesOOUI()
..


EditPage: Hard-deprecate isOouiEnabled(), getCheckboxes(), getCheckboxesOOUI()

Deprecated in MW 1.30 in:
* 478caa076f75fde935c66eb9334410d868c30818
* 31587c50fe43f18e6379bf2d1b0376be0715fb4a

Change-Id: Id94eca12f16decfada113a46ffb6b29e52c14493
---
M includes/EditPage.php
1 file changed, 3 insertions(+), 0 deletions(-)

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



diff --git a/includes/EditPage.php b/includes/EditPage.php
index 0ea61c0..c101ba3 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -486,6 +486,7 @@
 * @deprecated since 1.30
 */
public function isOouiEnabled() {
+   wfDeprecated( __METHOD__, '1.30' );
return true;
}
 
@@ -4188,6 +4189,7 @@
 * @return array
 */
public function getCheckboxes( &$tabindex, $checked ) {
+   wfDeprecated( __METHOD__, '1.30' );
$checkboxes = [];
$checkboxesDef = $this->getCheckboxesDefinition( $checked );
 
@@ -4243,6 +4245,7 @@
 * @return array Associative array of string keys to OOUI\FieldLayout 
instances
 */
public function getCheckboxesOOUI( &$tabindex, $checked ) {
+   wfDeprecated( __METHOD__, '1.30' );
return $this->getCheckboxesWidget( $tabindex, $checked );
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id94eca12f16decfada113a46ffb6b29e52c14493
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Tpt 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] labs...stewardbots[master]: Add MediaWiki CodeSniffer to composer.json

2017-09-24 Thread MarcoAurelio (Code Review)

MarcoAurelio has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/380355 )

Change subject: Add MediaWiki CodeSniffer to composer.json
..

Add MediaWiki CodeSniffer to composer.json

Change-Id: I0762b400f10d1d8d8d94390bbf363f6cc6b002ff
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/tools/stewardbots 
refs/changes/55/380355/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0762b400f10d1d8d8d94390bbf363f6cc6b002ff
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/stewardbots
Gerrit-Branch: master
Gerrit-Owner: MarcoAurelio 

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

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

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


build: Updating mediawiki/mediawiki-codesniffer to 13.0.0

The following sniffs are failing and were disabled:
* MediaWiki.VariableAnalysis.ForbiddenGlobalVariables.ForbiddenGlobal$wgTitle

Change-Id: I3c9e3197329b29dfd1d4751119b5a70361627c17
---
M api/ApiFeedLQTThreads.php
M api/ApiQueryLQTThreads.php
M classes/Dispatch.php
M classes/HistoricalThread.php
M classes/Hooks.php
M classes/NewMessagesController.php
M classes/Thread.php
M classes/ThreadRevision.php
M classes/Threads.php
M classes/View.php
M composer.json
M pages/NewUserMessagesView.php
M phpcs.xml
13 files changed, 36 insertions(+), 35 deletions(-)

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



diff --git a/api/ApiFeedLQTThreads.php b/api/ApiFeedLQTThreads.php
index 24ad88e..3e4a900 100644
--- a/api/ApiFeedLQTThreads.php
+++ b/api/ApiFeedLQTThreads.php
@@ -45,7 +45,7 @@
 
$params = $this->extractRequestParams();
 
-   $db = wfGetDB( DB_SLAVE );
+   $db = wfGetDB( DB_REPLICA );
 
$feedTitle = $this->createFeedTitle( $params );
$feedClass = $wgFeedClasses[$params['feedformat']];
diff --git a/api/ApiQueryLQTThreads.php b/api/ApiQueryLQTThreads.php
index c1d1325..404e73d 100644
--- a/api/ApiQueryLQTThreads.php
+++ b/api/ApiQueryLQTThreads.php
@@ -172,7 +172,7 @@
protected function addSubItems(
$tableName, $fields, $joinField, $subitemName, /*callable*/ 
$handleRow, $tagName
) {
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
$result = $this->getResult();
 
$fields = array_merge( (array)$fields, (array)$joinField );
diff --git a/classes/Dispatch.php b/classes/Dispatch.php
index e8ffb01..74d2c5a 100644
--- a/classes/Dispatch.php
+++ b/classes/Dispatch.php
@@ -181,7 +181,7 @@
}
 
// Load from the database.
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
 
$row = $dbr->selectRow(
'page_props',
diff --git a/classes/HistoricalThread.php b/classes/HistoricalThread.php
index 03c351d..ccf07a4 100644
--- a/classes/HistoricalThread.php
+++ b/classes/HistoricalThread.php
@@ -40,7 +40,7 @@
}
 
static function withIdAtRevision( $id, $rev ) {
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
$line = $dbr->selectRow(
'historical_thread',
'hthread_contents',
diff --git a/classes/Hooks.php b/classes/Hooks.php
index b960759..9dcd91d 100644
--- a/classes/Hooks.php
+++ b/classes/Hooks.php
@@ -117,7 +117,7 @@
return true;
}
 
-   $db = wfGetDB( DB_SLAVE );
+   $db = wfGetDB( DB_REPLICA );
 
if ( !in_array( 'page', $tables ) ) {
$tables[] = 'page';
@@ -253,7 +253,7 @@
 
$join_conds['thread'] = [ 'left join', [ 'thread_root=page_id' 
] ];
 
-   $db = wfGetDB( DB_SLAVE );
+   $db = wfGetDB( DB_REPLICA );
$fields[] = $db->tableName( 'thread' ) . '.*';
 
return true;
diff --git a/classes/NewMessagesController.php 
b/classes/NewMessagesController.php
index 1a89929..1ab126e 100644
--- a/classes/NewMessagesController.php
+++ b/classes/NewMessagesController.php
@@ -131,7 +131,7 @@
];
$fields = [ 'wl_user', 'ums_user', 'ums_read_timestamp', 
'up_value' ];
 
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
return $dbr->select( $tables, $fields, self::getWhereClause( $t 
), __METHOD__, [], $joins );
}
 
@@ -256,7 +256,7 @@
}
 
// Send email notification, fetching all the data in one go
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
 
$tables = [
'user',
@@ -347,7 +347,7 @@
static function newUserMessages( $user ) {
$talkPage = new Article( $user->getUserPage()->getTalkPage(), 0 
);
 
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
 
$joinConds = [ 'ums_user' => null ];
$joinConds[] = $dbr->makeList(
@@ -377,7 +377,7 @@
return Threads::loadFromResult( $res, $dbr );
}
 
-   static function newMessageCount( $user, $db = DB_SLAVE ) {
+   static function newMessageCount( $user, $db = DB_REPLICA ) {
global $wgMemc;
 
$cval = $wgMemc->get( wfMemcKey(

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

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


build: Updating mediawiki/mediawiki-codesniffer to 13.0.0

Change-Id: I4770f1ddb098c38552e969da583f0642ad909e30
---
M SpecialSmiteSpamTrustedUsers.php
M api/SmiteSpamApiTrustUser.php
M composer.json
M includes/SmiteSpamAnalyzer.php
4 files changed, 5 insertions(+), 5 deletions(-)

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



diff --git a/SpecialSmiteSpamTrustedUsers.php b/SpecialSmiteSpamTrustedUsers.php
index 4a47303..39687a5 100644
--- a/SpecialSmiteSpamTrustedUsers.php
+++ b/SpecialSmiteSpamTrustedUsers.php
@@ -24,7 +24,7 @@
$username = $request->getText( 'username' );
$user = User::newFromName( $username );
if ( $user && $user->getId() !== 0 ) {
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
$result = $dbr->selectRow(
[ 'smitespam_trusted_user' ],
'trusted_user_id',
@@ -81,7 +81,7 @@
}
}
 
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
$result = $dbr->select(
[ 'smitespam_trusted_user' ],
[ 'trusted_user_id', 'trusted_user_timestamp', 
'trusted_user_admin_id' ],
diff --git a/api/SmiteSpamApiTrustUser.php b/api/SmiteSpamApiTrustUser.php
index 7adb9fd..fe1c8ac 100644
--- a/api/SmiteSpamApiTrustUser.php
+++ b/api/SmiteSpamApiTrustUser.php
@@ -12,7 +12,7 @@
$this->dieUsage( 'Not a valid username.', 'badparams' );
}
 
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
 
$result = $dbr->selectRow(
[ 'smitespam_trusted_user' ],
diff --git a/composer.json b/composer.json
index 7f5f307..5adecaf 100644
--- a/composer.json
+++ b/composer.json
@@ -9,7 +9,7 @@
"license": "GPL-2.0",
"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/SmiteSpamAnalyzer.php b/includes/SmiteSpamAnalyzer.php
index 5c12717..a02d07f 100644
--- a/includes/SmiteSpamAnalyzer.php
+++ b/includes/SmiteSpamAnalyzer.php
@@ -30,7 +30,7 @@
 * @return array
 */
public function run( $offset = 0, $limit = 500 ) {
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
 
$usersResult = $dbr->select(
[ 'smitespam_trusted_user' ],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4770f1ddb098c38552e969da583f0642ad909e30
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SmiteSpam
Gerrit-Branch: master
Gerrit-Owner: Libraryupgrader 
Gerrit-Reviewer: Legoktm 
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...LifeWeb[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/380179 )

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


build: Updating mediawiki/mediawiki-codesniffer to 13.0.0

Change-Id: I8880e7b1645cea30a813a083ee4833fdf93cd7f6
---
M composer.json
M lib/LifeWeb/LWItem.php
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/composer.json b/composer.json
index 7c63cad..6394fcf 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/lib/LifeWeb/LWItem.php b/lib/LifeWeb/LWItem.php
index 74468b4..6ccb6ea 100644
--- a/lib/LifeWeb/LWItem.php
+++ b/lib/LifeWeb/LWItem.php
@@ -196,7 +196,7 @@
$cacheKeyMax = wfMemcKey( $name, 'ItemsMaxpage', 
$wgLang->getCode() );
$maxpage = $cache->get( $cacheKeyMax );
 
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
 
if ( $items === false || $clearCache ) {
// Nothing cached

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8880e7b1645cea30a813a083ee4833fdf93cd7f6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LifeWeb
Gerrit-Branch: master
Gerrit-Owner: Libraryupgrader 
Gerrit-Reviewer: Legoktm 
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...Patroller[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/380220 )

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


build: Updating mediawiki/mediawiki-codesniffer to 13.0.0

Change-Id: I645d059b061795f299476ef5f53f4b2c4517
---
M SpecialPatroller.php
M composer.json
2 files changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/SpecialPatroller.php b/SpecialPatroller.php
index bc1b5e4..f10d9ba 100644
--- a/SpecialPatroller.php
+++ b/SpecialPatroller.php
@@ -222,7 +222,7 @@
 * @return  boolean RecentChange
 */
private function fetchChange( &$user ) {
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
$uid = $user->getId();
extract( $dbr->tableNames( 'recentchanges', 'patrollers', 
'page' ) );
$res = $dbr->select(
@@ -266,7 +266,7 @@
 * @return  boolean RecentChange
 */
private function loadChange( $rcid ) {
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
$res = $dbr->select(
'recentchanges',
'*',
diff --git a/composer.json b/composer.json
index 5b8e8e3..1915458 100644
--- a/composer.json
+++ b/composer.json
@@ -16,7 +16,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": {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I645d059b061795f299476ef5f53f4b2c4517
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Patroller
Gerrit-Branch: master
Gerrit-Owner: Libraryupgrader 
Gerrit-Reviewer: Legoktm 
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...MathSearch[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/380189 )

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


build: Updating mediawiki/mediawiki-codesniffer to 13.0.0

Change-Id: Ic97c9bec3f405985a45547d9d2ec86dde91bfa0d
---
M GetEquationsByQuery.php
M MathObject.php
M MathSearch.hooks.php
M SpecialMathDownloadResult.php
M SpecialUploadResult.php
M composer.json
M includes/ImportCsv.php
M includes/special/SpecialDisplayTopics.php
M maintenance/BatchExport.php
M maintenance/ExportCache.php
M maintenance/IndexBase.php
M maintenance/QueryEval.php
M maintenance/WmcRefIdentifier.php
13 files changed, 26 insertions(+), 26 deletions(-)

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



diff --git a/GetEquationsByQuery.php b/GetEquationsByQuery.php
index 292c01d..0bc85d7 100644
--- a/GetEquationsByQuery.php
+++ b/GetEquationsByQuery.php
@@ -57,7 +57,7 @@
$wgOut->addWikiText(
"Displaying first 10 equation for query: " . 
var_export( $sqlFilter, true ) . ''
);
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
$res = $dbr->select(
[ 'math' ],
[
diff --git a/MathObject.php b/MathObject.php
index fd3acea..aca736d 100644
--- a/MathObject.php
+++ b/MathObject.php
@@ -21,7 +21,7 @@
 
public static function hash2md5( $hash ) {
// TODO: make MathRenderer::dbHash2md5 public
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
$xhash = unpack( 'H32md5', $dbr->decodeBlob( $hash ) . "
" );
return $xhash['md5'];
}
@@ -29,7 +29,7 @@
public static function findSimilarPages( $pid ) {
global $wgOut;
$out = "";
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
try {
$res = $dbr->select( 'mathpagesimilarity',
[
@@ -75,7 +75,7 @@
 * @return self instance
 */
public static function constructformpage( $pid, $eid ) {
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
$res = $dbr->selectRow(
[ 'mathindex' ], self::dbIndexFieldsArray(), 
'mathindex_revision_id = ' . $pid
. ' AND mathindex_anchor= "' . $eid . '"' );
@@ -224,7 +224,7 @@
 
public function getObservations( $update = true ) {
global $wgOut;
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
try {
$res = $dbr->select( [ "mathobservation", 
"mathvarstat", 'mathrevisionstat' ],
[
@@ -334,7 +334,7 @@
 * @return bool|ResultWrapper
 */
public function getNouns( $identifier ) {
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
$pageName = $this->getPageTitle();
if ( $pageName === false ) {
return false;
@@ -366,7 +366,7 @@
 */
public function getAllOccurences( $currentOnly = true ) {
$out = [];
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
$res = $dbr->select(
'mathindex', self::dbIndexFieldsArray(),
[ 'mathindex_inputhash' => $this->getInputHash() ]
@@ -468,7 +468,7 @@
}
 
public function getRelations() {
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
$selection = $dbr->select( 'mathsemantics', [ 'identifier', 
'evidence', 'noun' ],
[ 'revision_id' => $this->revisionID ], __METHOD__,
[ 'ORDER BY' => 'evidence desc' ] );
diff --git a/MathSearch.hooks.php b/MathSearch.hooks.php
index ab4eb15..44b5508 100644
--- a/MathSearch.hooks.php
+++ b/MathSearch.hooks.php
@@ -79,7 +79,7 @@
private static function updateIndex( $revId, $eid, $inputHash, $tex ) {
if ( $revId > 0 && $eid ) {
try {
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
$exists = $dbr->selectRow( 'mathindex',
[ 'mathindex_revision_id', 
'mathindex_anchor', 'mathindex_inputhash' ],
[
diff --git a/SpecialMathDownloadResult.php b/SpecialMathDownloadResult.php
index 113ce08..e4cdcc9 100644
--- a/SpecialMathDownloadResult.php
+++ b/SpecialMathDownloadResult.php
@@ -14,7

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

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


build: Updating mediawiki/mediawiki-codesniffer to 13.0.0

Change-Id: I4f4ab422a6fefa0f61d7c2c2e21942cd83cf161b
---
M OATHAuth.hooks.php
M OATHUserRepository.php
M auth/TOTPSecondaryAuthenticationProvider.php
M composer.json
4 files changed, 2 insertions(+), 4 deletions(-)

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



diff --git a/OATHAuth.hooks.php b/OATHAuth.hooks.php
index 8e13c7c..2674e1d 100644
--- a/OATHAuth.hooks.php
+++ b/OATHAuth.hooks.php
@@ -1,7 +1,6 @@
 centralIdFromLocalUser( $user );
-   $res = $this->getDB( DB_SLAVE )->selectRow(
+   $res = $this->getDB( DB_REPLICA )->selectRow(
'oathauth_users',
'*',
[ 'id' => $uid ],
diff --git a/auth/TOTPSecondaryAuthenticationProvider.php 
b/auth/TOTPSecondaryAuthenticationProvider.php
index 6fe71b7..ddb0349 100644
--- a/auth/TOTPSecondaryAuthenticationProvider.php
+++ b/auth/TOTPSecondaryAuthenticationProvider.php
@@ -4,7 +4,6 @@
 use MediaWiki\Auth\AuthenticationRequest;
 use MediaWiki\Auth\AuthenticationResponse;
 use MediaWiki\Auth\AuthManager;
-use MediaWiki\Session\SessionManager;
 
 /**
  * AuthManager secondary authentication provider for TOTP second-factor 
authentication.
diff --git a/composer.json b/composer.json
index 3fa0ae0..29a6c4a 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": {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4f4ab422a6fefa0f61d7c2c2e21942cd83cf161b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OATHAuth
Gerrit-Branch: master
Gerrit-Owner: Libraryupgrader 
Gerrit-Reviewer: Legoktm 
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...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
+++

[MediaWiki-commits] [Gerrit] labs...heritage[master]: Add Uganda in English (ug_en)

2017-09-24 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/379992 )

Change subject: Add Uganda in English (ug_en)
..


Add Uganda in English (ug_en)

Bug: T174426
Change-Id: Ie81f3ee1f68bc1a164773051f999b7fa9f2b51e1
---
A erfgoedbot/monuments_config/ug_en.json
1 file changed, 141 insertions(+), 0 deletions(-)

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



diff --git a/erfgoedbot/monuments_config/ug_en.json 
b/erfgoedbot/monuments_config/ug_en.json
new file mode 100644
index 000..1de400a
--- /dev/null
+++ b/erfgoedbot/monuments_config/ug_en.json
@@ -0,0 +1,141 @@
+{
+"country": "ug",
+"lang": "en",
+"description": "Monuments in Uganda in English",
+"project": "wikipedia",
+"namespaces": [
+0
+],
+"table": "monuments_ug_(en)",
+"truncate": false,
+"primkey": "number",
+"headerTemplate": "National Cultural Site of Uganda header",
+"rowTemplate": "National Cultural Site of Uganda row",
+"commonsTemplate": "National Cultural Site Uganda",
+"commonsTrackerCategory": "National Cultural Sites in Uganda with known 
IDs",
+"commonsCategoryBase": "National Cultural Sites in Uganda",
+"unusedImagesPage": "Wikipedia:WikiProject Historic sites/Unused images of 
National Cultural Sites in Uganda",
+"imagesWithoutIdPage": "Wikipedia:WikiProject Historic sites/Images of 
National Cultural Sites in Uganda without an ID",
+"fields": [
+{
+"dest": "number",
+"source": "number",
+"type": "varchar(11)"
+},
+{
+"dest": "region_iso",
+"source": "region_iso"
+},
+{
+"dest": "site",
+"source": "site"
+},
+{
+"dest": "description",
+"source": "description"
+},
+{
+"dest": "district",
+"source": "district"
+},
+{
+"dest": "location",
+"source": "location"
+},
+{
+"dest": "original_function",
+"source": "original_function"
+},
+{
+"dest": "lat",
+"source": "lat",
+"check": "checkLat"
+},
+{
+"dest": "lon",
+"source": "lon",
+"check": "checkLon"
+},
+{
+"dest": "image",
+"source": "image"
+},
+{
+"dest": "commonscat",
+"source": "commonscat"
+},
+{
+"dest": "monument_article",
+"source": "site",
+"conv": "extractWikilink"
+}
+],
+"sql_lang": "English",
+"sql_country": "Uganda",
+"sql_data": {
+"country": {
+"value": "ug",
+"type": "Text"
+},
+"lang": {
+"value": "en",
+"type": "Text"
+},
+"id": {
+"value": "number",
+"type": "Field"
+},
+"adm0": {
+"value": "ug",
+"type": "Text"
+},
+"adm1": {
+"value": "LOWER(`region_iso`)",
+"type": "Raw"
+},
+"adm3": {
+"value": "district",
+"type": "Field"
+},
+"name": {
+"value": "site",
+"type": "Field"
+},
+"address": {
+"value": "location",
+"type": "Field"
+},
+"municipality": {
+"value": "district",
+"type": "Field"
+},
+"lat": {
+"value": "lat",
+"type": "Field"
+},
+"lon": {
+"value": "lon",
+"type": "Field"
+},
+"image": {
+"value": "image",
+"type": "Field"
+},
+"commonscat": {
+"value": "commonscat",
+"type": "Field"
+},
+"source": {
+"value": "source",
+"type": "Field"
+},
+"changed": {
+"value": "changed",
+"type": "Field"
+},
+"monument_article": {
+"value": "monument_article",
+"type": "Field"
+}
+}
+}
\ No newline at end of file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie81f3ee1f68bc1a164773051f999b7fa9f2b51e1
Gerrit-PatchSet: 2
Gerrit-Project: labs/tools/heritage
Gerrit-Branch: master
Gerrit-Owner: Jean-Frédéric 
Gerrit-Reviewer: Lokal Profil 
Gerrit-Reviewer: Multichill 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

___

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

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


build: Updating mediawiki/mediawiki-codesniffer to 13.0.0

Change-Id: I8282b41f32fe99e260c82795f2c62aacf9e1a851
---
M SpecialPetition.php
M SpecialPetitionData.php
M composer.json
3 files changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/SpecialPetition.php b/SpecialPetition.php
index 1d5a0c7..2997ed3 100644
--- a/SpecialPetition.php
+++ b/SpecialPetition.php
@@ -123,7 +123,7 @@
$key,
$wgPetitionCountCacheTime,
function () use ( $petitionName ) {
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
return $dbr->selectField( 'petition_data',
'count(pt_id)',
[ 'pt_petitionname' => $petitionName ]
diff --git a/SpecialPetitionData.php b/SpecialPetitionData.php
index 2da588b..c701399 100644
--- a/SpecialPetitionData.php
+++ b/SpecialPetitionData.php
@@ -18,7 +18,7 @@
$this->getOutput()->addHTML( $downloadLink );
 
if ( $par == 'csv' ) {
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
$res = $dbr->select( 'petition_data', '*', 1, 
__METHOD__ );
$this->csvOutput( $res );
}
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",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8282b41f32fe99e260c82795f2c62aacf9e1a851
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Petition
Gerrit-Branch: master
Gerrit-Owner: Libraryupgrader 
Gerrit-Reviewer: Legoktm 
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...SubPageList3[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/380250 )

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


build: Updating mediawiki/mediawiki-codesniffer to 13.0.0

Change-Id: Ic59602702e9b0b2906ec985af3827b1e42feaebd
---
M SubPageList3.class.php
M composer.json
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/SubPageList3.class.php b/SubPageList3.class.php
index c546636..de1e3f9 100644
--- a/SubPageList3.class.php
+++ b/SubPageList3.class.php
@@ -327,7 +327,7 @@
 * @private
 */
function getTitles() {
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
 
$conditions = [];
$options = [];
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",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic59602702e9b0b2906ec985af3827b1e42feaebd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SubPageList3
Gerrit-Branch: master
Gerrit-Owner: Libraryupgrader 
Gerrit-Reviewer: Legoktm 
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...ProofreadPage[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/380230 )

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


build: Updating mediawiki/mediawiki-codesniffer to 13.0.0

The following sniffs are failing and were disabled:
* MediaWiki.VariableAnalysis.ForbiddenGlobalVariables.ForbiddenGlobal$wgTitle

Change-Id: I31932852745645cd76acce9b2b56d8d78a78da4d
---
M ProofreadPage.body.php
M SpecialPagesWithoutScans.php
M composer.json
M includes/index/IndexContentHandler.php
M includes/index/IndexEditAction.php
M includes/index/ProofreadIndexDbConnector.php
M includes/page/EditPagePage.php
M includes/page/ProofreadPageDbConnector.php
M includes/page/ProofreadPagePage.php
M phpcs.xml
M tests/phpunit/ProofreadPageTestCase.php
11 files changed, 12 insertions(+), 20 deletions(-)

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



diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index dbae3ab..8377fd1 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -21,7 +21,6 @@
 
 use ProofreadPage\Context;
 use ProofreadPage\FileNotFoundException;
-use ProofreadPage\Index\EditIndexPage;
 use ProofreadPage\Page\PageContent;
 use ProofreadPage\Page\PageContentBuilder;
 use ProofreadPage\Pagination\PageNotInPaginationException;
diff --git a/SpecialPagesWithoutScans.php b/SpecialPagesWithoutScans.php
index a60b085..7299bfc 100644
--- a/SpecialPagesWithoutScans.php
+++ b/SpecialPagesWithoutScans.php
@@ -77,7 +77,7 @@
}
 
public function getQueryInfo() {
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
 
// Construct subqueries
$pagesWithScansSubquery = $dbr->selectSQLText(
diff --git a/composer.json b/composer.json
index c0cdd39..a6aa35f 100644
--- a/composer.json
+++ b/composer.json
@@ -9,7 +9,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/index/IndexContentHandler.php 
b/includes/index/IndexContentHandler.php
index c8c64e9..37f94bf 100644
--- a/includes/index/IndexContentHandler.php
+++ b/includes/index/IndexContentHandler.php
@@ -7,7 +7,6 @@
 use MWContentSerializationException;
 use Parser;
 use PPFrame;
-use StubObject;
 use TextContentHandler;
 use Title;
 use WikitextContent;
diff --git a/includes/index/IndexEditAction.php 
b/includes/index/IndexEditAction.php
index 9a120b3..d2662dc 100644
--- a/includes/index/IndexEditAction.php
+++ b/includes/index/IndexEditAction.php
@@ -3,8 +3,6 @@
 namespace ProofreadPage\Index;
 
 use EditAction;
-use ProofreadPage\Context;
-use ProofreadPagePage;
 
 /**
  * @licence GNU GPL v2+
diff --git a/includes/index/ProofreadIndexDbConnector.php 
b/includes/index/ProofreadIndexDbConnector.php
index 7b452b9..6ff1bc7 100644
--- a/includes/index/ProofreadIndexDbConnector.php
+++ b/includes/index/ProofreadIndexDbConnector.php
@@ -27,7 +27,7 @@
 * @return ResultWrapper
 */
public static function getRowsFromTitle( Title $title ) {
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
$result = $dbr->select(
[ 'page', 'pagelinks' ],
[ 'page_namespace', 'page_title' ],
@@ -150,7 +150,7 @@
 * @return Object
 */
public static function getIndexDataFromIndexTitle( $indexTitle ) {
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
$res = $dbr->selectRow(
[ 'pr_index', 'page' ],
[ 'pr_count', 'pr_q0', 'pr_q1', 'pr_q2', 
'pr_q3', 'pr_q4' ],
@@ -167,7 +167,7 @@
 * @return Object
 */
public static function getIndexDataFromIndexPageId( $indexId ) {
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
$res = $dbr->selectRow(
[ 'pr_index' ],
[ 'pr_count', 'pr_q0', 'pr_q1', 'pr_q2', 
'pr_q3', 'pr_q4' ],
diff --git a/includes/page/EditPagePage.php b/includes/page/EditPagePage.php
index 28f19cc..8f6847f 100644
--- a/includes/page/EditPagePage.php
+++ b/includes/page/EditPagePage.php
@@ -3,7 +3,6 @@
 namespace ProofreadPage\Page;
 
 use Article;
-use ContentHandler;
 use EditPage;
 use Html;
 use MWException;
diff --git a/includes/page/ProofreadPageDbConnector.php 
b/includes/page/ProofreadPageDbConnector.php
index 8080a94..c51939e 100644
--- a/includes/page/ProofreadPageDbConnector.php
+++ b/includes/page/ProofreadPageDbConnector.php
@@ -26,7 +26,7 @@

[MediaWiki-commits] [Gerrit] mediawiki...TemplateData[master]: Improve some parameter docs

2017-09-24 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/380334 )

Change subject: Improve some parameter docs
..

Improve some parameter docs

Change-Id: I2ffe6893abf6ca6a7553acfd5ccfa26361f63124
---
M TemplateData.hooks.php
M TemplateDataBlob.php
M api/ApiTemplateData.php
M phpcs.xml
4 files changed, 14 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TemplateData 
refs/changes/34/380334/1

diff --git a/TemplateData.hooks.php b/TemplateData.hooks.php
index 1b6cf8a..bff3402 100644
--- a/TemplateData.hooks.php
+++ b/TemplateData.hooks.php
@@ -9,6 +9,8 @@
 class TemplateDataHooks {
/**
 * Register parser hooks
+* @param Parser &$parser
+* @return bool
 */
public static function onParserFirstCallInit( &$parser ) {
$parser->setHook( 'templatedata', [ 'TemplateDataHooks', 
'render' ] );
@@ -17,6 +19,9 @@
 
/**
 * Register qunit unit tests
+* @param array &$testModules
+* @param ResourceLoader &$resourceLoader
+* @return bool
 */
public static function onResourceLoaderTestModules(
array &$testModules,
@@ -35,7 +40,7 @@
 * Conditionally register the jquery.uls.data module, in case they've 
already been
 * registered by the UniversalLanguageSelector extension or the 
VisualEditor extension.
 *
-* @param ResourceLoader $resourceLoader
+* @param ResourceLoader &$resourceLoader
 * @return boolean true
 */
public static function onResourceLoaderRegisterModules( ResourceLoader 
&$resourceLoader ) {
@@ -61,11 +66,12 @@
 * @param User &$user
 * @param Content &$content
 * @param string &$summary
-* @param $minor
+* @param bool $minor
 * @param bool|null $watchthis
-* @param $sectionanchor
-* @param &$flags
+* @param string $sectionanchor
+* @param int &$flags
 * @param Status &$status
+* @return bool
 */
public static function onPageContentSave( &$page, &$user, &$content, 
&$summary, $minor,
$watchthis, $sectionanchor, &$flags, &$status
diff --git a/TemplateDataBlob.php b/TemplateDataBlob.php
index c024802..b088ded 100644
--- a/TemplateDataBlob.php
+++ b/TemplateDataBlob.php
@@ -561,7 +561,8 @@
 
/**
 * Normalise a InterfaceText field in the TemplateData blob.
-* @return stdClass|string $text
+* @param stdClass|string $text
+* @return stdClass|string
 */
protected static function normaliseInterfaceText( $text ) {
if ( is_string( $text ) ) {
diff --git a/api/ApiTemplateData.php b/api/ApiTemplateData.php
index a366846..8aa5b0f 100644
--- a/api/ApiTemplateData.php
+++ b/api/ApiTemplateData.php
@@ -155,6 +155,7 @@
 
/**
 * @see ApiBase::getExamplesMessages()
+* @return array
 */
protected function getExamplesMessages() {
return [
diff --git a/phpcs.xml b/phpcs.xml
index 649a74b..d81f486 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -2,16 +2,11 @@
 


-   
-   
-   
-   




.

-   
-   vendor
+   
 

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

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

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

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

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


build: Updating mediawiki/mediawiki-codesniffer to 13.0.0

Change-Id: Ie0106bd59ebf06a333596cd914292f7846e8fa23
---
M MathRenderer.php
M MathTexvc.php
M composer.json
3 files changed, 6 insertions(+), 6 deletions(-)

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



diff --git a/MathRenderer.php b/MathRenderer.php
index f65ee01..635846f 100644
--- a/MathRenderer.php
+++ b/MathRenderer.php
@@ -241,7 +241,7 @@
public function getInputHash() {
// TODO: What happens if $tex is empty?
if ( !$this->inputHash ) {
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
return $dbr->encodeBlob( pack( "H32", $this->getMd5() ) 
); # Binary packed, not hex
}
return $this->inputHash;
@@ -253,7 +253,7 @@
 * @return string md5
 */
private static function dbHash2md5( $hash ) {
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
$xhash = unpack( 'H32md5', $dbr->decodeBlob( $hash ) . "
" );
return $xhash['md5'];
}
@@ -264,7 +264,7 @@
 * @return bool true if read successfully, false otherwise
 */
public function readFromDatabase() {
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
$rpage = $dbr->selectRow( $this->getMathTableName(),
$this->dbInArray(),
[ 'math_inputhash' => $this->getInputHash() ],
diff --git a/MathTexvc.php b/MathTexvc.php
index 07c982d..cd692de 100644
--- a/MathTexvc.php
+++ b/MathTexvc.php
@@ -36,7 +36,7 @@
 */
public function dbOutArray() {
$out = [];
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
$outmd5_sql = $dbr->encodeBlob( pack( 'H32', $this->hash ) );
if ( $outmd5_sql instanceof Blob ) {
$outmd5_sql = $outmd5_sql->fetch();
@@ -64,7 +64,7 @@
parent::initializeFromDatabaseRow( $rpage );
// get deprecated fields
if ( $rpage->math_outputhash ) {
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
$xhash = unpack( 'H32md5',
$dbr->decodeBlob( $rpage->math_outputhash ) . " 
   " );
$this->hash = $xhash['md5'];
diff --git a/composer.json b/composer.json
index 6b670ed..607cc1e 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": {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie0106bd59ebf06a333596cd914292f7846e8fa23
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Math
Gerrit-Branch: master
Gerrit-Owner: Libraryupgrader 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Physikerwelt 
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...XenForoAuth[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/380290 )

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


build: Updating mediawiki/mediawiki-codesniffer to 13.0.0

Change-Id: Iff57a7ca8b437610171adca306e437192de4a9e7
---
M composer.json
M includes/XenForoUser.php
2 files changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/composer.json b/composer.json
index 500e532..f5b618f 100644
--- a/composer.json
+++ b/composer.json
@@ -7,7 +7,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/XenForoUser.php b/includes/XenForoUser.php
index 20d848b..dd2bace 100644
--- a/includes/XenForoUser.php
+++ b/includes/XenForoUser.php
@@ -130,7 +130,7 @@
public static function getXFUserIdFromUser( User $user, $flags = 
User::READ_LATEST ) {
$db = ( $flags & User::READ_LATEST )
? wfGetDB( DB_MASTER )
-   : wfGetDB( DB_SLAVE );
+   : wfGetDB( DB_REPLICA );
 
$s = $db->select(
'user_xenforo_user',
@@ -163,7 +163,7 @@
public static function getUserFromXFUserId( $xfUserId, $flags = 
User::READ_LATEST ) {
$db = ( $flags & User::READ_LATEST )
? wfGetDB( DB_MASTER )
-   : wfGetDB( DB_SLAVE );
+   : wfGetDB( DB_REPLICA );
 
$s = $db->selectRow(
'user_xenforo_user',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iff57a7ca8b437610171adca306e437192de4a9e7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/XenForoAuth
Gerrit-Branch: master
Gerrit-Owner: Libraryupgrader 
Gerrit-Reviewer: Legoktm 
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...intersection[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/380293 )

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


build: Updating mediawiki/mediawiki-codesniffer to 13.0.0

Change-Id: I5b9458a908d451832bbc2e8fe5a8badd245d383d
---
M DynamicPageList.hooks.php
M composer.json
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/DynamicPageList.hooks.php b/DynamicPageList.hooks.php
index c3c19d5..e0c19f0 100644
--- a/DynamicPageList.hooks.php
+++ b/DynamicPageList.hooks.php
@@ -385,7 +385,7 @@
}
 
// build the SQL query
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
$tables = [ 'page' ];
$fields = [ 'page_namespace', 'page_title' ];
$where = [];
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",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5b9458a908d451832bbc2e8fe5a8badd245d383d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/intersection
Gerrit-Branch: master
Gerrit-Owner: Libraryupgrader 
Gerrit-Reviewer: Legoktm 
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...ThrottleOverride[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/380259 )

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


build: Updating mediawiki/mediawiki-codesniffer to 13.0.0

Change-Id: I8e764d86233bb3a2eba2d00a5947a1c85fbd
---
M SpecialOverrideThrottle.php
M ThrottleOverride.hooks.php
M composer.json
3 files changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/SpecialOverrideThrottle.php b/SpecialOverrideThrottle.php
index ee62d47..8144e30 100644
--- a/SpecialOverrideThrottle.php
+++ b/SpecialOverrideThrottle.php
@@ -189,10 +189,10 @@
 * if it doesn't exist.
 *
 * @param string $ip
-* @param int $dbtype either DB_SLAVE or DB_MASTER
+* @param int $dbtype either DB_REPLICA or DB_MASTER
 * @return int
 */
-   public static function getThrottleOverrideId( $ip, $dbtype = DB_SLAVE ) 
{
+   public static function getThrottleOverrideId( $ip, $dbtype = DB_REPLICA 
) {
$db = wfGetDB( $dbtype );
$field = $db->selectField(
'throttle_override',
diff --git a/ThrottleOverride.hooks.php b/ThrottleOverride.hooks.php
index 58dabd8..a2db662 100644
--- a/ThrottleOverride.hooks.php
+++ b/ThrottleOverride.hooks.php
@@ -46,7 +46,7 @@
return true;
}
 
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
 
if ( $user->isAnon() && IP::isValid( $user->getName() ) ) {
$ip = $user->getName();
diff --git a/composer.json b/composer.json
index c664bfb..09bfa42 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": {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8e764d86233bb3a2eba2d00a5947a1c85fbd
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ThrottleOverride
Gerrit-Branch: master
Gerrit-Owner: Libraryupgrader 
Gerrit-Reviewer: Legoktm 
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...ArticleCreationWorkflow[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/380088 )

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


build: Updating mediawiki/mediawiki-codesniffer to 13.0.0

The following sniffs now pass and were enabled:
* MediaWiki.Commenting.FunctionComment.MissingParamComment

Change-Id: I1cb8721e4a471936dea0e2b1be57bde293ca
---
M composer.json
M phpcs.xml
M tests/phpunit/WorkflowTest.php
3 files changed, 2 insertions(+), 5 deletions(-)

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



diff --git a/composer.json b/composer.json
index 9ae4d85..f0c17cb 100644
--- a/composer.json
+++ b/composer.json
@@ -8,7 +8,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/phpcs.xml b/phpcs.xml
index dc070b6..9b2d579 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,9 +1,7 @@
 
 
.
-   
-   
-   
+   


 
diff --git a/tests/phpunit/WorkflowTest.php b/tests/phpunit/WorkflowTest.php
index 9359766..9c79f19 100644
--- a/tests/phpunit/WorkflowTest.php
+++ b/tests/phpunit/WorkflowTest.php
@@ -5,7 +5,6 @@
 use Article;
 use ArticleCreationWorkflow\Workflow;
 use DerivativeContext;
-use EditPage;
 use HashConfig;
 use MediaWikiTestCase;
 use RequestContext;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1cb8721e4a471936dea0e2b1be57bde293ca
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ArticleCreationWorkflow
Gerrit-Branch: master
Gerrit-Owner: Libraryupgrader 
Gerrit-Reviewer: Legoktm 
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...UniversalLanguageSelector[master]: Remove support for MediaWiki version 1.26

2017-09-24 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/380330 )

Change subject: Remove support for MediaWiki version 1.26
..


Remove support for MediaWiki version 1.26

Change-Id: I9ad5e87fa335b2b94840c3b3da4e921a41c71d9c
---
M extension.json
M resources/js/ext.uls.interface.js
2 files changed, 5 insertions(+), 4 deletions(-)

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



diff --git a/extension.json b/extension.json
index 2f6e283..13b4a07 100644
--- a/extension.json
+++ b/extension.json
@@ -15,6 +15,9 @@
"url": 
"https://www.mediawiki.org/wiki/Extension:UniversalLanguageSelector;,
"descriptionmsg": "uls-desc",
"license-name": "GPL-2.0+",
+   "requires": {
+   "MediaWiki": ">= 1.27.0"
+   },
"Hooks": {
"BeforePageDisplay": 
"UniversalLanguageSelectorHooks::addModules",
"EnterMobileMode": 
"UniversalLanguageSelectorHooks::onEnterMobileMode",
diff --git a/resources/js/ext.uls.interface.js 
b/resources/js/ext.uls.interface.js
index 77f92de..ea5726d 100644
--- a/resources/js/ext.uls.interface.js
+++ b/resources/js/ext.uls.interface.js
@@ -456,7 +456,7 @@
}
 
function initTooltip() {
-   var module, previousLanguage, currentLanguage, previousAutonym, 
currentAutonym;
+   var previousLanguage, currentLanguage, previousAutonym, 
currentAutonym;
 
if ( !userCanChangeLanguage() ) {
return;
@@ -476,9 +476,7 @@
}
 
if ( previousLanguage !== currentLanguage ) {
-   // Use oojs-ui-core only after MediaWiki 1.26 is no 
longer supported
-   module = mw.loader.getState( 'oojs-ui-core' ) === null 
? 'oojs-ui' : 'oojs-ui-core';
-   mw.loader.using( module ).done( function () {
+   mw.loader.using( 'oojs-ui-core' ).done( function () {
showUndoTooltip( previousLanguage, 
previousAutonym );
} );
mw.storage.set( 'uls-previous-language-code', 
currentLanguage );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9ad5e87fa335b2b94840c3b3da4e921a41c71d9c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Fomafix 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] labs...heritage[master]: Add Croatia in Croatian (hr_hr)

2017-09-24 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/379986 )

Change subject: Add Croatia in Croatian (hr_hr)
..


Add Croatia in Croatian (hr_hr)

Bug: T174505
Change-Id: I9c56daa1e2b160f53cef0e601aca8e430199190f
---
A erfgoedbot/monuments_config/hr_hr.json
1 file changed, 152 insertions(+), 0 deletions(-)

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



diff --git a/erfgoedbot/monuments_config/hr_hr.json 
b/erfgoedbot/monuments_config/hr_hr.json
new file mode 100644
index 000..fd4117b
--- /dev/null
+++ b/erfgoedbot/monuments_config/hr_hr.json
@@ -0,0 +1,152 @@
+{
+"country": "hr",
+"lang": "hr",
+"description": "Monuments in Croatia in Croatian",
+"project": "wikipedia",
+"namespaces": [
+4
+],
+"table": "monuments_hr_(hr)",
+"truncate": false,
+"primkey": "kod",
+"headerTemplate": "Spomenik zaglavlje",
+"rowTemplate": "Spomenik red",
+"commonsTemplate": "",
+"commonsTrackerCategory": "",
+"commonsCategoryBase": "Cultural heritage monuments in Croatia",
+"unusedImagesPage": "Suradnik:Effeietsanders/Unused_images",
+"imagesWithoutIdPage": "Suradnik:Effeietsanders/Images_without_id",
+"registrantUrlBase": "",
+"fields": [
+{
+"dest": "kod",
+"source": "kod"
+},
+{
+"dest": "zupanija",
+"source": "zupanija"
+},
+{
+"dest": "naziv",
+"source": "naziv"
+},
+{
+"dest": "opis",
+"source": "opis"
+},
+{
+"dest": "type",
+"source": "vrsta kulturnog dobra"
+},
+{
+"dest": "pravni_status",
+"source": "pravni status"
+},
+{
+"dest": "klasifikacija",
+"source": "klasifikacija"
+},
+{
+"dest": "sagradjeno",
+"source": "sagradjeno"
+},
+{
+"dest": "unesco",
+"source": "UNESCO"
+},
+{
+"dest": "adresa",
+"source": "adresa"
+},
+{
+"dest": "mjesto",
+"source": "mjesto"
+},
+{
+"dest": "grad",
+"source": "grad"
+},
+{
+"dest": "arhitekt",
+"source": "arhitekt"
+},
+{
+"dest": "lat",
+"source": "lat",
+"check": "checkLat"
+},
+{
+"dest": "lon",
+"source": "lon",
+"check": "checkLon"
+},
+{
+"dest": "slika",
+"source": "slika"
+},
+{
+"dest": "commonscat",
+"source": "commonscat"
+}
+],
+"sql_lang": "Croatian",
+"sql_country": "Croatia",
+"sql_data": {
+"country": {
+"value": "hr",
+"type": "Text"
+},
+"lang": {
+"value": "hr",
+"type": "Text"
+},
+"id": {
+"value": "kod",
+"type": "Field"
+},
+"adm0": {
+"value": "hr",
+"type": "Text"
+},
+"adm1": {
+"value": "zupanija",
+"type": "Field"
+},
+"name": {
+"value": "naziv",
+"type": "Field"
+},
+"address": {
+"value": "adresa",
+"type": "Field"
+},
+"municipality": {
+"value": "mjesto",
+"type": "Field"
+},
+"lat": {
+"value": "lat",
+"type": "Field"
+},
+"lon": {
+"value": "lon",
+"type": "Field"
+},
+"image": {
+"value": "slika",
+"type": "Field"
+},
+"commonscat": {
+"value": "commonscat",
+"type": "Field"
+},
+"source": {
+"value": "source",
+"type": "Field"
+},
+"changed": {
+"value": "changed",
+"type": "Field"
+}
+}
+}
\ No newline at end of file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9c56daa1e2b160f53cef0e601aca8e430199190f
Gerrit-PatchSet: 2
Gerrit-Project: labs/tools/heritage
Gerrit-Branch: master
Gerrit-Owner: Jean-Frédéric 
Gerrit-Reviewer: Lokal Profil 
Gerrit-Reviewer: Multichill 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org

[MediaWiki-commits] [Gerrit] mediawiki...TemplateSandbox[master]: Improve some parameter docs

2017-09-24 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/380332 )

Change subject: Improve some parameter docs
..

Improve some parameter docs

Change-Id: I6a7865d3b74617ed91a9139fd158dc43e1fcd532
---
M TemplateSandbox.hooks.php
M phpcs.xml
2 files changed, 5 insertions(+), 9 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TemplateSandbox 
refs/changes/32/380332/1

diff --git a/TemplateSandbox.hooks.php b/TemplateSandbox.hooks.php
index 684b4d0..b0cb4fb 100644
--- a/TemplateSandbox.hooks.php
+++ b/TemplateSandbox.hooks.php
@@ -45,9 +45,9 @@
 * when our button was clicked.
 *
 * @param EditPage $editpage
-* @param Content $content
-* @param string $out
-* @param ParserOutput $parserOutput
+* @param Content &$content
+* @param string &$out
+* @param ParserOutput &$parserOutput
 * @return bool
 */
public static function templateSandboxPreview( EditPage $editpage, 
&$content, &$out,
@@ -181,7 +181,7 @@
 *
 * @param EditPage $editpage
 * @param OutputPage $output
-* @param int $tabindex
+* @param int &$tabindex
 * @return bool
 */
public static function injectOptions( $editpage, $output, &$tabindex ) {
@@ -313,7 +313,7 @@
 * modules.
 *
 * @param ApiBase $module
-* @param array $params
+* @param array &$params
 * @param int $flags
 * @return bool
 */
diff --git a/phpcs.xml b/phpcs.xml
index 7fa91dc..9a46950 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -4,14 +4,10 @@



-   
-   



.


-   vendor
-   node_modules
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Thanks[master]: Improve some parameter docs

2017-09-24 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/380329 )

Change subject: Improve some parameter docs
..

Improve some parameter docs

Change-Id: I5b84aec326dad863af152e0b53dbd9f8f66e40d2
---
M ApiFlowThank.php
M ApiRevThank.php
M ApiThank.php
M Thanks.hooks.php
M phpcs.xml
5 files changed, 29 insertions(+), 32 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Thanks 
refs/changes/29/380329/1

diff --git a/ApiFlowThank.php b/ApiFlowThank.php
index 81867eb..0cc1d9a 100644
--- a/ApiFlowThank.php
+++ b/ApiFlowThank.php
@@ -188,6 +188,7 @@
 
/**
 * @see ApiBase::getExamplesMessages()
+* @return array
 */
protected function getExamplesMessages() {
return [
diff --git a/ApiRevThank.php b/ApiRevThank.php
index 102da35..23475eb 100644
--- a/ApiRevThank.php
+++ b/ApiRevThank.php
@@ -128,6 +128,7 @@
 
/**
 * @see ApiBase::getExamplesMessages()
+* @return array
 */
protected function getExamplesMessages() {
return [
diff --git a/ApiThank.php b/ApiThank.php
index fac762e..a294f5e 100644
--- a/ApiThank.php
+++ b/ApiThank.php
@@ -86,8 +86,8 @@
return 'csrf';
}
 
-   // Writes to the Echo database and sometimes log tables.
public function isWriteMode() {
+   // Writes to the Echo database and sometimes log tables.
return true;
}
 }
diff --git a/Thanks.hooks.php b/Thanks.hooks.php
index cf8fe9b..a55c7fb 100644
--- a/Thanks.hooks.php
+++ b/Thanks.hooks.php
@@ -12,8 +12,8 @@
 * ResourceLoaderTestModules hook handler
 * @see 
https://www.mediawiki.org/wiki/Manual:Hooks/ResourceLoaderTestModules
 *
-* @param array $testModules
-* @param ResourceLoader $resourceLoader
+* @param array &$testModules
+* @param ResourceLoader &$resourceLoader
 * @return bool
 */
public static function onResourceLoaderTestModules( array &$testModules,
@@ -36,9 +36,10 @@
/**
 * Handler for HistoryRevisionTools and DiffRevisionTools hooks.
 * Inserts 'thank' link into revision interface
-* @param $rev Revision object to add the thank link for
-* @param &$links array Links to add to the revision interface
-* @param $oldRev Revision object of the "old" revision when viewing a 
diff
+* @param Revision $rev Revision object to add the thank link for
+* @param array &$links Links to add to the revision interface
+* @param Revision $oldRev Revision object of the "old" revision when 
viewing a diff
+* @param User $user
 * @return bool
 */
public static function insertThankLink( $rev, &$links, $oldRev = null, 
User $user ) {
@@ -85,8 +86,8 @@
/**
 * Helper for self::insertThankLink
 * Creates either a thank link or thanked span based on users session
-* @param $rev Revision object to generate the thank element for
-* @param $recipient User who receives thanks notification
+* @param Revision $rev Revision object to generate the thank element 
for
+* @param User $recipient User who receives thanks notification
 * @return string
 */
protected static function generateThankElement( $rev, $recipient ) {
@@ -120,9 +121,9 @@
/**
 * Handler for PageHistoryBeforeList hook.
 * @see http://www.mediawiki.org/wiki/Manual:Hooks/PageHistoryBeforeList
-* @param &$page WikiPage|Article|ImagePage|CategoryPage|Page The page 
for which the history
+* @param WikiPage|Article|ImagePage|CategoryPage|Page &$page The page 
for which the history
 *   is loading.
-* @param $context RequestContext object
+* @param RequestContext $context RequestContext object
 * @return bool true in all cases
 */
public static function onPageHistoryBeforeList( &$page, $context ) {
@@ -141,9 +142,9 @@
/**
 * Handler for DiffViewHeader hook.
 * @see http://www.mediawiki.org/wiki/Manual:Hooks/DiffViewHeader
-* @param $diff DifferenceEngine
-* @param $oldRev Revision object of the "old" revision (may be 
null/invalid)
-* @param $newRev Revision object of the "new" revision
+* @param DifferenceEngine $diff
+* @param Revision $oldRev Revision object of the "old" revision (may 
be null/invalid)
+* @param Revision $newRev Revision object of the "new" revision
 * @return bool true in all cases
 */
public static function onDiffViewHeader( $diff, $oldRev, $newRev ) {
@@ -162,9 +163,9 @@
/**
 * Add Thanks events to Echo
 *
-* @param $notifications array of Echo notifications
-* @param $notificationCategories array of Echo

[MediaWiki-commits] [Gerrit] mediawiki...UniversalLanguageSelector[master]: Remove support for MediaWiki version 1.26

2017-09-24 Thread Fomafix (Code Review)

Fomafix has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/380330 )

Change subject: Remove support for MediaWiki version 1.26
..

Remove support for MediaWiki version 1.26

Change-Id: I9ad5e87fa335b2b94840c3b3da4e921a41c71d9c
---
M extension.json
M resources/js/ext.uls.interface.js
2 files changed, 5 insertions(+), 4 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector 
refs/changes/30/380330/1

diff --git a/extension.json b/extension.json
index 2f6e283..13b4a07 100644
--- a/extension.json
+++ b/extension.json
@@ -15,6 +15,9 @@
"url": 
"https://www.mediawiki.org/wiki/Extension:UniversalLanguageSelector;,
"descriptionmsg": "uls-desc",
"license-name": "GPL-2.0+",
+   "requires": {
+   "MediaWiki": ">= 1.27.0"
+   },
"Hooks": {
"BeforePageDisplay": 
"UniversalLanguageSelectorHooks::addModules",
"EnterMobileMode": 
"UniversalLanguageSelectorHooks::onEnterMobileMode",
diff --git a/resources/js/ext.uls.interface.js 
b/resources/js/ext.uls.interface.js
index 77f92de..ea5726d 100644
--- a/resources/js/ext.uls.interface.js
+++ b/resources/js/ext.uls.interface.js
@@ -456,7 +456,7 @@
}
 
function initTooltip() {
-   var module, previousLanguage, currentLanguage, previousAutonym, 
currentAutonym;
+   var previousLanguage, currentLanguage, previousAutonym, 
currentAutonym;
 
if ( !userCanChangeLanguage() ) {
return;
@@ -476,9 +476,7 @@
}
 
if ( previousLanguage !== currentLanguage ) {
-   // Use oojs-ui-core only after MediaWiki 1.26 is no 
longer supported
-   module = mw.loader.getState( 'oojs-ui-core' ) === null 
? 'oojs-ui' : 'oojs-ui-core';
-   mw.loader.using( module ).done( function () {
+   mw.loader.using( 'oojs-ui-core' ).done( function () {
showUndoTooltip( previousLanguage, 
previousAutonym );
} );
mw.storage.set( 'uls-previous-language-code', 
currentLanguage );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9ad5e87fa335b2b94840c3b3da4e921a41c71d9c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Fomafix 

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

[MediaWiki-commits] [Gerrit] mediawiki...TorBlock[master]: Improve some parameter docs

2017-09-24 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/380328 )

Change subject: Improve some parameter docs
..

Improve some parameter docs

Change-Id: Ic51c101917d6697ccaaccda9c3fc384d7453377b
---
M ASN1Parser.php
M includes/TorBlockHooks.php
M phpcs.xml
3 files changed, 15 insertions(+), 19 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TorBlock 
refs/changes/28/380328/1

diff --git a/ASN1Parser.php b/ASN1Parser.php
index 17cd244..32488c5 100644
--- a/ASN1Parser.php
+++ b/ASN1Parser.php
@@ -39,7 +39,7 @@
// @codingStandardsIgnoreEnd
 
/**
-* @param $number int
+* @param int $number
 * @return string
 */
public static function encodeLength( $number ) {
@@ -54,7 +54,7 @@
}
 
/**
-* @param $buffer string
+* @param string $buffer
 * @return array
 * @throws ASN1Exception
 */
@@ -147,7 +147,7 @@
}
 
/**
-* @param $decodedArray array
+* @param array $decodedArray
 * @return array
 */
public static function prettyDecode( $decodedArray ) {
@@ -158,8 +158,8 @@
}
 
/**
-* @param $value string
-* @param $key string
+* @param string &$value
+* @param string $key
 */
protected static function prettyItem( &$value, $key ) {
switch ( $key ) {
@@ -175,8 +175,8 @@
}
 
/**
-* @param $tagId
-* @param $contents
+* @param int $tagId
+* @param string $contents
 * @return string
 * @throws ASN1Exception
 */
diff --git a/includes/TorBlockHooks.php b/includes/TorBlockHooks.php
index 6c777b4..9077e3a 100644
--- a/includes/TorBlockHooks.php
+++ b/includes/TorBlockHooks.php
@@ -79,8 +79,8 @@
 * Check if a user is a Tor node and not whitelisted or allowed
 * to bypass tor blocks.
 *
-* @param Title $title Title being acted upon
-* @param User $user User performing the action
+* @param Title &$title Title being acted upon
+* @param User &$user User performing the action
 * @param string $action Action being performed
 * @param array &$result Will be filled with block status if blocked
 * @return bool
@@ -147,7 +147,7 @@
 * Set a variable for Extension:AbuseFilter indicating whether the
 * user is operating from a tor exit node or not.
 *
-* @param array $builder Array of builder values
+* @param array &$builder Array of builder values
 * @return bool
 */
public static function onAbuseFilterBuilder( array &$builder ) {
@@ -157,7 +157,7 @@
 
/**
 * @static
-* @param $user User
+* @param User &$user
 * @return bool
 */
public static function onGetBlockedStatus( &$user ) {
@@ -260,7 +260,7 @@
/**
 * If enabled, add a new tag type for recent changes made by Tor exit 
nodes.
 *
-* @param array $emptyTags List of defined tags (for ListDefinedTags 
hook) or
+* @param array &$emptyTags List of defined tags (for ListDefinedTags 
hook) or
 * list of active tags (for ChangeTagsListActive hook)
 * @return bool true
 */
@@ -276,7 +276,7 @@
/**
 * Creates a message with the Tor blocking status if applicable.
 *
-* @param array $msg Message with the status
+* @param array &$msg Message with the status
 * @param string $ip The IP address to be checked
 * @return bool true
 */
diff --git a/phpcs.xml b/phpcs.xml
index 0bc8fcc..bf67ffa 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,19 +1,15 @@
 
 

-   
-   
-   




+   



.

-   
-   vendor
-   node_modules
+   
 

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

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

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

[MediaWiki-commits] [Gerrit] search/extra[master]: [WIP] start using the diescovery-parent-pom

2017-09-24 Thread Gehel (Code Review)

Gehel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/380327 )

Change subject: [WIP] start using the diescovery-parent-pom
..

[WIP] start using the diescovery-parent-pom

Change-Id: I0bdf2cb61fc389db15b01fe53a75a728e4b9227e
---
M pom.xml
1 file changed, 301 insertions(+), 473 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/search/extra 
refs/changes/27/380327/1

diff --git a/pom.xml b/pom.xml
index e7b848b..0f8a06a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,488 +1,316 @@
 
 http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
-  4.0.0
+4.0.0
 
-  
-org.sonatype.oss
-oss-parent
-7
-  
+
+org.wikimedia.discovery
+discovery-parent-pom
+1.0-SNAPSHOT
+
 
-  org.wikimedia.search
-  extra
-  5.5.2.2-SNAPSHOT
-  Extra queries and filters for Elasticsearch.
+org.wikimedia.search
+extra
+5.5.2.2-SNAPSHOT
+Extra queries and filters for Elasticsearch.
 
-  
-
-  The Apache Software License, Version 2.0
-  http://www.apache.org/licenses/LICENSE-2.0.txt
-  repo
-
-  
+
+
+The Apache Software License, Version 2.0
+http://www.apache.org/licenses/LICENSE-2.0.txt
+repo
+
+
 
-  
-
-  manybubbles
-  Nik Everett
-  nik9000+ex...@gmail.com
-  America/New York
-
-  
+
+
+manybubbles
+Nik Everett
+nik9000+ex...@gmail.com
+America/New York
+
+
 
-  
-https://gerrit.wikimedia.org/r/#/admin/projects/search/extra
-
scm:git:https://gerrit.wikimedia.org/r/search/extra
-
scm:git:https://gerrit.wikimedia.org/r/search/extra
-HEAD
-  
+
+
scm:git:https://gerrit.wikimedia.org/r/search/extra
+
scm:git:https://gerrit.wikimedia.org/r/search/extra
+HEAD
+https://gerrit.wikimedia.org/r/#/admin/projects/search/extra
+
 
-  
-GitHub
-https://github.com/wikimedia/extra/issues
-  
+
+GitHub
+https://github.com/wikimedia/extra/issues
+
 
-  
-UTF-8
-5.5.2
-6.6.0
-2.5.0
-1.8
-1.8
-true
-3.1.0-RC5
-  
+
+5.5.2
+6.6.0
+true
+1.8
+1.8
+UTF-8
+2.5.0
+3.1.0-RC5
+
 
-  
-
-  
-src/main/resources
-true
-
-  *.properties
-
-  
-
-
-  
-com.github.hazendaz.spotbugs
-spotbugs-maven-plugin
-3.0.6
-
-  
+
+
 com.github.spotbugs
-spotbugs
-${spotbugs.version}
-  
-
-
-  high
-  low
-  
${project.basedir}/src/dev-tools/spotbugs-excludes.xml
-  
-
-  com.mebigfatguy.fb-contrib
-  fb-contrib
-  7.0.4.sb
-
-  
-
-
-  
-findbugs-check
-
-  check
-
-verify
-  
-
-  
-  
-com.carrotsearch.randomizedtesting
-junit4-maven-plugin
-  
-  
-maven-assembly-plugin
-2.2-beta-5
-
-  false
-  
${project.build.directory}/releases/
-  
-${basedir}/src/main/assemblies/plugin.xml
-  
-
-
-  
-package
-
-  single
-
-  
-
-  
-  
-org.apache.maven.plugins
-maven-source-plugin
-  
-  
-org.apache.maven.plugins
-maven-javadoc-plugin
-  
-  
-de.thetaphi
-forbiddenapis
-1.6.1
-
-  ${maven.compiler.target}
-  
-  true
-  
-  false
-  
-
-jdk-unsafe
-jdk-deprecated
-jdk-system-out
-  
-
-
-  
-check-forbidden-apis
-compile
-
-  check
-
-
-  
-
src/dev-tools/forbidden/core-signatures.txt
-
src/dev-tools/forbidden/all-signatures.txt
-  
-
-  
-  
-check-forbidden-test-apis
-test-compile
-
-  testCheck
-
-
-  
-
src/dev-tools/forbidden/test-signatures.txt
-
src/dev-tools/forbidden/all-signatures.txt
-  
-
-  
-
-  
-  
-org.apache.maven.plugins
-maven-checkstyle-plugin
-2.17
-
-  src/dev-tools/checkstyle.xml
-

[MediaWiki-commits] [Gerrit] mediawiki...SendGrid[master]: Add some documentation to the README.md

2017-09-24 Thread D3r1ck01 (Code Review)

D3r1ck01 has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/380312 )

Change subject: Add some documentation to the README.md
..


Add some documentation to the README.md

* Adding some documentation/links to online docs related to
  the SendGrid extension.

Bug: T176575
Change-Id: I0ce7d8b0dcd3df3e235be7af60ccf1d2f39e71b4
---
M README.md
1 file changed, 15 insertions(+), 0 deletions(-)

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



diff --git a/README.md b/README.md
index e69de29..4f26292 100644
--- a/README.md
+++ b/README.md
@@ -0,0 +1,15 @@
+# SendGrid MediaWiki Extension
+
+This is a Github mirror of MediaWiki extension SendGrid - our actual code is 
hosted with Gerrit (please see https://www.mediawiki.org/wiki/Developer_access 
for contributing).
+
+
+
+# View SendGrid package using the link below;
+
+Github SendGrid package: https://github.com/stephenb/sendgrid.
+
+
+
+# Installing the SendGrid Extension on MW
+
+To install this extension on MediaWiki (MW), follow the documentations here: 
https://www.mediawiki.org/wiki/Extension:SendGrid
\ No newline at end of file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0ce7d8b0dcd3df3e235be7af60ccf1d2f39e71b4
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/SendGrid
Gerrit-Branch: master
Gerrit-Owner: D3r1ck01 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: D3r1ck01 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: Zoranzoki21 
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...TrustedXFF[master]: Improve some parameter docs

2017-09-24 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/380326 )

Change subject: Improve some parameter docs
..

Improve some parameter docs

Change-Id: Ib41737bbc9f1628f99e06b970fe73c1d0fc4ea9f
---
M TrustedXFF.body.php
M phpcs.xml
2 files changed, 5 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TrustedXFF 
refs/changes/26/380326/1

diff --git a/TrustedXFF.body.php b/TrustedXFF.body.php
index d9a167f..445316a 100644
--- a/TrustedXFF.body.php
+++ b/TrustedXFF.body.php
@@ -32,8 +32,8 @@
private static $ipv6Set;
 
/**
-* @param string $ip
-* @param bool $trusted
+* @param string &$ip
+* @param bool &$trusted
 * @return bool
 */
public static function onIsTrustedProxy( &$ip, &$trusted ) {
diff --git a/phpcs.xml b/phpcs.xml
index d3d5b4f..db9d9a0 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,11 +1,9 @@
 
 

-   
-   
-   
-   

+   
+   



@@ -19,7 +17,5 @@

.

-   
-   vendor
-   node_modules
+   
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...TimedMediaHandler[master]: Improve some parameter docs

2017-09-24 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/380325 )

Change subject: Improve some parameter docs
..

Improve some parameter docs

Change-Id: Ie75e6f6c05217f8da32c70522d23275b70d95cee
---
M ApiQueryVideoInfo.php
M ApiTranscodeReset.php
M ApiTranscodeStatus.php
M SpecialOrphanedTimedText.php
M SpecialTimedMediaHandler.php
M TimedMediaHandler.hooks.php
M TimedMediaHandler_body.php
M TimedMediaIframeOutput.php
M TimedMediaThumbnail.php
M TimedMediaTransformOutput.php
M TimedTextPage.php
M TranscodeStatusTable.php
M WebVideoTranscode/WebVideoTranscode.php
M WebVideoTranscode/WebVideoTranscodeJob.php
M handlers/FLACHandler/FLACHandler.php
M handlers/ID3Handler/ID3Handler.php
M handlers/Mp3Handler/Mp3Handler.php
M handlers/Mp4Handler/Mp4Handler.php
M handlers/OggHandler/OggHandler.php
M handlers/TextHandler/TextHandler.php
M handlers/WAVHandler/WAVHandler.php
M handlers/WebMHandler/WebMHandler.php
M phpcs.xml
M tests/phpunit/TestOggHandler.php
M tests/phpunit/TestTimedMediaHandler.php
M tests/phpunit/TestTimedMediaTransformOutput.php
M tests/phpunit/TestWebMHandler.php
27 files changed, 265 insertions(+), 244 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TimedMediaHandler 
refs/changes/25/380325/1

diff --git a/ApiQueryVideoInfo.php b/ApiQueryVideoInfo.php
index 72a17b3..0acf987 100644
--- a/ApiQueryVideoInfo.php
+++ b/ApiQueryVideoInfo.php
@@ -58,6 +58,7 @@
 
/**
 * @see ApiBase::getExamplesMessages()
+* @return array
 */
protected function getExamplesMessages() {
return [
diff --git a/ApiTranscodeReset.php b/ApiTranscodeReset.php
index 9a0e05b..7fa1037 100644
--- a/ApiTranscodeReset.php
+++ b/ApiTranscodeReset.php
@@ -110,8 +110,8 @@
}
 
/**
-* @param $file
-* @param $transcodeKey
+* @param File $file
+* @param string|bool $transcodeKey
 * @return int|string
 */
public static function checkTimeSinceLastRest( $file, $transcodeKey ) {
@@ -137,7 +137,7 @@
}
 
/**
-* @param $state
+* @param array $state
 * @return int|string
 */
public static function getStateResetTime( $state ) {
@@ -218,6 +218,7 @@
 
/**
 * @see ApiBase::getExamplesMessages()
+* @return array
 */
protected function getExamplesMessages() {
// @codingStandardsIgnoreStart
diff --git a/ApiTranscodeStatus.php b/ApiTranscodeStatus.php
index 59a352a..88052ee 100644
--- a/ApiTranscodeStatus.php
+++ b/ApiTranscodeStatus.php
@@ -66,6 +66,7 @@
 
/**
 * @see ApiBase::getExamplesMessages()
+* @return array
 */
protected function getExamplesMessages() {
return [
diff --git a/SpecialOrphanedTimedText.php b/SpecialOrphanedTimedText.php
index d651a74..00153f4 100644
--- a/SpecialOrphanedTimedText.php
+++ b/SpecialOrphanedTimedText.php
@@ -23,6 +23,7 @@
 
/**
 * This is alphabetical, so sort ascending.
+* @return bool
 */
public function sortDescending() {
return false;
@@ -33,6 +34,7 @@
 *
 * This query is actually almost cheap given the current
 * number of things in TimedText namespace.
+* @return bool
 */
public function isExpensive() {
return true;
@@ -41,7 +43,7 @@
/**
 * Main execution function
 *
-* @param $par String subpage
+* @param string $par subpage
 */
public function execute( $par ) {
global $wgEnableLocalTimedText;
@@ -165,6 +167,7 @@
 *
 * Given a title like "TimedText:Some bit here.webm.en.srt"
 * check to see if "File:Some bit here.webm" really exists (locally).
+* @param Title $title
 * @return bool True if we should cross out the line.
 */
protected function existenceCheck( Title $title ) {
@@ -205,8 +208,8 @@
/**
 * Preprocess result to do existence checks all at once.
 *
-* @param $db Database
-* @param $res ResultWraper
+* @param Database $db
+* @param ResultWraper $res
 */
public function preprocessResults( $db, $res ) {
parent::preprocessResults( $db, $res );
diff --git a/SpecialTimedMediaHandler.php b/SpecialTimedMediaHandler.php
index 99a3b67..22a2fb3 100644
--- a/SpecialTimedMediaHandler.php
+++ b/SpecialTimedMediaHandler.php
@@ -69,8 +69,8 @@
 
/**
 * @param OutputPage $out
-* @param $state
-* @param $states
+* @param string $state
+* @param array $states
 * @param bool $showTable
 */
private function renderState( $out, $state, $states, $showTable = true 
) {
diff --git a/TimedMediaHandler.hooks.php

[MediaWiki-commits] [Gerrit] translatewiki[master]: [MultiLanguageManager] Register alias file

2017-09-24 Thread Raimond Spekking (Code Review)

Raimond Spekking has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/380324 )

Change subject: [MultiLanguageManager] Register alias file
..


[MultiLanguageManager] Register alias file

Change-Id: Iba6e9e057918e352151529f294c8035fca20e676
---
M groups/MediaWiki/mediawiki-extensions.txt
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Raimond Spekking: Verified; Looks good to me, approved



diff --git a/groups/MediaWiki/mediawiki-extensions.txt 
b/groups/MediaWiki/mediawiki-extensions.txt
index 676a011..367c0aa 100644
--- a/groups/MediaWiki/mediawiki-extensions.txt
+++ b/groups/MediaWiki/mediawiki-extensions.txt
@@ -1648,6 +1648,7 @@
 ignored = multimediaviewer-embed-dimensions-with-file-format, 
multimediaviewer-report-issue-url
 
 Multi Language Manager
+aliasfile = MultiLanguageManager/MultiLanguageManager.alias.php
 descmsg = mlm-desc
 
 MwEmbed Support

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iba6e9e057918e352151529f294c8035fca20e676
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking 
Gerrit-Reviewer: Raimond Spekking 

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

[MediaWiki-commits] [Gerrit] translatewiki[master]: [MultiLanguageManager] Register alias file

2017-09-24 Thread Raimond Spekking (Code Review)

Raimond Spekking has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/380324 )

Change subject: [MultiLanguageManager] Register alias file
..

[MultiLanguageManager] Register alias file

Change-Id: Iba6e9e057918e352151529f294c8035fca20e676
---
M groups/MediaWiki/mediawiki-extensions.txt
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/24/380324/1

diff --git a/groups/MediaWiki/mediawiki-extensions.txt 
b/groups/MediaWiki/mediawiki-extensions.txt
index 676a011..367c0aa 100644
--- a/groups/MediaWiki/mediawiki-extensions.txt
+++ b/groups/MediaWiki/mediawiki-extensions.txt
@@ -1648,6 +1648,7 @@
 ignored = multimediaviewer-embed-dimensions-with-file-format, 
multimediaviewer-report-issue-url
 
 Multi Language Manager
+aliasfile = MultiLanguageManager/MultiLanguageManager.alias.php
 descmsg = mlm-desc
 
 MwEmbed Support

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iba6e9e057918e352151529f294c8035fca20e676
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking 

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

[MediaWiki-commits] [Gerrit] translatewiki[master]: [CommitStreams] Register extension

2017-09-24 Thread Raimond Spekking (Code Review)

Raimond Spekking has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/380323 )

Change subject: [CommitStreams] Register extension
..


[CommitStreams] Register extension

Change-Id: Idc96b2aaa9b73d69da7d11bc076e8fe93effe10a
---
M groups/MediaWiki/mediawiki-extensions.txt
1 file changed, 3 insertions(+), 0 deletions(-)

Approvals:
  Raimond Spekking: Verified; Looks good to me, approved



diff --git a/groups/MediaWiki/mediawiki-extensions.txt 
b/groups/MediaWiki/mediawiki-extensions.txt
index 79987b1..676a011 100644
--- a/groups/MediaWiki/mediawiki-extensions.txt
+++ b/groups/MediaWiki/mediawiki-extensions.txt
@@ -647,6 +647,9 @@
 Comment Pages
 ignored = commenttab-editintro, commenttab-preload
 
+Comment Streams
+aliasfile = CommentStreams/includes/CommentStreamsAllComments.alias.php
+
 Commentbox
 aliasfile = Commentbox/Commentbox.alias.php
 ignored = commentbox-prefill

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idc96b2aaa9b73d69da7d11bc076e8fe93effe10a
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking 
Gerrit-Reviewer: Raimond Spekking 

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

[MediaWiki-commits] [Gerrit] translatewiki[master]: [CommitStreams] Register extension

2017-09-24 Thread Raimond Spekking (Code Review)

Raimond Spekking has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/380323 )

Change subject: [CommitStreams] Register extension
..

[CommitStreams] Register extension

Change-Id: Idc96b2aaa9b73d69da7d11bc076e8fe93effe10a
---
M groups/MediaWiki/mediawiki-extensions.txt
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/23/380323/1

diff --git a/groups/MediaWiki/mediawiki-extensions.txt 
b/groups/MediaWiki/mediawiki-extensions.txt
index 79987b1..676a011 100644
--- a/groups/MediaWiki/mediawiki-extensions.txt
+++ b/groups/MediaWiki/mediawiki-extensions.txt
@@ -647,6 +647,9 @@
 Comment Pages
 ignored = commenttab-editintro, commenttab-preload
 
+Comment Streams
+aliasfile = CommentStreams/includes/CommentStreamsAllComments.alias.php
+
 Commentbox
 aliasfile = Commentbox/Commentbox.alias.php
 ignored = commentbox-prefill

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idc96b2aaa9b73d69da7d11bc076e8fe93effe10a
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking 

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

[MediaWiki-commits] [Gerrit] mediawiki...Comments[master]: [DNM] v4.4.0 - New form in OOUI with previewing + byte limit...

2017-09-24 Thread SamanthaNguyen (Code Review)

SamanthaNguyen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/380322 )

Change subject: [DNM] v4.4.0 - New form in OOUI with previewing + byte limit 
features
..

[DNM] v4.4.0 - New form in OOUI with previewing + byte limit features

Not everything is fully implemented yet, but getting there.

New features (outlined plan):
 - You can now preview your comment in wiki markup to help prevent
   mistakes before submitting. This can be done by writing your comment
   and then clicking on the "Preview" tab.
 - As a system administrator, you can decide whether or not to have an
   enforced byte limit turned on or off. By default, it is turned off.
   The variables include:
- $wgCommentsEnableByteLimit
- $wgCommentsByteLimitNumber

TODO:
 - Handle buttons properly
 - Handle permissions properly
 - Make sure tabs show up
 - Use core jquery.byteLimit module for enforcing byte limit

Based on original demo/experiment in:
 - https://samanthanguyen.github.io/mediawiki-demos/comments/demo.html

Bug: T156055
Change-Id: I977089eedad5be5f944f8ffeb4ad757b7fda4517
---
M .jshintrc
M extension.json
M i18n/en.json
M i18n/qqq.json
M includes/CommentsPage.class.php
A includes/interfaces/FormInterface.php
M includes/parser/DisplayComments.class.php
M resources/css/Comments.css
A resources/css/ext.comments.form.ooui.styles.css
A resources/js/ext.comments.form.ooui.js
10 files changed, 286 insertions(+), 63 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Comments 
refs/changes/22/380322/1

diff --git a/.jshintrc b/.jshintrc
index 04c3a97..687fe80 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -18,6 +18,7 @@
"jquery": true,
 
"globals": {
-   "mediaWiki": false
+   "mediaWiki": false,
+   "OO": false
}
 }
diff --git a/extension.json b/extension.json
index 143c8dc..719f71a 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "Comments",
-   "version": "4.3.2",
+   "version": "4.4.0",
"author": [
"David Pean",
"Misza",
@@ -74,7 +74,8 @@
"CommentLatestIdAPI": "includes/api/CommentLatestID.api.php",
"CommentListAPI": "includes/api/CommentList.api.php",
"CommentSubmitAPI": "includes/api/CommentSubmit.api.php",
-   "CommentVoteAPI": "includes/api/CommentVote.api.php"
+   "CommentVoteAPI": "includes/api/CommentVote.api.php",
+   "FormInterface": "includes/interfaces/FormInterface.php"
},
"ResourceModules": {
"ext.comments.css": {
@@ -95,6 +96,25 @@
"comments-block-warning-user",
"comments-delete-warning"
]
+   },
+   "ext.comments.form.ooui.styles": {
+   "styles": 
"resources/css/ext.comments.forms.ooui.styles.css",
+   "position": "top"
+   },
+   "ext.comments.form.ooui": {
+   "scripts": "resources/js/ext.comments.form.ooui.js",
+   "dependencies": [
+   "oojs-ui-core",
+   "oojs-ui-widgets",
+   "oojs-ui.styles.icons-alerts"
+   ],
+   "messages": [
+   "comments-preview-failed",
+   "comments-tab-write",
+   "comments-tab-preview",
+   "comments-post",
+   "comments-cancel-reply"
+   ]
}
},
"ResourceFileModulePaths": {
@@ -111,7 +131,9 @@
"config": {
"CommentsDefaultAvatar": 
"http://www.shoutwiki.com/w/extensions/SocialProfile/avatars/default_ml.gif;,
"CommentsSortDescending": false,
-   "CommentsInRecentChanges": false
+   "CommentsInRecentChanges": false,
+   "CommentsEnableByteLimit": false,
+   "CommentsByteLimitNumber": ""
},
"manifest_version": 1
 }
diff --git a/i18n/en.json b/i18n/en.json
index 78e4940..c97108b 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -67,6 +67,10 @@
"comments-ignore-title": "Comment ignore list",
"commentignorelist": "Comment ignore list",
"comments-no-comments-of-day": "There are no comments of the day.",
+   "comments-textarea-placeholder": "Add a comment",
+   "comments-tab-write": "Write",
+   "comments-tab-preview": "Preview",
+   "comments-preview-failed": "Previewing failed. Please try again.",
"log-name-comments": "Comments log",
"log-description-comments": "This is a log of comments.",
"logentry-comments-add": "$1 posted a new

[MediaWiki-commits] [Gerrit] mediawiki...MediaWikiFarm[master]: Always check Composer extensions independantly of ExtensionR...

2017-09-24 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/380317 )

Change subject: Always check Composer extensions independantly of 
ExtensionRegistration
..


Always check Composer extensions independantly of ExtensionRegistration

Sometimes, when MediaWikiFarm is in monoversion mode, ExtensionRegistry
is known, and we should check if some extension should be loaded with
Composer; it was no more the case since ca185e0.

Also, the function MediaWikiFarmConfiguration::detectLoadingMechanism
no more tries to detect Composer extension given the case is handled
in an other way.

Change-Id: I6b1379826f698861d66016c836b3d867d2d85fec
---
M src/MediaWikiFarmConfiguration.php
M tests/phpunit/ConfigurationTest.php
M tests/phpunit/LoadingTest.php
3 files changed, 17 insertions(+), 30 deletions(-)

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



diff --git a/src/MediaWikiFarmConfiguration.php 
b/src/MediaWikiFarmConfiguration.php
index 62d7eb6..a9d92f3 100644
--- a/src/MediaWikiFarmConfiguration.php
+++ b/src/MediaWikiFarmConfiguration.php
@@ -430,16 +430,13 @@
unset( $this->configuration['extensions'][$key] 
);
 
# Mechanism Composer wanted
-   } elseif( $value === 'composer' && 
$this->detectComposer( $type, $name ) ) {
+   } elseif( ( $value === 'composer' || $value === true ) 
&& $this->detectComposer( $type, $name ) ) {
$status = 'composer';
$value = true;
 
-   # MediaWiki still not loaded: we must wait before 
taking a decision except for Composer loading
+   # MediaWiki still not loaded: we must wait before 
taking a decision
} elseif( $ExtensionRegistry === null ) {
-   if( $this->detectComposer( $type, $name ) ) {
-   $status = 'composer';
-   $value = true;
-   }
+   # nop
 
# Mechanism require_once wanted
} elseif( $value === 'require_once' && 
$this->detectLoadingMechanism( $type, $name, true ) == $value ) {
@@ -529,10 +526,10 @@
 *
 * @param string $type Type, in ['extension', 'skin'].
 * @param string $name Name of the extension/skin.
-* @param string $preferedRO Prefered require_once mechanism.
-* @return string|null Loading mechnism in ['wfLoadExtension', 
'wfLoadSkin', 'require_once', 'composer'] or null if all mechanisms failed.
+* @param bool $preferedRO Prefered require_once mechanism.
+* @return string|null Loading mechnism in ['wfLoadExtension', 
'wfLoadSkin', 'require_once'] or null if all mechanisms failed.
 */
-   function detectLoadingMechanism( $type, $name, $preferedRO = null ) {
+   function detectLoadingMechanism( $type, $name, $preferedRO = false ) {
 
# Search base directory
$base = $this->farm->getVariable( '$CODE' ) . '/' . $type . 's';
@@ -555,11 +552,6 @@
# An extension.json/skin.json file is in the directory -> 
assume it is the loading mechanism
if( $this->environment['ExtensionRegistry'] && is_file( $base . 
'/' . $name . '/' . $type . '.json' ) ) {
return 'wfLoad' . ucfirst( $type );
-   }
-
-   # A composer.json file is in the directory and the extension is 
properly autoloaded by Composer
-   elseif( $this->detectComposer( $type, $name ) ) {
-   return 'composer';
}
 
# A MyExtension.php file is in the directory -> assume it is 
the loading mechanism
diff --git a/tests/phpunit/ConfigurationTest.php 
b/tests/phpunit/ConfigurationTest.php
index 67a10da..7ca59f1 100644
--- a/tests/phpunit/ConfigurationTest.php
+++ b/tests/phpunit/ConfigurationTest.php
@@ -276,11 +276,8 @@
 * @uses MediaWikiFarmConfiguration::detectComposer
 * @uses MediaWikiFarmConfiguration::setEnvironment
 * @uses MediaWikiFarmConfiguration::getConfiguration
-* @uses MediaWikiFarmConfiguration::setComposer
-* @uses AbstractMediaWikiFarmScript::rmdirr
-* @uses MediaWikiFarmUtils::arrayMerge
-* @uses MediaWikiFarmUtils::isMediaWiki
-* @uses MediaWikiFarmUtils::readFile
+* @uses AbstractMediaWikiFarmScript
+* @uses MediaWikiFarmUtils
 */
function testLoadMediaWikiConfigMultiversion() {
 
@@ -346,7 +343,6 @@
 * @uses MediaWikiFarm::readFile
 * @uses MediaWikiFarmConfiguration::__construct
 * @uses MediaWikiFarmConfiguration::getConfiguration
-* @uses MediaWikiFarmConfiguration::setComposer

[MediaWiki-commits] [Gerrit] mediawiki...Vector[master]: Page actions in dropdown menu should expands if space allows...

2017-09-24 Thread Rammanojpotla (Code Review)

Rammanojpotla has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/380321 )

Change subject: Page actions in dropdown menu should expands if space allows in 
Vector
..

Page actions in dropdown menu should expands if space allows in Vector

The items in dropdown expands if space allows so that all urls display in
navigation menu

Depending on the resolution the tabs moves under dropdown if there is
insuffieciency of space

Bug: T24986
Change-Id: Ibfd65db17e15afb494614a09d986f708f557092f
---
M VectorTemplate.php
M vector.js
2 files changed, 3 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Vector 
refs/changes/21/380321/1

diff --git a/VectorTemplate.php b/VectorTemplate.php
index d109031..e29ea7c 100644
--- a/VectorTemplate.php
+++ b/VectorTemplate.php
@@ -49,7 +49,8 @@
unset( $this->data['action_urls'][$mode] );
}
}
-
+   $this->data['view_urls'] = 
array_merge($this->data['view_urls'],$this->data['action_urls']);
+   unset($this->data['action_urls']);
// Reverse horizontally rendered navigation elements
if ( $this->data['rtl'] ) {
$this->data['view_urls'] =
diff --git a/vector.js b/vector.js
index 9d4c48a..acfa780 100644
--- a/vector.js
+++ b/vector.js
@@ -98,7 +98,7 @@
// But only if the width of the tab to 
collapse is smaller than the width of the dropdown
// we would have to insert. An example 
language where this happens is Lithuanian (lt).
if ( $cactions.hasClass( 'emptyPortlet' 
) ) {
-   return $tabContainer.children( 
'li.collapsible:last' ).width() > initialCactionsWidth();
+   return $tabContainer.children( 
'li.collapsible:last' ).width() + 20 > initialCactionsWidth();
} else {
return true;
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibfd65db17e15afb494614a09d986f708f557092f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Vector
Gerrit-Branch: master
Gerrit-Owner: Rammanojpotla 

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

[MediaWiki-commits] [Gerrit] mediawiki...CommentStreams[master]: Missing message.

2017-09-24 Thread Cicalese (Code Review)

Cicalese has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/380320 )

Change subject: Missing message.
..


Missing message.

Change-Id: If1de385d7b3ed4dd0f9bdd8d7a013468d18af516
---
M i18n/en.json
M i18n/qqq.json
2 files changed, 2 insertions(+), 0 deletions(-)

Approvals:
  Cicalese: Verified; Looks good to me, approved



diff --git a/i18n/en.json b/i18n/en.json
index aedf7ad..e5f7d77 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -141,6 +141,7 @@
"logentry-commentstreams-reply-delete": "$1 {{GENDER:$2|deleted}} reply 
$3",
"logentry-commentstreams-reply-moderator-delete": "$1 
{{GENDER:$2|(moderator) deleted}} reply $3",
"commentstreamsallcomments": "All Comments",
+   "commentstreams-allcomments-nocommentsfound": "No comments found.",
"commentstreams-allcomments-label-page": "Comment Page",
"commentstreams-allcomments-label-associatedpage": "Associated Page",
"commentstreams-allcomments-label-commenttitle": "Comment Title",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 88d5c78..9c57dab 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -141,6 +141,7 @@
"logentry-commentstreams-reply-delete": "The template of the log entry 
message",
"logentry-commentstreams-reply-moderator-delete": "The template of the 
log entry message",
"commentstreamsallcomments": "Special page title",
+   "commentstreams-allcomments-nocommentsfound": "Message to user.",
"commentstreams-allcomments-label-page": "Table column label",
"commentstreams-allcomments-label-associatedpage": "Table column label",
"commentstreams-allcomments-label-commenttitle": "Table column label",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If1de385d7b3ed4dd0f9bdd8d7a013468d18af516
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CommentStreams
Gerrit-Branch: master
Gerrit-Owner: Cicalese 
Gerrit-Reviewer: Cicalese 

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

[MediaWiki-commits] [Gerrit] mediawiki...CommentStreams[master]: Missing message.

2017-09-24 Thread Cicalese (Code Review)

Cicalese has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/380320 )

Change subject: Missing message.
..

Missing message.

Change-Id: If1de385d7b3ed4dd0f9bdd8d7a013468d18af516
---
M i18n/en.json
M i18n/qqq.json
2 files changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CommentStreams 
refs/changes/20/380320/1

diff --git a/i18n/en.json b/i18n/en.json
index aedf7ad..e5f7d77 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -141,6 +141,7 @@
"logentry-commentstreams-reply-delete": "$1 {{GENDER:$2|deleted}} reply 
$3",
"logentry-commentstreams-reply-moderator-delete": "$1 
{{GENDER:$2|(moderator) deleted}} reply $3",
"commentstreamsallcomments": "All Comments",
+   "commentstreams-allcomments-nocommentsfound": "No comments found.",
"commentstreams-allcomments-label-page": "Comment Page",
"commentstreams-allcomments-label-associatedpage": "Associated Page",
"commentstreams-allcomments-label-commenttitle": "Comment Title",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 88d5c78..9c57dab 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -141,6 +141,7 @@
"logentry-commentstreams-reply-delete": "The template of the log entry 
message",
"logentry-commentstreams-reply-moderator-delete": "The template of the 
log entry message",
"commentstreamsallcomments": "Special page title",
+   "commentstreams-allcomments-nocommentsfound": "Message to user.",
"commentstreams-allcomments-label-page": "Table column label",
"commentstreams-allcomments-label-associatedpage": "Table column label",
"commentstreams-allcomments-label-commenttitle": "Table column label",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If1de385d7b3ed4dd0f9bdd8d7a013468d18af516
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CommentStreams
Gerrit-Branch: master
Gerrit-Owner: Cicalese 

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

[MediaWiki-commits] [Gerrit] mediawiki...Scribunto[master]: Improve some parameter docs

2017-09-24 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/380319 )

Change subject: Improve some parameter docs
..

Improve some parameter docs

Change-Id: Ia21866f266bbd6fad4876485798370764ae13500
---
M common/Base.php
M common/Common.php
M common/Hooks.php
M common/ScribuntoContent.php
M engines/LuaCommon/LibraryBase.php
M engines/LuaCommon/LuaCommon.php
M engines/LuaCommon/LuaInterpreter.php
M engines/LuaCommon/TitleLibrary.php
M engines/LuaSandbox/Engine.php
M engines/LuaStandalone/LuaStandaloneEngine.php
M phpcs.xml
11 files changed, 74 insertions(+), 61 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Scribunto 
refs/changes/19/380319/1

diff --git a/common/Base.php b/common/Base.php
index 4f49d03..a4d6a94 100644
--- a/common/Base.php
+++ b/common/Base.php
@@ -78,13 +78,13 @@
 
/**
 * Get software information for Special:Version
-* @param &$software array
+* @param array &$software
 * @return bool
 */
abstract public function getSoftwareInfo( array &$software );
 
/**
-* @param $options array Associative array of options:
+* @param array $options Associative array of options:
 *- parser:A Parser object
 */
public function __construct( array $options ) {
@@ -135,7 +135,7 @@
 
/**
 * @param string $message
-* @param $params array
+* @param array $params
 * @return ScribuntoException
 */
public function newException( $message, array $params = [] ) {
@@ -186,7 +186,7 @@
 * Validates the script and returns a Status object containing the 
syntax
 * errors for the given code.
 *
-* @param $text string
+* @param string $text
 * @param string|bool $chunkName
 * @return Status
 */
@@ -198,6 +198,7 @@
/**
 * Allows the engine to append their information to the limits
 * report.
+* @return string
 */
public function getLimitsReport() {
/* No-op by default */
@@ -222,6 +223,7 @@
 
/**
 * Get the language for GeSHi syntax highlighter.
+* @return bool
 */
function getGeSHiLanguage() {
return false;
@@ -229,6 +231,7 @@
 
/**
 * Get the language for Ace code editor.
+* @return bool
 */
function getCodeEditorLanguage() {
return false;
@@ -251,8 +254,8 @@
 *  - deferLoad: (bool) Library should not be loaded at startup; modules
 *  needing the library must request it (e.g. via 'require' in Lua)
 *
-* @param $engine String script engine we're using (eg: lua)
-* @param $coreLibraries Array of core libraries we support
+* @param string $engine script engine we're using (eg: lua)
+* @param array $coreLibraries Array of core libraries we support
 * @return array
 */
protected function getLibraries( $engine, array $coreLibraries = [] ) {
@@ -264,8 +267,8 @@
/**
 * Load a list of all paths libraries can be in for this engine
 *
-* @param $engine String script engine we're using (eg: lua)
-* @param $coreLibraryPaths Array of library paths to use by default
+* @param string $engine script engine we're using (eg: lua)
+* @param array $coreLibraryPaths Array of library paths to use by 
default
 * @return array
 */
protected function getLibraryPaths( $engine, array $coreLibraryPaths = 
[] ) {
@@ -277,7 +280,7 @@
/**
 * Add limit report data to a ParserOutput object
 *
-* @param $output ParserOutput ParserOutput object in which to add 
limit data
+* @param ParserOutput $output ParserOutput object in which to add 
limit data
 * @return null
 */
public function reportLimitData( ParserOutput $output ) {
@@ -286,11 +289,11 @@
/**
 * Format limit report data
 *
-* @param $key string
-* @param &$value string
-* @param &$report string
-* @param $isHTML bool
-* @param $localize bool
+* @param string $key
+* @param string &$value
+* @param string &$report
+* @param bool $isHTML
+* @param bool $localize
 * @return bool
 */
public function formatLimitData( $key, &$value, &$report, $isHTML, 
$localize ) {
diff --git a/common/Common.php b/common/Common.php
index 5a2a6dc..dfd3b58 100644
--- a/common/Common.php
+++ b/common/Common.php
@@ -24,7 +24,7 @@
/**
 * Create a new engine object with default parameters
 *
-* @param $extraOptions array Extra options to pass to the constructor,
+* @param array $extraOptions Extra options

[MediaWiki-commits] [Gerrit] operations/puppet[production]: tools: Disable IPv6 for static reverse provy

2017-09-24 Thread BryanDavis (Code Review)

BryanDavis has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/380318 )

Change subject: tools: Disable IPv6 for static reverse provy
..

tools: Disable IPv6 for static reverse provy

Configure nginx to only perform IPv4 lookups when resolving upstream
servers.

Change-Id: If2e5b5e8cd9413462b3d8c9e36e95524a63ad1e3
---
M modules/toollabs/templates/static-server.conf.erb
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/18/380318/1

diff --git a/modules/toollabs/templates/static-server.conf.erb 
b/modules/toollabs/templates/static-server.conf.erb
index 2d63db3..d7d53d3 100644
--- a/modules/toollabs/templates/static-server.conf.erb
+++ b/modules/toollabs/templates/static-server.conf.erb
@@ -13,7 +13,7 @@
 #limitations under the License.
 
 server {
-resolver <%= @resolver %>;
+resolver <%= @resolver %> ipv6=off;
 
 listen 80;
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If2e5b5e8cd9413462b3d8c9e36e95524a63ad1e3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis 

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikidata[master]: New Wikidata Build - 2017-09-24T10:00:01+0000

2017-09-24 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/380305 )

Change subject: New Wikidata Build - 2017-09-24T10:00:01+
..


New Wikidata Build - 2017-09-24T10:00:01+

Change-Id: I45a34715f0a3753efccadc9012c12d74e4199444
---
M composer.lock
M extensions/Constraints/i18n/cs.json
M extensions/Wikibase/client/i18n/ais.json
M extensions/Wikibase/client/i18n/bg.json
M extensions/Wikibase/client/i18n/fa.json
M extensions/Wikibase/lib/i18n/ais.json
M extensions/Wikibase/repo/i18n/ais.json
M extensions/Wikibase/repo/i18n/az.json
M vendor/composer/installed.json
9 files changed, 45 insertions(+), 17 deletions(-)

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



diff --git a/composer.lock b/composer.lock
index 35d638b..b36bafa 100644
--- a/composer.lock
+++ b/composer.lock
@@ -977,7 +977,7 @@
 "source": {
 "type": "git",
 "url": 
"https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseQualityConstraints;,
-"reference": "aa555b2270587e847ab97281a895c594256b282d"
+"reference": "5c1cd2a6a1b893d55ee1c3f788ed59818689a6d8"
 },
 "require": {
 "php": ">=5.5.9",
@@ -1037,7 +1037,7 @@
 "support": {
 "issues": 
"https://phabricator.wikimedia.org/project/profile/1202/;
 },
-"time": "2017-09-22 21:30:43"
+"time": "2017-09-23 20:59:28"
 },
 {
 "name": "wikibase/data-model",
@@ -1548,12 +1548,12 @@
 "source": {
 "type": "git",
 "url": 
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git;,
-"reference": "c4ba0ca9c2e801bc53122dcbd060a1715030cae0"
+"reference": "72afc99c53695b9e5ae4050d27c2b8efb6f5"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/c4ba0ca9c2e801bc53122dcbd060a1715030cae0;,
-"reference": "c4ba0ca9c2e801bc53122dcbd060a1715030cae0",
+"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/72afc99c53695b9e5ae4050d27c2b8efb6f5;,
+"reference": "72afc99c53695b9e5ae4050d27c2b8efb6f5",
 "shasum": ""
 },
 "require": {
@@ -1631,7 +1631,7 @@
 "wikibaserepo",
 "wikidata"
 ],
-"time": "2017-09-22 21:30:19"
+"time": "2017-09-23 20:59:07"
 },
 {
 "name": "wikibase/wikimedia-badges",
diff --git a/extensions/Constraints/i18n/cs.json 
b/extensions/Constraints/i18n/cs.json
index b963593..3d82d0e 100644
--- a/extensions/Constraints/i18n/cs.json
+++ b/extensions/Constraints/i18n/cs.json
@@ -60,7 +60,7 @@
"wbqc-violation-message-commons-link-not-well-formed": "Odkaz na 
Commons by měl být ve správném formátu.",

"wbqc-violation-message-commons-link-check-for-namespace-not-yet-implemented": 
"Kontrola pro jmenný prostor „$1“ dosud nebyla implementována.",
"wbqc-violation-message-conflicts-with-property": "Entita nemůže mít 
současně tvrzení vlastností $1 a $2.",
-   "wbqc-violation-message-conflicts-with-claim": "Entita nemůže mít 
tvrzení vlastnosti $1, pokud má současně tvrzení vlasnosti $2 s hodnotou $3.",
+   "wbqc-violation-message-conflicts-with-claim": "Entita nemůže mít 
tvrzení vlastnosti $1, pokud má současně tvrzení vlastnosti $2 s hodnotou $3.",
"wbqc-violation-message-diff-within-range": "Rozdíl mezi vlastnostmi $3 
($4) a $1 ($2) by se měl nacházet v intervalu od $5 do $6 ([$5; $6]).",
"wbqc-violation-message-diff-within-range-leftopen": "Rozdíl mezi 
vlastnostmi $3 ($4) a $1 ($2) by neměl být větší než $5 ((−∞; $5]).",
"wbqc-violation-message-diff-within-range-rightopen": "Rozdíl mezi 
vlastnostmi $3 ($4) a $1 ($2) by neměl být menší než $5 ([$5; ∞)).",
diff --git a/extensions/Wikibase/client/i18n/ais.json 
b/extensions/Wikibase/client/i18n/ais.json
index 8fb1a6b..363c47e 100644
--- a/extensions/Wikibase/client/i18n/ais.json
+++ b/extensions/Wikibase/client/i18n/ais.json
@@ -30,6 +30,7 @@
"wikibase-pageswithbadges-badge": "kunpay:",
"wikibase-pageswithbadges-submit": "paazih  kasabelih",
"entityusage": "masaheciay misaungay zasatu",
+   "wikibase-entityusage-legend": "pasilsil pisaungay matuzu’ay masaheciay 
a kasabelih",
"wikibase-entityusage-entity": "masaheciay:",
"wikibase-entityusage-submit": "paazih  kasabelih",
"wikibase-pageinfo-entity-id-none": "nayi’",
diff --git a/extensions/Wikibase/client/i18n/bg.json 
b/extensions/Wikibase/client/i18n/bg.json
index beab9d2..d14172e 100644
--- a/extensions/Wikibase/client/i18n/bg.json
+++

[MediaWiki-commits] [Gerrit] mediawiki...MediaWikiFarm[master]: Always check Composer extensions independantly of ExtensionR...

2017-09-24 Thread Seb35 (Code Review)

Seb35 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/380317 )

Change subject: Always check Composer extensions independantly of 
ExtensionRegistration
..

Always check Composer extensions independantly of ExtensionRegistration

Sometimes, when MediaWikiFarm is in monoversion mode, ExtensionRegistry
is known, and we should check if some extension should be loaded with
Composer; it was no more the case since ca185e0.

Also, the function MediaWikiFarmConfiguration::detectLoadingMechanism
no more tries to detect Composer extension given the case is handled
in an other way.

Change-Id: I6b1379826f698861d66016c836b3d867d2d85fec
---
M src/MediaWikiFarmConfiguration.php
M tests/phpunit/ConfigurationTest.php
M tests/phpunit/LoadingTest.php
3 files changed, 17 insertions(+), 30 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MediaWikiFarm 
refs/changes/17/380317/1

diff --git a/src/MediaWikiFarmConfiguration.php 
b/src/MediaWikiFarmConfiguration.php
index 62d7eb6..a9d92f3 100644
--- a/src/MediaWikiFarmConfiguration.php
+++ b/src/MediaWikiFarmConfiguration.php
@@ -430,16 +430,13 @@
unset( $this->configuration['extensions'][$key] 
);
 
# Mechanism Composer wanted
-   } elseif( $value === 'composer' && 
$this->detectComposer( $type, $name ) ) {
+   } elseif( ( $value === 'composer' || $value === true ) 
&& $this->detectComposer( $type, $name ) ) {
$status = 'composer';
$value = true;
 
-   # MediaWiki still not loaded: we must wait before 
taking a decision except for Composer loading
+   # MediaWiki still not loaded: we must wait before 
taking a decision
} elseif( $ExtensionRegistry === null ) {
-   if( $this->detectComposer( $type, $name ) ) {
-   $status = 'composer';
-   $value = true;
-   }
+   # nop
 
# Mechanism require_once wanted
} elseif( $value === 'require_once' && 
$this->detectLoadingMechanism( $type, $name, true ) == $value ) {
@@ -529,10 +526,10 @@
 *
 * @param string $type Type, in ['extension', 'skin'].
 * @param string $name Name of the extension/skin.
-* @param string $preferedRO Prefered require_once mechanism.
-* @return string|null Loading mechnism in ['wfLoadExtension', 
'wfLoadSkin', 'require_once', 'composer'] or null if all mechanisms failed.
+* @param bool $preferedRO Prefered require_once mechanism.
+* @return string|null Loading mechnism in ['wfLoadExtension', 
'wfLoadSkin', 'require_once'] or null if all mechanisms failed.
 */
-   function detectLoadingMechanism( $type, $name, $preferedRO = null ) {
+   function detectLoadingMechanism( $type, $name, $preferedRO = false ) {
 
# Search base directory
$base = $this->farm->getVariable( '$CODE' ) . '/' . $type . 's';
@@ -555,11 +552,6 @@
# An extension.json/skin.json file is in the directory -> 
assume it is the loading mechanism
if( $this->environment['ExtensionRegistry'] && is_file( $base . 
'/' . $name . '/' . $type . '.json' ) ) {
return 'wfLoad' . ucfirst( $type );
-   }
-
-   # A composer.json file is in the directory and the extension is 
properly autoloaded by Composer
-   elseif( $this->detectComposer( $type, $name ) ) {
-   return 'composer';
}
 
# A MyExtension.php file is in the directory -> assume it is 
the loading mechanism
diff --git a/tests/phpunit/ConfigurationTest.php 
b/tests/phpunit/ConfigurationTest.php
index 67a10da..7ca59f1 100644
--- a/tests/phpunit/ConfigurationTest.php
+++ b/tests/phpunit/ConfigurationTest.php
@@ -276,11 +276,8 @@
 * @uses MediaWikiFarmConfiguration::detectComposer
 * @uses MediaWikiFarmConfiguration::setEnvironment
 * @uses MediaWikiFarmConfiguration::getConfiguration
-* @uses MediaWikiFarmConfiguration::setComposer
-* @uses AbstractMediaWikiFarmScript::rmdirr
-* @uses MediaWikiFarmUtils::arrayMerge
-* @uses MediaWikiFarmUtils::isMediaWiki
-* @uses MediaWikiFarmUtils::readFile
+* @uses AbstractMediaWikiFarmScript
+* @uses MediaWikiFarmUtils
 */
function testLoadMediaWikiConfigMultiversion() {
 
@@ -346,7 +343,6 @@
 * @uses MediaWikiFarm::readFile
 * @uses MediaWikiFarmConfiguration::__construct
 * @uses MediaWikiFarmConfiguration::getConfiguration
-* @uses

[MediaWiki-commits] [Gerrit] mediawiki...MediaWikiFarm[master]: Bug: Relaunch the tests before 5 minutes removed some coverage

2017-09-24 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/380315 )

Change subject: Bug: Relaunch the tests before 5 minutes removed some coverage
..


Bug: Relaunch the tests before 5 minutes removed some coverage

Given a test touch the mtime of a file with 5 minutes in the future,
the next launch before 5 minutes elapsed lacked some coverage. Resetting
the mtime to its original value at the end of the test.

PS: commit sent from a French train TGV :)

Change-Id: I2808e3d22a70cb4cdff3e09f315915a5687cddb1
---
M tests/phpunit/MultiversionInstallationTest.php
1 file changed, 5 insertions(+), 2 deletions(-)

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



diff --git a/tests/phpunit/MultiversionInstallationTest.php 
b/tests/phpunit/MultiversionInstallationTest.php
index 4a0186e..5ff1323 100644
--- a/tests/phpunit/MultiversionInstallationTest.php
+++ b/tests/phpunit/MultiversionInstallationTest.php
@@ -512,8 +512,8 @@
# Read the existence cache
$farm = new MediaWikiFarm( 
'a.testfarm-multiversion.example.org', null,
   self::$wgMediaWikiFarmConfigDir, 
self::$wgMediaWikiFarmCodeDir, self::$wgMediaWikiFarmCacheDir,
-  array( 'EntryPoint' => 'index.php' )
-   );
+  array( 'EntryPoint' => 'index.php' )
+   );
 
$this->assertTrue( $farm->checkExistence() );
 
@@ -538,6 +538,9 @@
   array( 'EntryPoint' => 'index.php' )
);
$this->assertFalse( is_file( self::$wgMediaWikiFarmCacheDir . 
'/LocalSettings/a.testfarm-multiversion.example.org.php' ) );
+
+   # Reinit mtime of farms.php for further tests
+   $this->assertTrue( touch( self::$wgMediaWikiFarmConfigDir . 
'/farms.php', time() - 5 ) );
}
 
/**

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2808e3d22a70cb4cdff3e09f315915a5687cddb1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MediaWikiFarm
Gerrit-Branch: master
Gerrit-Owner: Seb35 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Seb35 
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/core[master]: build: Updating mediawiki/mediawiki-codesniffer to 13.0.0

2017-09-24 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/380316 )

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

build: Updating mediawiki/mediawiki-codesniffer to 13.0.0

Change-Id: Ia24dbf015f2b4781683ca980a460d0ac3e85674e
---
M composer.json
M includes/CommentStoreComment.php
M includes/context/ContextSource.php
M includes/context/DerivativeContext.php
M includes/context/IContextSource.php
M includes/context/RequestContext.php
M includes/import/WikiImporter.php
M includes/installer/MysqlUpdater.php
M includes/libs/rdbms/database/Database.php
M includes/libs/stats/NullStatsdDataFactory.php
M includes/session/Session.php
M maintenance/populatePPSortKey.php
M phpcs.xml
M tests/phan/config.php
M tests/phpunit/includes/MediaWikiServicesTest.php
M tests/phpunit/includes/auth/ThrottlerTest.php
16 files changed, 5 insertions(+), 26 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/16/380316/1

diff --git a/composer.json b/composer.json
index 34f9559..23ca850 100644
--- a/composer.json
+++ b/composer.json
@@ -54,7 +54,7 @@
"jakub-onderka/php-parallel-lint": "0.9.2",
"jetbrains/phpstorm-stubs": 
"dev-master#1b9906084d6635456fcf3f3a01f0d7d5b99a578a",
"justinrainbow/json-schema": "~5.2",
-   "mediawiki/mediawiki-codesniffer": "0.12.0",
+   "mediawiki/mediawiki-codesniffer": "13.0.0",
"monolog/monolog": "~1.22.1",
"nikic/php-parser": "2.1.0",
"nmred/kafka-php": "0.1.5",
diff --git a/includes/CommentStoreComment.php b/includes/CommentStoreComment.php
index 3920ba0..7ed86d6 100644
--- a/includes/CommentStoreComment.php
+++ b/includes/CommentStoreComment.php
@@ -20,8 +20,6 @@
  * @file
  */
 
-use Wikimedia\Rdbms\IDatabase;
-
 /**
  * CommentStoreComment represents a comment stored by CommentStore. The fields
  * should be considered read-only.
diff --git a/includes/context/ContextSource.php 
b/includes/context/ContextSource.php
index cea8460..6530550 100644
--- a/includes/context/ContextSource.php
+++ b/includes/context/ContextSource.php
@@ -18,7 +18,6 @@
  * @author Happy-melon
  * @file
  */
-use Liuggio\StatsdClient\Factory\StatsdDataFactory;
 use MediaWiki\MediaWikiServices;
 
 /**
diff --git a/includes/context/DerivativeContext.php 
b/includes/context/DerivativeContext.php
index 6e3eda6..82b97ec 100644
--- a/includes/context/DerivativeContext.php
+++ b/includes/context/DerivativeContext.php
@@ -18,7 +18,6 @@
  * @author Daniel Friesen
  * @file
  */
-use Liuggio\StatsdClient\Factory\StatsdDataFactory;
 use MediaWiki\MediaWikiServices;
 
 /**
diff --git a/includes/context/IContextSource.php 
b/includes/context/IContextSource.php
index 895e9e4..5a856cf 100644
--- a/includes/context/IContextSource.php
+++ b/includes/context/IContextSource.php
@@ -21,8 +21,6 @@
  * @file
  */
 
-use Liuggio\StatsdClient\Factory\StatsdDataFactory;
-
 /**
  * Interface for objects which can provide a MediaWiki context on request
  *
diff --git a/includes/context/RequestContext.php 
b/includes/context/RequestContext.php
index 4a772ee..7cabd40 100644
--- a/includes/context/RequestContext.php
+++ b/includes/context/RequestContext.php
@@ -22,7 +22,6 @@
  * @file
  */
 
-use Liuggio\StatsdClient\Factory\StatsdDataFactory;
 use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\MediaWikiServices;
 use Wikimedia\ScopedCallback;
diff --git a/includes/import/WikiImporter.php b/includes/import/WikiImporter.php
index 9066079..a1f7e0c 100644
--- a/includes/import/WikiImporter.php
+++ b/includes/import/WikiImporter.php
@@ -23,7 +23,6 @@
  * @file
  * @ingroup SpecialPage
  */
-use MediaWiki\MediaWikiServices;
 
 /**
  * XML file reader for the page data importer.
diff --git a/includes/installer/MysqlUpdater.php 
b/includes/installer/MysqlUpdater.php
index 556d0d5..10a5410 100644
--- a/includes/installer/MysqlUpdater.php
+++ b/includes/installer/MysqlUpdater.php
@@ -20,7 +20,6 @@
  * @file
  * @ingroup Deployment
  */
-use Wikimedia\Rdbms\Field;
 use Wikimedia\Rdbms\MySQLField;
 use MediaWiki\MediaWikiServices;
 
diff --git a/includes/libs/rdbms/database/Database.php 
b/includes/libs/rdbms/database/Database.php
index e7417eb..65f84db 100644
--- a/includes/libs/rdbms/database/Database.php
+++ b/includes/libs/rdbms/database/Database.php
@@ -1138,6 +1138,7 @@
 *
 * @param string $error Error text
 * @param int $errno Error number
+* @return bool
 */
protected function wasQueryTimeout( $error, $errno ) {
return false;
diff --git a/includes/libs/stats/NullStatsdDataFactory.php 
b/includes/libs/stats/NullStatsdDataFactory.php
index d346f65..ed16311 100644
--- a/includes/libs/stats/NullStatsdDataFactory.php
+++ b/includes/libs/stats/NullStatsdDataFactory.php
@@ -2,7 +2,6 @@
 
 use

[MediaWiki-commits] [Gerrit] mediawiki...MediaWikiFarm[master]: Bug: Relaunch the tests before 5 minutes removed some coverage

2017-09-24 Thread Seb35 (Code Review)

Seb35 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/380315 )

Change subject: Bug: Relaunch the tests before 5 minutes removed some coverage
..

Bug: Relaunch the tests before 5 minutes removed some coverage

Given a test touch the mtime of a file with 5 minutes in the future,
the next launch before 5 minutes elapsed lacked some coverage. Resetting
the mtime to its original value at the end of the test.

PS: commit sent from a French train TGV :)

Change-Id: I2808e3d22a70cb4cdff3e09f315915a5687cddb1
---
M tests/phpunit/MultiversionInstallationTest.php
1 file changed, 5 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MediaWikiFarm 
refs/changes/15/380315/1

diff --git a/tests/phpunit/MultiversionInstallationTest.php 
b/tests/phpunit/MultiversionInstallationTest.php
index 4a0186e..5ff1323 100644
--- a/tests/phpunit/MultiversionInstallationTest.php
+++ b/tests/phpunit/MultiversionInstallationTest.php
@@ -512,8 +512,8 @@
# Read the existence cache
$farm = new MediaWikiFarm( 
'a.testfarm-multiversion.example.org', null,
   self::$wgMediaWikiFarmConfigDir, 
self::$wgMediaWikiFarmCodeDir, self::$wgMediaWikiFarmCacheDir,
-  array( 'EntryPoint' => 'index.php' )
-   );
+  array( 'EntryPoint' => 'index.php' )
+   );
 
$this->assertTrue( $farm->checkExistence() );
 
@@ -538,6 +538,9 @@
   array( 'EntryPoint' => 'index.php' )
);
$this->assertFalse( is_file( self::$wgMediaWikiFarmCacheDir . 
'/LocalSettings/a.testfarm-multiversion.example.org.php' ) );
+
+   # Reinit mtime of farms.php for further tests
+   $this->assertTrue( touch( self::$wgMediaWikiFarmConfigDir . 
'/farms.php', time() - 5 ) );
}
 
/**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2808e3d22a70cb4cdff3e09f315915a5687cddb1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MediaWikiFarm
Gerrit-Branch: master
Gerrit-Owner: Seb35 

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

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

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


build: Updating mediawiki/mediawiki-codesniffer to 13.0.0

Change-Id: Ie8f0c2f902678cddae5a63fe921c091f2c65ec8c
---
M ShortUrl.utils.php
M composer.json
M populateShortUrlTable.php
3 files changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/ShortUrl.utils.php b/ShortUrl.utils.php
index 9fa4a70..c391e5d 100644
--- a/ShortUrl.utils.php
+++ b/ShortUrl.utils.php
@@ -29,7 +29,7 @@
 
$id = $wgMemc->get( $memcKey );
if ( !$id ) {
-   $id = wfGetDB( DB_SLAVE )->selectField(
+   $id = wfGetDB( DB_REPLICA )->selectField(
'shorturls',
'su_id',
[
@@ -92,7 +92,7 @@
$memcKey = wfMemcKey( 'shorturls', 'id', $id );
$entry = $wgMemc->get( $memcKey );
if ( !$entry ) {
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
$entry = $dbr->selectRow(
'shorturls',
[ 'su_namespace', 'su_title' ],
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/populateShortUrlTable.php b/populateShortUrlTable.php
index 0577b7f..22f62e1 100644
--- a/populateShortUrlTable.php
+++ b/populateShortUrlTable.php
@@ -25,7 +25,7 @@
// @todo FIXME: Refactor out code in ShortUrl.functions.php so it can 
be used here
public function execute() {
$rowCount = 0;
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
 
$last_processed_id = 0;
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie8f0c2f902678cddae5a63fe921c091f2c65ec8c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ShortUrl
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...UrlShortener[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/380275 )

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


build: Updating mediawiki/mediawiki-codesniffer to 13.0.0

Change-Id: I943e85cec980aa4d2f53f32eb9ab3af9304b8076
---
M UrlShortener.utils.php
M composer.json
M maintenance/dumpURLs.php
3 files changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/UrlShortener.utils.php b/UrlShortener.utils.php
index 6d526cd..90277c6 100644
--- a/UrlShortener.utils.php
+++ b/UrlShortener.utils.php
@@ -141,7 +141,7 @@
return false;
}
 
-   $dbr = self::getDB( DB_SLAVE );
+   $dbr = self::getDB( DB_REPLICA );
$url = $dbr->selectField(
'urlshortcodes',
'usc_url',
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/maintenance/dumpURLs.php b/maintenance/dumpURLs.php
index 799380e..303b0a0 100644
--- a/maintenance/dumpURLs.php
+++ b/maintenance/dumpURLs.php
@@ -21,7 +21,7 @@
}
 
public function execute() {
-   $dbr = UrlShortenerUtils::getDB( DB_SLAVE );
+   $dbr = UrlShortenerUtils::getDB( DB_REPLICA );
$file = $this->getArg( 0 );
$this->output( "Writing to $file...\n" );
$handle = fopen( $file, 'w' );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I943e85cec980aa4d2f53f32eb9ab3af9304b8076
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UrlShortener
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...LdapAuthentication[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/380180 )

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


build: Updating mediawiki/mediawiki-codesniffer to 13.0.0

Change-Id: I265d6017372a2407b00ce645d80f2bd5416001e1
---
M LdapAuthenticationPlugin.php
M composer.json
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/LdapAuthenticationPlugin.php b/LdapAuthenticationPlugin.php
index f7c46b7..786990d 100644
--- a/LdapAuthenticationPlugin.php
+++ b/LdapAuthenticationPlugin.php
@@ -2107,7 +2107,7 @@
static function loadDomain( $user ) {
$user_id = $user->getId();
if ( $user_id != 0 ) {
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
$row = $dbr->selectRow(
'ldap_domains',
[ 'domain' ],
diff --git a/composer.json b/composer.json
index 41bb0d7..7df3c8d 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",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I265d6017372a2407b00ce645d80f2bd5416001e1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LdapAuthentication
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...PageTriage[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/380215 )

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


build: Updating mediawiki/mediawiki-codesniffer to 13.0.0

Change-Id: Id3b2e140468b1ab02355dc549c23bdc6fde4287c
---
M PageTriage.hooks.php
M api/ApiPageTriageAction.php
M api/ApiPageTriageList.php
M api/ApiPageTriageTagging.php
M composer.json
M cron/updatePageTriageQueue.php
M cron/updateUserMetadata.php
M includes/ArticleMetadata.php
M includes/PageTriage.php
M includes/PageTriageUtil.php
M tests/phpunit/ArticleMetadataTest.php
M tools/cleanupPageTriage.php
M tools/cleanupPageTriageLog.php
M tools/cleanupPageTriagePageTags.php
14 files changed, 37 insertions(+), 37 deletions(-)

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



diff --git a/PageTriage.hooks.php b/PageTriage.hooks.php
index 9cdecdd..e3fb056 100644
--- a/PageTriage.hooks.php
+++ b/PageTriage.hooks.php
@@ -40,11 +40,11 @@
// following components, BasicData is accessing 
pagetriage_page,
// which is not safe to use slave db
$config = [
-   'LinkCount' => DB_SLAVE,
-   'CategoryCount' => DB_SLAVE,
-   'Snippet' => DB_SLAVE,
-   'UserData' => DB_SLAVE,
-   'DeletionTag' => DB_SLAVE
+   'LinkCount' => DB_REPLICA,
+   'CategoryCount' => DB_REPLICA,
+   'Snippet' => DB_REPLICA,
+   'UserData' => DB_REPLICA,
+   'DeletionTag' => DB_REPLICA
];
$acp->configComponentDb( $config );
$acp->compileMetadata();
@@ -482,11 +482,11 @@
// page just gets added to pagetriage 
queue and hence not safe to use slave db
// for BasicData since it's accessing 
pagetriage_page table
$config = [
-   'LinkCount' => DB_SLAVE,
-   'CategoryCount' => DB_SLAVE,
-   'Snippet' => DB_SLAVE,
-   'UserData' => DB_SLAVE,
-   'DeletionTag' => DB_SLAVE
+   'LinkCount' => DB_REPLICA,
+   'CategoryCount' => DB_REPLICA,
+   'Snippet' => DB_REPLICA,
+   'UserData' => DB_REPLICA,
+   'DeletionTag' => DB_REPLICA
];
$acp->configComponentDb( $config );
$acp->compileMetadata();
@@ -777,7 +777,7 @@
 
$pageId = $event->getTitle()->getArticleID();
 
-   $articleMetadata = new ArticleMetadata( [ 
$pageId ], false, DB_SLAVE );
+   $articleMetadata = new ArticleMetadata( [ 
$pageId ], false, DB_REPLICA );
$metaData = $articleMetadata->getMetadata();
 
if ( !$metaData ) {
diff --git a/api/ApiPageTriageAction.php b/api/ApiPageTriageAction.php
index 19ea253..0fdc542 100644
--- a/api/ApiPageTriageAction.php
+++ b/api/ApiPageTriageAction.php
@@ -7,7 +7,7 @@
 
$params = $this->extractRequestParams();
 
-   if ( !ArticleMetadata::validatePageId( [ $params['pageid'] ], 
DB_SLAVE ) ) {
+   if ( !ArticleMetadata::validatePageId( [ $params['pageid'] ], 
DB_REPLICA ) ) {
$this->dieWithError( 'apierror-bad-pagetriage-page' );
}
 
diff --git a/api/ApiPageTriageList.php b/api/ApiPageTriageList.php
index 8f773d4..c8766c7 100644
--- a/api/ApiPageTriageList.php
+++ b/api/ApiPageTriageList.php
@@ -21,7 +21,7 @@
$pages = self::getPageIds( $opts );
$pageIdValidated = true;
}
-   $pageIdValidateDb = DB_SLAVE;
+   $pageIdValidateDb = DB_REPLICA;
 
$sortedMetaData = [];
 
@@ -167,7 +167,7 @@
}
 
// Database setup
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB(

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

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


build: Updating mediawiki/mediawiki-codesniffer to 13.0.0

Change-Id: I82d198f58fbc1aca06b21d4e425694d66d882ce5
---
M composer.json
M includes/GeoData.php
2 files changed, 2 insertions(+), 2 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/GeoData.php b/includes/GeoData.php
index 73b7061..5f82880 100644
--- a/includes/GeoData.php
+++ b/includes/GeoData.php
@@ -28,7 +28,7 @@
 * @param int $dbType Database to select from DB_MASTER or DB_SLAVE
 * @return Coord[]
 */
-   public static function getAllCoordinates( $pageId, $conds = [], $dbType 
= DB_SLAVE ) {
+   public static function getAllCoordinates( $pageId, $conds = [], $dbType 
= DB_REPLICA ) {
$db = self::getDB( $dbType );
$conds['gt_page_id'] = $pageId;
$res = $db->select( 'geo_tags', Coord::getColumns(), $conds, 
__METHOD__ );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I82d198f58fbc1aca06b21d4e425694d66d882ce5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GeoData
Gerrit-Branch: master
Gerrit-Owner: Libraryupgrader 
Gerrit-Reviewer: MaxSem 
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-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...PageAssessments[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/380211 )

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


build: Updating mediawiki/mediawiki-codesniffer to 13.0.0

Change-Id: I131c6bd0dccc14db161fcf89bfcf3ef47804201d
---
M PageAssessmentsBody.php
M composer.json
M src/SpecialPage.php
3 files changed, 5 insertions(+), 5 deletions(-)

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



diff --git a/PageAssessmentsBody.php b/PageAssessmentsBody.php
index e5ae6d8..255ad75 100644
--- a/PageAssessmentsBody.php
+++ b/PageAssessmentsBody.php
@@ -135,7 +135,7 @@
if ( isset( self::$projectNames[$projectId] ) ) {
return self::$projectNames[$projectId];
} else {
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
$projectName = $dbr->selectField(
'page_assessments_projects',
'pap_project_title',
@@ -171,7 +171,7 @@
 * @return int|false project ID or false if not found
 */
public static function getProjectId( $project ) {
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
return $dbr->selectField(
'page_assessments_projects',
'pap_project_id',
@@ -225,7 +225,7 @@
 * @return bool true
 */
public static function updateRecord( $values ) {
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
$conds = [
'pa_page_id' => $values['pa_page_id'],
'pa_project_id' => $values['pa_project_id']
diff --git a/composer.json b/composer.json
index d567d78..7e9d750 100644
--- a/composer.json
+++ b/composer.json
@@ -5,7 +5,7 @@
"license": "GPL-2.0+",
"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/src/SpecialPage.php b/src/SpecialPage.php
index c925fcc..619fdab 100644
--- a/src/SpecialPage.php
+++ b/src/SpecialPage.php
@@ -265,7 +265,7 @@
$this->getOutput()->addModules( 'ext.pageassessments.special' );
 
// Add a list of all projects to the page's JS.
-   $projects = wfGetDB( DB_SLAVE )->selectFieldValues(
+   $projects = wfGetDB( DB_REPLICA )->selectFieldValues(
[ 'page_assessments_projects' ],
'pap_project_title',
'',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I131c6bd0dccc14db161fcf89bfcf3ef47804201d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageAssessments
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...UserMerge[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/380276 )

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


build: Updating mediawiki/mediawiki-codesniffer to 13.0.0

Change-Id: I569a5737bac05eeb39289bcccf931569c47b836f
---
M MergeUser.php
M composer.json
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/MergeUser.php b/MergeUser.php
index 6b3e09d..b9cab64 100644
--- a/MergeUser.php
+++ b/MergeUser.php
@@ -384,7 +384,7 @@
$newusername = Title::makeTitleSafe( NS_USER, 
$wgContLang->ucfirst( $this->newUser->getName() ) );
 
# select all user pages and sub-pages
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
$pages = $dbr->select(
'page',
[ 'page_namespace', 'page_title' ],
diff --git a/composer.json b/composer.json
index 7c63cad..6394fcf 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": {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I569a5737bac05eeb39289bcccf931569c47b836f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UserMerge
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...OAuth[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/380204 )

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


build: Updating mediawiki/mediawiki-codesniffer to 13.0.0

Change-Id: I768ba4d9887c2c221978d57f0c6f9e544e6617f4
---
M api/MWOAuthSessionProvider.php
M backend/MWOAuth.hooks.php
M backend/MWOAuthDataStore.php
M backend/MWOAuthRequest.php
M backend/MWOAuthServer.php
M backend/MWOAuthUtils.php
M composer.json
M frontend/EchoOAuthStageChangePresentationModel.php
M frontend/MWOAuthUI.hooks.php
M frontend/MWOAuthUIUtils.php
M frontend/specialpages/SpecialMWOAuth.php
M frontend/specialpages/SpecialMWOAuthConsumerRegistration.php
M frontend/specialpages/SpecialMWOAuthListConsumers.php
M frontend/specialpages/SpecialMWOAuthManageConsumers.php
M frontend/specialpages/SpecialMWOAuthManageMyGrants.php
15 files changed, 23 insertions(+), 28 deletions(-)

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



diff --git a/api/MWOAuthSessionProvider.php b/api/MWOAuthSessionProvider.php
index 4b16f2d..f5cb4bf 100644
--- a/api/MWOAuthSessionProvider.php
+++ b/api/MWOAuthSessionProvider.php
@@ -87,7 +87,7 @@
}
 
$wiki = wfWikiID();
-   $dbr = MWOAuthUtils::getCentralDB( DB_SLAVE );
+   $dbr = MWOAuthUtils::getCentralDB( DB_REPLICA );
 
// Access token is for this wiki
$access = MWOAuthConsumerAcceptance::newFromToken( $dbr, 
$accesstoken->key );
@@ -263,7 +263,7 @@
public function onRecentChange_save( $rc ) {
$data = $this->getSessionData( $rc->getPerformer() ?: null );
if ( $data ) {
-   $dbr = MWOAuthUtils::getCentralDB( DB_SLAVE );
+   $dbr = MWOAuthUtils::getCentralDB( DB_REPLICA );
$access = MWOAuthConsumerAcceptance::newFromToken( 
$dbr, $data['key'] );
$consumerId = $access->get( 'consumerId' );
$consumer = MWOAuthConsumer::newFromId( $dbr, 
$consumerId );
diff --git a/backend/MWOAuth.hooks.php b/backend/MWOAuth.hooks.php
index e558571..42683e9 100644
--- a/backend/MWOAuth.hooks.php
+++ b/backend/MWOAuth.hooks.php
@@ -99,7 +99,7 @@
 */
public static function getUsedConsumerTags( $activeOnly, &$tags ) {
// Step 1: Get the list of (active) consumers' tags for this 
wiki
-   $db = MWOAuthUtils::getCentralDB( DB_SLAVE );
+   $db = MWOAuthUtils::getCentralDB( DB_REPLICA );
$conds = [
$db->makeList( [
'oarc_wiki = ' . $db->addQuotes( '*' ),
@@ -127,7 +127,7 @@
 
// Step 2: Return only those that are in use.
if ( $allTags ) {
-   $db = wfGetDB( DB_SLAVE );
+   $db = wfGetDB( DB_REPLICA );
$res = $db->select(
'change_tag',
[ 'ct_tag' ],
diff --git a/backend/MWOAuthDataStore.php b/backend/MWOAuthDataStore.php
index 338f0a8..02fbe00 100644
--- a/backend/MWOAuthDataStore.php
+++ b/backend/MWOAuthDataStore.php
@@ -3,7 +3,6 @@
 namespace MediaWiki\Extensions\OAuth;
 
 use MediaWiki\Logger\LoggerFactory;
-use Psr\Log\LoggerInterface;
 
 class MWOAuthDataStore extends OAuthDataStore {
/** @var \DBConnRef DB for the consumer/grant registry */
diff --git a/backend/MWOAuthRequest.php b/backend/MWOAuthRequest.php
index 102fbae..840ce50 100644
--- a/backend/MWOAuthRequest.php
+++ b/backend/MWOAuthRequest.php
@@ -3,7 +3,6 @@
 namespace MediaWiki\Extensions\OAuth;
 
 use MediaWiki\Logger\LoggerFactory;
-use Psr\Log\LoggerInterface;
 
 /**
  * @file
diff --git a/backend/MWOAuthServer.php b/backend/MWOAuthServer.php
index 6cc61d1..4905e29 100644
--- a/backend/MWOAuthServer.php
+++ b/backend/MWOAuthServer.php
@@ -385,7 +385,7 @@
 * @return MWOAuthConsumerAcceptance
 */
public function getCurrentAuthorization( \User $mwUser, $consumer, 
$wikiId ) {
-   $dbr = MWOAuthUtils::getCentralDB( DB_SLAVE );
+   $dbr = MWOAuthUtils::getCentralDB( DB_REPLICA );
 
$centralUserId = MWOAuthUtils::getCentralIdFromLocalUser( 
$mwUser );
if ( !$centralUserId ) {
diff --git a/backend/MWOAuthUtils.php b/backend/MWOAuthUtils.php
index c5c1546..dc2005c 100644
--- a/backend/MWOAuthUtils.php
+++ b/backend/MWOAuthUtils.php
@@ -192,7 +192,7 @@
 * @return MWOAuthServer with default configurations
 */
public static function newMWOAuthServer() {
-   $dbr = self::getCentralDB( DB_SLAVE );
+   $dbr = self::getCentralDB( DB_REPLICA );
$dbw = wfGetLB()->getServerCount() > 1 ? self::getCentralDB( 
DB_MASTER ) : null;

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

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


build: Updating mediawiki/mediawiki-codesniffer to 13.0.0

Change-Id: I7562a27108030044bdac1cf880ed22e4558f0c83
---
M BaseBlacklist.php
M SpamBlacklist_body.php
M composer.json
M maintenance/cleanup.php
4 files changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/BaseBlacklist.php b/BaseBlacklist.php
index 8f15aa9..82062e2 100644
--- a/BaseBlacklist.php
+++ b/BaseBlacklist.php
@@ -372,7 +372,7 @@
// Load all the relevant tables from the correct DB.
// This assumes that old_text is the actual text or
// that the external store system is at least unified.
-   $row = wfGetDB( DB_SLAVE, [], $wiki )->selectRow(
+   $row = wfGetDB( DB_REPLICA, [], $wiki )->selectRow(
[ 'page', 'revision', 'text' ],
array_merge(
Revision::selectFields(),
diff --git a/SpamBlacklist_body.php b/SpamBlacklist_body.php
index b3fb900..fa9a717 100644
--- a/SpamBlacklist_body.php
+++ b/SpamBlacklist_body.php
@@ -275,7 +275,7 @@
$cache->makeKey( 'external-link-list', 
$title->getLatestRevID() ),
$cache::TTL_MINUTE,
function ( $oldValue, &$ttl, array &$setOpts ) use ( 
$title ) {
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
$setOpts += Database::getCacheSetOptions( $dbr 
);
 
return $dbr->selectFieldValues(
diff --git a/composer.json b/composer.json
index 021a14c..690f49f 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/maintenance/cleanup.php b/maintenance/cleanup.php
index c56f148..4e985e5 100644
--- a/maintenance/cleanup.php
+++ b/maintenance/cleanup.php
@@ -91,7 +91,7 @@
exit( 1 );
 }
 
-$dbr = wfGetDB( DB_SLAVE );
+$dbr = wfGetDB( DB_REPLICA );
 $maxID = $dbr->selectField( 'page', 'MAX(page_id)' );
 $reportingInterval = 100;
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7562a27108030044bdac1cf880ed22e4558f0c83
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SpamBlacklist
Gerrit-Branch: master
Gerrit-Owner: Libraryupgrader 
Gerrit-Reviewer: Jackmcbarn 
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...OpenStackManager[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/380214 )

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


build: Updating mediawiki/mediawiki-codesniffer to 13.0.0

Change-Id: Ic48c8353dacc4865e420ce911a13e5215496c3d6
---
M composer.json
M nova/OpenStackNovaSecondaryAuthenticationProvider.php
M nova/OpenStackNovaUser.php
3 files changed, 2 insertions(+), 3 deletions(-)

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



diff --git a/composer.json b/composer.json
index 79ee46a..f1ef83b 100644
--- a/composer.json
+++ b/composer.json
@@ -5,7 +5,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/nova/OpenStackNovaSecondaryAuthenticationProvider.php 
b/nova/OpenStackNovaSecondaryAuthenticationProvider.php
index 7573e12..ec44e02 100644
--- a/nova/OpenStackNovaSecondaryAuthenticationProvider.php
+++ b/nova/OpenStackNovaSecondaryAuthenticationProvider.php
@@ -2,7 +2,6 @@
 
 use MediaWiki\Auth\AbstractPreAuthenticationProvider;
 use MediaWiki\Auth\AuthenticationRequest;
-use MediaWiki\Auth\AuthenticationResponse;
 use MediaWiki\Auth\AuthManager;
 
 class OpenStackNovaSecondaryAuthenticationProvider
diff --git a/nova/OpenStackNovaUser.php b/nova/OpenStackNovaUser.php
index 9080e70..7e81ff6 100644
--- a/nova/OpenStackNovaUser.php
+++ b/nova/OpenStackNovaUser.php
@@ -91,7 +91,7 @@
}
$user_id = $user->getId();
if ( $user_id != 0 ) {
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
$row = $dbr->selectRow(
'openstack_tokens',
[ 'token' ],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic48c8353dacc4865e420ce911a13e5215496c3d6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OpenStackManager
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...Renameuser[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/380235 )

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


build: Updating mediawiki/mediawiki-codesniffer to 13.0.0

Change-Id: I9326652a49116b9b0459b465d08b228fe4b60726
---
M composer.json
M maintenance/renameUserCleanup.php
M specials/SpecialRenameuser.php
3 files changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/composer.json b/composer.json
index 7c63cad..6394fcf 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/maintenance/renameUserCleanup.php 
b/maintenance/renameUserCleanup.php
index 136a663..74ec452 100644
--- a/maintenance/renameUserCleanup.php
+++ b/maintenance/renameUserCleanup.php
@@ -87,7 +87,7 @@
 * @param User $newuser
 */
public function checkRenameLog( $olduser, $newuser ) {
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
 
$oldTitle = Title::makeTitle( NS_USER, $olduser->getName() );
 
diff --git a/specials/SpecialRenameuser.php b/specials/SpecialRenameuser.php
index 0014377..89fbe34 100644
--- a/specials/SpecialRenameuser.php
+++ b/specials/SpecialRenameuser.php
@@ -255,7 +255,7 @@
// Until r19631 it was possible to rename a user to a name with 
first character as lowercase
if ( $oldusername->getText() !== $wgContLang->ucfirst( 
$oldusername->getText() ) ) {
// oldusername was entered as lowercase -> check for 
existence in table 'user'
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
$uid = $dbr->selectField( 'user', 'user_id',
[ 'user_name' => $oldusername->getText() ],
__METHOD__ );
@@ -315,7 +315,7 @@
 
// Move any user pages
if ( $request->getCheck( 'movepages' ) && $user->isAllowed( 
'move' ) ) {
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
 
$pages = $dbr->select(
'page',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9326652a49116b9b0459b465d08b228fe4b60726
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Renameuser
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...TimedMediaHandler[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/380262 )

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


build: Updating mediawiki/mediawiki-codesniffer to 13.0.0

Change-Id: Icf43e41e3252a4b796408aa413629846e689ad7e
---
M ApiTranscodeReset.php
M SpecialOrphanedTimedText.php
M SpecialTimedMediaHandler.php
M TimedMediaHandler.hooks.php
M WebVideoTranscode/WebVideoTranscode.php
M composer.json
M maintenance/requeueTranscodes.php
7 files changed, 8 insertions(+), 10 deletions(-)

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



diff --git a/ApiTranscodeReset.php b/ApiTranscodeReset.php
index e691ec4..9a0e05b 100644
--- a/ApiTranscodeReset.php
+++ b/ApiTranscodeReset.php
@@ -142,7 +142,7 @@
 */
public static function getStateResetTime( $state ) {
global $wgWaitTimeForTranscodeReset;
-   $db = wfGetDB( DB_SLAVE );
+   $db = wfGetDB( DB_REPLICA );
// if an error return waitTime +1
if ( !is_null( $state['time_error'] ) ) {
return $wgWaitTimeForTranscodeReset + 1;
diff --git a/SpecialOrphanedTimedText.php b/SpecialOrphanedTimedText.php
index 4420176..d651a74 100644
--- a/SpecialOrphanedTimedText.php
+++ b/SpecialOrphanedTimedText.php
@@ -86,7 +86,7 @@
 * @return bool
 */
private function canExecuteQuery() {
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
return $dbr->getType() === 'mysql';
}
 
diff --git a/SpecialTimedMediaHandler.php b/SpecialTimedMediaHandler.php
index 1622090..99a3b67 100644
--- a/SpecialTimedMediaHandler.php
+++ b/SpecialTimedMediaHandler.php
@@ -110,7 +110,7 @@
$memcKey = wfMemcKey( 'TimedMediaHandler', 'files', $state );
$files = $wgMemc->get( $memcKey );
if ( !$files ) {
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
$files = [];
$res = $dbr->select(
'transcode',
@@ -160,7 +160,7 @@
$memcKey = wfMemcKey( 'TimedMediaHandler', 'stats', '1' /* 
version */ );
$stats = $wgMemc->get( $memcKey );
if ( !$stats ) {
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
$stats = [];
$stats[ 'videos' ] = [ 'total' => 0 ];
foreach ( $this->formats as $format => $condition ) {
@@ -193,7 +193,7 @@
$memcKey = wfMemcKey( 'TimedMediaHandler', 'states' );
$states = $wgMemc->get( $memcKey );
if ( !$states ) {
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
$states = [];
$states[ 'transcodes' ] = [ 'total' => 0 ];
foreach ( $this->transcodeStates as $state => 
$condition ) {
diff --git a/TimedMediaHandler.hooks.php b/TimedMediaHandler.hooks.php
index dea2239..7c8cfbc 100644
--- a/TimedMediaHandler.hooks.php
+++ b/TimedMediaHandler.hooks.php
@@ -1,7 +1,5 @@
 select(
[ 'imagelinks', 'page' ],
[ 'page_namespace', 'page_title' ],
diff --git a/composer.json b/composer.json
index ae9e9ee..1ba520c 100644
--- a/composer.json
+++ b/composer.json
@@ -4,7 +4,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/maintenance/requeueTranscodes.php 
b/maintenance/requeueTranscodes.php
index c90f93e..1606b1e 100644
--- a/maintenance/requeueTranscodes.php
+++ b/maintenance/requeueTranscodes.php
@@ -28,7 +28,7 @@
 
public function execute() {
$this->output( "Cleanup transcodes:\n" );
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
$types = [];
if ( $this->hasOption( 'audio' ) ) {
$types[] = 'AUDIO';

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icf43e41e3252a4b796408aa413629846e689ad7e
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: Libraryupgrader 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

[MediaWiki-commits] [Gerrit] labs...stewardbots[master]: Tool Labs rebrand for elections.php

2017-09-24 Thread MarcoAurelio (Code Review)

MarcoAurelio has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/380313 )

Change subject: Tool Labs rebrand for elections.php
..


Tool Labs rebrand for elections.php

Change-Id: Ibf31ff557b991598a85f2931ea31a3e3e67f2c1f
---
M Elections/elections.php
1 file changed, 3 insertions(+), 3 deletions(-)

Approvals:
  MarcoAurelio: Verified; Looks good to me, approved



diff --git a/Elections/elections.php b/Elections/elections.php
index 7b83ac9..edbaacd 100644
--- a/Elections/elections.php
+++ b/Elections/elections.php
@@ -14,7 +14,7 @@
 echo "";
 $ch = curl_init( $URL );
 curl_setopt( $ch, CURLOPT_RETURNTRANSFER, true );
-curl_setopt( $ch, CURLOPT_USERAGENT, 'Labs Bot - 
https://tools.wmflabs.org/stewardbots' );
+curl_setopt( $ch, CURLOPT_USERAGENT, 'Toolforge Bot - 
https://tools.wmflabs.org/stewardbots' );
 $result = unserialize( curl_exec( $ch ) );
 curl_close( $ch );
 $resultPages = $result['query']['pages'];
@@ -170,7 +170,7 @@
 
 
 
-Could not get votes. Please report
 this.
+Could not get votes. Please report
 this.
 
 
 
 
 
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibf31ff557b991598a85f2931ea31a3e3e67f2c1f
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/stewardbots
Gerrit-Branch: master
Gerrit-Owner: MarcoAurelio 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: MarcoAurelio 
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...WikiLove[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/380281 )

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


build: Updating mediawiki/mediawiki-codesniffer to 13.0.0

Change-Id: I5c9ce680106efd0722b4ef0170de5ad97218fd5a
---
M WikiLove.hooks.php
M composer.json
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/WikiLove.hooks.php b/WikiLove.hooks.php
index e262312..ab1dac0 100644
--- a/WikiLove.hooks.php
+++ b/WikiLove.hooks.php
@@ -205,7 +205,7 @@
 */
public static function onUserMergeAccountFields( array &$updateFields ) 
{
global $wgWikiLoveLogging;
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
// FIXME HACK: The extension never actually required the 
'wikilove_log' table
// and would suppress db errors if it didn't exist
if ( $wgWikiLoveLogging && $dbr->tableExists( 'wikilove_log' ) 
) {
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",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5c9ce680106efd0722b4ef0170de5ad97218fd5a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiLove
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...WikimediaIncubator[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/380284 )

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


build: Updating mediawiki/mediawiki-codesniffer to 13.0.0

Change-Id: I61e86e0a97edfa13ae736788c135e5098c3998d8
---
M SpecialRandomByTest.php
M TestWikiRC.php
M composer.json
3 files changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/SpecialRandomByTest.php b/SpecialRandomByTest.php
index 52e3867..83d5627 100644
--- a/SpecialRandomByTest.php
+++ b/SpecialRandomByTest.php
@@ -16,7 +16,7 @@
$project = isset( $target['project'] ) ? $target['project'] : 
'';
$lang = isset( $target['lang'] ) ? $target['lang'] : '';
if ( WikimediaIncubator::isContentProject() || ( $project && 
$lang ) ) {
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
$this->extra[] = 'page_title' .
$dbr->buildLike( 
WikimediaIncubator::displayPrefix( $project, $lang ) .
'/', $dbr->anyString() );
diff --git a/TestWikiRC.php b/TestWikiRC.php
index 538cb98..cc4b9c6 100644
--- a/TestWikiRC.php
+++ b/TestWikiRC.php
@@ -48,11 +48,11 @@
 
if ( $projectvalue == $wmincProjectSite['short'] ) {
// If project site is selected, display all changes 
except test wiki changes
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
$conds[] = 'rc_title NOT ' . $dbr->buildLike( 'W', 
$dbr->anyChar(), '/', $dbr->anyString() );
} elseif ( WikimediaIncubator::validatePrefix( $prefix, true ) 
) {
// Else, display changes to the selected test wiki in 
the appropriate namespaces
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
$conds['rc_namespace'] = $wmincTestWikiNamespaces;
$conds[] = 'rc_title ' . $dbr->buildLike( $prefix . 
'/', $dbr->anyString() ) .
' OR rc_title = ' . $dbr->addQuotes( $prefix );
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",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I61e86e0a97edfa13ae736788c135e5098c3998d8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaIncubator
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...WikimediaMaintenance[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/380286 )

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


build: Updating mediawiki/mediawiki-codesniffer to 13.0.0

The following sniffs now pass and were enabled:
* MediaWiki.Commenting.FunctionComment.MissingReturn

Change-Id: I9c43d5fb39ff58caf6b788bdd318d24e27fb6f7b
---
M checkTranscacheEmpty.php
M cleanupBug31576.php
M cleanupT92775.php
M composer.json
M dumpInterwiki.php
M fixBug41778.php
M getPageCounts.php
M makeDumpList.php
M passwordAudit.php
M phpcs.xml
M storage/testRctComplete.php
11 files changed, 12 insertions(+), 13 deletions(-)

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



diff --git a/checkTranscacheEmpty.php b/checkTranscacheEmpty.php
index a853e4e..2d6b99b 100644
--- a/checkTranscacheEmpty.php
+++ b/checkTranscacheEmpty.php
@@ -5,7 +5,7 @@
 $good = 0;
 foreach ( $wgLocalDatabases as $wiki ) {
$lb = wfGetLB( $wiki );
-   $db = $lb->getConnection( DB_SLAVE, [], $wiki );
+   $db = $lb->getConnection( DB_REPLICA, [], $wiki );
$notEmpty = $db->selectField( 'transcache', '1', false, 
'checkTranscacheEmpty.php' );
if ( $notEmpty ) {
echo "$wiki\n";
diff --git a/cleanupBug31576.php b/cleanupBug31576.php
index 2d54cec..27c9fc5 100644
--- a/cleanupBug31576.php
+++ b/cleanupBug31576.php
@@ -26,7 +26,7 @@
}
 
public function processSynonym( $synonym ) {
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
$pCount = 0;
$vCount = 0;
$this->output( "Fixing pages with template links to $synonym 
...\n" );
diff --git a/cleanupT92775.php b/cleanupT92775.php
index fc8b7e7..983923a 100644
--- a/cleanupT92775.php
+++ b/cleanupT92775.php
@@ -16,7 +16,7 @@
 class FixCUBlockLogs extends Maintenance {
public function execute() {
$ids = [];
-   $res = wfGetDB( DB_SLAVE )->select(
+   $res = wfGetDB( DB_REPLICA )->select(
'logging',
[ 'log_id' ],
[ 'log_params' => "1 week\nanononly\nnocreate" ],
diff --git a/composer.json b/composer.json
index cc9738f..4fafaa8 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": {
"lint": "parallel-lint --exclude vendor --exclude node_modules 
--ignore-fails .",
diff --git a/dumpInterwiki.php b/dumpInterwiki.php
index ab12304..055536f 100644
--- a/dumpInterwiki.php
+++ b/dumpInterwiki.php
@@ -51,7 +51,7 @@
/**
 * Returns an array of multi-language sites
 * db suffix => db suffix, iw prefix, hostname
-* @returns array
+* @return array
 */
protected function getSites() {
return [
@@ -70,7 +70,7 @@
/**
 * Returns an array of extra global interwiki links that can't be in the
 * intermap for some reason
-* @returns array
+* @return array
 */
protected function getExtraLinks() {
return [
@@ -163,7 +163,7 @@
/**
 * Additional links to provide for the needs of the different projects
 * @param string $project The site (e.g. wikibooks)
-* @returns array
+* @return array
 */
protected function getAdditionalLinks( $project ) {
switch ( $project ) {
diff --git a/fixBug41778.php b/fixBug41778.php
index fdfed9b..70abcbf 100644
--- a/fixBug41778.php
+++ b/fixBug41778.php
@@ -75,7 +75,7 @@
 }
 
 function assertCanAlter() {
-   $count = wfGetDB( DB_SLAVE )->selectField( 'ipblocks', 'count(*)', 
false, __METHOD__ );
+   $count = wfGetDB( DB_REPLICA )->selectField( 'ipblocks', 'count(*)', 
false, __METHOD__ );
if ( $count > 100 ) {
print "Table is too large for this script\n";
exit( 1 );
diff --git a/getPageCounts.php b/getPageCounts.php
index d9a49b5..0b8698a 100644
--- a/getPageCounts.php
+++ b/getPageCounts.php
@@ -44,7 +44,7 @@
continue;
}
$lb = wfGetLB( $wiki );
-   $dbr = $lb->getConnection( DB_SLAVE, [], $wiki );
+   $dbr = $lb->getConnection( DB_REPLICA, [], $wiki );
$row = $dbr->selectRow( 'site_stats', [ 
'ss_total_pages', 'ss_good_articles' ], '', __METHOD__ );
if ( !$row ) {
$this->error( "Error: '$wiki' has empty

[MediaWiki-commits] [Gerrit] oojs/ui[master]: TextInputWidget: Reduce CSS output by enhancing unselectable...

2017-09-24 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/379536 )

Change subject: TextInputWidget: Reduce CSS output by enhancing unselectable 
behaviour
..


TextInputWidget: Reduce CSS output by enhancing unselectable behaviour

Removing `.oo-ui-unselectable()` mixin from icons/indicators, where it
doesn't provide any effect and reducing selector output.

Change-Id: I2bf70e98e8883e9a8d1ec9e261914249038ac36b
---
M src/styles/widgets/TextInputWidget.less
1 file changed, 2 insertions(+), 8 deletions(-)

Approvals:
  Bartosz Dziewoński: Looks good to me, approved
  Esanders: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/src/styles/widgets/TextInputWidget.less 
b/src/styles/widgets/TextInputWidget.less
index 1b60524..0734dc3 100644
--- a/src/styles/widgets/TextInputWidget.less
+++ b/src/styles/widgets/TextInputWidget.less
@@ -59,8 +59,6 @@
position: absolute;
top: 0;
height: 100%;
-
-   .oo-ui-unselectable();
}
 
&.oo-ui-widget-enabled {
@@ -76,12 +74,8 @@
}
}
 
-   &.oo-ui-widget-disabled {
-   input,
-   textarea,
-   & .oo-ui-labelElement-label {
-   .oo-ui-unselectable();
-   }
+   &.oo-ui-widget-disabled > * {
+   .oo-ui-unselectable();
}
 
&.oo-ui-labelElement > .oo-ui-labelElement-label {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2bf70e98e8883e9a8d1ec9e261914249038ac36b
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: VolkerE 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Prtksxna 
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...UploadWizard[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/380271 )

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


build: Updating mediawiki/mediawiki-codesniffer to 13.0.0

Change-Id: I0978e7a10a71abfe26836ad27846005a684905bc
---
M composer.json
M includes/UploadWizardCampaign.php
M includes/specials/SpecialCampaigns.php
3 files changed, 4 insertions(+), 4 deletions(-)

Approvals:
  Bartosz Dziewoński: 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/UploadWizardCampaign.php 
b/includes/UploadWizardCampaign.php
index d9e69b3..b739821 100644
--- a/includes/UploadWizardCampaign.php
+++ b/includes/UploadWizardCampaign.php
@@ -132,7 +132,7 @@
$data = $wgMemc->get( $key );
if ( $data === false ) {
wfDebug( __METHOD__ . ' cache miss for key ' . $key );
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
$result = $dbr->select(
[ 'categorylinks', 'page', 'image' ],
[ 'count' => 'COUNT(DISTINCT img_user)' ],
@@ -156,7 +156,7 @@
}
 
public function getUploadedMedia( $limit = 24 ) {
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
$result = $dbr->select(
[ 'categorylinks', 'page' ],
[ 'cl_from', 'page_namespace', 'page_title' ],
diff --git a/includes/specials/SpecialCampaigns.php 
b/includes/specials/SpecialCampaigns.php
index 450e396..e056159 100644
--- a/includes/specials/SpecialCampaigns.php
+++ b/includes/specials/SpecialCampaigns.php
@@ -8,7 +8,7 @@
 
public function execute( $subPage ) {
$request = $this->getRequest();
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
 
$start = (int)$request->getVal( 'start' );
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0978e7a10a71abfe26836ad27846005a684905bc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Libraryupgrader 
Gerrit-Reviewer: Bartosz Dziewoński 
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/core[master]: RCFilters: Don't load all of OOUI

2017-09-24 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/379951 )

Change subject: RCFilters: Don't load all of OOUI
..


RCFilters: Don't load all of OOUI

Just the widgets module is enough, we don't need
the windows or toolbars modules.

Change-Id: Ie8ce45f0d46fbc759d4579d619ab8c99c13cb0d5
---
M resources/Resources.php
1 file changed, 1 insertion(+), 2 deletions(-)

Approvals:
  Bartosz Dziewoński: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/resources/Resources.php b/resources/Resources.php
index 818112f..014e6a1 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1917,7 +1917,7 @@
'quotation-marks',
],
'dependencies' => [
-   'oojs-ui',
+   'oojs-ui-widgets',
'jquery.makeCollapsible',
'mediawiki.language',
'mediawiki.user',
@@ -1927,7 +1927,6 @@
'oojs-ui.styles.icons-editing-core',
'oojs-ui.styles.icons-editing-styling',
'oojs-ui.styles.icons-interactions',
-   'oojs-ui.styles.icons-content',
'oojs-ui.styles.icons-layout',
'oojs-ui.styles.icons-media',
],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie8ce45f0d46fbc759d4579d619ab8c99c13cb0d5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] labs...heritage[master]: Fix harvesting of commonscat field in fr_fr

2017-09-24 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/380308 )

Change subject: Fix harvesting of commonscat field in fr_fr
..


Fix harvesting of commonscat field in fr_fr

The template (or the underlying Lua module) processes
`catégorie commons`, not `catégorie_commons`.

Change-Id: Id48f60ae7325b3922fd51a3fcc0e689f4312cea1
---
M erfgoedbot/monuments_config/fr_fr.json
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/erfgoedbot/monuments_config/fr_fr.json 
b/erfgoedbot/monuments_config/fr_fr.json
index 83f205c..1cddb45 100644
--- a/erfgoedbot/monuments_config/fr_fr.json
+++ b/erfgoedbot/monuments_config/fr_fr.json
@@ -97,7 +97,7 @@
 },
 {
 "dest": "commonscat",
-"source": "catégorie_commons"
+"source": "catégorie commons"
 },
 {
 "dest": "id",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id48f60ae7325b3922fd51a3fcc0e689f4312cea1
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/heritage
Gerrit-Branch: master
Gerrit-Owner: Jean-Frédéric 
Gerrit-Reviewer: Lokal Profil 
Gerrit-Reviewer: Multichill 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "mariadb: Depool db2047, hardware issues"

2017-09-24 Thread Jcrespo (Code Review)

Hello Urbanecm, jenkins-bot,

I'd like you to do a code review.  Please visit

https://gerrit.wikimedia.org/r/380314

to review the following change.


Change subject: Revert "mariadb: Depool db2047, hardware issues"
..

Revert "mariadb: Depool db2047, hardware issues"

This reverts commit ff32fb02cd89114c6e2115fb3900fa4c2051d8bf.

Change-Id: I5079d08633a3f65ea225cac6195463d42caf0938
---
M wmf-config/db-codfw.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/14/380314/1

diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index 7fba7b5..ee39fdd 100644
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -159,7 +159,7 @@
's7' => [
'db2029' => 0,   # B6 2.9TB  96GB, master
'db2040' => 200, # C6 2.9TB 160GB, rc, log
-   # 'db2047' => 400, # C6 2.9TB 160GB, crashed T176573
+   'db2047' => 400, # C6 2.9TB 160GB
'db2054' => 200, # D6 2.9TB 160GB, dump (inactive), vslow
'db2061' => 200, # D6 3.3TB 160GB, api
'db2068' => 300, # D6 3.3TB 160GB

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5079d08633a3f65ea225cac6195463d42caf0938
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jcrespo 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] labs...stewardbots[master]: Tool Labs rebrand for elections.php

2017-09-24 Thread MarcoAurelio (Code Review)

MarcoAurelio has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/380313 )

Change subject: Tool Labs rebrand for elections.php
..

Tool Labs rebrand for elections.php

Change-Id: Ibf31ff557b991598a85f2931ea31a3e3e67f2c1f
---
M Elections/elections.php
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/tools/stewardbots 
refs/changes/13/380313/1

diff --git a/Elections/elections.php b/Elections/elections.php
index 7b83ac9..edbaacd 100644
--- a/Elections/elections.php
+++ b/Elections/elections.php
@@ -14,7 +14,7 @@
 echo "";
 $ch = curl_init( $URL );
 curl_setopt( $ch, CURLOPT_RETURNTRANSFER, true );
-curl_setopt( $ch, CURLOPT_USERAGENT, 'Labs Bot - 
https://tools.wmflabs.org/stewardbots' );
+curl_setopt( $ch, CURLOPT_USERAGENT, 'Toolforge Bot - 
https://tools.wmflabs.org/stewardbots' );
 $result = unserialize( curl_exec( $ch ) );
 curl_close( $ch );
 $resultPages = $result['query']['pages'];
@@ -170,7 +170,7 @@
 
 
 
-Could not get votes. Please report
 this.
+Could not get votes. Please report
 this.
 
 
 
 
 
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibf31ff557b991598a85f2931ea31a3e3e67f2c1f
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/stewardbots
Gerrit-Branch: master
Gerrit-Owner: MarcoAurelio 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: mariadb: Depool db2047, hardware issues

2017-09-24 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/380311 )

Change subject: mariadb: Depool db2047, hardware issues
..


mariadb: Depool db2047, hardware issues

Bug: T176573
Change-Id: I3905d07c57c37fd367ff621d3c2f1f4fd18607a4
---
M wmf-config/db-codfw.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index ee39fdd..7fba7b5 100644
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -159,7 +159,7 @@
's7' => [
'db2029' => 0,   # B6 2.9TB  96GB, master
'db2040' => 200, # C6 2.9TB 160GB, rc, log
-   'db2047' => 400, # C6 2.9TB 160GB
+   # 'db2047' => 400, # C6 2.9TB 160GB, crashed T176573
'db2054' => 200, # D6 2.9TB 160GB, dump (inactive), vslow
'db2061' => 200, # D6 3.3TB 160GB, api
'db2068' => 300, # D6 3.3TB 160GB

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3905d07c57c37fd367ff621d3c2f1f4fd18607a4
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jcrespo 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Urbanecm 
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...SendGrid[master]: Add some documentation to README.md

2017-09-24 Thread D3r1ck01 (Code Review)

D3r1ck01 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/380312 )

Change subject: Add some documentation to README.md
..

Add some documentation to README.md

* Adding some documentation / links to docs related to the SendGrid
  extension.

Bug: T176575
Change-Id: I0ce7d8b0dcd3df3e235be7af60ccf1d2f39e71b4
---
M README.md
1 file changed, 15 insertions(+), 0 deletions(-)


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

diff --git a/README.md b/README.md
index e69de29..4f26292 100644
--- a/README.md
+++ b/README.md
@@ -0,0 +1,15 @@
+# SendGrid MediaWiki Extension
+
+This is a Github mirror of MediaWiki extension SendGrid - our actual code is 
hosted with Gerrit (please see https://www.mediawiki.org/wiki/Developer_access 
for contributing).
+
+
+
+# View SendGrid package using the link below;
+
+Github SendGrid package: https://github.com/stephenb/sendgrid.
+
+
+
+# Installing the SendGrid Extension on MW
+
+To install this extension on MediaWiki (MW), follow the documentations here: 
https://www.mediawiki.org/wiki/Extension:SendGrid
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0ce7d8b0dcd3df3e235be7af60ccf1d2f39e71b4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SendGrid
Gerrit-Branch: master
Gerrit-Owner: D3r1ck01 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: mariadb: Depool db2047, hardware issues

2017-09-24 Thread Jcrespo (Code Review)

Jcrespo has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/380311 )

Change subject: mariadb: Depool db2047, hardware issues
..

mariadb: Depool db2047, hardware issues

Bug: T176573
Change-Id: I3905d07c57c37fd367ff621d3c2f1f4fd18607a4
---
M wmf-config/db-codfw.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/11/380311/1

diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index ee39fdd..7fba7b5 100644
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -159,7 +159,7 @@
's7' => [
'db2029' => 0,   # B6 2.9TB  96GB, master
'db2040' => 200, # C6 2.9TB 160GB, rc, log
-   'db2047' => 400, # C6 2.9TB 160GB
+   # 'db2047' => 400, # C6 2.9TB 160GB, crashed T176573
'db2054' => 200, # D6 2.9TB 160GB, dump (inactive), vslow
'db2061' => 200, # D6 3.3TB 160GB, api
'db2068' => 300, # D6 3.3TB 160GB

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3905d07c57c37fd367ff621d3c2f1f4fd18607a4
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jcrespo 

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

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

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


build: Updating mediawiki/mediawiki-codesniffer to 13.0.0

Change-Id: I35a3531c79a60ccc0f099d7d4cc1a1e39e23ca8a
---
M SpecialUserOptionStats.php
M composer.json
2 files changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/SpecialUserOptionStats.php b/SpecialUserOptionStats.php
index b8038f3..fae8003 100644
--- a/SpecialUserOptionStats.php
+++ b/SpecialUserOptionStats.php
@@ -56,7 +56,7 @@
return;
}
 
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
 
$total = $dbr->selectField( 'user', 'count(*)', '', __METHOD__ 
);
 
@@ -139,7 +139,7 @@
foreach ( $wgDefaultUserOptions as $k => $v ) { $opts[$k] = 
true;
 }
 
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
$res = $dbr->select( 'user_properties', 'DISTINCT(up_property) 
as value', '', __METHOD__ );
foreach ( $res as $r ) {
$opts[$r->value] = true;
diff --git a/composer.json b/composer.json
index 119afc0..3b46c98 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,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": {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I35a3531c79a60ccc0f099d7d4cc1a1e39e23ca8a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UserOptionStats
Gerrit-Branch: master
Gerrit-Owner: Libraryupgrader 
Gerrit-Reviewer: Nikerabbit 
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...TranslationNotifications[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/380266 )

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


build: Updating mediawiki/mediawiki-codesniffer to 13.0.0

Change-Id: I1b51fa235d5c1d5d527ab9f87c6d54857e4c756b
---
M SpecialNotifyTranslators.php
M composer.json
M scripts/DigestEmailer.php
3 files changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/SpecialNotifyTranslators.php b/SpecialNotifyTranslators.php
index ea784fd..7a840fe 100644
--- a/SpecialNotifyTranslators.php
+++ b/SpecialNotifyTranslators.php
@@ -192,7 +192,7 @@
 
$langPropertyPrefix = 'translationnotifications-lang-';
 
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
$propertyLikePattern = $dbr->buildLike( $langPropertyPrefix, 
$dbr->anyString() );
$translatorsConds = [
"up_property $propertyLikePattern",
diff --git a/composer.json b/composer.json
index 848ee5c..6a24e0b 100644
--- a/composer.json
+++ b/composer.json
@@ -10,7 +10,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/scripts/DigestEmailer.php b/scripts/DigestEmailer.php
index 631058b..bc058c2 100644
--- a/scripts/DigestEmailer.php
+++ b/scripts/DigestEmailer.php
@@ -237,7 +237,7 @@
 
protected function getTranslators() {
$translators = [];
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
$translatorsConds = [ 'up_property' => 
'translationnotifications-freq' ];
$translatorsConds += [ 'up_value' => [ 'weekly', 'monthly' ] ];
$result = $dbr->select(
@@ -262,7 +262,7 @@
 * @return Array of notifications
 */
protected function getNotifications() {
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
$logEntrySelectQuery = DatabaseLogEntry::getSelectQueryData();
$logFilter = [ 'log_type' => 'notifytranslators' ];
$lastMonthTimeStamp = $dbr->timestamp( strtotime( '-1 month' ) 
);

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1b51fa235d5c1d5d527ab9f87c6d54857e4c756b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TranslationNotifications
Gerrit-Branch: master
Gerrit-Owner: Libraryupgrader 
Gerrit-Reviewer: Nikerabbit 
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...codesniffer[master]: Update php code sniffer to 3.1.0

2017-09-24 Thread Paladox (Code Review)

Paladox has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/380310 )

Change subject: Update php code sniffer to 3.1.0
..

Update php code sniffer to 3.1.0

See https://github.com/squizlabs/PHP_CodeSniffer/releases/tag/3.1.0

Change-Id: I2d56b4e46b326e3768c09d731581efe944aa6063
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/codesniffer 
refs/changes/10/380310/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2d56b4e46b326e3768c09d731581efe944aa6063
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/codesniffer
Gerrit-Branch: master
Gerrit-Owner: Paladox 

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

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

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


build: Updating mediawiki/mediawiki-codesniffer to 13.0.0

Change-Id: Ibea048de7fc5f703d7ebf54d7844e35af8eac8d8
---
M composer.json
M includes/PopupsHooks.php
2 files changed, 1 insertion(+), 2 deletions(-)

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



diff --git a/composer.json b/composer.json
index 7898723..d980e06 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/PopupsHooks.php b/includes/PopupsHooks.php
index 41b038d..5f72955 100644
--- a/includes/PopupsHooks.php
+++ b/includes/PopupsHooks.php
@@ -24,7 +24,6 @@
 use User;
 use OutputPage;
 use Skin;
-use ResourceLoader;
 
 /**
  * Hooks definitions for Popups extension

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibea048de7fc5f703d7ebf54d7844e35af8eac8d8
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: master
Gerrit-Owner: Libraryupgrader 
Gerrit-Reviewer: Pmiazga 
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...RevisionSlider[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/380237 )

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


build: Updating mediawiki/mediawiki-codesniffer to 13.0.0

Change-Id: If7e2cece08c3c99d7acd5617abfb8368ec699d0f
---
M composer.json
M tests/phan/config.php
2 files changed, 1 insertion(+), 3 deletions(-)

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



diff --git a/composer.json b/composer.json
index e184046..f33066c 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/tests/phan/config.php b/tests/phan/config.php
index 4032958..d2967bc 100644
--- a/tests/phan/config.php
+++ b/tests/phan/config.php
@@ -1,7 +1,5 @@
 https://gerrit.wikimedia.org/r/380237
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If7e2cece08c3c99d7acd5617abfb8368ec699d0f
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/RevisionSlider
Gerrit-Branch: master
Gerrit-Owner: Libraryupgrader 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Andrew-WMDE 
Gerrit-Reviewer: Tobias Gritschacher 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: WMDE-Fisch 
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...TwoColConflict[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/380267 )

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


build: Updating mediawiki/mediawiki-codesniffer to 13.0.0

Change-Id: Ib0a9f74d43bff48dd17cb52842b280c01b3548d9
---
M composer.json
M tests/phan/config.php
2 files changed, 1 insertion(+), 3 deletions(-)

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



diff --git a/composer.json b/composer.json
index eff6da5..fb960b8 100644
--- a/composer.json
+++ b/composer.json
@@ -4,7 +4,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/tests/phan/config.php b/tests/phan/config.php
index 664f684..fc45a19 100644
--- a/tests/phan/config.php
+++ b/tests/phan/config.php
@@ -1,7 +1,5 @@
 https://gerrit.wikimedia.org/r/380267
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib0a9f74d43bff48dd17cb52842b280c01b3548d9
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/TwoColConflict
Gerrit-Branch: master
Gerrit-Owner: Libraryupgrader 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Andrew-WMDE 
Gerrit-Reviewer: Tobias Gritschacher 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: WMDE-Fisch 
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...Thanks[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/380258 )

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


build: Updating mediawiki/mediawiki-codesniffer to 13.0.0

Change-Id: I0f29013c1ef31a6da93741adf8d4f46ec59ce2e4
---
M ApiFlowThank.php
M Thanks.hooks.php
M composer.json
3 files changed, 1 insertion(+), 3 deletions(-)

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



diff --git a/ApiFlowThank.php b/ApiFlowThank.php
index 4cfb17c..81867eb 100644
--- a/ApiFlowThank.php
+++ b/ApiFlowThank.php
@@ -11,7 +11,6 @@
 
 use Flow\Container;
 use Flow\Conversion\Utils;
-use Flow\Data\RootPostLoader;
 use Flow\Exception\FlowException;
 use Flow\Model\PostRevision;
 use Flow\Model\UUID;
diff --git a/Thanks.hooks.php b/Thanks.hooks.php
index 6e0b717..cf8fe9b 100644
--- a/Thanks.hooks.php
+++ b/Thanks.hooks.php
@@ -1,5 +1,4 @@
 https://gerrit.wikimedia.org/r/380258
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I0f29013c1ef31a6da93741adf8d4f46ec59ce2e4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Thanks
Gerrit-Branch: master
Gerrit-Owner: Libraryupgrader 
Gerrit-Reviewer: Legoktm 
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...Metrolook[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/380297 )

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


build: Updating mediawiki/mediawiki-codesniffer to 13.0.0

Change-Id: I834e8ed423e7bad70d9a6654613f04244a744c2f
---
M MetrolookTemplate.php
M ResourceLoaderLessModule.php
M SkinMetrolook.php
M composer.json
4 files changed, 4 insertions(+), 5 deletions(-)

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



diff --git a/MetrolookTemplate.php b/MetrolookTemplate.php
index 82c0cda..23bcc48 100644
--- a/MetrolookTemplate.php
+++ b/MetrolookTemplate.php
@@ -799,7 +799,7 @@
}
 
/**
-* @inheritdoc
+* @inheritDoc
 */
public function makeLink( $key, $item, $options = [] ) {
$html = parent::makeLink( $key, $item, $options );
@@ -810,7 +810,7 @@
return $html;
}
/**
-* @inheritdoc
+* @inheritDoc
 */
public function makeListItem( $key, $item, $options = [] ) {
// For fancy styling of watch/unwatch star
diff --git a/ResourceLoaderLessModule.php b/ResourceLoaderLessModule.php
index e40e042..2d2ebfa 100644
--- a/ResourceLoaderLessModule.php
+++ b/ResourceLoaderLessModule.php
@@ -22,7 +22,6 @@
 
 namespace Metrolook;
 
-use ConfigFactory;
 use CSSMin;
 use MediaWiki\MediaWikiServices;
 use ResourceLoaderContext;
diff --git a/SkinMetrolook.php b/SkinMetrolook.php
index a6131e3..88fc142 100644
--- a/SkinMetrolook.php
+++ b/SkinMetrolook.php
@@ -39,7 +39,7 @@
->makeConfig( 'metrolook' );
}
 
-   /** @inheritdoc */
+   /** @inheritDoc */
public function getPageClasses( $title ) {
$className = parent::getPageClasses( $title );
if ( $this->metrolookConfig->get( 
'MetrolookExperimentalPrintStyles' ) ) {
diff --git a/composer.json b/composer.json
index 073a791..7f5b876 100644
--- a/composer.json
+++ b/composer.json
@@ -34,7 +34,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": {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I834e8ed423e7bad70d9a6654613f04244a744c2f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Metrolook
Gerrit-Branch: master
Gerrit-Owner: Libraryupgrader 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

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

1 2 3 >

1 - 100 of 279 matches

Mail list logo