date:20180107

[MediaWiki-commits] [Gerrit] operations/software[master]: s7.hosts: Remove db1039

2018-01-07 Thread jenkins-bot (Code Review)

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

Change subject: s7.hosts: Remove db1039
..


s7.hosts: Remove db1039

db1039 will be decommissioned

Bug: T184262
Change-Id: Iddbec211469f609bbd2611b66ca2722bbea891c4
---
M dbtools/s7.hosts
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/dbtools/s7.hosts b/dbtools/s7.hosts
index c747684..b552371 100644
--- a/dbtools/s7.hosts
+++ b/dbtools/s7.hosts
@@ -16,7 +16,6 @@
 db1102.eqiad.wmnet 3317
 dbstore1001.eqiad.wmnet3306
 dbstore1002.eqiad.wmnet3306
-db1039.eqiad.wmnet 3306
 db1069.eqiad.wmnet 3306
 db1079.eqiad.wmnet 3306
 db1086.eqiad.wmnet 3306

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iddbec211469f609bbd2611b66ca2722bbea891c4
Gerrit-PatchSet: 1
Gerrit-Project: operations/software
Gerrit-Branch: master
Gerrit-Owner: Marostegui 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Marostegui 
Gerrit-Reviewer: Volans 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] translatewiki[master]: Fix udpcast

2018-01-07 Thread jenkins-bot (Code Review)

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

Change subject: Fix udpcast
..


Fix udpcast

Change-Id: I000de795234f5bba155af870523f46ea9a995a6b
---
M bin/udpcast
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/bin/udpcast b/bin/udpcast
index f690e61..35fe7a5 100755
--- a/bin/udpcast
+++ b/bin/udpcast
@@ -2,6 +2,6 @@
 set -o nounset -o errexit
 
 DIRSCRIPT=$(dirname "$(readlink -f "$0")")
-WHO=${SUDO_USER-$USER}
+WHO=${SUDO_USER-${USER-}}
 
 php "${DIRSCRIPT}/scripts/snedUdpMessage.php" --host=127.0.0.1 --port=8966 
--quiet=1 "[$WHO]" "$@"

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I000de795234f5bba155af870523f46ea9a995a6b
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 
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] operations/software[master]: s7.hosts: Remove db1039

2018-01-07 Thread Marostegui (Code Review)

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

Change subject: s7.hosts: Remove db1039
..

s7.hosts: Remove db1039

db1039 will be decommissioned

Bug: T184262
Change-Id: Iddbec211469f609bbd2611b66ca2722bbea891c4
---
M dbtools/s7.hosts
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/software 
refs/changes/68/402768/1

diff --git a/dbtools/s7.hosts b/dbtools/s7.hosts
index c747684..b552371 100644
--- a/dbtools/s7.hosts
+++ b/dbtools/s7.hosts
@@ -16,7 +16,6 @@
 db1102.eqiad.wmnet 3317
 dbstore1001.eqiad.wmnet3306
 dbstore1002.eqiad.wmnet3306
-db1039.eqiad.wmnet 3306
 db1069.eqiad.wmnet 3306
 db1079.eqiad.wmnet 3306
 db1086.eqiad.wmnet 3306

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iddbec211469f609bbd2611b66ca2722bbea891c4
Gerrit-PatchSet: 1
Gerrit-Project: operations/software
Gerrit-Branch: master
Gerrit-Owner: Marostegui 

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

[MediaWiki-commits] [Gerrit] translatewiki[master]: Fix udpcast

2018-01-07 Thread Nikerabbit (Code Review)

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

Change subject: Fix udpcast
..

Fix udpcast

Change-Id: I000de795234f5bba155af870523f46ea9a995a6b
---
M bin/udpcast
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/69/402769/1

diff --git a/bin/udpcast b/bin/udpcast
index f690e61..35fe7a5 100755
--- a/bin/udpcast
+++ b/bin/udpcast
@@ -2,6 +2,6 @@
 set -o nounset -o errexit
 
 DIRSCRIPT=$(dirname "$(readlink -f "$0")")
-WHO=${SUDO_USER-$USER}
+WHO=${SUDO_USER-${USER-}}
 
 php "${DIRSCRIPT}/scripts/snedUdpMessage.php" --host=127.0.0.1 --port=8966 
--quiet=1 "[$WHO]" "$@"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I000de795234f5bba155af870523f46ea9a995a6b
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mariadb: Remove db1039

2018-01-07 Thread Marostegui (Code Review)

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

Change subject: mariadb: Remove db1039
..


mariadb: Remove db1039

db1039 is going to be decommissioned

Bug: T184262
Change-Id: Ia0ee5c411c5f01bfe23fc96dc730f6ac26e697cd
---
D hieradata/hosts/db1039.yaml
M hieradata/regex.yaml
M manifests/site.pp
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
M modules/role/files/prometheus/mysql-core_eqiad.yaml
5 files changed, 10 insertions(+), 13 deletions(-)

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



diff --git a/hieradata/hosts/db1039.yaml b/hieradata/hosts/db1039.yaml
deleted file mode 100644
index 082b36e..000
--- a/hieradata/hosts/db1039.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-mariadb::shard: 's7'
-mariadb::socket: '/tmp/mysql.sock'
-profile::base::notifications_enabled: '0'
diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index 537e6b3..b0f9d22 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -254,7 +254,7 @@
   profile::base::check_smart: true
 
 smart_health_eqiad:
-  __regex: !ruby/regexp 
/^(analytics10[234][0-9]|aqs1004|conf1001|cp1045|db1039|db1001|db1087|db1011|druid1001|elastic1017|es1015|etcd1001|ganeti1001|graphite1.*|kafka1001|kafka-jumbo1001|kube.*|labmon1001|labcontrol1001|labvirt1001|labvirt1010|labsdb1009|labstore1006|lvs1007logstash1008|mw11.*|maps1001|mc1019|ms-be1013|ms-be1039|ores1001|oresrdb1002|phab1001|poolcounter1001|mwlog1001|netmon1.*|puppetmaster1001|pc1004|sca1003|scb1001|thumbor1.*|tin|tungsten|wdqs1003|wtp1025|xenon).eqiad\.wmnet$/
+  __regex: !ruby/regexp 
/^(analytics10[234][0-9]|aqs1004|conf1001|cp1045|db1001|db1087|db1011|druid1001|elastic1017|es1015|etcd1001|ganeti1001|graphite1.*|kafka1001|kafka-jumbo1001|kube.*|labmon1001|labcontrol1001|labvirt1001|labvirt1010|labsdb1009|labstore1006|lvs1007logstash1008|mw11.*|maps1001|mc1019|ms-be1013|ms-be1039|ores1001|oresrdb1002|phab1001|poolcounter1001|mwlog1001|netmon1.*|puppetmaster1001|pc1004|sca1003|scb1001|thumbor1.*|tin|tungsten|wdqs1003|wtp1025|xenon).eqiad\.wmnet$/
   profile::base::check_smart: true
 
 labtestpuppetmaster:
diff --git a/manifests/site.pp b/manifests/site.pp
index a9a879f..1e71e7c 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -430,13 +430,21 @@
 role(mariadb::core)
 }
 
-node /^db10(39|69|79|86|94)\.eqiad\.wmnet/ {
+node /^db10(69|79|86|94)\.eqiad\.wmnet/ {
 role(mariadb::core)
 }
 
+# To be decommissioned T182556
 node 'db1034.eqiad.wmnet' {
 role(spare::system)
 }
+
+# To be decommissioned T184262
+node 'db1039.eqiad.wmnet' {
+role(spare::system)
+}
+
+#
 # s7 (centralauth, meta et al.) core production dbs on codfw
 # codfw master
 node 'db2029.codfw.wmnet' {
diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index d33b132..3c778da 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -940,13 +940,6 @@
 filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
 }
 
-host db1039 {
-hardware ethernet 78:2b:cb:04:fc:98;
-fixed-address db1039.eqiad.wmnet;
-option pxelinux.pathprefix "trusty-installer/";
-filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
-}
-
 host db1043 {
 hardware ethernet 78:2b:cb:03:dd:3b;
 fixed-address db1043.eqiad.wmnet;
diff --git a/modules/role/files/prometheus/mysql-core_eqiad.yaml 
b/modules/role/files/prometheus/mysql-core_eqiad.yaml
index 6cf92ee..c140642 100644
--- a/modules/role/files/prometheus/mysql-core_eqiad.yaml
+++ b/modules/role/files/prometheus/mysql-core_eqiad.yaml
@@ -100,7 +100,6 @@
 shard: s7
 role: slave
   targets:
-  - db1039:9104
   - db1069:9104
   - db1079:9104
   - db1086:9104

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia0ee5c411c5f01bfe23fc96dc730f6ac26e697cd
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Marostegui 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Marostegui 
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]: db-eqiad, db-codfw.php: Remove db1039 from config

2018-01-07 Thread jenkins-bot (Code Review)

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

Change subject: db-eqiad,db-codfw.php: Remove db1039 from config
..


db-eqiad,db-codfw.php: Remove db1039 from config

db1039 is going to be decommissioned

Bug: T184262
Change-Id: I233fb252028a10a67d8c2bf9578cd266bf7ff8d7
---
M wmf-config/db-codfw.php
M wmf-config/db-eqiad.php
2 files changed, 0 insertions(+), 3 deletions(-)

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



diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index e324d44..44ad540 100644
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -542,7 +542,6 @@
'db1011' => '10.64.0.15', # do not remove or comment out
'db1020' => '10.64.16.9', # do not remove or comment out
'db1030' => '10.64.16.19', # do not remove or comment out
-   'db1039' => '10.64.16.28', # do not remove or comment out
'db1043' => '10.64.16.32', # do not remove or comment out
'db1047' => '10.64.16.36', # do not remove or comment out
'db1051' => '10.64.16.76', # do not remove or comment out
diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index cbdce9f..e33e141 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -161,7 +161,6 @@
],
's7' => [
'db1062' => 0,   # D4 2.8TB 128GB, master
-   # 'db1039' => 0,   # B2 1.4TB  64GB # T163190
'db1069' => 0,   # D1 2.8TB 160GB, vslow, dump, old master
'db1079' => 300, # A2 3.6TB 512GB, api #master for db1102 
(sanitarium 3)
'db1086' => 500, # B3 3.6TB 512GB, api
@@ -521,7 +520,6 @@
'db1011' => '10.64.0.15', # do not remove or comment out
'db1020' => '10.64.16.9', # do not remove or comment out
'db1030' => '10.64.16.19', # do not remove or comment out
-   'db1039' => '10.64.16.28', # do not remove or comment out
'db1043' => '10.64.16.32', # do not remove or comment out
'db1047' => '10.64.16.36', # do not remove or comment out
'db1051' => '10.64.16.76', # do not remove or comment out

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I233fb252028a10a67d8c2bf9578cd266bf7ff8d7
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Marostegui 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Marostegui 
Gerrit-Reviewer: Urbanecm 
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/core[master]: Avoid loading classes in API factory check

2018-01-07 Thread Code Review

Gergő Tisza has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/402767 )

Change subject: Avoid loading classes in API factory check
..

Avoid loading classes in API factory check

Change-Id: Ie6849a13d0d04ccf089a1f4c2622b41e4507b720
---
M includes/api/ApiModuleManager.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/67/402767/1

diff --git a/includes/api/ApiModuleManager.php 
b/includes/api/ApiModuleManager.php
index b5e47ac..6d46519 100644
--- a/includes/api/ApiModuleManager.php
+++ b/includes/api/ApiModuleManager.php
@@ -135,7 +135,7 @@
throw new InvalidArgumentException( '$class must be a 
string' );
}
 
-   if ( $factory !== null && !is_callable( $factory ) ) {
+   if ( $factory !== null && !is_callable( $factory, false ) ) {
throw new InvalidArgumentException( '$factory must be a 
callable (or null)' );
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie6849a13d0d04ccf089a1f4c2622b41e4507b720
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mariadb: Remove db1039

2018-01-07 Thread Marostegui (Code Review)

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

Change subject: mariadb: Remove db1039
..

mariadb: Remove db1039

db1039 is going to be decommissioned

Bug: T184262
Change-Id: Ia0ee5c411c5f01bfe23fc96dc730f6ac26e697cd
---
D hieradata/hosts/db1039.yaml
M hieradata/regex.yaml
M manifests/site.pp
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
M modules/role/files/prometheus/mysql-core_eqiad.yaml
5 files changed, 10 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/66/402766/1

diff --git a/hieradata/hosts/db1039.yaml b/hieradata/hosts/db1039.yaml
deleted file mode 100644
index 082b36e..000
--- a/hieradata/hosts/db1039.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-mariadb::shard: 's7'
-mariadb::socket: '/tmp/mysql.sock'
-profile::base::notifications_enabled: '0'
diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index 537e6b3..b0f9d22 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -254,7 +254,7 @@
   profile::base::check_smart: true
 
 smart_health_eqiad:
-  __regex: !ruby/regexp 
/^(analytics10[234][0-9]|aqs1004|conf1001|cp1045|db1039|db1001|db1087|db1011|druid1001|elastic1017|es1015|etcd1001|ganeti1001|graphite1.*|kafka1001|kafka-jumbo1001|kube.*|labmon1001|labcontrol1001|labvirt1001|labvirt1010|labsdb1009|labstore1006|lvs1007logstash1008|mw11.*|maps1001|mc1019|ms-be1013|ms-be1039|ores1001|oresrdb1002|phab1001|poolcounter1001|mwlog1001|netmon1.*|puppetmaster1001|pc1004|sca1003|scb1001|thumbor1.*|tin|tungsten|wdqs1003|wtp1025|xenon).eqiad\.wmnet$/
+  __regex: !ruby/regexp 
/^(analytics10[234][0-9]|aqs1004|conf1001|cp1045|db1001|db1087|db1011|druid1001|elastic1017|es1015|etcd1001|ganeti1001|graphite1.*|kafka1001|kafka-jumbo1001|kube.*|labmon1001|labcontrol1001|labvirt1001|labvirt1010|labsdb1009|labstore1006|lvs1007logstash1008|mw11.*|maps1001|mc1019|ms-be1013|ms-be1039|ores1001|oresrdb1002|phab1001|poolcounter1001|mwlog1001|netmon1.*|puppetmaster1001|pc1004|sca1003|scb1001|thumbor1.*|tin|tungsten|wdqs1003|wtp1025|xenon).eqiad\.wmnet$/
   profile::base::check_smart: true
 
 labtestpuppetmaster:
diff --git a/manifests/site.pp b/manifests/site.pp
index a9a879f..4fb9871 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -430,13 +430,21 @@
 role(mariadb::core)
 }
 
-node /^db10(39|69|79|86|94)\.eqiad\.wmnet/ {
+node /^db10(69|79|86|94)\.eqiad\.wmnet/ {
 role(mariadb::core)
 }
 
+# To be decommissioned T182556
 node 'db1034.eqiad.wmnet' {
 role(spare::system)
 }
+
+# To be decommissioned T184262 
+node 'db1039.eqiad.wmnet' {
+role(spare::system)
+}
+
+#
 # s7 (centralauth, meta et al.) core production dbs on codfw
 # codfw master
 node 'db2029.codfw.wmnet' {
diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index d33b132..3c778da 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -940,13 +940,6 @@
 filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
 }
 
-host db1039 {
-hardware ethernet 78:2b:cb:04:fc:98;
-fixed-address db1039.eqiad.wmnet;
-option pxelinux.pathprefix "trusty-installer/";
-filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
-}
-
 host db1043 {
 hardware ethernet 78:2b:cb:03:dd:3b;
 fixed-address db1043.eqiad.wmnet;
diff --git a/modules/role/files/prometheus/mysql-core_eqiad.yaml 
b/modules/role/files/prometheus/mysql-core_eqiad.yaml
index 6cf92ee..c140642 100644
--- a/modules/role/files/prometheus/mysql-core_eqiad.yaml
+++ b/modules/role/files/prometheus/mysql-core_eqiad.yaml
@@ -100,7 +100,6 @@
 shard: s7
 role: slave
   targets:
-  - db1039:9104
   - db1069:9104
   - db1079:9104
   - db1086:9104

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad, db-codfw.php: Remove db1039 from config

2018-01-07 Thread Marostegui (Code Review)

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

Change subject: db-eqiad,db-codfw.php: Remove db1039 from config
..

db-eqiad,db-codfw.php: Remove db1039 from config

db1039 is going to be decommissioned

Bug: T184262
Change-Id: I233fb252028a10a67d8c2bf9578cd266bf7ff8d7
---
M wmf-config/db-codfw.php
M wmf-config/db-eqiad.php
2 files changed, 0 insertions(+), 3 deletions(-)


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

diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index e324d44..44ad540 100644
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -542,7 +542,6 @@
'db1011' => '10.64.0.15', # do not remove or comment out
'db1020' => '10.64.16.9', # do not remove or comment out
'db1030' => '10.64.16.19', # do not remove or comment out
-   'db1039' => '10.64.16.28', # do not remove or comment out
'db1043' => '10.64.16.32', # do not remove or comment out
'db1047' => '10.64.16.36', # do not remove or comment out
'db1051' => '10.64.16.76', # do not remove or comment out
diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index cbdce9f..e33e141 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -161,7 +161,6 @@
],
's7' => [
'db1062' => 0,   # D4 2.8TB 128GB, master
-   # 'db1039' => 0,   # B2 1.4TB  64GB # T163190
'db1069' => 0,   # D1 2.8TB 160GB, vslow, dump, old master
'db1079' => 300, # A2 3.6TB 512GB, api #master for db1102 
(sanitarium 3)
'db1086' => 500, # B3 3.6TB 512GB, api
@@ -521,7 +520,6 @@
'db1011' => '10.64.0.15', # do not remove or comment out
'db1020' => '10.64.16.9', # do not remove or comment out
'db1030' => '10.64.16.19', # do not remove or comment out
-   'db1039' => '10.64.16.28', # do not remove or comment out
'db1043' => '10.64.16.32', # do not remove or comment out
'db1047' => '10.64.16.36', # do not remove or comment out
'db1051' => '10.64.16.76', # do not remove or comment out

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Depool db1067, db1089

2018-01-07 Thread jenkins-bot (Code Review)

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

Change subject: db-eqiad.php: Depool db1067, db1089
..


db-eqiad.php: Depool db1067, db1089

Depool db1067 and db1089 to check their data

Bug: T162807
Change-Id: I4d9a20d81a7aab3993b66173f39792ad5070bccb
---
M wmf-config/db-eqiad.php
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index cf47536..cbdce9f 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -105,13 +105,13 @@
 'sectionLoads' => [
's1' => [
'db1052' => 0,   # B3 2.8TB  96GB, master
-   'db1067' => 0,   # D1 2.8TB 160GB, old master
+   # 'db1067' => 0,   # D1 2.8TB 160GB, old master # T162807
'db1065' => 0,   # D1 2.8TB 160GB, vslow, dump, master for 
sanitarium
'db1066' => 50,  # D1 2.8TB 160GB, api
'db1073' => 50,  # B3 2.8TB 160GB, api
'db1080' => 300, # A2 3.6TB 512GB, api
'db1083' => 500, # B1 3.6TB 512GB
-   'db1089' => 500, # C3 3.6TB 512GB
+   # 'db1089' => 500, # C3 3.6TB 512GB # T162807
'db1099:3311' => 1,   # B2 3.6TB 512GB # rc, log: s1 and s8
'db1105:3311' => 1,   # C3 3.6TB 512GB # rc, log: s1 and s2
],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4d9a20d81a7aab3993b66173f39792ad5070bccb
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Marostegui 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Marostegui 
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]: db-eqiad.php: Depool db1067, db1089

2018-01-07 Thread Marostegui (Code Review)

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

Change subject: db-eqiad.php: Depool db1067, db1089
..

db-eqiad.php: Depool db1067, db1089

Depool db1067 and db1089 to check their data

Bug: T162807
Change-Id: I4d9a20d81a7aab3993b66173f39792ad5070bccb
---
M wmf-config/db-eqiad.php
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index cf47536..cbdce9f 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -105,13 +105,13 @@
 'sectionLoads' => [
's1' => [
'db1052' => 0,   # B3 2.8TB  96GB, master
-   'db1067' => 0,   # D1 2.8TB 160GB, old master
+   # 'db1067' => 0,   # D1 2.8TB 160GB, old master # T162807
'db1065' => 0,   # D1 2.8TB 160GB, vslow, dump, master for 
sanitarium
'db1066' => 50,  # D1 2.8TB 160GB, api
'db1073' => 50,  # B3 2.8TB 160GB, api
'db1080' => 300, # A2 3.6TB 512GB, api
'db1083' => 500, # B1 3.6TB 512GB
-   'db1089' => 500, # C3 3.6TB 512GB
+   # 'db1089' => 500, # C3 3.6TB 512GB # T162807
'db1099:3311' => 1,   # B2 3.6TB 512GB # rc, log: s1 and s8
'db1105:3311' => 1,   # C3 3.6TB 512GB # rc, log: s1 and s2
],

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Configure the Swift file backend to accept X-MediaWiki- head...

2018-01-07 Thread Code Review

Gergő Tisza has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/402763 )

Change subject: Configure the Swift file backend to accept X-MediaWiki- headers.
..

Configure the Swift file backend to accept X-MediaWiki- headers.

Change-Id: I7a50f31c8a964d0225cd4483a071a137c434f6b2
Depends-On: Ic6a9e763f2e1d2e55612ec75cce921a8120f833d
---
M wmf-config/filebackend.php
1 file changed, 3 insertions(+), 2 deletions(-)


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

diff --git a/wmf-config/filebackend.php b/wmf-config/filebackend.php
index a26920b..29dc8d5 100644
--- a/wmf-config/filebackend.php
+++ b/wmf-config/filebackend.php
@@ -54,8 +54,9 @@
'cacheAuthInfo'  => true,
// When used by FileBackendMultiWrite, read from this cluster 
if it's the local one
'readAffinity'   => ( $specificDC === $wmfDatacenter ),
-   'readUsers'   => [ 
$wmfSwiftConfig[$specificDC]['thumborUser'] ],
-   'writeUsers'  => [ 
$wmfSwiftConfig[$specificDC]['thumborUser'] ]
+   'readUsers'  => [ 
$wmfSwiftConfig[$specificDC]['thumborUser'] ],
+   'writeUsers' => [ 
$wmfSwiftConfig[$specificDC]['thumborUser'] ],
+   'headerWhitelist'=> [ '/^x-mediawiki-/' ],
];
$wgFileBackends[] = [ // backend config for wiki's access to shared repo
'class'  => 'SwiftFileBackend',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7a50f31c8a964d0225cd4483a071a137c434f6b2
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add Help Page link in Special:ExpandTemplates

2018-01-07 Thread jenkins-bot (Code Review)

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

Change subject: Add Help Page link in Special:ExpandTemplates
..


Add Help Page link in Special:ExpandTemplates

Bug: T184366
Change-Id: Ice286405ec821c983020ebd6795ae429485c6d3c
---
M includes/specials/SpecialExpandTemplates.php
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Matěj Suchánek: Looks good to me, but someone else must approve
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/specials/SpecialExpandTemplates.php 
b/includes/specials/SpecialExpandTemplates.php
index 970c903..0c18a48 100644
--- a/includes/specials/SpecialExpandTemplates.php
+++ b/includes/specials/SpecialExpandTemplates.php
@@ -56,6 +56,7 @@
global $wgParser;
 
$this->setHeaders();
+   $this->addHelpLink( 'Help:ExpandTemplates' );
 
$request = $this->getRequest();
$titleStr = $request->getText( 'wpContextTitle' );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ice286405ec821c983020ebd6795ae429485c6d3c
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Jayprakash12345 <0freerunn...@gmail.com>
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Brian Wolff 
Gerrit-Reviewer: Dereckson 
Gerrit-Reviewer: Jayprakash12345 <0freerunn...@gmail.com>
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Matěj Suchánek 
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]: Add Help Page link in Special:ApiSandbox

2018-01-07 Thread jenkins-bot (Code Review)

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

Change subject: Add Help Page link in Special:ApiSandbox
..


Add Help Page link in Special:ApiSandbox

Bug: T184365
Change-Id: I61ca80947c331bbdbe59feff5f33942a7d800a51
---
M includes/specials/SpecialApiSandbox.php
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/includes/specials/SpecialApiSandbox.php 
b/includes/specials/SpecialApiSandbox.php
index e994347..2733e75 100644
--- a/includes/specials/SpecialApiSandbox.php
+++ b/includes/specials/SpecialApiSandbox.php
@@ -33,6 +33,7 @@
public function execute( $par ) {
$this->setHeaders();
$out = $this->getOutput();
+   $this->addHelpLink( 'Help:ApiSandbox' );
 
if ( !$this->getConfig()->get( 'EnableAPI' ) ) {
$out->showErrorPage( 'error', 'apisandbox-api-disabled' 
);

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I61ca80947c331bbdbe59feff5f33942a7d800a51
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Jayprakash12345 <0freerunn...@gmail.com>
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Brian Wolff 
Gerrit-Reviewer: Dereckson 
Gerrit-Reviewer: Jayprakash12345 <0freerunn...@gmail.com>
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...Cargo[master]: Changed default sort to be on more than one field

2018-01-07 Thread jenkins-bot (Code Review)

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

Change subject: Changed default sort to be on more than one field
..


Changed default sort to be on more than one field

Change-Id: Ieaedbcb5e375aae27eabe99e0ba931522e185f05
---
M includes/CargoSQLQuery.php
1 file changed, 19 insertions(+), 7 deletions(-)

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



diff --git a/includes/CargoSQLQuery.php b/includes/CargoSQLQuery.php
index 3a475bb..b41c058 100644
--- a/includes/CargoSQLQuery.php
+++ b/includes/CargoSQLQuery.php
@@ -392,13 +392,25 @@
if ( $orderByStr != '' ) {
$this->mOrderByStr = $orderByStr;
} else {
-   // By default, sort on the first field.
-   reset( $this->mAliasedFieldNames );
-   $firstField = current( $this->mAliasedFieldNames );
-   if ( strpos( $firstField, '(' ) === false && strpos( 
$firstField, '.' ) === false ) {
-   $this->mOrderByStr = 
$this->mCargoDB->addIdentifierQuotes( $firstField );
-   } else {
-   $this->mOrderByStr = $firstField;
+   // By default, sort on up to the first five fields, in
+   // the order in which they're defined. Five seems like
+   // enough to make sure everything is in the right order,
+   // no? Or should it always be all the fields?
+   $this->mOrderByStr = '';
+   $fieldNum = 1;
+   foreach ( $this->mAliasedFieldNames as $fieldName ) {
+   if ( $fieldNum > 1 ) {
+   $this->mOrderByStr .= ', ';
+   }
+   if ( strpos( $fieldName, '(' ) === false && 
strpos( $fieldName, '.' ) === false ) {
+   $this->mOrderByStr .= 
$this->mCargoDB->addIdentifierQuotes( $fieldName );
+   } else {
+   $this->mOrderByStr .= $fieldName;
+   }
+   $fieldNum++;
+   if ( $fieldNum > 5 ) {
+   break;
+   }
}
}
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ieaedbcb5e375aae27eabe99e0ba931522e185f05
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Cargo
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 
Gerrit-Reviewer: Yaron Koren 
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...Cargo[master]: Changed default sort to be on more than one field

2018-01-07 Thread Yaron Koren (Code Review)

Yaron Koren has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/402761 )

Change subject: Changed default sort to be on more than one field
..

Changed default sort to be on more than one field

Change-Id: Ieaedbcb5e375aae27eabe99e0ba931522e185f05
---
M includes/CargoSQLQuery.php
1 file changed, 19 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cargo 
refs/changes/61/402761/2

diff --git a/includes/CargoSQLQuery.php b/includes/CargoSQLQuery.php
index 3a475bb..b41c058 100644
--- a/includes/CargoSQLQuery.php
+++ b/includes/CargoSQLQuery.php
@@ -392,13 +392,25 @@
if ( $orderByStr != '' ) {
$this->mOrderByStr = $orderByStr;
} else {
-   // By default, sort on the first field.
-   reset( $this->mAliasedFieldNames );
-   $firstField = current( $this->mAliasedFieldNames );
-   if ( strpos( $firstField, '(' ) === false && strpos( 
$firstField, '.' ) === false ) {
-   $this->mOrderByStr = 
$this->mCargoDB->addIdentifierQuotes( $firstField );
-   } else {
-   $this->mOrderByStr = $firstField;
+   // By default, sort on up to the first five fields, in
+   // the order in which they're defined. Five seems like
+   // enough to make sure everything is in the right order,
+   // no? Or should it always be all the fields?
+   $this->mOrderByStr = '';
+   $fieldNum = 1;
+   foreach ( $this->mAliasedFieldNames as $fieldName ) {
+   if ( $fieldNum > 1 ) {
+   $this->mOrderByStr .= ', ';
+   }
+   if ( strpos( $fieldName, '(' ) === false && 
strpos( $fieldName, '.' ) === false ) {
+   $this->mOrderByStr .= 
$this->mCargoDB->addIdentifierQuotes( $fieldName );
+   } else {
+   $this->mOrderByStr .= $fieldName;
+   }
+   $fieldNum++;
+   if ( $fieldNum > 5 ) {
+   break;
+   }
}
}
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieaedbcb5e375aae27eabe99e0ba931522e185f05
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Cargo
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Add lazy loading images and grid layout in rows to images

2018-01-07 Thread StudentSydney (Code Review)

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

Change subject: Add lazy loading images and grid layout in rows to images
..

Add lazy loading images and grid layout in rows to images

This adds lazy loading to images from queries so they do not all load at
the same time, which is very slow and a bad user experiance for large
queries. This also imrpoves the layout and arranges the images in order.
The heights of images must be inform within a row so that they
do not staggar at the bottom.

Bug: T166216
Change-Id: Ie91a1675ab02dca9faf124cd50bcacc07aac8af7
---
M embed.html
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui 
refs/changes/60/402760/1

diff --git a/embed.html b/embed.html
index 70ea199..6667bf3 100644
--- a/embed.html
+++ b/embed.html
@@ -109,6 +109,9 @@
 .header-toolbar:hover {
opacity: 1;
 }
+.img-grid {
+   width: 95vw;
+}
 
 
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie91a1675ab02dca9faf124cd50bcacc07aac8af7
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/gui
Gerrit-Branch: master
Gerrit-Owner: StudentSydney 

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: WikimediaUI theme: Add additional 'interactions' & 'media' p...

2018-01-07 Thread VolkerE (Code Review)

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

Change subject: WikimediaUI theme: Add additional 'interactions' & 'media' pack 
icons
..

WikimediaUI theme: Add additional 'interactions' & 'media' pack icons

Adding additional icons from refined WikimediaUI collection:
- 'checkAll' to 'interactions' pack,
- 'exitFullscreen',
- 'imageBroken' and
- 'pause' to 'media' pack

Bug: T177432
Depends-on: I35fee09dbeb4ac5da7de859c15a1506b5fa5ac6d
Change-Id: Ib1a3f01fab3437a15e080262ad99ff75a718fa73
---
M demos/pages/icons.js
M src/themes/wikimediaui/icons-interactions.json
M src/themes/wikimediaui/icons-media.json
A src/themes/wikimediaui/images/icons/checkAll.svg
A src/themes/wikimediaui/images/icons/exitFullscreen.svg
A src/themes/wikimediaui/images/icons/imageBroken.svg
A src/themes/wikimediaui/images/icons/pause.svg
7 files changed, 36 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/59/402759/1

diff --git a/demos/pages/icons.js b/demos/pages/icons.js
index 4551f41..dc79d24 100644
--- a/demos/pages/icons.js
+++ b/demos/pages/icons.js
@@ -51,6 +51,7 @@
'browser',
'cancel',
'check',
+   'checkAll',
'clear',
'clock',
'close',
@@ -150,11 +151,14 @@
],
media: [
'fullScreen',
+   'exitFullscreen',
'image',
'imageAdd',
'imageLock',
'imageGallery',
+   'imageBroken',
'play',
+   'pause',
'stop'
],
location: [
diff --git a/src/themes/wikimediaui/icons-interactions.json 
b/src/themes/wikimediaui/icons-interactions.json
index 4d519a5..3b9b5d5 100644
--- a/src/themes/wikimediaui/icons-interactions.json
+++ b/src/themes/wikimediaui/icons-interactions.json
@@ -27,6 +27,7 @@
} },
"cancel": { "file": "images/icons/cancel.svg", "variants": [ 
"destructive" ] },
"check": { "file": "images/icons/check.svg", "variants": [ 
"destructive" ] },
+   "checkAll": { "file": "images/icons/checkAll.svg" },
"clear": { "file": "images/icons/clear.svg" },
"clock": { "file": "images/icons/clock.svg" },
"close": { "file": "images/icons/close.svg" },
diff --git a/src/themes/wikimediaui/icons-media.json 
b/src/themes/wikimediaui/icons-media.json
index 02f2928..95997de 100644
--- a/src/themes/wikimediaui/icons-media.json
+++ b/src/themes/wikimediaui/icons-media.json
@@ -19,6 +19,9 @@
}
},
"images": {
+   "exitFullscreen": {
+   "file": "images/icons/exitFullscreen.svg"
+   },
"fullScreen": { "file": "images/icons/fullScreen.svg" },
"image": {
"file": "images/icons/image.svg"
@@ -28,6 +31,9 @@
"ltr": "images/icons/imageAdd-ltr.svg",
"rtl": "images/icons/imageAdd-rtl.svg"
}
+   },
+   "imageBroken": {
+   "file": "images/icons/imageBroken.svg"
},
"imageLock": {
"file": {
@@ -41,6 +47,9 @@
"camera": {
"file": "images/icons/camera.svg"
},
+   "pause": {
+   "file": "images/icons/pause.svg"
+   },
"play": {
"file": "images/icons/play.svg"
},
diff --git a/src/themes/wikimediaui/images/icons/checkAll.svg 
b/src/themes/wikimediaui/images/icons/checkAll.svg
new file mode 100644
index 000..02eb568
--- /dev/null
+++ b/src/themes/wikimediaui/images/icons/checkAll.svg
@@ -0,0 +1,5 @@
+
+http://www.w3.org/2000/svg; width="20" height="20" viewBox="0 0 20 
20">
+   check all
+   
+
\ No newline at end of file
diff --git a/src/themes/wikimediaui/images/icons/exitFullscreen.svg 
b/src/themes/wikimediaui/images/icons/exitFullscreen.svg
new file mode 100644
index 000..c967cf1
--- /dev/null
+++ b/src/themes/wikimediaui/images/icons/exitFullscreen.svg
@@ -0,0 +1,5 @@
+
+http://www.w3.org/2000/svg; width="20" height="20" viewBox="0 0 20 
20">
+   exit fullscreen
+   
+
diff --git a/src/themes/wikimediaui/images/icons/imageBroken.svg 
b/src/themes/wikimediaui/images/icons/imageBroken.svg
new file mode

[MediaWiki-commits] [Gerrit] mediawiki...Score[master]: Migrate TiMidity++ to fluidsynth

2018-01-07 Thread jenkins-bot (Code Review)

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

Change subject: Migrate TiMidity++ to fluidsynth
..


Migrate TiMidity++ to fluidsynth

This patch adds support for a seamless migration to fluidsynth,
as timidty will be deprecated soon due to it's unmaintained
package status in the Debian repository.

Also, keep in mind that fluidsynth now requires a path to
the soundfont file, while timidity had it pre-configured.

Bug: T181897
Change-Id: Idaf062f060cca823bdf11b6b0e846540eb588945
---
M README
M extension.json
M i18n/en.json
M i18n/qqq.json
M includes/Score.php
5 files changed, 43 insertions(+), 17 deletions(-)

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



diff --git a/README b/README
index d3eae4c..d12f9fb 100644
--- a/README
+++ b/README
@@ -41,8 +41,11 @@
$wgScoreLilyPond = '/path/to/your/lilypond/executable'; /* required */
$wgScoreAbc2Ly = '/path/to/your/abc2ly/executable'; /* if you want ABC to
   LilyPond conversion 
*/
-   $wgScoreTimidty = '/path/to/your/timidty/executable'; /* if you want MIDI to
-Vorbis conversion 
*/
+   $wgScoreFluidsynth = '/path/to/your/fluidsynth/executable'; /* if you want 
MIDI to
+  Vorbis 
conversion */
+   $wgScoreSoundfont = '/path/to/your/soundfont/file'; /* required for 
Fluidsynth */
+   $wgScoreTimidity = '/path/to/your/timidity/executable'; /* fallback when 
Fluidsynth
+  is not installed 
*/
$wgScoreTrim = true; /* Set to false if you don't want score trimming */
$wgScoreSafeMode = false; /* Set to true if the Lilypond executable is
 running in a Firejail or equivalent */
diff --git a/extension.json b/extension.json
index 11e1080..7dc5b2c 100644
--- a/extension.json
+++ b/extension.json
@@ -87,6 +87,8 @@
"ScoreTrim": null,
"ScoreLilyPond": "/usr/bin/lilypond",
"ScoreAbc2Ly": "/usr/bin/abc2ly",
+   "ScoreFluidsynth": "/usr/bin/fluidsynth",
+   "ScoreSoundfont": "/usr/share/sounds/sf2/FluidR3_GM.sf2",
"ScoreTimidity": "/usr/bin/timidity",
"ScoreSafeMode": true,
"ScorePath": false,
diff --git a/i18n/en.json b/i18n/en.json
index 7c31ccc..3ec220c 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -32,7 +32,8 @@
"score-page": "Page $1",
"score-pregreplaceerr": "PCRE regular expression replacement failed",
"score-readerr": "Unable to read file $1.",
-   "score-timiditynotexecutable": "TiMidity++ could not be executed: $1 is 
not an executable file. Make sure $wgScoreTimidity is set 
correctly.",
+   "score-fallbacknotexecutable": "TiMidity++ could not be executed as 
fallback: $1 is not an executable file. Make sure $wgScoreTimidity 
or $wgScoreFluidsynth is set correctly.",
+   "score-soundfontnotexists": "Soundfont could not be found: $1 does not 
exists. Make sure $wgScoreSoundfont is set correctly.",
"score-renameerr": "Error moving score files to upload directory.",
"score-trimerr": "Image could not be trimmed:\n$1\nSet 
$wgScoreTrim=false if this problem persists.",
"score-versionerr": "Unable to obtain LilyPond version:\n$1",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 7072caf..d2593ad 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -38,7 +38,8 @@
"score-page": "The word \"Page\" as used in pagination. Parameters:\n* 
$1 - the page number\n{{Identical|Page}}",
"score-pregreplaceerr": "Displayed if a PCRE regular expression 
replacement failed.",
"score-readerr": "Displayed if the extension could not read a file. $1 
is the path to the file that could not be read.",
-   "score-timiditynotexecutable": "Displayed if TiMidity++ could not be 
executed. $1 is the path to the TiMidity++ binary.",
+   "score-fallbacknotexecutable": "Displayed if TiMidity++ could not be 
executed as fallback. $1 is the path to the TiMidity++ binary.",
+   "score-soundfontnotexists": "Displayed if soundfont could not be found. 
$1 is the path to the soundfont file.",
"score-renameerr": "Displayed if moving the resultant files from the 
working environment to the upload directory fails.",
"score-trimerr": "Displayed if the extension failed to trim an output 
image. $1 is the error (generally big block of text in a pre tag)",
"score-versionerr": "Displayed if the extension failed to obtain the 
version string of LilyPond. $1 is the LilyPond stdout output generated by the 
attempt.",
diff --git a/includes/Score.php b/includes/Score.php
index 9010605..dc90818 100644
--- a/includes/Score.php
+++ b/includes/Score.php
@@

[MediaWiki-commits] [Gerrit] operations/puppet[production]: swift: Fix checks on drive/filesystem titles to allow for la...

2018-01-07 Thread Alex Monk (Code Review)

Alex Monk has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/402758 )

Change subject: swift: Fix checks on drive/filesystem titles to allow for labs 
ones
..

swift: Fix checks on drive/filesystem titles to allow for labs ones

Added support for the lv- prefix used on deployment-ms-be0[34] machines in
deployment-prep.

Bug: T184236
Change-Id: I1eb608cf96e2e79a84772faaf7bedae6c0ecfb96
---
M modules/swift/manifests/init_device.pp
M modules/swift/manifests/mount_filesystem.pp
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/58/402758/1

diff --git a/modules/swift/manifests/init_device.pp 
b/modules/swift/manifests/init_device.pp
index eaca102..8c72c66 100644
--- a/modules/swift/manifests/init_device.pp
+++ b/modules/swift/manifests/init_device.pp
@@ -1,5 +1,5 @@
 define swift::init_device($partition_nr='1') {
-if ($title !~ /^([hvs]d[a-z]+|md[0-9]+)$/) {
+if ($title !~ /^([hvs]d[a-z]+|md[0-9]+|lv\-[a-z]+)$/) {
 fail("Invalid name ${title} for swift::init_device")
 }
 
diff --git a/modules/swift/manifests/mount_filesystem.pp 
b/modules/swift/manifests/mount_filesystem.pp
index 1a7a86e..38f478d 100644
--- a/modules/swift/manifests/mount_filesystem.pp
+++ b/modules/swift/manifests/mount_filesystem.pp
@@ -1,7 +1,7 @@
 define swift::mount_filesystem (
 $mount_base = '/srv/swift-storage',
 ){
-if ($title !~ /^[hvs]d[a-z]+[0-9]+$/) {
+if ($title !~ /^([hvs]d|lv\-)[a-z]+[0-9]+$/) {
 fail("Invalid name ${title} for swift::mount_filesystem")
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1eb608cf96e2e79a84772faaf7bedae6c0ecfb96
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: WikimediaUI theme: Align size and position of overhauled icons

2018-01-07 Thread VolkerE (Code Review)

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

Change subject: WikimediaUI theme: Align size and position of overhauled icons
..

WikimediaUI theme: Align size and position of overhauled icons

Bug: T177432
Change-Id: I154f638abd1f552018a3ef9d046627b88cfe9a13
---
M src/themes/wikimediaui/common.less
M src/themes/wikimediaui/elements.less
M src/themes/wikimediaui/widgets.less
3 files changed, 8 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/56/402756/1

diff --git a/src/themes/wikimediaui/common.less 
b/src/themes/wikimediaui/common.less
index a904fec..c69de80 100644
--- a/src/themes/wikimediaui/common.less
+++ b/src/themes/wikimediaui/common.less
@@ -64,14 +64,14 @@
 @size-fieldlayout-help-icon: 22 / @oo-ui-font-size-browser / 
@oo-ui-font-size-base;
 @size-tool: 40 / @oo-ui-font-size-browser / @oo-ui-font-size-base; // equals 
`3.125em`≈`40px`
 
-@start-framed-icon-only: 7 / @oo-ui-font-size-browser / @oo-ui-font-size-base; 
// equals `0.547em`≈`7px`; HACK: We have to break with 
`@padding-start-input-text-icon` to perfectly center in `@min-width-button-base`
+@start-framed-icon-only: 10 / @oo-ui-font-size-browser / 
@oo-ui-font-size-base; // equals `0.547em`≈`7px`; HACK: We have to break with 
`@padding-start-input-text-icon` to perfectly center in `@min-width-button-base`
 @start-framed-icon-only-numberinput: 6 / @oo-ui-font-size-browser / 
@oo-ui-font-size-base; // equals `0.46875em`≈`6px`
 @start-framed-indicator-only: 13 / @oo-ui-font-size-browser / 
@oo-ui-font-size-base; // equals `1.09375em`≈`14px`; `@size-indicator + 2 * 
@border-width-base`
 @start-framed-square-indicator-only: 9 / @oo-ui-font-size-browser / 
@oo-ui-font-size-base; // equals `0.703125em`≈`9px`
 @start-frameless: -@start-frameless-icon;
 @start-frameless-icon: 3 / @oo-ui-font-size-browser / @oo-ui-font-size-base;
 @start-tagmultiselect-input: 5 / @oo-ui-font-size-browser / 
@oo-ui-font-size-base; // equals `0.390625em`≈`5px`; 
`@padding-horizontal-tagitem` + `@border-width-base`
-@start-tool-icon-indicator: 8 / @oo-ui-font-size-browser / 
@oo-ui-font-size-base;
+@start-tool-icon-indicator: 12 / @oo-ui-font-size-browser / 
@oo-ui-font-size-base;
 @start-toolbar-narrow-tool-icon: 4 / @oo-ui-font-size-browser / 
@oo-ui-font-size-base;
 @end-tagitem: 4 / @oo-ui-font-size-browser / @oo-ui-font-size-base; // equals 
`0.3125em`≈`4px`
 
@@ -133,7 +133,6 @@
 @padding-bottom-base: 7 / @oo-ui-font-size-browser / @oo-ui-font-size-base; // 
equals `0.547em`≈`7px`
 @padding-bottom-menu: 8 / @oo-ui-font-size-browser / @oo-ui-font-size-base;
 @padding-bottom-tool-label: 12 / @oo-ui-font-size-browser / 
@oo-ui-font-size-base;
-@padding-start-input-text-icon: 6 / @oo-ui-font-size-browser / 
@oo-ui-font-size-base; // As long as we have whitespace in icon canvas, we need 
reduced `padding-left`.
 @padding-start-icon: @size-icon;
 @padding-start-icon-only: 26 / @oo-ui-font-size-browser / 
@oo-ui-font-size-base; // equals `2.03125em`≈`26px`; @min-width-button-base - 
@padding-horizontal-base - 2 * @border-width-base;
 @padding-start-fieldset-header-iconized: 26 / @oo-ui-font-size-browser / ( 
@oo-ui-font-size-base * @font-size-fieldset-header );
diff --git a/src/themes/wikimediaui/elements.less 
b/src/themes/wikimediaui/elements.less
index 585adef..946b7dc 100644
--- a/src/themes/wikimediaui/elements.less
+++ b/src/themes/wikimediaui/elements.less
@@ -271,7 +271,7 @@
padding-left: 
@padding-start-input-text-icon-label;
 
> .oo-ui-iconElement-icon {
-   left: 
@padding-start-input-text-icon;
+   //left: 
@padding-horizontal-input-text;
}
}
}
diff --git a/src/themes/wikimediaui/widgets.less 
b/src/themes/wikimediaui/widgets.less
index 7348fbb..810cd2b 100644
--- a/src/themes/wikimediaui/widgets.less
+++ b/src/themes/wikimediaui/widgets.less
@@ -265,7 +265,7 @@
padding-left: @padding-start-input-text-icon-label;
 
> .oo-ui-iconElement-icon {
-   left: @padding-start-input-text-icon;
+   left: @padding-horizontal-input-text;
}
}
 
@@ -570,7 +570,7 @@
line-height: @line-height-reset;
 
.oo-ui-iconElement-icon {
-   left: @padding-start-input-text-icon;
+   left: @padding-horizontal-input-text;
}
 
.oo-ui-indicatorElement-indicator {
@@ -1364,7 +1364,7 @@
> .oo-ui-iconElement-icon {
display: none;
top: -@border-width-base; // Address `border-top` of 
parent element
-

[MediaWiki-commits] [Gerrit] oojs/ui[master]: WikimediaUI theme: Align refined WikimediaUI icons in size a...

2018-01-07 Thread VolkerE (Code Review)

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

Change subject: WikimediaUI theme: Align refined WikimediaUI icons in size and 
position
..

WikimediaUI theme: Align refined WikimediaUI icons in size and position

With this and the depending parent change, the quirks of taking
canvas whitespace into account are greatly tamed,
enabling us to further fine-tune positioning to align to
design templates.
Decreasing base icon size – equivalent to missing canvas whitespace –
and slightly changing a few special cases, like
NumberInputWidget and checkboxes' checkmarks altogether
reduces CSS code needed for same visual appearance.

Bug: T177432
Depends-on: I35fee09dbeb4ac5da7de859c15a1506b5fa5ac6d
Change-Id: If5722df41e75a1d4bdf8afc83c81670d1be3a1b8
---
M src/themes/wikimediaui/common.less
M src/themes/wikimediaui/elements.less
M src/themes/wikimediaui/layouts.less
M src/themes/wikimediaui/widgets.less
4 files changed, 18 insertions(+), 26 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/57/402757/1

diff --git a/src/themes/wikimediaui/common.less 
b/src/themes/wikimediaui/common.less
index c69de80..7e02b06 100644
--- a/src/themes/wikimediaui/common.less
+++ b/src/themes/wikimediaui/common.less
@@ -44,10 +44,10 @@
 
 @min-size-icon: 16px; // values used for `min-height` are defined in `px`, see 
T130691
 @min-size-indicator: 12px;
-@min-size-tagitem-close: 20px;
 @min-width-button-base: 40 / @oo-ui-font-size-browser / @oo-ui-font-size-base; 
// equals `3.125em`≈`40px` at base `font-size: 12.8px`
 @min-width-button-combo-widget: @size-base;
 @min-width-icon-numberinput: 20px;
+@min-width-tagitem-close: 14px;
 @min-height-widget-base: @size-base;
 @min-height-toggleswitch: 26px; // equals `16px` @size-toggleswitch-grip-min + 
4px*2 distance top/bottom + 1px*2 border top/bottom
 @max-width-base: 50em;
@@ -55,21 +55,23 @@
 
 @size-anchor: 9px;
 @size-button-base: @size-base;
+@size-button-tagitem-close: 20 / @oo-ui-font-size-browser / 
@oo-ui-font-size-base; // equals `1.5625em`≈`20px`
 @size-icon: 16 / @oo-ui-font-size-browser / @oo-ui-font-size-base; // equals 
`1.875em`≈`24px`
-@size-icon-numberinput: 20 / @oo-ui-font-size-browser / @oo-ui-font-size-base; 
// equals `1.5625em`≈`20px`
-@size-icon-tagitem-close: 20 / @oo-ui-font-size-browser / 
@oo-ui-font-size-base;
+@size-icon-tagitem-close: 14 / @oo-ui-font-size-browser / 
@oo-ui-font-size-base; // equals `1.09375em`≈`14px`
+@size-icon-checkmark: 14 / @oo-ui-font-size-browser / @oo-ui-font-size-base;
 @size-indicator: 12 / @oo-ui-font-size-browser / @oo-ui-font-size-base; // 
equals `0.9375em`≈`12px`
 @size-toggleswitch-grip-min: 16px;
 @size-dialog-bar-top: 44 / @oo-ui-font-size-browser / @oo-ui-font-size-base; 
// equals `3.4375em`≈`44px`
 @size-fieldlayout-help-icon: 22 / @oo-ui-font-size-browser / 
@oo-ui-font-size-base;
 @size-tool: 40 / @oo-ui-font-size-browser / @oo-ui-font-size-base; // equals 
`3.125em`≈`40px`
 
-@start-framed-icon-only: 10 / @oo-ui-font-size-browser / 
@oo-ui-font-size-base; // equals `0.547em`≈`7px`; HACK: We have to break with 
`@padding-start-input-text-icon` to perfectly center in `@min-width-button-base`
-@start-framed-icon-only-numberinput: 6 / @oo-ui-font-size-browser / 
@oo-ui-font-size-base; // equals `0.46875em`≈`6px`
+@start-framed-icon-only: 11 / @oo-ui-font-size-browser / 
@oo-ui-font-size-base; // equals `0.859375em`≈`11px`; HACK: We have to break 
with `@padding-start-input-text-icon` to perfectly center in 
`@min-width-button-base`
+@start-framed-icon-only-numberinput: 7 / @oo-ui-font-size-browser / 
@oo-ui-font-size-base; // equals `0.546875em`≈`7px`
 @start-framed-indicator-only: 13 / @oo-ui-font-size-browser / 
@oo-ui-font-size-base; // equals `1.09375em`≈`14px`; `@size-indicator + 2 * 
@border-width-base`
 @start-framed-square-indicator-only: 9 / @oo-ui-font-size-browser / 
@oo-ui-font-size-base; // equals `0.703125em`≈`9px`
 @start-frameless: -@start-frameless-icon;
-@start-frameless-icon: 3 / @oo-ui-font-size-browser / @oo-ui-font-size-base;
+@start-frameless-icon: 7 / @oo-ui-font-size-browser / @oo-ui-font-size-base;
+@start-fieldlayout-help-icon: 3 / @oo-ui-font-size-browser / 
@oo-ui-font-size-base; // equals `0.234375em`≈`3px`
 @start-tagmultiselect-input: 5 / @oo-ui-font-size-browser / 
@oo-ui-font-size-base; // equals `0.390625em`≈`5px`; 
`@padding-horizontal-tagitem` + `@border-width-base`
 @start-tool-icon-indicator: 12 / @oo-ui-font-size-browser / 
@oo-ui-font-size-base;
 @start-toolbar-narrow-tool-icon: 4 / @oo-ui-font-size-browser / 
@oo-ui-font-size-base;
diff --git a/src/themes/wikimediaui/elements.less 
b/src/themes/wikimediaui/elements.less
index 946b7dc..4a86bc4 100644
--- a/src/themes/wikimediaui/elements.less
+++ b/src/themes/wikimediaui/elements.less
@@ -155,7 +155,7 @@
}
 
&.oo-ui-iconElement.oo-ui-labelElement

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Added Tests for ContentModelLogFormatter

2018-01-07 Thread jenkins-bot (Code Review)

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

Change subject: Added Tests for ContentModelLogFormatter
..


Added Tests for ContentModelLogFormatter

Bug: T183900
Change-Id: I812b477eb45e19a06e5c18bc30da731f4af8cc8f
---
A tests/phpunit/includes/logging/ContentModelLogFormatterTest.php
1 file changed, 60 insertions(+), 0 deletions(-)

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



diff --git a/tests/phpunit/includes/logging/ContentModelLogFormatterTest.php 
b/tests/phpunit/includes/logging/ContentModelLogFormatterTest.php
new file mode 100644
index 000..17e5411
--- /dev/null
+++ b/tests/phpunit/includes/logging/ContentModelLogFormatterTest.php
@@ -0,0 +1,60 @@
+ 'contentmodel',
+   'action' => 'new',
+   'comment' => 'new content model 
comment',
+   'namespace' => NS_MAIN,
+   'title' => 'ContentModelPage',
+   'params' => [
+   '5::newModel' => 
'testcontentmodel',
+   ],
+   ],
+   [
+   'text' => 'User created the page 
ContentModelPage ' .
+   'using a non-default content 
model ' .
+   '"testcontentmodel"',
+   'api' => [
+   'newModel' => 
'testcontentmodel',
+   ],
+   ],
+   ],
+   [
+   [
+   'type' => 'contentmodel',
+   'action' => 'change',
+   'comment' => 'change content model 
comment',
+   'namespace' => NS_MAIN,
+   'title' => 'ContentModelPage',
+   'params' => [
+   '4::oldmodel' => 'wikitext',
+   '5::newModel' => 
'testcontentmodel',
+   ],
+   ],
+   [
+   'text' => 'User changed the content 
model of the page ' .
+   'ContentModelPage from 
"wikitext" to ' .
+   '"testcontentmodel"',
+   'api' => [
+   'oldmodel' => 'wikitext',
+   'newModel' => 
'testcontentmodel',
+   ],
+   ],
+   ],
+   ];
+   }
+
+   /**
+* @dataProvider provideContentModelLogDatabaseRows
+*/
+   public function testContentModelLogDatabaseRows( $row, $extra ) {
+   $this->doTestLogFormatter( $row, $extra );
+   }
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I812b477eb45e19a06e5c18bc30da731f4af8cc8f
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Ryan10145 
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/core[master]: Added Tests for ContentModelLogFormatter

2018-01-07 Thread Ryan10145 (Code Review)

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

Change subject: Added Tests for ContentModelLogFormatter
..

Added Tests for ContentModelLogFormatter

Bug: T183900
Change-Id: I812b477eb45e19a06e5c18bc30da731f4af8cc8f
---
A tests/phpunit/includes/logging/ContentModelLogFormatterTest.php
1 file changed, 68 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/55/402755/1

diff --git a/tests/phpunit/includes/logging/ContentModelLogFormatterTest.php 
b/tests/phpunit/includes/logging/ContentModelLogFormatterTest.php
new file mode 100644
index 000..a6fc91a
--- /dev/null
+++ b/tests/phpunit/includes/logging/ContentModelLogFormatterTest.php
@@ -0,0 +1,68 @@
+ 'contentmodel',
+   'action' => 'new',
+   'comment' => 'new content model 
comment',
+   'namespace' => NS_MAIN,
+   'title' => 'ContentModelPage',
+   'params' => [
+   '5::newModel' => 
'testcontentmodel',
+   ],
+   ],
+   [
+   'text' => 'User created the page 
ContentModelPage using a non-default content model "testcontentmodel"',
+   'api' => [
+   'newModel' => 
'testcontentmodel',
+   ],
+   ],
+   ],
+   ];
+   }
+
+   /**
+* @dataProvider provideNewLogDatabaseRows
+*/
+   public function testNewLogDatabaseRows( $row, $extra ) {
+   $this->doTestLogFormatter( $row, $extra );
+   }
+
+   public static function provideChangeLogDatabaseRows() {
+   return [
+   [
+   [
+   'type' => 'contentmodel',
+   'action' => 'change',
+   'comment' => 'change content model 
comment',
+   'namespace' => NS_MAIN,
+   'title' => 'ContentModelPage',
+   'params' => [
+   '4::oldmodel' => 'wikitext',
+   '5::newModel' => 
'testcontentmodel',
+   ],
+   ],
+   [
+   'text' => 'User changed the content 
model of the page ContentModelPage from "wikitext" to "testcontentmodel"',
+   'api' => [
+   'oldmodel' => 'wikitext',
+   'newModel' => 
'testcontentmodel',
+   ],
+   ],
+   ],
+   ];
+   }
+
+   /**
+* @dataProvider provideChangeLogDatabaseRows
+*/
+   public function testChangeLogDatabaseRows( $row, $extra ) {
+   $this->doTestLogFormatter( $row, $extra );
+   }
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I812b477eb45e19a06e5c18bc30da731f4af8cc8f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Ryan10145 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: WIP: Update gerrit login display

2018-01-07 Thread Paladox (Code Review)

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

Change subject: WIP: Update gerrit login display
..

WIP: Update gerrit login display

This adds a new fancy login UI.

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/65/402665/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If18ceb87e7df7b2dd72aca834663467bec840496
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Paladox 
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...SocialProfile[master]: Introduce new UserProfileGetProfileHeaderLinks hook in UserP...

2018-01-07 Thread jenkins-bot (Code Review)

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

Change subject: Introduce new UserProfileGetProfileHeaderLinks hook in 
UserProfilePage::getProfileHeader()
..


Introduce new UserProfileGetProfileHeaderLinks hook in 
UserProfilePage::getProfileHeader()

This allows extensions such as Challenge to add their own links to the user
profile header.

Also cleaned up the code slightly by putting the profile top links into an
array, which this hook is allowed to manipulate, instead of having to muck
with raw HTML (the $output variable).

Bug: T152930
Change-Id: I0b269cb73602f0f55fa2474cadf9a7f40e4352cc
---
M UserProfile/UserProfilePage.php
1 file changed, 60 insertions(+), 35 deletions(-)

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



diff --git a/UserProfile/UserProfilePage.php b/UserProfile/UserProfilePage.php
index 043180f..ef03e13 100644
--- a/UserProfile/UserProfilePage.php
+++ b/UserProfile/UserProfilePage.php
@@ -93,7 +93,7 @@
}
 
$out->addHTML( '' );
-   $out->addHTML( $this->getProfileTop( $this->user_id, 
$this->user_name ) );
+   $out->addHTML( $this->getProfileHeader( $this->user_id, 
$this->user_name ) );
$out->addHTML( '' );
 
// User does not want social profile for User:user_name, so we 
just
@@ -919,7 +919,7 @@
 * @param $user_id Integer: user ID
 * @param $user_name String: user name
 */
-   function getProfileTop( $user_id, $user_name ) {
+   function getProfileHeader( $user_id, $user_name ) {
global $wgUserLevels;
 
$context = $this->getContext();
@@ -963,6 +963,8 @@
wfDebug( 'profile type: ' . $profile_data['user_page_type'] . 
"\n" );
$output = '';
 
+   // Show the link for changing user page type for the user whose 
page
+   // it is
if ( $this->isOwner() ) {
$toggle_title = SpecialPage::getTitleFor( 
'ToggleUserPage' );
// Cast it to an int because PHP is stupid.
@@ -1009,65 +1011,88 @@

';
 
+   $profileLinks = [];
if ( $this->isOwner() ) {
-   $output .= $language->pipeList( array(
-   '' . wfMessage( 'user-edit-profile' 
)->escaped() . '',
-   '' . wfMessage( 'user-upload-avatar' 
)->escaped() . '',
-   '' . wfMessage( 'user-watchlist' )->escaped() . 
'',
-   ''
-   ) );
+   $profileLinks['user-edit-profile'] =
+   '' . wfMessage( 'user-edit-profile' 
)->escaped() . '';
+   $profileLinks['user-upload-avatar'] =
+   '' . wfMessage( 'user-upload-avatar' 
)->escaped() . '';
+   $profileLinks['user-watchlist'] =
+   '' . wfMessage( 'user-watchlist' )->escaped() . 
'';
} elseif ( $userContext->isLoggedIn() ) {
if ( $relationship == false ) {
-   $output .= $language->pipeList( array(
-   '' . wfMessage( 'user-add-friend' )->escaped() . '',
-   '' . wfMessage( 'user-add-foe' )->escaped() . '',
-   ''
-   ) );
+   $profileLinks['user-add-friend'] =
+   '' . wfMessage( 'user-add-friend' )->escaped() . '';
+
+   $profileLinks['user-add-foe'] =
+   '' . wfMessage( 'user-add-foe' )->escaped() . '';
} else {
if ( $relationship == 1 ) {
-   $output .= $language->pipeList( array(
-   '' . wfMessage( 
'user-remove-friend' )->escaped() . '',
-   ''
-   ) );
+   $profileLinks['user-remove-friend'] =
+   '' . wfMessage( 
'user-remove-friend' )->escaped() . '';
}
if ( $relationship == 2 ) {
-   $output .= $language->pipeList( array(
-   '' . wfMessage( 
'user-remove-foe' )->escaped() . '',
-   ''
-   ) );
+   $profileLinks['user-remove-foe'] =
+

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Updating interwiki cache

2018-01-07 Thread jenkins-bot (Code Review)

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

Change subject: Updating interwiki cache
..


Updating interwiki cache

Change-Id: Ia06c50cc5fb576f46e393b6578ef09452f69a69a
---
M wmf-config/interwiki.php
1 file changed, 2 insertions(+), 52 deletions(-)

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



diff --git a/wmf-config/interwiki.php b/wmf-config/interwiki.php
index f437998..d3e6da2 100644
--- a/wmf-config/interwiki.php
+++ b/wmf-config/interwiki.php
@@ -1,5 +1,5 @@
  '0 https://www.acronymfinder.com/$1.html',
'__global:advisory' => '1 https://advisory.wikimedia.org/wiki/$1',
@@ -3446,33 +3446,6 @@
'alswiki:chapter' => '1 https://als.wikimedia.org/wiki/$1',
'alswiki:v' => '1 https://als.wikiversity.org/wiki/$1',
'alswiki:voy' => '1 https://als.wikivoyage.org/wiki/$1',
-   '__sites:alswikibooks' => 'wikibooks',
-   'alswikibooks:w' => '1 https://als.wikipedia.org/wiki/$1',
-   'alswikibooks:wikt' => '1 https://als.wiktionary.org/wiki/$1',
-   'alswikibooks:q' => '1 https://als.wikiquote.org/wiki/$1',
-   'alswikibooks:n' => '1 https://als.wikinews.org/wiki/$1',
-   'alswikibooks:s' => '1 https://als.wikisource.org/wiki/$1',
-   'alswikibooks:chapter' => '1 https://als.wikimedia.org/wiki/$1',
-   'alswikibooks:v' => '1 https://als.wikiversity.org/wiki/$1',
-   'alswikibooks:voy' => '1 https://als.wikivoyage.org/wiki/$1',
-   '__sites:alswikiquote' => 'wikiquote',
-   'alswikiquote:w' => '1 https://als.wikipedia.org/wiki/$1',
-   'alswikiquote:wikt' => '1 https://als.wiktionary.org/wiki/$1',
-   'alswikiquote:b' => '1 https://als.wikibooks.org/wiki/$1',
-   'alswikiquote:n' => '1 https://als.wikinews.org/wiki/$1',
-   'alswikiquote:s' => '1 https://als.wikisource.org/wiki/$1',
-   'alswikiquote:chapter' => '1 https://als.wikimedia.org/wiki/$1',
-   'alswikiquote:v' => '1 https://als.wikiversity.org/wiki/$1',
-   'alswikiquote:voy' => '1 https://als.wikivoyage.org/wiki/$1',
-   '__sites:alswiktionary' => 'wiktionary',
-   'alswiktionary:w' => '1 https://als.wikipedia.org/wiki/$1',
-   'alswiktionary:q' => '1 https://als.wikiquote.org/wiki/$1',
-   'alswiktionary:b' => '1 https://als.wikibooks.org/wiki/$1',
-   'alswiktionary:n' => '1 https://als.wikinews.org/wiki/$1',
-   'alswiktionary:s' => '1 https://als.wikisource.org/wiki/$1',
-   'alswiktionary:chapter' => '1 https://als.wikimedia.org/wiki/$1',
-   'alswiktionary:v' => '1 https://als.wikiversity.org/wiki/$1',
-   'alswiktionary:voy' => '1 https://als.wikivoyage.org/wiki/$1',
'__sites:amwiki' => 'wiki',
'amwiki:wikt' => '1 https://am.wiktionary.org/wiki/$1',
'amwiki:q' => '1 https://am.wikiquote.org/wiki/$1',
@@ -7993,24 +7966,6 @@
'movementroleswiki:chapter' => '1 https://en.wikimedia.org/wiki/$1',
'movementroleswiki:v' => '1 https://en.wikiversity.org/wiki/$1',
'movementroleswiki:voy' => '1 https://en.wikivoyage.org/wiki/$1',
-   '__sites:mowiki' => 'wiki',
-   'mowiki:wikt' => '1 https://mo.wiktionary.org/wiki/$1',
-   'mowiki:q' => '1 https://mo.wikiquote.org/wiki/$1',
-   'mowiki:b' => '1 https://mo.wikibooks.org/wiki/$1',
-   'mowiki:n' => '1 https://mo.wikinews.org/wiki/$1',
-   'mowiki:s' => '1 https://mo.wikisource.org/wiki/$1',
-   'mowiki:chapter' => '1 https://mo.wikimedia.org/wiki/$1',
-   'mowiki:v' => '1 https://mo.wikiversity.org/wiki/$1',
-   'mowiki:voy' => '1 https://mo.wikivoyage.org/wiki/$1',
-   '__sites:mowiktionary' => 'wiktionary',
-   'mowiktionary:w' => '1 https://mo.wikipedia.org/wiki/$1',
-   'mowiktionary:q' => '1 https://mo.wikiquote.org/wiki/$1',
-   'mowiktionary:b' => '1 https://mo.wikibooks.org/wiki/$1',
-   'mowiktionary:n' => '1 https://mo.wikinews.org/wiki/$1',
-   'mowiktionary:s' => '1 https://mo.wikisource.org/wiki/$1',
-   'mowiktionary:chapter' => '1 https://mo.wikimedia.org/wiki/$1',
-   'mowiktionary:v' => '1 https://mo.wikiversity.org/wiki/$1',
-   'mowiktionary:voy' => '1 https://mo.wikivoyage.org/wiki/$1',
'__sites:mrjwiki' => 'wiki',
'mrjwiki:wikt' => '1 https://mrj.wiktionary.org/wiki/$1',
'mrjwiki:q' => '1 https://mrj.wikiquote.org/wiki/$1',
@@ -11626,7 +11581,7 @@
'__list:_wikimedia' => 'aa ab ace ady af ak als am an ang ar arc arz as 
ast atj av ay az azb ba bar bat-smg bcl be be-x-old bg bh bi bjn bm bn bo bpy 
br bs bug bxr ca cbk-zam cdo ce ceb ch cho chr chy ckb co cr crh cs csb cu cv 
cy da de din diq dsb dty dv dz ee el eml en eo es et eu ext fa ff fi fiu-vro fj 
fo fr frp frr fur fy ga gag gan gd gl glk gn gom got gu gv ha hak haw he hi hif 
ho hr hsb ht hu hy hz ia id ie ig ii ik ilo io is it iu ja jam jbo jv ka kaa 
kab kbd kbp kg ki kj kk kl km kn ko koi kr

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Updating interwiki cache

2018-01-07 Thread Chad (Code Review)

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

Change subject: Updating interwiki cache
..

Updating interwiki cache

Change-Id: Ia06c50cc5fb576f46e393b6578ef09452f69a69a
---
M wmf-config/interwiki.php
1 file changed, 2 insertions(+), 52 deletions(-)


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

diff --git a/wmf-config/interwiki.php b/wmf-config/interwiki.php
index f437998..d3e6da2 100644
--- a/wmf-config/interwiki.php
+++ b/wmf-config/interwiki.php
@@ -1,5 +1,5 @@
  '0 https://www.acronymfinder.com/$1.html',
'__global:advisory' => '1 https://advisory.wikimedia.org/wiki/$1',
@@ -3446,33 +3446,6 @@
'alswiki:chapter' => '1 https://als.wikimedia.org/wiki/$1',
'alswiki:v' => '1 https://als.wikiversity.org/wiki/$1',
'alswiki:voy' => '1 https://als.wikivoyage.org/wiki/$1',
-   '__sites:alswikibooks' => 'wikibooks',
-   'alswikibooks:w' => '1 https://als.wikipedia.org/wiki/$1',
-   'alswikibooks:wikt' => '1 https://als.wiktionary.org/wiki/$1',
-   'alswikibooks:q' => '1 https://als.wikiquote.org/wiki/$1',
-   'alswikibooks:n' => '1 https://als.wikinews.org/wiki/$1',
-   'alswikibooks:s' => '1 https://als.wikisource.org/wiki/$1',
-   'alswikibooks:chapter' => '1 https://als.wikimedia.org/wiki/$1',
-   'alswikibooks:v' => '1 https://als.wikiversity.org/wiki/$1',
-   'alswikibooks:voy' => '1 https://als.wikivoyage.org/wiki/$1',
-   '__sites:alswikiquote' => 'wikiquote',
-   'alswikiquote:w' => '1 https://als.wikipedia.org/wiki/$1',
-   'alswikiquote:wikt' => '1 https://als.wiktionary.org/wiki/$1',
-   'alswikiquote:b' => '1 https://als.wikibooks.org/wiki/$1',
-   'alswikiquote:n' => '1 https://als.wikinews.org/wiki/$1',
-   'alswikiquote:s' => '1 https://als.wikisource.org/wiki/$1',
-   'alswikiquote:chapter' => '1 https://als.wikimedia.org/wiki/$1',
-   'alswikiquote:v' => '1 https://als.wikiversity.org/wiki/$1',
-   'alswikiquote:voy' => '1 https://als.wikivoyage.org/wiki/$1',
-   '__sites:alswiktionary' => 'wiktionary',
-   'alswiktionary:w' => '1 https://als.wikipedia.org/wiki/$1',
-   'alswiktionary:q' => '1 https://als.wikiquote.org/wiki/$1',
-   'alswiktionary:b' => '1 https://als.wikibooks.org/wiki/$1',
-   'alswiktionary:n' => '1 https://als.wikinews.org/wiki/$1',
-   'alswiktionary:s' => '1 https://als.wikisource.org/wiki/$1',
-   'alswiktionary:chapter' => '1 https://als.wikimedia.org/wiki/$1',
-   'alswiktionary:v' => '1 https://als.wikiversity.org/wiki/$1',
-   'alswiktionary:voy' => '1 https://als.wikivoyage.org/wiki/$1',
'__sites:amwiki' => 'wiki',
'amwiki:wikt' => '1 https://am.wiktionary.org/wiki/$1',
'amwiki:q' => '1 https://am.wikiquote.org/wiki/$1',
@@ -7993,24 +7966,6 @@
'movementroleswiki:chapter' => '1 https://en.wikimedia.org/wiki/$1',
'movementroleswiki:v' => '1 https://en.wikiversity.org/wiki/$1',
'movementroleswiki:voy' => '1 https://en.wikivoyage.org/wiki/$1',
-   '__sites:mowiki' => 'wiki',
-   'mowiki:wikt' => '1 https://mo.wiktionary.org/wiki/$1',
-   'mowiki:q' => '1 https://mo.wikiquote.org/wiki/$1',
-   'mowiki:b' => '1 https://mo.wikibooks.org/wiki/$1',
-   'mowiki:n' => '1 https://mo.wikinews.org/wiki/$1',
-   'mowiki:s' => '1 https://mo.wikisource.org/wiki/$1',
-   'mowiki:chapter' => '1 https://mo.wikimedia.org/wiki/$1',
-   'mowiki:v' => '1 https://mo.wikiversity.org/wiki/$1',
-   'mowiki:voy' => '1 https://mo.wikivoyage.org/wiki/$1',
-   '__sites:mowiktionary' => 'wiktionary',
-   'mowiktionary:w' => '1 https://mo.wikipedia.org/wiki/$1',
-   'mowiktionary:q' => '1 https://mo.wikiquote.org/wiki/$1',
-   'mowiktionary:b' => '1 https://mo.wikibooks.org/wiki/$1',
-   'mowiktionary:n' => '1 https://mo.wikinews.org/wiki/$1',
-   'mowiktionary:s' => '1 https://mo.wikisource.org/wiki/$1',
-   'mowiktionary:chapter' => '1 https://mo.wikimedia.org/wiki/$1',
-   'mowiktionary:v' => '1 https://mo.wikiversity.org/wiki/$1',
-   'mowiktionary:voy' => '1 https://mo.wikivoyage.org/wiki/$1',
'__sites:mrjwiki' => 'wiki',
'mrjwiki:wikt' => '1 https://mrj.wiktionary.org/wiki/$1',
'mrjwiki:q' => '1 https://mrj.wikiquote.org/wiki/$1',
@@ -11626,7 +11581,7 @@
'__list:_wikimedia' => 'aa ab ace ady af ak als am an ang ar arc arz as 
ast atj av ay az azb ba bar bat-smg bcl be be-x-old bg bh bi bjn bm bn bo bpy 
br bs bug bxr ca cbk-zam cdo ce ceb ch cho chr chy ckb co cr crh cs csb cu cv 
cy da de din diq dsb dty dv dz ee el eml en eo es et eu ext fa ff fi fiu-vro fj 
fo fr frp frr fur fy ga gag gan gd gl glk gn gom got gu gv ha hak haw he hi hif 
ho hr hsb ht hu hy hz ia id ie ig ii ik ilo io is it iu ja jam jbo jv ka kaa 
kab kbd kbp kg ki kj kk kl km kn

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: updateinterwikicache: check_valid_syntax was moved to lint

2018-01-07 Thread jenkins-bot (Code Review)

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

Change subject: updateinterwikicache: check_valid_syntax was moved to lint
..


updateinterwikicache: check_valid_syntax was moved to lint

Change-Id: I4246dac02a27ea72b3e890c9a82b48b6d79ad0d6
---
M scap/plugins/updateinterwikicache.py
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/scap/plugins/updateinterwikicache.py 
b/scap/plugins/updateinterwikicache.py
index 4ba12f9..049cdb1 100644
--- a/scap/plugins/updateinterwikicache.py
+++ b/scap/plugins/updateinterwikicache.py
@@ -4,8 +4,8 @@
 import subprocess
 
 import scap.cli as cli
+import scap.lint as lint
 import scap.main as main
-import scap.tasks as tasks
 import scap.utils as utils
 
 
@@ -31,7 +31,7 @@
 )
 
 # This shouldn't happen, but let's be safe
-tasks.check_valid_syntax(interwikifile)
+lint.check_valid_syntax(interwikifile)
 
 subprocess.check_call(['/usr/bin/git', 'add', interwikifile])
 subprocess.check_call(['/usr/bin/git', 'commit', '-q', '-m',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4246dac02a27ea72b3e890c9a82b48b6d79ad0d6
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Chad 
Gerrit-Reviewer: Chad 
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]: updateinterwikicache: check_valid_syntax was moved to lint

2018-01-07 Thread Chad (Code Review)

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

Change subject: updateinterwikicache: check_valid_syntax was moved to lint
..

updateinterwikicache: check_valid_syntax was moved to lint

Change-Id: I4246dac02a27ea72b3e890c9a82b48b6d79ad0d6
---
M scap/plugins/updateinterwikicache.py
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/scap/plugins/updateinterwikicache.py 
b/scap/plugins/updateinterwikicache.py
index 4ba12f9..049cdb1 100644
--- a/scap/plugins/updateinterwikicache.py
+++ b/scap/plugins/updateinterwikicache.py
@@ -4,8 +4,8 @@
 import subprocess
 
 import scap.cli as cli
+import scap.lint as lint
 import scap.main as main
-import scap.tasks as tasks
 import scap.utils as utils
 
 
@@ -31,7 +31,7 @@
 )
 
 # This shouldn't happen, but let's be safe
-tasks.check_valid_syntax(interwikifile)
+lint.check_valid_syntax(interwikifile)
 
 subprocess.check_call(['/usr/bin/git', 'add', interwikifile])
 subprocess.check_call(['/usr/bin/git', 'commit', '-q', '-m',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4246dac02a27ea72b3e890c9a82b48b6d79ad0d6
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Chad 
Gerrit-Reviewer: Chad 

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

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

2018-01-07 Thread jenkins-bot (Code Review)

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

Change subject: Improve some parameter docs
..


Improve some parameter docs

Change-Id: I48b8a33f1fe37cddbe4a1fd7d5fed14e4026691d
---
M .phpcs.xml
M SubpageSortkey_body.php
2 files changed, 9 insertions(+), 9 deletions(-)

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



diff --git a/.phpcs.xml b/.phpcs.xml
index 3773e8f..90e8108 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -1,13 +1,10 @@
 
 

-   
-   
+   


.

-   
-   vendor
-   node_modules
+   
 
diff --git a/SubpageSortkey_body.php b/SubpageSortkey_body.php
index b903e8a..f5cfb40 100644
--- a/SubpageSortkey_body.php
+++ b/SubpageSortkey_body.php
@@ -14,6 +14,9 @@
 *
 * Another example: Configuration -3..-1 turns 1/2/3/4/5 -> 3/4
 * and -3.. turns 1/2/3/4/5 -> 3/4/5
+* @param Title $title
+* @param string &$unprefixed
+* @return true
 */
public static function onGetDefaultSortkey( $title, &$unprefixed ) {
global $wgSubpageSortkeyDefault,
@@ -60,10 +63,10 @@
}
 
/**
-* @param $index Int starting index of subpage.
-* @param $count Int how many elements, or false to denote all
-* @param $title Title
-* @return array of subpages (strings)
+* @param int $index starting index of subpage.
+* @param int $count how many elements, or false to denote all
+* @param Title $title
+* @return string[] array of subpages
 */
private static function getSubpage( $index, $count, $title ) {
$subpages = explode( '/', $title->getText() );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I48b8a33f1fe37cddbe4a1fd7d5fed14e4026691d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SubpageSortkey
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Brian Wolff 
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/vagrant[master]: wikilabels: add missing config dependency

2018-01-07 Thread jenkins-bot (Code Review)

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

Change subject: wikilabels: add missing config dependency
..


wikilabels: add missing config dependency

Bug: T183605
Change-Id: I55b25663463e147afc95055cb0096fa0beaab885
---
M puppet/modules/wikilabels/manifests/init.pp
1 file changed, 8 insertions(+), 7 deletions(-)

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



diff --git a/puppet/modules/wikilabels/manifests/init.pp 
b/puppet/modules/wikilabels/manifests/init.pp
index 76a646c..9c742b2 100644
--- a/puppet/modules/wikilabels/manifests/init.pp
+++ b/puppet/modules/wikilabels/manifests/init.pp
@@ -52,6 +52,13 @@
 }
 $repo_dir = "${deploy_dir}/src/wikilabels"
 
+$cfg_file = "${repo_dir}/config/999-vagrant.yaml"
+file { $cfg_file:
+ensure  => present,
+content => template('wikilabels/wikilabels.yaml.erb'),
+require => Virtualenv::Package['wikilabels'],
+}
+
 $db_script = "${deploy_dir}/bin/create_wikilabels_db.sh"
 file { $db_script:
 ensure  => present,
@@ -80,18 +87,12 @@
 require =>[
   Exec['create wikilabels database'],
   Virtualenv::Package['wikilabels'],
+  File[$cfg_file],
 ],
 }
 
 apache::reverse_proxy { 'wikilabels':
 port => $port,
-}
-
-$cfg_file = "${repo_dir}/config/999-vagrant.yaml"
-file { $cfg_file:
-ensure  => present,
-content => template('wikilabels/wikilabels.yaml.erb'),
-require => Virtualenv::Package['wikilabels'],
 }
 
 systemd::service { 'wikilabels':

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I55b25663463e147afc95055cb0096fa0beaab885
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: Gergő Tisza 
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[wmf/1.31.0-wmf.15]: Fix Maintenance::output when called very early

2018-01-07 Thread jenkins-bot (Code Review)

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

Change subject: Fix Maintenance::output when called very early
..


Fix Maintenance::output when called very early

If a maintenance script is called with --help (or without
required args), this is currently failing, as MediaWikiServices
is only loaded after Maintenance::setup is initially called.
Follows 336454104d1249439e3ff97746de69c5e7b4a5f9.

Change-Id: Ied283d362675b6b98bd3144132a240b432998991
(cherry picked from commit 803a29127ce02734ab2dd83fff2cf716c98eedad)
---
M maintenance/Maintenance.php
1 file changed, 8 insertions(+), 4 deletions(-)

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



diff --git a/maintenance/Maintenance.php b/maintenance/Maintenance.php
index 07f547f..8bfead3 100644
--- a/maintenance/Maintenance.php
+++ b/maintenance/Maintenance.php
@@ -381,11 +381,15 @@
 * @param mixed $channel Unique identifier for the channel. See 
function outputChanneled.
 */
protected function output( $out, $channel = null ) {
-   // Try to periodically flush buffered metrics to avoid OOMs
-   $stats = 
MediaWikiServices::getInstance()->getStatsdDataFactory();
-   if ( $stats->getDataCount() > 1000 ) {
-   MediaWiki::emitBufferedStatsdData( $stats, 
$this->getConfig() );
+   // This is sometimes called very early, before Setup.php is 
included.
+   if ( class_exists( MediaWikiServices::class ) ) {
+   // Try to periodically flush buffered metrics to avoid 
OOMs
+   $stats = 
MediaWikiServices::getInstance()->getStatsdDataFactory();
+   if ( $stats->getDataCount() > 1000 ) {
+   MediaWiki::emitBufferedStatsdData( $stats, 
$this->getConfig() );
+   }
}
+
if ( $this->mQuiet ) {
return;
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ied283d362675b6b98bd3144132a240b432998991
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.31.0-wmf.15
Gerrit-Owner: Chad 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: Parent5446 
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/vagrant[master]: Make swift role more developer-friendly

2018-01-07 Thread jenkins-bot (Code Review)

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

Change subject: Make swift role more developer-friendly
..


Make swift role more developer-friendly

Change-Id: If3dc9d2532ec154772ce9c96282cfc7ed14ce73b
---
M puppet/modules/role/manifests/swift.pp
A puppet/modules/role/templates/swift/VagrantRoleSwift.wiki.erb
2 files changed, 31 insertions(+), 0 deletions(-)

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



diff --git a/puppet/modules/role/manifests/swift.pp 
b/puppet/modules/role/manifests/swift.pp
index dd84806..1dbab32 100644
--- a/puppet/modules/role/manifests/swift.pp
+++ b/puppet/modules/role/manifests/swift.pp
@@ -14,4 +14,19 @@
 site=> $::mediawiki::wiki_name,
 content => template('role/swift/apache2.conf.erb'),
 }
+
+# configuration for debugging with the 'swift' command
+env::var { 'ST_AUTH':
+value => "http://127.0.0.1:${::swift::port}/auth/v1.0;,
+}
+env::var { 'ST_USER':
+value => "${::swift::project}:${::swift::user}",
+}
+env::var { 'ST_KEY':
+value => $::swift::key,
+}
+
+mediawiki::import::text { 'VagrantRoleSwift':
+content => template('role/swift/VagrantRoleSwift.wiki.erb'),
+}
 }
diff --git a/puppet/modules/role/templates/swift/VagrantRoleSwift.wiki.erb 
b/puppet/modules/role/templates/swift/VagrantRoleSwift.wiki.erb
new file mode 100644
index 000..8143d77
--- /dev/null
+++ b/puppet/modules/role/templates/swift/VagrantRoleSwift.wiki.erb
@@ -0,0 +1,16 @@
+[https://en.wikipedia.org/wiki/OpenStack OpenStack] Swift is a highly 
available, distributed, eventually consistent object/blob store, which 
MediaWiki can use as a storage backend for media files and their derivatives 
(thumbnails, transcodes etc), together with associated headers and metadata.
+
+== Debugging ==
+The swift command-line client can be used for debugging:
+* swift list: list all containers (the Swift equivalent of 
directories)
+* swift list --prefix wiki-dev-local-public: list containers for 
public files
+* swift list : list files in a container
+* swift stat  : show data stored for a file
+
+A log of recent operations is in 
/vagrant/logs/swift/object-server.log.
+
+== More information ==
+* [https://docs.openstack.org/swift/latest/ Swift docs]
+* [https://developer.openstack.org/api-ref/object-store/index.html Swift API 
docs]
+* [https://wikitech.wikimedia.org/wiki/Swift Wikimedia instructure docs for 
Swift]
+* 
[https://github.com/wikimedia/mediawiki/blob/master/includes/libs/filebackend/SwiftFileBackend.php
 SwiftFileBackend.php] in MediaWiki

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If3dc9d2532ec154772ce9c96282cfc7ed14ce73b
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Cparle 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: Gilles 
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/vagrant[master]: Document varnish role

2018-01-07 Thread jenkins-bot (Code Review)

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

Change subject: Document varnish role
..


Document varnish role

Change-Id: I1ee180111d6e06ac6ccd1daffd3db07857576034
---
M puppet/modules/role/manifests/varnish.pp
A puppet/modules/role/templates/varnish/VagrantRoleVarnish.wiki.erb
2 files changed, 12 insertions(+), 0 deletions(-)

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



diff --git a/puppet/modules/role/manifests/varnish.pp 
b/puppet/modules/role/manifests/varnish.pp
index 44eebcb..56df63f 100644
--- a/puppet/modules/role/manifests/varnish.pp
+++ b/puppet/modules/role/manifests/varnish.pp
@@ -2,6 +2,7 @@
 #
 # Installs a Varnish instance
 # To go through Varnish, use 127.0.0.1:6081 instead of 127.0.0.1:8080.
+#
 class role::varnish {
 include ::varnish
 
@@ -15,4 +16,9 @@
 'wgUsePrivateIPs' => true,
 }
 }
+
+$example_url = "http://${::role::mediawiki::hostname}:6081/;
+mediawiki::import::text { 'VagrantRoleVarnish':
+content => template('role/varnish/VagrantRoleVarnish.wiki.erb'),
+}
 }
diff --git a/puppet/modules/role/templates/varnish/VagrantRoleVarnish.wiki.erb 
b/puppet/modules/role/templates/varnish/VagrantRoleVarnish.wiki.erb
new file mode 100644
index 000..01227c0
--- /dev/null
+++ b/puppet/modules/role/templates/varnish/VagrantRoleVarnish.wiki.erb
@@ -0,0 +1,6 @@
+[https://varnish-cache.org/intro/ Varnish] is a reverse proxy that 
transparently caches responses.
+
+To access the wiki through Varnish, visit it through port 6081 (e.g. 
[http://<%= @example_url %> <%= @example_url %>]).
+This will work as long as you have no more than one Vagrant instance with the 
varnish role enabled.
+
+To debug, use the various varnish... commands (varnishtop, 
varnishncsa, varnishlog etc.)

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1ee180111d6e06ac6ccd1daffd3db07857576034
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: Gilles 
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[wmf/1.31.0-wmf.15]: Fix Maintenance::output when called very early

2018-01-07 Thread Chad (Code Review)

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

Change subject: Fix Maintenance::output when called very early
..

Fix Maintenance::output when called very early

If a maintenance script is called with --help (or without
required args), this is currently failing, as MediaWikiServices
is only loaded after Maintenance::setup is initially called.
Follows 336454104d1249439e3ff97746de69c5e7b4a5f9.

Change-Id: Ied283d362675b6b98bd3144132a240b432998991
(cherry picked from commit 803a29127ce02734ab2dd83fff2cf716c98eedad)
---
M maintenance/Maintenance.php
1 file changed, 8 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/62/402662/1

diff --git a/maintenance/Maintenance.php b/maintenance/Maintenance.php
index 07f547f..8bfead3 100644
--- a/maintenance/Maintenance.php
+++ b/maintenance/Maintenance.php
@@ -381,11 +381,15 @@
 * @param mixed $channel Unique identifier for the channel. See 
function outputChanneled.
 */
protected function output( $out, $channel = null ) {
-   // Try to periodically flush buffered metrics to avoid OOMs
-   $stats = 
MediaWikiServices::getInstance()->getStatsdDataFactory();
-   if ( $stats->getDataCount() > 1000 ) {
-   MediaWiki::emitBufferedStatsdData( $stats, 
$this->getConfig() );
+   // This is sometimes called very early, before Setup.php is 
included.
+   if ( class_exists( MediaWikiServices::class ) ) {
+   // Try to periodically flush buffered metrics to avoid 
OOMs
+   $stats = 
MediaWikiServices::getInstance()->getStatsdDataFactory();
+   if ( $stats->getDataCount() > 1000 ) {
+   MediaWiki::emitBufferedStatsdData( $stats, 
$this->getConfig() );
+   }
}
+
if ( $this->mQuiet ) {
return;
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ied283d362675b6b98bd3144132a240b432998991
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.31.0-wmf.15
Gerrit-Owner: Chad 
Gerrit-Reviewer: Hoo man 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Improve some parameter docs

2018-01-07 Thread jenkins-bot (Code Review)

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

Change subject: Improve some parameter docs
..


Improve some parameter docs

Change-Id: I31e983d7ac287158101b18ad95779d83537302a2
---
M includes/Feed.php
M includes/Preferences.php
M includes/Revision.php
M includes/Storage/RevisionStore.php
M includes/Xml.php
M includes/collation/IcuCollation.php
M includes/libs/objectcache/WANObjectCache.php
M includes/preferences/DefaultPreferencesFactory.php
M includes/resourceloader/ResourceLoader.php
M includes/shell/Result.php
M includes/specialpage/LoginSignupSpecialPage.php
M includes/watcheditem/WatchedItemStore.php
M includes/widget/ComplexNamespaceInputWidget.php
M includes/widget/ComplexTitleInputWidget.php
M includes/widget/DateInputWidget.php
M includes/widget/DateTimeInputWidget.php
M includes/widget/NamespaceInputWidget.php
M includes/widget/SearchInputWidget.php
M includes/widget/SelectWithInputWidget.php
M includes/widget/TitleInputWidget.php
M includes/widget/UsersMultiselectWidget.php
21 files changed, 143 insertions(+), 74 deletions(-)

Approvals:
  Aaron Schulz: Looks good to me, approved
  Florianschmidtwelzow: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/Feed.php b/includes/Feed.php
index 0e715df..92eec08 100644
--- a/includes/Feed.php
+++ b/includes/Feed.php
@@ -153,6 +153,7 @@
/**
 * Get the description of this item without any escaping
 *
+* @return string
 */
public function getDescriptionUnescaped() {
return $this->description;
diff --git a/includes/Preferences.php b/includes/Preferences.php
index 0a41573..37de2a5 100644
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -315,6 +315,7 @@
/**
 * @param array $formData
 * @param PreferencesForm $form
+* @return Status
 */
public static function tryUISubmit( $formData, $form ) {
$preferencesFactory = self::getDefaultPreferencesFactory();
diff --git a/includes/Revision.php b/includes/Revision.php
index 54c6de0..b1440d0 100644
--- a/includes/Revision.php
+++ b/includes/Revision.php
@@ -65,7 +65,7 @@
}
 
/**
-* @param bool|string $wikiId The ID of the target wiki database. Use 
false for the local wiki.
+* @param bool|string $wiki The ID of the target wiki database. Use 
false for the local wiki.
 *
 * @return SqlBlobStore
 */
diff --git a/includes/Storage/RevisionStore.php 
b/includes/Storage/RevisionStore.php
index 2e953fc..0950109 100644
--- a/includes/Storage/RevisionStore.php
+++ b/includes/Storage/RevisionStore.php
@@ -562,6 +562,7 @@
/**
 * MCR migration note: this replaces Revision::isUnpatrolled
 *
+* @param RevisionRecord $rev
 * @return int Rcid of the unpatrolled row, zero if there isn't one
 */
public function isUnpatrolled( RevisionRecord $rev ) {
diff --git a/includes/Xml.php b/includes/Xml.php
index 0091513..b20f66e 100644
--- a/includes/Xml.php
+++ b/includes/Xml.php
@@ -532,8 +532,8 @@
 *
 * @param string $list Correctly formatted text (newline delimited) to 
be
 *   used to generate the options.
-* @param array $params Extra parameters
-* @param string $params['other'] If set, add an option with this as 
text and a value of 'other'
+* @param array $params Extra parameters:
+*   - string $params['other'] If set, add an option with this as text 
and a value of 'other'
 * @return array Array keys are textual labels, values are internal 
values
 */
public static function listDropDownOptions( $list, $params = [] ) {
diff --git a/includes/collation/IcuCollation.php 
b/includes/collation/IcuCollation.php
index 23f02de..36efdb3 100644
--- a/includes/collation/IcuCollation.php
+++ b/includes/collation/IcuCollation.php
@@ -492,7 +492,6 @@
}
 
/**
-* @param string $index
 * @return string
 * @since 1.16.3
 */
diff --git a/includes/libs/objectcache/WANObjectCache.php 
b/includes/libs/objectcache/WANObjectCache.php
index 562819e..409f507 100644
--- a/includes/libs/objectcache/WANObjectCache.php
+++ b/includes/libs/objectcache/WANObjectCache.php
@@ -214,6 +214,9 @@
$this->asyncHandler = isset( $params['asyncHandler'] ) ? 
$params['asyncHandler'] : null;
}
 
+   /**
+* @param LoggerInterface $logger
+*/
public function setLogger( LoggerInterface $logger ) {
$this->logger = $logger;
}
@@ -1238,7 +1241,7 @@
 * @param string $key
 * @param bool $versioned
 * @param float $minTime
-* @param mixed $asOf
+* @param mixed &$asOf
 * @return mixed
 */
protected function getInterimValue( $key,

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Install firejail

2018-01-07 Thread jenkins-bot (Code Review)

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

Change subject: Install firejail
..


Install firejail

Change-Id: I488d420d094ff2885b1f6547152f9a311d4cda81
---
M puppet/modules/mediawiki/manifests/init.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/puppet/modules/mediawiki/manifests/init.pp 
b/puppet/modules/mediawiki/manifests/init.pp
index 2dea2a3..11c2043 100644
--- a/puppet/modules/mediawiki/manifests/init.pp
+++ b/puppet/modules/mediawiki/manifests/init.pp
@@ -81,7 +81,7 @@
 include ::mediawiki::ready_service
 include ::mediawiki::psysh
 
-require_package('parallel')
+require_package('parallel', 'firejail')
 
 $managed_settings_dir = "${settings_dir}/puppet-managed"
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I488d420d094ff2885b1f6547152f9a311d4cda81
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: MaxSem 
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...minus-x[master]: Support ignoring entire directories

2018-01-07 Thread Legoktm (Code Review)

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

Change subject: Support ignoring entire directories
..

Support ignoring entire directories

Change-Id: Iab9ba6a8a5a48cd660e5fe432b7af66d301eec86
---
M README.md
M src/CheckCommand.php
2 files changed, 22 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/minus-x 
refs/changes/61/402661/1

diff --git a/README.md b/README.md
index 37680de..40f9d89 100644
--- a/README.md
+++ b/README.md
@@ -21,13 +21,16 @@
 `minus-x fix .`
 
 
-If you need to whitelist a specific file, create a `.minus-x.json` in
-the repository root:
+If you need to whitelist a specific file or directory, create a
+`.minus-x.json` in the repository root:
 
 ```
 {
"ignore": [
"./bin/executable"
+   ],
+   "ignoreDirectories": [
+   "extensions"
]
 }
 ```
diff --git a/src/CheckCommand.php b/src/CheckCommand.php
index 19840f6..c2df7c3 100644
--- a/src/CheckCommand.php
+++ b/src/CheckCommand.php
@@ -36,7 +36,7 @@
 *
 * @var string[]
 */
-   protected $ignoredDirs = [
+   protected $defaultIgnoredDirs = [
'.git',
'vendor',
'node_modules',
@@ -58,6 +58,13 @@
 * @var string[]
 */
protected $ignoredFiles = [];
+
+   /**
+* Ignored directories from .minus-x.json
+*
+* @var string[]
+*/
+   protected $ignoredDirs = [];
 
/**
 * @var InputInterface
@@ -148,6 +155,15 @@
}, $config['ignore'] );
}
 
+   if ( isset( $config['ignoreDirectories'] ) ) {
+   $this->ignoredDirs = array_merge(
+   $config['ignoreDirectories'],
+   $this->defaultIgnoredDirs
+   );
+   } else {
+   $this->ignoredDirs = $this->defaultIgnoredDirs;
+   }
+
if ( strtoupper( substr( PHP_OS, 0, 3 ) ) === 'WIN' ) {
// On Windows, is_executable() always returns true, so 
whitelist those
// files

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iab9ba6a8a5a48cd660e5fe432b7af66d301eec86
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/minus-x
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] operations/mediawiki-config[master]: Delete alswik(ibooks|iquote|tionary), mowik(ipedia|tionary)

2018-01-07 Thread jenkins-bot (Code Review)

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

Change subject: Delete alswik(ibooks|iquote|tionary), mowik(ipedia|tionary)
..


Delete alswik(ibooks|iquote|tionary), mowik(ipedia|tionary)

Remove the wikis from all.dblist and any other dblists they exist in
Add the wikis to deleted.dblist
Remove all references from wmf-config/, except for those in interwiki.php
Remove the logos from static/images/project-logos

Bug: T181923
Change-Id: I0555ba09cfc6807fb446bc1c60d9d405cf508f1e
---
M dblists/all.dblist
M dblists/closed.dblist
M dblists/deleted.dblist
M dblists/flow.dblist
M dblists/group0.dblist
M dblists/mobilemainpagelegacy.dblist
M dblists/nowikidatadescriptiontaglines.dblist
M dblists/pp_stage1.dblist
M dblists/s3.dblist
M dblists/securepollglobal.dblist
M dblists/small.dblist
M dblists/visualeditor-nondefault.dblist
M dblists/wikibooks.dblist
M dblists/wikidataclient.dblist
M dblists/wikipedia-english.dblist
M dblists/wikipedia.dblist
M dblists/wikiquote.dblist
M dblists/wiktionary.dblist
D static/images/project-logos/alswikibooks.png
D static/images/project-logos/alswikiquote.png
D static/images/project-logos/alswiktionary.png
D static/images/project-logos/mowiki.png
D static/images/project-logos/mowiktionary.png
M wikiversions.json
M wmf-config/InitialiseSettings.php
25 files changed, 5 insertions(+), 68 deletions(-)

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



diff --git a/dblists/all.dblist b/dblists/all.dblist
index 8f6e706..a0b62eb 100644
--- a/dblists/all.dblist
+++ b/dblists/all.dblist
@@ -14,9 +14,6 @@
 akwikibooks
 akwiktionary
 alswiki
-alswikibooks
-alswikiquote
-alswiktionary
 amwiki
 amwikimedia
 amwikiquote
@@ -516,8 +513,6 @@
 mnwikibooks
 mnwiktionary
 movementroleswiki
-mowiki
-mowiktionary
 mrjwiki
 mrwiki
 mrwikibooks
diff --git a/dblists/closed.dblist b/dblists/closed.dblist
index 83fb2fe..4cff237 100644
--- a/dblists/closed.dblist
+++ b/dblists/closed.dblist
@@ -5,9 +5,6 @@
 advisorywiki
 akwikibooks
 akwiktionary
-alswikibooks
-alswikiquote
-alswiktionary
 amwikiquote
 angwikibooks
 angwikiquote
@@ -62,8 +59,6 @@
 mhwiktionary
 miwikibooks
 mnwikibooks
-mowiki
-mowiktionary
 muswiki
 mywikibooks
 nahwikibooks
diff --git a/dblists/deleted.dblist b/dblists/deleted.dblist
index 08257fe..5db77b0 100644
--- a/dblists/deleted.dblist
+++ b/dblists/deleted.dblist
@@ -1,3 +1,6 @@
+alswikibooks
+alswikiquote
+alswiktionary
 bawiktionary
 chwikimedia
 closed_zh_twwiki
@@ -10,6 +13,8 @@
 flaggedrevs_labswikimedia
 langcomwiki
 liquidthreads_labswikimedia
+mowiki
+mowiktionary
 noboardwiki
 nomcomwiki
 readerfeedback_labswikimedia
diff --git a/dblists/flow.dblist b/dblists/flow.dblist
index 4a36f5e..bf5995f 100644
--- a/dblists/flow.dblist
+++ b/dblists/flow.dblist
@@ -14,9 +14,6 @@
 akwikibooks
 akwiktionary
 alswiki
-alswikibooks
-alswikiquote
-alswiktionary
 amwiki
 amwikiquote
 amwiktionary
@@ -480,8 +477,6 @@
 mnwiki
 mnwikibooks
 mnwiktionary
-mowiki
-mowiktionary
 mrjwiki
 mrwiki
 mrwikibooks
diff --git a/dblists/group0.dblist b/dblists/group0.dblist
index 1e646d6..72677f9 100644
--- a/dblists/group0.dblist
+++ b/dblists/group0.dblist
@@ -4,9 +4,6 @@
 advisorywiki
 akwikibooks
 akwiktionary
-alswikibooks
-alswikiquote
-alswiktionary
 amwikiquote
 angwikibooks
 angwikiquote
@@ -63,8 +60,6 @@
 mhwiktionary
 miwikibooks
 mnwikibooks
-mowiki
-mowiktionary
 muswiki
 mywikibooks
 nahwikibooks
diff --git a/dblists/mobilemainpagelegacy.dblist 
b/dblists/mobilemainpagelegacy.dblist
index 99dc557..4ece8cc 100644
--- a/dblists/mobilemainpagelegacy.dblist
+++ b/dblists/mobilemainpagelegacy.dblist
@@ -3,8 +3,6 @@
 akwiki
 akwiktionary
 alswiki
-alswikiquote
-alswiktionary
 amwiki
 arcwiki
 arwiki
diff --git a/dblists/nowikidatadescriptiontaglines.dblist 
b/dblists/nowikidatadescriptiontaglines.dblist
index 6ccf727..3a39756 100644
--- a/dblists/nowikidatadescriptiontaglines.dblist
+++ b/dblists/nowikidatadescriptiontaglines.dblist
@@ -6,8 +6,6 @@
 afwiktionary
 akwikibooks
 akwiktionary
-alswikibooks
-alswiktionary
 amwiktionary
 angwikibooks
 angwikisource
@@ -265,7 +263,6 @@
 mnwikibooks
 mnwiktionary
 movementroleswiki
-mowiktionary
 mrwikibooks
 mrwikisource
 mrwiktionary
diff --git a/dblists/pp_stage1.dblist b/dblists/pp_stage1.dblist
index bee10a2..5769af5 100644
--- a/dblists/pp_stage1.dblist
+++ b/dblists/pp_stage1.dblist
@@ -167,7 +167,6 @@
 mkwiki
 mlwiki
 mnwiki
-mowiki
 mrjwiki
 mrwiki
 mswiki
diff --git a/dblists/s3.dblist b/dblists/s3.dblist
index 4761693..d341a68 100644
--- a/dblists/s3.dblist
+++ b/dblists/s3.dblist
@@ -14,9 +14,6 @@
 akwikibooks
 akwiktionary
 alswiki
-alswikibooks
-alswikiquote
-alswiktionary
 amwiki
 amwikimedia
 amwikiquote
@@ -492,8 +489,6 @@
 mnwikibooks
 mnwiktionary
 movementroleswiki
-mowiki
-mowiktionary
 mrjwiki
 mrwiki
 mrwikibooks
diff --git a/dblists/securepollglobal.dblist

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: Adding details for bswiki, hrwiki, shwiki, srwiki

2018-01-07 Thread Zoranzoki21 (Code Review)

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

Change subject: Adding details for bswiki, hrwiki, shwiki, srwiki
..

Adding details for bswiki, hrwiki, shwiki, srwiki

Change-Id: I8f33d77f73138898f34625e177c329a3ff1da9f8
---
M pywikibot/families/wikipedia_family.py
1 file changed, 6 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/60/402660/2

diff --git a/pywikibot/families/wikipedia_family.py 
b/pywikibot/families/wikipedia_family.py
index 0260f78..0d05474 100644
--- a/pywikibot/families/wikipedia_family.py
+++ b/pywikibot/families/wikipedia_family.py
@@ -76,6 +76,7 @@
 '_default': (),
 'ar': ('تحويل تصنيف',),
 'arz': (u'تحويل تصنيف',),
+'bs': ('Category redirect',),
 'cs': (u'Zastaralá kategorie',),
 'da': (u'Kategoriomdirigering',),
 'en': (u'Category redirect',),
@@ -101,6 +102,7 @@
 'sh': ('Prekat',),
 'simple': ('Category redirect',),
 'sl': ('Preusmeritev kategorije',),
+'sr': ('Category redirect',),
 'sq': ('Kategori e zhvendosur',),
 'sv': ('Kategoriomdirigering',),
 'tl': (u'Category redirect',),
@@ -171,10 +173,11 @@
 # TODO: Remove comments for appropriate pages
 self.doc_subpages = {
 '_default': ((u'/doc', ),
- ['ar', 'bn', 'cs', 'da', 'en', 'es',
+ ['ar', 'bn', 'cs', 'da', 'en', 'es', 'hr',
   'hu', 'id', 'ilo', 'ja', 'ms',
-  'ms', 'pt', 'ro', 'ru', 'simple', 'vi', 'zh']
+  'pt', 'ro', 'ru', 'simple', 'sh', 'vi', 'zh']
  ),
+'bs': (u'/dok', ),
 'ca': (u'/ús', ),
 'de': (u'Doku', u'/Meta'),
 'dsb': (u'/Dokumentacija', ),
@@ -191,6 +194,7 @@
 'nn': (u'/dok', ),
 'pl': (u'/opis', ),
 'sk': (u'/Dokumentácia', ),
+'sr': (u'/док', ),
 'sv': (u'/dok', ),
 'uk': (u'/Документація', ),
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8f33d77f73138898f34625e177c329a3ff1da9f8
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Zoranzoki21 

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

[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: Remove obsolete text from self-explaining code

2018-01-07 Thread jenkins-bot (Code Review)

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

Change subject: Remove obsolete text from self-explaining code
..


Remove obsolete text from self-explaining code

Change-Id: I6a29891383a6d76b26d566b980f6253d1ec0bf44
---
M Hooks.php
M includes/Conversion/Utils.php
M includes/Data/Listener/RecentChangesListener.php
M includes/Notifications/Controller.php
M includes/Notifications/FlowPresentationModel.php
M includes/OOUI/BoardDescriptionWidget.php
6 files changed, 8 insertions(+), 10 deletions(-)

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



diff --git a/Hooks.php b/Hooks.php
index ec52bfd..4c13761 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -180,7 +180,7 @@
/**
 * Hook: LoadExtensionSchemaUpdates
 *
-* @param DatabaseUpdater $updater DatabaseUpdater object
+* @param DatabaseUpdater $updater
 * @return bool true in all cases
 */
public static function getSchemaUpdates( DatabaseUpdater $updater ) {
@@ -1132,7 +1132,7 @@
/**
 * Add topiclist sortby to preferences.
 *
-* @param User $user User object
+* @param User $user
 * @param array &$preferences Preferences object
 * @return bool
 */
diff --git a/includes/Conversion/Utils.php b/includes/Conversion/Utils.php
index 528065e..232544c 100644
--- a/includes/Conversion/Utils.php
+++ b/includes/Conversion/Utils.php
@@ -407,7 +407,7 @@
 * Handler for FlowAddModules, avoids rest of Flow having to be aware if
 * Parsoid is in use.
 *
-* @param OutputPage $out OutputPage object
+* @param OutputPage $out
 * @return bool
 */
public static function onFlowAddModules( OutputPage $out ) {
diff --git a/includes/Data/Listener/RecentChangesListener.php 
b/includes/Data/Listener/RecentChangesListener.php
index cfe173a..6edc98e 100644
--- a/includes/Data/Listener/RecentChangesListener.php
+++ b/includes/Data/Listener/RecentChangesListener.php
@@ -41,7 +41,7 @@
/**
 * @param FlowActions $actions
 * @param UserNameBatch $usernames
-* @param RecentChangeFactory $rcFactory Creates mw RecentChange 
instances
+* @param RecentChangeFactory $rcFactory
 * @param IRCLineUrlFormatter $ircFormatter
 */
public function __construct(
@@ -57,7 +57,7 @@
}
 
/**
-* @param AbstractRevision $revision Revision object
+* @param AbstractRevision $revision
 * @param array $row Revision row
 * @param array $metadata
 */
diff --git a/includes/Notifications/Controller.php 
b/includes/Notifications/Controller.php
index c65dac9..bb0a7bb 100644
--- a/includes/Notifications/Controller.php
+++ b/includes/Notifications/Controller.php
@@ -492,7 +492,7 @@
/**
 * @param AbstractRevision $content The (post|topic|header) revision 
that contains the content of the mention
 * @param PostRevision|null $topic Topic PostRevision object, if 
relevant (e.g. not for Header)
-* @param Workflow $workflow Workflow object
+* @param Workflow $workflow
 * @param User $user User who created the new post
 * @param array $mentionedUsers
 * @param bool $mentionsSkipped Were mentions skipped due to too many 
mentions being attempted?
diff --git a/includes/Notifications/FlowPresentationModel.php 
b/includes/Notifications/FlowPresentationModel.php
index 67d31db..0258b60 100644
--- a/includes/Notifications/FlowPresentationModel.php
+++ b/includes/Notifications/FlowPresentationModel.php
@@ -76,8 +76,8 @@
/**
 * Get the topic title Title
 *
-* @param string $fragment Optional fragment
-* @return Title Topic title
+* @param string $fragment
+* @return Title
 */
protected function getTopicTitleObj( $fragment = '' ) {
$workflowId = $this->event->getExtraParam( 'topic-workflow' );
diff --git a/includes/OOUI/BoardDescriptionWidget.php 
b/includes/OOUI/BoardDescriptionWidget.php
index e80ceb0..1bc546d 100644
--- a/includes/OOUI/BoardDescriptionWidget.php
+++ b/includes/OOUI/BoardDescriptionWidget.php
@@ -9,7 +9,6 @@
protected $description = '';
 
public function __construct( array $config = [] ) {
-   // Parent constructor
parent::__construct( $config );
 
if ( isset( $config['description'] ) ) {
@@ -20,7 +19,6 @@
$editLink = $config['editLink'];
}
 
-   // Edit button
$this->editButton = new \OOUI\ButtonWidget( [
'framed' => false,
'href' => $editLink,

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

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

2018-01-07 Thread jenkins-bot (Code Review)

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

Change subject: Improve some parameter docs
..


Improve some parameter docs

Change-Id: Ic445760aa7afec15cf56222a7053c3f9de6f559d
---
M .phpcs.xml
M ApiQueryProofread.php
M ApiQueryProofreadInfo.php
M ProofreadPage.body.php
M includes/Index/CustomIndexFieldsParser.php
M includes/Index/DatabaseIndexContentLookup.php
M includes/Index/EditIndexPage.php
M includes/Index/IndexContent.php
M includes/Index/IndexContentHandler.php
M includes/Index/IndexContentLookup.php
M includes/Index/IndexDifferenceEngine.php
M includes/Index/IndexRedirectContent.php
M includes/Page/DatabaseIndexForPageLookup.php
M includes/Page/EditPagePage.php
M includes/Page/IndexForPageLookup.php
M includes/Page/PageContent.php
M includes/Page/PageContentHandler.php
M includes/Page/PageDifferenceEngine.php
M includes/Page/PageDisplayHandler.php
M includes/Pagination/FilePagination.php
M includes/Pagination/PagePagination.php
M includes/Pagination/Pagination.php
M includes/Parser/PagelistTagParser.php
M includes/Parser/PagequalityTagParser.php
M includes/Parser/PagesTagParser.php
M includes/Parser/TagParser.php
M maintenance/fixProofreadIndexPagesContentModel.php
M maintenance/fixProofreadPagePagesContentModel.php
M tests/phpunit/FileProviderMock.php
M tests/phpunit/Index/IndexContentLookupMock.php
M tests/phpunit/Page/IndexForPageLookupMock.php
31 files changed, 110 insertions(+), 104 deletions(-)

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



diff --git a/.phpcs.xml b/.phpcs.xml
index 2855261..9b83b12 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -4,15 +4,10 @@



-   
-   




-   
-   
-   */maintenance/*



diff --git a/ApiQueryProofread.php b/ApiQueryProofread.php
index a2b0583..36893eb 100644
--- a/ApiQueryProofread.php
+++ b/ApiQueryProofread.php
@@ -114,7 +114,7 @@
}
 
/**
-* @see ApiBase::getExamplesMessages()
+* @inheritDoc
 */
protected function getExamplesMessages() {
return [
diff --git a/ApiQueryProofreadInfo.php b/ApiQueryProofreadInfo.php
index a5c1fb2..18689a4 100644
--- a/ApiQueryProofreadInfo.php
+++ b/ApiQueryProofreadInfo.php
@@ -88,7 +88,7 @@
}
 
/**
-* @see ApiBase::getExamplesMessages()
+* @inheritDoc
 */
protected function getExamplesMessages() {
return [
diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index b50dea5..b467703 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -618,6 +618,8 @@
 
/**
 * Adds canonical namespaces.
+* @param array &$list
+* @return true
 */
public static function addCanonicalNamespaces( &$list ) {
$list[self::getPageNamespaceId()] = 'Page';
@@ -661,6 +663,7 @@
 * Add the links to previous, next, index page and scan image to Page: 
pages.
 * @param SkinTemplate &$skin
 * @param array &$links Structured navigation links
+* @return true
 */
public static function onSkinTemplateNavigation( SkinTemplate &$skin, 
array &$links ) {
$title = $skin->getTitle();
@@ -751,6 +754,7 @@
 * Add proofreading status to action=info
 * @param IContextSource $context
 * @param array &$pageInfo The page information
+* @return true
 */
public static function onInfoAction( IContextSource $context, array 
&$pageInfo ) {
if ( !$context->canUseWikiPage() ) {
diff --git a/includes/Index/CustomIndexFieldsParser.php 
b/includes/Index/CustomIndexFieldsParser.php
index c7673b0..570e394 100644
--- a/includes/Index/CustomIndexFieldsParser.php
+++ b/includes/Index/CustomIndexFieldsParser.php
@@ -156,6 +156,7 @@
 
/**
 * Return metadata from the index page that have to be given to header 
template.
+* @param IndexContent $content
 * @return CustomIndexField[]
 */
public function parseCustomIndexFieldsForHeader( IndexContent $content 
) {
@@ -172,6 +173,8 @@
/**
 * Return the index entry with the same name or null if it's not found
 * Note: the comparison is case insensitive
+* @param IndexContent $content
+* @param string $fieldName
 * @return CustomIndexField
 * @throws OutOfBoundsException
 */
diff --git a/includes/Index/DatabaseIndexContentLookup.php 
b/includes/Index/DatabaseIndexContentLookup.php
index 36cd727..9827776 100644
--- a/includes/Index/DatabaseIndexContentLookup.php
+++ b/includes/Index/DatabaseIndexContentLookup.php
@@ -15,7 +15,7 @@
private $cache = [];
 
/**
-

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Update sitematrix

2018-01-07 Thread Urbanecm (Code Review)

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

Change subject: Update sitematrix
..

Update sitematrix

Change-Id: I2792b7e819667748d2a575893e4ee4eff5df20a1
---
M lib/config/sitematrix.json
1 file changed, 5 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid 
refs/changes/59/402659/1

diff --git a/lib/config/sitematrix.json b/lib/config/sitematrix.json
index c87fde4..7b20d5a 100644
--- a/lib/config/sitematrix.json
+++ b/lib/config/sitematrix.json
@@ -7027,7 +7027,7 @@
"url": "https://wa.wiktionary.org;,
"dbname": "wawiktionary",
"code": "wiktionary",
-   "sitename": "Wiktionary"
+   "sitename": "Wiccionaire"
},
{
"url": "https://wa.wikibooks.org;,
@@ -7911,7 +7911,8 @@
"dbname": "transitionteamwiki",
"code": "transitionteam",
"sitename": "Transition Team Wiki",
-   "private": ""
+   "private": "",
+   "closed": ""
},
{
"url": "https://ua.wikimedia.org;,
@@ -8041,7 +8042,8 @@
"url": "https://wikimania2017.wikimedia.org;,
"dbname": "wikimania2017wiki",
"code": "wikimania2017",
-   "sitename": "Wikipedia"
+   "sitename": "Wikipedia",
+   "closed": ""
},
{
"url": "https://wikimania2018.wikimedia.org;,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2792b7e819667748d2a575893e4ee4eff5df20a1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Urbanecm 

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

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: imagecopy: Convert to use pywikibot.comms.http.fetch

2018-01-07 Thread jenkins-bot (Code Review)

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

Change subject: imagecopy: Convert to use pywikibot.comms.http.fetch
..


imagecopy: Convert to use pywikibot.comms.http.fetch

Convert scripts/imagecopy.py to use
`pywikibot.comms.http.fetch()` instead of `urllib`.

Bug: T130523
Change-Id: I278081b24ff265a43c37372cd26f6fbae1c3b44e
---
M scripts/imagecopy.py
A tests/data/commonsHelper_description.txt
A tests/imagecopy_tests.py
3 files changed, 89 insertions(+), 17 deletions(-)

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



diff --git a/scripts/imagecopy.py b/scripts/imagecopy.py
index 9424c52..7a539b5 100644
--- a/scripts/imagecopy.py
+++ b/scripts/imagecopy.py
@@ -62,24 +62,20 @@
 
 import codecs
 import re
-import socket
 import threading
 import webbrowser
 
 import pywikibot
 
+from requests.exceptions import RequestException
+
 from pywikibot import pagegenerators, config, i18n
 
+from pywikibot.comms.http import fetch
+
 from pywikibot.specialbots import UploadRobot
-from pywikibot.tools import PY2
 
 from scripts import image
-
-if not PY2:
-from urllib.parse import urlencode
-from urllib.request import urlopen
-else:
-from urllib import urlencode, urlopen
 
 try:
 from pywikibot.userinterfaces.gui import Tkdialog, Tkinter
@@ -201,18 +197,27 @@
 
 
 def pageTextPost(url, parameters):
-"""Get data from commons helper page."""
+"""
+Get data from commons helper page.
+
+@param url: This parameter is not used here, we keep it here to avoid user
+scripts from breaking.
+@param parameters: Data that will be submitted to CommonsHelper.
+@type parameters: dict
+@return: A CommonHelper description message.
+@rtype: str
+"""
 gotInfo = False
 while not gotInfo:
 try:
-commonsHelperPage = urlopen(
-"http://tools.wmflabs.org/commonshelper/index.php;, parameters)
-data = commonsHelperPage.read().decode('utf-8')
+commonsHelperPage = fetch(
+'https://tools.wmflabs.org/commonshelper/',
+method='POST',
+data=parameters)
+data = commonsHelperPage.data.content.decode('utf-8')
 gotInfo = True
-except IOError:
-pywikibot.output(u'Got an IOError, let\'s try again')
-except socket.timeout:
-pywikibot.output(u'Got a timeout, let\'s try again')
+except RequestException:
+pywikibot.output("Got a RequestException, let's try again")
 return data
 
 
@@ -243,7 +248,6 @@
   'doit': 'Uitvoeren'
   }
 
-tosend = urlencode(tosend)
 pywikibot.output(tosend)
 CH = pageTextPost('http://tools.wmflabs.org/commonshelper/index.php',
   tosend)
diff --git a/tests/data/commonsHelper_description.txt 
b/tests/data/commonsHelper_description.txt
new file mode 100644
index 000..2e28200
--- /dev/null
+++ b/tests/data/commonsHelper_description.txt
@@ -0,0 +1,25 @@
+
+== {{int:filedesc}} ==
+{{Information
+|Description={{id|http://www.bekasikota.go.id/pages/profil-wakil-walikota-bekasi}}
+|Source={{transferred from|id.wikipedia}}
+|Date={{Original upload date|2018-01-07}}
+|Author={{Original uploader|Ramdan Herawan|wikipedia|id}}
+|Permission=PD-IDGOV.
+|other_versions=
+}}
+
+== {{int:license-header}} ==
+{{PD-IDGov}}
+
+
+== {{Original upload log}} ==
+{{original description|id.wikipedia|Ahmad+Syaikhu+Wakil+Walikota+Bekasi.jpg}}
+{| class="wikitable filehistory"
+! {{int:filehist-datetime}} !! {{int:filehist-dimensions}} !! 
{{int:filehist-user}} !! {{int:filehist-comment}}
+|-
+| 2018-01-07 01:03 || 448539 (46784 bytes) || [[:id:User:Ramdan 
Herawan|Ramdan Herawan]] || 
''http://www.bekasikota.go.id/pages/profil-wakil-walikota-bekasi''
+|}
+__NOTOC__
+
+{{subst:Unc}} 
\ No newline at end of file
diff --git a/tests/imagecopy_tests.py b/tests/imagecopy_tests.py
new file mode 100644
index 000..a5502f6
--- /dev/null
+++ b/tests/imagecopy_tests.py
@@ -0,0 +1,43 @@
+# -*- coding: utf-8 -*-
+"""Tests for imagecopy script."""
+#
+# (C) Pywikibot team, 2018
+#
+# Distributed under the terms of the MIT license.
+#
+from __future__ import absolute_import, unicode_literals
+
+import re
+
+from scripts.imagecopy import pageTextPost
+
+from tests.aspects import TestCase
+from tests import join_data_path
+
+
+class CommonsHelperMethodTest(TestCase):
+"""Test CommonsHelper methods in imagecopy."""
+
+hostname = 'https://tools.wmflabs.org/commonshelper/'
+
+def test_pageTextPost(self):
+"""Test scripts.imagecopy.pageTextPost() method."""
+parameters_dict = {
+'language': b'id',
+'image': b'Ahmad Syaikhu Wakil Walikota Bekasi.jpg',
+'newname': b'Ahmad Syaikhu Wakil Walikota Bekasi.jpg',
+

[MediaWiki-commits] [Gerrit] operations/puppet[production]: fix up dblist and related config setting of bigwikis for dum...

2018-01-07 Thread ArielGlenn (Code Review)

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

Change subject: fix up dblist and related config setting of bigwikis for dumps 
in labs
..


fix up dblist and related config setting of bigwikis for dumps in labs

Change-Id: I2bc623b1228296ac338dc2a8a54e1ab87c694277
---
M modules/snapshot/manifests/dumps/configs.pp
M modules/snapshot/manifests/dumps/dblists.pp
2 files changed, 9 insertions(+), 1 deletion(-)

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



diff --git a/modules/snapshot/manifests/dumps/configs.pp 
b/modules/snapshot/manifests/dumps/configs.pp
index 17e9585..6cafb9e 100644
--- a/modules/snapshot/manifests/dumps/configs.pp
+++ b/modules/snapshot/manifests/dumps/configs.pp
@@ -151,7 +151,7 @@
 chunksEnabled => '0',
 },
 big => {
-dblist=> "${dblistsdir}/labs_bigwikis.dblist",
+dblist=> "${dblistsdir}/bigwikis-labs.dblist",
 closedlist=> "${apachedir}/dblists/closed-labs.dblist",
 flowlist  => 
"${apachedir}/dblists/flow_only_labs.dblist",
 skipdblist=> "${dblistsdir}/skipmonitor.dblist",
diff --git a/modules/snapshot/manifests/dumps/dblists.pp 
b/modules/snapshot/manifests/dumps/dblists.pp
index 885c428..f6951e4 100644
--- a/modules/snapshot/manifests/dumps/dblists.pp
+++ b/modules/snapshot/manifests/dumps/dblists.pp
@@ -51,6 +51,14 @@
 group   => 'root',
 content => "${bigwikis_dblist}\n",
 }
+file { "${dblistsdir}/bigwikis-labs.dblist":
+ensure  => 'present',
+path=> "${dblistsdir}/bigwikis-labs.dblist",
+mode=> '0644',
+owner   => 'root',
+group   => 'root',
+content => "${labs_bigwikis_dblist}\n",
+}
 file { "${dblistsdir}/skip.dblist":
 ensure  => 'present',
 path=> "${dblistsdir}/skip.dblist",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2bc623b1228296ac338dc2a8a54e1ab87c694277
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn 
Gerrit-Reviewer: ArielGlenn 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: imagecopy: Raise Tkinter ImportError before the first call o...

2018-01-07 Thread jenkins-bot (Code Review)

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

Change subject: imagecopy: Raise Tkinter ImportError before the first call of it
..


imagecopy: Raise Tkinter ImportError before the first call of it

Raise `Tkinter` ImportError (if there's any) before the first
call of `Tkinter` instead of raising it on the top of the
module, so we don't get `Tkinter` ImportError when Tkinter
fails to import when we import the `imagecopy` and
`imagecopy_self` module, especially from the tests module.

Change-Id: Iaf9195fc0e7096f0c1fa15869f6e720a489545fb
---
M scripts/imagecopy.py
M scripts/imagecopy_self.py
M tests/script_tests.py
3 files changed, 14 insertions(+), 19 deletions(-)

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



diff --git a/scripts/imagecopy.py b/scripts/imagecopy.py
index 377f3c6..9424c52 100644
--- a/scripts/imagecopy.py
+++ b/scripts/imagecopy.py
@@ -54,7 +54,7 @@
 #
 # Another rewrite by:
 # (C) Multichill 2008-2011
-# (C) Pywikibot team, 2007-2017
+# (C) Pywikibot team, 2007-2018
 #
 # Distributed under the terms of the MIT license.
 #
@@ -76,18 +76,15 @@
 from scripts import image
 
 if not PY2:
-import tkinter as Tkinter
-
 from urllib.parse import urlencode
 from urllib.request import urlopen
 else:
-import Tkinter
-
 from urllib import urlencode, urlopen
 
 try:
-from pywikibot.userinterfaces.gui import Tkdialog
+from pywikibot.userinterfaces.gui import Tkdialog, Tkinter
 except ImportError as _tk_error:
+Tkinter = _tk_error
 Tkdialog = object
 
 NL = ''
@@ -383,6 +380,10 @@
 def __init__(self, image_title, content, uploader, url, templates,
  commonsconflict=0):
 """Constructor."""
+# Check if `Tkinter` wasn't imported
+if isinstance(Tkinter, ImportError):
+raise Tkinter
+
 super(TkdialogIC, self).__init__()
 self.root = Tkinter.Tk()
 # "%dx%d%+d%+d" % (width, height, xoffset, yoffset)
diff --git a/scripts/imagecopy_self.py b/scripts/imagecopy_self.py
index ab34888..dcbc8f1 100644
--- a/scripts/imagecopy_self.py
+++ b/scripts/imagecopy_self.py
@@ -44,7 +44,7 @@
 # English Wikipedia specific bot by:
 # (C) Multichill 2010-2012
 #
-# (C) Pywikibot team, 2010-2017
+# (C) Pywikibot team, 2010-2018
 #
 # Distributed under the terms of the MIT license.
 #
@@ -66,17 +66,14 @@
 from scripts import imagerecat, image
 
 if not PY2:
-import tkinter as Tkinter
-
 from queue import Queue
 else:
-import Tkinter
-
 from Queue import Queue
 
 try:
-from pywikibot.userinterfaces.gui import Tkdialog
+from pywikibot.userinterfaces.gui import Tkdialog, Tkinter
 except ImportError as _tk_error:
+Tkinter = _tk_error
 Tkdialog = object
 
 NL = ''
@@ -694,6 +691,10 @@
 categories
 """
 """Constructor."""
+# Check if `Tkinter` wasn't imported
+if isinstance(Tkinter, ImportError):
+raise Tkinter
+
 self.root = Tkinter.Tk()
 # "%dx%d%+d%+d" % (width, height, xoffset, yoffset)
 # Always appear the same size and in the bottom-left corner
diff --git a/tests/script_tests.py b/tests/script_tests.py
index 249ae42..77c516b 100644
--- a/tests/script_tests.py
+++ b/tests/script_tests.py
@@ -25,19 +25,12 @@
 
 archive_path = join_root_path('scripts', 'archive')
 
-if PY2:
-TK_IMPORT = 'Tkinter'
-else:
-TK_IMPORT = 'tkinter'
-
 # These dependencies are not always the package name which is in setup.py.
 # e.g. 'PIL.ImageTk' is a object provided by several different pypi packages,
 # and setup.py requests that 'Pillow' is installed to provide 'PIL.ImageTk'.
 # Here, it doesnt matter which pypi package was requested and installed.
 # Here, the name given to the module which will be imported is required.
 script_deps = {
-'imagecopy': [TK_IMPORT],
-'imagecopy_self': [TK_IMPORT],
 'script_wui': ['crontab', 'lua'],
 # Note: package 'lunatic-python' provides module 'lua'
 'flickrripper': ['flickrapi'],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iaf9195fc0e7096f0c1fa15869f6e720a489545fb
Gerrit-PatchSet: 4
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Rafidaslam 
Gerrit-Reviewer: John Vandenberg 
Gerrit-Reviewer: Rafidaslam 
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] operations/mediawiki-config[master]: Initial configuration for inhwiki

2018-01-07 Thread Urbanecm (Code Review)

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

Change subject: Initial configuration for inhwiki
..

Initial configuration for inhwiki

Bug: T184374
Change-Id: Ia08c8ceb9d72b646b1d83ca3cdf0731227a21eee
---
M dblists/all.dblist
M dblists/commonsuploads.dblist
M dblists/flow.dblist
M dblists/s3.dblist
M dblists/securepollglobal.dblist
M dblists/small.dblist
M dblists/wikidataclient.dblist
M dblists/wikipedia-english.dblist
M dblists/wikipedia.dblist
M langlist
M wikiversions.json
M wmf-config/InitialiseSettings.php
12 files changed, 12 insertions(+), 0 deletions(-)


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

diff --git a/dblists/all.dblist b/dblists/all.dblist
index 8f6e706..626c2b6 100644
--- a/dblists/all.dblist
+++ b/dblists/all.dblist
@@ -365,6 +365,7 @@
 ilwikimedia
 incubatorwiki
 internalwiki
+inhwiki
 iowiki
 iowiktionary
 iswiki
diff --git a/dblists/commonsuploads.dblist b/dblists/commonsuploads.dblist
index 5f5a61d..015c422 100644
--- a/dblists/commonsuploads.dblist
+++ b/dblists/commonsuploads.dblist
@@ -211,6 +211,7 @@
 ikwiki
 ilowiki
 incubatorwiki
+inhwiki
 iowiki
 iowiktionary
 iswikibooks
diff --git a/dblists/flow.dblist b/dblists/flow.dblist
index 4a36f5e..4af9bcf 100644
--- a/dblists/flow.dblist
+++ b/dblists/flow.dblist
@@ -337,6 +337,7 @@
 ikwiktionary
 ilowiki
 incubatorwiki
+inhwiki
 iowiki
 iowiktionary
 iswiki
diff --git a/dblists/s3.dblist b/dblists/s3.dblist
index 4761693..52838b7 100644
--- a/dblists/s3.dblist
+++ b/dblists/s3.dblist
@@ -347,6 +347,7 @@
 ilwikimedia
 incubatorwiki
 internalwiki
+inhwiki
 iowiki
 iowiktionary
 iswiki
diff --git a/dblists/securepollglobal.dblist b/dblists/securepollglobal.dblist
index 44f4aa5..b5c71b0 100644
--- a/dblists/securepollglobal.dblist
+++ b/dblists/securepollglobal.dblist
@@ -361,6 +361,7 @@
 ilwikimedia
 incubatorwiki
 internalwiki
+inhwiki
 iowiki
 iowiktionary
 iswiki
diff --git a/dblists/small.dblist b/dblists/small.dblist
index 3d80cd7..df7df6f 100644
--- a/dblists/small.dblist
+++ b/dblists/small.dblist
@@ -196,6 +196,7 @@
 ikwiktionary
 ilwikimedia
 internalwiki
+inhwiki
 iswikibooks
 iswikiquote
 iswikisource
diff --git a/dblists/wikidataclient.dblist b/dblists/wikidataclient.dblist
index 2284dbf..bd29bdc 100644
--- a/dblists/wikidataclient.dblist
+++ b/dblists/wikidataclient.dblist
@@ -265,6 +265,7 @@
 iiwiki
 ikwiki
 ilowiki
+inhwiki
 iowiki
 iswiki
 iswikibooks
diff --git a/dblists/wikipedia-english.dblist b/dblists/wikipedia-english.dblist
index 8661b9a..c5dd35a 100644
--- a/dblists/wikipedia-english.dblist
+++ b/dblists/wikipedia-english.dblist
@@ -112,6 +112,7 @@
 iiwiki
 ikwiki
 ilowiki
+inhwiki
 iowiki
 iswiki
 itwiki
diff --git a/dblists/wikipedia.dblist b/dblists/wikipedia.dblist
index 11c82b7..11e7d54 100644
--- a/dblists/wikipedia.dblist
+++ b/dblists/wikipedia.dblist
@@ -118,6 +118,7 @@
 iiwiki
 ikwiki
 ilowiki
+inhwiki
 iowiki
 iswiki
 itwiki
diff --git a/langlist b/langlist
index 9e82d32..ee037e5 100644
--- a/langlist
+++ b/langlist
@@ -113,6 +113,7 @@
 ii
 ik
 ilo
+inh
 io
 is
 it
diff --git a/wikiversions.json b/wikiversions.json
index 5d9412d..cb89add 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -366,6 +366,7 @@
 "ilwikimedia": "php-1.31.0-wmf.15",
 "incubatorwiki": "php-1.31.0-wmf.15",
 "internalwiki": "php-1.31.0-wmf.15",
+"inhwiki": "php-1.31.0-wmf.15",
 "iowiki": "php-1.31.0-wmf.15",
 "iowiktionary": "php-1.31.0-wmf.15",
 "iswiki": "php-1.31.0-wmf.15",
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index d42d744..26b59f8 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -606,6 +606,7 @@
'igwiki' => '/static/images/project-logos/igwiki.png',  // T48589
'ikwiki' => '/static/images/project-logos/ikwiki.png',  // T48589
'ilowiki' => '/static/images/project-logos/ilowiki.png',  // T42285
+   'inhwiki' => '/static/images/project-logos/inhwiki.png', // T184374
'iowiki' => '/static/images/project-logos/iowiki.png',  // T48589
'iswiki' => '/static/images/project-logos/iswiki.png',  // T42285
'itwiki' => '/static/images/project-logos/itwiki.png',

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: fix up dblist and related config setting of bigwikis for dum...

2018-01-07 Thread ArielGlenn (Code Review)

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

Change subject: fix up dblist and related config setting of bigwikis for dumps 
in labs
..

fix up dblist and related config setting of bigwikis for dumps in labs

Change-Id: I2bc623b1228296ac338dc2a8a54e1ab87c694277
---
M modules/snapshot/manifests/dumps/configs.pp
M modules/snapshot/manifests/dumps/dblists.pp
2 files changed, 9 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/57/402657/1

diff --git a/modules/snapshot/manifests/dumps/configs.pp 
b/modules/snapshot/manifests/dumps/configs.pp
index 17e9585..6cafb9e 100644
--- a/modules/snapshot/manifests/dumps/configs.pp
+++ b/modules/snapshot/manifests/dumps/configs.pp
@@ -151,7 +151,7 @@
 chunksEnabled => '0',
 },
 big => {
-dblist=> "${dblistsdir}/labs_bigwikis.dblist",
+dblist=> "${dblistsdir}/bigwikis-labs.dblist",
 closedlist=> "${apachedir}/dblists/closed-labs.dblist",
 flowlist  => 
"${apachedir}/dblists/flow_only_labs.dblist",
 skipdblist=> "${dblistsdir}/skipmonitor.dblist",
diff --git a/modules/snapshot/manifests/dumps/dblists.pp 
b/modules/snapshot/manifests/dumps/dblists.pp
index 885c428..f6951e4 100644
--- a/modules/snapshot/manifests/dumps/dblists.pp
+++ b/modules/snapshot/manifests/dumps/dblists.pp
@@ -51,6 +51,14 @@
 group   => 'root',
 content => "${bigwikis_dblist}\n",
 }
+file { "${dblistsdir}/bigwikis-labs.dblist":
+ensure  => 'present',
+path=> "${dblistsdir}/bigwikis-labs.dblist",
+mode=> '0644',
+owner   => 'root',
+group   => 'root',
+content => "${labs_bigwikis_dblist}\n",
+}
 file { "${dblistsdir}/skip.dblist":
 ensure  => 'present',
 path=> "${dblistsdir}/skip.dblist",

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

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

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

[MediaWiki-commits] [Gerrit] operations/dns[master]: Add inh to langs.tmpl

2018-01-07 Thread Urbanecm (Code Review)

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

Change subject: Add inh to langs.tmpl
..

Add inh to langs.tmpl

Bug: T184374
Change-Id: Idd644d36cc61e1640d1204f7ba824f73ed1cfe06
---
M templates/helpers/langs.tmpl
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/56/402656/1

diff --git a/templates/helpers/langs.tmpl b/templates/helpers/langs.tmpl
index 5e68290..37e0cff 100644
--- a/templates/helpers/langs.tmpl
+++ b/templates/helpers/langs.tmpl
@@ -118,6 +118,7 @@
 'ii',
 'ik',
 'ilo',
+   'inh',
 'io',
 'is',
 'it',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idd644d36cc61e1640d1204f7ba824f73ed1cfe06
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Urbanecm 

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

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

2018-01-07 Thread Umherirrender (Code Review)

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

Change subject: Improve some parameter docs
..

Improve some parameter docs

Change-Id: I4f5f3e9cd0c044ad29440475b61781957f4ef507
---
M .phpcs.xml
M api/ApiCodeDiff.php
M api/ApiCodeUpdate.php
M api/ApiQueryCodeComments.php
M api/ApiQueryCodePaths.php
M api/ApiQueryCodeRevisions.php
M api/ApiQueryCodeTags.php
M api/ApiRevisionUpdate.php
M backend/Subversion.php
M ui/SpecialCode.php
10 files changed, 9 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeReview 
refs/changes/55/402655/1

diff --git a/.phpcs.xml b/.phpcs.xml
index aa00a4e..759a46d 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -9,7 +9,6 @@



-   



diff --git a/api/ApiCodeDiff.php b/api/ApiCodeDiff.php
index 451db8a..42d2953 100644
--- a/api/ApiCodeDiff.php
+++ b/api/ApiCodeDiff.php
@@ -86,7 +86,7 @@
}
 
/**
-* @see ApiBase::getExamplesMessages()
+* @inheritDoc
 */
protected function getExamplesMessages() {
return [
diff --git a/api/ApiCodeUpdate.php b/api/ApiCodeUpdate.php
index 4a6a0a6..1c1ed4b 100644
--- a/api/ApiCodeUpdate.php
+++ b/api/ApiCodeUpdate.php
@@ -106,7 +106,7 @@
}
 
/**
-* @see ApiBase::getExamplesMessages()
+* @inheritDoc
 */
protected function getExamplesMessages() {
return [
diff --git a/api/ApiQueryCodeComments.php b/api/ApiQueryCodeComments.php
index 858f57e..f7621d7 100644
--- a/api/ApiQueryCodeComments.php
+++ b/api/ApiQueryCodeComments.php
@@ -144,7 +144,7 @@
}
 
/**
-* @see ApiBase::getExamplesMessages()
+* @inheritDoc
 */
protected function getExamplesMessages() {
return [
diff --git a/api/ApiQueryCodePaths.php b/api/ApiQueryCodePaths.php
index 4d70df5..eae40e2 100644
--- a/api/ApiQueryCodePaths.php
+++ b/api/ApiQueryCodePaths.php
@@ -84,7 +84,7 @@
}
 
/**
-* @see ApiBase::getExamplesMessages()
+* @inheritDoc
 */
protected function getExamplesMessages() {
return [
diff --git a/api/ApiQueryCodeRevisions.php b/api/ApiQueryCodeRevisions.php
index 767a4ea..0bbff46 100644
--- a/api/ApiQueryCodeRevisions.php
+++ b/api/ApiQueryCodeRevisions.php
@@ -221,7 +221,7 @@
}
 
/**
-* @see ApiBase::getExamplesMessages()
+* @inheritDoc
 */
protected function getExamplesMessages() {
return [
diff --git a/api/ApiQueryCodeTags.php b/api/ApiQueryCodeTags.php
index 16eebeb..286a9d3 100644
--- a/api/ApiQueryCodeTags.php
+++ b/api/ApiQueryCodeTags.php
@@ -67,7 +67,7 @@
}
 
/**
-* @see ApiBase::getExamplesMessages()
+* @inheritDoc
 */
protected function getExamplesMessages() {
return [
diff --git a/api/ApiRevisionUpdate.php b/api/ApiRevisionUpdate.php
index 69bf1d3..e38fb56 100644
--- a/api/ApiRevisionUpdate.php
+++ b/api/ApiRevisionUpdate.php
@@ -182,7 +182,7 @@
}
 
/**
-* @see ApiBase::getExamplesMessages()
+* @inheritDoc
 */
protected function getExamplesMessages() {
return [
diff --git a/backend/Subversion.php b/backend/Subversion.php
index da564ee..23f3419 100644
--- a/backend/Subversion.php
+++ b/backend/Subversion.php
@@ -84,6 +84,7 @@
 * Nobody ever bothered filling in the documentation on php.net though.
 * The function returns a big array of a bunch of info about the 
repository
 * It throws a warning if the repository does not exist.
+* @return true
 */
function canConnect() {
// MediaWiki\suppressWarnings();
diff --git a/ui/SpecialCode.php b/ui/SpecialCode.php
index 6a2844d..553de39 100644
--- a/ui/SpecialCode.php
+++ b/ui/SpecialCode.php
@@ -161,6 +161,7 @@
 
/**
 * Only list me on Special:SpecialPages when configured.
+* @return true
 */
public function isListed() {
return $this->getConfig()->get( 'CodeReviewListSpecialPage' );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4f5f3e9cd0c044ad29440475b61781957f4ef507
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CodeReview
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] pywikibot/core[master]: TerminalHandler.emit: Do not omit the last line even if it s...

2018-01-07 Thread jenkins-bot (Code Review)

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

Change subject: TerminalHandler.emit: Do not omit the last line even if it 
seems to be warn()
..


TerminalHandler.emit: Do not omit the last line even if it seems to be warn()

In T184368 we have a case that useful warning info are removed from the output.
This patch removes the lines responsible for removing the last line of a
warning message that appears to be a warn call.

In Pywikibot we usually fix warning stacklevel inside the warning
decorators (e.g. in issue_deprecation_warning). Even if we did not, we can
fix the code. Therefore, it seems unnecessary to remove the last line,
especially with the risk of removing useful information.

Bug: T184368
Change-Id: Iaf4b1dfb8939ce76b670e44f882e45504279a60a
---
M pywikibot/userinterfaces/terminal_interface_base.py
1 file changed, 0 insertions(+), 9 deletions(-)

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



diff --git a/pywikibot/userinterfaces/terminal_interface_base.py 
b/pywikibot/userinterfaces/terminal_interface_base.py
index c37cc9e..7bc017c 100755
--- a/pywikibot/userinterfaces/terminal_interface_base.py
+++ b/pywikibot/userinterfaces/terminal_interface_base.py
@@ -510,15 +510,6 @@
 if 'message' in record.__dict__:
 return
 
-# Remove the last line, if it appears to be the warn() call
-msg = record.args[0]
-is_useless_source_output = any(
-s in msg for s in
-(str('warn('), str('exceptions.'), str('Warning)'), 
str('Warning,')))
-
-if is_useless_source_output:
-record.args = ('\n'.join(record.args[0].splitlines()[0:-1]),)
-
 if 'newline' not in record.__dict__:
 record.__dict__['newline'] = '\n'
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iaf4b1dfb8939ce76b670e44f882e45504279a60a
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Dalba 
Gerrit-Reviewer: John Vandenberg 
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...intersection[master]: Improve some parameter docs

2018-01-07 Thread Umherirrender (Code Review)

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

Change subject: Improve some parameter docs
..

Improve some parameter docs

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/intersection 
refs/changes/54/402654/1

diff --git a/.phpcs.xml b/.phpcs.xml
index a9d9ba2..df18878 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -2,15 +2,11 @@
 


-   
-   



.

-   
+   
intersection.php
-   vendor
-   node_modules
 
diff --git a/DynamicPageList.hooks.php b/DynamicPageList.hooks.php
index e0c19f0..7daeea7 100644
--- a/DynamicPageList.hooks.php
+++ b/DynamicPageList.hooks.php
@@ -14,6 +14,10 @@
 
/**
 * The callback function for converting the input text to HTML output
+* @param string $input
+* @param array $args
+* @param Parser $mwParser
+* @return string
 */
public static function renderDynamicPageList( $input, $args, $mwParser 
) {
global $wgContLang;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8b1c4c8900838b92289a7e4b0764d3114e36a8b8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/intersection
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] pywikibot/core[master]: imagecopy: Raise Tkinter ImportError before the first call o...

2018-01-07 Thread Rafidaslam (Code Review)

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

Change subject: imagecopy: Raise Tkinter ImportError before the first call of it
..

imagecopy: Raise Tkinter ImportError before the first call of it

Raise `Tkinter` ImportError (if there's any) before the first
call of `Tkinter` instead of raising it on the top of the
module, so we don't get `Tkinter` ImportError when Tkinter
fails to import when we import the `imagecopy` module,
especially from the tests module.

Change-Id: Iaf9195fc0e7096f0c1fa15869f6e720a489545fb
---
M scripts/imagecopy.py
1 file changed, 7 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/53/402653/1

diff --git a/scripts/imagecopy.py b/scripts/imagecopy.py
index 377f3c6..9424c52 100644
--- a/scripts/imagecopy.py
+++ b/scripts/imagecopy.py
@@ -54,7 +54,7 @@
 #
 # Another rewrite by:
 # (C) Multichill 2008-2011
-# (C) Pywikibot team, 2007-2017
+# (C) Pywikibot team, 2007-2018
 #
 # Distributed under the terms of the MIT license.
 #
@@ -76,18 +76,15 @@
 from scripts import image
 
 if not PY2:
-import tkinter as Tkinter
-
 from urllib.parse import urlencode
 from urllib.request import urlopen
 else:
-import Tkinter
-
 from urllib import urlencode, urlopen
 
 try:
-from pywikibot.userinterfaces.gui import Tkdialog
+from pywikibot.userinterfaces.gui import Tkdialog, Tkinter
 except ImportError as _tk_error:
+Tkinter = _tk_error
 Tkdialog = object
 
 NL = ''
@@ -383,6 +380,10 @@
 def __init__(self, image_title, content, uploader, url, templates,
  commonsconflict=0):
 """Constructor."""
+# Check if `Tkinter` wasn't imported
+if isinstance(Tkinter, ImportError):
+raise Tkinter
+
 super(TkdialogIC, self).__init__()
 self.root = Tkinter.Tk()
 # "%dx%d%+d%+d" % (width, height, xoffset, yoffset)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaf9195fc0e7096f0c1fa15869f6e720a489545fb
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Rafidaslam 

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

[MediaWiki-commits] [Gerrit] mediawiki...PageForms[master]: Fix return in PFTemplate and PFOpenLayersInput

2018-01-07 Thread Umherirrender (Code Review)

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

Change subject: Fix return in PFTemplate and PFOpenLayersInput
..

Fix return in PFTemplate and PFOpenLayersInput

PFTemplate::loadTemplateFieldsSMWAndOther return void, no need for
another return
PFOpenLayersInput::parseCoordinatesString needs a return value, choose
null and moved the trim behind the check, because a null string could be
trimmed to an empty string

Change-Id: Id58350acfe01a3c92d9307a37ddf789c1405a94d
---
M .phpcs.xml
M includes/PF_Template.php
M includes/forminputs/PF_OpenLayersInput.php
3 files changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageForms 
refs/changes/52/402652/1

diff --git a/.phpcs.xml b/.phpcs.xml
index 4764e29..30ee060 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -18,7 +18,6 @@



-   



diff --git a/includes/PF_Template.php b/includes/PF_Template.php
index 6de0603..3483ee2 100644
--- a/includes/PF_Template.php
+++ b/includes/PF_Template.php
@@ -64,7 +64,7 @@
return;
}
}
-   return $this->loadTemplateFieldsSMWAndOther();
+   $this->loadTemplateFieldsSMWAndOther();
}
 
/**
diff --git a/includes/forminputs/PF_OpenLayersInput.php 
b/includes/forminputs/PF_OpenLayersInput.php
index 99b836d..21492a5 100644
--- a/includes/forminputs/PF_OpenLayersInput.php
+++ b/includes/forminputs/PF_OpenLayersInput.php
@@ -202,12 +202,13 @@
 * Copied from CargoStore::parseCoordinateString() in the Cargo
 * extension.
 * @param string $coordinatesString
+* @return string|null
 */
public static function parseCoordinatesString( $coordinatesString ) {
-   $coordinatesString = trim( $coordinatesString );
if ( $coordinatesString == null ) {
-   return;
+   return null;
}
+   $coordinatesString = trim( $coordinatesString );
 
// This is safe to do, right?
$coordinatesString = str_replace( array( '[', ']' ), '', 
$coordinatesString );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id58350acfe01a3c92d9307a37ddf789c1405a94d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageForms
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...Score[master]: Use Language class to get languages names instead of hardcoding

2018-01-07 Thread jenkins-bot (Code Review)

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

Change subject: Use Language class to get languages names instead of hardcoding
..


Use Language class to get languages names instead of hardcoding

Change-Id: Id2ece34c73b50b1600e5b2132749e5b1cfe677bc
---
M includes/Score.php
M includes/ScoreHooks.php
2 files changed, 17 insertions(+), 14 deletions(-)

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



diff --git a/includes/Score.php b/includes/Score.php
index 9010605..d6f1bc7 100644
--- a/includes/Score.php
+++ b/includes/Score.php
@@ -46,21 +46,21 @@
 
/**
 * Supported note languages.
-* Key is LilyPond filename. Value is native word
+* Key is LilyPond filename. Value is language code
 */
public static $supportedNoteLanguages = [
-   'arabic' => 'العربية',
-   'catalan' => 'Català',
-   'deutsch' => 'Deutsch',
-   'english' => 'English',
-   'espanol' => 'Español',
-   'italiano' => 'Italiano',
-   'nederlands' => 'Nederlands',
-   'norsk' => 'Norsk',
-   'portugues' => 'Português',
-   'suomi' => 'Suomi',
-   'svenska' => 'Svenska',
-   'vlaams' => 'Flemish',
+   'arabic' => 'ar',
+   'catalan' => 'ca',
+   'deutsch' => 'de',
+   'english' => 'en',
+   'espanol' => 'es',
+   'italiano' => 'it',
+   'nederlands' => 'nl',
+   'norsk' => 'no',
+   'portugues' => 'pt',
+   'suomi' => 'fi',
+   'svenska' => 'sv',
+   'vlaams' => 'vls',
];
 
/**
diff --git a/includes/ScoreHooks.php b/includes/ScoreHooks.php
index 34d053e..3cc32f7 100644
--- a/includes/ScoreHooks.php
+++ b/includes/ScoreHooks.php
@@ -34,7 +34,10 @@
 */
public static function onBeforePageDisplay( OutputPage &$output, Skin 
&$skin ) {
$output->addJsConfigVars( [
-   'wgScoreNoteLanguages' => 
Score::$supportedNoteLanguages,
+   'wgScoreNoteLanguages' => array_map(
+   'Language::fetchLanguageName',
+   Score::$supportedNoteLanguages
+   ),
'wgScoreDefaultNoteLanguage' => 
Score::$defaultNoteLanguage,
] );
return true;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id2ece34c73b50b1600e5b2132749e5b1cfe677bc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Score
Gerrit-Branch: master
Gerrit-Owner: Phantom42 
Gerrit-Reviewer: Ebe123 
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...GraphViz[master]: Improve some parameter docs

2018-01-07 Thread Umherirrender (Code Review)

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

Change subject: Improve some parameter docs
..

Improve some parameter docs

Change-Id: I3ff96ec363776a12be0cc5247b3de74d172c6bd9
---
M .phpcs.xml
M includes/GraphViz.php
M includes/UploadFromLocalFile.php
M includes/UploadLocalFile.php
4 files changed, 98 insertions(+), 54 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GraphViz 
refs/changes/51/402651/1

diff --git a/.phpcs.xml b/.phpcs.xml
index f9408cd..6cbe822 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -6,8 +6,6 @@



-   
-   

.

diff --git a/includes/GraphViz.php b/includes/GraphViz.php
index c1f5d91..d64c7cc 100644
--- a/includes/GraphViz.php
+++ b/includes/GraphViz.php
@@ -185,7 +185,8 @@
/**
 * Check if a given image type is probably allowed to be uploaded
 * (does not consult any file extension blacklists).
-* @param[in] string $imageType is the type of image (e.g. png) to 
check.
+* @param string $imageType is the type of image (e.g. png) to check.
+* @return bool
 * @author Keith Welter
 */
public static function imageTypeAllowed( $imageType ) {
@@ -201,6 +202,7 @@
/**
 * Set parser hook functions for supported graph types.
 * @author Keith Welter
+* @param Parser &$parser
 * @return true
 */
public static function onParserInit( Parser &$parser ) {
@@ -213,6 +215,10 @@
/**
 * When an article is deleted, delete all the associated graph files.
 * @author Keith Welter
+* @param Article &$article
+* @param User &$user
+* @param string $reason
+* @param int $id
 */
public static function onArticleDeleteComplete( &$article, User &$user, 
$reason, $id ) {
self::deleteArticleUploadedFiles( $article, self::getImageDir() 
);
@@ -223,6 +229,8 @@
/**
 * For a given title, get the corresponding graph file base name.
 * @author Keith Welter
+* @param Title $title
+* @return string
 */
public static function getGraphFileBaseNameFromTitle( $title ) {
$baseName = $title->getFulltext();
@@ -233,6 +241,8 @@
/**
 * Delete all the graph files associated with the given article and 
path.
 * @author Keith Welter
+* @param Article $article
+* @param string $path
 */
public static function deleteArticleFiles( $article, $path ) {
$title = $article->getTitle();
@@ -244,6 +254,8 @@
 
/**
 * Detect if the given title has associated graph files at the given 
path.
+* @param TItle $title
+* @param string $path
 * @return True if the title has associated graph files.  Otherwise 
false.
 * @author Keith Welter
 */
@@ -262,6 +274,8 @@
/**
 * Delete all uploaded files associated with the given article and path.
 * @author Keith Welter
+* @param Article $article
+* @param string $path
 */
public static function deleteArticleUploadedFiles( $article, $path ) {
wfDebug( __METHOD__ . ": entering\n" );
@@ -280,6 +294,8 @@
/**
 * Delete all the graph files associated with the graph name and path.
 * @author Keith Welter
+* @param string $graphName
+* @param string $path
 */
public static function deleteGraphFiles( $graphName, $path ) {
$globPattern = $path . $graphName . "*.*";
@@ -293,6 +309,10 @@
 * the parser cache reflects the canceled edit rather than the saved 
graph so we must
 * reject it.
 * @author Keith Welter
+* @param ParserOutput $parserOutput
+* @param WikiPage $wikiPage
+* @param ParserOptions $parserOptions
+* @return bool
 */
public static function onRejectParserCacheValue( $parserOutput, 
$wikiPage, $parserOptions ) {
$title = $wikiPage->getTitle();
@@ -313,6 +333,16 @@
 * (graph images for which the source wiki text has been deleted).
 * Graph images for extant wiki source will be regenerated when parsed.
 * @author Keith Welter
+* @param \WikiPage $wikiPage
+* @param User $user
+* @param Content $content
+* @param string $summary
+* @param bool $isMinor
+* @param bool $isWatch
+* @param string|int $section
+* @param int $flags
+* @param Status $status
+* @return true
 */
public static function onPageContentSave(
\WikiPage $wikiPage, $user, $content,
@@ -329,7 +359,7 @@
}
 
/**
-*

[MediaWiki-commits] [Gerrit] mediawiki...minus-x[master]: Loosen symfony/console dependency

2018-01-07 Thread jenkins-bot (Code Review)

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

Change subject: Loosen symfony/console dependency
..


Loosen symfony/console dependency

This is a commonly used package and trying to pin it to one specific version
is going to be problematic in the long run. And symfony generally does a good
job with following semantic versioning, and not breaking backwards-
compatibility.

Change-Id: I900f48ca95b62b63ff5b1b0c2e3436c6fb988d5f
---
M composer.json
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/composer.json b/composer.json
index 47362b2..8a498e3 100644
--- a/composer.json
+++ b/composer.json
@@ -11,7 +11,7 @@
],
"require": {
"php": ">=5.5.9",
-   "symfony/console": "3.3.5"
+   "symfony/console": "^3.3.5"
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I900f48ca95b62b63ff5b1b0c2e3436c6fb988d5f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/minus-x
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Florianschmidtwelzow 
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] pywikibot/core[master]: TerminalHandler.emit: Do not omit the last line even if it s...

2018-01-07 Thread Dalba (Code Review)

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

Change subject: TerminalHandler.emit: Do not omit the last line even if it 
seems to be warn()
..

TerminalHandler.emit: Do not omit the last line even if it seems to be warn()

In T184368 we have a case that useful warning info are removed from the output.
This patch removes the lines responsible for removing the last line of a
warning message that appears to be a warn call.

In Pywikibot we usually fix warning stacklevel inside the warning
decorators (e.g. in issue_deprecation_warning). Even if we did not, we can
fix the code. Therefore, it seems unnecessary to remove the last line,
especially with the rist of removing useful information.

Bug: T184368
Change-Id: Iaf4b1dfb8939ce76b670e44f882e45504279a60a
---
M pywikibot/userinterfaces/terminal_interface_base.py
1 file changed, 0 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/50/402650/1

diff --git a/pywikibot/userinterfaces/terminal_interface_base.py 
b/pywikibot/userinterfaces/terminal_interface_base.py
index c37cc9e..7bc017c 100755
--- a/pywikibot/userinterfaces/terminal_interface_base.py
+++ b/pywikibot/userinterfaces/terminal_interface_base.py
@@ -510,15 +510,6 @@
 if 'message' in record.__dict__:
 return
 
-# Remove the last line, if it appears to be the warn() call
-msg = record.args[0]
-is_useless_source_output = any(
-s in msg for s in
-(str('warn('), str('exceptions.'), str('Warning)'), 
str('Warning,')))
-
-if is_useless_source_output:
-record.args = ('\n'.join(record.args[0].splitlines()[0:-1]),)
-
 if 'newline' not in record.__dict__:
 record.__dict__['newline'] = '\n'
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaf4b1dfb8939ce76b670e44f882e45504279a60a
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Dalba 

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

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

2018-01-07 Thread Umherirrender (Code Review)

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

Change subject: Improve some parameter docs
..

Improve some parameter docs

Change-Id: Ie83c1380e7804146090ca14ccd67bdd7efae4c2f
---
M .phpcs.xml
M InfoPage.php
M ListUsersTestWiki.php
M SpecialIncubatorFirstSteps.php
M SpecialSearchWiki.php
M WikimediaIncubator.class.php
6 files changed, 53 insertions(+), 9 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaIncubator 
refs/changes/49/402649/1

diff --git a/.phpcs.xml b/.phpcs.xml
index 73c6331..9cfdd4b 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -2,8 +2,6 @@
 


-   
-   



diff --git a/InfoPage.php b/InfoPage.php
index da613ce..24cfff9 100644
--- a/InfoPage.php
+++ b/InfoPage.php
@@ -140,6 +140,9 @@
}
 
/**
+* @param string $beforetitle
+* @param string $aftertitle
+* @param string $content
 * @return String the core HTML for the info page
 */
public function StandardInfoPage( $beforetitle, $aftertitle, $content ) 
{
diff --git a/ListUsersTestWiki.php b/ListUsersTestWiki.php
index 713b6aa..dcd4284 100644
--- a/ListUsersTestWiki.php
+++ b/ListUsersTestWiki.php
@@ -21,6 +21,9 @@
 
/**
 * Input form
+* @param Pager $pager
+* @param string &$out
+* @return true
 */
static function onSpecialListusersHeaderForm( $pager, &$out ) {
$testwiki = WikimediaIncubator::getUrlParam();
@@ -53,6 +56,9 @@
 
/**
 * Query
+* @param Pager $pager
+* @param array &$query
+* @return true
 */
static function onSpecialListusersQueryInfo( $pager, &$query ) {
$testwiki = WikimediaIncubator::getUrlParam();
diff --git a/SpecialIncubatorFirstSteps.php b/SpecialIncubatorFirstSteps.php
index 8090c65..685d6bf 100644
--- a/SpecialIncubatorFirstSteps.php
+++ b/SpecialIncubatorFirstSteps.php
@@ -47,6 +47,7 @@
 * @param Message $msg Message object
 * @param bool $opaque
 * @param bool $done
+* @return string
 */
protected function showHeader( $msg, $opaque = true, $done = false ) {
$attrs = [];
diff --git a/SpecialSearchWiki.php b/SpecialSearchWiki.php
index 524d250..12ecfbb 100644
--- a/SpecialSearchWiki.php
+++ b/SpecialSearchWiki.php
@@ -98,6 +98,7 @@
/**
 * @param string $projectQuery
 * @param string $languageQuery
+* @return string
 */
protected function doSearch( $projectQuery, $languageQuery ) {
## Match project ##
diff --git a/WikimediaIncubator.class.php b/WikimediaIncubator.class.php
index fb3241b..26f7a95 100644
--- a/WikimediaIncubator.class.php
+++ b/WikimediaIncubator.class.php
@@ -125,6 +125,7 @@
/**
 * This validates a given language code.
 * Only "xx[x]" and "xx[x]-x[]" are allowed.
+* @param string $code
 * @return bool
 */
static function validateLanguageCode( $code ) {
@@ -278,7 +279,10 @@
/**
 * display the prefix by the given project and code
 * (or the URL = or user preference if no parameters are given)
-* @return String
+* @param string $project
+* @param string $code
+* @param bool $allowSister
+* @return string
 */
static function displayPrefix( $project = '', $code = '', $allowSister 
= false ) {
global $wmincSisterProjects;
@@ -371,7 +375,11 @@
 * Disables editing pages belonging to existing wikis (+ shows message)
 * Disables creating an unprefixed page (+ shows error message)
 * See also: WikimediaIncubator::onShowMissingArticle()
-* @return Boolean
+* @param Title $title
+* @param User $user
+* @param string $action
+* @param array &$result
+* @return bool
 */
static function onGetUserPermissionsErrors( $title, $user, $action, 
&$result ) {
$titletext = $title->getText();
@@ -425,7 +433,11 @@
/**
 * Return an error if the user wants to move
 * an existing page to an unprefixed title
-* @return Boolean
+* @param string $oldtitle
+* @param string $newtitle
+* @param User $user
+* @param array &$error
+* @return bool
 */
static function checkPrefixMovePermissions( $oldtitle, $newtitle, 
$user, &$error ) {
$status = new Status();
@@ -441,6 +453,10 @@
 * Add a link to Special:ViewUserLang from 
Special:Contributions/USERNAME
 * if the user has 'viewuserlang' permission
 * Based on code from extension LookupUser made by Tim Starling
+* @param int

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

2018-01-07 Thread Umherirrender (Code Review)

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

Change subject: Improve some parameter docs
..

Improve some parameter docs

Change-Id: Iedadec2058cd979c659708876f131328a7614649
---
M .phpcs.xml
M SpecialReplaceText.php
2 files changed, 8 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ReplaceText 
refs/changes/48/402648/1

diff --git a/.phpcs.xml b/.phpcs.xml
index 1c73823..aaeb946 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -1,8 +1,7 @@
 
 

-   
-   
+   



@@ -13,5 +12,4 @@
.


-   vendor
 
diff --git a/SpecialReplaceText.php b/SpecialReplaceText.php
index b4fc1df..be616a7 100644
--- a/SpecialReplaceText.php
+++ b/SpecialReplaceText.php
@@ -383,6 +383,9 @@
/**
 * Copied almost exactly from MediaWiki's SpecialSearch class, i.e.
 * the search page
+* @param array $namespaces
+* @param int $rowsPerTable
+* @return array
 */
function namespaceTables( $namespaces, $rowsPerTable = 3 ) {
global $wgContLang;
@@ -529,6 +532,10 @@
 * Extract context and highlights search text
 *
 * @todo The bolding needs to be fixed for regular expressions.
+* @param string $text
+* @param string $target
+* @param bool $use_regex
+* @return string
 */
function extractContext( $text, $target, $use_regex = false ) {
global $wgLang;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iedadec2058cd979c659708876f131328a7614649
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ReplaceText
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...ProofreadPage[master]: Improve some parameter docs

2018-01-07 Thread Umherirrender (Code Review)

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

Change subject: Improve some parameter docs
..

Improve some parameter docs

Change-Id: Ic445760aa7afec15cf56222a7053c3f9de6f559d
---
M .phpcs.xml
M ApiQueryProofread.php
M ApiQueryProofreadInfo.php
M ProofreadPage.body.php
M includes/Index/CustomIndexFieldsParser.php
M includes/Index/DatabaseIndexContentLookup.php
M includes/Index/EditIndexPage.php
M includes/Index/IndexContent.php
M includes/Index/IndexContentHandler.php
M includes/Index/IndexContentLookup.php
M includes/Index/IndexDifferenceEngine.php
M includes/Index/IndexRedirectContent.php
M includes/Page/DatabaseIndexForPageLookup.php
M includes/Page/EditPagePage.php
M includes/Page/IndexForPageLookup.php
M includes/Page/PageContent.php
M includes/Page/PageContentHandler.php
M includes/Page/PageDifferenceEngine.php
M includes/Page/PageDisplayHandler.php
M includes/Pagination/FilePagination.php
M includes/Pagination/PagePagination.php
M includes/Pagination/Pagination.php
M includes/Parser/PagelistTagParser.php
M includes/Parser/PagequalityTagParser.php
M includes/Parser/PagesTagParser.php
M includes/Parser/TagParser.php
M maintenance/fixProofreadIndexPagesContentModel.php
M maintenance/fixProofreadPagePagesContentModel.php
M tests/phpunit/FileProviderMock.php
M tests/phpunit/Index/IndexContentLookupMock.php
M tests/phpunit/Page/IndexForPageLookupMock.php
31 files changed, 110 insertions(+), 104 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/47/402647/1

diff --git a/.phpcs.xml b/.phpcs.xml
index 2855261..9b83b12 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -4,15 +4,10 @@



-   
-   




-   
-   
-   */maintenance/*



diff --git a/ApiQueryProofread.php b/ApiQueryProofread.php
index a2b0583..36893eb 100644
--- a/ApiQueryProofread.php
+++ b/ApiQueryProofread.php
@@ -114,7 +114,7 @@
}
 
/**
-* @see ApiBase::getExamplesMessages()
+* @inheritDoc
 */
protected function getExamplesMessages() {
return [
diff --git a/ApiQueryProofreadInfo.php b/ApiQueryProofreadInfo.php
index a5c1fb2..18689a4 100644
--- a/ApiQueryProofreadInfo.php
+++ b/ApiQueryProofreadInfo.php
@@ -88,7 +88,7 @@
}
 
/**
-* @see ApiBase::getExamplesMessages()
+* @inheritDoc
 */
protected function getExamplesMessages() {
return [
diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index b50dea5..b467703 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -618,6 +618,8 @@
 
/**
 * Adds canonical namespaces.
+* @param array &$list
+* @return true
 */
public static function addCanonicalNamespaces( &$list ) {
$list[self::getPageNamespaceId()] = 'Page';
@@ -661,6 +663,7 @@
 * Add the links to previous, next, index page and scan image to Page: 
pages.
 * @param SkinTemplate &$skin
 * @param array &$links Structured navigation links
+* @return true
 */
public static function onSkinTemplateNavigation( SkinTemplate &$skin, 
array &$links ) {
$title = $skin->getTitle();
@@ -751,6 +754,7 @@
 * Add proofreading status to action=info
 * @param IContextSource $context
 * @param array &$pageInfo The page information
+* @return true
 */
public static function onInfoAction( IContextSource $context, array 
&$pageInfo ) {
if ( !$context->canUseWikiPage() ) {
diff --git a/includes/Index/CustomIndexFieldsParser.php 
b/includes/Index/CustomIndexFieldsParser.php
index c7673b0..570e394 100644
--- a/includes/Index/CustomIndexFieldsParser.php
+++ b/includes/Index/CustomIndexFieldsParser.php
@@ -156,6 +156,7 @@
 
/**
 * Return metadata from the index page that have to be given to header 
template.
+* @param IndexContent $content
 * @return CustomIndexField[]
 */
public function parseCustomIndexFieldsForHeader( IndexContent $content 
) {
@@ -172,6 +173,8 @@
/**
 * Return the index entry with the same name or null if it's not found
 * Note: the comparison is case insensitive
+* @param IndexContent $content
+* @param string $fieldName
 * @return CustomIndexField
 * @throws OutOfBoundsException
 */
diff --git a/includes/Index/DatabaseIndexContentLookup.php 
b/includes/Index/DatabaseIndexContentLookup.php
index 36cd727..9827776 100644
--- a/includes/Index/DatabaseIndexContentLookup.php
+++ b/includes/Index/DatabaseIndexContentLookup.php
@@ -15,7 +15,7 @@
private

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

2018-01-07 Thread Umherirrender (Code Review)

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

Change subject: Improve some parameter docs
..

Improve some parameter docs

Change-Id: Iebc7d5eb0d0eb15a12193f2b7b1db98c08d94069
---
M .phpcs.xml
M utils/Hooks.php
2 files changed, 6 insertions(+), 8 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OAuthAuthentication 
refs/changes/46/402646/1

diff --git a/.phpcs.xml b/.phpcs.xml
index 78a662d..b15894e 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -1,14 +1,11 @@
 
 

-   
-   
-   
+   



.

-   
-   vendor
+   
 
diff --git a/utils/Hooks.php b/utils/Hooks.php
index 51cfb1b..1ee68fd 100644
--- a/utils/Hooks.php
+++ b/utils/Hooks.php
@@ -117,7 +117,8 @@
 
/**
 * Check that the identity complies with the site policy
-*
+* @param \User $user
+* @return true
 */
public static function onUserLoadAfterLoadFromSession( \User $user ) {
global $wgOAuthAuthenticationMaxIdentityAge;
@@ -150,8 +151,8 @@
}
 
/**
-* @param $user \User
-* @param $abortError
+* @param \User $user
+* @param bool &$abortError
 * @return bool
 */
public static function onAbortNewAccount( $user, &$abortError ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iebc7d5eb0d0eb15a12193f2b7b1db98c08d94069
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OAuthAuthentication
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...OnlineStatus[master]: Improve some parameter docs

2018-01-07 Thread Umherirrender (Code Review)

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

Change subject: Improve some parameter docs
..

Improve some parameter docs

Change-Id: Iaab5cc7473f5ac85b8422149ce1a2f7e389448c2
---
M .phpcs.xml
M OnlineStatus.body.php
2 files changed, 33 insertions(+), 4 deletions(-)


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

diff --git a/.phpcs.xml b/.phpcs.xml
index debe53d..8c77608 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -1,14 +1,12 @@
 
 

-   
-   
+   




.

-   
-   vendor
+   
 
diff --git a/OnlineStatus.body.php b/OnlineStatus.body.php
index ff0392f..9d9a012 100644
--- a/OnlineStatus.body.php
+++ b/OnlineStatus.body.php
@@ -6,6 +6,7 @@
 *
 * @param mixed $title string of Title object, if it's a title, if has 
to be in
 * User: of User_talk: namespace.
+* @param bool $checkShowPref
 * @return array ( string status, string username   ) or null
 */
static function GetUserStatus( $title, $checkShowPref = false ) {
@@ -39,6 +40,9 @@
 
/**
 * Used for AJAX requests
+* @param string $action
+* @param bool $stat
+* @return string
 */
static function Ajax( $action, $stat = false ) {
global $wgUser;
@@ -99,6 +103,8 @@
 
/**
 * Hook for ParserFirstCallInit
+* @param Parser $parser
+* @return true
 */
static function ParserFirstCallInit( $parser ) {
global $wgAllowAnyUserOnlineStatusFunction;
@@ -111,6 +117,10 @@
 
/**
 * Callback for {{#anyuserstatus:}}
+* @param Parser &$parser
+* @param User $user
+* @param bool $raw
+* @return array|string
 */
static function ParserHookCallback( &$parser, $user, $raw = false ) {
$status = self::GetUserStatus( $user );
@@ -130,6 +140,8 @@
 
/**
 * Hook function for MagicWordwgVariableIDs
+* @param array &$magicWords
+* @return true
 */
static function MagicWordVariable( &$magicWords ) {
$magicWords[] = 'onlinestatus_word';
@@ -140,6 +152,11 @@
 
/**
 * Hook function for ParserGetVariableValueSwitch
+* @param Parser &$parser
+* @param array &$varCache
+* @param string &$index
+* @param array &$ret
+* @return true
 */
static function ParserGetVariable( &$parser, &$varCache, &$index, &$ret 
) {
if ( $index == 'onlinestatus_word' ) {
@@ -169,6 +186,9 @@
 
/**
 * Hook for user preferences
+* @param User $user
+* @param array &$preferences
+* @return true
 */
public static function GetPreferences( $user, &$preferences ) {
$msg = wfMessage( 'onlinestatus-levels' 
)->inContentLanguage()->plain();
@@ -223,6 +243,8 @@
 
/**
 * Hook for UserLoginComplete
+* @param User $user
+* @return true
 */
static function UserLoginComplete( $user ) {
if ( $user->getOption( 'onlineonlogin' ) ) {
@@ -235,6 +257,10 @@
 
/**
 * Hook for UserLoginComplete
+* @param User &$newUser
+* @param string &$injected_html
+* @param string|null $oldName
+* @return true
 */
static function UserLogoutComplete( &$newUser, &$injected_html, 
$oldName = null ) {
if ( $oldName === null ) {
@@ -257,6 +283,8 @@
 
/**
 * Hook function for BeforePageDisplay
+* @param OutputPage &$out
+* @return true
 */
static function BeforePageDisplay( &$out ) {
global $wgRequest, $wgUser, $wgUseAjax;
@@ -289,6 +317,9 @@
 
/**
 * Hook for PersonalUrls
+* @param array &$urls
+* @param Title &$title
+* @return true
 */
static function PersonalUrls( &$urls, &$title ) {
global $wgUser, $wgUseAjax;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaab5cc7473f5ac85b8422149ce1a2f7e389448c2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OnlineStatus
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

2018-01-07 Thread Umherirrender (Code Review)

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

Change subject: Improve some parameter docs
..

Improve some parameter docs

Change-Id: If9f6b458c47d318482388b7441dfae57da29d26b
---
M .phpcs.xml
M WebVideoTranscode/WebVideoTranscode.php
M tests/phpunit/ApiTestCaseVideoUpload.php
M tests/phpunit/TestApiUploadVideo.php
M tests/phpunit/TestVideoThumbnail.php
M tests/phpunit/TestVideoTranscode.php
6 files changed, 16 insertions(+), 9 deletions(-)


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

diff --git a/.phpcs.xml b/.phpcs.xml
index fef4d9a..cf7a5c0 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -4,15 +4,9 @@



-   
-   
-   



-   
-   
-   */maintenance/*



TimedMediaHandler\.i18n\.*\.php
diff --git a/WebVideoTranscode/WebVideoTranscode.php 
b/WebVideoTranscode/WebVideoTranscode.php
index c8125ab..48dddbb 100644
--- a/WebVideoTranscode/WebVideoTranscode.php
+++ b/WebVideoTranscode/WebVideoTranscode.php
@@ -852,6 +852,7 @@
 *
 * @param File $file File object
 * @param IDatabase|bool $db
+* @return array
 */
public static function getTranscodeState( $file, $db = false ) {
global $wgTranscodeBackgroundTimeLimit;
@@ -997,6 +998,10 @@
 *
 * If the source is not found, it will not be used yet...
 * Missing transcodes should be added by write tasks, not read tasks!
+* @param array &$file
+* @param array &$sources
+* @param string $transcodeKey
+* @param string $dataPrefix
 */
public static function addSourceIfReady( &$file, &$sources, 
$transcodeKey, $dataPrefix = '' ) {
// Check if the transcode is ready:
@@ -1371,6 +1376,8 @@
/**
 * Is the given transcode key the smallest configured transcode for
 * its video codec?
+* @param string $transcodeKey
+* @return true
 */
public static function isSmallestTranscodeForCodec( $transcodeKey ) {
global $wgEnabledTranscodeSet;
diff --git a/tests/phpunit/ApiTestCaseVideoUpload.php 
b/tests/phpunit/ApiTestCaseVideoUpload.php
index 4cf98e1..1b482eb 100644
--- a/tests/phpunit/ApiTestCaseVideoUpload.php
+++ b/tests/phpunit/ApiTestCaseVideoUpload.php
@@ -47,10 +47,10 @@
]
];
}
+
/**
 * Fixture -- run after every test
 * Clean up temporary files etc.
-*
 */
protected function tearDown() {
parent::tearDown();
@@ -65,6 +65,8 @@
 
/**
 * Do login
+* @param string $user
+* @return array
 */
protected function doLogin( $user = 'sysop' ) {
$user = self::$users['uploader'];
@@ -88,7 +90,9 @@
}
 
/**
-* uploads a file:
+* uploads a file
+* @param array $file
+* @return array
 */
public function uploadFile( $file ) {
global $wgUser;
diff --git a/tests/phpunit/TestApiUploadVideo.php 
b/tests/phpunit/TestApiUploadVideo.php
index 7ee4b89..598e321 100644
--- a/tests/phpunit/TestApiUploadVideo.php
+++ b/tests/phpunit/TestApiUploadVideo.php
@@ -19,6 +19,7 @@
 
/**
 * @dataProvider mediaFilesProvider
+* @param array $file
 */
public function testUploadVideoFiles( $file ) {
$result = $this->uploadFile( $file );
diff --git a/tests/phpunit/TestVideoThumbnail.php 
b/tests/phpunit/TestVideoThumbnail.php
index f3cfea4..b9af900 100644
--- a/tests/phpunit/TestVideoThumbnail.php
+++ b/tests/phpunit/TestVideoThumbnail.php
@@ -10,6 +10,7 @@
 * Once video files are uploaded test thumbnail generating
 *
 * @dataProvider mediaFilesProvider
+* @param array $file
 * Broken as per bug 61877
 * @group Broken
 */
diff --git a/tests/phpunit/TestVideoTranscode.php 
b/tests/phpunit/TestVideoTranscode.php
index b03ab4e..9a303b1 100644
--- a/tests/phpunit/TestVideoTranscode.php
+++ b/tests/phpunit/TestVideoTranscode.php
@@ -12,6 +12,7 @@
 *  Test if a transcode job is added for a file once requested
 *
 * @dataProvider mediaFilesProvider
+* @param array $file
 * Broken as per bug 61878
 * @group Broken
 */
@@ -87,7 +88,6 @@
}
}
 
-   // Run Transcode job
function runTranscodeJobs() {
$dbw = wfGetDB( DB_MASTER );
$type = 'webVideoTranscode';

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add ul { margin-top: 0; margin-bottom: 0 } for multi-column

2018-01-07 Thread jenkins-bot (Code Review)

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

Change subject: Add ul { margin-top: 0; margin-bottom: 0 } for multi-column
..


Add ul { margin-top: 0; margin-bottom: 0 } for multi-column

The multi-column layout of a list has a currently different top margin
on the first column and on the following columns. On skin Timeless this
is conspicuous because there is a bigger top margin for lists.
This change fixes this for all skins.

This is a follow-up to cd95215caee7ead1098e5fa599d83da9bf56385f.

Change-Id: Icce12f52f98482e80aabd36af1359e37e2038705
---
M resources/src/mediawiki.action/mediawiki.action.view.categoryPage.less
M resources/src/mediawiki.special/mediawiki.special.css
M resources/src/mediawiki.special/mediawiki.special.version.css
3 files changed, 16 insertions(+), 0 deletions(-)

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



diff --git 
a/resources/src/mediawiki.action/mediawiki.action.view.categoryPage.less 
b/resources/src/mediawiki.action/mediawiki.action.view.categoryPage.less
index 83cc207..a481074 100644
--- a/resources/src/mediawiki.action/mediawiki.action.view.categoryPage.less
+++ b/resources/src/mediawiki.action/mediawiki.action.view.categoryPage.less
@@ -4,6 +4,10 @@
.column-count(3);
.column-width(24em);
.mw-category-group {
+   ul {
+   margin-top: 0;
+   margin-bottom: 0;
+   }
li {
.column-break-inside-avoid;
}
diff --git a/resources/src/mediawiki.special/mediawiki.special.css 
b/resources/src/mediawiki.special/mediawiki.special.css
index c25984c..0676bfc 100644
--- a/resources/src/mediawiki.special/mediawiki.special.css
+++ b/resources/src/mediawiki.special/mediawiki.special.css
@@ -25,6 +25,13 @@
page-break-inside: avoid;
-webkit-column-break-inside: avoid;
 }
+
+.mw-allpages-chunk,
+.mw-prefixindex-list {
+   margin-top: 0;
+   margin-bottom: 0;
+}
+
 .allpagesredirect {
font-style: italic;
 }
diff --git a/resources/src/mediawiki.special/mediawiki.special.version.css 
b/resources/src/mediawiki.special/mediawiki.special.version.css
index acc9f13..1b8581a 100644
--- a/resources/src/mediawiki.special/mediawiki.special.version.css
+++ b/resources/src/mediawiki.special/mediawiki.special.version.css
@@ -25,6 +25,11 @@
-webkit-column-width: 18em;
 }
 
+.mw-version-credits ul {
+   margin-top: 0;
+   margin-bottom: 0;
+}
+
 .mw-version-license-info strong {
font-weight: normal;
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icce12f52f98482e80aabd36af1359e37e2038705
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Fomafix 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Fomafix 
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]: Improve some parameter docs

2018-01-07 Thread jenkins-bot (Code Review)

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

Change subject: Improve some parameter docs
..


Improve some parameter docs

Change-Id: Ib45c5a3eb45373fdc8ef91b95667bc1b94599f0d
---
M .phpcs.xml
M SkinMetrolook.php
M SkinMetrolookHooks.php
3 files changed, 5 insertions(+), 2 deletions(-)

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



diff --git a/.phpcs.xml b/.phpcs.xml
index d57c719..3ba9483 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -2,8 +2,6 @@
 


-   
-   

.

diff --git a/SkinMetrolook.php b/SkinMetrolook.php
index 961deff..89ff179 100644
--- a/SkinMetrolook.php
+++ b/SkinMetrolook.php
@@ -118,6 +118,7 @@
 
/**
 * Override to pass our Config instance to it
+* @inheritDoc
 */
public function setupTemplate( $classname, $repository = false, 
$cache_dir = false ) {
return new $classname( $this->metrolookConfig );
diff --git a/SkinMetrolookHooks.php b/SkinMetrolookHooks.php
index 2eae141..d462273 100644
--- a/SkinMetrolookHooks.php
+++ b/SkinMetrolookHooks.php
@@ -72,6 +72,7 @@
 *
 * @param OutputPage $out
 * @param Skin $skin
+* @return true
 */
public static function beforePageDisplay( $out, $skin ) {
if ( $skin instanceof SkinMetrolook ) {
@@ -92,6 +93,7 @@
 *
 * @param User current user $user
 * @param array list of default user preference controls 
&$defaultPreferences
+* @return true
 */
public static function getPreferences( $user, &$defaultPreferences ) {
global $wgMetrolookFeatures;
@@ -113,6 +115,8 @@
 * ResourceLoaderGetConfigVars hook
 *
 * Adds enabled/disabled switches for Vector modules
+* @param array &$vars
+* @return true
 */
public static function resourceLoaderGetConfigVars( &$vars ) {
global $wgMetrolookFeatures, $wgMetrolookSearchBar;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib45c5a3eb45373fdc8ef91b95667bc1b94599f0d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Metrolook
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Paladox 
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...CollapsibleVector[master]: Improve some parameter docs

2018-01-07 Thread jenkins-bot (Code Review)

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

Change subject: Improve some parameter docs
..


Improve some parameter docs

Change-Id: I035113949da23a67058ec9d22b1079da3f97400a
---
M .phpcs.xml
M CollapsibleVectorHooks.php
2 files changed, 13 insertions(+), 21 deletions(-)

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



diff --git a/.phpcs.xml b/.phpcs.xml
index e9c55b5..04bdc33 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -1,16 +1,9 @@
 
 

-   
-   
-   
-   
-   
-   

-   
-   
-   */maintenance/*
+   
+   

.

diff --git a/CollapsibleVectorHooks.php b/CollapsibleVectorHooks.php
index 64981a6..24f65ee 100644
--- a/CollapsibleVectorHooks.php
+++ b/CollapsibleVectorHooks.php
@@ -8,8 +8,7 @@
 
 class CollapsibleVectorHooks {
 
-   /* Protected Static Members */
-
+   /** @var array $features */
protected static $features = [
'collapsiblenav' => [
'preferences' => [
@@ -35,15 +34,13 @@
],
];
 
-   /* Static Methods */
-
/**
 * Checks if a certain option is enabled
 *
 * This method is public to allow other extensions that use 
CollapsibleVector to use the
 * same configuration as CollapsibleVector itself
 *
-* @param $name string Name of the feature, should be a key of $features
+* @param string $name Name of the feature, should be a key of $features
 * @return bool
 */
public static function isEnabled( $name ) {
@@ -73,15 +70,14 @@
return false;
}
 
-   /* Static Methods */
-
/**
 * BeforePageDisplay hook
 *
 * Adds the modules to the page
 *
-* @param $out OutputPage output page
-* @param $skin Skin current skin
+* @param OutputPage $out output page
+* @param Skin $skin current skin
+* @return true
 */
public static function beforePageDisplay( $out, $skin ) {
if ( $skin instanceof SkinVector ) {
@@ -100,8 +96,9 @@
 *
 * Adds Vector-releated items to the preferences
 *
-* @param $user User current user
-* @param $defaultPreferences array list of default user preference 
controls
+* @param User $user current user
+* @param array &$defaultPreferences list of default user preference 
controls
+* @return true
 */
public static function getPreferences( $user, &$defaultPreferences ) {
global $wgCollapsibleVectorFeatures;
@@ -123,6 +120,8 @@
 * ResourceLoaderGetConfigVars hook
 *
 * Adds enabled/disabled switches for Vector modules
+* @param array &$vars
+* @return true
 */
public static function resourceLoaderGetConfigVars( &$vars ) {
global $wgCollapsibleVectorFeatures;
@@ -146,7 +145,7 @@
}
 
/**
-* @param $vars array
+* @param array &$vars
 * @return bool
 */
public static function makeGlobalVariablesScript( &$vars ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I035113949da23a67058ec9d22b1079da3f97400a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CollapsibleVector
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Paladox 
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...VectorV2[master]: Improve some parameter docs

2018-01-07 Thread jenkins-bot (Code Review)

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

Change subject: Improve some parameter docs
..


Improve some parameter docs

Change-Id: Ib7d2baf09f52b269fa3f7e5ca54400db63a9e0dc
---
M .phpcs.xml
M SkinVectorV2.php
2 files changed, 1 insertion(+), 2 deletions(-)

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



diff --git a/.phpcs.xml b/.phpcs.xml
index 13d4d33..ea18ce1 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -2,8 +2,6 @@
 


-   
-   



diff --git a/SkinVectorV2.php b/SkinVectorV2.php
index 0b06a9d..3ec3ad2 100644
--- a/SkinVectorV2.php
+++ b/SkinVectorV2.php
@@ -68,6 +68,7 @@
 
/**
 * Override to pass our Config instance to it
+* @inheritDoc
 */
public function setupTemplate( $classname, $repository = false, 
$cache_dir = false ) {
return new $classname( $this->vectorv2Config );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib7d2baf09f52b269fa3f7e5ca54400db63a9e0dc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/VectorV2
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Paladox 
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]: Remove æA icon from Wikidata and MediaWiki

2018-01-07 Thread Albert221 (Code Review)

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

Change subject: Remove æA icon from Wikidata and MediaWiki
..

Remove æA icon from Wikidata and MediaWiki

Bug: T152115
Change-Id: I0a973194f442367ad56dfd1dd2f49088d8b6faeb
---
M wmf-config/InitialiseSettings.php
1 file changed, 6 insertions(+), 0 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index d42d744..0b20a09 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -20029,6 +20029,12 @@
'wikidatawiki' => 5,
'testwikidatawiki' => 5,
 ],
+// T152115
+'wgMinervaAlwaysShowLanguageButton' => [
+'default' => true,
+'mediawikiwiki' => false,
+'wikidata' => false,
+],
 
 ];
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...TimedMediaHandler[master]: Fix return void in SpecialOrphanedTimedText::execute

2018-01-07 Thread Umherirrender (Code Review)

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

Change subject: Fix return void in SpecialOrphanedTimedText::execute
..

Fix return void in SpecialOrphanedTimedText::execute

QueryPage::execute returns void, no need to use a return statement here

Change-Id: I51d1863a1072dcf6a67ec824dd9ed20ed73b3f4c
---
M SpecialOrphanedTimedText.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/SpecialOrphanedTimedText.php b/SpecialOrphanedTimedText.php
index 00153f4..ebbe1ab 100644
--- a/SpecialOrphanedTimedText.php
+++ b/SpecialOrphanedTimedText.php
@@ -58,7 +58,7 @@
$this->getOutput()->addWikiMsg( 
'orphanedtimedtext-unsupported' );
return;
}
-   return parent::execute( $par );
+   parent::execute( $par );
}
 
/**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I51d1863a1072dcf6a67ec824dd9ed20ed73b3f4c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
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...TwnMainPage[master]: Improve some parameter docs

2018-01-07 Thread Umherirrender (Code Review)

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

Change subject: Improve some parameter docs
..

Improve some parameter docs

Change-Id: I1cc6e7812ebf890f14a6621426bf31c1d507d8d5
---
M .phpcs.xml
M ProjectHandler.php
M ResourceLoaderProjectIconsModule.php
M specials/SpecialTwnMainPage.php
4 files changed, 15 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TwnMainPage 
refs/changes/41/402641/1

diff --git a/.phpcs.xml b/.phpcs.xml
index 7fca01b..cb6203b 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -3,17 +3,11 @@



-   
-   
-   
-   
-   




.

-   
-   vendor
+   
 
diff --git a/ProjectHandler.php b/ProjectHandler.php
index e53523b..0dac29f 100644
--- a/ProjectHandler.php
+++ b/ProjectHandler.php
@@ -45,7 +45,7 @@
/**
 * Sort the projects by to be determined algorithm. Like most sorting
 * functions in PHP this modifies passed list in place.
-* @param MessageGroup[] $groups
+* @param MessageGroup[] &$groups
 * @param string $language Language code.
 * @param array $stats Message group stats.
 */
diff --git a/ResourceLoaderProjectIconsModule.php 
b/ResourceLoaderProjectIconsModule.php
index 9b80382..703210d 100644
--- a/ResourceLoaderProjectIconsModule.php
+++ b/ResourceLoaderProjectIconsModule.php
@@ -33,7 +33,7 @@
 
/**
 * @see also resouces/css/ext.translate.mainpage.css
-* @param $context ResourceLoaderContext
+* @param ResourceLoaderContext $context
 * @return array CSS styles
 */
public function getStyles( ResourceLoaderContext $context ) {
diff --git a/specials/SpecialTwnMainPage.php b/specials/SpecialTwnMainPage.php
index 29e75ef..5db4730 100644
--- a/specials/SpecialTwnMainPage.php
+++ b/specials/SpecialTwnMainPage.php
@@ -433,7 +433,11 @@
return $count;
}
 
-   // Callback for CachedStat
+   /**
+* Callback for CachedStat
+* @param ProjectHandler $handler
+* @return array
+*/
public static function getTwnStats( ProjectHandler $handler ) {
$projects = count( $handler->getProjects() );
$translators = SiteStats::numberingroup( 'translator' );
@@ -448,7 +452,12 @@
];
}
 
-   // Callback for CachedStat
+   /**
+* Callback for CachedStat
+* @param string $code
+* @param int $period
+* @return array
+*/
public static function getUserStats( $code, $period ) {
return [
'translators' => TwnUserStats::getTranslationRankings( 
$code, $period ),
@@ -533,6 +542,7 @@
 
/**
 * Form that allows users to signup via sandbox.
+* @return true
 */
public function loginForm() {
$this->getOutput()->addModules( 'ext.translate.mainpage.signup' 
);

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1cc6e7812ebf890f14a6621426bf31c1d507d8d5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TwnMainPage
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] operations/puppet[production]: add dumps config settings stanzas for labs testing

2018-01-07 Thread ArielGlenn (Code Review)

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

Change subject: add dumps config settings stanzas for labs testing
..


add dumps config settings stanzas for labs testing

Change-Id: Idf94b66efd1ceb3b3aace3fd56022b086626aaf0
---
M modules/snapshot/manifests/dumps/configs.pp
M modules/snapshot/manifests/dumps/dblists.pp
2 files changed, 71 insertions(+), 1 deletion(-)

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



diff --git a/modules/snapshot/manifests/dumps/configs.pp 
b/modules/snapshot/manifests/dumps/configs.pp
index bd510ec..17e9585 100644
--- a/modules/snapshot/manifests/dumps/configs.pp
+++ b/modules/snapshot/manifests/dumps/configs.pp
@@ -136,7 +136,55 @@
 },
 media => {
 skipdblist=> 
"${dblistsdir}/skipmonitor.dblist,${dblistsdir}/globalusage.dblist",
-}
+},
+},
+}
+
+$labsconfig = {
+allwikis => {
+global => {
+dblist=> "${apachedir}/dblists/all-labs.dblist",
+closedlist=> "${apachedir}/dblists/closed-labs.dblist",
+flowlist  => "${apachedir}/dblists/flow_only_labs.dblist",
+skipdblist=> "${dblistsdir}/skip-labs.dblist",
+keep  => '2',
+chunksEnabled => '0',
+},
+big => {
+dblist=> "${dblistsdir}/labs_bigwikis.dblist",
+closedlist=> "${apachedir}/dblists/closed-labs.dblist",
+flowlist  => 
"${apachedir}/dblists/flow_only_labs.dblist",
+skipdblist=> "${dblistsdir}/skipmonitor.dblist",
+keep  => '2',
+chunksEnabled => '1',
+chunksForAbstract => '4',
+chunksForPagelogs => '4',
+checkpointTime=> '720',
+recombineHistory  => '0',
+revsPerJob=> '7',
+retryWait => '30',
+maxRetries=> '3',
+revsMargin=> '20',
+fixeddumporder=> '1',
+wikis => {
+enwiki => {
+pagesPerChunkHistory  => '2,4,7,8',
+pagesPerChunkAbstract => '4000',
+},
+simplewiki => {
+pagesPerChunkHistory  => '2,5,9,14',
+pagesPerChunkAbstract => '6',
+},
+wikidatawiki => {
+pagesPerChunkHistory  => '54,3,2,3',
+pagesPerChunkAbstract => '25000',
+},
+},
+},
+en => {},
+wd => {},
+monitor => {},
+media => {},
 },
 }
 
@@ -150,6 +198,15 @@
 tempdir=> $tempdir,
 }
 
+# for xml/sql dumps testing in beta
+snapshot::dumps::wikiconf { 'wikidump.conf.labs':
+configtype => 'allwikis',
+config => $labsconfig,
+publicdir  => $publicdir,
+privatedir => $privatedir,
+tempdir=> $tempdir,
+}
+
 file { "${confsdir}/table_jobs.yaml":
 ensure => 'present',
 path   => "${confsdir}/table_jobs.yaml",
diff --git a/modules/snapshot/manifests/dumps/dblists.pp 
b/modules/snapshot/manifests/dumps/dblists.pp
index d28843e..885c428 100644
--- a/modules/snapshot/manifests/dumps/dblists.pp
+++ b/modules/snapshot/manifests/dumps/dblists.pp
@@ -10,11 +10,16 @@
 'zhwiki']
 $bigwikis_dblist = join($bigwikis, "\n")
 
+# for testing in deployment-prep
+$labs_bigwikis = ['enwiki', 'simplewiki', 'wikidatawiki']
+$labs_bigwikis_dblist = join($labs_bigwikis, "\n")
+
 # labswiki(s) can't be dumped from snapshot hosts
 $excludewikis = ['labswiki', 'labtestwiki']
 $excludewikis_dblist = join($excludewikis, "\n")
 
 $skip_dblist = 
"${enwiki_dblist}\n${wikidatawiki_dblist}\n${bigwikis_dblist}\n${excludewikis_dblist}"
+$skip_labs_dblist = $labs_bigwikis_dblist
 
 $skipnone_dblist = ''
 
@@ -54,6 +59,14 @@
 group   => 'root',
 content => "${skip_dblist}\n",
 }
+file { "${dblistsdir}/skip-labs.dblist":
+ensure  => 'present',
+path=> "${dblistsdir}/skip-labs.dblist",
+mode=> '0644',
+owner   => 'root',
+group   => 'root',
+content => "${skip_labs_dblist}\n",
+}
 file { "${dblistsdir}/skipmonitor.dblist":
 ensure  => 'present',
 path=> "${dblistsdir}/skipmonitor.dblist",

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

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

2018-01-07 Thread Umherirrender (Code Review)

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

Change subject: Improve some parameter docs
..

Improve some parameter docs

Change-Id: I9c25b7fd492753415dcd546f345e6f740b416c62
---
M .phpcs.xml
M SpecialTopTenPages.php
M TopTenPages.hooks.php
3 files changed, 23 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TopTenPages 
refs/changes/40/402640/1

diff --git a/.phpcs.xml b/.phpcs.xml
index d883e25..0bcff2b 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -1,15 +1,11 @@
 
 

-   
-   
+   


-   
-   

.

-   
-   vendor
+   
 
diff --git a/SpecialTopTenPages.php b/SpecialTopTenPages.php
index c7bb473..10dc71f 100644
--- a/SpecialTopTenPages.php
+++ b/SpecialTopTenPages.php
@@ -2,19 +2,27 @@
 use HitCounters\SpecialPopularPages;
 
 class SpecialTopTenPages extends SpecialPopularPages {
+   /**
+* @param string $name
+*/
public function __construct( $name = 'TopTenPages' ) {
parent::__construct( $name );
$inc = $this->including();
}
 
+   /** @inheritDoc */
public function isIncludable() {
return true;
}
 
+   /** @inheritDoc */
function isListed() {
return false;
}
 
+   /**
+* @param string|null $par
+*/
function execute( $par ) {
$inc = $this->including();
 
@@ -28,6 +36,10 @@
parent::execute( $par );
}
 
+   /**
+* @param int $offset
+* @return string
+*/
function openList( $offset ) {
global $wgTopTenPagesStartAtOne;
if ( $wgTopTenPagesStartAtOne ) {
@@ -36,6 +48,7 @@
return parent::openList( $offset );
}
 
+   /** @inheritDoc */
protected function getGroupName() {
return 'other';
}
diff --git a/TopTenPages.hooks.php b/TopTenPages.hooks.php
index 546cd88..a7e2573 100644
--- a/TopTenPages.hooks.php
+++ b/TopTenPages.hooks.php
@@ -1,12 +1,20 @@
 setHook( 'TopTenPages', 'TopTenPagesHooks::renderTag' 
);
}
 
/**
 * The callback function for converting the input text to HTML output.
+* @param string $text
+* @param array $args
+* @param Parser $parser
+* @param PPFrame $frame
+* @return string
 */
public static function renderTag( $text, array $args, Parser $parser, 
PPFrame $frame ) {
if ( array_key_exists( 'offset', $args ) ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9c25b7fd492753415dcd546f345e6f740b416c62
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TopTenPages
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...SubpageSortkey[master]: Improve some parameter docs

2018-01-07 Thread Umherirrender (Code Review)

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

Change subject: Improve some parameter docs
..

Improve some parameter docs

Change-Id: I48b8a33f1fe37cddbe4a1fd7d5fed14e4026691d
---
M .phpcs.xml
M SubpageSortkey_body.php
2 files changed, 9 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SubpageSortkey 
refs/changes/39/402639/1

diff --git a/.phpcs.xml b/.phpcs.xml
index 3773e8f..90e8108 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -1,13 +1,10 @@
 
 

-   
-   
+   


.

-   
-   vendor
-   node_modules
+   
 
diff --git a/SubpageSortkey_body.php b/SubpageSortkey_body.php
index b903e8a..f5cfb40 100644
--- a/SubpageSortkey_body.php
+++ b/SubpageSortkey_body.php
@@ -14,6 +14,9 @@
 *
 * Another example: Configuration -3..-1 turns 1/2/3/4/5 -> 3/4
 * and -3.. turns 1/2/3/4/5 -> 3/4/5
+* @param Title $title
+* @param string &$unprefixed
+* @return true
 */
public static function onGetDefaultSortkey( $title, &$unprefixed ) {
global $wgSubpageSortkeyDefault,
@@ -60,10 +63,10 @@
}
 
/**
-* @param $index Int starting index of subpage.
-* @param $count Int how many elements, or false to denote all
-* @param $title Title
-* @return array of subpages (strings)
+* @param int $index starting index of subpage.
+* @param int $count how many elements, or false to denote all
+* @param Title $title
+* @return string[] array of subpages
 */
private static function getSubpage( $index, $count, $title ) {
$subpages = explode( '/', $title->getText() );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I48b8a33f1fe37cddbe4a1fd7d5fed14e4026691d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SubpageSortkey
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...SmiteSpam[master]: Improve some parameter docs

2018-01-07 Thread Umherirrender (Code Review)

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

Change subject: Improve some parameter docs
..

Improve some parameter docs

Change-Id: I20caa680a06519f34898b16ddea1d17f35b15961
---
M .phpcs.xml
M SmiteSpam.hooks.php
M SpecialSmiteSpam.php
M SpecialSmiteSpamTrustedUsers.php
M api/SmiteSpamApiQuery.php
M api/SmiteSpamApiTrustUser.php
M includes/SmiteSpamAnalyzer.php
M includes/SmiteSpamWikiPage.php
8 files changed, 31 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SmiteSpam 
refs/changes/38/402638/1

diff --git a/.phpcs.xml b/.phpcs.xml
index 1898deb..84e8877 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -1,16 +1,13 @@
 
 

+   

-   

-   


-   

.

-   
-   vendor
+   
 
diff --git a/SmiteSpam.hooks.php b/SmiteSpam.hooks.php
index be583ce..aa7f0fc 100644
--- a/SmiteSpam.hooks.php
+++ b/SmiteSpam.hooks.php
@@ -1,13 +1,20 @@
 addExtensionTable( 'smitespam_trusted_user',
__DIR__ . '/smitespam.sql' );
return true;
}
 
+   /**
+* @param ALTree &$adminLinksTree
+*/
public static function addToAdminLinks( ALTree &$adminLinksTree ) {
$spamToolsMessage = wfMessage( 'specialpages-group-spam' 
)->text();
 
diff --git a/SpecialSmiteSpam.php b/SpecialSmiteSpam.php
index 004c063..9336602 100644
--- a/SpecialSmiteSpam.php
+++ b/SpecialSmiteSpam.php
@@ -8,6 +8,9 @@
parent::__construct( 'SmiteSpam', 'smitespam' );
}
 
+   /**
+* @param string|null $subPage
+*/
public function execute( $subPage ) {
if ( !$this->userCanExecute( $this->getUser() ) ) {
$this->displayRestrictionError();
@@ -61,6 +64,7 @@
] );
}
 
+   /** @inheritDoc */
function getGroupName() {
return 'spam';
}
diff --git a/SpecialSmiteSpamTrustedUsers.php b/SpecialSmiteSpamTrustedUsers.php
index 39687a5..065a9b8 100644
--- a/SpecialSmiteSpamTrustedUsers.php
+++ b/SpecialSmiteSpamTrustedUsers.php
@@ -6,10 +6,14 @@
parent::__construct( 'SmiteSpamTrustedUsers', 'smitespam' );
}
 
+   /** @inheritDoc */
public function doesWrites() {
return true;
}
 
+   /**
+* @param string|null $subPage
+*/
public function execute( $subPage ) {
if ( !$this->userCanExecute( $this->getUser() ) ) {
$this->displayRestrictionError();
diff --git a/api/SmiteSpamApiQuery.php b/api/SmiteSpamApiQuery.php
index bab89c1..29ffc1c 100644
--- a/api/SmiteSpamApiQuery.php
+++ b/api/SmiteSpamApiQuery.php
@@ -102,7 +102,7 @@
return true;
}
 
-   // Face parameter.
+   /** @inheritDoc */
public function getAllowedParams() {
return array_merge( parent::getAllowedParams(), [
'offset' => [
@@ -116,7 +116,7 @@
] );
}
 
-   // Get examples
+   /** @inheritDoc */
public function getExamples() {
return [
'api.php?action=smitespamanalyze=5=10'
diff --git a/api/SmiteSpamApiTrustUser.php b/api/SmiteSpamApiTrustUser.php
index fe1c8ac..183687a 100644
--- a/api/SmiteSpamApiTrustUser.php
+++ b/api/SmiteSpamApiTrustUser.php
@@ -44,7 +44,7 @@
return true;
}
 
-   // Face parameter.
+   /** @inheritDoc */
public function getAllowedParams() {
return array_merge( parent::getAllowedParams(), [
'username' => [
@@ -54,7 +54,7 @@
] );
}
 
-   // Get examples
+   /** @inheritDoc */
public function getExamples() {
return [
'api.php?action=smitespamtrustuser=Admin'
diff --git a/includes/SmiteSpamAnalyzer.php b/includes/SmiteSpamAnalyzer.php
index a02d07f..35d2288 100644
--- a/includes/SmiteSpamAnalyzer.php
+++ b/includes/SmiteSpamAnalyzer.php
@@ -9,6 +9,9 @@
 */
protected $config;
 
+   /**
+* @param bool $sort
+*/
public function __construct( $sort = true ) {
global $wgSmiteSpamCheckers, $wgSmiteSpamThreshold;
global $wgSmiteSpamIgnorePagesWithNoExternalLinks;
@@ -21,12 +24,15 @@
'sort' => $sort,
];
}
+
/**
 * Retrieves a list of pages in the wiki based on the offset and limit
 * and runs checks on each of them. Pages whose evaluated value exceeds 
the
 * threshold defined in the configuration are returned as an array.
 * @todo Perform DB queries in batches, else

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

2018-01-07 Thread Umherirrender (Code Review)

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

Change subject: Improve some parameter docs
..

Improve some parameter docs

Change-Id: Ie4f1f962c9fa07bf3632b0bb84ebfbe07d452d27
---
M .phpcs.xml
M Git2Pages.body.php
M GitRepository.php
3 files changed, 15 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Git2Pages 
refs/changes/37/402637/1

diff --git a/.phpcs.xml b/.phpcs.xml
index 69ede16..8c77608 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -2,15 +2,11 @@
 


-   
-   
-   




.

-   
-   vendor
+   
 
diff --git a/Git2Pages.body.php b/Git2Pages.body.php
index 0f613e6..423d7d8 100644
--- a/Git2Pages.body.php
+++ b/Git2Pages.body.php
@@ -16,6 +16,8 @@
 
/**
 * Registers the parser function hook
+* @param Parser $parser
+* @return true
 */
public static function Git2PagesSetup( $parser ) {
$parser->setFunctionHook( 'snippet', [ 'Git2PagesHooks', 
'PullContentFromRepo' ] );
@@ -26,8 +28,8 @@
 * Converts an array of values in form [0] => "name=value" into a real
 * associative array in form [name] => value
 *
-* @param array string $options
-* @return array $results
+* @param array $options
+* @return array
 */
static function extractOptions( array $options ) {
$results = [];
@@ -56,6 +58,7 @@
 * Pulls the content from a repository
 *
 * @param array $parser Array, the first element a Parser instance, 
then the user input values
+* @return string|array
 */
public static function PullContentFromRepo( $parser ) {
global $wgGit2PagesDataDir;
diff --git a/GitRepository.php b/GitRepository.php
index 6a3c5ac..da65fde 100644
--- a/GitRepository.php
+++ b/GitRepository.php
@@ -3,6 +3,7 @@
  * A class to manipulate a Git repository.
  */
 class GitRepository {
+   /** @var string $gitUrl */
protected $gitUrl;
 
/**
@@ -66,11 +67,14 @@
] );
chdir( $oldDir );
}
+
/**
 * Clones just the .git folder
 *
 * @param string $url
 * @param string $gitFolder
+* @param string $checkoutItem
+* @param string $branch
 */
static function SparseCheckoutNewRepo( $url, $gitFolder, $checkoutItem, 
$branch ) {
$oldDir = getcwd();
@@ -127,8 +131,12 @@
/**
 * Finds and reads the file.
 *
+* @param string $filename
 * @param string $gitFolder contains the path to Git repo folder
-* @param array $options contains user inputs
+* @param int $startLine
+* @param int $endLine
+* @return string
+* @throws Exception
 */
function FindAndReadFile( $filename, $gitFolder, $startLine = 1, 
$endLine = -1 ) {
# Remove file separators (dots) and slashes to prevent 
directory traversal attack

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie4f1f962c9fa07bf3632b0bb84ebfbe07d452d27
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Git2Pages
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...CollapsibleVector[master]: Improve some parameter docs

2018-01-07 Thread Umherirrender (Code Review)

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

Change subject: Improve some parameter docs
..

Improve some parameter docs

Change-Id: I035113949da23a67058ec9d22b1079da3f97400a
---
M .phpcs.xml
M CollapsibleVectorHooks.php
2 files changed, 13 insertions(+), 21 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CollapsibleVector 
refs/changes/36/402636/1

diff --git a/.phpcs.xml b/.phpcs.xml
index e9c55b5..04bdc33 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -1,16 +1,9 @@
 
 

-   
-   
-   
-   
-   
-   

-   
-   
-   */maintenance/*
+   
+   

.

diff --git a/CollapsibleVectorHooks.php b/CollapsibleVectorHooks.php
index 64981a6..24f65ee 100644
--- a/CollapsibleVectorHooks.php
+++ b/CollapsibleVectorHooks.php
@@ -8,8 +8,7 @@
 
 class CollapsibleVectorHooks {
 
-   /* Protected Static Members */
-
+   /** @var array $features */
protected static $features = [
'collapsiblenav' => [
'preferences' => [
@@ -35,15 +34,13 @@
],
];
 
-   /* Static Methods */
-
/**
 * Checks if a certain option is enabled
 *
 * This method is public to allow other extensions that use 
CollapsibleVector to use the
 * same configuration as CollapsibleVector itself
 *
-* @param $name string Name of the feature, should be a key of $features
+* @param string $name Name of the feature, should be a key of $features
 * @return bool
 */
public static function isEnabled( $name ) {
@@ -73,15 +70,14 @@
return false;
}
 
-   /* Static Methods */
-
/**
 * BeforePageDisplay hook
 *
 * Adds the modules to the page
 *
-* @param $out OutputPage output page
-* @param $skin Skin current skin
+* @param OutputPage $out output page
+* @param Skin $skin current skin
+* @return true
 */
public static function beforePageDisplay( $out, $skin ) {
if ( $skin instanceof SkinVector ) {
@@ -100,8 +96,9 @@
 *
 * Adds Vector-releated items to the preferences
 *
-* @param $user User current user
-* @param $defaultPreferences array list of default user preference 
controls
+* @param User $user current user
+* @param array &$defaultPreferences list of default user preference 
controls
+* @return true
 */
public static function getPreferences( $user, &$defaultPreferences ) {
global $wgCollapsibleVectorFeatures;
@@ -123,6 +120,8 @@
 * ResourceLoaderGetConfigVars hook
 *
 * Adds enabled/disabled switches for Vector modules
+* @param array &$vars
+* @return true
 */
public static function resourceLoaderGetConfigVars( &$vars ) {
global $wgCollapsibleVectorFeatures;
@@ -146,7 +145,7 @@
}
 
/**
-* @param $vars array
+* @param array &$vars
 * @return bool
 */
public static function makeGlobalVariablesScript( &$vars ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I035113949da23a67058ec9d22b1079da3f97400a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CollapsibleVector
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...Citoid[master]: Improve some parameter docs

2018-01-07 Thread Umherirrender (Code Review)

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

Change subject: Improve some parameter docs
..

Improve some parameter docs

Change-Id: Ia3e62f7935db45350a6ff7d60befa1d0072b4b30
---
M .phpcs.xml
M Citoid.hooks.php
M CitoidDataModule.php
3 files changed, 26 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Citoid 
refs/changes/35/402635/1

diff --git a/.phpcs.xml b/.phpcs.xml
index c4c4501..90e8108 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -1,15 +1,10 @@
 
 

-   
-   
-   
+   

-   

.

-   
-   vendor
-   node_modules
+   
 
diff --git a/Citoid.hooks.php b/Citoid.hooks.php
index 7a27a36..b057134 100644
--- a/Citoid.hooks.php
+++ b/Citoid.hooks.php
@@ -10,6 +10,8 @@
 
/**
 * Adds extra variables to the global config
+* @param array &$vars
+* @return true
 */
public static function onResourceLoaderGetConfigVars( array &$vars ) {
global $wgCitoidServiceUrl;
@@ -23,6 +25,9 @@
 
/**
 * Register qunit unit tests
+* @param array &$testModules
+* @param ResourceLoader &$resourceLoader
+* @return true
 */
public static function onResourceLoaderTestModules(
array &$testModules,
@@ -47,6 +52,11 @@
return true;
}
 
+   /**
+* @param User $user
+* @param array &$preferences
+* @return true
+*/
public static function onGetPreferences( User $user, array 
&$preferences ) {
$preferences['citoid-mode'] = [
'type' => 'api'
diff --git a/CitoidDataModule.php b/CitoidDataModule.php
index c32e077..480a2cd 100644
--- a/CitoidDataModule.php
+++ b/CitoidDataModule.php
@@ -12,13 +12,16 @@
 
 class CitoidDataModule extends ResourceLoaderModule {
 
-   /* Protected Members */
-
+   /** @var string $origin */
protected $origin = self::ORIGIN_USER_SITEWIDE;
+
+   /** @var array $targets */
protected $targets = [ 'desktop', 'mobile' ];
 
-   /* Methods */
-
+   /**
+* @param ResourceLoaderContext $context
+* @return string
+*/
public function getScript( ResourceLoaderContext $context ) {
return 've.init.platform.addMessages(' . FormatJson::encode(
[
@@ -31,6 +34,10 @@
) . ');';
}
 
+   /**
+* @param ResourceLoaderContext|null $context
+* @return array
+*/
public function getDependencies( ResourceLoaderContext $context = null 
) {
return [
'ext.visualEditor.base',
@@ -38,6 +45,9 @@
];
}
 
+   /**
+* @return bool
+*/
public function enableModuleContentVersion() {
return true;
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia3e62f7935db45350a6ff7d60befa1d0072b4b30
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Citoid
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...CentralAuth[master]: Improve some parameter docs

2018-01-07 Thread Umherirrender (Code Review)

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

Change subject: Improve some parameter docs
..

Improve some parameter docs

Change-Id: I2f1dfd94674bc6a20134b56d41f05a02cb038e64
---
M .phpcs.xml
M includes/CentralAuthHooks.php
M includes/CentralAuthUser.php
M includes/api/ApiCentralAuthToken.php
M includes/api/ApiDeleteGlobalAccount.php
M includes/api/ApiGlobalUserRights.php
M includes/api/ApiQueryGlobalAllUsers.php
M includes/api/ApiQueryGlobalGroups.php
M includes/api/ApiQueryGlobalRenameStatus.php
M includes/api/ApiQueryGlobalUserInfo.php
M includes/api/ApiQueryWikiSets.php
M includes/api/ApiSetGlobalAccountStatus.php
M includes/specials/SpecialGlobalRenameRequest.php
13 files changed, 18 insertions(+), 35 deletions(-)


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

diff --git a/.phpcs.xml b/.phpcs.xml
index ffef7f4..eb0da02 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -1,12 +1,9 @@
 
 

-   



-   
-   



diff --git a/includes/CentralAuthHooks.php b/includes/CentralAuthHooks.php
index b84cb05..c4abfe9 100644
--- a/includes/CentralAuthHooks.php
+++ b/includes/CentralAuthHooks.php
@@ -1324,9 +1324,9 @@
return true;
}
 
-   /*
+   /**
 * Handler for UserGetReservedNames
-* @param array $reservedUsernames
+* @param array &$reservedUsernames
 * @return bool
 */
public static function onUserGetReservedNames( &$reservedUsernames ) {
@@ -1451,6 +1451,7 @@
/**
 * Create databases for WMF Jenkins unit tests
 * @param DatabaseUpdater $updater
+* @return true
 */
public static function onLoadExtensionSchemaUpdates( DatabaseUpdater 
$updater ) {
global $wgWikimediaJenkinsCI;
diff --git a/includes/CentralAuthUser.php b/includes/CentralAuthUser.php
index a763bb6..9bb6feb 100644
--- a/includes/CentralAuthUser.php
+++ b/includes/CentralAuthUser.php
@@ -607,6 +607,7 @@
 
/**
 * Return the global-login token for this account.
+* @return string
 */
public function getAuthToken() {
global $wgAuthenticationTokenVersion;
@@ -677,6 +678,7 @@
/**
 * Returns the hidden level of
 * the account.
+* @return string
 */
public function getHiddenLevel() {
$this->loadState();
@@ -2628,6 +2630,7 @@
/**
 * Get the password hash.
 * Automatically converts to a new-style hash
+* @return string
 */
function getPassword() {
$this->loadState();
diff --git a/includes/api/ApiCentralAuthToken.php 
b/includes/api/ApiCentralAuthToken.php
index 855d654..2340cfc 100644
--- a/includes/api/ApiCentralAuthToken.php
+++ b/includes/api/ApiCentralAuthToken.php
@@ -98,9 +98,7 @@
];
}
 
-   /**
-* @see ApiBase::getExamplesMessages()
-*/
+   /** @inheritDoc */
protected function getExamplesMessages() {
return [
'action=centralauthtoken'
diff --git a/includes/api/ApiDeleteGlobalAccount.php 
b/includes/api/ApiDeleteGlobalAccount.php
index 2ab156e..e137604 100644
--- a/includes/api/ApiDeleteGlobalAccount.php
+++ b/includes/api/ApiDeleteGlobalAccount.php
@@ -29,8 +29,8 @@
  * @ingroup Extensions
  */
 class ApiDeleteGlobalAccount extends ApiBase {
-   /* Heavily based on code from SpecialCentralAuth::doSubmit */
public function execute() {
+   // Heavily based on code from SpecialCentralAuth::doSubmit
if ( is_callable( [ $this, 'checkUserRightsAny' ] ) ) {
$this->checkUserRightsAny( 'centralauth-unmerge' );
} else {
@@ -76,9 +76,7 @@
];
}
 
-   /**
-* @see ApiBase::getExamplesMessages()
-*/
+   /** @inheritDoc */
protected function getExamplesMessages() {
return [

'action=deleteglobalaccount=Example=Because+I+can'
diff --git a/includes/api/ApiGlobalUserRights.php 
b/includes/api/ApiGlobalUserRights.php
index 3e418d3..e0b10ae 100644
--- a/includes/api/ApiGlobalUserRights.php
+++ b/includes/api/ApiGlobalUserRights.php
@@ -34,9 +34,7 @@
return CentralAuthUser::availableGlobalGroups();
}
 
-   /**
-* @see ApiBase::getExamplesMessages()
-*/
+   /** @inheritDoc */
protected function getExamplesMessages() {
return [

'action=userrights=FooBot=bot=sysop|bureaucrat=123ABC'
diff --git a/includes/api/ApiQueryGlobalAllUsers.php 
b/includes/api/ApiQueryGlobalAllUsers.php
index

[MediaWiki-commits] [Gerrit] operations/puppet[production]: add dumps config settings stanzas for labs testing

2018-01-07 Thread ArielGlenn (Code Review)

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

Change subject: add dumps config settings stanzas for labs testing
..

add dumps config settings stanzas for labs testing

Change-Id: Idf94b66efd1ceb3b3aace3fd56022b086626aaf0
---
M modules/snapshot/manifests/dumps/configs.pp
M modules/snapshot/manifests/dumps/dblists.pp
M modules/snapshot/templates/dumps/wikidump.conf.erb
3 files changed, 68 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/33/402633/1

diff --git a/modules/snapshot/manifests/dumps/configs.pp 
b/modules/snapshot/manifests/dumps/configs.pp
index bd510ec..cfad2ad 100644
--- a/modules/snapshot/manifests/dumps/configs.pp
+++ b/modules/snapshot/manifests/dumps/configs.pp
@@ -137,6 +137,45 @@
 media => {
 skipdblist=> 
"${dblistsdir}/skipmonitor.dblist,${dblistsdir}/globalusage.dblist",
 }
+labs_small => {
+dblist=> "${apachedir}/dblists/all-labs.dblist",
+closedlist=> "${apachedir}/dblists/closed-labs.dblist",
+flowlist  => "${apachedir}/dblists/flow_only_labs.dblist",
+skipdblist=> "${dblistsdir}/skip-labs.dblist",
+keep  => '2',
+chunksEnabled => '0',
+},
+labs_big => {
+dblist=> "${dblistsdir}/labs_bigwikis.dblist",
+closedlist=> "${apachedir}/dblists/closed-labs.dblist",
+flowlist  => 
"${apachedir}/dblists/flow_only_labs.dblist",
+skipdblist=> "${dblistsdir}/skipmonitor.dblist",
+keep  => '2',
+chunksEnabled => '1',
+chunksForAbstract => '4',
+chunksForPagelogs => '4',
+checkpointTime=> '720',
+recombineHistory  => '0',
+revsPerJob=> '7',
+retryWait => '30',
+maxRetries=> '3',
+revsMargin=> '20',
+fixeddumporder=> '1',
+wikis => {
+enwiki => {
+pagesPerChunkHistory  => '2,4,7,8',
+pagesPerChunkAbstract => '4000',
+},
+simplewiki => {
+pagesPerChunkHistory  => '2,5,9,14',
+pagesPerChunkAbstract => '6',
+},
+wikidatawikiwiki => {
+pagesPerChunkHistory  => '54,3,2,3',
+pagesPerChunkAbstract => '25000',
+},
+},
+},
 },
 }
 
diff --git a/modules/snapshot/manifests/dumps/dblists.pp 
b/modules/snapshot/manifests/dumps/dblists.pp
index d28843e..3dcb1b9 100644
--- a/modules/snapshot/manifests/dumps/dblists.pp
+++ b/modules/snapshot/manifests/dumps/dblists.pp
@@ -10,11 +10,16 @@
 'zhwiki']
 $bigwikis_dblist = join($bigwikis, "\n")
 
+# for testing in deployment-prep
+$labs_bigwikis = ['dewiki', 'simplewiki', 'wikidatawiki']
+$labs_bigwikis_dblist = join($bigwikis, "\n")
+
 # labswiki(s) can't be dumped from snapshot hosts
 $excludewikis = ['labswiki', 'labtestwiki']
 $excludewikis_dblist = join($excludewikis, "\n")
 
 $skip_dblist = 
"${enwiki_dblist}\n${wikidatawiki_dblist}\n${bigwikis_dblist}\n${excludewikis_dblist}"
+$skip_labs_dblist = "${labs_bigwikis_dblist}"
 
 $skipnone_dblist = ''
 
@@ -54,6 +59,14 @@
 group   => 'root',
 content => "${skip_dblist}\n",
 }
+file { "${dblistsdir}/skip-labs.dblist":
+ensure  => 'present',
+path=> "${dblistsdir}/skip-labs.dblist",
+mode=> '0644',
+owner   => 'root',
+group   => 'root',
+content => "${skip_labs_dblist}\n",
+}
 file { "${dblistsdir}/skipmonitor.dblist":
 ensure  => 'present',
 path=> "${dblistsdir}/skipmonitor.dblist",
diff --git a/modules/snapshot/templates/dumps/wikidump.conf.erb 
b/modules/snapshot/templates/dumps/wikidump.conf.erb
index fe04686..d893c99 100644
--- a/modules/snapshot/templates/dumps/wikidump.conf.erb
+++ b/modules/snapshot/templates/dumps/wikidump.conf.erb
@@ -118,6 +118,22 @@
 <% end -%>
 <% end -%>
 
+[labssmall]
+# generic settings for small wikis in labs
+<% @config[@configtype]['labs_small'].keys.sort.each do |bigsetting| -%>
+<% if bigsetting != 'wikis' -%>
+<%= bigsetting %>=<%= @config[@configtype]['labs_small'][bigsetting] %>
+<% end -%>
+<% end -%>
+
+[labsbig]
+# generic settings for big wikis in labs
+<% @config[@configtype]['labs_big'].keys.sort.each do |bigsetting| -%>
+<% if bigsetting !=

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

2018-01-07 Thread Umherirrender (Code Review)

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

Change subject: Improve some parameter docs
..

Improve some parameter docs

Change-Id: Ib7d2baf09f52b269fa3f7e5ca54400db63a9e0dc
---
M .phpcs.xml
M SkinVectorV2.php
2 files changed, 1 insertion(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/VectorV2 
refs/changes/32/402632/1

diff --git a/.phpcs.xml b/.phpcs.xml
index 13d4d33..ea18ce1 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -2,8 +2,6 @@
 


-   
-   



diff --git a/SkinVectorV2.php b/SkinVectorV2.php
index 0b06a9d..3ec3ad2 100644
--- a/SkinVectorV2.php
+++ b/SkinVectorV2.php
@@ -68,6 +68,7 @@
 
/**
 * Override to pass our Config instance to it
+* @inheritDoc
 */
public function setupTemplate( $classname, $repository = false, 
$cache_dir = false ) {
return new $classname( $this->vectorv2Config );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib7d2baf09f52b269fa3f7e5ca54400db63a9e0dc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/VectorV2
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...Metrolook[master]: Improve some parameter docs

2018-01-07 Thread Umherirrender (Code Review)

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

Change subject: Improve some parameter docs
..

Improve some parameter docs

Change-Id: Ib45c5a3eb45373fdc8ef91b95667bc1b94599f0d
---
M .phpcs.xml
M SkinMetrolook.php
M SkinMetrolookHooks.php
3 files changed, 5 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook 
refs/changes/31/402631/1

diff --git a/.phpcs.xml b/.phpcs.xml
index d57c719..3ba9483 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -2,8 +2,6 @@
 


-   
-   

.

diff --git a/SkinMetrolook.php b/SkinMetrolook.php
index 961deff..89ff179 100644
--- a/SkinMetrolook.php
+++ b/SkinMetrolook.php
@@ -118,6 +118,7 @@
 
/**
 * Override to pass our Config instance to it
+* @inheritDoc
 */
public function setupTemplate( $classname, $repository = false, 
$cache_dir = false ) {
return new $classname( $this->metrolookConfig );
diff --git a/SkinMetrolookHooks.php b/SkinMetrolookHooks.php
index 2eae141..d462273 100644
--- a/SkinMetrolookHooks.php
+++ b/SkinMetrolookHooks.php
@@ -72,6 +72,7 @@
 *
 * @param OutputPage $out
 * @param Skin $skin
+* @return true
 */
public static function beforePageDisplay( $out, $skin ) {
if ( $skin instanceof SkinMetrolook ) {
@@ -92,6 +93,7 @@
 *
 * @param User current user $user
 * @param array list of default user preference controls 
&$defaultPreferences
+* @return true
 */
public static function getPreferences( $user, &$defaultPreferences ) {
global $wgMetrolookFeatures;
@@ -113,6 +115,8 @@
 * ResourceLoaderGetConfigVars hook
 *
 * Adds enabled/disabled switches for Vector modules
+* @param array &$vars
+* @return true
 */
public static function resourceLoaderGetConfigVars( &$vars ) {
global $wgMetrolookFeatures, $wgMetrolookSearchBar;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib45c5a3eb45373fdc8ef91b95667bc1b94599f0d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Metrolook
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/core[master]: Improve some parameter docs

2018-01-07 Thread Umherirrender (Code Review)

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

Change subject: Improve some parameter docs
..

Improve some parameter docs

Change-Id: I31e983d7ac287158101b18ad95779d83537302a2
---
M includes/Feed.php
M includes/Preferences.php
M includes/Revision.php
M includes/Storage/RevisionStore.php
M includes/Xml.php
M includes/collation/IcuCollation.php
M includes/libs/objectcache/WANObjectCache.php
M includes/preferences/DefaultPreferencesFactory.php
M includes/resourceloader/ResourceLoader.php
M includes/shell/Result.php
M includes/specialpage/LoginSignupSpecialPage.php
M includes/watcheditem/WatchedItemStore.php
M includes/widget/ComplexNamespaceInputWidget.php
M includes/widget/ComplexTitleInputWidget.php
M includes/widget/DateInputWidget.php
M includes/widget/DateTimeInputWidget.php
M includes/widget/NamespaceInputWidget.php
M includes/widget/SearchInputWidget.php
M includes/widget/SelectWithInputWidget.php
M includes/widget/TitleInputWidget.php
M includes/widget/UsersMultiselectWidget.php
21 files changed, 143 insertions(+), 74 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/30/402630/1

diff --git a/includes/Feed.php b/includes/Feed.php
index 0e715df..92eec08 100644
--- a/includes/Feed.php
+++ b/includes/Feed.php
@@ -153,6 +153,7 @@
/**
 * Get the description of this item without any escaping
 *
+* @return string
 */
public function getDescriptionUnescaped() {
return $this->description;
diff --git a/includes/Preferences.php b/includes/Preferences.php
index 0a41573..37de2a5 100644
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -315,6 +315,7 @@
/**
 * @param array $formData
 * @param PreferencesForm $form
+* @return Status
 */
public static function tryUISubmit( $formData, $form ) {
$preferencesFactory = self::getDefaultPreferencesFactory();
diff --git a/includes/Revision.php b/includes/Revision.php
index 54c6de0..b1440d0 100644
--- a/includes/Revision.php
+++ b/includes/Revision.php
@@ -65,7 +65,7 @@
}
 
/**
-* @param bool|string $wikiId The ID of the target wiki database. Use 
false for the local wiki.
+* @param bool|string $wiki The ID of the target wiki database. Use 
false for the local wiki.
 *
 * @return SqlBlobStore
 */
diff --git a/includes/Storage/RevisionStore.php 
b/includes/Storage/RevisionStore.php
index 2e953fc..0950109 100644
--- a/includes/Storage/RevisionStore.php
+++ b/includes/Storage/RevisionStore.php
@@ -562,6 +562,7 @@
/**
 * MCR migration note: this replaces Revision::isUnpatrolled
 *
+* @param RevisionRecord $rev
 * @return int Rcid of the unpatrolled row, zero if there isn't one
 */
public function isUnpatrolled( RevisionRecord $rev ) {
diff --git a/includes/Xml.php b/includes/Xml.php
index 0091513..b20f66e 100644
--- a/includes/Xml.php
+++ b/includes/Xml.php
@@ -532,8 +532,8 @@
 *
 * @param string $list Correctly formatted text (newline delimited) to 
be
 *   used to generate the options.
-* @param array $params Extra parameters
-* @param string $params['other'] If set, add an option with this as 
text and a value of 'other'
+* @param array $params Extra parameters:
+*   - string $params['other'] If set, add an option with this as text 
and a value of 'other'
 * @return array Array keys are textual labels, values are internal 
values
 */
public static function listDropDownOptions( $list, $params = [] ) {
diff --git a/includes/collation/IcuCollation.php 
b/includes/collation/IcuCollation.php
index 23f02de..36efdb3 100644
--- a/includes/collation/IcuCollation.php
+++ b/includes/collation/IcuCollation.php
@@ -492,7 +492,6 @@
}
 
/**
-* @param string $index
 * @return string
 * @since 1.16.3
 */
diff --git a/includes/libs/objectcache/WANObjectCache.php 
b/includes/libs/objectcache/WANObjectCache.php
index 562819e..409f507 100644
--- a/includes/libs/objectcache/WANObjectCache.php
+++ b/includes/libs/objectcache/WANObjectCache.php
@@ -214,6 +214,9 @@
$this->asyncHandler = isset( $params['asyncHandler'] ) ? 
$params['asyncHandler'] : null;
}
 
+   /**
+* @param LoggerInterface $logger
+*/
public function setLogger( LoggerInterface $logger ) {
$this->logger = $logger;
}
@@ -1238,7 +1241,7 @@
 * @param string $key
 * @param bool $versioned
 * @param float $minTime
-* @param mixed $asOf
+* @param mixed &$asOf
 * @return mixed
 */
protected function getInterimValue( $key, $versioned, $minTime, &$asOf 
) {
diff --git

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add Help Page link in Special:ExpandTemplates

2018-01-07 Thread Jayprakash12345 (Code Review)

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

Change subject: Add Help Page link in Special:ExpandTemplates
..

Add Help Page link in Special:ExpandTemplates

Change-Id: Ice286405ec821c983020ebd6795ae429485c6d3c
---
M includes/specials/SpecialExpandTemplates.php
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/29/402629/2

diff --git a/includes/specials/SpecialExpandTemplates.php 
b/includes/specials/SpecialExpandTemplates.php
index 970c903..966937f 100644
--- a/includes/specials/SpecialExpandTemplates.php
+++ b/includes/specials/SpecialExpandTemplates.php
@@ -56,6 +56,8 @@
global $wgParser;
 
$this->setHeaders();
+  
+   $this->addHelpLink( 'Help:ExpandTemplates' );
 
$request = $this->getRequest();
$titleStr = $request->getText( 'wpContextTitle' );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ice286405ec821c983020ebd6795ae429485c6d3c
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Jayprakash12345 <0freerunn...@gmail.com>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add Help Page link in Special:ApiSandbox

2018-01-07 Thread Jayprakash12345 (Code Review)

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

Change subject: Add Help Page link in Special:ApiSandbox
..

Add Help Page link in Special:ApiSandbox

Change-Id: I61ca80947c331bbdbe59feff5f33942a7d800a51
---
M includes/specials/SpecialApiSandbox.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/28/402628/2

diff --git a/includes/specials/SpecialApiSandbox.php 
b/includes/specials/SpecialApiSandbox.php
index e994347..f2be9be 100644
--- a/includes/specials/SpecialApiSandbox.php
+++ b/includes/specials/SpecialApiSandbox.php
@@ -33,6 +33,7 @@
public function execute( $par ) {
$this->setHeaders();
$out = $this->getOutput();
+   $this->addHelpLink( 'Help:Apisandbox' ); // T184365
 
if ( !$this->getConfig()->get( 'EnableAPI' ) ) {
$out->showErrorPage( 'error', 'apisandbox-api-disabled' 
);

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I61ca80947c331bbdbe59feff5f33942a7d800a51
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Jayprakash12345 <0freerunn...@gmail.com>

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

86 matches

Mail list logo