[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add new Apertium pairs: crh-tur and cat-srd

[Alexandros Kosiaris (Code Review)]

Alexandros Kosiaris has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/391511 )

Change subject: Add new Apertium pairs: crh-tur and cat-srd
..


Add new Apertium pairs: crh-tur and cat-srd

Bug: T178139
Change-Id: I1a8db0210f44fa4db9be45bda6c91bcc26733fad
---
M modules/profile/manifests/apertium.pp
1 file changed, 4 insertions(+), 0 deletions(-)

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



diff --git a/modules/profile/manifests/apertium.pp 
b/modules/profile/manifests/apertium.pp
index 4345fb1..6bf902c 100644
--- a/modules/profile/manifests/apertium.pp
+++ b/modules/profile/manifests/apertium.pp
@@ -35,6 +35,9 @@
 'apertium-br-fr',
 'apertium-ca-it',
 'apertium-cat',
+'apertium-cat-srd',
+'apertium-crh',
+'apertium-crh-tur',
 'apertium-cy-en',
 'apertium-dan',
 'apertium-dan-nor',
@@ -89,6 +92,7 @@
 'apertium-swe-dan',
 'apertium-swe-nor',
 'apertium-tat',
+'apertium-tur',
 'apertium-urd',
 'apertium-urd-hin',
 'cg3',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1a8db0210f44fa4db9be45bda6c91bcc26733fad
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: KartikMistry 
Gerrit-Reviewer: Alexandros Kosiaris 
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/puppet[production]: tools.my.cnf: Replication filter for i_psub

[Marostegui (Code Review)]

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

Change subject: tools.my.cnf: Replication filter for i_psub
..


tools.my.cnf: Replication filter for i_psub

The table  s51290__dpl_p.i_psub gets recreated in MEMORY all the time
and it reaches the size limit, breaking replication.
This needs to be fixed by the user

Bug: T180560
Change-Id: I0236ce55bf5aeec797a61e8edb7f7dbdd498b1c2
---
M modules/role/templates/mariadb/mysqld_config/tools.my.cnf.erb
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/modules/role/templates/mariadb/mysqld_config/tools.my.cnf.erb 
b/modules/role/templates/mariadb/mysqld_config/tools.my.cnf.erb
index d30fef9..8e581f0 100644
--- a/modules/role/templates/mariadb/mysqld_config/tools.my.cnf.erb
+++ b/modules/role/templates/mariadb/mysqld_config/tools.my.cnf.erb
@@ -68,6 +68,7 @@
 replicate_wild_ignore_table= s52721\_\_pagecount\_stats\_p.%
 # T180560
 replicate_wild_ignore_table= s51290__dpl_p.i_orphan_candidates
+replicate_wild_ignore_table= s51290__dpl_p.i_psub
 
 table_open_cache   = 5000
 table_definition_cache = 4000

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0236ce55bf5aeec797a61e8edb7f7dbdd498b1c2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
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/puppet[production]: tools.my.cnf: Replication filter for i_psub

[Marostegui (Code Review)]

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

Change subject: tools.my.cnf: Replication filter for i_psub
..

tools.my.cnf: Replication filter for i_psub

The table  s51290__dpl_p.i_psub gets recreated in MEMORY all the time
and it reaches the size limit, breaking replication.
This needs to be fixed by the user

Bug: T180560
Change-Id: I0236ce55bf5aeec797a61e8edb7f7dbdd498b1c2
---
M modules/role/templates/mariadb/mysqld_config/tools.my.cnf.erb
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/13/391513/1

diff --git a/modules/role/templates/mariadb/mysqld_config/tools.my.cnf.erb 
b/modules/role/templates/mariadb/mysqld_config/tools.my.cnf.erb
index d30fef9..8e581f0 100644
--- a/modules/role/templates/mariadb/mysqld_config/tools.my.cnf.erb
+++ b/modules/role/templates/mariadb/mysqld_config/tools.my.cnf.erb
@@ -68,6 +68,7 @@
 replicate_wild_ignore_table= s52721\_\_pagecount\_stats\_p.%
 # T180560
 replicate_wild_ignore_table= s51290__dpl_p.i_orphan_candidates
+replicate_wild_ignore_table= s51290__dpl_p.i_psub
 
 table_open_cache   = 5000
 table_definition_cache = 4000

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0236ce55bf5aeec797a61e8edb7f7dbdd498b1c2
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/puppet[production]: Add apertium-crh-tur packages

[KartikMistry (Code Review)]

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

Change subject: Add apertium-crh-tur packages
..

Add apertium-crh-tur packages

Bug: T178139
Change-Id: I1a8db0210f44fa4db9be45bda6c91bcc26733fad
---
M modules/profile/manifests/apertium.pp
1 file changed, 4 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/11/391511/1

diff --git a/modules/profile/manifests/apertium.pp 
b/modules/profile/manifests/apertium.pp
index 4345fb1..4cb650f 100644
--- a/modules/profile/manifests/apertium.pp
+++ b/modules/profile/manifests/apertium.pp
@@ -34,7 +34,9 @@
 'apertium-bel-rus',
 'apertium-br-fr',
 'apertium-ca-it',
-'apertium-cat',
+'apertium-cat'
+'apertium-crh',
+'apertium-crh-tur',
 'apertium-cy-en',
 'apertium-dan',
 'apertium-dan-nor',
@@ -89,6 +91,7 @@
 'apertium-swe-dan',
 'apertium-swe-nor',
 'apertium-tat',
+'apertium-tur',
 'apertium-urd',
 'apertium-urd-hin',
 'cg3',

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Really autoload client class in Repo-only mode tests

[WMDE-leszek (Code Review)]

WMDE-leszek has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/391510 )

Change subject: Really autoload client class in Repo-only mode tests
..

Really autoload client class in Repo-only mode tests

Doing Ic3c3f2b969064c65cc4dc69d65392bbdb8b7ff99 right.

Change-Id: Icb197448fcc85d41e893f695953adf753ea5cb59
---
M repo/Wikibase.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/10/391510/1

diff --git a/repo/Wikibase.php b/repo/Wikibase.php
index bd52030..22f3177 100644
--- a/repo/Wikibase.php
+++ b/repo/Wikibase.php
@@ -74,7 +74,7 @@
 // Load autoload info as long as extension classes are not PSR-4-autoloaded
 require_once __DIR__  . '/autoload.php';
 // Nasty hack: some repo's tests rely on classes defined in Client! Load it in 
repo-only mode to have tests pass
-if ( !defined( 'WB_VERSION' ) && defined( 'MW_PHPUNIT_TEST' ) ) {
+if ( !defined( 'WBC_VERSION' ) && defined( 'MW_PHPUNIT_TEST' ) ) {
global $wgAutoloadClasses;
$wgAutoloadClasses['Wikibase\\Client\\Store\\TitleFactory'] = __DIR__ . 
'/../client/includes/Store/TitleFactory.php';
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icb197448fcc85d41e893f695953adf753ea5cb59
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: WMDE-leszek 

___
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 db1071 and db1099

[jenkins-bot (Code Review)]

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

Change subject: db-eqiad.php: Depool db1071 and db1099
..


db-eqiad.php: Depool db1071 and db1099

db1071 and db1099 need a schema change

Bug: T174569
Change-Id: Ic2970f6e4a98be445ba7e6bcde441b9a95932b2a
---
M wmf-config/db-eqiad.php
1 file changed, 9 insertions(+), 9 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 171ed37..66cfe45 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -145,12 +145,12 @@
's5' => [
'db1063' => 0,   # C5 2.8TB 128GB, master
'db1070' => 1,   # D1 2.8TB 160GB, vslow, dump #ROW based 
replication - master for db1095
-   'db1071' => 1,   # D1 2.8TB 160GB, api
-   'db1082' => 300, # A2 3.6TB 512GB, api
+   # 'db1071' => 1,   # D1 2.8TB 160GB, api #T174569
+   'db1082' => 100, # A2 3.6TB 512GB, api
'db1087' => 500, # C2 3.6TB 512GB
'db1092' => 500, # D2 3.6TB 512GB
'db1096' => 1,   # A6 3.6TB 512GB, watchlist, recentchanges, 
contributions, logpager
-   'db1099' => 1,   # B2 3.6TB 512GB, watchlist, recentchanges, 
contributions, logpager
+   # 'db1099' => 1,   # B2 3.6TB 512GB, watchlist, recentchanges, 
contributions, logpager #T174569
'db1100' => 1,   # C2 3.6TB 512GB, old master
# 'db1104' => 100,  # B3 3.6TB 512GB
'db1106' => 300,  # D3 3.6TB 512GB
@@ -388,28 +388,28 @@
'db1070' => 1,
],
'api' => [
-   'db1071' => 1,
+   # 'db1071' => 1,
'db1082' => 1,
],
'watchlist' => [
'db1096' => 1,
-   'db1099' => 1,
+   # 'db1099' => 1,
],
'recentchanges' => [
'db1096' => 1,
-   'db1099' => 1,
+   # 'db1099' => 1,
],
'recentchangeslinked' => [
'db1096' => 1,
-   'db1099' => 1,
+   # 'db1099' => 1,
],
'contributions' => [
'db1096' => 1,
-   'db1099' => 1,
+   # 'db1099' => 1,
],
'logpager' => [
'db1096' => 1,
-   'db1099' => 1,
+   # 'db1099' => 1,
],
],
's6' => [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic2970f6e4a98be445ba7e6bcde441b9a95932b2a
Gerrit-PatchSet: 2
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] operations/mediawiki-config[master]: db-eqiad.php: Depool db1071 and db1099

[Marostegui (Code Review)]

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

Change subject: db-eqiad.php: Depool db1071 and db1099
..

db-eqiad.php: Depool db1071 and db1099

db1071 and db1099 need a schema change

Bug: T174569
Change-Id: Ic2970f6e4a98be445ba7e6bcde441b9a95932b2a
---
M wmf-config/db-eqiad.php
1 file changed, 8 insertions(+), 8 deletions(-)


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 171ed37..e84f8a9 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -145,12 +145,12 @@
's5' => [
'db1063' => 0,   # C5 2.8TB 128GB, master
'db1070' => 1,   # D1 2.8TB 160GB, vslow, dump #ROW based 
replication - master for db1095
-   'db1071' => 1,   # D1 2.8TB 160GB, api
+   # 'db1071' => 1,   # D1 2.8TB 160GB, api #T174569
'db1082' => 300, # A2 3.6TB 512GB, api
'db1087' => 500, # C2 3.6TB 512GB
'db1092' => 500, # D2 3.6TB 512GB
'db1096' => 1,   # A6 3.6TB 512GB, watchlist, recentchanges, 
contributions, logpager
-   'db1099' => 1,   # B2 3.6TB 512GB, watchlist, recentchanges, 
contributions, logpager
+   # 'db1099' => 1,   # B2 3.6TB 512GB, watchlist, recentchanges, 
contributions, logpager #T174569
'db1100' => 1,   # C2 3.6TB 512GB, old master
# 'db1104' => 100,  # B3 3.6TB 512GB
'db1106' => 300,  # D3 3.6TB 512GB
@@ -388,28 +388,28 @@
'db1070' => 1,
],
'api' => [
-   'db1071' => 1,
+   # 'db1071' => 1,
'db1082' => 1,
],
'watchlist' => [
'db1096' => 1,
-   'db1099' => 1,
+   # 'db1099' => 1,
],
'recentchanges' => [
'db1096' => 1,
-   'db1099' => 1,
+   # 'db1099' => 1,
],
'recentchangeslinked' => [
'db1096' => 1,
-   'db1099' => 1,
+   # 'db1099' => 1,
],
'contributions' => [
'db1096' => 1,
-   'db1099' => 1,
+   # 'db1099' => 1,
],
'logpager' => [
'db1096' => 1,
-   'db1099' => 1,
+   # 'db1099' => 1,
],
],
's6' => [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic2970f6e4a98be445ba7e6bcde441b9a95932b2a
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]: Revert "db-eqiad.php: Depool db1106 and db1100"

[jenkins-bot (Code Review)]

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

Change subject: Revert "db-eqiad.php: Depool db1106 and db1100"
..


Revert "db-eqiad.php: Depool db1106 and db1100"

This reverts commit 23f88985d9829a499907f31cbd4c00c6884ce842.

Change-Id: Iaba3a88bb0e1d80607ea321ae219110da73f0912
---
M wmf-config/db-eqiad.php
1 file changed, 3 insertions(+), 3 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 5c78778..171ed37 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -151,9 +151,9 @@
'db1092' => 500, # D2 3.6TB 512GB
'db1096' => 1,   # A6 3.6TB 512GB, watchlist, recentchanges, 
contributions, logpager
'db1099' => 1,   # B2 3.6TB 512GB, watchlist, recentchanges, 
contributions, logpager
-   # 'db1100' => 1,   # C2 3.6TB 512GB, old master #T174569
-   # 'db1104' => 100,  # B3 3.6TB 512GB #T174569
-   # 'db1106' => 300,  # D3 3.6TB 512GB #T174569
+   'db1100' => 1,   # C2 3.6TB 512GB, old master
+   # 'db1104' => 100,  # B3 3.6TB 512GB
+   'db1106' => 300,  # D3 3.6TB 512GB
],
's6' => [
'db1061' => 0,   # C3 2.8TB 128GB, master

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iaba3a88bb0e1d80607ea321ae219110da73f0912
Gerrit-PatchSet: 2
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] operations/puppet[production]: tools.my.cnf: Replication filter: s51290__dpl_p

[Marostegui (Code Review)]

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

Change subject: tools.my.cnf: Replication filter: s51290__dpl_p
..


tools.my.cnf: Replication filter: s51290__dpl_p

Add new replication filter to ignore an in MEMORY table
See T180560

Bug: T180560
Change-Id: I3788c57e76b0f145a3699b15f00a977b90a29479
---
M modules/role/templates/mariadb/mysqld_config/tools.my.cnf.erb
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/modules/role/templates/mariadb/mysqld_config/tools.my.cnf.erb 
b/modules/role/templates/mariadb/mysqld_config/tools.my.cnf.erb
index 9d25c27..d30fef9 100644
--- a/modules/role/templates/mariadb/mysqld_config/tools.my.cnf.erb
+++ b/modules/role/templates/mariadb/mysqld_config/tools.my.cnf.erb
@@ -66,6 +66,8 @@
 replicate_wild_ignore_table= s51412\_\_data.%
 replicate_wild_ignore_table= s51071\_\_templatetiger\_p.%
 replicate_wild_ignore_table= s52721\_\_pagecount\_stats\_p.%
+# T180560
+replicate_wild_ignore_table= s51290__dpl_p.i_orphan_candidates
 
 table_open_cache   = 5000
 table_definition_cache = 4000

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3788c57e76b0f145a3699b15f00a977b90a29479
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
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/puppet[production]: tools.my.cnf: Replication filter: s51290__dpl_p

[Marostegui (Code Review)]

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

Change subject: tools.my.cnf: Replication filter: s51290__dpl_p
..

tools.my.cnf: Replication filter: s51290__dpl_p

Add new replication filter to ignore an in MEMORY table
See T180560

Bug: T180560
Change-Id: I3788c57e76b0f145a3699b15f00a977b90a29479
---
M modules/role/templates/mariadb/mysqld_config/tools.my.cnf.erb
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/08/391508/1

diff --git a/modules/role/templates/mariadb/mysqld_config/tools.my.cnf.erb 
b/modules/role/templates/mariadb/mysqld_config/tools.my.cnf.erb
index 9d25c27..d30fef9 100644
--- a/modules/role/templates/mariadb/mysqld_config/tools.my.cnf.erb
+++ b/modules/role/templates/mariadb/mysqld_config/tools.my.cnf.erb
@@ -66,6 +66,8 @@
 replicate_wild_ignore_table= s51412\_\_data.%
 replicate_wild_ignore_table= s51071\_\_templatetiger\_p.%
 replicate_wild_ignore_table= s52721\_\_pagecount\_stats\_p.%
+# T180560
+replicate_wild_ignore_table= s51290__dpl_p.i_orphan_candidates
 
 table_open_cache   = 5000
 table_definition_cache = 4000

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3788c57e76b0f145a3699b15f00a977b90a29479
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] mediawiki/core[REL1_28]: Fix phpcs issues from LanguageConverter patches

[Brian Wolff (Code Review)]

Brian Wolff has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/391507 )

Change subject: Fix phpcs issues from LanguageConverter patches
..


Fix phpcs issues from LanguageConverter patches

Change-Id: I34e57c90ffd40fbd9f8afe3c57dd73fa7f655841
(cherry picked from commit f600b4ede9a6390cc5e929d2a48ed98af2edbc60)
---
M languages/LanguageConverter.php
M tests/phpunit/languages/LanguageConverterTest.php
2 files changed, 5 insertions(+), 3 deletions(-)

Approvals:
  Brian Wolff: Verified; Looks good to me, approved



diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index ebff245..9987f64 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -420,11 +420,11 @@
$log = LoggerFactory::getInstance( 
'languageconverter' );
$log->error( "Hit pcre.backtrack_limit in " . 
__METHOD__
. ". Disabling language conversion for 
this page.",
-   array(
+   [
"method" => __METHOD__,
"variant" => $toVariant,
"startOfText" => substr( $text, 
0, 500 )
-   )
+   ]
);
return $text;
}
@@ -682,7 +682,9 @@
 
$noScript = '.*?<\/script>(*SKIP)(*FAIL)';
$noStyle = '.*?<\/style>(*SKIP)(*FAIL)';
+   // @codingStandardsIgnoreStart Generic.Files.LineLength.TooLong
$noHtml = 
'<(?:[^>=]*+(?>[^>=]*+=\s*+(?:"[^"]*"|\'[^\']*\'|[^\'">\s]*+))*+[^>=]*+>|.*+)(*SKIP)(*FAIL)';
+   // @codingStandardsIgnoreEnd
while ( $startPos < $length && $continue ) {
$continue = preg_match(
// Only match -{ outside of html.
diff --git a/tests/phpunit/languages/LanguageConverterTest.php 
b/tests/phpunit/languages/LanguageConverterTest.php
index 331368e..fc2ed33 100644
--- a/tests/phpunit/languages/LanguageConverterTest.php
+++ b/tests/phpunit/languages/LanguageConverterTest.php
@@ -167,7 +167,7 @@
$testString .= 'xxx xxx xxx';
}
$testString .= "\n";
-   $old = ini_set('pcre.backtrack_limit', 200 );
+   $old = ini_set( 'pcre.backtrack_limit', 200 );
$result = $this->lc->autoConvert( $testString, 'tg-latn' );
ini_set( 'pcre.backtrack_limit', $old );
// The в in the id attribute should not get converted to a v

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I34e57c90ffd40fbd9f8afe3c57dd73fa7f655841
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_28
Gerrit-Owner: Brian Wolff 
Gerrit-Reviewer: Brian Wolff 
Gerrit-Reviewer: Reedy 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_28]: Fix phpcs issues from LanguageConverter patches

[Brian Wolff (Code Review)]

Brian Wolff has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/391507 )

Change subject: Fix phpcs issues from LanguageConverter patches
..

Fix phpcs issues from LanguageConverter patches

Change-Id: I34e57c90ffd40fbd9f8afe3c57dd73fa7f655841
(cherry picked from commit f600b4ede9a6390cc5e929d2a48ed98af2edbc60)
---
M languages/LanguageConverter.php
M tests/phpunit/languages/LanguageConverterTest.php
2 files changed, 5 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/07/391507/1

diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index ebff245..9987f64 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -420,11 +420,11 @@
$log = LoggerFactory::getInstance( 
'languageconverter' );
$log->error( "Hit pcre.backtrack_limit in " . 
__METHOD__
. ". Disabling language conversion for 
this page.",
-   array(
+   [
"method" => __METHOD__,
"variant" => $toVariant,
"startOfText" => substr( $text, 
0, 500 )
-   )
+   ]
);
return $text;
}
@@ -682,7 +682,9 @@
 
$noScript = '.*?<\/script>(*SKIP)(*FAIL)';
$noStyle = '.*?<\/style>(*SKIP)(*FAIL)';
+   // @codingStandardsIgnoreStart Generic.Files.LineLength.TooLong
$noHtml = 
'<(?:[^>=]*+(?>[^>=]*+=\s*+(?:"[^"]*"|\'[^\']*\'|[^\'">\s]*+))*+[^>=]*+>|.*+)(*SKIP)(*FAIL)';
+   // @codingStandardsIgnoreEnd
while ( $startPos < $length && $continue ) {
$continue = preg_match(
// Only match -{ outside of html.
diff --git a/tests/phpunit/languages/LanguageConverterTest.php 
b/tests/phpunit/languages/LanguageConverterTest.php
index 331368e..fc2ed33 100644
--- a/tests/phpunit/languages/LanguageConverterTest.php
+++ b/tests/phpunit/languages/LanguageConverterTest.php
@@ -167,7 +167,7 @@
$testString .= 'xxx xxx xxx';
}
$testString .= "\n";
-   $old = ini_set('pcre.backtrack_limit', 200 );
+   $old = ini_set( 'pcre.backtrack_limit', 200 );
$result = $this->lc->autoConvert( $testString, 'tg-latn' );
ini_set( 'pcre.backtrack_limit', $old );
// The в in the id attribute should not get converted to a v

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I34e57c90ffd40fbd9f8afe3c57dd73fa7f655841
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_28
Gerrit-Owner: Brian Wolff 
Gerrit-Reviewer: Reedy 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "db-eqiad.php: Depool db1106 and db1100"

[Marostegui (Code Review)]

Hello jenkins-bot, Jcrespo,

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

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

to review the following change.


Change subject: Revert "db-eqiad.php: Depool db1106 and db1100"
..

Revert "db-eqiad.php: Depool db1106 and db1100"

This reverts commit 23f88985d9829a499907f31cbd4c00c6884ce842.

Change-Id: Iaba3a88bb0e1d80607ea321ae219110da73f0912
---
M wmf-config/db-eqiad.php
1 file changed, 3 insertions(+), 3 deletions(-)


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index e3504e8..14635db 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -151,9 +151,9 @@
'db1092' => 500, # D2 3.6TB 512GB
'db1096' => 1,   # A6 3.6TB 512GB, watchlist, recentchanges, 
contributions, logpager
'db1099' => 1,   # B2 3.6TB 512GB, watchlist, recentchanges, 
contributions, logpager
-   # 'db1100' => 1,   # C2 3.6TB 512GB, old master #T174569
-   # 'db1104' => 100,  # B3 3.6TB 512GB #T174569
-   # 'db1106' => 300,  # D3 3.6TB 512GB #T174569
+   'db1100' => 1,   # C2 3.6TB 512GB, old master
+   # 'db1104' => 100,  # B3 3.6TB 512GB
+   'db1106' => 300,  # D3 3.6TB 512GB
],
's6' => [
'db1061' => 0,   # C3 2.8TB 128GB, master

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaba3a88bb0e1d80607ea321ae219110da73f0912
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Marostegui 
Gerrit-Reviewer: Jcrespo 
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]: Updated phpunit/phpunit from v4.8.35 to v4.8.36 in correct R...

[jenkins-bot (Code Review)]

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

Change subject: Updated phpunit/phpunit from v4.8.35 to v4.8.36 in correct 
RELEASE-NOTES
..


Updated phpunit/phpunit from v4.8.35 to v4.8.36 in correct RELEASE-NOTES

Change-Id: I034e234348755e6746fbd9755d070f10bf91303d
---
M RELEASE-NOTES-1.30
M RELEASE-NOTES-1.31
2 files changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/RELEASE-NOTES-1.30 b/RELEASE-NOTES-1.30
index d92c38c..1449dab 100644
--- a/RELEASE-NOTES-1.30
+++ b/RELEASE-NOTES-1.30
@@ -87,6 +87,7 @@
 * Updated OOjs from v2.0.0 to v2.1.0.
 * Updated OOUI from v0.21.1 to v0.23.0.
 * Updated QUnit from v1.23.1 to v2.4.0.
+* Updated phpunit/phpunit from v4.8.35 to v4.8.36.
 
  New external libraries 
 * The class \TestingAccessWrapper has been moved to the external library
diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31
index 9ded68c..49bcbe4 100644
--- a/RELEASE-NOTES-1.31
+++ b/RELEASE-NOTES-1.31
@@ -24,7 +24,7 @@
 === External library changes in 1.31 ===
 
  Upgraded external libraries 
-* Updated dev dependancy phpunit/phpunit from v4.8.35 to v4.8.36.
+* …
 
  New external libraries 
 * …

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I034e234348755e6746fbd9755d070f10bf91303d
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Reedy 
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/core[REL1_28]: Follow-up I077d30c50 fix phpcs error

[Brian Wolff (Code Review)]

Brian Wolff has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/391505 )

Change subject: Follow-up I077d30c50 fix phpcs error
..

Follow-up I077d30c50 fix phpcs error

Change-Id: I28cb7060d6149d96ceb0dcad7e2bff2ed3434411
---
M languages/LanguageConverter.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/05/391505/1

diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index 6760527..ebff245 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -404,7 +404,7 @@
// We hit the end.
$elementPos = strlen( $text );
$element = '';
-   } elseif( substr( $element, -1 ) === "\004" ) {
+   } elseif ( substr( $element, -1 ) === "\004" ) {
// This can sometimes happen if we have
// unclosed html tags (For example
// when converting a title attribute

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I28cb7060d6149d96ceb0dcad7e2bff2ed3434411
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_28
Gerrit-Owner: Brian Wolff 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_28]: Follow-up I077d30c50 fix phpcs error

[Brian Wolff (Code Review)]

Brian Wolff has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/391505 )

Change subject: Follow-up I077d30c50 fix phpcs error
..


Follow-up I077d30c50 fix phpcs error

Change-Id: I28cb7060d6149d96ceb0dcad7e2bff2ed3434411
---
M languages/LanguageConverter.php
1 file changed, 1 insertion(+), 1 deletion(-)



diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index 6760527..ebff245 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -404,7 +404,7 @@
// We hit the end.
$elementPos = strlen( $text );
$element = '';
-   } elseif( substr( $element, -1 ) === "\004" ) {
+   } elseif ( substr( $element, -1 ) === "\004" ) {
// This can sometimes happen if we have
// unclosed html tags (For example
// when converting a title attribute

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I28cb7060d6149d96ceb0dcad7e2bff2ed3434411
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_28
Gerrit-Owner: Brian Wolff 
Gerrit-Reviewer: Brian Wolff 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_29]: Follow-up I077d30c50 fix phpcs error

[Brian Wolff (Code Review)]

Brian Wolff has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/391504 )

Change subject: Follow-up I077d30c50 fix phpcs error
..


Follow-up I077d30c50 fix phpcs error

Change-Id: I28cb7060d6149d96ceb0dcad7e2bff2ed3434411
---
M languages/LanguageConverter.php
1 file changed, 1 insertion(+), 1 deletion(-)



diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index 187727f..a35366f 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -409,7 +409,7 @@
// We hit the end.
$elementPos = strlen( $text );
$element = '';
-   } elseif( substr( $element, -1 ) === "\004" ) {
+   } elseif ( substr( $element, -1 ) === "\004" ) {
// This can sometimes happen if we have
// unclosed html tags (For example
// when converting a title attribute

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I28cb7060d6149d96ceb0dcad7e2bff2ed3434411
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_29
Gerrit-Owner: Brian Wolff 
Gerrit-Reviewer: Brian Wolff 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_29]: Follow-up I077d30c50 fix phpcs error

[Brian Wolff (Code Review)]

Brian Wolff has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/391504 )

Change subject: Follow-up I077d30c50 fix phpcs error
..

Follow-up I077d30c50 fix phpcs error

Change-Id: I28cb7060d6149d96ceb0dcad7e2bff2ed3434411
---
M languages/LanguageConverter.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/04/391504/1

diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index 187727f..a35366f 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -409,7 +409,7 @@
// We hit the end.
$elementPos = strlen( $text );
$element = '';
-   } elseif( substr( $element, -1 ) === "\004" ) {
+   } elseif ( substr( $element, -1 ) === "\004" ) {
// This can sometimes happen if we have
// unclosed html tags (For example
// when converting a title attribute

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I28cb7060d6149d96ceb0dcad7e2bff2ed3434411
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_29
Gerrit-Owner: Brian Wolff 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_30]: Follow-up I077d30c50 fix phpcs error

[Brian Wolff (Code Review)]

Brian Wolff has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/391503 )

Change subject: Follow-up I077d30c50 fix phpcs error
..

Follow-up I077d30c50 fix phpcs error

Change-Id: I28cb7060d6149d96ceb0dcad7e2bff2ed3434411
---
M languages/LanguageConverter.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/03/391503/1

diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index 1d78402..1f720af 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -403,7 +403,7 @@
// We hit the end.
$elementPos = strlen( $text );
$element = '';
-   } elseif( substr( $element, -1 ) === "\004" ) {
+   } elseif ( substr( $element, -1 ) === "\004" ) {
// This can sometimes happen if we have
// unclosed html tags (For example
// when converting a title attribute

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I28cb7060d6149d96ceb0dcad7e2bff2ed3434411
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_30
Gerrit-Owner: Brian Wolff 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_30]: Follow-up I077d30c50 fix phpcs error

[Brian Wolff (Code Review)]

Brian Wolff has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/391503 )

Change subject: Follow-up I077d30c50 fix phpcs error
..


Follow-up I077d30c50 fix phpcs error

Change-Id: I28cb7060d6149d96ceb0dcad7e2bff2ed3434411
---
M languages/LanguageConverter.php
1 file changed, 1 insertion(+), 1 deletion(-)



diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index 1d78402..1f720af 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -403,7 +403,7 @@
// We hit the end.
$elementPos = strlen( $text );
$element = '';
-   } elseif( substr( $element, -1 ) === "\004" ) {
+   } elseif ( substr( $element, -1 ) === "\004" ) {
// This can sometimes happen if we have
// unclosed html tags (For example
// when converting a title attribute

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I28cb7060d6149d96ceb0dcad7e2bff2ed3434411
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_30
Gerrit-Owner: Brian Wolff 
Gerrit-Reviewer: Brian Wolff 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Follow-up I077d30c50 fix phpcs error

[Brian Wolff (Code Review)]

Brian Wolff has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/391502 )

Change subject: Follow-up I077d30c50 fix phpcs error
..


Follow-up I077d30c50 fix phpcs error

Change-Id: I28cb7060d6149d96ceb0dcad7e2bff2ed3434411
---
M languages/LanguageConverter.php
1 file changed, 1 insertion(+), 1 deletion(-)



diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index 1d78402..1f720af 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -403,7 +403,7 @@
// We hit the end.
$elementPos = strlen( $text );
$element = '';
-   } elseif( substr( $element, -1 ) === "\004" ) {
+   } elseif ( substr( $element, -1 ) === "\004" ) {
// This can sometimes happen if we have
// unclosed html tags (For example
// when converting a title attribute

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I28cb7060d6149d96ceb0dcad7e2bff2ed3434411
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff 
Gerrit-Reviewer: Brian Wolff 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Follow-up I077d30c50 fix phpcs error

[Brian Wolff (Code Review)]

Brian Wolff has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/391502 )

Change subject: Follow-up I077d30c50 fix phpcs error
..

Follow-up I077d30c50 fix phpcs error

Change-Id: I28cb7060d6149d96ceb0dcad7e2bff2ed3434411
---
M languages/LanguageConverter.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/02/391502/1

diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index 1d78402..1f720af 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -403,7 +403,7 @@
// We hit the end.
$elementPos = strlen( $text );
$element = '';
-   } elseif( substr( $element, -1 ) === "\004" ) {
+   } elseif ( substr( $element, -1 ) === "\004" ) {
// This can sometimes happen if we have
// unclosed html tags (For example
// when converting a title attribute

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I28cb7060d6149d96ceb0dcad7e2bff2ed3434411
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff 

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

[MediaWiki-commits] [Gerrit] mediawiki...CentralNotice[master]: Don't load CentralNotice on history or diff pages

[jenkins-bot (Code Review)]

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

Change subject: Don't load CentralNotice on history or diff pages
..


Don't load CentralNotice on history or diff pages

History and diff pages have one-click rollback links. Delayed loading
of CentralNotice banners on these pages can cause users to misclick
these links. It is safer, and affects relatively few pageviews, to not
load CentralNotice on these pages. We already avoid loading on Special
pages.

Bug: T176656
Change-Id: Icf31d9f00b7c74c5eca661ce9f759b7fbab74cd3
---
M CentralNotice.hooks.php
1 file changed, 5 insertions(+), 2 deletions(-)

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



diff --git a/CentralNotice.hooks.php b/CentralNotice.hooks.php
index b980767..92fed08 100644
--- a/CentralNotice.hooks.php
+++ b/CentralNotice.hooks.php
@@ -168,9 +168,12 @@
// TODO Separate geoIP from CentralNotice
$out->addModules( 'ext.centralNotice.geoIP' );
 
-   // If we're editing or we're on a special page, bow out now
+   // If we're on a special page, editing, viewing history or a 
diff, bow out now
+   // This is to reduce chance of bad misclicks from delayed 
banner loading
if ( $out->getTitle()->inNamespace( NS_SPECIAL ) ||
-   ( $wgRequest->getText( 'action' ) === 'edit' )
+   ( $wgRequest->getText( 'action' ) === 'edit' ) ||
+   ( $wgRequest->getText( 'action' ) === 'history' ) ||
+   $wgRequest->getCheck( 'diff' )
) {
return true;
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icf31d9f00b7c74c5eca661ce9f759b7fbab74cd3
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: master
Gerrit-Owner: Pcoombe 
Gerrit-Reviewer: AndyRussG 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: XenoRyet 
Gerrit-Reviewer: Zfilipin 
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[REL1_27]: Fix langauge converter parser test with self-close tags

[Brian Wolff (Code Review)]

Brian Wolff has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/391501 )

Change subject: Fix langauge converter parser test with self-close tags
..

Fix langauge converter parser test with self-close tags

This fixes an issue in f21f3942 where if there was an html
element with an alt or title attribute containing an 
entity, an ascii EOT control character (0x04) may become
inserted into the text if language converter was enabled.

Due to a really old bug in language converter, self-closed tags
got turned into non-self closed tags. However due a different
bug which was fixed in f21f3942 this code path was rarely taken
so nobody noticed until now.

Follow-up Idbc45cac12

Bug: T180552
Change-Id: I077d30c50fcb419837fef937d27caca307153d2d
---
M languages/LanguageConverter.php
M tests/parser/parserTests.txt
2 files changed, 17 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/01/391501/1

diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index 28c75e1..7b5abb2 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -354,7 +354,6 @@
if ( $this->guessVariant( $text, $toVariant ) ) {
return $text;
}
-
/* we convert everything except:
   1. HTML markups (anything between < and >)
   2. HTML entities
@@ -389,6 +388,7 @@
 
// Guard against delimiter nulls in the input
$text = str_replace( "\000", '', $text );
+   $text = str_replace( "\004", '', $text );
 
$markupMatches = null;
$elementMatches = null;
@@ -403,6 +403,13 @@
// We hit the end.
$elementPos = strlen( $text );
$element = '';
+   } elseif ( substr( $element, -1 ) === "\004" ) {
+   // This can sometimes happen if we have
+   // unclosed html tags (For example
+   // when converting a title attribute
+   // during a recursive call that contains
+   // a  e.g. .
+   $element = substr( $element, 0, -1 );
}
} else {
// If we hit here, then Language Converter 
could be tricked
@@ -430,7 +437,14 @@
if ( $element !== ''
&& preg_match( 
'/^(<[^>\s]*+)\s([^>]*+)(.*+)$/', $element, $elementMatches )
) {
+   // FIXME, this decodes entities, so if you have 
something
+   // like  the bar won't 
get
+   // translated since after entity decoding it 
looks like
+   // unclosed html and we call this method 
recursively
+   // on attributes.
$attrs = Sanitizer::decodeTagAttributes( 
$elementMatches[2] );
+   // Ensure self-closing tags stay self-closing.
+   $close = substr( $elementMatches[2], -1 ) === 
'/' ? ' /' : '';
$changed = false;
foreach ( [ 'title', 'alt' ] as $attrName ) {
if ( !isset( $attrs[$attrName] ) ) {
@@ -451,7 +465,7 @@
}
if ( $changed ) {
$element = $elementMatches[1] . 
Html::expandAttributes( $attrs ) .
-   $elementMatches[3];
+   $close . $elementMatches[3];
}
}
$literalBlob .= $element . "\000";
diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index b498105..5814985 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -16772,7 +16772,7 @@
 [[File:Foobar.jpg|alt=-{}-foAjrjvi-{}-]]
 !! html
 
-http://example.com/images/3/3a/Foobar.jpg; width="1941" height="220">
+http://example.com/images/3/3a/Foobar.jpg; width="1941" height="220" />
 
 !! end
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I077d30c50fcb419837fef937d27caca307153d2d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_27
Gerrit-Owner: Brian Wolff 

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_27]: Fix langauge converter parser test with self-close tags

[Brian Wolff (Code Review)]

Brian Wolff has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/391501 )

Change subject: Fix langauge converter parser test with self-close tags
..


Fix langauge converter parser test with self-close tags

This fixes an issue in f21f3942 where if there was an html
element with an alt or title attribute containing an 
entity, an ascii EOT control character (0x04) may become
inserted into the text if language converter was enabled.

Due to a really old bug in language converter, self-closed tags
got turned into non-self closed tags. However due a different
bug which was fixed in f21f3942 this code path was rarely taken
so nobody noticed until now.

Follow-up Idbc45cac12

Bug: T180552
Change-Id: I077d30c50fcb419837fef937d27caca307153d2d
---
M languages/LanguageConverter.php
M tests/parser/parserTests.txt
2 files changed, 17 insertions(+), 3 deletions(-)



diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index 28c75e1..7b5abb2 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -354,7 +354,6 @@
if ( $this->guessVariant( $text, $toVariant ) ) {
return $text;
}
-
/* we convert everything except:
   1. HTML markups (anything between < and >)
   2. HTML entities
@@ -389,6 +388,7 @@
 
// Guard against delimiter nulls in the input
$text = str_replace( "\000", '', $text );
+   $text = str_replace( "\004", '', $text );
 
$markupMatches = null;
$elementMatches = null;
@@ -403,6 +403,13 @@
// We hit the end.
$elementPos = strlen( $text );
$element = '';
+   } elseif ( substr( $element, -1 ) === "\004" ) {
+   // This can sometimes happen if we have
+   // unclosed html tags (For example
+   // when converting a title attribute
+   // during a recursive call that contains
+   // a  e.g. .
+   $element = substr( $element, 0, -1 );
}
} else {
// If we hit here, then Language Converter 
could be tricked
@@ -430,7 +437,14 @@
if ( $element !== ''
&& preg_match( 
'/^(<[^>\s]*+)\s([^>]*+)(.*+)$/', $element, $elementMatches )
) {
+   // FIXME, this decodes entities, so if you have 
something
+   // like  the bar won't 
get
+   // translated since after entity decoding it 
looks like
+   // unclosed html and we call this method 
recursively
+   // on attributes.
$attrs = Sanitizer::decodeTagAttributes( 
$elementMatches[2] );
+   // Ensure self-closing tags stay self-closing.
+   $close = substr( $elementMatches[2], -1 ) === 
'/' ? ' /' : '';
$changed = false;
foreach ( [ 'title', 'alt' ] as $attrName ) {
if ( !isset( $attrs[$attrName] ) ) {
@@ -451,7 +465,7 @@
}
if ( $changed ) {
$element = $elementMatches[1] . 
Html::expandAttributes( $attrs ) .
-   $elementMatches[3];
+   $close . $elementMatches[3];
}
}
$literalBlob .= $element . "\000";
diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index b498105..5814985 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -16772,7 +16772,7 @@
 [[File:Foobar.jpg|alt=-{}-foAjrjvi-{}-]]
 !! html
 
-http://example.com/images/3/3a/Foobar.jpg; width="1941" height="220">
+http://example.com/images/3/3a/Foobar.jpg; width="1941" height="220" />
 
 !! end
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I077d30c50fcb419837fef937d27caca307153d2d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_27
Gerrit-Owner: Brian Wolff 
Gerrit-Reviewer: Brian Wolff 

___
MediaWiki-commits 

[MediaWiki-commits] [Gerrit] mediawiki...Cargo[master]: Fix for bcadef37f8d7 - added quoting of field names

[jenkins-bot (Code Review)]

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

Change subject: Fix for bcadef37f8d7 - added quoting of field names
..


Fix for bcadef37f8d7 - added quoting of field names

Change-Id: Iab2b2bc1207c60c9fc10a198994a18f592998e3d
---
M includes/parserfunctions/CargoStore.php
1 file changed, 3 insertions(+), 2 deletions(-)

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



diff --git a/includes/parserfunctions/CargoStore.php 
b/includes/parserfunctions/CargoStore.php
index 6dd0932..78c1b4f 100644
--- a/includes/parserfunctions/CargoStore.php
+++ b/includes/parserfunctions/CargoStore.php
@@ -301,10 +301,11 @@
continue;
}
if ( $fieldDescription->mIsList || 
$fieldDescription->mType == 'Coordinates' ) {
-   $tableFieldValuesForCheck[$fieldName . 
'__full'] = $tableFieldValues[$fieldName];
+   $quotedFieldName = $cdb->addIdentifierQuotes( 
$fieldName . '__full' );
} else {
-   $tableFieldValuesForCheck[$fieldName] = 
$tableFieldValues[$fieldName];
+   $quotedFieldName = $cdb->addIdentifierQuotes( 
$fieldName );
}
+   $tableFieldValuesForCheck[$quotedFieldName] = 
$tableFieldValues[$fieldName];
}
$res = $cdb->select( $tableName, 'COUNT(*)', 
$tableFieldValuesForCheck );
$row = $cdb->fetchRow( $res );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iab2b2bc1207c60c9fc10a198994a18f592998e3d
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/core[REL1_28]: Fix langauge converter parser test with self-close tags

[Brian Wolff (Code Review)]

Brian Wolff has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/391500 )

Change subject: Fix langauge converter parser test with self-close tags
..

Fix langauge converter parser test with self-close tags

This fixes an issue in f21f3942 where if there was an html
element with an alt or title attribute containing an 
entity, an ascii EOT control character (0x04) may become
inserted into the text if language converter was enabled.

Due to a really old bug in language converter, self-closed tags
got turned into non-self closed tags. However due a different
bug which was fixed in f21f3942 this code path was rarely taken
so nobody noticed until now.

Follow-up Idbc45cac12

Bug: T180552
Change-Id: I077d30c50fcb419837fef937d27caca307153d2d
---
M languages/LanguageConverter.php
M tests/parser/parserTests.txt
2 files changed, 17 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/00/391500/1

diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index 62ec442..6760527 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -357,7 +357,6 @@
if ( $this->guessVariant( $text, $toVariant ) ) {
return $text;
}
-
/* we convert everything except:
   1. HTML markups (anything between < and >)
   2. HTML entities
@@ -390,6 +389,7 @@
 
// Guard against delimiter nulls in the input
$text = str_replace( "\000", '', $text );
+   $text = str_replace( "\004", '', $text );
 
$markupMatches = null;
$elementMatches = null;
@@ -404,6 +404,13 @@
// We hit the end.
$elementPos = strlen( $text );
$element = '';
+   } elseif( substr( $element, -1 ) === "\004" ) {
+   // This can sometimes happen if we have
+   // unclosed html tags (For example
+   // when converting a title attribute
+   // during a recursive call that contains
+   // a  e.g. .
+   $element = substr( $element, 0, -1 );
}
} else {
// If we hit here, then Language Converter 
could be tricked
@@ -431,7 +438,14 @@
if ( $element !== ''
&& preg_match( 
'/^(<[^>\s]*+)\s([^>]*+)(.*+)$/', $element, $elementMatches )
) {
+   // FIXME, this decodes entities, so if you have 
something
+   // like  the bar won't 
get
+   // translated since after entity decoding it 
looks like
+   // unclosed html and we call this method 
recursively
+   // on attributes.
$attrs = Sanitizer::decodeTagAttributes( 
$elementMatches[2] );
+   // Ensure self-closing tags stay self-closing.
+   $close = substr( $elementMatches[2], -1 ) === 
'/' ? ' /' : '';
$changed = false;
foreach ( [ 'title', 'alt' ] as $attrName ) {
if ( !isset( $attrs[$attrName] ) ) {
@@ -452,7 +466,7 @@
}
if ( $changed ) {
$element = $elementMatches[1] . 
Html::expandAttributes( $attrs ) .
-   $elementMatches[3];
+   $close . $elementMatches[3];
}
}
$literalBlob .= $element . "\000";
diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index 19bf56f..910dcd9 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -17149,7 +17149,7 @@
 [[File:Foobar.jpg|alt=-{}-foAjrjvi-{}-]]
 !! html
 
-http://example.com/images/3/3a/Foobar.jpg; width="1941" height="220">
+http://example.com/images/3/3a/Foobar.jpg; width="1941" height="220" />
 
 !! end
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I077d30c50fcb419837fef937d27caca307153d2d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_28
Gerrit-Owner: Brian Wolff 

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_28]: Fix langauge converter parser test with self-close tags

[Brian Wolff (Code Review)]

Brian Wolff has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/391500 )

Change subject: Fix langauge converter parser test with self-close tags
..


Fix langauge converter parser test with self-close tags

This fixes an issue in f21f3942 where if there was an html
element with an alt or title attribute containing an 
entity, an ascii EOT control character (0x04) may become
inserted into the text if language converter was enabled.

Due to a really old bug in language converter, self-closed tags
got turned into non-self closed tags. However due a different
bug which was fixed in f21f3942 this code path was rarely taken
so nobody noticed until now.

Follow-up Idbc45cac12

Bug: T180552
Change-Id: I077d30c50fcb419837fef937d27caca307153d2d
---
M languages/LanguageConverter.php
M tests/parser/parserTests.txt
2 files changed, 17 insertions(+), 3 deletions(-)



diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index 62ec442..6760527 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -357,7 +357,6 @@
if ( $this->guessVariant( $text, $toVariant ) ) {
return $text;
}
-
/* we convert everything except:
   1. HTML markups (anything between < and >)
   2. HTML entities
@@ -390,6 +389,7 @@
 
// Guard against delimiter nulls in the input
$text = str_replace( "\000", '', $text );
+   $text = str_replace( "\004", '', $text );
 
$markupMatches = null;
$elementMatches = null;
@@ -404,6 +404,13 @@
// We hit the end.
$elementPos = strlen( $text );
$element = '';
+   } elseif( substr( $element, -1 ) === "\004" ) {
+   // This can sometimes happen if we have
+   // unclosed html tags (For example
+   // when converting a title attribute
+   // during a recursive call that contains
+   // a  e.g. .
+   $element = substr( $element, 0, -1 );
}
} else {
// If we hit here, then Language Converter 
could be tricked
@@ -431,7 +438,14 @@
if ( $element !== ''
&& preg_match( 
'/^(<[^>\s]*+)\s([^>]*+)(.*+)$/', $element, $elementMatches )
) {
+   // FIXME, this decodes entities, so if you have 
something
+   // like  the bar won't 
get
+   // translated since after entity decoding it 
looks like
+   // unclosed html and we call this method 
recursively
+   // on attributes.
$attrs = Sanitizer::decodeTagAttributes( 
$elementMatches[2] );
+   // Ensure self-closing tags stay self-closing.
+   $close = substr( $elementMatches[2], -1 ) === 
'/' ? ' /' : '';
$changed = false;
foreach ( [ 'title', 'alt' ] as $attrName ) {
if ( !isset( $attrs[$attrName] ) ) {
@@ -452,7 +466,7 @@
}
if ( $changed ) {
$element = $elementMatches[1] . 
Html::expandAttributes( $attrs ) .
-   $elementMatches[3];
+   $close . $elementMatches[3];
}
}
$literalBlob .= $element . "\000";
diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index 19bf56f..910dcd9 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -17149,7 +17149,7 @@
 [[File:Foobar.jpg|alt=-{}-foAjrjvi-{}-]]
 !! html
 
-http://example.com/images/3/3a/Foobar.jpg; width="1941" height="220">
+http://example.com/images/3/3a/Foobar.jpg; width="1941" height="220" />
 
 !! end
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I077d30c50fcb419837fef937d27caca307153d2d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_28
Gerrit-Owner: Brian Wolff 
Gerrit-Reviewer: Brian Wolff 

___
MediaWiki-commits 

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_29]: Fix langauge converter parser test with self-close tags

[Brian Wolff (Code Review)]

Brian Wolff has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/391499 )

Change subject: Fix langauge converter parser test with self-close tags
..

Fix langauge converter parser test with self-close tags

This fixes an issue in f21f3942 where if there was an html
element with an alt or title attribute containing an 
entity, an ascii EOT control character (0x04) may become
inserted into the text if language converter was enabled.

Due to a really old bug in language converter, self-closed tags
got turned into non-self closed tags. However due a different
bug which was fixed in f21f3942 this code path was rarely taken
so nobody noticed until now.

Follow-up Idbc45cac12

Bug: T180552
Change-Id: I077d30c50fcb419837fef937d27caca307153d2d
---
M languages/LanguageConverter.php
M tests/parser/parserTests.txt
2 files changed, 17 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/99/391499/1

diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index e9a9642..187727f 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -359,7 +359,6 @@
if ( $this->guessVariant( $text, $toVariant ) ) {
return $text;
}
-
/* we convert everything except:
   1. HTML markups (anything between < and >)
   2. HTML entities
@@ -395,6 +394,7 @@
// Guard against delimiter nulls in the input
// (should never happen: see T159174)
$text = str_replace( "\000", '', $text );
+   $text = str_replace( "\004", '', $text );
 
$markupMatches = null;
$elementMatches = null;
@@ -409,6 +409,13 @@
// We hit the end.
$elementPos = strlen( $text );
$element = '';
+   } elseif( substr( $element, -1 ) === "\004" ) {
+   // This can sometimes happen if we have
+   // unclosed html tags (For example
+   // when converting a title attribute
+   // during a recursive call that contains
+   // a  e.g. .
+   $element = substr( $element, 0, -1 );
}
} else {
// If we hit here, then Language Converter 
could be tricked
@@ -436,7 +443,14 @@
if ( $element !== ''
&& preg_match( 
'/^(<[^>\s]*+)\s([^>]*+)(.*+)$/', $element, $elementMatches )
) {
+   // FIXME, this decodes entities, so if you have 
something
+   // like  the bar won't 
get
+   // translated since after entity decoding it 
looks like
+   // unclosed html and we call this method 
recursively
+   // on attributes.
$attrs = Sanitizer::decodeTagAttributes( 
$elementMatches[2] );
+   // Ensure self-closing tags stay self-closing.
+   $close = substr( $elementMatches[2], -1 ) === 
'/' ? ' /' : '';
$changed = false;
foreach ( [ 'title', 'alt' ] as $attrName ) {
if ( !isset( $attrs[$attrName] ) ) {
@@ -455,7 +469,7 @@
}
if ( $changed ) {
$element = $elementMatches[1] . 
Html::expandAttributes( $attrs ) .
-   $elementMatches[3];
+   $close . $elementMatches[3];
}
}
$literalBlob .= $element . "\000";
diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index 86db951..0950533 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -17434,7 +17434,7 @@
 [[File:Foobar.jpg|alt=-{}-foAjrjvi-{}-]]
 !! html
 
-http://example.com/images/3/3a/Foobar.jpg; width="1941" height="220">
+http://example.com/images/3/3a/Foobar.jpg; width="1941" height="220" />
 
 !! end
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I077d30c50fcb419837fef937d27caca307153d2d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_29
Gerrit-Owner: Brian Wolff 

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_29]: Fix langauge converter parser test with self-close tags

[Brian Wolff (Code Review)]

Brian Wolff has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/391499 )

Change subject: Fix langauge converter parser test with self-close tags
..


Fix langauge converter parser test with self-close tags

This fixes an issue in f21f3942 where if there was an html
element with an alt or title attribute containing an 
entity, an ascii EOT control character (0x04) may become
inserted into the text if language converter was enabled.

Due to a really old bug in language converter, self-closed tags
got turned into non-self closed tags. However due a different
bug which was fixed in f21f3942 this code path was rarely taken
so nobody noticed until now.

Follow-up Idbc45cac12

Bug: T180552
Change-Id: I077d30c50fcb419837fef937d27caca307153d2d
---
M languages/LanguageConverter.php
M tests/parser/parserTests.txt
2 files changed, 17 insertions(+), 3 deletions(-)



diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index e9a9642..187727f 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -359,7 +359,6 @@
if ( $this->guessVariant( $text, $toVariant ) ) {
return $text;
}
-
/* we convert everything except:
   1. HTML markups (anything between < and >)
   2. HTML entities
@@ -395,6 +394,7 @@
// Guard against delimiter nulls in the input
// (should never happen: see T159174)
$text = str_replace( "\000", '', $text );
+   $text = str_replace( "\004", '', $text );
 
$markupMatches = null;
$elementMatches = null;
@@ -409,6 +409,13 @@
// We hit the end.
$elementPos = strlen( $text );
$element = '';
+   } elseif( substr( $element, -1 ) === "\004" ) {
+   // This can sometimes happen if we have
+   // unclosed html tags (For example
+   // when converting a title attribute
+   // during a recursive call that contains
+   // a  e.g. .
+   $element = substr( $element, 0, -1 );
}
} else {
// If we hit here, then Language Converter 
could be tricked
@@ -436,7 +443,14 @@
if ( $element !== ''
&& preg_match( 
'/^(<[^>\s]*+)\s([^>]*+)(.*+)$/', $element, $elementMatches )
) {
+   // FIXME, this decodes entities, so if you have 
something
+   // like  the bar won't 
get
+   // translated since after entity decoding it 
looks like
+   // unclosed html and we call this method 
recursively
+   // on attributes.
$attrs = Sanitizer::decodeTagAttributes( 
$elementMatches[2] );
+   // Ensure self-closing tags stay self-closing.
+   $close = substr( $elementMatches[2], -1 ) === 
'/' ? ' /' : '';
$changed = false;
foreach ( [ 'title', 'alt' ] as $attrName ) {
if ( !isset( $attrs[$attrName] ) ) {
@@ -455,7 +469,7 @@
}
if ( $changed ) {
$element = $elementMatches[1] . 
Html::expandAttributes( $attrs ) .
-   $elementMatches[3];
+   $close . $elementMatches[3];
}
}
$literalBlob .= $element . "\000";
diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index 86db951..0950533 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -17434,7 +17434,7 @@
 [[File:Foobar.jpg|alt=-{}-foAjrjvi-{}-]]
 !! html
 
-http://example.com/images/3/3a/Foobar.jpg; width="1941" height="220">
+http://example.com/images/3/3a/Foobar.jpg; width="1941" height="220" />
 
 !! end
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I077d30c50fcb419837fef937d27caca307153d2d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_29
Gerrit-Owner: Brian Wolff 
Gerrit-Reviewer: Brian Wolff 

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_30]: Fix langauge converter parser test with self-close tags

[Brian Wolff (Code Review)]

Brian Wolff has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/391498 )

Change subject: Fix langauge converter parser test with self-close tags
..

Fix langauge converter parser test with self-close tags

This fixes an issue in f21f3942 where if there was an html
element with an alt or title attribute containing an 
entity, an ascii EOT control character (0x04) may become
inserted into the text if language converter was enabled.

Due to a really old bug in language converter, self-closed tags
got turned into non-self closed tags. However due a different
bug which was fixed in f21f3942 this code path was rarely taken
so nobody noticed until now.

Follow-up Idbc45cac12

Bug: T180552
Change-Id: I077d30c50fcb419837fef937d27caca307153d2d
---
M languages/LanguageConverter.php
M tests/parser/parserTests.txt
2 files changed, 17 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/98/391498/1

diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index 8e98abd..1d78402 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -353,7 +353,6 @@
if ( $this->guessVariant( $text, $toVariant ) ) {
return $text;
}
-
/* we convert everything except:
   1. HTML markups (anything between < and >)
   2. HTML entities
@@ -389,6 +388,7 @@
// Guard against delimiter nulls in the input
// (should never happen: see T159174)
$text = str_replace( "\000", '', $text );
+   $text = str_replace( "\004", '', $text );
 
$markupMatches = null;
$elementMatches = null;
@@ -403,6 +403,13 @@
// We hit the end.
$elementPos = strlen( $text );
$element = '';
+   } elseif( substr( $element, -1 ) === "\004" ) {
+   // This can sometimes happen if we have
+   // unclosed html tags (For example
+   // when converting a title attribute
+   // during a recursive call that contains
+   // a  e.g. .
+   $element = substr( $element, 0, -1 );
}
} else {
// If we hit here, then Language Converter 
could be tricked
@@ -430,7 +437,14 @@
if ( $element !== ''
&& preg_match( 
'/^(<[^>\s]*+)\s([^>]*+)(.*+)$/', $element, $elementMatches )
) {
+   // FIXME, this decodes entities, so if you have 
something
+   // like  the bar won't 
get
+   // translated since after entity decoding it 
looks like
+   // unclosed html and we call this method 
recursively
+   // on attributes.
$attrs = Sanitizer::decodeTagAttributes( 
$elementMatches[2] );
+   // Ensure self-closing tags stay self-closing.
+   $close = substr( $elementMatches[2], -1 ) === 
'/' ? ' /' : '';
$changed = false;
foreach ( [ 'title', 'alt' ] as $attrName ) {
if ( !isset( $attrs[$attrName] ) ) {
@@ -449,7 +463,7 @@
}
if ( $changed ) {
$element = $elementMatches[1] . 
Html::expandAttributes( $attrs ) .
-   $elementMatches[3];
+   $close . $elementMatches[3];
}
}
$literalBlob .= $element . "\000";
diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index 8b4e2ef..5663316 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -18347,7 +18347,7 @@
 [[File:Foobar.jpg|alt=-{}-foAjrjvi-{}-]]
 !! html
 
-http://example.com/images/3/3a/Foobar.jpg; width="1941" height="220">
+http://example.com/images/3/3a/Foobar.jpg; width="1941" height="220" />
 
 !! end
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I077d30c50fcb419837fef937d27caca307153d2d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_30
Gerrit-Owner: Brian Wolff 

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_30]: Fix langauge converter parser test with self-close tags

[Brian Wolff (Code Review)]

Brian Wolff has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/391498 )

Change subject: Fix langauge converter parser test with self-close tags
..


Fix langauge converter parser test with self-close tags

This fixes an issue in f21f3942 where if there was an html
element with an alt or title attribute containing an 
entity, an ascii EOT control character (0x04) may become
inserted into the text if language converter was enabled.

Due to a really old bug in language converter, self-closed tags
got turned into non-self closed tags. However due a different
bug which was fixed in f21f3942 this code path was rarely taken
so nobody noticed until now.

Follow-up Idbc45cac12

Bug: T180552
Change-Id: I077d30c50fcb419837fef937d27caca307153d2d
---
M languages/LanguageConverter.php
M tests/parser/parserTests.txt
2 files changed, 17 insertions(+), 3 deletions(-)



diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index 8e98abd..1d78402 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -353,7 +353,6 @@
if ( $this->guessVariant( $text, $toVariant ) ) {
return $text;
}
-
/* we convert everything except:
   1. HTML markups (anything between < and >)
   2. HTML entities
@@ -389,6 +388,7 @@
// Guard against delimiter nulls in the input
// (should never happen: see T159174)
$text = str_replace( "\000", '', $text );
+   $text = str_replace( "\004", '', $text );
 
$markupMatches = null;
$elementMatches = null;
@@ -403,6 +403,13 @@
// We hit the end.
$elementPos = strlen( $text );
$element = '';
+   } elseif( substr( $element, -1 ) === "\004" ) {
+   // This can sometimes happen if we have
+   // unclosed html tags (For example
+   // when converting a title attribute
+   // during a recursive call that contains
+   // a  e.g. .
+   $element = substr( $element, 0, -1 );
}
} else {
// If we hit here, then Language Converter 
could be tricked
@@ -430,7 +437,14 @@
if ( $element !== ''
&& preg_match( 
'/^(<[^>\s]*+)\s([^>]*+)(.*+)$/', $element, $elementMatches )
) {
+   // FIXME, this decodes entities, so if you have 
something
+   // like  the bar won't 
get
+   // translated since after entity decoding it 
looks like
+   // unclosed html and we call this method 
recursively
+   // on attributes.
$attrs = Sanitizer::decodeTagAttributes( 
$elementMatches[2] );
+   // Ensure self-closing tags stay self-closing.
+   $close = substr( $elementMatches[2], -1 ) === 
'/' ? ' /' : '';
$changed = false;
foreach ( [ 'title', 'alt' ] as $attrName ) {
if ( !isset( $attrs[$attrName] ) ) {
@@ -449,7 +463,7 @@
}
if ( $changed ) {
$element = $elementMatches[1] . 
Html::expandAttributes( $attrs ) .
-   $elementMatches[3];
+   $close . $elementMatches[3];
}
}
$literalBlob .= $element . "\000";
diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index 8b4e2ef..5663316 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -18347,7 +18347,7 @@
 [[File:Foobar.jpg|alt=-{}-foAjrjvi-{}-]]
 !! html
 
-http://example.com/images/3/3a/Foobar.jpg; width="1941" height="220">
+http://example.com/images/3/3a/Foobar.jpg; width="1941" height="220" />
 
 !! end
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I077d30c50fcb419837fef937d27caca307153d2d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_30
Gerrit-Owner: Brian Wolff 
Gerrit-Reviewer: Brian Wolff 

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Fix langauge converter parser test with self-close tags

[Brian Wolff (Code Review)]

Brian Wolff has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/391497 )

Change subject: Fix langauge converter parser test with self-close tags
..


Fix langauge converter parser test with self-close tags

This fixes an issue in f21f3942 where if there was an html
element with an alt or title attribute containing an 
entity, an ascii EOT control character (0x04) may become
inserted into the text if language converter was enabled.

Due to a really old bug in language converter, self-closed tags
got turned into non-self closed tags. However due a different
bug which was fixed in f21f3942 this code path was rarely taken
so nobody noticed until now.

Follow-up Idbc45cac12

Bug: T180552
Change-Id: I077d30c50fcb419837fef937d27caca307153d2d
---
M languages/LanguageConverter.php
M tests/parser/parserTests.txt
2 files changed, 17 insertions(+), 3 deletions(-)



diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index 8e98abd..1d78402 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -353,7 +353,6 @@
if ( $this->guessVariant( $text, $toVariant ) ) {
return $text;
}
-
/* we convert everything except:
   1. HTML markups (anything between < and >)
   2. HTML entities
@@ -389,6 +388,7 @@
// Guard against delimiter nulls in the input
// (should never happen: see T159174)
$text = str_replace( "\000", '', $text );
+   $text = str_replace( "\004", '', $text );
 
$markupMatches = null;
$elementMatches = null;
@@ -403,6 +403,13 @@
// We hit the end.
$elementPos = strlen( $text );
$element = '';
+   } elseif( substr( $element, -1 ) === "\004" ) {
+   // This can sometimes happen if we have
+   // unclosed html tags (For example
+   // when converting a title attribute
+   // during a recursive call that contains
+   // a  e.g. .
+   $element = substr( $element, 0, -1 );
}
} else {
// If we hit here, then Language Converter 
could be tricked
@@ -430,7 +437,14 @@
if ( $element !== ''
&& preg_match( 
'/^(<[^>\s]*+)\s([^>]*+)(.*+)$/', $element, $elementMatches )
) {
+   // FIXME, this decodes entities, so if you have 
something
+   // like  the bar won't 
get
+   // translated since after entity decoding it 
looks like
+   // unclosed html and we call this method 
recursively
+   // on attributes.
$attrs = Sanitizer::decodeTagAttributes( 
$elementMatches[2] );
+   // Ensure self-closing tags stay self-closing.
+   $close = substr( $elementMatches[2], -1 ) === 
'/' ? ' /' : '';
$changed = false;
foreach ( [ 'title', 'alt' ] as $attrName ) {
if ( !isset( $attrs[$attrName] ) ) {
@@ -449,7 +463,7 @@
}
if ( $changed ) {
$element = $elementMatches[1] . 
Html::expandAttributes( $attrs ) .
-   $elementMatches[3];
+   $close . $elementMatches[3];
}
}
$literalBlob .= $element . "\000";
diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index 7e678d8..56879ff 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -18515,7 +18515,7 @@
 [[File:Foobar.jpg|alt=-{}-foAjrjvi-{}-]]
 !! html
 
-http://example.com/images/3/3a/Foobar.jpg; width="1941" height="220">
+http://example.com/images/3/3a/Foobar.jpg; width="1941" height="220" />
 
 !! end
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I077d30c50fcb419837fef937d27caca307153d2d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff 
Gerrit-Reviewer: Brian Wolff 

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Fix langauge converter parser test with self-close tags

[Brian Wolff (Code Review)]

Brian Wolff has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/391497 )

Change subject: Fix langauge converter parser test with self-close tags
..

Fix langauge converter parser test with self-close tags

This fixes an issue in f21f3942 where if there was an html
element with an alt or title attribute containing an 
entity, an ascii EOT control character (0x04) may become
inserted into the text if language converter was enabled.

Due to a really old bug in language converter, self-closed tags
got turned into non-self closed tags. However due a different
bug which was fixed in f21f3942 this code path was rarely taken
so nobody noticed until now.

Follow-up Idbc45cac12

Bug: T180552
Change-Id: I077d30c50fcb419837fef937d27caca307153d2d
---
M languages/LanguageConverter.php
M tests/parser/parserTests.txt
2 files changed, 17 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/97/391497/1

diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index 8e98abd..1d78402 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -353,7 +353,6 @@
if ( $this->guessVariant( $text, $toVariant ) ) {
return $text;
}
-
/* we convert everything except:
   1. HTML markups (anything between < and >)
   2. HTML entities
@@ -389,6 +388,7 @@
// Guard against delimiter nulls in the input
// (should never happen: see T159174)
$text = str_replace( "\000", '', $text );
+   $text = str_replace( "\004", '', $text );
 
$markupMatches = null;
$elementMatches = null;
@@ -403,6 +403,13 @@
// We hit the end.
$elementPos = strlen( $text );
$element = '';
+   } elseif( substr( $element, -1 ) === "\004" ) {
+   // This can sometimes happen if we have
+   // unclosed html tags (For example
+   // when converting a title attribute
+   // during a recursive call that contains
+   // a  e.g. .
+   $element = substr( $element, 0, -1 );
}
} else {
// If we hit here, then Language Converter 
could be tricked
@@ -430,7 +437,14 @@
if ( $element !== ''
&& preg_match( 
'/^(<[^>\s]*+)\s([^>]*+)(.*+)$/', $element, $elementMatches )
) {
+   // FIXME, this decodes entities, so if you have 
something
+   // like  the bar won't 
get
+   // translated since after entity decoding it 
looks like
+   // unclosed html and we call this method 
recursively
+   // on attributes.
$attrs = Sanitizer::decodeTagAttributes( 
$elementMatches[2] );
+   // Ensure self-closing tags stay self-closing.
+   $close = substr( $elementMatches[2], -1 ) === 
'/' ? ' /' : '';
$changed = false;
foreach ( [ 'title', 'alt' ] as $attrName ) {
if ( !isset( $attrs[$attrName] ) ) {
@@ -449,7 +463,7 @@
}
if ( $changed ) {
$element = $elementMatches[1] . 
Html::expandAttributes( $attrs ) .
-   $elementMatches[3];
+   $close . $elementMatches[3];
}
}
$literalBlob .= $element . "\000";
diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index 7e678d8..56879ff 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -18515,7 +18515,7 @@
 [[File:Foobar.jpg|alt=-{}-foAjrjvi-{}-]]
 !! html
 
-http://example.com/images/3/3a/Foobar.jpg; width="1941" height="220">
+http://example.com/images/3/3a/Foobar.jpg; width="1941" height="220" />
 
 !! end
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I077d30c50fcb419837fef937d27caca307153d2d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Skip upper limits for values in navtiming2

[Phedenskog (Code Review)]

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

Change subject: Skip upper limits for values in navtiming2
..

Skip upper limits for values in navtiming2

The upper limit was before we started to work with median and
percentiles and doesn't gives us any value (it rather hide things
instead).

Bug: T104902
Change-Id: I2e98d4f1e37df39d04dec186b31ade7cdc880606
---
M modules/webperf/files/navtiming.py
M modules/webperf/files/navtiming_fixture.yaml
2 files changed, 86 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/96/391496/1

diff --git a/modules/webperf/files/navtiming.py 
b/modules/webperf/files/navtiming.py
index 5e7d737..ca5e13b 100755
--- a/modules/webperf/files/navtiming.py
+++ b/modules/webperf/files/navtiming.py
@@ -339,7 +339,7 @@
 
 
 def is_sanev2(value):
-return isinstance(value, int) and value >= 0 and value < 18
+return isinstance(value, int) and value >= 0
 
 
 @handles('SaveTiming')
@@ -471,7 +471,7 @@
 if not isSane:
 break
 
-# If one of the metrics are over the max then skip it entirely
+# If one of the metrics are under the min then skip it entirely
 if not isSane:
 yield make_count('frontend.navtiming_discard', 'isSane')
 else:
diff --git a/modules/webperf/files/navtiming_fixture.yaml 
b/modules/webperf/files/navtiming_fixture.yaml
index b2b9f63..3f9f408 100644
--- a/modules/webperf/files/navtiming_fixture.yaml
+++ b/modules/webperf/files/navtiming_fixture.yaml
@@ -501,7 +501,90 @@
   - frontend.navtiming.domInteractive.by_browser.Edge.all:7403|ms
   - frontend.navtiming.domInteractive.by_continent.Europe:7403|ms
   - frontend.navtiming.domInteractive.by_country.France:7403|ms
-  - frontend.navtiming_discard.isSane:1|c
+  - frontend.navtiming2.onLoad.desktop.anonymous:2|ms
+  - frontend.navtiming2.onLoad.desktop.overall:2|ms
+  - frontend.navtiming2.onLoad.overall:2|ms
+  - frontend.navtiming2.onLoad.by_browser.Edge.15:2|ms
+  - frontend.navtiming2.onLoad.by_browser.Edge.all:2|ms
+  - frontend.navtiming2.onLoad.by_continent.Europe:2|ms
+  - frontend.navtiming2.onLoad.by_country.France:2|ms
+  - frontend.navtiming2.dns.desktop.anonymous:0|ms
+  - frontend.navtiming2.dns.desktop.overall:0|ms
+  - frontend.navtiming2.dns.overall:0|ms
+  - frontend.navtiming2.dns.by_browser.Edge.15:0|ms
+  - frontend.navtiming2.dns.by_browser.Edge.all:0|ms
+  - frontend.navtiming2.dns.by_continent.Europe:0|ms
+  - frontend.navtiming2.dns.by_country.France:0|ms
+  - frontend.navtiming2.request.desktop.anonymous:543|ms
+  - frontend.navtiming2.request.desktop.overall:543|ms
+  - frontend.navtiming2.request.overall:543|ms
+  - frontend.navtiming2.request.by_browser.Edge.15:543|ms
+  - frontend.navtiming2.request.by_browser.Edge.all:543|ms
+  - frontend.navtiming2.request.by_continent.Europe:543|ms
+  - frontend.navtiming2.request.by_country.France:543|ms
+  - frontend.navtiming2.processing.desktop.anonymous:196791|ms
+  - frontend.navtiming2.processing.desktop.overall:196791|ms
+  - frontend.navtiming2.processing.overall:196791|ms
+  - frontend.navtiming2.processing.by_browser.Edge.15:196791|ms
+  - frontend.navtiming2.processing.by_browser.Edge.all:196791|ms
+  - frontend.navtiming2.processing.by_continent.Europe:196791|ms
+  - frontend.navtiming2.processing.by_country.France:196791|ms
+  - frontend.navtiming2.firstPaint.desktop.anonymous:9356|ms
+  - frontend.navtiming2.firstPaint.desktop.overall:9356|ms
+  - frontend.navtiming2.firstPaint.overall:9356|ms
+  - frontend.navtiming2.firstPaint.by_browser.Edge.15:9356|ms
+  - frontend.navtiming2.firstPaint.by_browser.Edge.all:9356|ms
+  - frontend.navtiming2.firstPaint.by_continent.Europe:9356|ms
+  - frontend.navtiming2.firstPaint.by_country.France:9356|ms
+  - frontend.navtiming2.tcp.desktop.anonymous:0|ms
+  - frontend.navtiming2.tcp.desktop.overall:0|ms
+  - frontend.navtiming2.tcp.overall:0|ms
+  - frontend.navtiming2.tcp.by_browser.Edge.15:0|ms
+  - frontend.navtiming2.tcp.by_browser.Edge.all:0|ms
+  - frontend.navtiming2.tcp.by_continent.Europe:0|ms
+  - frontend.navtiming2.tcp.by_country.France:0|ms
+  - frontend.navtiming2.loadEventEnd.desktop.anonymous:204085|ms
+  - frontend.navtiming2.loadEventEnd.desktop.overall:204085|ms
+  - frontend.navtiming2.loadEventEnd.overall:204085|ms
+  - frontend.navtiming2.loadEventEnd.by_browser.Edge.15:204085|ms
+  - frontend.navtiming2.loadEventEnd.by_browser.Edge.all:204085|ms
+  - frontend.navtiming2.loadEventEnd.by_continent.Europe:204085|ms
+  - frontend.navtiming2.loadEventEnd.by_country.France:204085|ms
+  - frontend.navtiming2.loadEventStart.desktop.anonymous:204083|ms
+  - frontend.navtiming2.loadEventStart.desktop.overall:204083|ms
+  - frontend.navtiming2.loadEventStart.overall:204083|ms
+  - frontend.navtiming2.loadEventStart.by_browser.Edge.15:204083|ms
+  - 

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Follow-up 5e56f01f1. Rebase failure.

[Brian Wolff (Code Review)]

Brian Wolff has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/391495 )

Change subject: Follow-up 5e56f01f1. Rebase failure.
..

Follow-up 5e56f01f1. Rebase failure.

Bug: T180551
Change-Id: I07a8c2555f08c6c731cd7e1917be451ec40d4d0c
---
M tests/parser/parserTests.txt
1 file changed, 0 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/95/391495/1

diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index 245ca9f..7e678d8 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -18510,20 +18510,6 @@
 !! options
 language=sr variant=sr-el
 !! wikitext
--{H|abc=>sr-el:" onload="alert(1)" data-foo="}-
-
-[[File:Foobar.jpg|alt=-{}-abc-{}-]]
-!! html
-
-http://example.com/images/3/3a/Foobar.jpg; width="1941" height="220">
-
-!! end
-
-!! test
-Language converter glossary rules inside attributes (T119158)
-!! options
-language=sr variant=sr-el
-!! wikitext
 -{H|foAjrjvi=>sr-el:" onload="alert(1)" data-foo="}-
 
 [[File:Foobar.jpg|alt=-{}-foAjrjvi-{}-]]

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I07a8c2555f08c6c731cd7e1917be451ec40d4d0c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Follow-up 5e56f01f1. Rebase failure.

[Brian Wolff (Code Review)]

Brian Wolff has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/391495 )

Change subject: Follow-up 5e56f01f1. Rebase failure.
..


Follow-up 5e56f01f1. Rebase failure.

Bug: T180551
Change-Id: I07a8c2555f08c6c731cd7e1917be451ec40d4d0c
---
M tests/parser/parserTests.txt
1 file changed, 0 insertions(+), 14 deletions(-)



diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index 245ca9f..7e678d8 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -18510,20 +18510,6 @@
 !! options
 language=sr variant=sr-el
 !! wikitext
--{H|abc=>sr-el:" onload="alert(1)" data-foo="}-
-
-[[File:Foobar.jpg|alt=-{}-abc-{}-]]
-!! html
-
-http://example.com/images/3/3a/Foobar.jpg; width="1941" height="220">
-
-!! end
-
-!! test
-Language converter glossary rules inside attributes (T119158)
-!! options
-language=sr variant=sr-el
-!! wikitext
 -{H|foAjrjvi=>sr-el:" onload="alert(1)" data-foo="}-
 
 [[File:Foobar.jpg|alt=-{}-foAjrjvi-{}-]]

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I07a8c2555f08c6c731cd7e1917be451ec40d4d0c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff 
Gerrit-Reviewer: Brian Wolff 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Fix LanguageSrTest for language converter

[Brian Wolff (Code Review)]

Brian Wolff has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/391484 )

Change subject: Fix LanguageSrTest for language converter
..


Fix LanguageSrTest for language converter

Language converter seems to maintain state between parser
invocations. Use a more unique string for the test.

This is a follow-up to 98b6635895.

Bug: T180551
Change-Id: I0259b378549f7d9778c27c4bc3efd8d277893f8c
---
M tests/parser/parserTests.txt
1 file changed, 14 insertions(+), 0 deletions(-)



diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index fb549f5..245ca9f 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -18520,6 +18520,20 @@
 !! end
 
 !! test
+Language converter glossary rules inside attributes (T119158)
+!! options
+language=sr variant=sr-el
+!! wikitext
+-{H|foAjrjvi=>sr-el:" onload="alert(1)" data-foo="}-
+
+[[File:Foobar.jpg|alt=-{}-foAjrjvi-{}-]]
+!! html
+
+http://example.com/images/3/3a/Foobar.jpg; width="1941" height="220">
+
+!! end
+
+!! test
 Self closed html pairs (T7487)
 !! wikitext
 Centered text

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0259b378549f7d9778c27c4bc3efd8d277893f8c
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff 
Gerrit-Reviewer: Brian Wolff 
Gerrit-Reviewer: C. Scott Ananian 
Gerrit-Reviewer: Jackmcbarn 
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[REL1_30]: Fix LanguageSrTest for language converter

[Brian Wolff (Code Review)]

Brian Wolff has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/391494 )

Change subject: Fix LanguageSrTest for language converter
..


Fix LanguageSrTest for language converter

Language converter seems to maintain state between parser
invocations. Use a more unique string for the test.

This is a follow-up to 98b6635895.

Bug: T180551
Change-Id: I0259b378549f7d9778c27c4bc3efd8d277893f8c
---
M tests/parser/parserTests.txt
1 file changed, 2 insertions(+), 2 deletions(-)



diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index 92cf572..8b4e2ef 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -18342,9 +18342,9 @@
 !! options
 language=sr variant=sr-el
 !! wikitext
--{H|abc=>sr-el:" onload="alert(1)" data-foo="}-
+-{H|foAjrjvi=>sr-el:" onload="alert(1)" data-foo="}-
 
-[[File:Foobar.jpg|alt=-{}-abc-{}-]]
+[[File:Foobar.jpg|alt=-{}-foAjrjvi-{}-]]
 !! html
 
 http://example.com/images/3/3a/Foobar.jpg; width="1941" height="220">

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0259b378549f7d9778c27c4bc3efd8d277893f8c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_30
Gerrit-Owner: Brian Wolff 
Gerrit-Reviewer: Brian Wolff 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_30]: Fix LanguageSrTest for language converter

[Brian Wolff (Code Review)]

Brian Wolff has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/391494 )

Change subject: Fix LanguageSrTest for language converter
..

Fix LanguageSrTest for language converter

Language converter seems to maintain state between parser
invocations. Use a more unique string for the test.

This is a follow-up to 98b6635895.

Bug: T180551
Change-Id: I0259b378549f7d9778c27c4bc3efd8d277893f8c
---
M tests/parser/parserTests.txt
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/94/391494/1

diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index 92cf572..8b4e2ef 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -18342,9 +18342,9 @@
 !! options
 language=sr variant=sr-el
 !! wikitext
--{H|abc=>sr-el:" onload="alert(1)" data-foo="}-
+-{H|foAjrjvi=>sr-el:" onload="alert(1)" data-foo="}-
 
-[[File:Foobar.jpg|alt=-{}-abc-{}-]]
+[[File:Foobar.jpg|alt=-{}-foAjrjvi-{}-]]
 !! html
 
 http://example.com/images/3/3a/Foobar.jpg; width="1941" height="220">

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0259b378549f7d9778c27c4bc3efd8d277893f8c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_30
Gerrit-Owner: Brian Wolff 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_29]: Fix LanguageSrTest for language converter

[Brian Wolff (Code Review)]

Brian Wolff has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/391493 )

Change subject: Fix LanguageSrTest for language converter
..


Fix LanguageSrTest for language converter

Language converter seems to maintain state between parser
invocations. Use a more unique string for the test.

This is a follow-up to 98b6635895.

Bug: T180551
Change-Id: I0259b378549f7d9778c27c4bc3efd8d277893f8c
---
M tests/parser/parserTests.txt
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Brian Wolff: Verified; Looks good to me, approved



diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index 95b3f5a..86db951 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -17429,9 +17429,9 @@
 !! options
 language=sr variant=sr-el
 !! wikitext
--{H|abc=>sr-el:" onload="alert(1)" data-foo="}-
+-{H|foAjrjvi=>sr-el:" onload="alert(1)" data-foo="}-
 
-[[File:Foobar.jpg|alt=-{}-abc-{}-]]
+[[File:Foobar.jpg|alt=-{}-foAjrjvi-{}-]]
 !! html
 
 http://example.com/images/3/3a/Foobar.jpg; width="1941" height="220">

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0259b378549f7d9778c27c4bc3efd8d277893f8c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_29
Gerrit-Owner: Brian Wolff 
Gerrit-Reviewer: Brian Wolff 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_29]: Fix LanguageSrTest for language converter

[Brian Wolff (Code Review)]

Brian Wolff has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/391493 )

Change subject: Fix LanguageSrTest for language converter
..

Fix LanguageSrTest for language converter

Language converter seems to maintain state between parser
invocations. Use a more unique string for the test.

This is a follow-up to 98b6635895.

Bug: T180551
Change-Id: I0259b378549f7d9778c27c4bc3efd8d277893f8c
---
M tests/parser/parserTests.txt
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/93/391493/1

diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index 95b3f5a..86db951 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -17429,9 +17429,9 @@
 !! options
 language=sr variant=sr-el
 !! wikitext
--{H|abc=>sr-el:" onload="alert(1)" data-foo="}-
+-{H|foAjrjvi=>sr-el:" onload="alert(1)" data-foo="}-
 
-[[File:Foobar.jpg|alt=-{}-abc-{}-]]
+[[File:Foobar.jpg|alt=-{}-foAjrjvi-{}-]]
 !! html
 
 http://example.com/images/3/3a/Foobar.jpg; width="1941" height="220">

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0259b378549f7d9778c27c4bc3efd8d277893f8c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_29
Gerrit-Owner: Brian Wolff 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_28]: Fix LanguageSrTest for language converter

[Brian Wolff (Code Review)]

Brian Wolff has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/391492 )

Change subject: Fix LanguageSrTest for language converter
..


Fix LanguageSrTest for language converter

Language converter seems to maintain state between parser
invocations. Use a more unique string for the test.

This is a follow-up to 98b6635895.

Bug: T180551
Change-Id: I0259b378549f7d9778c27c4bc3efd8d277893f8c
---
M tests/parser/parserTests.txt
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Brian Wolff: Verified; Looks good to me, approved



diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index 38a6e47..19bf56f 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -17144,9 +17144,9 @@
 !! options
 language=sr variant=sr-el
 !! wikitext
--{H|abc=>sr-el:" onload="alert(1)" data-foo="}-
+-{H|foAjrjvi=>sr-el:" onload="alert(1)" data-foo="}-
 
-[[File:Foobar.jpg|alt=-{}-abc-{}-]]
+[[File:Foobar.jpg|alt=-{}-foAjrjvi-{}-]]
 !! html
 
 http://example.com/images/3/3a/Foobar.jpg; width="1941" height="220">

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0259b378549f7d9778c27c4bc3efd8d277893f8c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_28
Gerrit-Owner: Brian Wolff 
Gerrit-Reviewer: Brian Wolff 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_27]: Fix LanguageSrTest for language converter

[Brian Wolff (Code Review)]

Brian Wolff has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/391491 )

Change subject: Fix LanguageSrTest for language converter
..


Fix LanguageSrTest for language converter

Language converter seems to maintain state between parser
invocations. Use a more unique string for the test.

This is a follow-up to 98b6635895.

Bug: T180551
Change-Id: I0259b378549f7d9778c27c4bc3efd8d277893f8c
---
M tests/parser/parserTests.txt
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Brian Wolff: Verified; Looks good to me, approved



diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index 4a52c46..b498105 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -16767,9 +16767,9 @@
 !! options
 language=sr variant=sr-el
 !! wikitext
--{H|abc=>sr-el:" onload="alert(1)" data-foo="}-
+-{H|foAjrjvi=>sr-el:" onload="alert(1)" data-foo="}-
 
-[[File:Foobar.jpg|alt=-{}-abc-{}-]]
+[[File:Foobar.jpg|alt=-{}-foAjrjvi-{}-]]
 !! html
 
 http://example.com/images/3/3a/Foobar.jpg; width="1941" height="220">

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0259b378549f7d9778c27c4bc3efd8d277893f8c
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_27
Gerrit-Owner: Brian Wolff 
Gerrit-Reviewer: Brian Wolff 
Gerrit-Reviewer: C. Scott Ananian 
Gerrit-Reviewer: Jackmcbarn 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_28]: Fix LanguageSrTest for language converter

[Brian Wolff (Code Review)]

Brian Wolff has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/391492 )

Change subject: Fix LanguageSrTest for language converter
..

Fix LanguageSrTest for language converter

Language converter seems to maintain state between parser
invocations. Use a more unique string for the test.

This is a follow-up to 98b6635895.

Bug: T180551
Change-Id: I0259b378549f7d9778c27c4bc3efd8d277893f8c
---
M tests/parser/parserTests.txt
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/92/391492/1

diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index 38a6e47..19bf56f 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -17144,9 +17144,9 @@
 !! options
 language=sr variant=sr-el
 !! wikitext
--{H|abc=>sr-el:" onload="alert(1)" data-foo="}-
+-{H|foAjrjvi=>sr-el:" onload="alert(1)" data-foo="}-
 
-[[File:Foobar.jpg|alt=-{}-abc-{}-]]
+[[File:Foobar.jpg|alt=-{}-foAjrjvi-{}-]]
 !! html
 
 http://example.com/images/3/3a/Foobar.jpg; width="1941" height="220">

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0259b378549f7d9778c27c4bc3efd8d277893f8c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_28
Gerrit-Owner: Brian Wolff 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_27]: Fix parser test for language converter

[Brian Wolff (Code Review)]

Brian Wolff has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/391491 )

Change subject: Fix parser test for language converter
..

Fix parser test for language converter

Language converter seems to maintain state between parser
invocations. Use a more unique string for the test.

This is a follow-up to 98b6635895.

Bug: T180551
Change-Id: I0259b378549f7d9778c27c4bc3efd8d277893f8c
---
M tests/parser/parserTests.txt
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/91/391491/1

diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index 4a52c46..b498105 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -16767,9 +16767,9 @@
 !! options
 language=sr variant=sr-el
 !! wikitext
--{H|abc=>sr-el:" onload="alert(1)" data-foo="}-
+-{H|foAjrjvi=>sr-el:" onload="alert(1)" data-foo="}-
 
-[[File:Foobar.jpg|alt=-{}-abc-{}-]]
+[[File:Foobar.jpg|alt=-{}-foAjrjvi-{}-]]
 !! html
 
 http://example.com/images/3/3a/Foobar.jpg; width="1941" height="220">

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0259b378549f7d9778c27c4bc3efd8d277893f8c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_27
Gerrit-Owner: Brian Wolff 

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

[MediaWiki-commits] [Gerrit] analytics/wikistats2[master]: [VERY VERY WIP] Work so far on simplifying and fixing breakd...

[Milimetric (Code Review)]

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

Change subject: [VERY VERY WIP] Work so far on simplifying and fixing breakdowns
..

[VERY VERY WIP] Work so far on simplifying and fixing breakdowns

Work so far:
* break everything
* unify the breakdown/overall logic and data so it all looks and works
  the same
* simplify the components by factoring out common logic
* simplify the code by factoring out repeated logic
* make sure all the little bits and pieces are still functioning (this
  will mean substantial work)

Bug: T180556
Change-Id: I034b70b3d5a0034aa87013650884691c1c94e9f9
---
M src/components/dashboard/MetricBarWidget.vue
M src/components/dashboard/MetricLineWidget.vue
M src/components/dashboard/MetricWidget.vue
M src/components/detail/Breakdowns.vue
M src/components/detail/Detail.vue
M src/components/detail/GraphPanel.vue
M src/components/detail/chart/BarChart.vue
M src/components/detail/chart/LineChart.vue
M src/components/detail/chart/TableChart.vue
M src/config/metrics/content.js
M src/models/DimensionalData.js
M src/models/GraphModel.js
M src/utils.js
M test/GraphModel.spec.js
14 files changed, 180 insertions(+), 205 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/wikistats2 
refs/changes/90/391490/1

diff --git a/src/components/dashboard/MetricBarWidget.vue 
b/src/components/dashboard/MetricBarWidget.vue
index b2dfc2e..72384c4 100644
--- a/src/components/dashboard/MetricBarWidget.vue
+++ b/src/components/dashboard/MetricBarWidget.vue
@@ -52,7 +52,7 @@
   );
 g.selectAll('*').remove();
 
-const rowData = this.graphModel.getGraphData();
+const rowData = this.graphModel.graphData;
 
 const n = root.node(),
   width = n.offsetWidth - margin.left - margin.right,
diff --git a/src/components/dashboard/MetricLineWidget.vue 
b/src/components/dashboard/MetricLineWidget.vue
index be6f956..c0520de 100644
--- a/src/components/dashboard/MetricLineWidget.vue
+++ b/src/components/dashboard/MetricLineWidget.vue
@@ -47,7 +47,7 @@
   );
 g.selectAll('*').remove();
 
-const rowData = this.graphModel.getGraphData();
+const rowData = this.graphModel.graphData;
 
 function resize () {
 g.html("");
@@ -70,10 +70,10 @@
 g.attr('width', width).attr('height', height);
 g.append('path').datum(rowData)
 .attr('d', area)
-.style('fill', 'url(#grad-'+self.graphModel.getArea()+')')
+.style('fill', 'url(#grad-'+self.graphModel.area+')')
 .style('stroke-width', '0');
 let gradient = g.append('linearGradient')
-.attr('id', 'grad-'+self.graphModel.getArea())
+.attr('id', 'grad-'+self.graphModel.area)
 .attr('x1',"0%")
 .attr('y1',"0%")
 .attr('x2',"0%")
diff --git a/src/components/dashboard/MetricWidget.vue 
b/src/components/dashboard/MetricWidget.vue
index bfcc4c5..a31d027 100644
--- a/src/components/dashboard/MetricWidget.vue
+++ b/src/components/dashboard/MetricWidget.vue
@@ -137,7 +137,7 @@
 return _.last(this.graphData);
 },
 graphData: function () {
-return this.graphModel.getGraphData();
+return this.graphModel.graphData;
 },
 changeMoM: function () {
 const data = this.graphData;
diff --git a/src/components/detail/Breakdowns.vue 
b/src/components/detail/Breakdowns.vue
index 8ee6906..3765dd6 100644
--- a/src/components/detail/Breakdowns.vue
+++ b/src/components/detail/Breakdowns.vue
@@ -4,54 +4,49 @@
 
 Filter and Split
 
-
+
 
 
+v-model="graphModel.activeBreakdown"
+:value="b">
 
-Split by {{b.name}}
-
+
+Overall {{b.name}}
+
+
+
+Split by {{b.name}}
+
+
 
 
 
-
-
-{{bv.name}}
-
+
+
+
+
+{{bv.name}}
+
+
 
 
 
 
 
+import utils from '../../utils';
+
 export default {
 name: 'breakdowns',
 props: ['graphModel'],
+
 methods: {
-breakdownToggled (index) {
-this.graphModel.getBreakdowns().forEach((b, i) => {
-if(i != index) {
-this.graphModel.getBreakdowns()[i].on = false;
-}
-})
-this.updateState();
-},
-shouldBeChecked (index) {
-   

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_30]: Ignore long git hashes for eval-stdin.php

[Reedy (Code Review)]

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

Change subject: Ignore long git hashes for eval-stdin.php
..


Ignore long git hashes for eval-stdin.php

This reverts commit 5b205725842edbae6ccde5a13baf20c2eb3ec4ae.

Change-Id: Ib47ffed1174628959b9ef537370ff88f8bcb22f1
(cherry picked from commit 417a83a1a3ddf374dff5a14d8a08cd4c6099d357)
---
M maintenance/update.php
1 file changed, 4 insertions(+), 2 deletions(-)

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



diff --git a/maintenance/update.php b/maintenance/update.php
index 08b1576..52e9017 100755
--- a/maintenance/update.php
+++ b/maintenance/update.php
@@ -172,9 +172,11 @@
 
$badPhpUnit = dirname( __DIR__ ) . 
'/vendor/phpunit/phpunit/src/Util/PHP/eval-stdin.php';
if ( file_exists( $badPhpUnit ) ) {
+   // @codingStandardsIgnoreStart 
Generic.Files.LineLength.TooLong
// Bad versions of the file are:
-   // 
https://raw.githubusercontent.com/sebastianbergmann/phpunit/c820f91/src/Util/PHP/eval-stdin.php
-   // 
https://raw.githubusercontent.com/sebastianbergmann/phpunit/3aaddb1/src/Util/PHP/eval-stdin.php
+   // 
https://raw.githubusercontent.com/sebastianbergmann/phpunit/c820f915bfae34e5a836f94967a2a5ea5ef34f21/src/Util/PHP/eval-stdin.php
+   // 
https://raw.githubusercontent.com/sebastianbergmann/phpunit/3aaddb1c5bd9b9b8d070b4cf120e71c36fd08412/src/Util/PHP/eval-stdin.php
+   // @codingStandardsIgnoreEnd
$md5 = md5_file( $badPhpUnit );
if ( $md5 === '120ac49800671dc383b6f3709c25c099'
|| $md5 === '28af792cb38fc9a1b236b91c1aad2876'

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib47ffed1174628959b9ef537370ff88f8bcb22f1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_30
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Reedy 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_30]: Ignore long git hashes for eval-stdin.php

[Reedy (Code Review)]

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

Change subject: Ignore long git hashes for eval-stdin.php
..

Ignore long git hashes for eval-stdin.php

This reverts commit 5b205725842edbae6ccde5a13baf20c2eb3ec4ae.

Change-Id: Ib47ffed1174628959b9ef537370ff88f8bcb22f1
(cherry picked from commit 417a83a1a3ddf374dff5a14d8a08cd4c6099d357)
---
M maintenance/update.php
1 file changed, 4 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/88/391488/1

diff --git a/maintenance/update.php b/maintenance/update.php
index 08b1576..52e9017 100755
--- a/maintenance/update.php
+++ b/maintenance/update.php
@@ -172,9 +172,11 @@
 
$badPhpUnit = dirname( __DIR__ ) . 
'/vendor/phpunit/phpunit/src/Util/PHP/eval-stdin.php';
if ( file_exists( $badPhpUnit ) ) {
+   // @codingStandardsIgnoreStart 
Generic.Files.LineLength.TooLong
// Bad versions of the file are:
-   // 
https://raw.githubusercontent.com/sebastianbergmann/phpunit/c820f91/src/Util/PHP/eval-stdin.php
-   // 
https://raw.githubusercontent.com/sebastianbergmann/phpunit/3aaddb1/src/Util/PHP/eval-stdin.php
+   // 
https://raw.githubusercontent.com/sebastianbergmann/phpunit/c820f915bfae34e5a836f94967a2a5ea5ef34f21/src/Util/PHP/eval-stdin.php
+   // 
https://raw.githubusercontent.com/sebastianbergmann/phpunit/3aaddb1c5bd9b9b8d070b4cf120e71c36fd08412/src/Util/PHP/eval-stdin.php
+   // @codingStandardsIgnoreEnd
$md5 = md5_file( $badPhpUnit );
if ( $md5 === '120ac49800671dc383b6f3709c25c099'
|| $md5 === '28af792cb38fc9a1b236b91c1aad2876'

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib47ffed1174628959b9ef537370ff88f8bcb22f1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_30
Gerrit-Owner: Reedy 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_29]: Ignore long git hashes for eval-stdin.php

[Reedy (Code Review)]

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

Change subject: Ignore long git hashes for eval-stdin.php
..


Ignore long git hashes for eval-stdin.php

This reverts commit 5b205725842edbae6ccde5a13baf20c2eb3ec4ae.

Change-Id: Ib47ffed1174628959b9ef537370ff88f8bcb22f1
(cherry picked from commit 417a83a1a3ddf374dff5a14d8a08cd4c6099d357)
---
M maintenance/update.php
1 file changed, 4 insertions(+), 2 deletions(-)

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



diff --git a/maintenance/update.php b/maintenance/update.php
index f2f8a43..1a01381 100755
--- a/maintenance/update.php
+++ b/maintenance/update.php
@@ -162,9 +162,11 @@
 
$badPhpUnit = dirname( __DIR__ ) . 
'/vendor/phpunit/phpunit/src/Util/PHP/eval-stdin.php';
if ( file_exists( $badPhpUnit ) ) {
+   // @codingStandardsIgnoreStart 
Generic.Files.LineLength.TooLong
// Bad versions of the file are:
-   // 
https://raw.githubusercontent.com/sebastianbergmann/phpunit/c820f91/src/Util/PHP/eval-stdin.php
-   // 
https://raw.githubusercontent.com/sebastianbergmann/phpunit/3aaddb1/src/Util/PHP/eval-stdin.php
+   // 
https://raw.githubusercontent.com/sebastianbergmann/phpunit/c820f915bfae34e5a836f94967a2a5ea5ef34f21/src/Util/PHP/eval-stdin.php
+   // 
https://raw.githubusercontent.com/sebastianbergmann/phpunit/3aaddb1c5bd9b9b8d070b4cf120e71c36fd08412/src/Util/PHP/eval-stdin.php
+   // @codingStandardsIgnoreEnd
$md5 = md5_file( $badPhpUnit );
if ( $md5 === '120ac49800671dc383b6f3709c25c099'
|| $md5 === '28af792cb38fc9a1b236b91c1aad2876'

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib47ffed1174628959b9ef537370ff88f8bcb22f1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_29
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Reedy 
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...dcat[master]: Work around HHVM bug by using XMLWriter::writeAttribute()

[Tim Starling (Code Review)]

Tim Starling has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/391489 )

Change subject: Work around HHVM bug by using XMLWriter::writeAttribute()
..

Work around HHVM bug by using XMLWriter::writeAttribute()

HHVM has a bug which causes a null namespace URI passed to
writeAttributeNS() to be converted to an empty string before being
passed to libxml2. This causes libxml2 to output an invalid namespace
declaration. So instead, use writeAttribute() to write the prefixed
attribute name, bypassing libxml2's namespace support.

libxml2 keeps a stack of current xmlns declarations, so you would
think it would be possible to declare a namespace on the root element
and then use it in subsequent elements by specifying the same URI each
time. But libxml does not parse xmlns:prefix="..." attributes to add
them to its declaration list, and has no other way to declare
namespaces, so the relevant attributes would have to actually be present
on the root element.

Bug: T117534
Change-Id: Iae8c95adb7824dd9d44849dd54f1ccc67e70e084
---
M DCAT.php
1 file changed, 42 insertions(+), 44 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dumps/dcat 
refs/changes/89/391489/1

diff --git a/DCAT.php b/DCAT.php
index ce7e6e2..12811a7 100644
--- a/DCAT.php
+++ b/DCAT.php
@@ -163,22 +163,20 @@
);
 
$xml->startElementNS( 'dcat', 'accessURL', null );
-   $xml->writeAttributeNS( 'rdf', 'resource', null, $url );
+   $xml->writeAttribute( 'rdf:resource', $url );
$xml->endElement();
 
$xml->startElementNS( 'dcat', 'downloadURL', null );
-   $xml->writeAttributeNS( 'rdf', 'resource', null, $url );
+   $xml->writeAttribute( 'rdf:resource', $url );
$xml->endElement();
 
$xml->startElementNS( 'dcterms', 'issued', null );
-   $xml->writeAttributeNS( 'rdf', 'datatype', null,
-   'http://www.w3.org/2001/XMLSchema#date' );
+   $xml->writeAttribute( 'rdf:datatype', 
'http://www.w3.org/2001/XMLSchema#date' );
$xml->text( $dump['timestamp'] );
$xml->endElement();
 
$xml->startElementNS( 'dcat', 'byteSize', null );
-   $xml->writeAttributeNS( 'rdf', 'datatype', null,
-   'http://www.w3.org/2001/XMLSchema#decimal' );
+   $xml->writeAttribute( 'rdf:datatype', 
'http://www.w3.org/2001/XMLSchema#decimal' );
$xml->text( $dump['byteSize'] );
$xml->endElement();
 }
@@ -211,7 +209,7 @@
);
}
$xml->startElementNS( 'dcterms', 'description', null );
-   $xml->writeAttributeNS( 'xml', 'lang', null, $langCode 
);
+   $xml->writeAttribute( 'xml:lang', $langCode );
$xml->text( $formatDescription );
$xml->endElement();
}
@@ -253,21 +251,21 @@
array_push( $ids, $id );
 
$xml->startElementNS( 'rdf', 'Description', null );
-   $xml->writeAttributeNS( 'rdf', 'about', null, $id );
+   $xml->writeAttribute( 'rdf:about', $id );
 
$xml->startElementNS( 'rdf', 'type', null );
-   $xml->writeAttributeNS( 'rdf', 'resource', null,
+   $xml->writeAttribute( 'rdf:resource',
'http://www.w3.org/ns/dcat#Distribution' );
$xml->endElement();
 
$xml->startElementNS( 'dcterms', 'license', null );
-   $xml->writeAttributeNS( 'rdf', 'resource', null,
+   $xml->writeAttribute( 'rdf:resource',
$data['config']["$prefix-info"]['license'] );
$xml->endElement();
 
if ( !$isDump ) {
$xml->startElementNS( 'dcat', 'accessURL', null 
);
-   $xml->writeAttributeNS( 'rdf', 'resource', null,
+   $xml->writeAttribute( 'rdf:resource',

$data['config']["$prefix-info"]['accessURL'] );
$xml->endElement();
} else {
@@ -302,7 +300,7 @@
foreach ( $data['i18n'] as $langCode => $langData ) {
if ( array_key_exists( "dataset-$type-title", $langData ) ) {
$xml->startElementNS( 'dcterms', 'title', null );
-   $xml->writeAttributeNS( 'xml', 'lang', null, $langCode 
);
+   $xml->writeAttribute( 'xml:lang', $langCode );
if ( $type === 'live' ) {
$xml->text( $langData['dataset-live-title'] );
} else {
@@ -314,7 +312,7 @@
}
if ( array_key_exists( 

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_27]: Ignore long git hashes for eval-stdin.php

[Reedy (Code Review)]

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

Change subject: Ignore long git hashes for eval-stdin.php
..


Ignore long git hashes for eval-stdin.php

This reverts commit 5b205725842edbae6ccde5a13baf20c2eb3ec4ae.

Change-Id: Ib47ffed1174628959b9ef537370ff88f8bcb22f1
(cherry picked from commit 417a83a1a3ddf374dff5a14d8a08cd4c6099d357)
---
M maintenance/update.php
1 file changed, 4 insertions(+), 2 deletions(-)

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



diff --git a/maintenance/update.php b/maintenance/update.php
index f800e4a..da81661 100755
--- a/maintenance/update.php
+++ b/maintenance/update.php
@@ -167,9 +167,11 @@
 
$badPhpUnit = dirname( __DIR__ ) . 
'/vendor/phpunit/phpunit/src/Util/PHP/eval-stdin.php';
if ( file_exists( $badPhpUnit ) ) {
+   // @codingStandardsIgnoreStart 
Generic.Files.LineLength.TooLong
// Bad versions of the file are:
-   // 
https://raw.githubusercontent.com/sebastianbergmann/phpunit/c820f91/src/Util/PHP/eval-stdin.php
-   // 
https://raw.githubusercontent.com/sebastianbergmann/phpunit/3aaddb1/src/Util/PHP/eval-stdin.php
+   // 
https://raw.githubusercontent.com/sebastianbergmann/phpunit/c820f915bfae34e5a836f94967a2a5ea5ef34f21/src/Util/PHP/eval-stdin.php
+   // 
https://raw.githubusercontent.com/sebastianbergmann/phpunit/3aaddb1c5bd9b9b8d070b4cf120e71c36fd08412/src/Util/PHP/eval-stdin.php
+   // @codingStandardsIgnoreEnd
$md5 = md5_file( $badPhpUnit );
if ( $md5 === '120ac49800671dc383b6f3709c25c099'
|| $md5 === '28af792cb38fc9a1b236b91c1aad2876'

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib47ffed1174628959b9ef537370ff88f8bcb22f1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_27
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Reedy 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_27]: Ignore long git hashes for eval-stdin.php

[Reedy (Code Review)]

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

Change subject: Ignore long git hashes for eval-stdin.php
..

Ignore long git hashes for eval-stdin.php

This reverts commit 5b205725842edbae6ccde5a13baf20c2eb3ec4ae.

Change-Id: Ib47ffed1174628959b9ef537370ff88f8bcb22f1
(cherry picked from commit 417a83a1a3ddf374dff5a14d8a08cd4c6099d357)
---
M maintenance/update.php
1 file changed, 4 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/86/391486/1

diff --git a/maintenance/update.php b/maintenance/update.php
index f800e4a..da81661 100755
--- a/maintenance/update.php
+++ b/maintenance/update.php
@@ -167,9 +167,11 @@
 
$badPhpUnit = dirname( __DIR__ ) . 
'/vendor/phpunit/phpunit/src/Util/PHP/eval-stdin.php';
if ( file_exists( $badPhpUnit ) ) {
+   // @codingStandardsIgnoreStart 
Generic.Files.LineLength.TooLong
// Bad versions of the file are:
-   // 
https://raw.githubusercontent.com/sebastianbergmann/phpunit/c820f91/src/Util/PHP/eval-stdin.php
-   // 
https://raw.githubusercontent.com/sebastianbergmann/phpunit/3aaddb1/src/Util/PHP/eval-stdin.php
+   // 
https://raw.githubusercontent.com/sebastianbergmann/phpunit/c820f915bfae34e5a836f94967a2a5ea5ef34f21/src/Util/PHP/eval-stdin.php
+   // 
https://raw.githubusercontent.com/sebastianbergmann/phpunit/3aaddb1c5bd9b9b8d070b4cf120e71c36fd08412/src/Util/PHP/eval-stdin.php
+   // @codingStandardsIgnoreEnd
$md5 = md5_file( $badPhpUnit );
if ( $md5 === '120ac49800671dc383b6f3709c25c099'
|| $md5 === '28af792cb38fc9a1b236b91c1aad2876'

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib47ffed1174628959b9ef537370ff88f8bcb22f1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_27
Gerrit-Owner: Reedy 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_29]: Ignore long git hashes for eval-stdin.php

[Reedy (Code Review)]

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

Change subject: Ignore long git hashes for eval-stdin.php
..

Ignore long git hashes for eval-stdin.php

This reverts commit 5b205725842edbae6ccde5a13baf20c2eb3ec4ae.

Change-Id: Ib47ffed1174628959b9ef537370ff88f8bcb22f1
(cherry picked from commit 417a83a1a3ddf374dff5a14d8a08cd4c6099d357)
---
M maintenance/update.php
1 file changed, 4 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/87/391487/1

diff --git a/maintenance/update.php b/maintenance/update.php
index f2f8a43..1a01381 100755
--- a/maintenance/update.php
+++ b/maintenance/update.php
@@ -162,9 +162,11 @@
 
$badPhpUnit = dirname( __DIR__ ) . 
'/vendor/phpunit/phpunit/src/Util/PHP/eval-stdin.php';
if ( file_exists( $badPhpUnit ) ) {
+   // @codingStandardsIgnoreStart 
Generic.Files.LineLength.TooLong
// Bad versions of the file are:
-   // 
https://raw.githubusercontent.com/sebastianbergmann/phpunit/c820f91/src/Util/PHP/eval-stdin.php
-   // 
https://raw.githubusercontent.com/sebastianbergmann/phpunit/3aaddb1/src/Util/PHP/eval-stdin.php
+   // 
https://raw.githubusercontent.com/sebastianbergmann/phpunit/c820f915bfae34e5a836f94967a2a5ea5ef34f21/src/Util/PHP/eval-stdin.php
+   // 
https://raw.githubusercontent.com/sebastianbergmann/phpunit/3aaddb1c5bd9b9b8d070b4cf120e71c36fd08412/src/Util/PHP/eval-stdin.php
+   // @codingStandardsIgnoreEnd
$md5 = md5_file( $badPhpUnit );
if ( $md5 === '120ac49800671dc383b6f3709c25c099'
|| $md5 === '28af792cb38fc9a1b236b91c1aad2876'

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib47ffed1174628959b9ef537370ff88f8bcb22f1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_29
Gerrit-Owner: Reedy 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Ignore long git hashes for eval-stdin.php

[Reedy (Code Review)]

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

Change subject: Ignore long git hashes for eval-stdin.php
..


Ignore long git hashes for eval-stdin.php

This reverts commit 5b205725842edbae6ccde5a13baf20c2eb3ec4ae.

Change-Id: Ib47ffed1174628959b9ef537370ff88f8bcb22f1
---
M maintenance/update.php
1 file changed, 4 insertions(+), 2 deletions(-)

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



diff --git a/maintenance/update.php b/maintenance/update.php
index d5c11b5..f8f5dcd 100755
--- a/maintenance/update.php
+++ b/maintenance/update.php
@@ -172,9 +172,11 @@
 
$badPhpUnit = dirname( __DIR__ ) . 
'/vendor/phpunit/phpunit/src/Util/PHP/eval-stdin.php';
if ( file_exists( $badPhpUnit ) ) {
+   // @codingStandardsIgnoreStart 
Generic.Files.LineLength.TooLong
// Bad versions of the file are:
-   // 
https://raw.githubusercontent.com/sebastianbergmann/phpunit/c820f91/src/Util/PHP/eval-stdin.php
-   // 
https://raw.githubusercontent.com/sebastianbergmann/phpunit/3aaddb1/src/Util/PHP/eval-stdin.php
+   // 
https://raw.githubusercontent.com/sebastianbergmann/phpunit/c820f915bfae34e5a836f94967a2a5ea5ef34f21/src/Util/PHP/eval-stdin.php
+   // 
https://raw.githubusercontent.com/sebastianbergmann/phpunit/3aaddb1c5bd9b9b8d070b4cf120e71c36fd08412/src/Util/PHP/eval-stdin.php
+   // @codingStandardsIgnoreEnd
$md5 = md5_file( $badPhpUnit );
if ( $md5 === '120ac49800671dc383b6f3709c25c099'
|| $md5 === '28af792cb38fc9a1b236b91c1aad2876'

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib47ffed1174628959b9ef537370ff88f8bcb22f1
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Parent5446 
Gerrit-Reviewer: Reedy 
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]: Revert "Shorten git hashes for eval-stdin.php"

[Reedy (Code Review)]

Hello Parent5446, jenkins-bot,

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

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

to review the following change.


Change subject: Revert "Shorten git hashes for eval-stdin.php"
..

Revert "Shorten git hashes for eval-stdin.php"

This reverts commit 5b205725842edbae6ccde5a13baf20c2eb3ec4ae.

Change-Id: Ib47ffed1174628959b9ef537370ff88f8bcb22f1
---
M maintenance/update.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/85/391485/1

diff --git a/maintenance/update.php b/maintenance/update.php
index d5c11b5..70cea51 100755
--- a/maintenance/update.php
+++ b/maintenance/update.php
@@ -173,8 +173,8 @@
$badPhpUnit = dirname( __DIR__ ) . 
'/vendor/phpunit/phpunit/src/Util/PHP/eval-stdin.php';
if ( file_exists( $badPhpUnit ) ) {
// Bad versions of the file are:
-   // 
https://raw.githubusercontent.com/sebastianbergmann/phpunit/c820f91/src/Util/PHP/eval-stdin.php
-   // 
https://raw.githubusercontent.com/sebastianbergmann/phpunit/3aaddb1/src/Util/PHP/eval-stdin.php
+   // 
https://raw.githubusercontent.com/sebastianbergmann/phpunit/c820f915bfae34e5a836f94967a2a5ea5ef34f21/src/Util/PHP/eval-stdin.php
+   // 
https://raw.githubusercontent.com/sebastianbergmann/phpunit/3aaddb1c5bd9b9b8d070b4cf120e71c36fd08412/src/Util/PHP/eval-stdin.php
$md5 = md5_file( $badPhpUnit );
if ( $md5 === '120ac49800671dc383b6f3709c25c099'
|| $md5 === '28af792cb38fc9a1b236b91c1aad2876'

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib47ffed1174628959b9ef537370ff88f8bcb22f1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Reedy 
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/core[master]: Fix parser test for language converter

[Brian Wolff (Code Review)]

Brian Wolff has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/391484 )

Change subject: Fix parser test for language converter
..

Fix parser test for language converter

Language converter seems to maintain state between parser
invocations. Use a more unique string for the test.

This is a follow-up to 98b6635895

Bug: T180551
Change-Id: I0259b378549f7d9778c27c4bc3efd8d277893f8c
---
M tests/parser/parserTests.txt
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/84/391484/1

diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index 4a52c46..b498105 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -16767,9 +16767,9 @@
 !! options
 language=sr variant=sr-el
 !! wikitext
--{H|abc=>sr-el:" onload="alert(1)" data-foo="}-
+-{H|foAjrjvi=>sr-el:" onload="alert(1)" data-foo="}-
 
-[[File:Foobar.jpg|alt=-{}-abc-{}-]]
+[[File:Foobar.jpg|alt=-{}-foAjrjvi-{}-]]
 !! html
 
 http://example.com/images/3/3a/Foobar.jpg; width="1941" height="220">

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0259b378549f7d9778c27c4bc3efd8d277893f8c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_30]: Fix phpcs issues from LanguageConverter patches

[Reedy (Code Review)]

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

Change subject: Fix phpcs issues from LanguageConverter patches
..

Fix phpcs issues from LanguageConverter patches

Change-Id: I34e57c90ffd40fbd9f8afe3c57dd73fa7f655841
(cherry picked from commit f600b4ede9a6390cc5e929d2a48ed98af2edbc60)
---
M languages/LanguageConverter.php
M tests/phpunit/languages/LanguageConverterTest.php
2 files changed, 5 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/83/391483/1

diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index f9610fa..8e98abd 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -412,11 +412,11 @@
$log = LoggerFactory::getInstance( 
'languageconverter' );
$log->error( "Hit pcre.backtrack_limit in " . 
__METHOD__
. ". Disabling language conversion for 
this page.",
-   array(
+   [
"method" => __METHOD__,
"variant" => $toVariant,
"startOfText" => substr( $text, 
0, 500 )
-   )
+   ]
);
return $text;
}
@@ -665,7 +665,9 @@
 
$noScript = '.*?<\/script>(*SKIP)(*FAIL)';
$noStyle = '.*?<\/style>(*SKIP)(*FAIL)';
+   // @codingStandardsIgnoreStart Generic.Files.LineLength.TooLong
$noHtml = 
'<(?:[^>=]*+(?>[^>=]*+=\s*+(?:"[^"]*"|\'[^\']*\'|[^\'">\s]*+))*+[^>=]*+>|.*+)(*SKIP)(*FAIL)';
+   // @codingStandardsIgnoreEnd
while ( $startPos < $length && $continue ) {
$continue = preg_match(
// Only match -{ outside of html.
diff --git a/tests/phpunit/languages/LanguageConverterTest.php 
b/tests/phpunit/languages/LanguageConverterTest.php
index 331368e..fc2ed33 100644
--- a/tests/phpunit/languages/LanguageConverterTest.php
+++ b/tests/phpunit/languages/LanguageConverterTest.php
@@ -167,7 +167,7 @@
$testString .= 'xxx xxx xxx';
}
$testString .= "\n";
-   $old = ini_set('pcre.backtrack_limit', 200 );
+   $old = ini_set( 'pcre.backtrack_limit', 200 );
$result = $this->lc->autoConvert( $testString, 'tg-latn' );
ini_set( 'pcre.backtrack_limit', $old );
// The в in the id attribute should not get converted to a v

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I34e57c90ffd40fbd9f8afe3c57dd73fa7f655841
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_30
Gerrit-Owner: Reedy 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_30]: Fix phpcs issues from LanguageConverter patches

[Reedy (Code Review)]

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

Change subject: Fix phpcs issues from LanguageConverter patches
..


Fix phpcs issues from LanguageConverter patches

Change-Id: I34e57c90ffd40fbd9f8afe3c57dd73fa7f655841
(cherry picked from commit f600b4ede9a6390cc5e929d2a48ed98af2edbc60)
---
M languages/LanguageConverter.php
M tests/phpunit/languages/LanguageConverterTest.php
2 files changed, 5 insertions(+), 3 deletions(-)

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



diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index f9610fa..8e98abd 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -412,11 +412,11 @@
$log = LoggerFactory::getInstance( 
'languageconverter' );
$log->error( "Hit pcre.backtrack_limit in " . 
__METHOD__
. ". Disabling language conversion for 
this page.",
-   array(
+   [
"method" => __METHOD__,
"variant" => $toVariant,
"startOfText" => substr( $text, 
0, 500 )
-   )
+   ]
);
return $text;
}
@@ -665,7 +665,9 @@
 
$noScript = '.*?<\/script>(*SKIP)(*FAIL)';
$noStyle = '.*?<\/style>(*SKIP)(*FAIL)';
+   // @codingStandardsIgnoreStart Generic.Files.LineLength.TooLong
$noHtml = 
'<(?:[^>=]*+(?>[^>=]*+=\s*+(?:"[^"]*"|\'[^\']*\'|[^\'">\s]*+))*+[^>=]*+>|.*+)(*SKIP)(*FAIL)';
+   // @codingStandardsIgnoreEnd
while ( $startPos < $length && $continue ) {
$continue = preg_match(
// Only match -{ outside of html.
diff --git a/tests/phpunit/languages/LanguageConverterTest.php 
b/tests/phpunit/languages/LanguageConverterTest.php
index 331368e..fc2ed33 100644
--- a/tests/phpunit/languages/LanguageConverterTest.php
+++ b/tests/phpunit/languages/LanguageConverterTest.php
@@ -167,7 +167,7 @@
$testString .= 'xxx xxx xxx';
}
$testString .= "\n";
-   $old = ini_set('pcre.backtrack_limit', 200 );
+   $old = ini_set( 'pcre.backtrack_limit', 200 );
$result = $this->lc->autoConvert( $testString, 'tg-latn' );
ini_set( 'pcre.backtrack_limit', $old );
// The в in the id attribute should not get converted to a v

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I34e57c90ffd40fbd9f8afe3c57dd73fa7f655841
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_30
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Reedy 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_29]: Fix phpcs issues from LanguageConverter patches

[Reedy (Code Review)]

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

Change subject: Fix phpcs issues from LanguageConverter patches
..


Fix phpcs issues from LanguageConverter patches

Change-Id: I34e57c90ffd40fbd9f8afe3c57dd73fa7f655841
(cherry picked from commit f600b4ede9a6390cc5e929d2a48ed98af2edbc60)
---
M languages/LanguageConverter.php
M tests/phpunit/languages/LanguageConverterTest.php
2 files changed, 5 insertions(+), 3 deletions(-)

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



diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index 2f175e2..e9a9642 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -418,11 +418,11 @@
$log = LoggerFactory::getInstance( 
'languageconverter' );
$log->error( "Hit pcre.backtrack_limit in " . 
__METHOD__
. ". Disabling language conversion for 
this page.",
-   array(
+   [
"method" => __METHOD__,
"variant" => $toVariant,
"startOfText" => substr( $text, 
0, 500 )
-   )
+   ]
);
return $text;
}
@@ -671,7 +671,9 @@
 
$noScript = '.*?<\/script>(*SKIP)(*FAIL)';
$noStyle = '.*?<\/style>(*SKIP)(*FAIL)';
+   // @codingStandardsIgnoreStart Generic.Files.LineLength.TooLong
$noHtml = 
'<(?:[^>=]*+(?>[^>=]*+=\s*+(?:"[^"]*"|\'[^\']*\'|[^\'">\s]*+))*+[^>=]*+>|.*+)(*SKIP)(*FAIL)';
+   // @codingStandardsIgnoreEnd
while ( $startPos < $length && $continue ) {
$continue = preg_match(
// Only match -{ outside of html.
diff --git a/tests/phpunit/languages/LanguageConverterTest.php 
b/tests/phpunit/languages/LanguageConverterTest.php
index 331368e..fc2ed33 100644
--- a/tests/phpunit/languages/LanguageConverterTest.php
+++ b/tests/phpunit/languages/LanguageConverterTest.php
@@ -167,7 +167,7 @@
$testString .= 'xxx xxx xxx';
}
$testString .= "\n";
-   $old = ini_set('pcre.backtrack_limit', 200 );
+   $old = ini_set( 'pcre.backtrack_limit', 200 );
$result = $this->lc->autoConvert( $testString, 'tg-latn' );
ini_set( 'pcre.backtrack_limit', $old );
// The в in the id attribute should not get converted to a v

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I34e57c90ffd40fbd9f8afe3c57dd73fa7f655841
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_29
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Reedy 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_27]: Fix phpcs issues from LanguageConverter patches

[Reedy (Code Review)]

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

Change subject: Fix phpcs issues from LanguageConverter patches
..


Fix phpcs issues from LanguageConverter patches

Change-Id: I34e57c90ffd40fbd9f8afe3c57dd73fa7f655841
(cherry picked from commit f600b4ede9a6390cc5e929d2a48ed98af2edbc60)
---
M languages/LanguageConverter.php
M tests/phpunit/languages/LanguageConverterTest.php
2 files changed, 5 insertions(+), 3 deletions(-)

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



diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index 87eb80d..28c75e1 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -412,11 +412,11 @@
$log = LoggerFactory::getInstance( 
'languageconverter' );
$log->error( "Hit pcre.backtrack_limit in " . 
__METHOD__
. ". Disabling language conversion for 
this page.",
-   array(
+   [
"method" => __METHOD__,
"variant" => $toVariant,
"startOfText" => substr( $text, 
0, 500 )
-   )
+   ]
);
return $text;
}
@@ -667,7 +667,9 @@
 
$noScript = '.*?<\/script>(*SKIP)(*FAIL)';
$noStyle = '.*?<\/style>(*SKIP)(*FAIL)';
+   // @codingStandardsIgnoreStart Generic.Files.LineLength.TooLong
$noHtml = 
'<(?:[^>=]*+(?>[^>=]*+=\s*+(?:"[^"]*"|\'[^\']*\'|[^\'">\s]*+))*+[^>=]*+>|.*+)(*SKIP)(*FAIL)';
+   // @codingStandardsIgnoreEnd
while ( $startPos < $length && $continue ) {
$continue = preg_match(
// Only match -{ outside of html.
diff --git a/tests/phpunit/languages/LanguageConverterTest.php 
b/tests/phpunit/languages/LanguageConverterTest.php
index 331368e..fc2ed33 100644
--- a/tests/phpunit/languages/LanguageConverterTest.php
+++ b/tests/phpunit/languages/LanguageConverterTest.php
@@ -167,7 +167,7 @@
$testString .= 'xxx xxx xxx';
}
$testString .= "\n";
-   $old = ini_set('pcre.backtrack_limit', 200 );
+   $old = ini_set( 'pcre.backtrack_limit', 200 );
$result = $this->lc->autoConvert( $testString, 'tg-latn' );
ini_set( 'pcre.backtrack_limit', $old );
// The в in the id attribute should not get converted to a v

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I34e57c90ffd40fbd9f8afe3c57dd73fa7f655841
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_27
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Reedy 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_29]: Fix phpcs issues from LanguageConverter patches

[Reedy (Code Review)]

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

Change subject: Fix phpcs issues from LanguageConverter patches
..

Fix phpcs issues from LanguageConverter patches

Change-Id: I34e57c90ffd40fbd9f8afe3c57dd73fa7f655841
(cherry picked from commit f600b4ede9a6390cc5e929d2a48ed98af2edbc60)
---
M languages/LanguageConverter.php
M tests/phpunit/languages/LanguageConverterTest.php
2 files changed, 5 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/82/391482/1

diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index 2f175e2..e9a9642 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -418,11 +418,11 @@
$log = LoggerFactory::getInstance( 
'languageconverter' );
$log->error( "Hit pcre.backtrack_limit in " . 
__METHOD__
. ". Disabling language conversion for 
this page.",
-   array(
+   [
"method" => __METHOD__,
"variant" => $toVariant,
"startOfText" => substr( $text, 
0, 500 )
-   )
+   ]
);
return $text;
}
@@ -671,7 +671,9 @@
 
$noScript = '.*?<\/script>(*SKIP)(*FAIL)';
$noStyle = '.*?<\/style>(*SKIP)(*FAIL)';
+   // @codingStandardsIgnoreStart Generic.Files.LineLength.TooLong
$noHtml = 
'<(?:[^>=]*+(?>[^>=]*+=\s*+(?:"[^"]*"|\'[^\']*\'|[^\'">\s]*+))*+[^>=]*+>|.*+)(*SKIP)(*FAIL)';
+   // @codingStandardsIgnoreEnd
while ( $startPos < $length && $continue ) {
$continue = preg_match(
// Only match -{ outside of html.
diff --git a/tests/phpunit/languages/LanguageConverterTest.php 
b/tests/phpunit/languages/LanguageConverterTest.php
index 331368e..fc2ed33 100644
--- a/tests/phpunit/languages/LanguageConverterTest.php
+++ b/tests/phpunit/languages/LanguageConverterTest.php
@@ -167,7 +167,7 @@
$testString .= 'xxx xxx xxx';
}
$testString .= "\n";
-   $old = ini_set('pcre.backtrack_limit', 200 );
+   $old = ini_set( 'pcre.backtrack_limit', 200 );
$result = $this->lc->autoConvert( $testString, 'tg-latn' );
ini_set( 'pcre.backtrack_limit', $old );
// The в in the id attribute should not get converted to a v

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I34e57c90ffd40fbd9f8afe3c57dd73fa7f655841
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_29
Gerrit-Owner: Reedy 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_27]: Fix phpcs issues from LanguageConverter patches

[Reedy (Code Review)]

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

Change subject: Fix phpcs issues from LanguageConverter patches
..

Fix phpcs issues from LanguageConverter patches

Change-Id: I34e57c90ffd40fbd9f8afe3c57dd73fa7f655841
(cherry picked from commit f600b4ede9a6390cc5e929d2a48ed98af2edbc60)
---
M languages/LanguageConverter.php
M tests/phpunit/languages/LanguageConverterTest.php
2 files changed, 5 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/81/391481/1

diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index 87eb80d..28c75e1 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -412,11 +412,11 @@
$log = LoggerFactory::getInstance( 
'languageconverter' );
$log->error( "Hit pcre.backtrack_limit in " . 
__METHOD__
. ". Disabling language conversion for 
this page.",
-   array(
+   [
"method" => __METHOD__,
"variant" => $toVariant,
"startOfText" => substr( $text, 
0, 500 )
-   )
+   ]
);
return $text;
}
@@ -667,7 +667,9 @@
 
$noScript = '.*?<\/script>(*SKIP)(*FAIL)';
$noStyle = '.*?<\/style>(*SKIP)(*FAIL)';
+   // @codingStandardsIgnoreStart Generic.Files.LineLength.TooLong
$noHtml = 
'<(?:[^>=]*+(?>[^>=]*+=\s*+(?:"[^"]*"|\'[^\']*\'|[^\'">\s]*+))*+[^>=]*+>|.*+)(*SKIP)(*FAIL)';
+   // @codingStandardsIgnoreEnd
while ( $startPos < $length && $continue ) {
$continue = preg_match(
// Only match -{ outside of html.
diff --git a/tests/phpunit/languages/LanguageConverterTest.php 
b/tests/phpunit/languages/LanguageConverterTest.php
index 331368e..fc2ed33 100644
--- a/tests/phpunit/languages/LanguageConverterTest.php
+++ b/tests/phpunit/languages/LanguageConverterTest.php
@@ -167,7 +167,7 @@
$testString .= 'xxx xxx xxx';
}
$testString .= "\n";
-   $old = ini_set('pcre.backtrack_limit', 200 );
+   $old = ini_set( 'pcre.backtrack_limit', 200 );
$result = $this->lc->autoConvert( $testString, 'tg-latn' );
ini_set( 'pcre.backtrack_limit', $old );
// The в in the id attribute should not get converted to a v

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I34e57c90ffd40fbd9f8afe3c57dd73fa7f655841
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_27
Gerrit-Owner: Reedy 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Fix phpcs issues from LanguageConverter patches

[Reedy (Code Review)]

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

Change subject: Fix phpcs issues from LanguageConverter patches
..


Fix phpcs issues from LanguageConverter patches

Change-Id: I34e57c90ffd40fbd9f8afe3c57dd73fa7f655841
---
M languages/LanguageConverter.php
M tests/phpunit/languages/LanguageConverterTest.php
2 files changed, 5 insertions(+), 3 deletions(-)

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



diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index f9610fa..8e98abd 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -412,11 +412,11 @@
$log = LoggerFactory::getInstance( 
'languageconverter' );
$log->error( "Hit pcre.backtrack_limit in " . 
__METHOD__
. ". Disabling language conversion for 
this page.",
-   array(
+   [
"method" => __METHOD__,
"variant" => $toVariant,
"startOfText" => substr( $text, 
0, 500 )
-   )
+   ]
);
return $text;
}
@@ -665,7 +665,9 @@
 
$noScript = '.*?<\/script>(*SKIP)(*FAIL)';
$noStyle = '.*?<\/style>(*SKIP)(*FAIL)';
+   // @codingStandardsIgnoreStart Generic.Files.LineLength.TooLong
$noHtml = 
'<(?:[^>=]*+(?>[^>=]*+=\s*+(?:"[^"]*"|\'[^\']*\'|[^\'">\s]*+))*+[^>=]*+>|.*+)(*SKIP)(*FAIL)';
+   // @codingStandardsIgnoreEnd
while ( $startPos < $length && $continue ) {
$continue = preg_match(
// Only match -{ outside of html.
diff --git a/tests/phpunit/languages/LanguageConverterTest.php 
b/tests/phpunit/languages/LanguageConverterTest.php
index 331368e..fc2ed33 100644
--- a/tests/phpunit/languages/LanguageConverterTest.php
+++ b/tests/phpunit/languages/LanguageConverterTest.php
@@ -167,7 +167,7 @@
$testString .= 'xxx xxx xxx';
}
$testString .= "\n";
-   $old = ini_set('pcre.backtrack_limit', 200 );
+   $old = ini_set( 'pcre.backtrack_limit', 200 );
$result = $this->lc->autoConvert( $testString, 'tg-latn' );
ini_set( 'pcre.backtrack_limit', $old );
// The в in the id attribute should not get converted to a v

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I34e57c90ffd40fbd9f8afe3c57dd73fa7f655841
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Reedy 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: SECURITY: Handle -{}- syntax in attributes safely

[Reedy (Code Review)]

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

Change subject: SECURITY: Handle -{}- syntax in attributes safely
..


SECURITY: Handle -{}- syntax in attributes safely

Previously, if one had an attribute with the contents
"-{}-foo-{}-", foo would get replaced by language converter as if
it wasn't in an attribute. This lead to an XSS attack.

This breaks doing manual conversions in url href's (or any
other attribute that goes through an escaping method
other than Sanitizer's). e.g. http://{sr-el:foo';sr-ec:bar}.com
won't work anymore. See also T87332

Bug: T119158
Change-Id: Idbc45cac12c309b0ccb4adeff6474fa527b48edb
---
M languages/LanguageConverter.php
M tests/parser/parserTests.txt
2 files changed, 39 insertions(+), 10 deletions(-)

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



diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index 00bc02d..f9610fa 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -376,9 +376,12 @@
$scriptfix = 
']*+>[^<]*+(?:(?:(?!<\/script>).)[^<]*+)*+<\/script>|';
// disable conversion of  tags
$prefix = 
']*+>[^<]*+(?:(?:(?!<\/pre>).)[^<]*+)*+<\/pre>|';
+   // The "|.*+)" at the end, is in case we missed some part of 
html syntax,
+   // we will fail securely (hopefully) by matching the rest of 
the string.
+   $htmlFullTag = 
'<(?:[^>=]*+(?>[^>=]*+=\s*+(?:"[^"]*"|\'[^\']*\'|[^\'">\s]*+))*+[^>=]*+>|.*+)|';
 
-   $reg = '/' . $codefix . $scriptfix . $prefix .
-   '<[^>]++>|&[a-zA-Z#][a-z0-9]++;' . $marker . $htmlfix . 
'|\004$/s';
+   $reg = '/' . $codefix . $scriptfix . $prefix . $htmlFullTag .
+   '&[a-zA-Z#][a-z0-9]++;' . $marker . $htmlfix . 
'|\004$/s';
$startPos = 0;
$sourceBlob = '';
$literalBlob = '';
@@ -658,29 +661,41 @@
$out = '';
$length = strlen( $text );
$shouldConvert = !$this->guessVariant( $text, $variant );
+   $continue = 1;
 
-   while ( $startPos < $length ) {
-   $pos = strpos( $text, '-{', $startPos );
+   $noScript = '.*?<\/script>(*SKIP)(*FAIL)';
+   $noStyle = '.*?<\/style>(*SKIP)(*FAIL)';
+   $noHtml = 
'<(?:[^>=]*+(?>[^>=]*+=\s*+(?:"[^"]*"|\'[^\']*\'|[^\'">\s]*+))*+[^>=]*+>|.*+)(*SKIP)(*FAIL)';
+   while ( $startPos < $length && $continue ) {
+   $continue = preg_match(
+   // Only match -{ outside of html.
+   "/$noScript|$noStyle|$noHtml|-\{/",
+   $text,
+   $m,
+   PREG_OFFSET_CAPTURE,
+   $startPos
+   );
 
-   if ( $pos === false ) {
+   if ( !$continue ) {
// No more markup, append final segment
$fragment = substr( $text, $startPos );
$out .= $shouldConvert ? $this->autoConvert( 
$fragment, $variant ) : $fragment;
return $out;
}
 
-   // Markup found
+   // Offset of the match of the regex pattern.
+   $pos = $m[0][1];
+
// Append initial segment
$fragment = substr( $text, $startPos, $pos - $startPos 
);
$out .= $shouldConvert ? $this->autoConvert( $fragment, 
$variant ) : $fragment;
-
-   // Advance position
+   // -{ marker found, not in attribute
+   // Advance position up to -{ marker.
$startPos = $pos;
-
// Do recursive conversion
+   // Note: This passes $startPos by reference, and 
advances it.
$out .= $this->recursiveConvertRule( $text, $variant, 
$startPos, $depth + 1 );
}
-
return $out;
}
 
diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index ff574d1..fb549f5 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -18506,6 +18506,20 @@
 !! end
 
 !! test
+Language converter glossary rules inside attributes (T119158)
+!! options
+language=sr variant=sr-el
+!! wikitext
+-{H|abc=>sr-el:" onload="alert(1)" data-foo="}-
+
+[[File:Foobar.jpg|alt=-{}-abc-{}-]]
+!! html
+
+http://example.com/images/3/3a/Foobar.jpg; width="1941" height="220">
+
+!! end
+
+!! test
 Self closed html pairs (T7487)
 !! wikitext
 Centered text

-- 
To 

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: SECURITY: XSS in langconverter when regex hits pcre.backtrac...

[Reedy (Code Review)]

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

Change subject: SECURITY: XSS in langconverter when regex hits 
pcre.backtrack_limit
..


SECURITY: XSS in langconverter when regex hits pcre.backtrack_limit

Adjust regexes for what not to convert to avoid backtracking by
preferring possesive quantifiers

Add check that we really have matched to the end of the string, and
log error if the regex hits some sort of error preventing the
entire string from being matched. Should the regex not match to the
end, then language conversion is disabled for the string.

Bug: T124404
Change-Id: I4f0c171c7da804e9c1508ef1f59556665a318f6a
---
M languages/LanguageConverter.php
M tests/phpunit/languages/LanguageConverterTest.php
2 files changed, 61 insertions(+), 15 deletions(-)

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



diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index 67c0ca7..00bc02d 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -20,6 +20,8 @@
  */
 use MediaWiki\MediaWikiServices;
 
+use MediaWiki\Logger\LoggerFactory;
+
 /**
  * Base class for language conversion.
  * @ingroup Language
@@ -353,24 +355,30 @@
}
 
/* we convert everything except:
-* 1. HTML markups (anything between < and >)
-* 2. HTML entities
-* 3. placeholders created by the parser
-*/
-   $marker = '|' . Parser::MARKER_PREFIX . '[\-a-zA-Z0-9]+';
+  1. HTML markups (anything between < and >)
+  2. HTML entities
+  3. placeholders created by the parser
+  IMPORTANT: Beware of failure from pcre.backtrack_limit 
(T124404).
+  Minimize use of backtracking where possible.
+   */
+   $marker = '|' . Parser::MARKER_PREFIX . '[^\x7f]++\x7f';
 
// this one is needed when the text is inside an HTML markup
-   $htmlfix = '|<[^>]+$|^[^<>]*>';
+   $htmlfix = '|<[^>\004]++(?=\004$)|^[^<>]*+>';
+
+   // Optimize for the common case where these tags have
+   // few or no children. Thus try and possesively get as much as
+   // possible, and only engage in backtracking when we hit a '<'.
 
// disable convert to variants between  tags
-   $codefix = '.+?<\/code>|';
+   $codefix = '[^<]*+(?:(?:(?!<\/code>).)[^<]*+)*+<\/code>|';
// disable conversion of 

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Fix phpcs issues from LanguageConverter patches

[Reedy (Code Review)]

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

Change subject: Fix phpcs issues from LanguageConverter patches
..

Fix phpcs issues from LanguageConverter patches

Change-Id: I34e57c90ffd40fbd9f8afe3c57dd73fa7f655841
---
M languages/LanguageConverter.php
M tests/phpunit/languages/LanguageConverterTest.php
2 files changed, 5 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/80/391480/1

diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index f9610fa..8e98abd 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -412,11 +412,11 @@
$log = LoggerFactory::getInstance( 
'languageconverter' );
$log->error( "Hit pcre.backtrack_limit in " . 
__METHOD__
. ". Disabling language conversion for 
this page.",
-   array(
+   [
"method" => __METHOD__,
"variant" => $toVariant,
"startOfText" => substr( $text, 
0, 500 )
-   )
+   ]
);
return $text;
}
@@ -665,7 +665,9 @@
 
$noScript = '.*?<\/script>(*SKIP)(*FAIL)';
$noStyle = '.*?<\/style>(*SKIP)(*FAIL)';
+   // @codingStandardsIgnoreStart Generic.Files.LineLength.TooLong
$noHtml = 
'<(?:[^>=]*+(?>[^>=]*+=\s*+(?:"[^"]*"|\'[^\']*\'|[^\'">\s]*+))*+[^>=]*+>|.*+)(*SKIP)(*FAIL)';
+   // @codingStandardsIgnoreEnd
while ( $startPos < $length && $continue ) {
$continue = preg_match(
// Only match -{ outside of html.
diff --git a/tests/phpunit/languages/LanguageConverterTest.php 
b/tests/phpunit/languages/LanguageConverterTest.php
index 331368e..fc2ed33 100644
--- a/tests/phpunit/languages/LanguageConverterTest.php
+++ b/tests/phpunit/languages/LanguageConverterTest.php
@@ -167,7 +167,7 @@
$testString .= 'xxx xxx xxx';
}
$testString .= "\n";
-   $old = ini_set('pcre.backtrack_limit', 200 );
+   $old = ini_set( 'pcre.backtrack_limit', 200 );
$result = $this->lc->autoConvert( $testString, 'tg-latn' );
ini_set( 'pcre.backtrack_limit', $old );
// The в in the id attribute should not get converted to a v

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Enable extended report

[Eileen (Code Review)]

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

Change subject: Enable extended report
..

Enable extended report

This extension gives us the Address History tab.

Bug: T142549
Change-Id: I114c8ff324484c618be5be50f929ea15f6596a3c
---
M sites/all/modules/wmf_civicrm/wmf_civicrm.install
1 file changed, 13 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/79/391479/1

diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.install 
b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
index c30711e..e3b1bf5 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.install
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
@@ -3320,3 +3320,16 @@
   civicrm_api3('extension', 'refresh', array());
   civicrm_api3('extension', 'install',  array('key' => 
'org.wikimedia.dedupetools'));
 }
+
+/**
+ * Enable extended report.
+ *
+ * This extension gives us the Address History tab.
+ *
+ * Bug: T142549
+ */
+function wmf_civicrm_update_7580() {
+  civicrm_initialize();
+  civicrm_api3('extension', 'refresh', array());
+  civicrm_api3('extension', 'install',  array('key' => 
'nz.co.fuzion.extendedreport'));
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I114c8ff324484c618be5be50f929ea15f6596a3c
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Eileen 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_30]: Shorten git hashes for eval-stdin.php

[Reedy (Code Review)]

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

Change subject: Shorten git hashes for eval-stdin.php
..


Shorten git hashes for eval-stdin.php

Ping I5b838686ede9764083c52853cc05c52ea72739df

Change-Id: Ie80a068507444721f8ffdbdc1867555338489283
(cherry picked from commit 5b205725842edbae6ccde5a13baf20c2eb3ec4ae)
---
M maintenance/update.php
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/maintenance/update.php b/maintenance/update.php
index 795f6f5..08b1576 100755
--- a/maintenance/update.php
+++ b/maintenance/update.php
@@ -173,8 +173,8 @@
$badPhpUnit = dirname( __DIR__ ) . 
'/vendor/phpunit/phpunit/src/Util/PHP/eval-stdin.php';
if ( file_exists( $badPhpUnit ) ) {
// Bad versions of the file are:
-   // 
https://raw.githubusercontent.com/sebastianbergmann/phpunit/c820f915bfae34e5a836f94967a2a5ea5ef34f21/src/Util/PHP/eval-stdin.php
-   // 
https://raw.githubusercontent.com/sebastianbergmann/phpunit/3aaddb1c5bd9b9b8d070b4cf120e71c36fd08412/src/Util/PHP/eval-stdin.php
+   // 
https://raw.githubusercontent.com/sebastianbergmann/phpunit/c820f91/src/Util/PHP/eval-stdin.php
+   // 
https://raw.githubusercontent.com/sebastianbergmann/phpunit/3aaddb1/src/Util/PHP/eval-stdin.php
$md5 = md5_file( $badPhpUnit );
if ( $md5 === '120ac49800671dc383b6f3709c25c099'
|| $md5 === '28af792cb38fc9a1b236b91c1aad2876'

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie80a068507444721f8ffdbdc1867555338489283
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_30
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Reedy 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_30]: Shorten git hashes for eval-stdin.php

[Reedy (Code Review)]

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

Change subject: Shorten git hashes for eval-stdin.php
..

Shorten git hashes for eval-stdin.php

Ping I5b838686ede9764083c52853cc05c52ea72739df

Change-Id: Ie80a068507444721f8ffdbdc1867555338489283
(cherry picked from commit 5b205725842edbae6ccde5a13baf20c2eb3ec4ae)
---
M maintenance/update.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/78/391478/1

diff --git a/maintenance/update.php b/maintenance/update.php
index 795f6f5..08b1576 100755
--- a/maintenance/update.php
+++ b/maintenance/update.php
@@ -173,8 +173,8 @@
$badPhpUnit = dirname( __DIR__ ) . 
'/vendor/phpunit/phpunit/src/Util/PHP/eval-stdin.php';
if ( file_exists( $badPhpUnit ) ) {
// Bad versions of the file are:
-   // 
https://raw.githubusercontent.com/sebastianbergmann/phpunit/c820f915bfae34e5a836f94967a2a5ea5ef34f21/src/Util/PHP/eval-stdin.php
-   // 
https://raw.githubusercontent.com/sebastianbergmann/phpunit/3aaddb1c5bd9b9b8d070b4cf120e71c36fd08412/src/Util/PHP/eval-stdin.php
+   // 
https://raw.githubusercontent.com/sebastianbergmann/phpunit/c820f91/src/Util/PHP/eval-stdin.php
+   // 
https://raw.githubusercontent.com/sebastianbergmann/phpunit/3aaddb1/src/Util/PHP/eval-stdin.php
$md5 = md5_file( $badPhpUnit );
if ( $md5 === '120ac49800671dc383b6f3709c25c099'
|| $md5 === '28af792cb38fc9a1b236b91c1aad2876'

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie80a068507444721f8ffdbdc1867555338489283
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_30
Gerrit-Owner: Reedy 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_29]: Shorten git hashes for eval-stdin.php

[Reedy (Code Review)]

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

Change subject: Shorten git hashes for eval-stdin.php
..

Shorten git hashes for eval-stdin.php

Ping I5b838686ede9764083c52853cc05c52ea72739df

Change-Id: Ie80a068507444721f8ffdbdc1867555338489283
(cherry picked from commit 5b205725842edbae6ccde5a13baf20c2eb3ec4ae)
---
M maintenance/update.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/77/391477/1

diff --git a/maintenance/update.php b/maintenance/update.php
index 281b2ff..f2f8a43 100755
--- a/maintenance/update.php
+++ b/maintenance/update.php
@@ -163,8 +163,8 @@
$badPhpUnit = dirname( __DIR__ ) . 
'/vendor/phpunit/phpunit/src/Util/PHP/eval-stdin.php';
if ( file_exists( $badPhpUnit ) ) {
// Bad versions of the file are:
-   // 
https://raw.githubusercontent.com/sebastianbergmann/phpunit/c820f915bfae34e5a836f94967a2a5ea5ef34f21/src/Util/PHP/eval-stdin.php
-   // 
https://raw.githubusercontent.com/sebastianbergmann/phpunit/3aaddb1c5bd9b9b8d070b4cf120e71c36fd08412/src/Util/PHP/eval-stdin.php
+   // 
https://raw.githubusercontent.com/sebastianbergmann/phpunit/c820f91/src/Util/PHP/eval-stdin.php
+   // 
https://raw.githubusercontent.com/sebastianbergmann/phpunit/3aaddb1/src/Util/PHP/eval-stdin.php
$md5 = md5_file( $badPhpUnit );
if ( $md5 === '120ac49800671dc383b6f3709c25c099'
|| $md5 === '28af792cb38fc9a1b236b91c1aad2876'

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie80a068507444721f8ffdbdc1867555338489283
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_29
Gerrit-Owner: Reedy 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_27]: Shorten git hashes for eval-stdin.php

[Reedy (Code Review)]

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

Change subject: Shorten git hashes for eval-stdin.php
..


Shorten git hashes for eval-stdin.php

Ping I5b838686ede9764083c52853cc05c52ea72739df

Change-Id: Ie80a068507444721f8ffdbdc1867555338489283
(cherry picked from commit 5b205725842edbae6ccde5a13baf20c2eb3ec4ae)
---
M maintenance/update.php
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/maintenance/update.php b/maintenance/update.php
index 8d8a15b..f800e4a 100755
--- a/maintenance/update.php
+++ b/maintenance/update.php
@@ -168,8 +168,8 @@
$badPhpUnit = dirname( __DIR__ ) . 
'/vendor/phpunit/phpunit/src/Util/PHP/eval-stdin.php';
if ( file_exists( $badPhpUnit ) ) {
// Bad versions of the file are:
-   // 
https://raw.githubusercontent.com/sebastianbergmann/phpunit/c820f915bfae34e5a836f94967a2a5ea5ef34f21/src/Util/PHP/eval-stdin.php
-   // 
https://raw.githubusercontent.com/sebastianbergmann/phpunit/3aaddb1c5bd9b9b8d070b4cf120e71c36fd08412/src/Util/PHP/eval-stdin.php
+   // 
https://raw.githubusercontent.com/sebastianbergmann/phpunit/c820f91/src/Util/PHP/eval-stdin.php
+   // 
https://raw.githubusercontent.com/sebastianbergmann/phpunit/3aaddb1/src/Util/PHP/eval-stdin.php
$md5 = md5_file( $badPhpUnit );
if ( $md5 === '120ac49800671dc383b6f3709c25c099'
|| $md5 === '28af792cb38fc9a1b236b91c1aad2876'

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie80a068507444721f8ffdbdc1867555338489283
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_27
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Reedy 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_29]: Shorten git hashes for eval-stdin.php

[Reedy (Code Review)]

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

Change subject: Shorten git hashes for eval-stdin.php
..


Shorten git hashes for eval-stdin.php

Ping I5b838686ede9764083c52853cc05c52ea72739df

Change-Id: Ie80a068507444721f8ffdbdc1867555338489283
(cherry picked from commit 5b205725842edbae6ccde5a13baf20c2eb3ec4ae)
---
M maintenance/update.php
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/maintenance/update.php b/maintenance/update.php
index 281b2ff..f2f8a43 100755
--- a/maintenance/update.php
+++ b/maintenance/update.php
@@ -163,8 +163,8 @@
$badPhpUnit = dirname( __DIR__ ) . 
'/vendor/phpunit/phpunit/src/Util/PHP/eval-stdin.php';
if ( file_exists( $badPhpUnit ) ) {
// Bad versions of the file are:
-   // 
https://raw.githubusercontent.com/sebastianbergmann/phpunit/c820f915bfae34e5a836f94967a2a5ea5ef34f21/src/Util/PHP/eval-stdin.php
-   // 
https://raw.githubusercontent.com/sebastianbergmann/phpunit/3aaddb1c5bd9b9b8d070b4cf120e71c36fd08412/src/Util/PHP/eval-stdin.php
+   // 
https://raw.githubusercontent.com/sebastianbergmann/phpunit/c820f91/src/Util/PHP/eval-stdin.php
+   // 
https://raw.githubusercontent.com/sebastianbergmann/phpunit/3aaddb1/src/Util/PHP/eval-stdin.php
$md5 = md5_file( $badPhpUnit );
if ( $md5 === '120ac49800671dc383b6f3709c25c099'
|| $md5 === '28af792cb38fc9a1b236b91c1aad2876'

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie80a068507444721f8ffdbdc1867555338489283
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_29
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Reedy 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_27]: Shorten git hashes for eval-stdin.php

[Reedy (Code Review)]

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

Change subject: Shorten git hashes for eval-stdin.php
..

Shorten git hashes for eval-stdin.php

Ping I5b838686ede9764083c52853cc05c52ea72739df

Change-Id: Ie80a068507444721f8ffdbdc1867555338489283
(cherry picked from commit 5b205725842edbae6ccde5a13baf20c2eb3ec4ae)
---
M maintenance/update.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/76/391476/1

diff --git a/maintenance/update.php b/maintenance/update.php
index 8d8a15b..f800e4a 100755
--- a/maintenance/update.php
+++ b/maintenance/update.php
@@ -168,8 +168,8 @@
$badPhpUnit = dirname( __DIR__ ) . 
'/vendor/phpunit/phpunit/src/Util/PHP/eval-stdin.php';
if ( file_exists( $badPhpUnit ) ) {
// Bad versions of the file are:
-   // 
https://raw.githubusercontent.com/sebastianbergmann/phpunit/c820f915bfae34e5a836f94967a2a5ea5ef34f21/src/Util/PHP/eval-stdin.php
-   // 
https://raw.githubusercontent.com/sebastianbergmann/phpunit/3aaddb1c5bd9b9b8d070b4cf120e71c36fd08412/src/Util/PHP/eval-stdin.php
+   // 
https://raw.githubusercontent.com/sebastianbergmann/phpunit/c820f91/src/Util/PHP/eval-stdin.php
+   // 
https://raw.githubusercontent.com/sebastianbergmann/phpunit/3aaddb1/src/Util/PHP/eval-stdin.php
$md5 = md5_file( $badPhpUnit );
if ( $md5 === '120ac49800671dc383b6f3709c25c099'
|| $md5 === '28af792cb38fc9a1b236b91c1aad2876'

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie80a068507444721f8ffdbdc1867555338489283
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_27
Gerrit-Owner: Reedy 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_30]: Fix tests for I7afaa955a4b393ef00b11e420709bd62b84fbc71

[Reedy (Code Review)]

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

Change subject: Fix tests for I7afaa955a4b393ef00b11e420709bd62b84fbc71
..


Fix tests for I7afaa955a4b393ef00b11e420709bd62b84fbc71

Change-Id: Id5a2a9768dc64db5259a5988d645e664163ba234
(cherry picked from commit 492431bce57aac2a995ea468a9e273b6423cde81)
---
M tests/phpunit/includes/auth/LocalPasswordPrimaryAuthenticationProviderTest.php
1 file changed, 6 insertions(+), 2 deletions(-)

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



diff --git 
a/tests/phpunit/includes/auth/LocalPasswordPrimaryAuthenticationProviderTest.php
 
b/tests/phpunit/includes/auth/LocalPasswordPrimaryAuthenticationProviderTest.php
index e0ddb0a..5f37078 100644
--- 
a/tests/phpunit/includes/auth/LocalPasswordPrimaryAuthenticationProviderTest.php
+++ 
b/tests/phpunit/includes/auth/LocalPasswordPrimaryAuthenticationProviderTest.php
@@ -221,8 +221,12 @@
$req->password = 'DoesNotExist';
$ret = $provider->beginPrimaryAuthentication( $reqs );
$this->assertEquals(
-   AuthenticationResponse::newAbstain(),
-   $provider->beginPrimaryAuthentication( $reqs )
+   AuthenticationResponse::FAIL,
+   $ret->status
+   );
+   $this->assertEquals(
+   'wrongpassword',
+   $ret->message->getKey()
);
 
// Validation failure

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id5a2a9768dc64db5259a5988d645e664163ba234
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_30
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Reedy 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_30]: Fix tests for I7afaa955a4b393ef00b11e420709bd62b84fbc71

[Reedy (Code Review)]

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

Change subject: Fix tests for I7afaa955a4b393ef00b11e420709bd62b84fbc71
..

Fix tests for I7afaa955a4b393ef00b11e420709bd62b84fbc71

Change-Id: Id5a2a9768dc64db5259a5988d645e664163ba234
(cherry picked from commit 492431bce57aac2a995ea468a9e273b6423cde81)
---
M tests/phpunit/includes/auth/LocalPasswordPrimaryAuthenticationProviderTest.php
1 file changed, 6 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/75/391475/1

diff --git 
a/tests/phpunit/includes/auth/LocalPasswordPrimaryAuthenticationProviderTest.php
 
b/tests/phpunit/includes/auth/LocalPasswordPrimaryAuthenticationProviderTest.php
index e0ddb0a..5f37078 100644
--- 
a/tests/phpunit/includes/auth/LocalPasswordPrimaryAuthenticationProviderTest.php
+++ 
b/tests/phpunit/includes/auth/LocalPasswordPrimaryAuthenticationProviderTest.php
@@ -221,8 +221,12 @@
$req->password = 'DoesNotExist';
$ret = $provider->beginPrimaryAuthentication( $reqs );
$this->assertEquals(
-   AuthenticationResponse::newAbstain(),
-   $provider->beginPrimaryAuthentication( $reqs )
+   AuthenticationResponse::FAIL,
+   $ret->status
+   );
+   $this->assertEquals(
+   'wrongpassword',
+   $ret->message->getKey()
);
 
// Validation failure

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id5a2a9768dc64db5259a5988d645e664163ba234
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_30
Gerrit-Owner: Reedy 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_29]: Fix tests for I7afaa955a4b393ef00b11e420709bd62b84fbc71

[Reedy (Code Review)]

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

Change subject: Fix tests for I7afaa955a4b393ef00b11e420709bd62b84fbc71
..


Fix tests for I7afaa955a4b393ef00b11e420709bd62b84fbc71

Change-Id: Id5a2a9768dc64db5259a5988d645e664163ba234
(cherry picked from commit 492431bce57aac2a995ea468a9e273b6423cde81)
---
M tests/phpunit/includes/auth/LocalPasswordPrimaryAuthenticationProviderTest.php
1 file changed, 6 insertions(+), 2 deletions(-)

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



diff --git 
a/tests/phpunit/includes/auth/LocalPasswordPrimaryAuthenticationProviderTest.php
 
b/tests/phpunit/includes/auth/LocalPasswordPrimaryAuthenticationProviderTest.php
index b89f1e0..b2a38e3 100644
--- 
a/tests/phpunit/includes/auth/LocalPasswordPrimaryAuthenticationProviderTest.php
+++ 
b/tests/phpunit/includes/auth/LocalPasswordPrimaryAuthenticationProviderTest.php
@@ -221,8 +221,12 @@
$req->password = 'DoesNotExist';
$ret = $provider->beginPrimaryAuthentication( $reqs );
$this->assertEquals(
-   AuthenticationResponse::newAbstain(),
-   $provider->beginPrimaryAuthentication( $reqs )
+   AuthenticationResponse::FAIL,
+   $ret->status
+   );
+   $this->assertEquals(
+   'wrongpassword',
+   $ret->message->getKey()
);
 
// Validation failure

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id5a2a9768dc64db5259a5988d645e664163ba234
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_29
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Reedy 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_27]: Fix tests for I7afaa955a4b393ef00b11e420709bd62b84fbc71

[Reedy (Code Review)]

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

Change subject: Fix tests for I7afaa955a4b393ef00b11e420709bd62b84fbc71
..

Fix tests for I7afaa955a4b393ef00b11e420709bd62b84fbc71

Change-Id: Id5a2a9768dc64db5259a5988d645e664163ba234
(cherry picked from commit 492431bce57aac2a995ea468a9e273b6423cde81)
---
M tests/phpunit/includes/auth/LocalPasswordPrimaryAuthenticationProviderTest.php
1 file changed, 6 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/73/391473/1

diff --git 
a/tests/phpunit/includes/auth/LocalPasswordPrimaryAuthenticationProviderTest.php
 
b/tests/phpunit/includes/auth/LocalPasswordPrimaryAuthenticationProviderTest.php
index 637810a..8135bd9 100644
--- 
a/tests/phpunit/includes/auth/LocalPasswordPrimaryAuthenticationProviderTest.php
+++ 
b/tests/phpunit/includes/auth/LocalPasswordPrimaryAuthenticationProviderTest.php
@@ -216,8 +216,12 @@
$req->password = 'DoesNotExist';
$ret = $provider->beginPrimaryAuthentication( $reqs );
$this->assertEquals(
-   AuthenticationResponse::newAbstain(),
-   $provider->beginPrimaryAuthentication( $reqs )
+   AuthenticationResponse::FAIL,
+   $ret->status
+   );
+   $this->assertEquals(
+   'wrongpassword',
+   $ret->message->getKey()
);
 
// Validation failure

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id5a2a9768dc64db5259a5988d645e664163ba234
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_27
Gerrit-Owner: Reedy 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_27]: Fix tests for I7afaa955a4b393ef00b11e420709bd62b84fbc71

[Reedy (Code Review)]

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

Change subject: Fix tests for I7afaa955a4b393ef00b11e420709bd62b84fbc71
..


Fix tests for I7afaa955a4b393ef00b11e420709bd62b84fbc71

Change-Id: Id5a2a9768dc64db5259a5988d645e664163ba234
(cherry picked from commit 492431bce57aac2a995ea468a9e273b6423cde81)
---
M tests/phpunit/includes/auth/LocalPasswordPrimaryAuthenticationProviderTest.php
1 file changed, 6 insertions(+), 2 deletions(-)

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



diff --git 
a/tests/phpunit/includes/auth/LocalPasswordPrimaryAuthenticationProviderTest.php
 
b/tests/phpunit/includes/auth/LocalPasswordPrimaryAuthenticationProviderTest.php
index 637810a..8135bd9 100644
--- 
a/tests/phpunit/includes/auth/LocalPasswordPrimaryAuthenticationProviderTest.php
+++ 
b/tests/phpunit/includes/auth/LocalPasswordPrimaryAuthenticationProviderTest.php
@@ -216,8 +216,12 @@
$req->password = 'DoesNotExist';
$ret = $provider->beginPrimaryAuthentication( $reqs );
$this->assertEquals(
-   AuthenticationResponse::newAbstain(),
-   $provider->beginPrimaryAuthentication( $reqs )
+   AuthenticationResponse::FAIL,
+   $ret->status
+   );
+   $this->assertEquals(
+   'wrongpassword',
+   $ret->message->getKey()
);
 
// Validation failure

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id5a2a9768dc64db5259a5988d645e664163ba234
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_27
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Reedy 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_29]: Fix tests for I7afaa955a4b393ef00b11e420709bd62b84fbc71

[Reedy (Code Review)]

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

Change subject: Fix tests for I7afaa955a4b393ef00b11e420709bd62b84fbc71
..

Fix tests for I7afaa955a4b393ef00b11e420709bd62b84fbc71

Change-Id: Id5a2a9768dc64db5259a5988d645e664163ba234
(cherry picked from commit 492431bce57aac2a995ea468a9e273b6423cde81)
---
M tests/phpunit/includes/auth/LocalPasswordPrimaryAuthenticationProviderTest.php
1 file changed, 6 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/74/391474/1

diff --git 
a/tests/phpunit/includes/auth/LocalPasswordPrimaryAuthenticationProviderTest.php
 
b/tests/phpunit/includes/auth/LocalPasswordPrimaryAuthenticationProviderTest.php
index b89f1e0..b2a38e3 100644
--- 
a/tests/phpunit/includes/auth/LocalPasswordPrimaryAuthenticationProviderTest.php
+++ 
b/tests/phpunit/includes/auth/LocalPasswordPrimaryAuthenticationProviderTest.php
@@ -221,8 +221,12 @@
$req->password = 'DoesNotExist';
$ret = $provider->beginPrimaryAuthentication( $reqs );
$this->assertEquals(
-   AuthenticationResponse::newAbstain(),
-   $provider->beginPrimaryAuthentication( $reqs )
+   AuthenticationResponse::FAIL,
+   $ret->status
+   );
+   $this->assertEquals(
+   'wrongpassword',
+   $ret->message->getKey()
);
 
// Validation failure

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id5a2a9768dc64db5259a5988d645e664163ba234
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_29
Gerrit-Owner: Reedy 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: SECURITY: Fix rebase error in 4d38a489

[Reedy (Code Review)]

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

Change subject: SECURITY: Fix rebase error in 4d38a489
..


SECURITY: Fix rebase error in 4d38a489

The fix for T125177 from F4932228 was incorrectly rebased when it was
applied to master as 4d38a489, causing the bug to not actually be fixed.

Bug: T180488
Change-Id: Ie6b87ef2373369987c112c19903c99afb789c1ff
---
M includes/api/ApiBase.php
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/includes/api/ApiBase.php b/includes/api/ApiBase.php
index 80aeff5..bf2b977 100644
--- a/includes/api/ApiBase.php
+++ b/includes/api/ApiBase.php
@@ -1069,10 +1069,10 @@
} else {
$type = 'NULL'; // allow everything
}
+   }
 
-   if ( $type == 'password' || !empty( 
$paramSettings[self::PARAM_SENSITIVE] ) ) {
-   $this->getMain()->markParamsSensitive( 
$encParamName );
-   }
+   if ( $type == 'password' || !empty( 
$paramSettings[self::PARAM_SENSITIVE] ) ) {
+   $this->getMain()->markParamsSensitive( $encParamName );
}
 
if ( $type == 'boolean' ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie6b87ef2373369987c112c19903c99afb789c1ff
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Reedy 
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]: Shorten git hashes for eval-stdin.php

[Reedy (Code Review)]

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

Change subject: Shorten git hashes for eval-stdin.php
..


Shorten git hashes for eval-stdin.php

Ping I5b838686ede9764083c52853cc05c52ea72739df

Change-Id: Ie80a068507444721f8ffdbdc1867555338489283
---
M maintenance/update.php
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/maintenance/update.php b/maintenance/update.php
index 70cea51..d5c11b5 100755
--- a/maintenance/update.php
+++ b/maintenance/update.php
@@ -173,8 +173,8 @@
$badPhpUnit = dirname( __DIR__ ) . 
'/vendor/phpunit/phpunit/src/Util/PHP/eval-stdin.php';
if ( file_exists( $badPhpUnit ) ) {
// Bad versions of the file are:
-   // 
https://raw.githubusercontent.com/sebastianbergmann/phpunit/c820f915bfae34e5a836f94967a2a5ea5ef34f21/src/Util/PHP/eval-stdin.php
-   // 
https://raw.githubusercontent.com/sebastianbergmann/phpunit/3aaddb1c5bd9b9b8d070b4cf120e71c36fd08412/src/Util/PHP/eval-stdin.php
+   // 
https://raw.githubusercontent.com/sebastianbergmann/phpunit/c820f91/src/Util/PHP/eval-stdin.php
+   // 
https://raw.githubusercontent.com/sebastianbergmann/phpunit/3aaddb1/src/Util/PHP/eval-stdin.php
$md5 = md5_file( $badPhpUnit );
if ( $md5 === '120ac49800671dc383b6f3709c25c099'
|| $md5 === '28af792cb38fc9a1b236b91c1aad2876'

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie80a068507444721f8ffdbdc1867555338489283
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Parent5446 
Gerrit-Reviewer: Reedy 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: SECURITY: update.php: Remove eval-stdin.php if necessary

[Reedy (Code Review)]

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

Change subject: SECURITY: update.php: Remove eval-stdin.php if necessary
..


SECURITY: update.php: Remove eval-stdin.php if necessary

If phpunit's eval-stdin.php file exists and is one of the vulnerable
versions, delete it when running update.php as most people should run
that when updating to a new release. If the unlink() call fails, we'll
warn the user but continue with update.php processing and hope they've
mitigated it in some other way.

Bug: T180231
Change-Id: I5b838686ede9764083c52853cc05c52ea72739df
---
M maintenance/update.php
1 file changed, 18 insertions(+), 0 deletions(-)

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



diff --git a/maintenance/update.php b/maintenance/update.php
index ba66c76..70cea51 100755
--- a/maintenance/update.php
+++ b/maintenance/update.php
@@ -170,6 +170,24 @@
 
$time1 = microtime( true );
 
+   $badPhpUnit = dirname( __DIR__ ) . 
'/vendor/phpunit/phpunit/src/Util/PHP/eval-stdin.php';
+   if ( file_exists( $badPhpUnit ) ) {
+   // Bad versions of the file are:
+   // 
https://raw.githubusercontent.com/sebastianbergmann/phpunit/c820f915bfae34e5a836f94967a2a5ea5ef34f21/src/Util/PHP/eval-stdin.php
+   // 
https://raw.githubusercontent.com/sebastianbergmann/phpunit/3aaddb1c5bd9b9b8d070b4cf120e71c36fd08412/src/Util/PHP/eval-stdin.php
+   $md5 = md5_file( $badPhpUnit );
+   if ( $md5 === '120ac49800671dc383b6f3709c25c099'
+   || $md5 === '28af792cb38fc9a1b236b91c1aad2876'
+   ) {
+   $success = unlink( $badPhpUnit );
+   if ( $success ) {
+   $this->output( "Removed PHPUnit 
eval-stdin.php to protect against CVE-2017-9841\n" );
+   } else {
+   $this->error( "Unable to remove 
$badPhpUnit, you should manually. See CVE-2017-9841" );
+   }
+   }
+   }
+
$shared = $this->hasOption( 'doshared' );
 
$updates = [ 'core', 'extensions' ];

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5b838686ede9764083c52853cc05c52ea72739df
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Parent5446 
Gerrit-Reviewer: Reedy 
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]: Fix for bcadef37f8d7 - added quoting of field names

[Yaron Koren (Code Review)]

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

Change subject: Fix for bcadef37f8d7 - added quoting of field names
..

Fix for bcadef37f8d7 - added quoting of field names

Change-Id: Iab2b2bc1207c60c9fc10a198994a18f592998e3d
---
M includes/parserfunctions/CargoStore.php
1 file changed, 3 insertions(+), 2 deletions(-)


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

diff --git a/includes/parserfunctions/CargoStore.php 
b/includes/parserfunctions/CargoStore.php
index 6dd0932..78c1b4f 100644
--- a/includes/parserfunctions/CargoStore.php
+++ b/includes/parserfunctions/CargoStore.php
@@ -301,10 +301,11 @@
continue;
}
if ( $fieldDescription->mIsList || 
$fieldDescription->mType == 'Coordinates' ) {
-   $tableFieldValuesForCheck[$fieldName . 
'__full'] = $tableFieldValues[$fieldName];
+   $quotedFieldName = $cdb->addIdentifierQuotes( 
$fieldName . '__full' );
} else {
-   $tableFieldValuesForCheck[$fieldName] = 
$tableFieldValues[$fieldName];
+   $quotedFieldName = $cdb->addIdentifierQuotes( 
$fieldName );
}
+   $tableFieldValuesForCheck[$quotedFieldName] = 
$tableFieldValues[$fieldName];
}
$res = $cdb->select( $tableName, 'COUNT(*)', 
$tableFieldValuesForCheck );
$row = $cdb->fetchRow( $res );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iab2b2bc1207c60c9fc10a198994a18f592998e3d
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Cargo
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Shorten git hashes for eval-stdin.php

[Reedy (Code Review)]

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

Change subject: Shorten git hashes for eval-stdin.php
..

Shorten git hashes for eval-stdin.php

Ping I5b838686ede9764083c52853cc05c52ea72739df

Change-Id: Ie80a068507444721f8ffdbdc1867555338489283
---
M maintenance/update.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/72/391472/1

diff --git a/maintenance/update.php b/maintenance/update.php
index 70cea51..d5c11b5 100755
--- a/maintenance/update.php
+++ b/maintenance/update.php
@@ -173,8 +173,8 @@
$badPhpUnit = dirname( __DIR__ ) . 
'/vendor/phpunit/phpunit/src/Util/PHP/eval-stdin.php';
if ( file_exists( $badPhpUnit ) ) {
// Bad versions of the file are:
-   // 
https://raw.githubusercontent.com/sebastianbergmann/phpunit/c820f915bfae34e5a836f94967a2a5ea5ef34f21/src/Util/PHP/eval-stdin.php
-   // 
https://raw.githubusercontent.com/sebastianbergmann/phpunit/3aaddb1c5bd9b9b8d070b4cf120e71c36fd08412/src/Util/PHP/eval-stdin.php
+   // 
https://raw.githubusercontent.com/sebastianbergmann/phpunit/c820f91/src/Util/PHP/eval-stdin.php
+   // 
https://raw.githubusercontent.com/sebastianbergmann/phpunit/3aaddb1/src/Util/PHP/eval-stdin.php
$md5 = md5_file( $badPhpUnit );
if ( $md5 === '120ac49800671dc383b6f3709c25c099'
|| $md5 === '28af792cb38fc9a1b236b91c1aad2876'

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: search.wikimedia.org: Add robots.txt, tell them to stay away

[jenkins-bot (Code Review)]

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

Change subject: search.wikimedia.org: Add robots.txt, tell them to stay away
..


search.wikimedia.org: Add robots.txt, tell them to stay away

Change-Id: I4154f5cc3d7565c3f1edc92cc760c579d6da9610
---
A docroot/search.wikimedia.org/robots.txt
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/docroot/search.wikimedia.org/robots.txt 
b/docroot/search.wikimedia.org/robots.txt
new file mode 100644
index 000..1f53798
--- /dev/null
+++ b/docroot/search.wikimedia.org/robots.txt
@@ -0,0 +1,2 @@
+User-agent: *
+Disallow: /

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4154f5cc3d7565c3f1edc92cc760c579d6da9610
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Chad 
Gerrit-Reviewer: Chad 
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] operations/mediawiki-config[master]: search.wikimedia.org: Add robots.txt, tell them to stay away

[Chad (Code Review)]

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

Change subject: search.wikimedia.org: Add robots.txt, tell them to stay away
..

search.wikimedia.org: Add robots.txt, tell them to stay away

Change-Id: I4154f5cc3d7565c3f1edc92cc760c579d6da9610
---
A docroot/search.wikimedia.org/robots.txt
1 file changed, 2 insertions(+), 0 deletions(-)


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

diff --git a/docroot/search.wikimedia.org/robots.txt 
b/docroot/search.wikimedia.org/robots.txt
new file mode 100644
index 000..1f53798
--- /dev/null
+++ b/docroot/search.wikimedia.org/robots.txt
@@ -0,0 +1,2 @@
+User-agent: *
+Disallow: /

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4154f5cc3d7565c3f1edc92cc760c579d6da9610
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...Translate[master]: wfBCP47() is deprecated

[MaxSem (Code Review)]

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

Change subject: wfBCP47() is deprecated
..

wfBCP47() is deprecated

Change-Id: I1753296093681c2b9f2f2d523c918c3b8f943b55
---
M ffs/GettextFFS.php
M tag/PageTranslationHooks.php
2 files changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate 
refs/changes/69/391469/1

diff --git a/ffs/GettextFFS.php b/ffs/GettextFFS.php
index 180195f..8f0b33b 100644
--- a/ffs/GettextFFS.php
+++ b/ffs/GettextFFS.php
@@ -418,7 +418,7 @@
}
$specs['Content-Type'] = 'text/plain; charset=UTF-8';
$specs['Content-Transfer-Encoding'] = '8bit';
-   $specs['Language'] = wfBCP47( $this->group->mapCode( $code ) );
+   $specs['Language'] = LanguageCode::bcp47( 
$this->group->mapCode( $code ) );
Hooks::run( 'Translate:GettextFFS:headerFields', [ &$specs, 
$this->group, $code ] );
$specs['X-Generator'] = $this->getGenerator();
 
diff --git a/tag/PageTranslationHooks.php b/tag/PageTranslationHooks.php
index 2251cf7..a4e7b2e 100644
--- a/tag/PageTranslationHooks.php
+++ b/tag/PageTranslationHooks.php
@@ -284,7 +284,7 @@
$classes = array_merge( $classes, 
self::tpProgressIcon( $percent ) );
$name = Html::rawElement(
'span',
-   [ 'class' => $classes , 'lang' => 
wfBCP47( $code ) ],
+   [ 'class' => $classes , 'lang' => 
LanguageCode::bcp47( $code ) ],
$name
);
} elseif ( $subpage->isKnown() ) {
@@ -303,7 +303,7 @@
$attribs = [
'title' => $title,
'class' => $classes,
-   'lang' => wfBCP47( $code ),
+   'lang' => LanguageCode::bcp47( $code ),
];
 
$name = Linker::linkKnown( $subpage, $name, 
$attribs );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1753296093681c2b9f2f2d523c918c3b8f943b55
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: MaxSem 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add missing ComposerVendorHtaccessCreator class to autoload.php

[Reedy (Code Review)]

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

Change subject: Add missing ComposerVendorHtaccessCreator class to autoload.php
..


Add missing ComposerVendorHtaccessCreator class to autoload.php

Change-Id: Ia70324acf3db2df50c6629d705c2c4728c38
Follow-up: I2cf6541750c90b5708d7cf5f81b914ae2d9d46d1
---
M autoload.php
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/autoload.php b/autoload.php
index 8053f5e..a826f7a 100644
--- a/autoload.php
+++ b/autoload.php
@@ -284,6 +284,7 @@
'ComposerJson' => __DIR__ . '/includes/libs/composer/ComposerJson.php',
'ComposerLock' => __DIR__ . '/includes/libs/composer/ComposerLock.php',
'ComposerPackageModifier' => __DIR__ . 
'/includes/composer/ComposerPackageModifier.php',
+   'ComposerVendorHtaccessCreator' => __DIR__ . 
'/includes/composer/ComposerVendorHtaccessCreator.php',
'ComposerVersionNormalizer' => __DIR__ . 
'/includes/composer/ComposerVersionNormalizer.php',
'CompressOld' => __DIR__ . '/maintenance/storage/compressOld.php',
'ConcatenatedGzipHistoryBlob' => __DIR__ . '/includes/HistoryBlob.php',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia70324acf3db2df50c6629d705c2c4728c38
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: wfBCP47() is deprecated

[MaxSem (Code Review)]

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

Change subject: wfBCP47() is deprecated
..

wfBCP47() is deprecated

Change-Id: I33cc024d86ac0685da05181eaf8cc0882d4c1772
---
M includes/specials/SpecialMobileLanguages.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/includes/specials/SpecialMobileLanguages.php 
b/includes/specials/SpecialMobileLanguages.php
index 735645e..7dfca9a 100644
--- a/includes/specials/SpecialMobileLanguages.php
+++ b/includes/specials/SpecialMobileLanguages.php
@@ -125,7 +125,7 @@
$output[] = [
'langname' => $varname,
'url' => 
$this->title->getLocalURL( [ 'variant' => $code ] ),
-   'lang' => wfBCP47( $code )
+   'lang' => LanguageCode::bcp47( 
$code ),
];
}
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I33cc024d86ac0685da05181eaf8cc0882d4c1772
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: MaxSem 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: SECURITY: Create a .htaccess in /vendor after composer runs

[Reedy (Code Review)]

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

Change subject: SECURITY: Create a .htaccess in /vendor after composer runs
..


SECURITY: Create a .htaccess in /vendor after composer runs

The /vendor directory does not need to be web accessible, and to reduce
attack surface, it should not be web accessible. We can use the
post-install-cmd and post-update-cmd hooks to create a .htaccess after
the user has run "composer install" or "composer update". On the first
run of composer, this hook will be invoked twice due to the composer
merge plugin.

If the htaccess file already exists, this hook won't do anything.

Bug: T180237
Change-Id: I2cf6541750c90b5708d7cf5f81b914ae2d9d46d1
---
M composer.json
A includes/composer/ComposerVendorHtaccessCreator.php
2 files changed, 47 insertions(+), 1 deletion(-)

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



diff --git a/composer.json b/composer.json
index 71c9398..a5501d0 100644
--- a/composer.json
+++ b/composer.json
@@ -79,7 +79,8 @@
},
"autoload": {
"psr-0": {
-   "ComposerHookHandler": "includes/composer"
+   "ComposerHookHandler": "includes/composer",
+   "ComposerVendorHtaccessCreator": "includes/composer"
},
"files": [
"includes/compat/Timestamp.php"
@@ -97,6 +98,8 @@
"fix": "phpcbf",
"pre-install-cmd": "ComposerHookHandler::onPreInstall",
"pre-update-cmd": "ComposerHookHandler::onPreUpdate",
+   "post-install-cmd": "ComposerVendorHtaccessCreator::onEvent",
+   "post-update-cmd": "ComposerVendorHtaccessCreator::onEvent",
"test": [
"composer lint",
"composer phpcs"
diff --git a/includes/composer/ComposerVendorHtaccessCreator.php 
b/includes/composer/ComposerVendorHtaccessCreator.php
new file mode 100644
index 000..1e5efdf
--- /dev/null
+++ b/includes/composer/ComposerVendorHtaccessCreator.php
@@ -0,0 +1,43 @@
+
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
+/**
+ * Creates a .htaccess in the vendor/ directory
+ * to prevent web access.
+ *
+ * This class runs *outside* of the normal MediaWiki
+ * environment and cannot depend upon any MediaWiki
+ * code.
+ */
+class ComposerVendorHtaccessCreator {
+
+   /**
+* Handle post-install-cmd and post-update-cmd hooks
+*/
+   public static function onEvent() {
+   $fname = dirname( dirname( __DIR__ ) ) . "/vendor/.htaccess";
+   if ( file_exists( $fname ) ) {
+   // Already exists
+   return;
+   }
+
+   file_put_contents( $fname, "Deny from all\n" );
+   }
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2cf6541750c90b5708d7cf5f81b914ae2d9d46d1
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Reedy 
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]: SECURITY: Ensure Message::rawParams can't lead to XSS

[Reedy (Code Review)]

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

Change subject: SECURITY: Ensure Message::rawParams can't lead to XSS
..


SECURITY: Ensure Message::rawParams can't lead to XSS

If you used wfMessage( 'foo' )->rawParams( 'bar"baz' )
there's a possibility of leading to xss, if the foo
message has a $1 in an attribute, as the quote characters
may end the attribute.

To prevent that, we convert $1 to $'"1 for after parameters,
so if any of them end up in attributes, the attribute escaping
will break the parameter name, preventing substitution.

This would of course break if someone intentionally inserted
a raw parameter into an attribute, but that's silly and I
don't think we should allow that.

This is similar to the parser strip marker issue.

Bug: T176247
Change-Id: If83aec01b20e414f9c92be894f145d7df2974866
---
M includes/Message.php
1 file changed, 20 insertions(+), 2 deletions(-)

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



diff --git a/includes/Message.php b/includes/Message.php
index 2a55d0e..3b2f3cc 100644
--- a/includes/Message.php
+++ b/includes/Message.php
@@ -1123,11 +1123,29 @@
 * @return string
 */
protected function replaceParameters( $message, $type = 'before', 
$format ) {
+   // A temporary marker for $1 parameters that is only valid
+   // in non-attribute contexts. However if the entire message is 
escaped
+   // then we don't want to use it because it will be mangled in 
all contexts
+   // and its unnessary as ->escaped() messages aren't html.
+   $marker = $format === self::FORMAT_ESCAPED ? '$' : '$\'"';
$replacementKeys = [];
foreach ( $this->parameters as $n => $param ) {
list( $paramType, $value ) = $this->extractParam( 
$param, $format );
-   if ( $type === $paramType ) {
-   $replacementKeys['$' . ( $n + 1 )] = $value;
+   if ( $type === 'before' ) {
+   if ( $paramType === 'before' ) {
+   $replacementKeys['$' . ( $n + 1 )] = 
$value;
+   } else /* $paramType === 'after' */ {
+   // To protect against XSS from 
replacing parameters
+   // inside html attributes, we convert 
$1 to $'"1.
+   // In the event that one of the 
parameters ends up
+   // in an attribute, either the ' or the 
" will be
+   // escaped, breaking the replacement 
and avoiding XSS.
+   $replacementKeys['$' . ( $n + 1 )] = 
$marker . ( $n + 1 );
+   }
+   } else {
+   if ( $paramType === 'after' ) {
+   $replacementKeys[$marker . ( $n + 1 )] 
= $value;
+   }
}
}
$message = strtr( $message, $replacementKeys );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If83aec01b20e414f9c92be894f145d7df2974866
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Brian Wolff 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] marvin[master]: WIP: use Webpack for server production builds

[Niedzielski (Code Review)]

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

Change subject: WIP: use Webpack for server production builds
..

WIP: use Webpack for server production builds

Bug: T177235
Change-Id: I04fa8f52dfd19da9b6a9f90a59daa559353a8efe
---
M docs/setting-a-staging-server.md
M package-lock.json
M package.json
M src/server/index.tsx
D src/server/types/ignore-styles.d.ts
M webpack.config.ts
6 files changed, 83 insertions(+), 118 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/marvin refs/changes/67/391467/1

diff --git a/docs/setting-a-staging-server.md b/docs/setting-a-staging-server.md
index dd92f23..6429f14 100644
--- a/docs/setting-a-staging-server.md
+++ b/docs/setting-a-staging-server.md
@@ -165,7 +165,7 @@
 cp -R node_modules/ /home/marvin/dist/node_modules
 
 echo "Running new server version"
-NODE_ENV=production node /home/marvin/dist/server/index.js &
+node /home/marvin/dist &
 ```
 
 And make it executable
@@ -183,7 +183,7 @@
 added 115 packages in 12.848s
 
 > marvin@0.0.0 build /home/marvin/sources
-> NODE_ENV=production npm-run-all --silent clean --parallel server:build 
'client:build -- -p'
+> NODE_ENV=production webpack
 
 Removing previously started server processes
 Copying new tarball
diff --git a/package-lock.json b/package-lock.json
index 523d7a9..8106353 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -145,6 +145,15 @@
 "@types/uglify-js": "2.6.29"
   }
 },
+"@types/webpack-node-externals": {
+  "version": "1.6.0",
+  "resolved": 
"https://registry.npmjs.org/@types/webpack-node-externals/-/webpack-node-externals-1.6.0.tgz;,
+  "integrity": 
"sha512-9O3qTR4rDvHIUtKw1Uy95W3r7Ipac7E/obKwdiqdhqTbCuaAyyTpPOA7LFceqxB1TXs2NbFWxorbCkqmb5eFlw==",
+  "dev": true,
+  "requires": {
+"@types/webpack": "3.0.9"
+  }
+},
 "abbrev": {
   "version": "1.1.0",
   "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz;,
@@ -1214,20 +1223,6 @@
 "mkdirp": "0.5.1",
 "rimraf": "2.6.2",
 "run-queue": "1.0.3"
-  }
-},
-"copyfiles": {
-  "version": "1.2.0",
-  "resolved": "https://registry.npmjs.org/copyfiles/-/copyfiles-1.2.0.tgz;,
-  "integrity": "sha1-qNo6xBqiIgrim9PFi2mEKU8sWTw=",
-  "dev": true,
-  "requires": {
-"glob": "7.1.2",
-"ltcdr": "2.2.1",
-"minimatch": "3.0.4",
-"mkdirp": "0.5.1",
-"noms": "0.0.0",
-"through2": "2.0.3"
   }
 },
 "core-util-is": {
@@ -3035,6 +3030,12 @@
   "integrity": "sha1-SMptcvbGo68Aqa1K5odr44ieKwk=",
   "dev": true
 },
+"ignore-loader": {
+  "version": "0.1.2",
+  "resolved": 
"https://registry.npmjs.org/ignore-loader/-/ignore-loader-0.1.2.tgz;,
+  "integrity": "sha1-2B8kA3bQuk8Nd4lyw60lh0EXpGM=",
+  "dev": true
+},
 "ignore-styles": {
   "version": "5.0.1",
   "resolved": 
"https://registry.npmjs.org/ignore-styles/-/ignore-styles-5.0.1.tgz;,
@@ -3944,12 +3945,6 @@
 "yallist": "2.1.2"
   }
 },
-"ltcdr": {
-  "version": "2.2.1",
-  "resolved": "https://registry.npmjs.org/ltcdr/-/ltcdr-2.2.1.tgz;,
-  "integrity": "sha1-Wrh60dTB2rjowIu/A37gwZAih88=",
-  "dev": true
-},
 "macaddress": {
   "version": "0.2.8",
   "resolved": 
"https://registry.npmjs.org/macaddress/-/macaddress-0.2.8.tgz;,
@@ -4479,42 +4474,6 @@
 "touch": "3.1.0",
 "undefsafe": "0.0.3",
 "update-notifier": "2.3.0"
-  }
-},
-"noms": {
-  "version": "0.0.0",
-  "resolved": "https://registry.npmjs.org/noms/-/noms-0.0.0.tgz;,
-  "integrity": "sha1-2o69nzr51nYJGbJ9nNyAkqczKFk=",
-  "dev": true,
-  "requires": {
-"inherits": "2.0.3",
-"readable-stream": "1.0.34"
-  },
-  "dependencies": {
-"isarray": {
-  "version": "0.0.1",
-  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz;,
-  "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-  "dev": true
-},
-"readable-stream": {
-  "version": "1.0.34",
-  "resolved": 
"https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz;,
-  "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-  "dev": true,
-  "requires": {
-"core-util-is": "1.0.2",
-"inherits": "2.0.3",
-"isarray": "0.0.1",
-"string_decoder": "0.10.31"
-  }
-},
-"string_decoder": {
-  "version": "0.10.31",
-  "resolved": 
"https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz;,
-  "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-  "dev": true
-}
   }
 },
 "nopt": {
@@ -7778,6 +7737,12 @@
 }
   }
 },
+"webpack-node-externals": {
+  "version": 

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: SECURITY: Do not reveal if user exists during login failure

[Reedy (Code Review)]

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

Change subject: SECURITY: Do not reveal if user exists during login failure
..


SECURITY: Do not reveal if user exists during login failure

This is meant for private wikis where the list of users may
be secret. It is only meant to prevent trivial enumeration
of usernames. It is not designed to prevent enumeration
via timing attacks.

Bug: T134100
Change-Id: I7afaa955a4b393ef00b11e420709bd62b84fbc71
---
M includes/auth/LocalPasswordPrimaryAuthenticationProvider.php
M languages/i18n/en.json
2 files changed, 5 insertions(+), 2 deletions(-)

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



diff --git a/includes/auth/LocalPasswordPrimaryAuthenticationProvider.php 
b/includes/auth/LocalPasswordPrimaryAuthenticationProvider.php
index 7f93c12..86a6aae 100644
--- a/includes/auth/LocalPasswordPrimaryAuthenticationProvider.php
+++ b/includes/auth/LocalPasswordPrimaryAuthenticationProvider.php
@@ -96,7 +96,10 @@
__METHOD__
);
if ( !$row ) {
-   return AuthenticationResponse::newAbstain();
+   // Do not reveal whether its bad username or
+   // bad password to prevent username enumeration
+   // on private wikis. (T134100)
+   return $this->failResponse( $req );
}
 
$oldRow = clone $row;
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index dc5d97d..5083bed 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -467,7 +467,7 @@
"nosuchusershort": "There is no user by the name \"$1\".\nCheck your 
spelling.",
"nouserspecified": "You have to specify a username.",
"login-userblocked": "This user is blocked. Login not allowed.",
-   "wrongpassword": "Incorrect password entered.\nPlease try again.",
+   "wrongpassword": "Incorrect username or password entered.\nPlease try 
again.",
"wrongpasswordempty": "Password entered was blank.\nPlease try again.",
"passwordtooshort": "Passwords must be at least {{PLURAL:$1|1 
character|$1 characters}}.",
"passwordtoolong": "Passwords cannot be longer than {{PLURAL:$1|1 
character|$1 characters}}.",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7afaa955a4b393ef00b11e420709bd62b84fbc71
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Brian Wolff 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: Siebrand 
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]: Fix tests for I7afaa955a4b393ef00b11e420709bd62b84fbc71

[Reedy (Code Review)]

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

Change subject: Fix tests for I7afaa955a4b393ef00b11e420709bd62b84fbc71
..


Fix tests for I7afaa955a4b393ef00b11e420709bd62b84fbc71

Change-Id: Id5a2a9768dc64db5259a5988d645e664163ba234
---
M tests/phpunit/includes/auth/LocalPasswordPrimaryAuthenticationProviderTest.php
1 file changed, 6 insertions(+), 2 deletions(-)

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



diff --git 
a/tests/phpunit/includes/auth/LocalPasswordPrimaryAuthenticationProviderTest.php
 
b/tests/phpunit/includes/auth/LocalPasswordPrimaryAuthenticationProviderTest.php
index e0ddb0a..5f37078 100644
--- 
a/tests/phpunit/includes/auth/LocalPasswordPrimaryAuthenticationProviderTest.php
+++ 
b/tests/phpunit/includes/auth/LocalPasswordPrimaryAuthenticationProviderTest.php
@@ -221,8 +221,12 @@
$req->password = 'DoesNotExist';
$ret = $provider->beginPrimaryAuthentication( $reqs );
$this->assertEquals(
-   AuthenticationResponse::newAbstain(),
-   $provider->beginPrimaryAuthentication( $reqs )
+   AuthenticationResponse::FAIL,
+   $ret->status
+   );
+   $this->assertEquals(
+   'wrongpassword',
+   $ret->message->getKey()
);
 
// Validation failure

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id5a2a9768dc64db5259a5988d645e664163ba234
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 
Gerrit-Reviewer: Reedy 
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[REL1_30]: Add missing ComposerVendorHtaccessCreator class to autoload.php

[Reedy (Code Review)]

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

Change subject: Add missing ComposerVendorHtaccessCreator class to autoload.php
..


Add missing ComposerVendorHtaccessCreator class to autoload.php

Change-Id: Ia70324acf3db2df50c6629d705c2c4728c38
Follow-up: I2cf6541750c90b5708d7cf5f81b914ae2d9d46d1
---
M autoload.php
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/autoload.php b/autoload.php
index 89d22b0..75c9b55 100644
--- a/autoload.php
+++ b/autoload.php
@@ -285,6 +285,7 @@
'ComposerJson' => __DIR__ . '/includes/libs/composer/ComposerJson.php',
'ComposerLock' => __DIR__ . '/includes/libs/composer/ComposerLock.php',
'ComposerPackageModifier' => __DIR__ . 
'/includes/composer/ComposerPackageModifier.php',
+   'ComposerVendorHtaccessCreator' => __DIR__ . 
'/includes/composer/ComposerVendorHtaccessCreator.php',
'ComposerVersionNormalizer' => __DIR__ . 
'/includes/composer/ComposerVersionNormalizer.php',
'CompressOld' => __DIR__ . '/maintenance/storage/compressOld.php',
'ConcatenatedGzipHistoryBlob' => __DIR__ . '/includes/HistoryBlob.php',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia70324acf3db2df50c6629d705c2c4728c38
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_30
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Reedy 
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[REL1_27]: Add missing ComposerVendorHtaccessCreator class to autoload.php

[Reedy (Code Review)]

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

Change subject: Add missing ComposerVendorHtaccessCreator class to autoload.php
..


Add missing ComposerVendorHtaccessCreator class to autoload.php

Change-Id: Ia70324acf3db2df50c6629d705c2c4728c38
Follow-up: I2cf6541750c90b5708d7cf5f81b914ae2d9d46d1
---
M autoload.php
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/autoload.php b/autoload.php
index dbba50d..2089c57 100644
--- a/autoload.php
+++ b/autoload.php
@@ -261,6 +261,7 @@
'ComposerJson' => __DIR__ . '/includes/libs/composer/ComposerJson.php',
'ComposerLock' => __DIR__ . '/includes/libs/composer/ComposerLock.php',
'ComposerPackageModifier' => __DIR__ . 
'/includes/composer/ComposerPackageModifier.php',
+   'ComposerVendorHtaccessCreator' => __DIR__ . 
'/includes/composer/ComposerVendorHtaccessCreator.php',
'ComposerVersionNormalizer' => __DIR__ . 
'/includes/composer/ComposerVersionNormalizer.php',
'CompressOld' => __DIR__ . '/maintenance/storage/compressOld.php',
'ConcatenatedGzipHistoryBlob' => __DIR__ . '/includes/HistoryBlob.php',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia70324acf3db2df50c6629d705c2c4728c38
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_27
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Reedy 
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[REL1_29]: Add missing ComposerVendorHtaccessCreator class to autoload.php

[Reedy (Code Review)]

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

Change subject: Add missing ComposerVendorHtaccessCreator class to autoload.php
..


Add missing ComposerVendorHtaccessCreator class to autoload.php

Change-Id: Ia70324acf3db2df50c6629d705c2c4728c38
Follow-up: I2cf6541750c90b5708d7cf5f81b914ae2d9d46d1
---
M autoload.php
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/autoload.php b/autoload.php
index 446ff16..4ced1e2 100644
--- a/autoload.php
+++ b/autoload.php
@@ -281,6 +281,7 @@
'ComposerJson' => __DIR__ . '/includes/libs/composer/ComposerJson.php',
'ComposerLock' => __DIR__ . '/includes/libs/composer/ComposerLock.php',
'ComposerPackageModifier' => __DIR__ . 
'/includes/composer/ComposerPackageModifier.php',
+   'ComposerVendorHtaccessCreator' => __DIR__ . 
'/includes/composer/ComposerVendorHtaccessCreator.php',
'ComposerVersionNormalizer' => __DIR__ . 
'/includes/composer/ComposerVersionNormalizer.php',
'CompressOld' => __DIR__ . '/maintenance/storage/compressOld.php',
'ConcatenatedGzipHistoryBlob' => __DIR__ . '/includes/HistoryBlob.php',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia70324acf3db2df50c6629d705c2c4728c38
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_29
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Reedy 
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/vendor[master]: Add .htaccess to disallow web access

[jenkins-bot (Code Review)]

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

Change subject: Add .htaccess to disallow web access
..


Add .htaccess to disallow web access

The /vendor directory does not need to be web accessible, and to reduce
attack surface, should not be web accessible.

Bug: T180237
Change-Id: I855212e10d6ff75d9778d275e0815a8ff19f1da7
(cherry picked from commit 77b6619a845993b5221dd2ff8b9fa1005fd06b04)
---
M .gitignore
A .htaccess
2 files changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/.gitignore b/.gitignore
index 9d96ec6..c3d5b76 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,5 +34,4 @@
 .settings
 /static*
 /tags
-/.htaccess
 /.htpasswd
diff --git a/.htaccess b/.htaccess
new file mode 100644
index 000..3a42882
--- /dev/null
+++ b/.htaccess
@@ -0,0 +1 @@
+Deny from all

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I855212e10d6ff75d9778d275e0815a8ff19f1da7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vendor
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Reedy 
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]: Fix tests for I7afaa955a4b393ef00b11e420709bd62b84fbc71

[Code Review]

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

Change subject: Fix tests for I7afaa955a4b393ef00b11e420709bd62b84fbc71
..

Fix tests for I7afaa955a4b393ef00b11e420709bd62b84fbc71

Change-Id: Id5a2a9768dc64db5259a5988d645e664163ba234
---
M tests/phpunit/includes/auth/LocalPasswordPrimaryAuthenticationProviderTest.php
1 file changed, 6 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/66/391466/1

diff --git 
a/tests/phpunit/includes/auth/LocalPasswordPrimaryAuthenticationProviderTest.php
 
b/tests/phpunit/includes/auth/LocalPasswordPrimaryAuthenticationProviderTest.php
index e0ddb0a..5f37078 100644
--- 
a/tests/phpunit/includes/auth/LocalPasswordPrimaryAuthenticationProviderTest.php
+++ 
b/tests/phpunit/includes/auth/LocalPasswordPrimaryAuthenticationProviderTest.php
@@ -221,8 +221,12 @@
$req->password = 'DoesNotExist';
$ret = $provider->beginPrimaryAuthentication( $reqs );
$this->assertEquals(
-   AuthenticationResponse::newAbstain(),
-   $provider->beginPrimaryAuthentication( $reqs )
+   AuthenticationResponse::FAIL,
+   $ret->status
+   );
+   $this->assertEquals(
+   'wrongpassword',
+   $ret->message->getKey()
);
 
// Validation failure

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id5a2a9768dc64db5259a5988d645e664163ba234
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