date:20161228

[MediaWiki-commits] [Gerrit] mediawiki...Gadgets[master]: Explicit convert the Message object to string

2016-12-28 Thread jenkins-bot (Code Review)

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

Change subject: Explicit convert the Message object to string
..


Explicit convert the Message object to string

This prevents double HTML escaping of the messages.

Change-Id: Iafba3108490f56d20cf1fac15a43e8fe420fedc2
---
M SpecialGadgetUsage.php
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/SpecialGadgetUsage.php b/SpecialGadgetUsage.php
index 38f07af..5bfe60f 100644
--- a/SpecialGadgetUsage.php
+++ b/SpecialGadgetUsage.php
@@ -214,9 +214,9 @@
foreach ( $defaultGadgets as $default ) {
$html = Html::openElement( 'tr', [] );
$html .= Html::element( 'td', [], $default );
-   $html .= Html::element( 'td', [], $this->msg( 
'gadgetusage-default' ) );
+   $html .= Html::element( 'td', [], $this->msg( 
'gadgetusage-default' )->text() );
if ( $this->activeUsers ) {
-   $html .= Html::element( 'td', [], 
$this->msg( 'gadgetusage-default' ) );
+   $html .= Html::element( 'td', [], 
$this->msg( 'gadgetusage-default' )->text() );
}
$html .= Html::closeElement( 'tr' );
$out->addHTML( $html );

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

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

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

[MediaWiki-commits] [Gerrit] translatewiki[master]: Commons Android: add hif-latn to codemap

2016-12-28 Thread jenkins-bot (Code Review)

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

Change subject: Commons Android: add hif-latn to codemap
..


Commons Android: add hif-latn to codemap

Just following the existing pattern here. I hope it's okay.

Change-Id: I95c120a011b650503fdce045448ae8fc46b6ecb3
---
M groups/Wikimedia/CommonsAndroid.yaml
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/groups/Wikimedia/CommonsAndroid.yaml 
b/groups/Wikimedia/CommonsAndroid.yaml
index ed625e2..50b7f94 100644
--- a/groups/Wikimedia/CommonsAndroid.yaml
+++ b/groups/Wikimedia/CommonsAndroid.yaml
@@ -10,6 +10,7 @@
 codeMap:
   be-tarask: b+be+tarask
   he: iw
+  hif-latn: b+hif+Latn
   id: in
   kk-cyrl: b+kk+Cyrl
   ku-latn: ku

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I95c120a011b650503fdce045448ae8fc46b6ecb3
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] translatewiki[master]: Commons Android: add hif-latn to codemap

2016-12-28 Thread Nikerabbit (Code Review)

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

Change subject: Commons Android: add hif-latn to codemap
..

Commons Android: add hif-latn to codemap

Just following the existing pattern here. I hope it's okay.

Change-Id: I95c120a011b650503fdce045448ae8fc46b6ecb3
---
M groups/Wikimedia/CommonsAndroid.yaml
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/47/329547/1

diff --git a/groups/Wikimedia/CommonsAndroid.yaml 
b/groups/Wikimedia/CommonsAndroid.yaml
index ed625e2..50b7f94 100644
--- a/groups/Wikimedia/CommonsAndroid.yaml
+++ b/groups/Wikimedia/CommonsAndroid.yaml
@@ -10,6 +10,7 @@
 codeMap:
   be-tarask: b+be+tarask
   he: iw
+  hif-latn: b+hif+Latn
   id: in
   kk-cyrl: b+kk+Cyrl
   ku-latn: ku

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[jessie-migration]: Convert statsd to systemd

2016-12-28 Thread BryanDavis (Code Review)

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

Change subject: Convert statsd to systemd
..

Convert statsd to systemd

Bug: T154268
Change-Id: Iba2e9f9a0ab04cfaa98fa96c3434bc024a521bff
---
M puppet/modules/statsd/manifests/init.pp
A puppet/modules/statsd/templates/systemd.erb
D puppet/modules/statsd/templates/upstart.conf.erb
3 files changed, 24 insertions(+), 28 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/46/329546/1

diff --git a/puppet/modules/statsd/manifests/init.pp 
b/puppet/modules/statsd/manifests/init.pp
index ef2bbf9..05c4efd 100644
--- a/puppet/modules/statsd/manifests/init.pp
+++ b/puppet/modules/statsd/manifests/init.pp
@@ -41,14 +41,20 @@
 content => template('statsd/config.js.erb'),
 mode=> '0644',
 require => Git::Clone['statsd'],
+notify  => Service['statsd'],
 }
 
-file { '/etc/init/statsd.conf':
-content => template('statsd/upstart.conf.erb'),
+file { '/lib/systemd/system/statsd.service':
+content => template('statsd/systemd.erb'),
 owner   => 'root',
 group   => 'root',
 mode=> '0444',
 notify  => Service['statsd'],
+}
+exec { 'systemd reload for statsd':
+refreshonly => true,
+command => '/bin/systemctl daemon-reload',
+subscribe   => File['/lib/systemd/system/statsd.service'],
 }
 
 file { '/etc/logrotate.d/statsd':
@@ -66,11 +72,7 @@
 service { 'statsd':
 ensure   => running,
 enable   => true,
-provider => 'upstart',
-require  => [
-Git::Clone['statsd'],
-Npm::Install[$dir],
-File["${dir}/config.js"],
-],
+provider => 'systemd',
+require  => Npm::Install[$dir],
 }
 }
diff --git a/puppet/modules/statsd/templates/systemd.erb 
b/puppet/modules/statsd/templates/systemd.erb
new file mode 100644
index 000..ff61e53
--- /dev/null
+++ b/puppet/modules/statsd/templates/systemd.erb
@@ -0,0 +1,14 @@
+[Unit]
+Description="statsd service"
+
+[Service]
+Environment=NODE_PATH=<%= @dir %>/node_modules
+User=www-data
+Group=www-data
+SyslogIdentifier=statsd
+WorkingDirectory=<%= @dir %>
+ExecStart=/usr/bin/nodejs stats.js <%= @dir %>/config.js > <%= @logdir 
%>/statsd.log
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
diff --git a/puppet/modules/statsd/templates/upstart.conf.erb 
b/puppet/modules/statsd/templates/upstart.conf.erb
deleted file mode 100644
index b31934a..000
--- a/puppet/modules/statsd/templates/upstart.conf.erb
+++ /dev/null
@@ -1,20 +0,0 @@
-# vim: set ft=upstart:
-
-# This file is managed by Puppet
-# Upstart init script for statsd
-
-description "statsd service"
-
-start on mediawiki-ready
-stop on runlevel [016]
-
-setuid "www-data"
-setgid "www-data"
-
-env NODE_PATH="<%= @dir %>/node_modules"
-
-chdir "<%= @dir %>"
-exec /usr/bin/nodejs stats.js <%= @dir %>/config.js > <%= @logdir %>/statsd.log
-
-respawn
-

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iba2e9f9a0ab04cfaa98fa96c3434bc024a521bff
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: jessie-migration
Gerrit-Owner: BryanDavis 

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

[MediaWiki-commits] [Gerrit] mediawiki...FlaggedRevs[master]: Refactor maybeMakeEditReviewed to handle all self-reverts, a...

2016-12-28 Thread Cen.temp (Code Review)

Cen.temp has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329545 )

Change subject: Refactor maybeMakeEditReviewed to handle all self-reverts, 
avoid db hits
..

Refactor maybeMakeEditReviewed to handle all self-reverts, avoid db hits

This refactors maybeMakeEditReviewed to check text hashes rather than
baseRevIds which are presently only given for rollbacks. They could
also be given for undoes, but it still wouldn't detect manual reverts.
This allows to simplify the function. In addition, some master reads
are avoided.

Change-Id: I37ebd972775510d3b8515c76237920ae8314ae4e
---
M backend/FlaggedRevs.hooks.php
1 file changed, 46 insertions(+), 101 deletions(-)


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

diff --git a/backend/FlaggedRevs.hooks.php b/backend/FlaggedRevs.hooks.php
index 593906c..93b6756 100755
--- a/backend/FlaggedRevs.hooks.php
+++ b/backend/FlaggedRevs.hooks.php
@@ -384,8 +384,6 @@
public static function maybeMakeEditReviewed(
Page $article, $rev, $baseRevId = false, $user = null
) {
-   global $wgRequest;
-
$title = $article->getTitle(); // convenience
# Edit must be non-null, to a reviewable page, with $user set
$fa = FlaggableWikiPage::getTitleInstance( $title );
@@ -397,100 +395,66 @@
$title->resetArticleID( $rev->getPage() ); // Avoid extra DB 
hit and lag issues
# Get what was just the current revision ID
$prevRevId = $rev->getParentId();
-   # Get edit timestamp. Existance already validated by 
EditPage.php.
-   $editTimestamp = $wgRequest->getVal( 'wpEdittime' );
-   # Is the page manually checked off to be reviewed?
-   if ( $editTimestamp
-   && $wgRequest->getCheck( 'wpReviewEdit' )
-   && $title->getUserPermissionsErrors( 'review', $user ) 
=== array() )
+   # Get edit timestamp. Existence already validated by 
EditPage.php.
+   $editTimestamp = $user->getRequest()->getVal( 'wpEdittime' );
+   # Case A: The page is manually checked off to be reviewed by a 
reviewer.
+   # Check that the timestamps match to guard against auto-merges 
of unreviewed edits
+   if ( $editTimestamp && $user->getRequest()->getCheck( 
'wpReviewEdit' )
+   && $title->getUserPermissionsErrors( 'review', $user ) 
=== array()
+   && self::editCheckReview( $fa, $rev, $user, 
$editTimestamp ) )
{
-   if ( self::editCheckReview( $fa, $rev, $user, 
$editTimestamp ) ) {
-   return true; // reviewed...done!
-   }
+   $flags = null; // review flags (null => default flags)
+   FlaggedRevs::autoReviewEdit( $article, $user, $rev, 
$flags, false /* manual */ );
+   return true; // reviewed...done!
}
# All cases below require auto-review of edits to be enabled
if ( !FlaggedRevs::autoReviewEnabled() ) {
return true; // short-circuit
}
-   # If a $baseRevId is passed in, the edit is using an old 
revision's text
-   $isOldRevCopy = (bool)$baseRevId; // null edit or rollback
-   # Get the revision ID the incoming one was based off...
-   if ( !$baseRevId && $prevRevId ) {
-   $prevTimestamp = Revision::getTimestampFromId(
-   $title, $prevRevId, Revision::READ_LATEST );
-   # The user just made an edit. The one before that 
should have
-   # been the current version. If not reflected in 
wpEdittime, an
-   # edit may have been auto-merged in between, in that 
case, discard
-   # the baseRevId given from the client.
-   if ( $editTimestamp && $prevTimestamp === 
$editTimestamp ) {
-   $baseRevId = $wgRequest->getInt( 'baseRevId' );
-   }
-   # If baseRevId not given, assume the previous revision 
ID (for bots).
-   # For auto-merges, this also occurs since the given ID 
is ignored.
-   if ( !$baseRevId ) {
-   $baseRevId = $prevRevId;
-   }
-   }
-   $frev = null; // flagged rev this edit was based on
-   $flags = null; // review flags (null => default flags)
$srev = $fa->getStableRev();
-   # Case A: this user can auto-review edits. Check if either:
+   # Case B: this user can auto-review edits. Check if

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[jessie-migration]: crm::dash: Fix Puppet lint errors

2016-12-28 Thread jenkins-bot (Code Review)

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

Change subject: crm::dash: Fix Puppet lint errors
..


crm::dash: Fix Puppet lint errors

Change-Id: I479c9482b5cd6d40c32cf96790a49bc1b78b149c
(cherry picked from commit 80e627169457d1e98807656c89f7c6c796669a3e)
---
M puppet/modules/crm/manifests/dash.pp
1 file changed, 8 insertions(+), 8 deletions(-)

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



diff --git a/puppet/modules/crm/manifests/dash.pp 
b/puppet/modules/crm/manifests/dash.pp
index 0b4b416..30371c3 100644
--- a/puppet/modules/crm/manifests/dash.pp
+++ b/puppet/modules/crm/manifests/dash.pp
@@ -7,18 +7,18 @@
 require ::npm
 
 # FIXME this should be in hieradata
-$fundraising_dash_dir = "/vagrant/srv/fundraising-dash"
+$fundraising_dash_dir = '/vagrant/srv/fundraising-dash'
 
 git::clone { 'wikimedia/fundraising/dash':
 directory => $fundraising_dash_dir
 }
 
-npm::install { "dash_npm_install":
+npm::install { 'dash_npm_install':
 directory => $fundraising_dash_dir,
 require   => Git::Clone['wikimedia/fundraising/dash']
 }
 
-exec { "dash_bower_install":
+exec { 'dash_bower_install':
 command => "${fundraising_dash_dir}/node_modules/bower/bin/bower 
install",
 cwd => $fundraising_dash_dir,
 require => Npm::Install['dash_npm_install'],
@@ -41,15 +41,15 @@
 ],
 }
 
-file { "/etc/init/fundraising_dash.conf":
+file { '/etc/init/fundraising_dash.conf':
 content => template('crm/fundraising_dash.conf.erb'),
 }
 
 service { 'fundraising_dash':
-enable=> true,
-provider  => 'upstart',
-ensure=> running,
-require   => Exec['dash_schema'],
+ensure   => running,
+enable   => true,
+provider => 'upstart',
+require  => Exec['dash_schema'],
 }
 
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I479c9482b5cd6d40c32cf96790a49bc1b78b149c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: jessie-migration
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[jessie-migration]: crm::dash: Fix Puppet lint errors

2016-12-28 Thread BryanDavis (Code Review)

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

Change subject: crm::dash: Fix Puppet lint errors
..

crm::dash: Fix Puppet lint errors

Change-Id: I479c9482b5cd6d40c32cf96790a49bc1b78b149c
(cherry picked from commit 80e627169457d1e98807656c89f7c6c796669a3e)
---
M puppet/modules/crm/manifests/dash.pp
1 file changed, 8 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/44/329544/1

diff --git a/puppet/modules/crm/manifests/dash.pp 
b/puppet/modules/crm/manifests/dash.pp
index 0b4b416..30371c3 100644
--- a/puppet/modules/crm/manifests/dash.pp
+++ b/puppet/modules/crm/manifests/dash.pp
@@ -7,18 +7,18 @@
 require ::npm
 
 # FIXME this should be in hieradata
-$fundraising_dash_dir = "/vagrant/srv/fundraising-dash"
+$fundraising_dash_dir = '/vagrant/srv/fundraising-dash'
 
 git::clone { 'wikimedia/fundraising/dash':
 directory => $fundraising_dash_dir
 }
 
-npm::install { "dash_npm_install":
+npm::install { 'dash_npm_install':
 directory => $fundraising_dash_dir,
 require   => Git::Clone['wikimedia/fundraising/dash']
 }
 
-exec { "dash_bower_install":
+exec { 'dash_bower_install':
 command => "${fundraising_dash_dir}/node_modules/bower/bin/bower 
install",
 cwd => $fundraising_dash_dir,
 require => Npm::Install['dash_npm_install'],
@@ -41,15 +41,15 @@
 ],
 }
 
-file { "/etc/init/fundraising_dash.conf":
+file { '/etc/init/fundraising_dash.conf':
 content => template('crm/fundraising_dash.conf.erb'),
 }
 
 service { 'fundraising_dash':
-enable=> true,
-provider  => 'upstart',
-ensure=> running,
-require   => Exec['dash_schema'],
+ensure   => running,
+enable   => true,
+provider => 'upstart',
+require  => Exec['dash_schema'],
 }
 
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I479c9482b5cd6d40c32cf96790a49bc1b78b149c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: jessie-migration
Gerrit-Owner: BryanDavis 

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Update PHPMailer

2016-12-28 Thread jenkins-bot (Code Review)

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

Change subject: Update PHPMailer
..


Update PHPMailer

Bug: T154209
Change-Id: I2a841615cc52517d59a630a2f74b0132449df987
---
M composer.json
M composer.lock
M vendor
3 files changed, 9 insertions(+), 9 deletions(-)

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



diff --git a/composer.json b/composer.json
index fa55f4f..d6a3181 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,7 @@
 "cogpowered/finediff": "0.*",
 "wikimedia/donation-interface": "dev-master",
 "wikimedia/smash-pig": "dev-master",
-"phpmailer/phpmailer": "5.2.19",
+"phpmailer/phpmailer": "5.2.21",
 "phpseclib/phpseclib": "0.3.7",
 "predis/predis": "1.*",
 "twig/twig": "1.*"
diff --git a/composer.lock b/composer.lock
index 30ab830..9f798f1 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
 "Read more about it at 
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
 "This file is @generated automatically"
 ],
-"hash": "cec6275ac424c446d05c52716f6274f5",
-"content-hash": "91931727db11a0b3a078b4c4401f5b5f",
+"hash": "c2a08d033ae69a5ecbae72fdbe929a2a",
+"content-hash": "824641a9a433422fd2773d67876f5d7b",
 "packages": [
 {
 "name": "amzn/login-and-pay-with-amazon-sdk-php",
@@ -449,16 +449,16 @@
 },
 {
 "name": "phpmailer/phpmailer",
-"version": "v5.2.19",
+"version": "v5.2.21",
 "source": {
 "type": "git",
 "url": "https://github.com/PHPMailer/PHPMailer.git;,
-"reference": "9e4b8fb3deb7d9cfa515c04cec41f71bc37ce9a9"
+"reference": "1d51856b76c06fc687fcd9180efa7a0bed0d761e"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/PHPMailer/PHPMailer/zipball/9e4b8fb3deb7d9cfa515c04cec41f71bc37ce9a9;,
-"reference": "9e4b8fb3deb7d9cfa515c04cec41f71bc37ce9a9",
+"url": 
"https://api.github.com/repos/PHPMailer/PHPMailer/zipball/1d51856b76c06fc687fcd9180efa7a0bed0d761e;,
+"reference": "1d51856b76c06fc687fcd9180efa7a0bed0d761e",
 "shasum": ""
 },
 "require": {
@@ -505,7 +505,7 @@
 }
 ],
 "description": "PHPMailer is a full-featured email creation and 
transfer class for PHP",
-"time": "2016-12-26 10:09:10"
+"time": "2016-12-28 15:35:48"
 },
 {
 "name": "phpseclib/phpseclib",
diff --git a/vendor b/vendor
index c4dc0ee..4260d17 16
--- a/vendor
+++ b/vendor
@@ -1 +1 @@
-Subproject commit c4dc0eedce0c888a7d1632aa91b30d2b5722b0fa
+Subproject commit 4260d175c1691436047aa1e1d8fb19c50b823f03

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2a841615cc52517d59a630a2f74b0132449df987
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Awight 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia...vendor[master]: Short array syntax tweaks.

2016-12-28 Thread Awight (Code Review)

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

Change subject: Short array syntax tweaks.
..


Short array syntax tweaks.

find . -name "*.php" -exec php 
~/php-short-array-syntax-converter/revert.php -w "{}" \;

Bug: T154209
Change-Id: Ie8cfc288a756087cd467eb87a819ca39a55150c5
---
M phpmailer/phpmailer/class.phpmaileroauthgoogle.php
M phpmailer/phpmailer/get_oauth_token.php
2 files changed, 7 insertions(+), 7 deletions(-)

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



diff --git a/phpmailer/phpmailer/class.phpmaileroauthgoogle.php 
b/phpmailer/phpmailer/class.phpmaileroauthgoogle.php
index 71c9bd3..8d169b2 100644
--- a/phpmailer/phpmailer/class.phpmaileroauthgoogle.php
+++ b/phpmailer/phpmailer/class.phpmaileroauthgoogle.php
@@ -51,10 +51,10 @@
 
 private function getProvider()
 {
-return new League\OAuth2\Client\Provider\Google([
+return new League\OAuth2\Client\Provider\Google(array(
 'clientId' => $this->oauthClientId,
 'clientSecret' => $this->oauthClientSecret
-]);
+));
 }
 
 private function getGrant()
@@ -66,7 +66,7 @@
 {
 $provider = $this->getProvider();
 $grant = $this->getGrant();
-return $provider->getAccessToken($grant, ['refresh_token' => 
$this->oauthRefreshToken]);
+return $provider->getAccessToken($grant, array('refresh_token' => 
$this->oauthRefreshToken));
 }
 
 public function getOauth64()
diff --git a/phpmailer/phpmailer/get_oauth_token.php 
b/phpmailer/phpmailer/get_oauth_token.php
index 2c26d0f..b95d5c4 100644
--- a/phpmailer/phpmailer/get_oauth_token.php
+++ b/phpmailer/phpmailer/get_oauth_token.php
@@ -80,24 +80,24 @@
 
 $params = array_merge(
 parent::getAuthorizationParameters($options),
-array_filter([
+array_filter(array(
 'hd'  => $this->hostedDomain,
 'access_type' => $this->accessType,
'scope'   => $this->scope,
 // if the user is logged in with more than one account ask 
which one to use for the login!
 'authuser'=> '-1'
-])
+))
 );
 return $params;
 }
 
 protected function getDefaultScopes()
 {
-return [
+return array(
 'email',
 'openid',
 'profile',
-];
+);
 }
 
 protected function getScopeSeparator()

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie8cfc288a756087cd467eb87a819ca39a55150c5
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm/vendor
Gerrit-Branch: master
Gerrit-Owner: Awight 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia...vendor[master]: Update PHPMailer

2016-12-28 Thread Awight (Code Review)

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

Change subject: Update PHPMailer
..


Update PHPMailer

Bug: T154209
Change-Id: I761c51473e7dde1faff1b1fc181300bba594dc49
---
M composer/installed.json
M phpmailer/phpmailer/VERSION
M phpmailer/phpmailer/class.phpmailer.php
M phpmailer/phpmailer/class.phpmaileroauthgoogle.php
M phpmailer/phpmailer/class.pop3.php
M phpmailer/phpmailer/class.smtp.php
M phpmailer/phpmailer/extras/htmlfilter.php
M phpmailer/phpmailer/get_oauth_token.php
8 files changed, 68 insertions(+), 26 deletions(-)

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



diff --git a/composer/installed.json b/composer/installed.json
index 02ab9f6..fe0c886 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -1225,17 +1225,17 @@
 },
 {
 "name": "phpmailer/phpmailer",
-"version": "v5.2.19",
-"version_normalized": "5.2.19.0",
+"version": "v5.2.21",
+"version_normalized": "5.2.21.0",
 "source": {
 "type": "git",
 "url": "https://github.com/PHPMailer/PHPMailer.git;,
-"reference": "9e4b8fb3deb7d9cfa515c04cec41f71bc37ce9a9"
+"reference": "1d51856b76c06fc687fcd9180efa7a0bed0d761e"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/PHPMailer/PHPMailer/zipball/9e4b8fb3deb7d9cfa515c04cec41f71bc37ce9a9;,
-"reference": "9e4b8fb3deb7d9cfa515c04cec41f71bc37ce9a9",
+"url": 
"https://api.github.com/repos/PHPMailer/PHPMailer/zipball/1d51856b76c06fc687fcd9180efa7a0bed0d761e;,
+"reference": "1d51856b76c06fc687fcd9180efa7a0bed0d761e",
 "shasum": ""
 },
 "require": {
@@ -1248,7 +1248,7 @@
 "suggest": {
 "league/oauth2-google": "Needed for Google XOAUTH2 authentication"
 },
-"time": "2016-12-26 10:09:10",
+"time": "2016-12-28 15:35:48",
 "type": "library",
 "installation-source": "dist",
 "autoload": {
diff --git a/phpmailer/phpmailer/VERSION b/phpmailer/phpmailer/VERSION
index 1c26b6f..567eefa 100644
--- a/phpmailer/phpmailer/VERSION
+++ b/phpmailer/phpmailer/VERSION
@@ -1 +1 @@
-5.2.19
\ No newline at end of file
+5.2.21
diff --git a/phpmailer/phpmailer/class.phpmailer.php 
b/phpmailer/phpmailer/class.phpmailer.php
index 6afcf9a..8ff13f1 100644
--- a/phpmailer/phpmailer/class.phpmailer.php
+++ b/phpmailer/phpmailer/class.phpmailer.php
@@ -31,7 +31,7 @@
  * The PHPMailer Version number.
  * @var string
  */
-public $Version = '5.2.19';
+public $Version = '5.2.21';
 
 /**
  * Email priority.
@@ -1364,19 +1364,24 @@
  */
 protected function sendmailSend($header, $body)
 {
-if (!empty($this->Sender)) {
+// CVE-2016-10033, CVE-2016-10045: Don't pass -f if characters will be 
escaped.
+if (!empty($this->Sender) and self::isShellSafe($this->Sender)) {
 if ($this->Mailer == 'qmail') {
-$sendmail = sprintf('%s -f%s', 
escapeshellcmd($this->Sendmail), escapeshellarg($this->Sender));
+$sendmailFmt = '%s -f%s';
 } else {
-$sendmail = sprintf('%s -oi -f%s -t', 
escapeshellcmd($this->Sendmail), escapeshellarg($this->Sender));
+$sendmailFmt = '%s -oi -f%s -t';
 }
 } else {
 if ($this->Mailer == 'qmail') {
-$sendmail = sprintf('%s', escapeshellcmd($this->Sendmail));
+$sendmailFmt = '%s';
 } else {
-$sendmail = sprintf('%s -oi -t', 
escapeshellcmd($this->Sendmail));
+$sendmailFmt = '%s -oi -t';
 }
 }
+
+// TODO: If possible, this should be changed to escapeshellarg.  Needs 
thorough testing.
+$sendmail = sprintf($sendmailFmt, escapeshellcmd($this->Sendmail), 
$this->Sender);
+
 if ($this->SingleTo) {
 foreach ($this->SingleToArray as $toAddr) {
 if (!@$mail = popen($sendmail, 'w')) {
@@ -1423,6 +1428,40 @@
 }
 
 /**
+ * Fix CVE-2016-10033 and CVE-2016-10045 by disallowing potentially unsafe 
shell characters.
+ *
+ * Note that escapeshellarg and escapeshellcmd are inadequate for our 
purposes, especially on Windows.
+ * @param string $string The string to be validated
+ * @see https://github.com/PHPMailer/PHPMailer/issues/924 CVE-2016-10045 
bug report
+ * @access protected
+ * @return boolean
+ */
+protected static function isShellSafe($string)
+{
+// Future-proof
+if (escapeshellcmd($string) !== $string
+or !in_array(escapeshellarg($string), array("'$string'", 
"\"$string\""))
+) {
+return false;
+}
+
+$length = strlen($string);
+
+for ($i = 0; $i < $length;

[MediaWiki-commits] [Gerrit] wikimedia...vendor[master]: Short array syntax tweaks.

2016-12-28 Thread Awight (Code Review)

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

Change subject: Short array syntax tweaks.
..

Short array syntax tweaks.

find . -name "*.php" -exec php 
~/php-short-array-syntax-converter/revert.php -w "{}" \;

Bug: T154209
Change-Id: Ie8cfc288a756087cd467eb87a819ca39a55150c5
---
M phpmailer/phpmailer/class.phpmaileroauthgoogle.php
M phpmailer/phpmailer/get_oauth_token.php
2 files changed, 7 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm/vendor 
refs/changes/43/329543/1

diff --git a/phpmailer/phpmailer/class.phpmaileroauthgoogle.php 
b/phpmailer/phpmailer/class.phpmaileroauthgoogle.php
index 71c9bd3..8d169b2 100644
--- a/phpmailer/phpmailer/class.phpmaileroauthgoogle.php
+++ b/phpmailer/phpmailer/class.phpmaileroauthgoogle.php
@@ -51,10 +51,10 @@
 
 private function getProvider()
 {
-return new League\OAuth2\Client\Provider\Google([
+return new League\OAuth2\Client\Provider\Google(array(
 'clientId' => $this->oauthClientId,
 'clientSecret' => $this->oauthClientSecret
-]);
+));
 }
 
 private function getGrant()
@@ -66,7 +66,7 @@
 {
 $provider = $this->getProvider();
 $grant = $this->getGrant();
-return $provider->getAccessToken($grant, ['refresh_token' => 
$this->oauthRefreshToken]);
+return $provider->getAccessToken($grant, array('refresh_token' => 
$this->oauthRefreshToken));
 }
 
 public function getOauth64()
diff --git a/phpmailer/phpmailer/get_oauth_token.php 
b/phpmailer/phpmailer/get_oauth_token.php
index 2c26d0f..b95d5c4 100644
--- a/phpmailer/phpmailer/get_oauth_token.php
+++ b/phpmailer/phpmailer/get_oauth_token.php
@@ -80,24 +80,24 @@
 
 $params = array_merge(
 parent::getAuthorizationParameters($options),
-array_filter([
+array_filter(array(
 'hd'  => $this->hostedDomain,
 'access_type' => $this->accessType,
'scope'   => $this->scope,
 // if the user is logged in with more than one account ask 
which one to use for the login!
 'authuser'=> '-1'
-])
+))
 );
 return $params;
 }
 
 protected function getDefaultScopes()
 {
-return [
+return array(
 'email',
 'openid',
 'profile',
-];
+);
 }
 
 protected function getScopeSeparator()

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie8cfc288a756087cd467eb87a819ca39a55150c5
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm/vendor
Gerrit-Branch: master
Gerrit-Owner: Awight 

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Add missing imports required for PHPDoc comments

2016-12-28 Thread jenkins-bot (Code Review)

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

Change subject: Add missing imports required for PHPDoc comments
..


Add missing imports required for PHPDoc comments

Change-Id: I60d1781d323a4189fbc4687c781b70052df2b122
---
M client/tests/phpunit/includes/Hooks/EchoNotificationsHandlersTest.php
M lib/includes/Store/PropertyInfoLookup.php
2 files changed, 2 insertions(+), 0 deletions(-)

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



diff --git 
a/client/tests/phpunit/includes/Hooks/EchoNotificationsHandlersTest.php 
b/client/tests/phpunit/includes/Hooks/EchoNotificationsHandlersTest.php
index 729e370..df5633d 100644
--- a/client/tests/phpunit/includes/Hooks/EchoNotificationsHandlersTest.php
+++ b/client/tests/phpunit/includes/Hooks/EchoNotificationsHandlersTest.php
@@ -5,6 +5,7 @@
 use EchoEvent;
 use MediaWikiTestCase;
 use Title;
+use Wikibase\ChangeRow;
 use Wikibase\Client\Hooks\EchoNotificationsHandlers;
 use Wikibase\Client\RepoLinker;
 use Wikibase\Lib\Tests\Changes\TestChanges;
diff --git a/lib/includes/Store/PropertyInfoLookup.php 
b/lib/includes/Store/PropertyInfoLookup.php
index ce81897..79330fd 100644
--- a/lib/includes/Store/PropertyInfoLookup.php
+++ b/lib/includes/Store/PropertyInfoLookup.php
@@ -2,6 +2,7 @@
 
 namespace Wikibase\Lib\Store;
 
+use DBError;
 use Wikibase\DataModel\Entity\PropertyId;
 
 /**

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I60d1781d323a4189fbc4687c781b70052df2b122
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia...vendor[master]: Update PHPMailer

2016-12-28 Thread Awight (Code Review)

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

Change subject: Update PHPMailer
..

Update PHPMailer

Bug: T154209
Change-Id: I761c51473e7dde1faff1b1fc181300bba594dc49
---
M composer/installed.json
M phpmailer/phpmailer/VERSION
M phpmailer/phpmailer/class.phpmailer.php
M phpmailer/phpmailer/class.phpmaileroauthgoogle.php
M phpmailer/phpmailer/class.pop3.php
M phpmailer/phpmailer/class.smtp.php
M phpmailer/phpmailer/extras/htmlfilter.php
M phpmailer/phpmailer/get_oauth_token.php
8 files changed, 68 insertions(+), 26 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm/vendor 
refs/changes/41/329541/1

diff --git a/composer/installed.json b/composer/installed.json
index 02ab9f6..fe0c886 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -1225,17 +1225,17 @@
 },
 {
 "name": "phpmailer/phpmailer",
-"version": "v5.2.19",
-"version_normalized": "5.2.19.0",
+"version": "v5.2.21",
+"version_normalized": "5.2.21.0",
 "source": {
 "type": "git",
 "url": "https://github.com/PHPMailer/PHPMailer.git;,
-"reference": "9e4b8fb3deb7d9cfa515c04cec41f71bc37ce9a9"
+"reference": "1d51856b76c06fc687fcd9180efa7a0bed0d761e"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/PHPMailer/PHPMailer/zipball/9e4b8fb3deb7d9cfa515c04cec41f71bc37ce9a9;,
-"reference": "9e4b8fb3deb7d9cfa515c04cec41f71bc37ce9a9",
+"url": 
"https://api.github.com/repos/PHPMailer/PHPMailer/zipball/1d51856b76c06fc687fcd9180efa7a0bed0d761e;,
+"reference": "1d51856b76c06fc687fcd9180efa7a0bed0d761e",
 "shasum": ""
 },
 "require": {
@@ -1248,7 +1248,7 @@
 "suggest": {
 "league/oauth2-google": "Needed for Google XOAUTH2 authentication"
 },
-"time": "2016-12-26 10:09:10",
+"time": "2016-12-28 15:35:48",
 "type": "library",
 "installation-source": "dist",
 "autoload": {
diff --git a/phpmailer/phpmailer/VERSION b/phpmailer/phpmailer/VERSION
index 1c26b6f..567eefa 100644
--- a/phpmailer/phpmailer/VERSION
+++ b/phpmailer/phpmailer/VERSION
@@ -1 +1 @@
-5.2.19
\ No newline at end of file
+5.2.21
diff --git a/phpmailer/phpmailer/class.phpmailer.php 
b/phpmailer/phpmailer/class.phpmailer.php
index 6afcf9a..8ff13f1 100644
--- a/phpmailer/phpmailer/class.phpmailer.php
+++ b/phpmailer/phpmailer/class.phpmailer.php
@@ -31,7 +31,7 @@
  * The PHPMailer Version number.
  * @var string
  */
-public $Version = '5.2.19';
+public $Version = '5.2.21';
 
 /**
  * Email priority.
@@ -1364,19 +1364,24 @@
  */
 protected function sendmailSend($header, $body)
 {
-if (!empty($this->Sender)) {
+// CVE-2016-10033, CVE-2016-10045: Don't pass -f if characters will be 
escaped.
+if (!empty($this->Sender) and self::isShellSafe($this->Sender)) {
 if ($this->Mailer == 'qmail') {
-$sendmail = sprintf('%s -f%s', 
escapeshellcmd($this->Sendmail), escapeshellarg($this->Sender));
+$sendmailFmt = '%s -f%s';
 } else {
-$sendmail = sprintf('%s -oi -f%s -t', 
escapeshellcmd($this->Sendmail), escapeshellarg($this->Sender));
+$sendmailFmt = '%s -oi -f%s -t';
 }
 } else {
 if ($this->Mailer == 'qmail') {
-$sendmail = sprintf('%s', escapeshellcmd($this->Sendmail));
+$sendmailFmt = '%s';
 } else {
-$sendmail = sprintf('%s -oi -t', 
escapeshellcmd($this->Sendmail));
+$sendmailFmt = '%s -oi -t';
 }
 }
+
+// TODO: If possible, this should be changed to escapeshellarg.  Needs 
thorough testing.
+$sendmail = sprintf($sendmailFmt, escapeshellcmd($this->Sendmail), 
$this->Sender);
+
 if ($this->SingleTo) {
 foreach ($this->SingleToArray as $toAddr) {
 if (!@$mail = popen($sendmail, 'w')) {
@@ -1423,6 +1428,40 @@
 }
 
 /**
+ * Fix CVE-2016-10033 and CVE-2016-10045 by disallowing potentially unsafe 
shell characters.
+ *
+ * Note that escapeshellarg and escapeshellcmd are inadequate for our 
purposes, especially on Windows.
+ * @param string $string The string to be validated
+ * @see https://github.com/PHPMailer/PHPMailer/issues/924 CVE-2016-10045 
bug report
+ * @access protected
+ * @return boolean
+ */
+protected static function isShellSafe($string)
+{
+// Future-proof
+if (escapeshellcmd($string) !== $string
+or !in_array(escapeshellarg($string), array("'$string'", 
"\"$string\""))
+) {
+return false;
+}
+
+$length = strlen($string);
+

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Update PHPMailer

2016-12-28 Thread Awight (Code Review)

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

Change subject: Update PHPMailer
..

Update PHPMailer

Bug: T154209
Change-Id: I2a841615cc52517d59a630a2f74b0132449df987
---
M composer.json
M composer.lock
M vendor
3 files changed, 9 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/42/329542/1

diff --git a/composer.json b/composer.json
index fa55f4f..d6a3181 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,7 @@
 "cogpowered/finediff": "0.*",
 "wikimedia/donation-interface": "dev-master",
 "wikimedia/smash-pig": "dev-master",
-"phpmailer/phpmailer": "5.2.19",
+"phpmailer/phpmailer": "5.2.21",
 "phpseclib/phpseclib": "0.3.7",
 "predis/predis": "1.*",
 "twig/twig": "1.*"
diff --git a/composer.lock b/composer.lock
index 30ab830..9f798f1 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
 "Read more about it at 
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
 "This file is @generated automatically"
 ],
-"hash": "cec6275ac424c446d05c52716f6274f5",
-"content-hash": "91931727db11a0b3a078b4c4401f5b5f",
+"hash": "c2a08d033ae69a5ecbae72fdbe929a2a",
+"content-hash": "824641a9a433422fd2773d67876f5d7b",
 "packages": [
 {
 "name": "amzn/login-and-pay-with-amazon-sdk-php",
@@ -449,16 +449,16 @@
 },
 {
 "name": "phpmailer/phpmailer",
-"version": "v5.2.19",
+"version": "v5.2.21",
 "source": {
 "type": "git",
 "url": "https://github.com/PHPMailer/PHPMailer.git;,
-"reference": "9e4b8fb3deb7d9cfa515c04cec41f71bc37ce9a9"
+"reference": "1d51856b76c06fc687fcd9180efa7a0bed0d761e"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/PHPMailer/PHPMailer/zipball/9e4b8fb3deb7d9cfa515c04cec41f71bc37ce9a9;,
-"reference": "9e4b8fb3deb7d9cfa515c04cec41f71bc37ce9a9",
+"url": 
"https://api.github.com/repos/PHPMailer/PHPMailer/zipball/1d51856b76c06fc687fcd9180efa7a0bed0d761e;,
+"reference": "1d51856b76c06fc687fcd9180efa7a0bed0d761e",
 "shasum": ""
 },
 "require": {
@@ -505,7 +505,7 @@
 }
 ],
 "description": "PHPMailer is a full-featured email creation and 
transfer class for PHP",
-"time": "2016-12-26 10:09:10"
+"time": "2016-12-28 15:35:48"
 },
 {
 "name": "phpseclib/phpseclib",
diff --git a/vendor b/vendor
index c4dc0ee..b2361e3 16
--- a/vendor
+++ b/vendor
@@ -1 +1 @@
-Subproject commit c4dc0eedce0c888a7d1632aa91b30d2b5722b0fa
+Subproject commit b2361e31226d29606b1e759debf0f8fdfd96

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2a841615cc52517d59a630a2f74b0132449df987
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Awight 

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

[MediaWiki-commits] [Gerrit] mediawiki...FanBoxes[master]: Make desc more i18n friendly, consistent tabbing

2016-12-28 Thread SamanthaNguyen (Code Review)

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

Change subject: Make desc more i18n friendly, consistent tabbing
..

Make desc more i18n friendly, consistent tabbing

Change-Id: I4b312ef20aee55f8753addb0ad2b4e0de0f654f2
---
M extension.json
M i18n/en.json
M package.json
3 files changed, 14 insertions(+), 13 deletions(-)


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

diff --git a/extension.json b/extension.json
index 5f1ea0d..afa860b 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
-   "name": "FanBox",
-   "version": "3.2.3",
+   "name": "FanBoxes",
+   "version": "3.2.4",
"author": [
"Aaron Wright",
"David Pean",
@@ -9,7 +9,7 @@
],
"license-name": "GPL-2.0+",
"url": "https://www.mediawiki.org/wiki/Extension:FanBoxes;,
-   "description": "A new way of creating and using userboxes, based on 
special pages",
+   "descriptionmsg": "fanbox-desc",
"type": "other",
"config": {
"FanBoxPageDisplay": {
diff --git a/i18n/en.json b/i18n/en.json
index a2fa18d..5e86541 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -5,6 +5,7 @@
"David Pean "
]
},
+   "fanbox-desc": "A new way of creating and using userboxes, based on 
special pages",
"fanbox-add": "Add",
"fanbox-addtext": "Add text",
"fanbox-categories-help": "Categories help organize information on the 
site. To add multiple categories seperate them by commas.",
@@ -75,4 +76,4 @@
"fanbox-top-list-is-empty": "There are no top userboxes yet. 
[[Special:UserBoxes|Create a userbox!]]",
"right-create-userbox": "Create user boxes via [[Special:UserBoxes]]",
"action-create-userbox": "create user boxes via [[Special:UserBoxes]]"
-}
\ No newline at end of file
+}
diff --git a/package.json b/package.json
index a0b255c..0649e7d 100644
--- a/package.json
+++ b/package.json
@@ -1,11 +1,11 @@
 {
-  "scripts": {
-"test": "grunt test"
-  },
-  "devDependencies": {
-"grunt": "0.4.5",
-"grunt-cli": "0.1.13",
-"grunt-contrib-jshint": "1.0.0",
-"grunt-jsonlint": "1.0.7"
-  }
+   "scripts": {
+   "test": "grunt test"
+   },
+   "devDependencies": {
+   "grunt": "0.4.5",
+   "grunt-cli": "0.1.13",
+   "grunt-contrib-jshint": "1.0.0",
+   "grunt-jsonlint": "1.0.7"
+   }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4b312ef20aee55f8753addb0ad2b4e0de0f654f2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FanBoxes
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Fix and remove invalid @covers tags

2016-12-28 Thread jenkins-bot (Code Review)

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

Change subject: Fix and remove invalid @covers tags
..


Fix and remove invalid @covers tags

I'm removing @covers tags with file names. This is not supported by
PHPUnit. Having these lines of documentation is not worth much (you
can tell from the class name what is tested), but are actually blocking
PHPUnit from creating coverage reports.

Change-Id: Icbdb444338533774c0549d949c4a9ce3e60e6027
---
M client/tests/phpunit/includes/DispatchingServiceWiringTest.php
M client/tests/phpunit/includes/Store/RepositoryServiceWiringTest.php
M lib/tests/phpunit/EntityTypesTest.php
M lib/tests/phpunit/Formatters/CommonsThumbnailFormatterTest.php
M lib/tests/phpunit/Store/DispatchingTermBufferTest.php
M lib/tests/phpunit/Store/HttpUrlPropertyOrderProviderTest.php
M lib/tests/phpunit/Store/MockPropertyInfoStoreTest.php
M lib/tests/phpunit/Store/WikiPagePropertyOrderProviderTest.php
M lib/tests/phpunit/Units/UnitStorageTest.php
M repo/tests/phpunit/includes/Actions/ViewEntityActionTest.php
M repo/tests/phpunit/includes/EntityTypesTest.php
M repo/tests/phpunit/includes/Store/Sql/WikiPageEntityStoreTest.php
12 files changed, 10 insertions(+), 16 deletions(-)

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



diff --git a/client/tests/phpunit/includes/DispatchingServiceWiringTest.php 
b/client/tests/phpunit/includes/DispatchingServiceWiringTest.php
index 0bca974..fc539ad 100644
--- a/client/tests/phpunit/includes/DispatchingServiceWiringTest.php
+++ b/client/tests/phpunit/includes/DispatchingServiceWiringTest.php
@@ -8,8 +8,6 @@
 use Wikibase\Lib\Store\EntityRevisionLookup;
 
 /**
- * @covers client/includes/DispatchingServiceWiring.php
- *
  * @group Wikibase
  * @group WikibaseClient
  *
diff --git 
a/client/tests/phpunit/includes/Store/RepositoryServiceWiringTest.php 
b/client/tests/phpunit/includes/Store/RepositoryServiceWiringTest.php
index 2a4efed..ee4dc3b 100644
--- a/client/tests/phpunit/includes/Store/RepositoryServiceWiringTest.php
+++ b/client/tests/phpunit/includes/Store/RepositoryServiceWiringTest.php
@@ -11,8 +11,6 @@
 use Wikibase\TermIndex;
 
 /**
- * @covers client/includes/Store/RepositoryServiceWiring.php
- *
  * @group Wikibase
  * @group WikibaseClient
  *
diff --git a/lib/tests/phpunit/EntityTypesTest.php 
b/lib/tests/phpunit/EntityTypesTest.php
index 1b49cc7..f9f28d7 100644
--- a/lib/tests/phpunit/EntityTypesTest.php
+++ b/lib/tests/phpunit/EntityTypesTest.php
@@ -9,8 +9,6 @@
 use Wikibase\DataModel\SerializerFactory;
 
 /**
- * @covers WikibaseLib.entitytypes.php
- *
  * @group Wikibase
  * @group WikibaseLib
  *
diff --git a/lib/tests/phpunit/Formatters/CommonsThumbnailFormatterTest.php 
b/lib/tests/phpunit/Formatters/CommonsThumbnailFormatterTest.php
index 954a6ec..d39d378 100644
--- a/lib/tests/phpunit/Formatters/CommonsThumbnailFormatterTest.php
+++ b/lib/tests/phpunit/Formatters/CommonsThumbnailFormatterTest.php
@@ -9,7 +9,7 @@
 use Wikibase\Lib\Formatters\CommonsThumbnailFormatter;
 
 /**
- * @covers Wikibase\Lib\CommonsThumbnailFormatter
+ * @covers Wikibase\Lib\Formatters\CommonsThumbnailFormatter
  *
  * @group ValueFormatters
  * @group WikibaseLib
diff --git a/lib/tests/phpunit/Store/DispatchingTermBufferTest.php 
b/lib/tests/phpunit/Store/DispatchingTermBufferTest.php
index b678195..17146f6 100644
--- a/lib/tests/phpunit/Store/DispatchingTermBufferTest.php
+++ b/lib/tests/phpunit/Store/DispatchingTermBufferTest.php
@@ -10,7 +10,7 @@
 use Wikimedia\Assert\ParameterAssertionException;
 
 /**
- * @covers Wikibase\Store\DispatchingTermBuffer
+ * @covers Wikibase\Lib\Store\DispatchingTermBuffer
  *
  * @group Wikibase
  * @group WikibaseLib
diff --git a/lib/tests/phpunit/Store/HttpUrlPropertyOrderProviderTest.php 
b/lib/tests/phpunit/Store/HttpUrlPropertyOrderProviderTest.php
index fe89afa..80e4795 100644
--- a/lib/tests/phpunit/Store/HttpUrlPropertyOrderProviderTest.php
+++ b/lib/tests/phpunit/Store/HttpUrlPropertyOrderProviderTest.php
@@ -6,7 +6,7 @@
 use Wikibase\Lib\Store\HttpUrlPropertyOrderProvider;
 
 /**
- * @covers Wikibase\Store\HttpUrlPropertyOrderProvider
+ * @covers Wikibase\Lib\Store\HttpUrlPropertyOrderProvider
  *
  * @group Wikibase
  * @group WikibaseLib
diff --git a/lib/tests/phpunit/Store/MockPropertyInfoStoreTest.php 
b/lib/tests/phpunit/Store/MockPropertyInfoStoreTest.php
index 51195de..0e7ceae 100644
--- a/lib/tests/phpunit/Store/MockPropertyInfoStoreTest.php
+++ b/lib/tests/phpunit/Store/MockPropertyInfoStoreTest.php
@@ -5,7 +5,7 @@
 use Wikibase\DataModel\Entity\PropertyId;
 
 /**
- * @covers Wikibase\Test\MockPropertyInfoStore
+ * @covers Wikibase\Lib\Tests\Store\MockPropertyInfoStore
  *
  * @since 0.4
  *
diff --git a/lib/tests/phpunit/Store/WikiPagePropertyOrderProviderTest.php 
b/lib/tests/phpunit/Store/WikiPagePropertyOrderProviderTest.php
index bf5b5c1..5d74762 100644
---

[MediaWiki-commits] [Gerrit] mediawiki...PageForms[master]: Superfluous \n in PageForms changes how checkboxes render in...

2016-12-28 Thread jenkins-bot (Code Review)

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

Change subject: Superfluous \n in PageForms changes how checkboxes render in a 
table
..


Superfluous \n in PageForms changes how checkboxes render in a table

Full explanation on bug.

Bug: T154259
Change-Id: I286a40ef3f33c15552f6ea5bb9abb4e963935acb
---
M includes/forminputs/PF_CheckboxesInput.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/forminputs/PF_CheckboxesInput.php 
b/includes/forminputs/PF_CheckboxesInput.php
index 69f89ba..308b8e8 100644
--- a/includes/forminputs/PF_CheckboxesInput.php
+++ b/includes/forminputs/PF_CheckboxesInput.php
@@ -89,7 +89,7 @@
$text .= "\t" . Html::rawElement( 'label',
array( 'class' => $labelClass ),
$checkbox_input . '' . $label
-   ) . "\n";
+   ) . " ";
$wgPageFormsTabIndex++;
$wgPageFormsFieldNum++;
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I286a40ef3f33c15552f6ea5bb9abb4e963935acb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageForms
Gerrit-Branch: master
Gerrit-Owner: MarkAHershberger 
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...PageForms[master]: Fix E_NOTICE

2016-12-28 Thread Yaron Koren (Code Review)

Yaron Koren has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329538 )

Change subject: Fix E_NOTICE
..


Fix E_NOTICE

Bug: T154257
Change-Id: I72072dc16c0700e13e8ca8ced8aa116220e1f650
---
M includes/PF_FormPrinter.php
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/includes/PF_FormPrinter.php b/includes/PF_FormPrinter.php
index 7a9830b..74d66f1 100644
--- a/includes/PF_FormPrinter.php
+++ b/includes/PF_FormPrinter.php
@@ -828,6 +828,7 @@
// 
=
// for template processing
// 
=
+   $template_name = "";
if ( $tag_title == 'for template' ) {
if ( $tif ) {
$previous_template_name = 
$tif->getTemplateName();
@@ -944,7 +945,7 @@
// the fields that 
weren't
// handled by the form.
$cur_value = 
$tif->getAndRemoveValueFromPageForField( $field_name );
- 
+
// If the field is a 
placeholder, the contents of this template
// parameter should be 
treated as elements parsed by an another
// multiple template 
form.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I72072dc16c0700e13e8ca8ced8aa116220e1f650
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageForms
Gerrit-Branch: master
Gerrit-Owner: MarkAHershberger 
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...PageForms[master]: Superfluous \n in PageForms changes how checkboxes render in...

2016-12-28 Thread MarkAHershberger (Code Review)

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

Change subject: Superfluous \n in PageForms changes how checkboxes render in a 
table
..

Superfluous \n in PageForms changes how checkboxes render in a table

Full explanation on bug.

Bug: T154259
Change-Id: I286a40ef3f33c15552f6ea5bb9abb4e963935acb
---
M includes/forminputs/PF_CheckboxesInput.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/includes/forminputs/PF_CheckboxesInput.php 
b/includes/forminputs/PF_CheckboxesInput.php
index 69f89ba..308b8e8 100644
--- a/includes/forminputs/PF_CheckboxesInput.php
+++ b/includes/forminputs/PF_CheckboxesInput.php
@@ -89,7 +89,7 @@
$text .= "\t" . Html::rawElement( 'label',
array( 'class' => $labelClass ),
$checkbox_input . '' . $label
-   ) . "\n";
+   ) . " ";
$wgPageFormsTabIndex++;
$wgPageFormsFieldNum++;
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I286a40ef3f33c15552f6ea5bb9abb4e963935acb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageForms
Gerrit-Branch: master
Gerrit-Owner: MarkAHershberger 

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Fix and add missing PHPDoc lines

2016-12-28 Thread jenkins-bot (Code Review)

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

Change subject: Fix and add missing PHPDoc lines
..


Fix and add missing PHPDoc lines

I also found a chunk of entirely unused code this way.

Everything in this patch should be super trivial and obvious. If you
disagree, then please tell me and I will split this patch into
multiple ones.

Change-Id: If6bd8bba2132d029812f31acbd3f427a93871c6e
---
M client/includes/DispatchingServiceFactory.php
M client/includes/Hooks/InterwikiSortingHookHandlers.php
M client/includes/Notifications/PageConnectionPresentationModel.php
M 
client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseEntityLibraryTest.php
M client/tests/phpunit/includes/Hooks/EchoNotificationsHandlersTest.php
M lib/includes/Store/PropertyInfoLookup.php
M lib/includes/Store/Sql/SqlEntityInfoBuilder.php
M repo/includes/Api/RemoveQualifiers.php
M repo/includes/Api/SetAliases.php
M repo/includes/Api/SetSiteLink.php
M repo/includes/ChangeOp/ChangeOpAliases.php
M repo/includes/ChangeOp/ChangeOpDescription.php
M repo/includes/ChangeOp/ChangeOpMainSnak.php
M repo/includes/ChangeOp/ChangeOpQualifier.php
M repo/includes/ChangeOp/ChangeOpQualifierRemove.php
M repo/includes/ChangeOp/ChangeOpReference.php
M repo/includes/ChangeOp/ChangeOpReferenceRemove.php
M repo/includes/ChangeOp/ChangeOpSiteLink.php
M repo/includes/ChangeOp/ChangeOpStatementRank.php
M repo/includes/MediaWikiLanguageDirectionalityLookup.php
M repo/includes/Parsers/MwTimeIsoParser.php
M repo/includes/Specials/SpecialNewProperty.php
M repo/includes/Store/Sql/EntityPerPageTable.php
M repo/tests/phpunit/includes/Specials/SpecialItemByTitleTest.php
M view/resources/wikibase/view/ViewFactory.js
25 files changed, 89 insertions(+), 29 deletions(-)

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



diff --git a/client/includes/DispatchingServiceFactory.php 
b/client/includes/DispatchingServiceFactory.php
index 59d857b..03d31cb 100644
--- a/client/includes/DispatchingServiceFactory.php
+++ b/client/includes/DispatchingServiceFactory.php
@@ -75,7 +75,11 @@
 
/**
 * Returns a map of id prefix mappings defined for configured foreign 
repositories.
-* @return array Associative array mapping repository names to 
repository-specific prefix mapping
+*
+* @param array[] $settings
+*
+* @return array[] Associative array mapping repository names to 
repository-specific prefix
+*  mapping.
 */
private function getIdPrefixMaps( array $settings ) {
$mappings = [];
diff --git a/client/includes/Hooks/InterwikiSortingHookHandlers.php 
b/client/includes/Hooks/InterwikiSortingHookHandlers.php
index a7319cf..c2736ad 100644
--- a/client/includes/Hooks/InterwikiSortingHookHandlers.php
+++ b/client/includes/Hooks/InterwikiSortingHookHandlers.php
@@ -36,7 +36,7 @@
private $alwaysSort;
 
/**
-* @return InterwikiSortingConfig
+* @return self
 */
public static function newFromGlobalState() {
$wikibaseClient = WikibaseClient::getDefaultInstance();
@@ -57,7 +57,7 @@
 * @param Config $config
 * @param NamespaceChecker $namespaceChecker
 *
-* @return InterwikiSortingHookHandlers
+* @return self
 */
public static function newFromInterwikiSortingConfig(
Config $config,
@@ -69,7 +69,7 @@
$config->get( 'InterwikiSortingSortPrepend' )
);
 
-   return new InterwikiSortingHookHandlers(
+   return new self(
$interwikiSorter,
$namespaceChecker,
$config->get( 'InterwikiSortingAlwaysSort' )
@@ -80,7 +80,7 @@
 * @param SettingsArray $settings
 * @param NamespaceChecker $namespaceChecker
 *
-* @return InterwikiSortingHookHandlers
+* @return self
 */
public static function newFromWikibaseConfig(
SettingsArray $settings,
@@ -92,7 +92,7 @@
$settings->getSetting( 'sortPrepend' )
);
 
-   return new InterwikiSortingHookHandlers(
+   return new self(
$interwikiSorter,
$namespaceChecker,
$settings->getSetting( 'alwaysSort' )
diff --git a/client/includes/Notifications/PageConnectionPresentationModel.php 
b/client/includes/Notifications/PageConnectionPresentationModel.php
index bfa33dc..2d34b9a 100644
--- a/client/includes/Notifications/PageConnectionPresentationModel.php
+++ b/client/includes/Notifications/PageConnectionPresentationModel.php
@@ -18,7 +18,8 @@
 class PageConnectionPresentationModel extends EchoEventPresentationModel {
 
/**
-* @param EchoEvent
+

[MediaWiki-commits] [Gerrit] mediawiki...PageForms[master]: Fix E_NOTICE

2016-12-28 Thread MarkAHershberger (Code Review)

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

Change subject: Fix E_NOTICE
..

Fix E_NOTICE

Bug: T154257
Change-Id: I72072dc16c0700e13e8ca8ced8aa116220e1f650
---
M includes/PF_FormPrinter.php
1 file changed, 2 insertions(+), 1 deletion(-)


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

diff --git a/includes/PF_FormPrinter.php b/includes/PF_FormPrinter.php
index 7a9830b..74d66f1 100644
--- a/includes/PF_FormPrinter.php
+++ b/includes/PF_FormPrinter.php
@@ -828,6 +828,7 @@
// 
=
// for template processing
// 
=
+   $template_name = "";
if ( $tag_title == 'for template' ) {
if ( $tif ) {
$previous_template_name = 
$tif->getTemplateName();
@@ -944,7 +945,7 @@
// the fields that 
weren't
// handled by the form.
$cur_value = 
$tif->getAndRemoveValueFromPageForField( $field_name );
- 
+
// If the field is a 
placeholder, the contents of this template
// parameter should be 
treated as elements parsed by an another
// multiple template 
form.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I72072dc16c0700e13e8ca8ced8aa116220e1f650
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageForms
Gerrit-Branch: master
Gerrit-Owner: MarkAHershberger 

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

[MediaWiki-commits] [Gerrit] mediawiki...MediaWikiChat[master]: Change the loading dots to a GIF

2016-12-28 Thread jenkins-bot (Code Review)

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

Change subject: Change the loading dots to a GIF
..


Change the loading dots to a GIF

Bug:T147270
Change-Id: I5b9c7f071978a96b18dae8e4a7ef17cf2c2350fc
---
M MediaWikiChat.js
M SpecialChat.php
M SpecialChat.template.php
M extension.json
4 files changed, 5 insertions(+), 19 deletions(-)

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



diff --git a/MediaWikiChat.js b/MediaWikiChat.js
index 19c876c..d53930b 100644
--- a/MediaWikiChat.js
+++ b/MediaWikiChat.js
@@ -705,23 +705,10 @@
}
window.clearInterval( MediaWikiChat.pollInterval );
MediaWikiChat.pollInterval = setInterval( MediaWikiChat.getNew, 
interval );
-   },
-
-   loadingBackground: function() {
-   $( '#mwchat-loading-3' ).animate( { opacity: 1 } );
-   $( '#mwchat-loading-2' ).animate( { opacity: 0 }, function() {
-   $( '#mwchat-loading-3' ).animate( { opacity: 0 } );
-   $( '#mwchat-loading-1' ).animate( { opacity: 1 }, 
function() {
-   $( '#mwchat-loading-2' ).animate( { opacity: 1 
} );
-   $( '#mwchat-loading-1' ).animate( { opacity: 0 
}, MediaWikiChat.loadingBackground );
-   });
-   });
}
 };
 
 $( document ).ready( function() {
-   MediaWikiChat.loadingBackground();
-
$( $( '#mwchat-type input' )[0] ).keydown( function( e ) { // Send text
MediaWikiChat.clearMentions();
 
diff --git a/SpecialChat.php b/SpecialChat.php
index 2df2aeb..9876e4c 100644
--- a/SpecialChat.php
+++ b/SpecialChat.php
@@ -38,8 +38,9 @@
 
// Load modules via ResourceLoader
$modules = array(
-   'ext.mediawikichat.css',
-   'ext.mediawikichat.js',
+   'ext.mediawikichat.css',
+   'ext.mediawikichat.js',
+   'mediawiki.feedback' // for the loading gif
);
$out->addModules( $modules );
 
diff --git a/SpecialChat.template.php b/SpecialChat.template.php
index 09fd7b2..1955e24 100644
--- a/SpecialChat.template.php
+++ b/SpecialChat.template.php
@@ -29,9 +29,7 @@



-   
-   
-   
+   



diff --git a/extension.json b/extension.json
index 74a70ce..41bb56c 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "MediaWikiChat",
-   "version": "2.17.4",
+   "version": "2.17.5",
"author": [
"Adam Carter/UltrasonicNXT"
],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5b9c7f071978a96b18dae8e4a7ef17cf2c2350fc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MediaWikiChat
Gerrit-Branch: master
Gerrit-Owner: UltrasonicNXT 
Gerrit-Reviewer: UltrasonicNXT 
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...MediaWikiChat[master]: Change the loading dots to a GIF

2016-12-28 Thread UltrasonicNXT (Code Review)

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

Change subject: Change the loading dots to a GIF
..

Change the loading dots to a GIF

Bug:T147270
Change-Id: I5b9c7f071978a96b18dae8e4a7ef17cf2c2350fc
---
M MediaWikiChat.js
M SpecialChat.php
M SpecialChat.template.php
M extension.json
4 files changed, 5 insertions(+), 19 deletions(-)


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

diff --git a/MediaWikiChat.js b/MediaWikiChat.js
index 19c876c..d53930b 100644
--- a/MediaWikiChat.js
+++ b/MediaWikiChat.js
@@ -705,23 +705,10 @@
}
window.clearInterval( MediaWikiChat.pollInterval );
MediaWikiChat.pollInterval = setInterval( MediaWikiChat.getNew, 
interval );
-   },
-
-   loadingBackground: function() {
-   $( '#mwchat-loading-3' ).animate( { opacity: 1 } );
-   $( '#mwchat-loading-2' ).animate( { opacity: 0 }, function() {
-   $( '#mwchat-loading-3' ).animate( { opacity: 0 } );
-   $( '#mwchat-loading-1' ).animate( { opacity: 1 }, 
function() {
-   $( '#mwchat-loading-2' ).animate( { opacity: 1 
} );
-   $( '#mwchat-loading-1' ).animate( { opacity: 0 
}, MediaWikiChat.loadingBackground );
-   });
-   });
}
 };
 
 $( document ).ready( function() {
-   MediaWikiChat.loadingBackground();
-
$( $( '#mwchat-type input' )[0] ).keydown( function( e ) { // Send text
MediaWikiChat.clearMentions();
 
diff --git a/SpecialChat.php b/SpecialChat.php
index 2df2aeb..9876e4c 100644
--- a/SpecialChat.php
+++ b/SpecialChat.php
@@ -38,8 +38,9 @@
 
// Load modules via ResourceLoader
$modules = array(
-   'ext.mediawikichat.css',
-   'ext.mediawikichat.js',
+   'ext.mediawikichat.css',
+   'ext.mediawikichat.js',
+   'mediawiki.feedback' // for the loading gif
);
$out->addModules( $modules );
 
diff --git a/SpecialChat.template.php b/SpecialChat.template.php
index 09fd7b2..1955e24 100644
--- a/SpecialChat.template.php
+++ b/SpecialChat.template.php
@@ -29,9 +29,7 @@



-   
-   
-   
+   



diff --git a/extension.json b/extension.json
index 74a70ce..41bb56c 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "MediaWikiChat",
-   "version": "2.17.4",
+   "version": "2.17.5",
"author": [
"Adam Carter/UltrasonicNXT"
],

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5b9c7f071978a96b18dae8e4a7ef17cf2c2350fc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MediaWikiChat
Gerrit-Branch: master
Gerrit-Owner: UltrasonicNXT 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[fundraising/REL1_27]: update DonationInterface submodule

2016-12-28 Thread jenkins-bot (Code Review)

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

Change subject: update DonationInterface submodule
..


update DonationInterface submodule

Change-Id: I441aa0e1a098becaa592920833b6977f550a0e15
---
M extensions/DonationInterface
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/extensions/DonationInterface b/extensions/DonationInterface
index ea03d94..5edaa17 16
--- a/extensions/DonationInterface
+++ b/extensions/DonationInterface
@@ -1 +1 @@
-Subproject commit ea03d946fec317ab4e382db1854d826633e909e8
+Subproject commit 5edaa173de13b1a5227915af2fb630d3a5699b9e

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I441aa0e1a098becaa592920833b6977f550a0e15
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: fundraising/REL1_27
Gerrit-Owner: Cdentinger 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Cdentinger 
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[fundraising/REL1_27]: update DonationInterface submodule

2016-12-28 Thread Cdentinger (Code Review)

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

Change subject: update DonationInterface submodule
..

update DonationInterface submodule

Change-Id: I441aa0e1a098becaa592920833b6977f550a0e15
---
M extensions/DonationInterface
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/36/329536/1

diff --git a/extensions/DonationInterface b/extensions/DonationInterface
index ea03d94..5edaa17 16
--- a/extensions/DonationInterface
+++ b/extensions/DonationInterface
@@ -1 +1 @@
-Subproject commit ea03d946fec317ab4e382db1854d826633e909e8
+Subproject commit 5edaa173de13b1a5227915af2fb630d3a5699b9e

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I441aa0e1a098becaa592920833b6977f550a0e15
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: fundraising/REL1_27
Gerrit-Owner: Cdentinger 

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

[MediaWiki-commits] [Gerrit] mediawiki...vendor[master]: Update phpmailer (and restore smash-pig)

2016-12-28 Thread Cdentinger (Code Review)

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

Change subject: Update phpmailer (and restore smash-pig)
..


Update phpmailer (and restore smash-pig)

Make smash-pig match composer.lock

Change-Id: I83d210e8c9f8720e3fea22111b411e6f87df4053
---
M composer/LICENSE
M composer/autoload_classmap.php
M composer/installed.json
D phpmailer/phpmailer/.gitignore
D phpmailer/phpmailer/.scrutinizer.yml
D phpmailer/phpmailer/.travis.yml
D phpmailer/phpmailer/README.md
M phpmailer/phpmailer/VERSION
D phpmailer/phpmailer/changelog.md
M phpmailer/phpmailer/class.phpmailer.php
M phpmailer/phpmailer/class.phpmaileroauth.php
M phpmailer/phpmailer/class.pop3.php
M phpmailer/phpmailer/class.smtp.php
M phpmailer/phpmailer/composer.lock
D phpmailer/phpmailer/docs/Callback_function_notes.txt
D phpmailer/phpmailer/docs/DomainKeys_notes.txt
D phpmailer/phpmailer/docs/Note_for_SMTP_debugging.txt
D phpmailer/phpmailer/docs/extending.html
D phpmailer/phpmailer/docs/faq.html
D phpmailer/phpmailer/docs/generatedocs.sh
D phpmailer/phpmailer/docs/pop3_article.txt
M phpmailer/phpmailer/examples/scripts/shLegacy.js
M phpmailer/phpmailer/examples/smtp_check.phps
M phpmailer/phpmailer/extras/htmlfilter.php
M phpmailer/phpmailer/extras/ntlm_sasl_client.php
R phpmailer/phpmailer/language/phpmailer.lang-cs.php
R phpmailer/phpmailer/language/phpmailer.lang-da.php
M phpmailer/phpmailer/language/phpmailer.lang-de.php
M phpmailer/phpmailer/language/phpmailer.lang-es.php
R phpmailer/phpmailer/language/phpmailer.lang-nb.php
R phpmailer/phpmailer/language/phpmailer.lang-pt_br.php
M phpmailer/phpmailer/language/phpmailer.lang-ro.php
R phpmailer/phpmailer/language/phpmailer.lang-sv.php
D phpmailer/phpmailer/test/bootstrap.php
D phpmailer/phpmailer/test/fakepopserver.sh
D phpmailer/phpmailer/test/fakesendmail.sh
D phpmailer/phpmailer/test/phpmailerLangTest.php
D phpmailer/phpmailer/test/phpmailerTest.php
D phpmailer/phpmailer/test/runfakepopserver.sh
D phpmailer/phpmailer/test/test_callback.php
D phpmailer/phpmailer/test/testbootstrap-dist.php
D phpmailer/phpmailer/travis.phpunit.xml.dist
M wikimedia/smash-pig/Core/DataStores/PaymentsInitialDatabase.php
M wikimedia/smash-pig/Core/DataStores/PendingDatabase.php
M wikimedia/smash-pig/Core/Jobs/DeletePendingJob.php
M wikimedia/smash-pig/Core/Listeners/ListenerBase.php
M wikimedia/smash-pig/Core/QueueConsumers/PendingQueueConsumer.php
A wikimedia/smash-pig/CrmLink/Messages/DonationInterfaceAntifraud.php
D wikimedia/smash-pig/CrmLink/Messages/DonationInterfaceAntifraudFactory.php
M wikimedia/smash-pig/Maintenance/ConsumePendingQueue.php
M wikimedia/smash-pig/Maintenance/CreateIpnMessagesFromPendingDb.php
M wikimedia/smash-pig/Maintenance/MaintenanceBase.php
M wikimedia/smash-pig/PaymentProviders/Adyen/AdyenListener.php
M wikimedia/smash-pig/PaymentProviders/Adyen/Jobs/ProcessCaptureRequestJob.php
M wikimedia/smash-pig/PaymentProviders/Adyen/Jobs/RecordCaptureJob.php
M wikimedia/smash-pig/PaymentProviders/Adyen/Tests/AdyenTestConfiguration.php
M wikimedia/smash-pig/PaymentProviders/Adyen/Tests/config_test.yaml
M wikimedia/smash-pig/PaymentProviders/Adyen/Tests/phpunit/CaptureJobTest.php
M 
wikimedia/smash-pig/PaymentProviders/Adyen/Tests/phpunit/RecordCaptureJobTest.php
M 
wikimedia/smash-pig/PaymentProviders/Amazon/ExpatriatedMessages/PaymentCapture.php
M 
wikimedia/smash-pig/PaymentProviders/AstroPay/ExpatriatedMessages/AstroPayMessage.php
M wikimedia/smash-pig/Schema/mysql/001_CreatePendingTable.sql
M wikimedia/smash-pig/Schema/mysql/002_CreateDamagedTable.sql
M wikimedia/smash-pig/Schema/mysql/003_CreatePaymentsInitialTable.sql
M wikimedia/smash-pig/Schema/sqlite/001_CreatePendingTable.sql
M wikimedia/smash-pig/Schema/sqlite/002_CreateDamagedTable.sql
M wikimedia/smash-pig/Schema/sqlite/003_CreatePaymentsInitialTable.sql
M wikimedia/smash-pig/SmashPig.yaml
M wikimedia/smash-pig/Tests/MessageTest.php
M wikimedia/smash-pig/Tests/PendingQueueConsumerTest.php
70 files changed, 874 insertions(+), 4,527 deletions(-)

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: I83d210e8c9f8720e3fea22111b411e6f87df4053
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface/vendor
Gerrit-Branch: master
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Siebrand 

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

[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[deployment]: Merge branch 'master' into deployment

2016-12-28 Thread jenkins-bot (Code Review)

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

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

And update vendor

e1e7c42 Localisation updates from https://translatewiki.net.
c4729eb Localisation updates from https://translatewiki.net.
951d084 Adyen iframe form fields should be white on mobile
ef776f2 Add 'maxlength' attributes to personal info fields
01069be Localisation updates from https://translatewiki.net.
65c6d0f Localisation updates from https://translatewiki.net.
2de0945 Localisation updates from https://translatewiki.net.
6823f20 update composer.lock
81061a5 Revert "update composer.lock"
4fca4ba Update (only) phpmailer in composer.lock

Change-Id: Ia975d6f47d1295fac02e2035f9f40e1ef55663bc
---
M composer.lock
M vendor
2 files changed, 53 insertions(+), 4 deletions(-)

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



diff --git a/composer.lock b/composer.lock
index f1f8c44..e18e257 100644
--- a/composer.lock
+++ b/composer.lock
@@ -198,6 +198,7 @@
 "messaging",
 "stomp"
 ],
+"abandoned": "stomp-php/stomp-php",
 "time": "2013-02-23 17:34:44"
 },
 {
@@ -886,7 +887,7 @@
 "source": {
 "type": "git",
 "url": 
"https://gerrit.wikimedia.org/r/wikimedia/fundraising/SmashPig.git;,
-"reference": "61f47be34b4c8ade307bf218b84c55966a8e4acb"
+"reference": "8625a3502c2f7f48b6ed0e388d95b35a6398ad9f"
 },
 "require": {
 "amzn/login-and-pay-with-amazon-sdk-php": "dev-master",
@@ -937,7 +938,7 @@
 "donations",
 "payments"
 ],
-"time": "2016-09-15 00:32:38"
+"time": "2016-09-13 18:34:33"
 },
 {
 "name": "zordius/lightncandy",
@@ -987,7 +988,55 @@
 "time": "2015-11-05 07:14:57"
 }
 ],
-"packages-dev": null,
+"packages-dev": [
+{
+"name": "jakub-onderka/php-parallel-lint",
+"version": "v0.9.2",
+"source": {
+"type": "git",
+"url": "https://github.com/JakubOnderka/PHP-Parallel-Lint.git;,
+"reference": "2ead2e4043ab125bee9554f356e0a86742c2d4fa"
+},
+"dist": {
+"type": "zip",
+"url": 
"https://api.github.com/repos/JakubOnderka/PHP-Parallel-Lint/zipball/2ead2e4043ab125bee9554f356e0a86742c2d4fa;,
+"reference": "2ead2e4043ab125bee9554f356e0a86742c2d4fa",
+"shasum": ""
+},
+"require": {
+"php": ">=5.3.3"
+},
+"require-dev": {
+"jakub-onderka/php-console-highlighter": "~0.3",
+"nette/tester": "~1.3"
+},
+"suggest": {
+"jakub-onderka/php-console-highlighter": "Highlight syntax in 
code snippet"
+},
+"bin": [
+"parallel-lint"
+],
+"type": "library",
+"autoload": {
+"classmap": [
+"./"
+]
+},
+"notification-url": "https://packagist.org/downloads/;,
+"license": [
+"BSD-2-Clause"
+],
+"authors": [
+{
+"name": "Jakub Onderka",
+"email": "jakub.onde...@gmail.com"
+}
+],
+"description": "This tool check syntax of PHP files about 20x 
faster than serial check.",
+"homepage": "https://github.com/JakubOnderka/PHP-Parallel-Lint;,
+"time": "2015-12-15 10:42:16"
+}
+],
 "aliases": [],
 "minimum-stability": "stable",
 "stability-flags": {
diff --git a/vendor b/vendor
index 4707185..78065ce 16
--- a/vendor
+++ b/vendor
@@ -1 +1 @@
-Subproject commit 470718556c34eb7bdfd6fe095f639c2bf035f438
+Subproject commit 78065ce486209a6c6ce1bbdc3263eef27564a26e

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia975d6f47d1295fac02e2035f9f40e1ef55663bc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: AndyRussG 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Ssmith 
Gerrit-Reviewer: XenoRyet 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list

[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[deployment]: Merge branch 'master' into deployment

2016-12-28 Thread Ejegg (Code Review)

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

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

And update vendor

e1e7c42 Localisation updates from https://translatewiki.net.
c4729eb Localisation updates from https://translatewiki.net.
951d084 Adyen iframe form fields should be white on mobile
ef776f2 Add 'maxlength' attributes to personal info fields
01069be Localisation updates from https://translatewiki.net.
65c6d0f Localisation updates from https://translatewiki.net.
2de0945 Localisation updates from https://translatewiki.net.
6823f20 update composer.lock
81061a5 Revert "update composer.lock"
4fca4ba Update (only) phpmailer in composer.lock

Change-Id: Ia975d6f47d1295fac02e2035f9f40e1ef55663bc
---
M composer.lock
M vendor
2 files changed, 53 insertions(+), 4 deletions(-)


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

diff --git a/composer.lock b/composer.lock
index f1f8c44..e18e257 100644
--- a/composer.lock
+++ b/composer.lock
@@ -198,6 +198,7 @@
 "messaging",
 "stomp"
 ],
+"abandoned": "stomp-php/stomp-php",
 "time": "2013-02-23 17:34:44"
 },
 {
@@ -886,7 +887,7 @@
 "source": {
 "type": "git",
 "url": 
"https://gerrit.wikimedia.org/r/wikimedia/fundraising/SmashPig.git;,
-"reference": "61f47be34b4c8ade307bf218b84c55966a8e4acb"
+"reference": "8625a3502c2f7f48b6ed0e388d95b35a6398ad9f"
 },
 "require": {
 "amzn/login-and-pay-with-amazon-sdk-php": "dev-master",
@@ -937,7 +938,7 @@
 "donations",
 "payments"
 ],
-"time": "2016-09-15 00:32:38"
+"time": "2016-09-13 18:34:33"
 },
 {
 "name": "zordius/lightncandy",
@@ -987,7 +988,55 @@
 "time": "2015-11-05 07:14:57"
 }
 ],
-"packages-dev": null,
+"packages-dev": [
+{
+"name": "jakub-onderka/php-parallel-lint",
+"version": "v0.9.2",
+"source": {
+"type": "git",
+"url": "https://github.com/JakubOnderka/PHP-Parallel-Lint.git;,
+"reference": "2ead2e4043ab125bee9554f356e0a86742c2d4fa"
+},
+"dist": {
+"type": "zip",
+"url": 
"https://api.github.com/repos/JakubOnderka/PHP-Parallel-Lint/zipball/2ead2e4043ab125bee9554f356e0a86742c2d4fa;,
+"reference": "2ead2e4043ab125bee9554f356e0a86742c2d4fa",
+"shasum": ""
+},
+"require": {
+"php": ">=5.3.3"
+},
+"require-dev": {
+"jakub-onderka/php-console-highlighter": "~0.3",
+"nette/tester": "~1.3"
+},
+"suggest": {
+"jakub-onderka/php-console-highlighter": "Highlight syntax in 
code snippet"
+},
+"bin": [
+"parallel-lint"
+],
+"type": "library",
+"autoload": {
+"classmap": [
+"./"
+]
+},
+"notification-url": "https://packagist.org/downloads/;,
+"license": [
+"BSD-2-Clause"
+],
+"authors": [
+{
+"name": "Jakub Onderka",
+"email": "jakub.onde...@gmail.com"
+}
+],
+"description": "This tool check syntax of PHP files about 20x 
faster than serial check.",
+"homepage": "https://github.com/JakubOnderka/PHP-Parallel-Lint;,
+"time": "2015-12-15 10:42:16"
+}
+],
 "aliases": [],
 "minimum-stability": "stable",
 "stability-flags": {
diff --git a/vendor b/vendor
index 4707185..78065ce 16
--- a/vendor
+++ b/vendor
@@ -1 +1 @@
-Subproject commit 470718556c34eb7bdfd6fe095f639c2bf035f438
+Subproject commit 78065ce486209a6c6ce1bbdc3263eef27564a26e

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia975d6f47d1295fac02e2035f9f40e1ef55663bc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 

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

[MediaWiki-commits] [Gerrit] mediawiki...vendor[master]: Update phpmailer (and restore smash-pig)

2016-12-28 Thread Ejegg (Code Review)

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

Change subject: Update phpmailer (and restore smash-pig)
..

Update phpmailer (and restore smash-pig)

Make smash-pig match composer.lock

Change-Id: I83d210e8c9f8720e3fea22111b411e6f87df4053
---
M composer/LICENSE
M composer/autoload_classmap.php
M composer/installed.json
D phpmailer/phpmailer/.gitignore
D phpmailer/phpmailer/.scrutinizer.yml
D phpmailer/phpmailer/.travis.yml
D phpmailer/phpmailer/README.md
M phpmailer/phpmailer/VERSION
D phpmailer/phpmailer/changelog.md
M phpmailer/phpmailer/class.phpmailer.php
M phpmailer/phpmailer/class.phpmaileroauth.php
M phpmailer/phpmailer/class.pop3.php
M phpmailer/phpmailer/class.smtp.php
M phpmailer/phpmailer/composer.lock
D phpmailer/phpmailer/docs/Callback_function_notes.txt
D phpmailer/phpmailer/docs/DomainKeys_notes.txt
D phpmailer/phpmailer/docs/Note_for_SMTP_debugging.txt
D phpmailer/phpmailer/docs/extending.html
D phpmailer/phpmailer/docs/faq.html
D phpmailer/phpmailer/docs/generatedocs.sh
D phpmailer/phpmailer/docs/pop3_article.txt
M phpmailer/phpmailer/examples/scripts/shLegacy.js
M phpmailer/phpmailer/examples/smtp_check.phps
M phpmailer/phpmailer/extras/htmlfilter.php
M phpmailer/phpmailer/extras/ntlm_sasl_client.php
R phpmailer/phpmailer/language/phpmailer.lang-cs.php
R phpmailer/phpmailer/language/phpmailer.lang-da.php
M phpmailer/phpmailer/language/phpmailer.lang-de.php
M phpmailer/phpmailer/language/phpmailer.lang-es.php
R phpmailer/phpmailer/language/phpmailer.lang-nb.php
R phpmailer/phpmailer/language/phpmailer.lang-pt_br.php
M phpmailer/phpmailer/language/phpmailer.lang-ro.php
R phpmailer/phpmailer/language/phpmailer.lang-sv.php
D phpmailer/phpmailer/test/bootstrap.php
D phpmailer/phpmailer/test/fakepopserver.sh
D phpmailer/phpmailer/test/fakesendmail.sh
D phpmailer/phpmailer/test/phpmailerLangTest.php
D phpmailer/phpmailer/test/phpmailerTest.php
D phpmailer/phpmailer/test/runfakepopserver.sh
D phpmailer/phpmailer/test/test_callback.php
D phpmailer/phpmailer/test/testbootstrap-dist.php
D phpmailer/phpmailer/travis.phpunit.xml.dist
M wikimedia/smash-pig/Core/DataStores/PaymentsInitialDatabase.php
M wikimedia/smash-pig/Core/DataStores/PendingDatabase.php
M wikimedia/smash-pig/Core/Jobs/DeletePendingJob.php
M wikimedia/smash-pig/Core/Listeners/ListenerBase.php
M wikimedia/smash-pig/Core/QueueConsumers/PendingQueueConsumer.php
A wikimedia/smash-pig/CrmLink/Messages/DonationInterfaceAntifraud.php
D wikimedia/smash-pig/CrmLink/Messages/DonationInterfaceAntifraudFactory.php
M wikimedia/smash-pig/Maintenance/ConsumePendingQueue.php
M wikimedia/smash-pig/Maintenance/CreateIpnMessagesFromPendingDb.php
M wikimedia/smash-pig/Maintenance/MaintenanceBase.php
M wikimedia/smash-pig/PaymentProviders/Adyen/AdyenListener.php
M wikimedia/smash-pig/PaymentProviders/Adyen/Jobs/ProcessCaptureRequestJob.php
M wikimedia/smash-pig/PaymentProviders/Adyen/Jobs/RecordCaptureJob.php
M wikimedia/smash-pig/PaymentProviders/Adyen/Tests/AdyenTestConfiguration.php
M wikimedia/smash-pig/PaymentProviders/Adyen/Tests/config_test.yaml
M wikimedia/smash-pig/PaymentProviders/Adyen/Tests/phpunit/CaptureJobTest.php
M 
wikimedia/smash-pig/PaymentProviders/Adyen/Tests/phpunit/RecordCaptureJobTest.php
M 
wikimedia/smash-pig/PaymentProviders/Amazon/ExpatriatedMessages/PaymentCapture.php
M 
wikimedia/smash-pig/PaymentProviders/AstroPay/ExpatriatedMessages/AstroPayMessage.php
M wikimedia/smash-pig/Schema/mysql/001_CreatePendingTable.sql
M wikimedia/smash-pig/Schema/mysql/002_CreateDamagedTable.sql
M wikimedia/smash-pig/Schema/mysql/003_CreatePaymentsInitialTable.sql
M wikimedia/smash-pig/Schema/sqlite/001_CreatePendingTable.sql
M wikimedia/smash-pig/Schema/sqlite/002_CreateDamagedTable.sql
M wikimedia/smash-pig/Schema/sqlite/003_CreatePaymentsInitialTable.sql
M wikimedia/smash-pig/SmashPig.yaml
M wikimedia/smash-pig/Tests/MessageTest.php
M wikimedia/smash-pig/Tests/PendingQueueConsumerTest.php
70 files changed, 874 insertions(+), 4,527 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface/vendor 
refs/changes/34/329534/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I83d210e8c9f8720e3fea22111b411e6f87df4053
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface/vendor
Gerrit-Branch: master
Gerrit-Owner: Ejegg 

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

[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Update (only) phpmailer in composer.lock

2016-12-28 Thread jenkins-bot (Code Review)

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

Change subject: Update (only) phpmailer in composer.lock
..


Update (only) phpmailer in composer.lock

Change-Id: I5c278d30816cec3f7fd0c912e9a4df4dadcd6a12
---
M composer.lock
1 file changed, 5 insertions(+), 5 deletions(-)

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



diff --git a/composer.lock b/composer.lock
index ea09d7f..e18e257 100644
--- a/composer.lock
+++ b/composer.lock
@@ -398,16 +398,16 @@
 },
 {
 "name": "phpmailer/phpmailer",
-"version": "v5.2.16",
+"version": "v5.2.21",
 "source": {
 "type": "git",
 "url": "https://github.com/PHPMailer/PHPMailer.git;,
-"reference": "1d85f9ef3ecfc42bbc4f3c70d5e37ca9a65f629a"
+"reference": "1d51856b76c06fc687fcd9180efa7a0bed0d761e"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/PHPMailer/PHPMailer/zipball/1d85f9ef3ecfc42bbc4f3c70d5e37ca9a65f629a;,
-"reference": "1d85f9ef3ecfc42bbc4f3c70d5e37ca9a65f629a",
+"url": 
"https://api.github.com/repos/PHPMailer/PHPMailer/zipball/1d51856b76c06fc687fcd9180efa7a0bed0d761e;,
+"reference": "1d51856b76c06fc687fcd9180efa7a0bed0d761e",
 "shasum": ""
 },
 "require": {
@@ -454,7 +454,7 @@
 }
 ],
 "description": "PHPMailer is a full-featured email creation and 
transfer class for PHP",
-"time": "2016-06-06 09:09:37"
+"time": "2016-12-28 15:35:48"
 },
 {
 "name": "predis/predis",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5c278d30816cec3f7fd0c912e9a4df4dadcd6a12
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: AndyRussG 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Ssmith 
Gerrit-Reviewer: XenoRyet 
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...DonationInterface[master]: Revert "update composer.lock"

2016-12-28 Thread jenkins-bot (Code Review)

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

Change subject: Revert "update composer.lock"
..


Revert "update composer.lock"

This reverts commit 6823f20b632bed4606cc1ce7e7d27e31b659fae9.

Change-Id: I31217c6f607a5f5f8c6d7e46a13c7a97091e6edf
---
M composer.lock
1 file changed, 57 insertions(+), 65 deletions(-)

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



diff --git a/composer.lock b/composer.lock
index 5cd945b..ea09d7f 100644
--- a/composer.lock
+++ b/composer.lock
@@ -93,7 +93,7 @@
 "source": {
 "type": "git",
 "url": 
"https://gerrit.wikimedia.org/r/p/wikimedia/fundraising/php-queue.git;,
-"reference": "8e15cbf9a46ef58ceeadb9b359fee925291a0173"
+"reference": "14198ba1f7d4868933649a85621a3955965e83cd"
 },
 "require": {
 "clio/clio": "0.1.*",
@@ -149,7 +149,7 @@
 "queue",
 "transaction"
 ],
-"time": "2016-10-17 23:39:02"
+"time": "2016-08-05 19:16:32"
 },
 {
 "name": "fusesource/stomp-php",
@@ -245,22 +245,23 @@
 },
 {
 "name": "minfraud/http",
-"version": "v1.71",
+"version": "v1.70",
 "source": {
 "type": "git",
 "url": "https://github.com/maxmind/ccfd-api-php.git;,
-"reference": "5f6c2a5454e755f1c56be17a1fc0c97576ff010e"
+"reference": "941e9345f9c237a253be8b908ecef951698a1a99"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/maxmind/ccfd-api-php/zipball/5f6c2a5454e755f1c56be17a1fc0c97576ff010e;,
-"reference": "5f6c2a5454e755f1c56be17a1fc0c97576ff010e",
+"url": 
"https://api.github.com/repos/maxmind/ccfd-api-php/zipball/941e9345f9c237a253be8b908ecef951698a1a99;,
+"reference": "941e9345f9c237a253be8b908ecef951698a1a99",
 "shasum": ""
 },
 "type": "library",
 "autoload": {
-"classmap": [
-"src"
+"files": [
+"src/HTTPBase.php",
+"src/CreditCardFraudDetection.php"
 ]
 },
 "notification-url": "https://packagist.org/downloads/;,
@@ -281,7 +282,7 @@
 "maxmind",
 "minfraud"
 ],
-"time": "2016-10-13 14:35:01"
+"time": "2015-07-21 14:49:48"
 },
 {
 "name": "monolog/monolog",
@@ -397,16 +398,16 @@
 },
 {
 "name": "phpmailer/phpmailer",
-"version": "v5.2.21",
+"version": "v5.2.16",
 "source": {
 "type": "git",
 "url": "https://github.com/PHPMailer/PHPMailer.git;,
-"reference": "1d51856b76c06fc687fcd9180efa7a0bed0d761e"
+"reference": "1d85f9ef3ecfc42bbc4f3c70d5e37ca9a65f629a"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/PHPMailer/PHPMailer/zipball/1d51856b76c06fc687fcd9180efa7a0bed0d761e;,
-"reference": "1d51856b76c06fc687fcd9180efa7a0bed0d761e",
+"url": 
"https://api.github.com/repos/PHPMailer/PHPMailer/zipball/1d85f9ef3ecfc42bbc4f3c70d5e37ca9a65f629a;,
+"reference": "1d85f9ef3ecfc42bbc4f3c70d5e37ca9a65f629a",
 "shasum": ""
 },
 "require": {
@@ -453,7 +454,7 @@
 }
 ],
 "description": "PHPMailer is a full-featured email creation and 
transfer class for PHP",
-"time": "2016-12-28 15:35:48"
+"time": "2016-06-06 09:09:37"
 },
 {
 "name": "predis/predis",
@@ -507,30 +508,22 @@
 },
 {
 "name": "psr/log",
-"version": "1.0.2",
+"version": "1.0.0",
 "source": {
 "type": "git",
 "url": "https://github.com/php-fig/log.git;,
-"reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d"
+"reference": "fe0936ee26643249e916849d48e3a51d5f5e278b"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d;,
-"reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
+"url": 
"https://api.github.com/repos/php-fig/log/zipball/fe0936ee26643249e916849d48e3a51d5f5e278b;,
+"reference": "fe0936ee26643249e916849d48e3a51d5f5e278b",
 "shasum": ""
 },
-

[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Revert "update composer.lock"

2016-12-28 Thread Ejegg (Code Review)

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

Change subject: Revert "update composer.lock"
..

Revert "update composer.lock"

This reverts commit 6823f20b632bed4606cc1ce7e7d27e31b659fae9.

Change-Id: I31217c6f607a5f5f8c6d7e46a13c7a97091e6edf
---
M composer.lock
1 file changed, 57 insertions(+), 65 deletions(-)


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

diff --git a/composer.lock b/composer.lock
index 5cd945b..ea09d7f 100644
--- a/composer.lock
+++ b/composer.lock
@@ -93,7 +93,7 @@
 "source": {
 "type": "git",
 "url": 
"https://gerrit.wikimedia.org/r/p/wikimedia/fundraising/php-queue.git;,
-"reference": "8e15cbf9a46ef58ceeadb9b359fee925291a0173"
+"reference": "14198ba1f7d4868933649a85621a3955965e83cd"
 },
 "require": {
 "clio/clio": "0.1.*",
@@ -149,7 +149,7 @@
 "queue",
 "transaction"
 ],
-"time": "2016-10-17 23:39:02"
+"time": "2016-08-05 19:16:32"
 },
 {
 "name": "fusesource/stomp-php",
@@ -245,22 +245,23 @@
 },
 {
 "name": "minfraud/http",
-"version": "v1.71",
+"version": "v1.70",
 "source": {
 "type": "git",
 "url": "https://github.com/maxmind/ccfd-api-php.git;,
-"reference": "5f6c2a5454e755f1c56be17a1fc0c97576ff010e"
+"reference": "941e9345f9c237a253be8b908ecef951698a1a99"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/maxmind/ccfd-api-php/zipball/5f6c2a5454e755f1c56be17a1fc0c97576ff010e;,
-"reference": "5f6c2a5454e755f1c56be17a1fc0c97576ff010e",
+"url": 
"https://api.github.com/repos/maxmind/ccfd-api-php/zipball/941e9345f9c237a253be8b908ecef951698a1a99;,
+"reference": "941e9345f9c237a253be8b908ecef951698a1a99",
 "shasum": ""
 },
 "type": "library",
 "autoload": {
-"classmap": [
-"src"
+"files": [
+"src/HTTPBase.php",
+"src/CreditCardFraudDetection.php"
 ]
 },
 "notification-url": "https://packagist.org/downloads/;,
@@ -281,7 +282,7 @@
 "maxmind",
 "minfraud"
 ],
-"time": "2016-10-13 14:35:01"
+"time": "2015-07-21 14:49:48"
 },
 {
 "name": "monolog/monolog",
@@ -397,16 +398,16 @@
 },
 {
 "name": "phpmailer/phpmailer",
-"version": "v5.2.21",
+"version": "v5.2.16",
 "source": {
 "type": "git",
 "url": "https://github.com/PHPMailer/PHPMailer.git;,
-"reference": "1d51856b76c06fc687fcd9180efa7a0bed0d761e"
+"reference": "1d85f9ef3ecfc42bbc4f3c70d5e37ca9a65f629a"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/PHPMailer/PHPMailer/zipball/1d51856b76c06fc687fcd9180efa7a0bed0d761e;,
-"reference": "1d51856b76c06fc687fcd9180efa7a0bed0d761e",
+"url": 
"https://api.github.com/repos/PHPMailer/PHPMailer/zipball/1d85f9ef3ecfc42bbc4f3c70d5e37ca9a65f629a;,
+"reference": "1d85f9ef3ecfc42bbc4f3c70d5e37ca9a65f629a",
 "shasum": ""
 },
 "require": {
@@ -453,7 +454,7 @@
 }
 ],
 "description": "PHPMailer is a full-featured email creation and 
transfer class for PHP",
-"time": "2016-12-28 15:35:48"
+"time": "2016-06-06 09:09:37"
 },
 {
 "name": "predis/predis",
@@ -507,30 +508,22 @@
 },
 {
 "name": "psr/log",
-"version": "1.0.2",
+"version": "1.0.0",
 "source": {
 "type": "git",
 "url": "https://github.com/php-fig/log.git;,
-"reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d"
+"reference": "fe0936ee26643249e916849d48e3a51d5f5e278b"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d;,
-"reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
+"url": 
"https://api.github.com/repos/php-fig/log/zipball/fe0936ee26643249e916849d48e3a51d5f5e278b;,
+"reference": "fe0936ee26643249e916849d48e3a51d5f5e278b",
 "shasum": ""

[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Update (only) phpmailer in composer.lock

2016-12-28 Thread Ejegg (Code Review)

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

Change subject: Update (only) phpmailer in composer.lock
..

Update (only) phpmailer in composer.lock

Change-Id: I5c278d30816cec3f7fd0c912e9a4df4dadcd6a12
---
M composer.lock
1 file changed, 5 insertions(+), 5 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface 
refs/changes/33/329533/1

diff --git a/composer.lock b/composer.lock
index ea09d7f..e18e257 100644
--- a/composer.lock
+++ b/composer.lock
@@ -398,16 +398,16 @@
 },
 {
 "name": "phpmailer/phpmailer",
-"version": "v5.2.16",
+"version": "v5.2.21",
 "source": {
 "type": "git",
 "url": "https://github.com/PHPMailer/PHPMailer.git;,
-"reference": "1d85f9ef3ecfc42bbc4f3c70d5e37ca9a65f629a"
+"reference": "1d51856b76c06fc687fcd9180efa7a0bed0d761e"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/PHPMailer/PHPMailer/zipball/1d85f9ef3ecfc42bbc4f3c70d5e37ca9a65f629a;,
-"reference": "1d85f9ef3ecfc42bbc4f3c70d5e37ca9a65f629a",
+"url": 
"https://api.github.com/repos/PHPMailer/PHPMailer/zipball/1d51856b76c06fc687fcd9180efa7a0bed0d761e;,
+"reference": "1d51856b76c06fc687fcd9180efa7a0bed0d761e",
 "shasum": ""
 },
 "require": {
@@ -454,7 +454,7 @@
 }
 ],
 "description": "PHPMailer is a full-featured email creation and 
transfer class for PHP",
-"time": "2016-06-06 09:09:37"
+"time": "2016-12-28 15:35:48"
 },
 {
 "name": "predis/predis",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5c278d30816cec3f7fd0c912e9a4df4dadcd6a12
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ejegg 

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

[MediaWiki-commits] [Gerrit] wikimedia...php-queue[master]: Decoding null to null is not an error

2016-12-28 Thread Ejegg (Code Review)

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

Change subject: Decoding null to null is not an error
..

Decoding null to null is not an error

Quit throwing exceptions when the queue is empty.

Change-Id: Ie5479c81c0a6138e1cad416b40d3edabffb1e9c4
---
M src/PHPQueue/Json.php
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/php-queue 
refs/changes/31/329531/1

diff --git a/src/PHPQueue/Json.php b/src/PHPQueue/Json.php
index ad518ed..ed2e6d1 100644
--- a/src/PHPQueue/Json.php
+++ b/src/PHPQueue/Json.php
@@ -5,6 +5,9 @@
 
 class Json {
 public static function safe_decode( $text ) {
+if ( $text === null ) {
+return null;
+}
 $data = json_decode($text, true);
 if ( $data === null ) {
 throw new JsonException("JSON could not be decoded: '{$text}'");

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie5479c81c0a6138e1cad416b40d3edabffb1e9c4
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/php-queue
Gerrit-Branch: master
Gerrit-Owner: Ejegg 

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

[MediaWiki-commits] [Gerrit] mediawiki...Gamepress[master]: Remove unused script, make description more i18n-friendly

2016-12-28 Thread jenkins-bot (Code Review)

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

Change subject: Remove unused script, make description more i18n-friendly
..


Remove unused script, make description more i18n-friendly

Bug: T154106
Change-Id: Ib82a8afdb972b33028d034bfaa67ee6d2666de16
---
M i18n/en.json
D resources/js/twitter.js
M skin.json
3 files changed, 3 insertions(+), 139 deletions(-)

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



diff --git a/i18n/en.json b/i18n/en.json
index 95ee620..616857d 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -2,6 +2,7 @@
"@metadata": {
"authors": []
},
+   "gamepress-desc": "Easy-to-use gaming-oriented skin",
"gamepress-back-to-top": "Back to top ",
"gamepress-navigation": "* mainpage|mainpage-description\n\n** 
faqpage|faq\n\n** recentchanges-url|recentchanges",
"gamepress-prefooter-1": "",
diff --git a/resources/js/twitter.js b/resources/js/twitter.js
deleted file mode 100644
index 6f0e2e7..000
--- a/resources/js/twitter.js
+++ /dev/null
@@ -1,137 +0,0 @@
-JQTWEET = {
-   // Configuration
-   user: 'envato', // twitter username
-   numTweets: 3,   // number of tweets to display
-   appendTo: '#jstwitter', // id/class of HTML elemnt to append tweets to 
(don't change unless You know what You're doing)
-
-   // core function of jqtweet
-   loadTweets: function() {
-   $.ajax({
-   url: 
'http://api.twitter.com/1/statuses/user_timeline.json/',
-   type: 'GET',
-   dataType: 'jsonp',
-   data: {
-   screen_name: JQTWEET.user,
-   include_rts: true,
-   count: JQTWEET.numTweets,
-   include_entities: true
-   },
-   success: function(data, textStatus, xhr) {
-   var html = 'TWEET_TEXTAGO';
-   // append tweets into page
-   for (var i = 0; i < data.length; i++) {
-   $(JQTWEET.appendTo).append(
-   html.replace('TWEET_TEXT', 
JQTWEET.ify.clean(data[i].text))
-   .replace(/USER/g, 
data[i].user.screen_name)
-   .replace('AGO', 
JQTWEET.timeAgo(data[i].created_at))
-   .replace(/ID/g, 
data[i].id_str)
-   );
-   }
-   }
-   });
-   },
-
-   /**
-* relative time calculator FROM TWITTER
-* @param {string} twitter date string returned from Twitter API
-* @return {string} relative time like "2 minutes ago"
-*/
-   timeAgo: function(dateString) {
-   var rightNow = new Date();
-   var then = new Date(dateString);
-
-   if ($.browser.msie) {
-   // IE can't parse these crazy Ruby dates
-   then = Date.parse(dateString.replace(/( \+)/, ' 
UTC$1'));
-   }
-
-   var diff = rightNow - then;
-
-   var second = 1000,
-   minute = second * 60,
-   hour = minute * 60,
-   day = hour * 24,
-   week = day * 7;
-
-   if (isNaN(diff) || diff < 0) {
-   return ''; // return blank string if unknown
-   }
-
-   if (diff < second * 2) {
-   // within 2 seconds
-   return 'right now';
-   }
-
-   if (diff < minute) {
-   return Math.floor(diff / second) + ' seconds ago';
-   }
-
-   if (diff < minute * 2) {
-   return 'about 1 minute ago';
-   }
-
-   if (diff < hour) {
-   return Math.floor(diff / minute) + ' minutes ago';
-   }
-
-   if (diff < hour * 2) {
-   return 'about 1 hour ago';
-   }
-
-   if (diff < day) {
-   return  Math.floor(diff / hour) + ' hours ago';
-   }
-
-   if (diff > day && diff < day * 2) {
-   return 'yesterday';
-   }
-
-   if (diff < day * 365) {
-   return Math.floor(diff / day) + ' days ago';
-   } else {
-   return 'over a year ago';
-   }
-   }, // timeAgo()
-
-   /**
- * The Twitalinkahashifyer!
- * http://www.dustindiaz.com/basement/ify.html
-

[MediaWiki-commits] [Gerrit] mediawiki...Gamepress[master]: Remove unused script, make description more i18n-friendly

2016-12-28 Thread SamanthaNguyen (Code Review)

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

Change subject: Remove unused script, make description more i18n-friendly
..

Remove unused script, make description more i18n-friendly

Bug: T154106
Change-Id: Ib82a8afdb972b33028d034bfaa67ee6d2666de16
---
M i18n/en.json
D resources/js/twitter.js
M skin.json
3 files changed, 3 insertions(+), 139 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Gamepress 
refs/changes/30/329530/1

diff --git a/i18n/en.json b/i18n/en.json
index 95ee620..616857d 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -2,6 +2,7 @@
"@metadata": {
"authors": []
},
+   "gamepress-desc": "Easy-to-use gaming-oriented skin",
"gamepress-back-to-top": "Back to top ",
"gamepress-navigation": "* mainpage|mainpage-description\n\n** 
faqpage|faq\n\n** recentchanges-url|recentchanges",
"gamepress-prefooter-1": "",
diff --git a/resources/js/twitter.js b/resources/js/twitter.js
deleted file mode 100644
index 6f0e2e7..000
--- a/resources/js/twitter.js
+++ /dev/null
@@ -1,137 +0,0 @@
-JQTWEET = {
-   // Configuration
-   user: 'envato', // twitter username
-   numTweets: 3,   // number of tweets to display
-   appendTo: '#jstwitter', // id/class of HTML elemnt to append tweets to 
(don't change unless You know what You're doing)
-
-   // core function of jqtweet
-   loadTweets: function() {
-   $.ajax({
-   url: 
'http://api.twitter.com/1/statuses/user_timeline.json/',
-   type: 'GET',
-   dataType: 'jsonp',
-   data: {
-   screen_name: JQTWEET.user,
-   include_rts: true,
-   count: JQTWEET.numTweets,
-   include_entities: true
-   },
-   success: function(data, textStatus, xhr) {
-   var html = 'TWEET_TEXTAGO';
-   // append tweets into page
-   for (var i = 0; i < data.length; i++) {
-   $(JQTWEET.appendTo).append(
-   html.replace('TWEET_TEXT', 
JQTWEET.ify.clean(data[i].text))
-   .replace(/USER/g, 
data[i].user.screen_name)
-   .replace('AGO', 
JQTWEET.timeAgo(data[i].created_at))
-   .replace(/ID/g, 
data[i].id_str)
-   );
-   }
-   }
-   });
-   },
-
-   /**
-* relative time calculator FROM TWITTER
-* @param {string} twitter date string returned from Twitter API
-* @return {string} relative time like "2 minutes ago"
-*/
-   timeAgo: function(dateString) {
-   var rightNow = new Date();
-   var then = new Date(dateString);
-
-   if ($.browser.msie) {
-   // IE can't parse these crazy Ruby dates
-   then = Date.parse(dateString.replace(/( \+)/, ' 
UTC$1'));
-   }
-
-   var diff = rightNow - then;
-
-   var second = 1000,
-   minute = second * 60,
-   hour = minute * 60,
-   day = hour * 24,
-   week = day * 7;
-
-   if (isNaN(diff) || diff < 0) {
-   return ''; // return blank string if unknown
-   }
-
-   if (diff < second * 2) {
-   // within 2 seconds
-   return 'right now';
-   }
-
-   if (diff < minute) {
-   return Math.floor(diff / second) + ' seconds ago';
-   }
-
-   if (diff < minute * 2) {
-   return 'about 1 minute ago';
-   }
-
-   if (diff < hour) {
-   return Math.floor(diff / minute) + ' minutes ago';
-   }
-
-   if (diff < hour * 2) {
-   return 'about 1 hour ago';
-   }
-
-   if (diff < day) {
-   return  Math.floor(diff / hour) + ' hours ago';
-   }
-
-   if (diff > day && diff < day * 2) {
-   return 'yesterday';
-   }
-
-   if (diff < day * 365) {
-   return Math.floor(diff / day) + ' days ago';
-   } else {
-   return 'over a year ago';
-   }
-   }, // timeAgo()
-
-   /**
- * The Twitalinkahashifyer!
- *

[MediaWiki-commits] [Gerrit] wikimedia...vendor[master]: Update (only) phpmailer

2016-12-28 Thread Cdentinger (Code Review)

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

Change subject: Update (only) phpmailer
..


Update (only) phpmailer

Change-Id: Ibabce5112b3160d25bf192960809e3772bbeaa03
---
M composer/LICENSE
M composer/autoload_real.php
M composer/installed.json
D phpmailer/phpmailer/.gitignore
D phpmailer/phpmailer/.scrutinizer.yml
D phpmailer/phpmailer/.travis.yml
D phpmailer/phpmailer/README.md
M phpmailer/phpmailer/VERSION
D phpmailer/phpmailer/changelog.md
M phpmailer/phpmailer/class.phpmailer.php
M phpmailer/phpmailer/class.phpmaileroauth.php
M phpmailer/phpmailer/class.pop3.php
M phpmailer/phpmailer/class.smtp.php
M phpmailer/phpmailer/composer.lock
D phpmailer/phpmailer/docs/Callback_function_notes.txt
D phpmailer/phpmailer/docs/DomainKeys_notes.txt
D phpmailer/phpmailer/docs/Note_for_SMTP_debugging.txt
D phpmailer/phpmailer/docs/extending.html
D phpmailer/phpmailer/docs/faq.html
D phpmailer/phpmailer/docs/generatedocs.sh
D phpmailer/phpmailer/docs/pop3_article.txt
M phpmailer/phpmailer/examples/scripts/shLegacy.js
M phpmailer/phpmailer/examples/smtp_check.phps
M phpmailer/phpmailer/extras/htmlfilter.php
M phpmailer/phpmailer/extras/ntlm_sasl_client.php
R phpmailer/phpmailer/language/phpmailer.lang-cs.php
R phpmailer/phpmailer/language/phpmailer.lang-da.php
M phpmailer/phpmailer/language/phpmailer.lang-de.php
M phpmailer/phpmailer/language/phpmailer.lang-es.php
R phpmailer/phpmailer/language/phpmailer.lang-nb.php
R phpmailer/phpmailer/language/phpmailer.lang-pt_br.php
M phpmailer/phpmailer/language/phpmailer.lang-ro.php
R phpmailer/phpmailer/language/phpmailer.lang-sv.php
D phpmailer/phpmailer/test/bootstrap.php
D phpmailer/phpmailer/test/fakepopserver.sh
D phpmailer/phpmailer/test/fakesendmail.sh
D phpmailer/phpmailer/test/phpmailerLangTest.php
D phpmailer/phpmailer/test/phpmailerTest.php
D phpmailer/phpmailer/test/runfakepopserver.sh
D phpmailer/phpmailer/test/test_callback.php
D phpmailer/phpmailer/test/testbootstrap-dist.php
D phpmailer/phpmailer/travis.phpunit.xml.dist
42 files changed, 685 insertions(+), 4,363 deletions(-)

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibabce5112b3160d25bf192960809e3772bbeaa03
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/SmashPig/vendor
Gerrit-Branch: master
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Cdentinger 

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

[MediaWiki-commits] [Gerrit] mediawiki...DeskMessMirrored[master]: Organize CSS, deleting stylesheets, remove old IE support

2016-12-28 Thread jenkins-bot (Code Review)

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

Change subject: Organize CSS, deleting stylesheets, remove old IE support
..


Organize CSS, deleting stylesheets, remove old IE support

- Removed "editor-style.css" and "ie.css", since they
weren't being loaded anyways.
- Removed some specific lines that were for supporting
ancient versions of IE(6!), and organized stylesheets
by moving resets and wordpress-rules into their own
stylehseets.
- Bumped up version number (major change)
- Also removed unnecessary vendor prefixes for border-radius,
see http://caniuse.com/#feat=border-radius

Bug: T154200
Change-Id: I2092fe681ef3b68ffe80b63b64fb0674c5c4e75c
---
D css/editor-style.css
D css/ie.css
A css/reset.css
M css/style.css
A css/wordpress-rules.css
M skin.json
6 files changed, 78 insertions(+), 401 deletions(-)

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



diff --git a/css/editor-style.css b/css/editor-style.css
deleted file mode 100644
index 01a45f8..000
--- a/css/editor-style.css
+++ /dev/null
@@ -1,301 +0,0 @@
-/*
-Editor-Style CSS for ...
-Theme Name: Desk Mess Mirrored
-Theme URI: http://buynowshop.com/themes/desk-mess-mirrored/
-Version: 2.0
-Author: Edward Caissie
-Author URI: http://edwardcaissie.com/
-License: GNU General Public License v2
-License URI: http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
-*/
-
-/**
- * Copyright 2009-2012  Edward Caissie  (email : edward.cais...@gmail.com)
- *
- * This program is free software; you can redistribute it and/or modify it 
under
- * the terms of the GNU General Public License version 2, as published by the
- * Free Software Foundation.
- *
- * You may NOT assume that you can use any other version of the GPL.
- *
- * 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:
- *
- *  Free Software Foundation, Inc.
- *  51 Franklin St, Fifth Floor
- *  Boston, MA  02110-1301  USA
- *
- * The license for this software can also likely be found here:
- * http://www.gnu.org/licenses/gpl-2.0.html
- */
-
-/**
- * See index.php for additional program documentation and license information
- * references.
- */
-
-/*-- YUI Reset: Start --*/
-body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,textarea,p,blockquote,th,td
 { margin: 0; padding: 0; }
-table { border-collapse: collapse; border-spacing: 0; }
-fieldset,img { border: 0; }
-address,caption,cite,code,dfn,em,strong,th,var { font-style: normal; 
font-weight: normal; }
-ol,ul { list-style: none; }
-caption,th { text-align: left; }
-h1,h2,h3,h4,h5,h6 { font-size: 100%; font-weight: normal; }
-q:before,q:after { content: ''; }
-abbr,acronym { border:0; }
-/*-- YUI Reset: End --*/
-
-/*-- WordPress Rules --*/
-div.aligncenter, .aligncenter, .center { margin: 0 auto; }
-.alignleft, .left { float: left; text-align: left; }
-.alignright, .right { float: right; text-align: right; }
-img.aligncenter, img.center { display: block; }
-img.alignleft, img.left { display: inline; margin: 0 8px 8px 0; }
-img.alignright, img.right { display: inline; margin: 0 0 8px 8px; }
-.wp-caption { border: 1px solid #ddd; text-align: center; background-color: 
#f3f3f3; padding-top: 4px; margin: 10px;
-/* optional rounded corners for browsers that support it */
-   -moz-border-radius: 3px;
-   -khtml-border-radius: 3px;
-   -webkit-border-radius: 3px;
-   -border-radius: 3px;
-}
-.wp-caption img { margin: 0; padding: 0; border: 0 none; }
-.wp-caption p.wp-caption-text { font-size: 11px; line-height: 17px; padding: 0 
4px 5px; margin: 0; }
-/*-- End WordPress Rules --*/
-
-/*-- Begin TinyMCE --*/
-html .mceContentBody {
-   max-width: 580px;
-   margin: 0;
-   padding: 0;
-   font-family: "Lucida Grande", "Lucida Sans Unicode", sans-serif;
-   font-size: 14px;
-   line-height: 21px;
-}
-
-a:link, a:visited { color: #d21600; text-decoration: none; }
-a:hover { text-decoration: underline; }
-a:focus, a:active { color: #d21600; text-decoration: none; }
-
-a img { border: none; }
-
-em { font-style: italic; }
-
-h1, h2, h3, h4, h5, h6 {
-   font-family: Georgia, "Times New Roman", Times, serif;
-   font-weight: normal;
-   line-height: normal;
-}
-
-h1 {
-   font-size: 25px;
-   padding-bottom: 2px;
-}
-h2 {
-   font-size: 20px;
-   padding-bottom: 11px;
-   padding-top: 15px;
-}
-h3 {
-   font-size: 17px;
-   padding-bottom: 10px;
-   padding-top: 14px;
-}
-h4 {
-   font-size: 15px;
-   padding-bottom: 10px;
-   padding-top: 12px;
-}

[MediaWiki-commits] [Gerrit] wikimedia...SmashPig[master]: DO NOT MERGE: Update payments_initial when donation completes

2016-12-28 Thread Ejegg (Code Review)

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

Change subject: DO NOT MERGE: Update payments_initial when donation completes
..

DO NOT MERGE: Update payments_initial when donation completes

Needs settings updates to deploy, as we have been using a read-only
connection for the fredge db.

FIXME: This direct-to-db approach doesn't work for Amazon and Astropay
listeners as they exist now. But if we move the pending merge into a
SmashPig job, they can do the payments_init update then.

Bigger FIXME: payments_init row should really stay intact, and a new
table should track status changes.

Old Change: Ibb79ba42d22d57dd849ffdd5eae3db92ad57163c

Change-Id: I13e146b383ba7349885b21b1f15d5fecfbf605ce
---
M Core/DataStores/PaymentsInitialDatabase.php
M PaymentProviders/Adyen/Jobs/RecordCaptureJob.php
M PaymentProviders/Adyen/Tests/config_test.yaml
M PaymentProviders/Adyen/Tests/phpunit/RecordCaptureJobTest.php
4 files changed, 70 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig 
refs/changes/29/329529/1

diff --git a/Core/DataStores/PaymentsInitialDatabase.php 
b/Core/DataStores/PaymentsInitialDatabase.php
index d40238c..857377e 100644
--- a/Core/DataStores/PaymentsInitialDatabase.php
+++ b/Core/DataStores/PaymentsInitialDatabase.php
@@ -75,6 +75,25 @@
$this->prepareAndExecute( $sql, $message );
}
 
+   public function updatePaymentStatus(
+   $gateway, $contributionTrackingId, $orderId, $status
+   ) {
+   $sql = 'UPDATE payments_initial
+   SET payments_final_status = :status
+   WHERE gateway = :gateway
+   AND contribution_tracking_id = :ct_id
+   AND order_id = :order_id';
+
+   $params = array(
+   'gateway' => $gateway,
+   'ct_id' => $contributionTrackingId,
+   'order_id' => $orderId,
+   'status' => $status
+   );
+
+   $this->prepareAndExecute( $sql, $params );
+   }
+
protected function getConfigKey() {
return 'data-store/fredge-db';
}
diff --git a/PaymentProviders/Adyen/Jobs/RecordCaptureJob.php 
b/PaymentProviders/Adyen/Jobs/RecordCaptureJob.php
index bdcb117..8531ed8 100644
--- a/PaymentProviders/Adyen/Jobs/RecordCaptureJob.php
+++ b/PaymentProviders/Adyen/Jobs/RecordCaptureJob.php
@@ -1,6 +1,7 @@
 object( 'data-store/verified' )->push( 
$queueMessage );
 
+   PaymentsInitialDatabase::get()
+   ->updatePaymentStatus(
+   'adyen',
+   $dbMessage['contribution_tracking_id'],
+   $dbMessage['order_id'],
+   'complete'
+   );
+
// Remove it from the pending database
$logger->debug( 'Removing donor details message from 
pending database' );
$db->deleteMessage( $dbMessage );
diff --git a/PaymentProviders/Adyen/Tests/config_test.yaml 
b/PaymentProviders/Adyen/Tests/config_test.yaml
index 33e8128..6f249d0 100644
--- a/PaymentProviders/Adyen/Tests/config_test.yaml
+++ b/PaymentProviders/Adyen/Tests/config_test.yaml
@@ -24,6 +24,11 @@
 constructor-parameters:
 - 'sqlite::memory:'
 
+fredge-db:
+class: PDO
+constructor-parameters:
+- 'sqlite::memory:'
+
 payment-provider:
 adyen:
 api:
diff --git a/PaymentProviders/Adyen/Tests/phpunit/RecordCaptureJobTest.php 
b/PaymentProviders/Adyen/Tests/phpunit/RecordCaptureJobTest.php
index ce3edf9..f59e1b2 100644
--- a/PaymentProviders/Adyen/Tests/phpunit/RecordCaptureJobTest.php
+++ b/PaymentProviders/Adyen/Tests/phpunit/RecordCaptureJobTest.php
@@ -3,11 +3,14 @@
 use SmashPig\Core\Configuration;
 use SmashPig\Core\Context;
 use SmashPig\Core\DataStores\KeyedOpaqueStorableObject;
+use SmashPig\Core\DataStores\PaymentsInitialDatabase;
 use SmashPig\Core\DataStores\PendingDatabase;
 use SmashPig\Core\QueueConsumers\BaseQueueConsumer;
 use SmashPig\PaymentProviders\Adyen\Jobs\RecordCaptureJob;
 use SmashPig\PaymentProviders\Adyen\Tests\AdyenTestConfiguration;
 use SmashPig\Tests\BaseSmashPigUnitTestCase;
+use SmashPig\Tests\PaymentsInitialDatabaseTest;
+use SmashPig\Tests\TestingDatabase;
 
 /**
  * Verify Adyen RecordCapture job functions
@@ -23,21 +26,43 @@
 */
protected $pendingDatabase;
protected $pendingMessage;
+   /**
+* @var PaymentsInitialDatabase
+*/
+   protected $paymentsInitDatabase;
+   protected $paymentsInitMessage;
 
public function setUp() {

[MediaWiki-commits] [Gerrit] mediawiki...Truglass[master]: Remove support for

2016-12-28 Thread jenkins-bot (Code Review)

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

Change subject: Remove support for  tags with right margins and nowrap 
*/
-   margin-right: 0;
-}
diff --git a/truglass/Opera6Fixes.css b/truglass/Opera6Fixes.css
deleted file mode 100644
index 8870473..000
--- a/truglass/Opera6Fixes.css
+++ /dev/null
@@ -1,14 +0,0 @@
-/* opera 6 fixes */
-#column-one {
-   position: relative;
-   max-width: 11.7em;
-}
-#p-personal {
-   width: 45em;
-   margin-left: 8.6em;
-   right: 0;
-}
-#bodyContent a.external {
-   background: url(external.png) center right no-repeat;
-   padding-right: 13px;
-}
diff --git a/truglass/Opera7Fixes.css b/truglass/Opera7Fixes.css
deleted file mode 100644
index 446ea44..000
--- a/truglass/Opera7Fixes.css
+++ /dev/null
@@ -1,11 +0,0 @@
-/* small tweaks for opera seven */
-#p-cactions {
-   margin-top: .1em;
-}
-#p-cactions li a {
-   top: 2px;
-}
-#bodyContent a.external {
-   background: url(external.png) center right no-repeat;
-   padding-right: 13px;
-}
diff --git a/truglass/Opera95Fixes.css b/truglass/Opera95Fixes.css
deleted file mode 100644
index 6048c66..000
--- a/truglass/Opera95Fixes.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * One tweak for Opera 9.5 carried over from Opera 7.  This seems to be exactly
- * the same rule as is used for #bodyContent a.external normally, why do we
- * need it?  Someone should compare with and without and remove this file en-
- * tirely if appropriate.
- */
-#bodyContent a.external {
-   background: url(external.png) center right no-repeat;
-   padding-right: 13px;
-}
diff --git a/truglass/rtl.css b/truglass/rtl.css
deleted file mode 100644
index 8114f4b..000
--- a/truglass/rtl.css
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
-Right-to-left fixes for MonoBook.
-Places sidebar on right, tweaks various alignment issues.
-
-Works mostly ok nicely on Safari 1.2.1; fine in Mozilla.
-
-Safari bugs (1.2.1):
-* Tabs are still appearing in left-to-right order. (Try after localizing)
-
-Opera bugs (7.23 linux):
-* Some bits of ltr text (sidebar box titles) have forward and backward 
versions overlapping each other
-
-IE/mac bugs:
-* The thing barfs on Hebrew and Arabic anyway, so no point testing.
-
-Missing features due to lack of support:
-* external link icons
-
-To test:
-* Opera6
-* IE 5.0
-* etc
-
-*/
-body {
-   direction: rtl;
-/*unicode-bidi: bidi-override;*/
-   unicode-bidi: embed;
-}
-#column-content {
-   margin: 0 -12.2em 0 0;
-   float: left;
-}
-#column-content #content{
-   margin-left: 0;
-   margin-right: 12.2em;
-   border-right: 1px solid #aa;
-   border-left: none;
-}
-html>body .portlet {
-   float: right;
-   clear: right;
-}
-.editsection {
-   float: left;
-   margin-right: 5px;
-   margin-left: 0; /* bug 9122: undo default LTR */
-}
-/* recover IEMac (might be fine with the float, but usually it's close to IE */
-*>body .portlet {
-   float: none;
-   clear: none;
-}
-.pBody {
-   padding-right: 0.8em;
-   padding-left: 0.5em;
-}
-
-/* Fix alignment */
-.documentByLine,
-.portletDetails,
-.portletMore,
-#p-personal {
-   text-align: left;
-}
-
-div div.thumbcaption {
-   text-align: right;
-}
-
-div.magnify,
-#p-logo {
-   left: auto;
-   right: 0;
-}
-#p-personal {
-   left: auto;
-   right: 0;
-}
-
-#p-cactions {
-   left: auto;
-   right: 11.5em;
-   padding-left: 0;
-   padding-right: 1em;
-}
-#p-cactions li {
-   margin-left: 0.3em;
-   margin-right: 0;
-   float: right;
-}
-* html #p-cactions li a {
-   display: block;
-   padding-bottom: 0;
-}
-* html #p-cactions li a:hover {
-   padding-bottom: 0.2em;
-}
-/* offsets to distinguish the tab groups */
-li#ca-talk {
-   margin-right: auto;
-   margin-left: 1.6em;
-}
-li#ca-watch,li#ca-unwatch {
-   margin-right: 1.6em !important;
-}
-
-/* Fix margins for non-css2 browsers */
-/* top right bottom left */
-
-ul {
-   margin-left: 0;
-   margin-right: 1.5em;
-}
-ol {
-   margin-left: 0;
-   margin-right: 2.4em;
-}
-dd {
-   margin-left: 0;
-   margin-right: 1.6em;
-}
-#contentSub {
-   margin-right: 1em;
-   margin-left: 0;
-}
-.tocindent {
-   margin-left: 0;
-   margin-right: 2em;
-}
-div.tright, div.floatright, table.floatright {
-   clear: none;
-}
-div.tleft, div.floatleft, table.floatleft {
-   clear: left;
-}
-
-#p-personal li {
-   margin-left: 0;
-   margin-right: 1em;
-}
-
-li#ca-talk,
-li#ca-watch {
-   margin-right: auto;
-   margin-left: 1.6em;
-}
-
-#p-personal li {
-   float: left;
-}
-/* Fix link icons */
-.external {
-   padding: 0 !important;
-   background: none !important;
-}
-#footer {
-   clear: both;
-}
-* html #footer {
-   margin-left: 0;
-   margin-right: 13.6em;
-   border-left: 0;
-   border-right:

[MediaWiki-commits] [Gerrit] wikimedia...SmashPig[deployment]: Update vendor

2016-12-28 Thread jenkins-bot (Code Review)

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

Change subject: Update vendor
..


Update vendor

Just phpmailer lib

Change-Id: Ie7907c14c62ebaab4a352ddac05bcb85485bdc92
---
M vendor
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/vendor b/vendor
index b97f8f8..a325017 16
--- a/vendor
+++ b/vendor
@@ -1 +1 @@
-Subproject commit b97f8f82b9fd4ba92f9a99911ac0dabe02482e79
+Subproject commit a3250177eec55bbe6dc0420950ff75092d0dc0cb

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie7907c14c62ebaab4a352ddac05bcb85485bdc92
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/SmashPig
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia...vendor[master]: Revert "update phpmailer for CVE"

2016-12-28 Thread Cdentinger (Code Review)

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

Change subject: Revert "update phpmailer for CVE"
..


Revert "update phpmailer for CVE"

This reverts commit b97f8f82b9fd4ba92f9a99911ac0dabe02482e79.

Change-Id: I9ff373aae3a6a1aedce2394c6a76dcdb87719551
---
M coderkungfu/php-queue/src/PHPQueue/Backend/PDO.php
M coderkungfu/php-queue/src/PHPQueue/Backend/Predis.php
D coderkungfu/php-queue/src/PHPQueue/Exception/JsonException.php
D coderkungfu/php-queue/src/PHPQueue/Json.php
M coderkungfu/php-queue/test/PHPQueue/Backend/PredisTest.php
M composer/LICENSE
M composer/autoload_files.php
M composer/autoload_namespaces.php
M composer/autoload_psr4.php
M composer/installed.json
M monolog/monolog/CHANGELOG.mdown
M monolog/monolog/composer.json
M monolog/monolog/doc/02-handlers-formatters-processors.md
M monolog/monolog/src/Monolog/Formatter/JsonFormatter.php
M monolog/monolog/src/Monolog/Formatter/LineFormatter.php
M monolog/monolog/src/Monolog/Formatter/NormalizerFormatter.php
M monolog/monolog/src/Monolog/Handler/AmqpHandler.php
M monolog/monolog/src/Monolog/Handler/DynamoDbHandler.php
M monolog/monolog/src/Monolog/Handler/RavenHandler.php
M monolog/monolog/src/Monolog/Handler/RollbarHandler.php
D monolog/monolog/src/Monolog/Handler/Slack/SlackRecord.php
M monolog/monolog/src/Monolog/Handler/SlackHandler.php
D monolog/monolog/src/Monolog/Handler/SlackWebhookHandler.php
D monolog/monolog/src/Monolog/Handler/SlackbotHandler.php
M monolog/monolog/src/Monolog/Handler/StreamHandler.php
M monolog/monolog/src/Monolog/Handler/SyslogUdpHandler.php
M monolog/monolog/src/Monolog/Handler/TestHandler.php
M monolog/monolog/src/Monolog/Logger.php
D monolog/monolog/src/Monolog/Processor/MercurialProcessor.php
M monolog/monolog/tests/Monolog/Formatter/JsonFormatterTest.php
M monolog/monolog/tests/Monolog/Formatter/NormalizerFormatterTest.php
M monolog/monolog/tests/Monolog/Handler/RavenHandlerTest.php
D monolog/monolog/tests/Monolog/Handler/Slack/SlackRecordTest.php
M monolog/monolog/tests/Monolog/Handler/SlackHandlerTest.php
D monolog/monolog/tests/Monolog/Handler/SlackWebhookHandlerTest.php
D monolog/monolog/tests/Monolog/Handler/SlackbotHandlerTest.php
M monolog/monolog/tests/Monolog/Handler/SyslogUdpHandlerTest.php
M monolog/monolog/tests/Monolog/Handler/TestHandlerTest.php
M monolog/monolog/tests/Monolog/LoggerTest.php
D monolog/monolog/tests/Monolog/Processor/MercurialProcessorTest.php
A phpmailer/phpmailer/.gitignore
A phpmailer/phpmailer/.scrutinizer.yml
A phpmailer/phpmailer/.travis.yml
A phpmailer/phpmailer/README.md
M phpmailer/phpmailer/VERSION
A phpmailer/phpmailer/changelog.md
M phpmailer/phpmailer/class.phpmailer.php
M phpmailer/phpmailer/class.phpmaileroauth.php
M phpmailer/phpmailer/class.pop3.php
M phpmailer/phpmailer/class.smtp.php
M phpmailer/phpmailer/composer.lock
A phpmailer/phpmailer/docs/Callback_function_notes.txt
A phpmailer/phpmailer/docs/DomainKeys_notes.txt
A phpmailer/phpmailer/docs/Note_for_SMTP_debugging.txt
A phpmailer/phpmailer/docs/extending.html
A phpmailer/phpmailer/docs/faq.html
A phpmailer/phpmailer/docs/generatedocs.sh
A phpmailer/phpmailer/docs/pop3_article.txt
M phpmailer/phpmailer/examples/scripts/shLegacy.js
M phpmailer/phpmailer/examples/smtp_check.phps
M phpmailer/phpmailer/extras/htmlfilter.php
M phpmailer/phpmailer/extras/ntlm_sasl_client.php
R phpmailer/phpmailer/language/phpmailer.lang-br.php
R phpmailer/phpmailer/language/phpmailer.lang-cz.php
M phpmailer/phpmailer/language/phpmailer.lang-de.php
R phpmailer/phpmailer/language/phpmailer.lang-dk.php
M phpmailer/phpmailer/language/phpmailer.lang-es.php
R phpmailer/phpmailer/language/phpmailer.lang-no.php
M phpmailer/phpmailer/language/phpmailer.lang-ro.php
R phpmailer/phpmailer/language/phpmailer.lang-se.php
A phpmailer/phpmailer/test/bootstrap.php
A phpmailer/phpmailer/test/fakepopserver.sh
A phpmailer/phpmailer/test/fakesendmail.sh
A phpmailer/phpmailer/test/phpmailerLangTest.php
A phpmailer/phpmailer/test/phpmailerTest.php
A phpmailer/phpmailer/test/runfakepopserver.sh
A phpmailer/phpmailer/test/test_callback.php
A phpmailer/phpmailer/test/testbootstrap-dist.php
A phpmailer/phpmailer/travis.phpunit.xml.dist
M psr/log/Psr/Log/AbstractLogger.php
M psr/log/Psr/Log/LogLevel.php
M psr/log/Psr/Log/LoggerAwareInterface.php
M psr/log/Psr/Log/LoggerAwareTrait.php
M psr/log/Psr/Log/LoggerInterface.php
M psr/log/Psr/Log/LoggerTrait.php
M psr/log/Psr/Log/NullLogger.php
M psr/log/Psr/Log/Test/LoggerInterfaceTest.php
M psr/log/composer.json
M symfony/event-dispatcher/EventDispatcher.php
M symfony/http-foundation/BinaryFileResponse.php
M symfony/http-foundation/File/MimeType/FileinfoMimeTypeGuesser.php
M symfony/http-foundation/JsonResponse.php
M symfony/http-foundation/Request.php
M symfony/http-foundation/RequestMatcher.php
M symfony/http-foundation/Response.php
M

[MediaWiki-commits] [Gerrit] wikimedia...SmashPig[deployment]: Update vendor

2016-12-28 Thread Ejegg (Code Review)

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

Change subject: Update vendor
..

Update vendor

Just phpmailer lib

Change-Id: Ie7907c14c62ebaab4a352ddac05bcb85485bdc92
---
M vendor
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig 
refs/changes/28/329528/1

diff --git a/vendor b/vendor
index b97f8f8..a325017 16
--- a/vendor
+++ b/vendor
@@ -1 +1 @@
-Subproject commit b97f8f82b9fd4ba92f9a99911ac0dabe02482e79
+Subproject commit a3250177eec55bbe6dc0420950ff75092d0dc0cb

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie7907c14c62ebaab4a352ddac05bcb85485bdc92
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/SmashPig
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 

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

[MediaWiki-commits] [Gerrit] wikimedia...SmashPig[deployment]: Merge branch 'master' into deployment

2016-12-28 Thread jenkins-bot (Code Review)

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

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

5db2b21 Clean up a couple unused things
78a59db Update payments_initial when donation completes
e181e46 Less noisy queue consumer logging
bbba45f reject some address_names
63d30e8 Update phpmailer for CVE-2016-10045 and CVE-2016-10033
7424e99 Revert "Update phpmailer for CVE-2016-10045 and CVE-2016-10033"
ae44b1a Update (only) PHPMailer
7bc3113 Revert "Update payments_initial when donation completes"

This just gets us out of cherry-pick hell
Everything except the libs and payments_initial update are already deployed.

Change-Id: I7815a05f5e7cf51d90fcdc6b9e95ff3bd25f8247
---
D PaymentProviders/PayPal/Tests/phpunit/CaptureIncomingMessageTest.php
M composer.lock
2 files changed, 104 insertions(+), 260 deletions(-)

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



diff --git 
a/PaymentProviders/PayPal/Tests/phpunit/CaptureIncomingMessageTest.php 
b/PaymentProviders/PayPal/Tests/phpunit/CaptureIncomingMessageTest.php
deleted file mode 100644
index b2e4312..000
--- a/PaymentProviders/PayPal/Tests/phpunit/CaptureIncomingMessageTest.php
+++ /dev/null
@@ -1,147 +0,0 @@
-<<< HEAD   (8597bd REVERT "DEPLOYMENT ONLY: Short-circuit everything to 
disable)
-===
- 'verified',
-   'subscr_signup.json' => 'recurring',
-   'subscr_payment.json' => 'recurring',
-   'refund.json' => 'refund',
-   'chargeback_settlement.json' => 'refund',
-   // this should not actually get written to
-   // TODO 'new_case.json' => 'no-op',
-   );
-
-   static $messages = array();
-
-   public function setUp() {
-   parent::setUp();
-   $this->config = PayPalTestConfiguration::get();
-
-   // php-queue\PDO complains about pop() from non-existent table
-   $this->config->object( 'data-store/jobs-paypal' )
-   ->createTable( 'jobs-paypal' );
-
-   Context::initWithLogger( $this->config );
-   foreach ( self::$message_data as $file => $type ) {
-   self::$messages[] = array(
-   'type' => $type,
-   'payload' => json_decode(
-   file_get_contents( __DIR__ . 
'/../Data/' . $file ),
-   true
-   )
-   );
-   }
-   }
-
-   public function tearDown() {
-   self::$fail_verification = false;
-   self::$paypal_is_broken = false;
-   parent::tearDown();
-   }
-
-   private function capture( $msg ) {
-   $request = new Request( $msg );
-   $response = new Response;
-   $listener = new Listener;
-   return $listener->execute( $request, $response );
-   }
-
-   public function testCapture() {
-   foreach ( self::$messages as $msg ) {
-
-   $this->capture( $msg['payload'] );
-
-   $jobQueue = $this->config->object( 
'data-store/jobs-paypal' );
-   $jobMessage = $jobQueue->pop();
-
-   $this->assertEquals( $jobMessage['php-message-class'],
-   'SmashPig\PaymentProviders\PayPal\Job' );
-
-   $this->assertEquals( $jobMessage['payload'], 
$msg['payload'] );
-   }
-   }
-
-   public function testBlankMessage() {
-   $this->capture( array() );
-   $jobQueue = $this->config->object( 'data-store/jobs-paypal' );
-   $this->assertNull( $jobQueue->pop() );
-   }
-
-   public function testConsume() {
-   foreach ( self::$messages as $msg ) {
-   $this->capture( $msg['payload'] );
-
-   $jobQueue = $this->config->object( 
'data-store/jobs-paypal' );
-   $jobMessage = $jobQueue->pop();
-
-   $job = KeyedOpaqueStorableObject::fromJsonProxy(
-   $jobMessage['php-message-class'],
-   json_encode( $jobMessage )
-   );
-
-   $job->execute();
-
-   $queue = $this->config->object( 'data-store/' . 
$msg['type'] );
-   $queue->createTable( $msg['type'] );
-   $message = $queue->pop();
-
-   if ( $job->is_reject() ) {
-   $this->assertEmpty( $message );
-   } else {
-   $this->assertNotEmpty( $message );
-   if ( isset(

[MediaWiki-commits] [Gerrit] wikimedia...SmashPig[master]: Update (only) PHPMailer

2016-12-28 Thread jenkins-bot (Code Review)

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

Change subject: Update (only) PHPMailer
..


Update (only) PHPMailer

Change-Id: I7922aab6116360112668ecbefd1656d43757cc19
---
M composer.lock
1 file changed, 6 insertions(+), 5 deletions(-)

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



diff --git a/composer.lock b/composer.lock
index d93db56..bd4ec82 100644
--- a/composer.lock
+++ b/composer.lock
@@ -198,6 +198,7 @@
 "messaging",
 "stomp"
 ],
+"abandoned": "stomp-php/stomp-php",
 "time": "2013-02-23 17:34:44"
 },
 {
@@ -322,16 +323,16 @@
 },
 {
 "name": "phpmailer/phpmailer",
-"version": "v5.2.16",
+"version": "v5.2.21",
 "source": {
 "type": "git",
 "url": "https://github.com/PHPMailer/PHPMailer.git;,
-"reference": "1d85f9ef3ecfc42bbc4f3c70d5e37ca9a65f629a"
+"reference": "1d51856b76c06fc687fcd9180efa7a0bed0d761e"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/PHPMailer/PHPMailer/zipball/1d85f9ef3ecfc42bbc4f3c70d5e37ca9a65f629a;,
-"reference": "1d85f9ef3ecfc42bbc4f3c70d5e37ca9a65f629a",
+"url": 
"https://api.github.com/repos/PHPMailer/PHPMailer/zipball/1d51856b76c06fc687fcd9180efa7a0bed0d761e;,
+"reference": "1d51856b76c06fc687fcd9180efa7a0bed0d761e",
 "shasum": ""
 },
 "require": {
@@ -378,7 +379,7 @@
 }
 ],
 "description": "PHPMailer is a full-featured email creation and 
transfer class for PHP",
-"time": "2016-06-06 09:09:37"
+"time": "2016-12-28 15:35:48"
 },
 {
 "name": "predis/predis",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7922aab6116360112668ecbefd1656d43757cc19
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/SmashPig
Gerrit-Branch: master
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia...SmashPig[master]: Revert "Update payments_initial when donation completes"

2016-12-28 Thread jenkins-bot (Code Review)

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

Change subject: Revert "Update payments_initial when donation completes"
..


Revert "Update payments_initial when donation completes"

Will re-apply once we can deploy it

This reverts commit 78a59db62eccfbc6cfa9ab08443e4cba31517ca4.

Change-Id: I591f6ced479d8e9a30b490b2167464cb3b753ac8
---
M Core/DataStores/PaymentsInitialDatabase.php
M PaymentProviders/Adyen/Jobs/RecordCaptureJob.php
M PaymentProviders/Adyen/Tests/config_test.yaml
M PaymentProviders/Adyen/Tests/phpunit/RecordCaptureJobTest.php
4 files changed, 1 insertion(+), 70 deletions(-)

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



diff --git a/Core/DataStores/PaymentsInitialDatabase.php 
b/Core/DataStores/PaymentsInitialDatabase.php
index 857377e..d40238c 100644
--- a/Core/DataStores/PaymentsInitialDatabase.php
+++ b/Core/DataStores/PaymentsInitialDatabase.php
@@ -75,25 +75,6 @@
$this->prepareAndExecute( $sql, $message );
}
 
-   public function updatePaymentStatus(
-   $gateway, $contributionTrackingId, $orderId, $status
-   ) {
-   $sql = 'UPDATE payments_initial
-   SET payments_final_status = :status
-   WHERE gateway = :gateway
-   AND contribution_tracking_id = :ct_id
-   AND order_id = :order_id';
-
-   $params = array(
-   'gateway' => $gateway,
-   'ct_id' => $contributionTrackingId,
-   'order_id' => $orderId,
-   'status' => $status
-   );
-
-   $this->prepareAndExecute( $sql, $params );
-   }
-
protected function getConfigKey() {
return 'data-store/fredge-db';
}
diff --git a/PaymentProviders/Adyen/Jobs/RecordCaptureJob.php 
b/PaymentProviders/Adyen/Jobs/RecordCaptureJob.php
index 8531ed8..bdcb117 100644
--- a/PaymentProviders/Adyen/Jobs/RecordCaptureJob.php
+++ b/PaymentProviders/Adyen/Jobs/RecordCaptureJob.php
@@ -1,7 +1,6 @@
 object( 'data-store/verified' )->push( 
$queueMessage );
-
-   PaymentsInitialDatabase::get()
-   ->updatePaymentStatus(
-   'adyen',
-   $dbMessage['contribution_tracking_id'],
-   $dbMessage['order_id'],
-   'complete'
-   );
 
// Remove it from the pending database
$logger->debug( 'Removing donor details message from 
pending database' );
diff --git a/PaymentProviders/Adyen/Tests/config_test.yaml 
b/PaymentProviders/Adyen/Tests/config_test.yaml
index 6f249d0..33e8128 100644
--- a/PaymentProviders/Adyen/Tests/config_test.yaml
+++ b/PaymentProviders/Adyen/Tests/config_test.yaml
@@ -24,11 +24,6 @@
 constructor-parameters:
 - 'sqlite::memory:'
 
-fredge-db:
-class: PDO
-constructor-parameters:
-- 'sqlite::memory:'
-
 payment-provider:
 adyen:
 api:
diff --git a/PaymentProviders/Adyen/Tests/phpunit/RecordCaptureJobTest.php 
b/PaymentProviders/Adyen/Tests/phpunit/RecordCaptureJobTest.php
index f59e1b2..ce3edf9 100644
--- a/PaymentProviders/Adyen/Tests/phpunit/RecordCaptureJobTest.php
+++ b/PaymentProviders/Adyen/Tests/phpunit/RecordCaptureJobTest.php
@@ -3,14 +3,11 @@
 use SmashPig\Core\Configuration;
 use SmashPig\Core\Context;
 use SmashPig\Core\DataStores\KeyedOpaqueStorableObject;
-use SmashPig\Core\DataStores\PaymentsInitialDatabase;
 use SmashPig\Core\DataStores\PendingDatabase;
 use SmashPig\Core\QueueConsumers\BaseQueueConsumer;
 use SmashPig\PaymentProviders\Adyen\Jobs\RecordCaptureJob;
 use SmashPig\PaymentProviders\Adyen\Tests\AdyenTestConfiguration;
 use SmashPig\Tests\BaseSmashPigUnitTestCase;
-use SmashPig\Tests\PaymentsInitialDatabaseTest;
-use SmashPig\Tests\TestingDatabase;
 
 /**
  * Verify Adyen RecordCapture job functions
@@ -26,43 +23,21 @@
 */
protected $pendingDatabase;
protected $pendingMessage;
-   /**
-* @var PaymentsInitialDatabase
-*/
-   protected $paymentsInitDatabase;
-   protected $paymentsInitMessage;
 
public function setUp() {
parent::setUp();
$this->config = 
AdyenTestConfiguration::createWithSuccessfulApi();
Context::initWithLogger( $this->config );
-
-   $this->paymentsInitDatabase = PaymentsInitialDatabase::get();
-   $this->paymentsInitDatabase->createTable();
-   $this->paymentsInitMessage = 
PaymentsInitialDatabaseTest::generateTestMessage();
-

[MediaWiki-commits] [Gerrit] wikimedia...SmashPig[master]: Revert "Update phpmailer for CVE-2016-10045 and CVE-2016-10033"

2016-12-28 Thread jenkins-bot (Code Review)

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

Change subject: Revert "Update phpmailer for CVE-2016-10045 and CVE-2016-10033"
..


Revert "Update phpmailer for CVE-2016-10045 and CVE-2016-10033"

This reverts commit 63d30e8c6dfaee0b38db746a21a993c282424ec8.

Change-Id: I1b0fd5ef6ddfe296290b0c254d4a9eb967e89312
---
M composer.lock
1 file changed, 107 insertions(+), 118 deletions(-)

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



diff --git a/composer.lock b/composer.lock
index 5278ada..d93db56 100644
--- a/composer.lock
+++ b/composer.lock
@@ -44,7 +44,7 @@
 "payment",
 "payments"
 ],
-"time": "2016-02-17 00:44:20"
+"time": "2016-02-17 00:53:20"
 },
 {
 "name": "clio/clio",
@@ -93,7 +93,7 @@
 "source": {
 "type": "git",
 "url": 
"https://gerrit.wikimedia.org/r/p/wikimedia/fundraising/php-queue.git;,
-"reference": "8e15cbf9a46ef58ceeadb9b359fee925291a0173"
+"reference": "14198ba1f7d4868933649a85621a3955965e83cd"
 },
 "require": {
 "clio/clio": "0.1.*",
@@ -149,7 +149,7 @@
 "queue",
 "transaction"
 ],
-"time": "2016-10-17 23:39:02"
+"time": "2016-08-05 19:16:32"
 },
 {
 "name": "fusesource/stomp-php",
@@ -198,7 +198,6 @@
 "messaging",
 "stomp"
 ],
-"abandoned": "stomp-php/stomp-php",
 "time": "2013-02-23 17:34:44"
 },
 {
@@ -245,16 +244,16 @@
 },
 {
 "name": "monolog/monolog",
-"version": "1.22.0",
+"version": "1.21.0",
 "source": {
 "type": "git",
 "url": "https://github.com/Seldaek/monolog.git;,
-"reference": "bad29cb8d18ab0315e6c477751418a82c850d558"
+"reference": "f42fbdfd53e306bda545845e4dbfd3e72edb4952"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/Seldaek/monolog/zipball/bad29cb8d18ab0315e6c477751418a82c850d558;,
-"reference": "bad29cb8d18ab0315e6c477751418a82c850d558",
+"url": 
"https://api.github.com/repos/Seldaek/monolog/zipball/f42fbdfd53e306bda545845e4dbfd3e72edb4952;,
+"reference": "f42fbdfd53e306bda545845e4dbfd3e72edb4952",
 "shasum": ""
 },
 "require": {
@@ -265,7 +264,7 @@
 "psr/log-implementation": "1.0.0"
 },
 "require-dev": {
-"aws/aws-sdk-php": "^2.4.9 || ^3.0",
+"aws/aws-sdk-php": "^2.4.9",
 "doctrine/couchdb": "~1.0@dev",
 "graylog2/gelf-php": "~1.0",
 "jakub-onderka/php-parallel-lint": "0.9",
@@ -319,20 +318,20 @@
 "logging",
 "psr-3"
 ],
-"time": "2016-11-26 00:15:39"
+"time": "2016-07-29 03:23:52"
 },
 {
 "name": "phpmailer/phpmailer",
-"version": "v5.2.21",
+"version": "v5.2.16",
 "source": {
 "type": "git",
 "url": "https://github.com/PHPMailer/PHPMailer.git;,
-"reference": "1d51856b76c06fc687fcd9180efa7a0bed0d761e"
+"reference": "1d85f9ef3ecfc42bbc4f3c70d5e37ca9a65f629a"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/PHPMailer/PHPMailer/zipball/1d51856b76c06fc687fcd9180efa7a0bed0d761e;,
-"reference": "1d51856b76c06fc687fcd9180efa7a0bed0d761e",
+"url": 
"https://api.github.com/repos/PHPMailer/PHPMailer/zipball/1d85f9ef3ecfc42bbc4f3c70d5e37ca9a65f629a;,
+"reference": "1d85f9ef3ecfc42bbc4f3c70d5e37ca9a65f629a",
 "shasum": ""
 },
 "require": {
@@ -379,7 +378,7 @@
 }
 ],
 "description": "PHPMailer is a full-featured email creation and 
transfer class for PHP",
-"time": "2016-12-28 15:35:48"
+"time": "2016-06-06 09:09:37"
 },
 {
 "name": "predis/predis",
@@ -433,30 +432,22 @@
 },
 {
 "name": "psr/log",
-"version": "1.0.2",
+"version": "1.0.0",
 "source": {
 "type": "git",
 "url": "https://github.com/php-fig/log.git;,
-"reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d"
+"reference": "fe0936ee26643249e916849d48e3a51d5f5e278b"
 },
 "dist": {

[MediaWiki-commits] [Gerrit] wikimedia...vendor[master]: Update (only) phpmailer

2016-12-28 Thread Ejegg (Code Review)

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

Change subject: Update (only) phpmailer
..

Update (only) phpmailer

Change-Id: Ibabce5112b3160d25bf192960809e3772bbeaa03
---
M composer/LICENSE
M composer/autoload_real.php
M composer/installed.json
D phpmailer/phpmailer/.gitignore
D phpmailer/phpmailer/.scrutinizer.yml
D phpmailer/phpmailer/.travis.yml
D phpmailer/phpmailer/README.md
M phpmailer/phpmailer/VERSION
D phpmailer/phpmailer/changelog.md
M phpmailer/phpmailer/class.phpmailer.php
M phpmailer/phpmailer/class.phpmaileroauth.php
M phpmailer/phpmailer/class.pop3.php
M phpmailer/phpmailer/class.smtp.php
M phpmailer/phpmailer/composer.lock
D phpmailer/phpmailer/docs/Callback_function_notes.txt
D phpmailer/phpmailer/docs/DomainKeys_notes.txt
D phpmailer/phpmailer/docs/Note_for_SMTP_debugging.txt
D phpmailer/phpmailer/docs/extending.html
D phpmailer/phpmailer/docs/faq.html
D phpmailer/phpmailer/docs/generatedocs.sh
D phpmailer/phpmailer/docs/pop3_article.txt
M phpmailer/phpmailer/examples/scripts/shLegacy.js
M phpmailer/phpmailer/examples/smtp_check.phps
M phpmailer/phpmailer/extras/htmlfilter.php
M phpmailer/phpmailer/extras/ntlm_sasl_client.php
R phpmailer/phpmailer/language/phpmailer.lang-cs.php
R phpmailer/phpmailer/language/phpmailer.lang-da.php
M phpmailer/phpmailer/language/phpmailer.lang-de.php
M phpmailer/phpmailer/language/phpmailer.lang-es.php
R phpmailer/phpmailer/language/phpmailer.lang-nb.php
R phpmailer/phpmailer/language/phpmailer.lang-pt_br.php
M phpmailer/phpmailer/language/phpmailer.lang-ro.php
R phpmailer/phpmailer/language/phpmailer.lang-sv.php
D phpmailer/phpmailer/test/bootstrap.php
D phpmailer/phpmailer/test/fakepopserver.sh
D phpmailer/phpmailer/test/fakesendmail.sh
D phpmailer/phpmailer/test/phpmailerLangTest.php
D phpmailer/phpmailer/test/phpmailerTest.php
D phpmailer/phpmailer/test/runfakepopserver.sh
D phpmailer/phpmailer/test/test_callback.php
D phpmailer/phpmailer/test/testbootstrap-dist.php
D phpmailer/phpmailer/travis.phpunit.xml.dist
42 files changed, 685 insertions(+), 4,363 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig/vendor 
refs/changes/27/329527/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibabce5112b3160d25bf192960809e3772bbeaa03
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/SmashPig/vendor
Gerrit-Branch: master
Gerrit-Owner: Ejegg 

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

[MediaWiki-commits] [Gerrit] wikimedia...vendor[master]: Revert "update phpmailer for CVE"

2016-12-28 Thread Ejegg (Code Review)

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

Change subject: Revert "update phpmailer for CVE"
..

Revert "update phpmailer for CVE"

This reverts commit b97f8f82b9fd4ba92f9a99911ac0dabe02482e79.

Change-Id: I9ff373aae3a6a1aedce2394c6a76dcdb87719551
---
M coderkungfu/php-queue/src/PHPQueue/Backend/PDO.php
M coderkungfu/php-queue/src/PHPQueue/Backend/Predis.php
D coderkungfu/php-queue/src/PHPQueue/Exception/JsonException.php
D coderkungfu/php-queue/src/PHPQueue/Json.php
M coderkungfu/php-queue/test/PHPQueue/Backend/PredisTest.php
M composer/LICENSE
M composer/autoload_files.php
M composer/autoload_namespaces.php
M composer/autoload_psr4.php
M composer/installed.json
M monolog/monolog/CHANGELOG.mdown
M monolog/monolog/composer.json
M monolog/monolog/doc/02-handlers-formatters-processors.md
M monolog/monolog/src/Monolog/Formatter/JsonFormatter.php
M monolog/monolog/src/Monolog/Formatter/LineFormatter.php
M monolog/monolog/src/Monolog/Formatter/NormalizerFormatter.php
M monolog/monolog/src/Monolog/Handler/AmqpHandler.php
M monolog/monolog/src/Monolog/Handler/DynamoDbHandler.php
M monolog/monolog/src/Monolog/Handler/RavenHandler.php
M monolog/monolog/src/Monolog/Handler/RollbarHandler.php
D monolog/monolog/src/Monolog/Handler/Slack/SlackRecord.php
M monolog/monolog/src/Monolog/Handler/SlackHandler.php
D monolog/monolog/src/Monolog/Handler/SlackWebhookHandler.php
D monolog/monolog/src/Monolog/Handler/SlackbotHandler.php
M monolog/monolog/src/Monolog/Handler/StreamHandler.php
M monolog/monolog/src/Monolog/Handler/SyslogUdpHandler.php
M monolog/monolog/src/Monolog/Handler/TestHandler.php
M monolog/monolog/src/Monolog/Logger.php
D monolog/monolog/src/Monolog/Processor/MercurialProcessor.php
M monolog/monolog/tests/Monolog/Formatter/JsonFormatterTest.php
M monolog/monolog/tests/Monolog/Formatter/NormalizerFormatterTest.php
M monolog/monolog/tests/Monolog/Handler/RavenHandlerTest.php
D monolog/monolog/tests/Monolog/Handler/Slack/SlackRecordTest.php
M monolog/monolog/tests/Monolog/Handler/SlackHandlerTest.php
D monolog/monolog/tests/Monolog/Handler/SlackWebhookHandlerTest.php
D monolog/monolog/tests/Monolog/Handler/SlackbotHandlerTest.php
M monolog/monolog/tests/Monolog/Handler/SyslogUdpHandlerTest.php
M monolog/monolog/tests/Monolog/Handler/TestHandlerTest.php
M monolog/monolog/tests/Monolog/LoggerTest.php
D monolog/monolog/tests/Monolog/Processor/MercurialProcessorTest.php
A phpmailer/phpmailer/.gitignore
A phpmailer/phpmailer/.scrutinizer.yml
A phpmailer/phpmailer/.travis.yml
A phpmailer/phpmailer/README.md
M phpmailer/phpmailer/VERSION
A phpmailer/phpmailer/changelog.md
M phpmailer/phpmailer/class.phpmailer.php
M phpmailer/phpmailer/class.phpmaileroauth.php
M phpmailer/phpmailer/class.pop3.php
M phpmailer/phpmailer/class.smtp.php
M phpmailer/phpmailer/composer.lock
A phpmailer/phpmailer/docs/Callback_function_notes.txt
A phpmailer/phpmailer/docs/DomainKeys_notes.txt
A phpmailer/phpmailer/docs/Note_for_SMTP_debugging.txt
A phpmailer/phpmailer/docs/extending.html
A phpmailer/phpmailer/docs/faq.html
A phpmailer/phpmailer/docs/generatedocs.sh
A phpmailer/phpmailer/docs/pop3_article.txt
M phpmailer/phpmailer/examples/scripts/shLegacy.js
M phpmailer/phpmailer/examples/smtp_check.phps
M phpmailer/phpmailer/extras/htmlfilter.php
M phpmailer/phpmailer/extras/ntlm_sasl_client.php
R phpmailer/phpmailer/language/phpmailer.lang-br.php
R phpmailer/phpmailer/language/phpmailer.lang-cz.php
M phpmailer/phpmailer/language/phpmailer.lang-de.php
R phpmailer/phpmailer/language/phpmailer.lang-dk.php
M phpmailer/phpmailer/language/phpmailer.lang-es.php
R phpmailer/phpmailer/language/phpmailer.lang-no.php
M phpmailer/phpmailer/language/phpmailer.lang-ro.php
R phpmailer/phpmailer/language/phpmailer.lang-se.php
A phpmailer/phpmailer/test/bootstrap.php
A phpmailer/phpmailer/test/fakepopserver.sh
A phpmailer/phpmailer/test/fakesendmail.sh
A phpmailer/phpmailer/test/phpmailerLangTest.php
A phpmailer/phpmailer/test/phpmailerTest.php
A phpmailer/phpmailer/test/runfakepopserver.sh
A phpmailer/phpmailer/test/test_callback.php
A phpmailer/phpmailer/test/testbootstrap-dist.php
A phpmailer/phpmailer/travis.phpunit.xml.dist
M psr/log/Psr/Log/AbstractLogger.php
M psr/log/Psr/Log/LogLevel.php
M psr/log/Psr/Log/LoggerAwareInterface.php
M psr/log/Psr/Log/LoggerAwareTrait.php
M psr/log/Psr/Log/LoggerInterface.php
M psr/log/Psr/Log/LoggerTrait.php
M psr/log/Psr/Log/NullLogger.php
M psr/log/Psr/Log/Test/LoggerInterfaceTest.php
M psr/log/composer.json
M symfony/event-dispatcher/EventDispatcher.php
M symfony/http-foundation/BinaryFileResponse.php
M symfony/http-foundation/File/MimeType/FileinfoMimeTypeGuesser.php
M symfony/http-foundation/JsonResponse.php
M symfony/http-foundation/Request.php
M symfony/http-foundation/RequestMatcher.php
M symfony/http-foundation/Response.php
M

[MediaWiki-commits] [Gerrit] wikimedia...SmashPig[master]: Revert "Update payments_initial when donation completes"

2016-12-28 Thread Ejegg (Code Review)

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

Change subject: Revert "Update payments_initial when donation completes"
..

Revert "Update payments_initial when donation completes"

Will re-apply once we can deploy it

This reverts commit 78a59db62eccfbc6cfa9ab08443e4cba31517ca4.

Change-Id: I591f6ced479d8e9a30b490b2167464cb3b753ac8
---
M Core/DataStores/PaymentsInitialDatabase.php
M PaymentProviders/Adyen/Jobs/RecordCaptureJob.php
M PaymentProviders/Adyen/Tests/config_test.yaml
M PaymentProviders/Adyen/Tests/phpunit/RecordCaptureJobTest.php
4 files changed, 1 insertion(+), 70 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig 
refs/changes/24/329524/1

diff --git a/Core/DataStores/PaymentsInitialDatabase.php 
b/Core/DataStores/PaymentsInitialDatabase.php
index 857377e..d40238c 100644
--- a/Core/DataStores/PaymentsInitialDatabase.php
+++ b/Core/DataStores/PaymentsInitialDatabase.php
@@ -75,25 +75,6 @@
$this->prepareAndExecute( $sql, $message );
}
 
-   public function updatePaymentStatus(
-   $gateway, $contributionTrackingId, $orderId, $status
-   ) {
-   $sql = 'UPDATE payments_initial
-   SET payments_final_status = :status
-   WHERE gateway = :gateway
-   AND contribution_tracking_id = :ct_id
-   AND order_id = :order_id';
-
-   $params = array(
-   'gateway' => $gateway,
-   'ct_id' => $contributionTrackingId,
-   'order_id' => $orderId,
-   'status' => $status
-   );
-
-   $this->prepareAndExecute( $sql, $params );
-   }
-
protected function getConfigKey() {
return 'data-store/fredge-db';
}
diff --git a/PaymentProviders/Adyen/Jobs/RecordCaptureJob.php 
b/PaymentProviders/Adyen/Jobs/RecordCaptureJob.php
index 8531ed8..bdcb117 100644
--- a/PaymentProviders/Adyen/Jobs/RecordCaptureJob.php
+++ b/PaymentProviders/Adyen/Jobs/RecordCaptureJob.php
@@ -1,7 +1,6 @@
 object( 'data-store/verified' )->push( 
$queueMessage );
-
-   PaymentsInitialDatabase::get()
-   ->updatePaymentStatus(
-   'adyen',
-   $dbMessage['contribution_tracking_id'],
-   $dbMessage['order_id'],
-   'complete'
-   );
 
// Remove it from the pending database
$logger->debug( 'Removing donor details message from 
pending database' );
diff --git a/PaymentProviders/Adyen/Tests/config_test.yaml 
b/PaymentProviders/Adyen/Tests/config_test.yaml
index 6f249d0..33e8128 100644
--- a/PaymentProviders/Adyen/Tests/config_test.yaml
+++ b/PaymentProviders/Adyen/Tests/config_test.yaml
@@ -24,11 +24,6 @@
 constructor-parameters:
 - 'sqlite::memory:'
 
-fredge-db:
-class: PDO
-constructor-parameters:
-- 'sqlite::memory:'
-
 payment-provider:
 adyen:
 api:
diff --git a/PaymentProviders/Adyen/Tests/phpunit/RecordCaptureJobTest.php 
b/PaymentProviders/Adyen/Tests/phpunit/RecordCaptureJobTest.php
index f59e1b2..ce3edf9 100644
--- a/PaymentProviders/Adyen/Tests/phpunit/RecordCaptureJobTest.php
+++ b/PaymentProviders/Adyen/Tests/phpunit/RecordCaptureJobTest.php
@@ -3,14 +3,11 @@
 use SmashPig\Core\Configuration;
 use SmashPig\Core\Context;
 use SmashPig\Core\DataStores\KeyedOpaqueStorableObject;
-use SmashPig\Core\DataStores\PaymentsInitialDatabase;
 use SmashPig\Core\DataStores\PendingDatabase;
 use SmashPig\Core\QueueConsumers\BaseQueueConsumer;
 use SmashPig\PaymentProviders\Adyen\Jobs\RecordCaptureJob;
 use SmashPig\PaymentProviders\Adyen\Tests\AdyenTestConfiguration;
 use SmashPig\Tests\BaseSmashPigUnitTestCase;
-use SmashPig\Tests\PaymentsInitialDatabaseTest;
-use SmashPig\Tests\TestingDatabase;
 
 /**
  * Verify Adyen RecordCapture job functions
@@ -26,43 +23,21 @@
 */
protected $pendingDatabase;
protected $pendingMessage;
-   /**
-* @var PaymentsInitialDatabase
-*/
-   protected $paymentsInitDatabase;
-   protected $paymentsInitMessage;
 
public function setUp() {
parent::setUp();
$this->config = 
AdyenTestConfiguration::createWithSuccessfulApi();
Context::initWithLogger( $this->config );
-
-   $this->paymentsInitDatabase = PaymentsInitialDatabase::get();
-   $this->paymentsInitDatabase->createTable();
-   $this->paymentsInitMessage = 
PaymentsInitialDatabaseTest::generateTestMessage();
-

[MediaWiki-commits] [Gerrit] wikimedia...SmashPig[master]: Update (only) PHPMailer

2016-12-28 Thread Ejegg (Code Review)

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

Change subject: Update (only) PHPMailer
..

Update (only) PHPMailer

Change-Id: I7922aab6116360112668ecbefd1656d43757cc19
---
M composer.lock
1 file changed, 6 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig 
refs/changes/23/329523/1

diff --git a/composer.lock b/composer.lock
index d93db56..bd4ec82 100644
--- a/composer.lock
+++ b/composer.lock
@@ -198,6 +198,7 @@
 "messaging",
 "stomp"
 ],
+"abandoned": "stomp-php/stomp-php",
 "time": "2013-02-23 17:34:44"
 },
 {
@@ -322,16 +323,16 @@
 },
 {
 "name": "phpmailer/phpmailer",
-"version": "v5.2.16",
+"version": "v5.2.21",
 "source": {
 "type": "git",
 "url": "https://github.com/PHPMailer/PHPMailer.git;,
-"reference": "1d85f9ef3ecfc42bbc4f3c70d5e37ca9a65f629a"
+"reference": "1d51856b76c06fc687fcd9180efa7a0bed0d761e"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/PHPMailer/PHPMailer/zipball/1d85f9ef3ecfc42bbc4f3c70d5e37ca9a65f629a;,
-"reference": "1d85f9ef3ecfc42bbc4f3c70d5e37ca9a65f629a",
+"url": 
"https://api.github.com/repos/PHPMailer/PHPMailer/zipball/1d51856b76c06fc687fcd9180efa7a0bed0d761e;,
+"reference": "1d51856b76c06fc687fcd9180efa7a0bed0d761e",
 "shasum": ""
 },
 "require": {
@@ -378,7 +379,7 @@
 }
 ],
 "description": "PHPMailer is a full-featured email creation and 
transfer class for PHP",
-"time": "2016-06-06 09:09:37"
+"time": "2016-12-28 15:35:48"
 },
 {
 "name": "predis/predis",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7922aab6116360112668ecbefd1656d43757cc19
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/SmashPig
Gerrit-Branch: master
Gerrit-Owner: Ejegg 

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

[MediaWiki-commits] [Gerrit] wikimedia...SmashPig[master]: Revert "Update phpmailer for CVE-2016-10045 and CVE-2016-10033"

2016-12-28 Thread Ejegg (Code Review)

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

Change subject: Revert "Update phpmailer for CVE-2016-10045 and CVE-2016-10033"
..

Revert "Update phpmailer for CVE-2016-10045 and CVE-2016-10033"

This reverts commit 63d30e8c6dfaee0b38db746a21a993c282424ec8.

Change-Id: I1b0fd5ef6ddfe296290b0c254d4a9eb967e89312
---
M composer.lock
1 file changed, 107 insertions(+), 118 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig 
refs/changes/22/329522/1

diff --git a/composer.lock b/composer.lock
index 5278ada..d93db56 100644
--- a/composer.lock
+++ b/composer.lock
@@ -44,7 +44,7 @@
 "payment",
 "payments"
 ],
-"time": "2016-02-17 00:44:20"
+"time": "2016-02-17 00:53:20"
 },
 {
 "name": "clio/clio",
@@ -93,7 +93,7 @@
 "source": {
 "type": "git",
 "url": 
"https://gerrit.wikimedia.org/r/p/wikimedia/fundraising/php-queue.git;,
-"reference": "8e15cbf9a46ef58ceeadb9b359fee925291a0173"
+"reference": "14198ba1f7d4868933649a85621a3955965e83cd"
 },
 "require": {
 "clio/clio": "0.1.*",
@@ -149,7 +149,7 @@
 "queue",
 "transaction"
 ],
-"time": "2016-10-17 23:39:02"
+"time": "2016-08-05 19:16:32"
 },
 {
 "name": "fusesource/stomp-php",
@@ -198,7 +198,6 @@
 "messaging",
 "stomp"
 ],
-"abandoned": "stomp-php/stomp-php",
 "time": "2013-02-23 17:34:44"
 },
 {
@@ -245,16 +244,16 @@
 },
 {
 "name": "monolog/monolog",
-"version": "1.22.0",
+"version": "1.21.0",
 "source": {
 "type": "git",
 "url": "https://github.com/Seldaek/monolog.git;,
-"reference": "bad29cb8d18ab0315e6c477751418a82c850d558"
+"reference": "f42fbdfd53e306bda545845e4dbfd3e72edb4952"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/Seldaek/monolog/zipball/bad29cb8d18ab0315e6c477751418a82c850d558;,
-"reference": "bad29cb8d18ab0315e6c477751418a82c850d558",
+"url": 
"https://api.github.com/repos/Seldaek/monolog/zipball/f42fbdfd53e306bda545845e4dbfd3e72edb4952;,
+"reference": "f42fbdfd53e306bda545845e4dbfd3e72edb4952",
 "shasum": ""
 },
 "require": {
@@ -265,7 +264,7 @@
 "psr/log-implementation": "1.0.0"
 },
 "require-dev": {
-"aws/aws-sdk-php": "^2.4.9 || ^3.0",
+"aws/aws-sdk-php": "^2.4.9",
 "doctrine/couchdb": "~1.0@dev",
 "graylog2/gelf-php": "~1.0",
 "jakub-onderka/php-parallel-lint": "0.9",
@@ -319,20 +318,20 @@
 "logging",
 "psr-3"
 ],
-"time": "2016-11-26 00:15:39"
+"time": "2016-07-29 03:23:52"
 },
 {
 "name": "phpmailer/phpmailer",
-"version": "v5.2.21",
+"version": "v5.2.16",
 "source": {
 "type": "git",
 "url": "https://github.com/PHPMailer/PHPMailer.git;,
-"reference": "1d51856b76c06fc687fcd9180efa7a0bed0d761e"
+"reference": "1d85f9ef3ecfc42bbc4f3c70d5e37ca9a65f629a"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/PHPMailer/PHPMailer/zipball/1d51856b76c06fc687fcd9180efa7a0bed0d761e;,
-"reference": "1d51856b76c06fc687fcd9180efa7a0bed0d761e",
+"url": 
"https://api.github.com/repos/PHPMailer/PHPMailer/zipball/1d85f9ef3ecfc42bbc4f3c70d5e37ca9a65f629a;,
+"reference": "1d85f9ef3ecfc42bbc4f3c70d5e37ca9a65f629a",
 "shasum": ""
 },
 "require": {
@@ -379,7 +378,7 @@
 }
 ],
 "description": "PHPMailer is a full-featured email creation and 
transfer class for PHP",
-"time": "2016-12-28 15:35:48"
+"time": "2016-06-06 09:09:37"
 },
 {
 "name": "predis/predis",
@@ -433,30 +432,22 @@
 },
 {
 "name": "psr/log",
-"version": "1.0.2",
+"version": "1.0.0",
 "source": {
 "type": "git",
 "url": "https://github.com/php-fig/log.git;,
-"reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d"
+"reference": "fe0936ee26643249e916849d48e3a51d5f5e278b"
 },

[MediaWiki-commits] [Gerrit] wikimedia...SmashPig[deployment]: Revert "Update phpmailer for CVE-2016-10045 and CVE-2016-10033"

2016-12-28 Thread Cdentinger (Code Review)

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

Change subject: Revert "Update phpmailer for CVE-2016-10045 and CVE-2016-10033"
..

Revert "Update phpmailer for CVE-2016-10045 and CVE-2016-10033"

This reverts commit 5b466f39f8e57177481cef8c15cc89a037d5a5de.

Change-Id: Ifa053095b4ae511881afbf771ea3074f948ed60c
---
M composer.lock
M vendor
2 files changed, 108 insertions(+), 119 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig 
refs/changes/21/329521/1

diff --git a/composer.lock b/composer.lock
index db64036..12315e9 100644
--- a/composer.lock
+++ b/composer.lock
@@ -44,7 +44,7 @@
 "payment",
 "payments"
 ],
-"time": "2016-02-17 00:44:20"
+"time": "2016-02-17 00:53:20"
 },
 {
 "name": "clio/clio",
@@ -93,7 +93,7 @@
 "source": {
 "type": "git",
 "url": 
"https://gerrit.wikimedia.org/r/p/wikimedia/fundraising/php-queue.git;,
-"reference": "8e15cbf9a46ef58ceeadb9b359fee925291a0173"
+"reference": "14198ba1f7d4868933649a85621a3955965e83cd"
 },
 "require": {
 "clio/clio": "0.1.*",
@@ -148,7 +148,7 @@
 "queue",
 "transaction"
 ],
-"time": "2016-10-17 23:39:02"
+"time": "2016-08-05 19:16:32"
 },
 {
 "name": "fusesource/stomp-php",
@@ -197,7 +197,6 @@
 "messaging",
 "stomp"
 ],
-"abandoned": "stomp-php/stomp-php",
 "time": "2013-02-23 17:34:44"
 },
 {
@@ -244,16 +243,16 @@
 },
 {
 "name": "monolog/monolog",
-"version": "1.22.0",
+"version": "1.21.0",
 "source": {
 "type": "git",
 "url": "https://github.com/Seldaek/monolog.git;,
-"reference": "bad29cb8d18ab0315e6c477751418a82c850d558"
+"reference": "f42fbdfd53e306bda545845e4dbfd3e72edb4952"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/Seldaek/monolog/zipball/bad29cb8d18ab0315e6c477751418a82c850d558;,
-"reference": "bad29cb8d18ab0315e6c477751418a82c850d558",
+"url": 
"https://api.github.com/repos/Seldaek/monolog/zipball/f42fbdfd53e306bda545845e4dbfd3e72edb4952;,
+"reference": "f42fbdfd53e306bda545845e4dbfd3e72edb4952",
 "shasum": ""
 },
 "require": {
@@ -264,7 +263,7 @@
 "psr/log-implementation": "1.0.0"
 },
 "require-dev": {
-"aws/aws-sdk-php": "^2.4.9 || ^3.0",
+"aws/aws-sdk-php": "^2.4.9",
 "doctrine/couchdb": "~1.0@dev",
 "graylog2/gelf-php": "~1.0",
 "jakub-onderka/php-parallel-lint": "0.9",
@@ -318,20 +317,20 @@
 "logging",
 "psr-3"
 ],
-"time": "2016-11-26 00:15:39"
+"time": "2016-07-29 03:23:52"
 },
 {
 "name": "phpmailer/phpmailer",
-"version": "v5.2.21",
+"version": "v5.2.16",
 "source": {
 "type": "git",
 "url": "https://github.com/PHPMailer/PHPMailer.git;,
-"reference": "1d51856b76c06fc687fcd9180efa7a0bed0d761e"
+"reference": "1d85f9ef3ecfc42bbc4f3c70d5e37ca9a65f629a"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/PHPMailer/PHPMailer/zipball/1d51856b76c06fc687fcd9180efa7a0bed0d761e;,
-"reference": "1d51856b76c06fc687fcd9180efa7a0bed0d761e",
+"url": 
"https://api.github.com/repos/PHPMailer/PHPMailer/zipball/1d85f9ef3ecfc42bbc4f3c70d5e37ca9a65f629a;,
+"reference": "1d85f9ef3ecfc42bbc4f3c70d5e37ca9a65f629a",
 "shasum": ""
 },
 "require": {
@@ -378,7 +377,7 @@
 }
 ],
 "description": "PHPMailer is a full-featured email creation and 
transfer class for PHP",
-"time": "2016-12-28 15:35:48"
+"time": "2016-06-06 09:09:37"
 },
 {
 "name": "predis/predis",
@@ -432,30 +431,22 @@
 },
 {
 "name": "psr/log",
-"version": "1.0.2",
+"version": "1.0.0",
 "source": {
 "type": "git",
 "url": "https://github.com/php-fig/log.git;,
-"reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d"
+"reference": "fe0936ee26643249e916849d48e3a51d5f5e278b"
 },

[MediaWiki-commits] [Gerrit] wikimedia...SmashPig[master]: Revert "Update phpmailer for CVE-2016-10045 and CVE-2016-10033"

2016-12-28 Thread Cdentinger (Code Review)

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

Change subject: Revert "Update phpmailer for CVE-2016-10045 and CVE-2016-10033"
..

Revert "Update phpmailer for CVE-2016-10045 and CVE-2016-10033"

This reverts commit 63d30e8c6dfaee0b38db746a21a993c282424ec8.

Change-Id: Ic78f5a7c8978c7092cd7e727dc8552a71d7df2ec
---
M composer.lock
1 file changed, 107 insertions(+), 118 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig 
refs/changes/20/329520/1

diff --git a/composer.lock b/composer.lock
index 5278ada..d93db56 100644
--- a/composer.lock
+++ b/composer.lock
@@ -44,7 +44,7 @@
 "payment",
 "payments"
 ],
-"time": "2016-02-17 00:44:20"
+"time": "2016-02-17 00:53:20"
 },
 {
 "name": "clio/clio",
@@ -93,7 +93,7 @@
 "source": {
 "type": "git",
 "url": 
"https://gerrit.wikimedia.org/r/p/wikimedia/fundraising/php-queue.git;,
-"reference": "8e15cbf9a46ef58ceeadb9b359fee925291a0173"
+"reference": "14198ba1f7d4868933649a85621a3955965e83cd"
 },
 "require": {
 "clio/clio": "0.1.*",
@@ -149,7 +149,7 @@
 "queue",
 "transaction"
 ],
-"time": "2016-10-17 23:39:02"
+"time": "2016-08-05 19:16:32"
 },
 {
 "name": "fusesource/stomp-php",
@@ -198,7 +198,6 @@
 "messaging",
 "stomp"
 ],
-"abandoned": "stomp-php/stomp-php",
 "time": "2013-02-23 17:34:44"
 },
 {
@@ -245,16 +244,16 @@
 },
 {
 "name": "monolog/monolog",
-"version": "1.22.0",
+"version": "1.21.0",
 "source": {
 "type": "git",
 "url": "https://github.com/Seldaek/monolog.git;,
-"reference": "bad29cb8d18ab0315e6c477751418a82c850d558"
+"reference": "f42fbdfd53e306bda545845e4dbfd3e72edb4952"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/Seldaek/monolog/zipball/bad29cb8d18ab0315e6c477751418a82c850d558;,
-"reference": "bad29cb8d18ab0315e6c477751418a82c850d558",
+"url": 
"https://api.github.com/repos/Seldaek/monolog/zipball/f42fbdfd53e306bda545845e4dbfd3e72edb4952;,
+"reference": "f42fbdfd53e306bda545845e4dbfd3e72edb4952",
 "shasum": ""
 },
 "require": {
@@ -265,7 +264,7 @@
 "psr/log-implementation": "1.0.0"
 },
 "require-dev": {
-"aws/aws-sdk-php": "^2.4.9 || ^3.0",
+"aws/aws-sdk-php": "^2.4.9",
 "doctrine/couchdb": "~1.0@dev",
 "graylog2/gelf-php": "~1.0",
 "jakub-onderka/php-parallel-lint": "0.9",
@@ -319,20 +318,20 @@
 "logging",
 "psr-3"
 ],
-"time": "2016-11-26 00:15:39"
+"time": "2016-07-29 03:23:52"
 },
 {
 "name": "phpmailer/phpmailer",
-"version": "v5.2.21",
+"version": "v5.2.16",
 "source": {
 "type": "git",
 "url": "https://github.com/PHPMailer/PHPMailer.git;,
-"reference": "1d51856b76c06fc687fcd9180efa7a0bed0d761e"
+"reference": "1d85f9ef3ecfc42bbc4f3c70d5e37ca9a65f629a"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/PHPMailer/PHPMailer/zipball/1d51856b76c06fc687fcd9180efa7a0bed0d761e;,
-"reference": "1d51856b76c06fc687fcd9180efa7a0bed0d761e",
+"url": 
"https://api.github.com/repos/PHPMailer/PHPMailer/zipball/1d85f9ef3ecfc42bbc4f3c70d5e37ca9a65f629a;,
+"reference": "1d85f9ef3ecfc42bbc4f3c70d5e37ca9a65f629a",
 "shasum": ""
 },
 "require": {
@@ -379,7 +378,7 @@
 }
 ],
 "description": "PHPMailer is a full-featured email creation and 
transfer class for PHP",
-"time": "2016-12-28 15:35:48"
+"time": "2016-06-06 09:09:37"
 },
 {
 "name": "predis/predis",
@@ -433,30 +432,22 @@
 },
 {
 "name": "psr/log",
-"version": "1.0.2",
+"version": "1.0.0",
 "source": {
 "type": "git",
 "url": "https://github.com/php-fig/log.git;,
-"reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d"
+"reference": "fe0936ee26643249e916849d48e3a51d5f5e278b"
 },

[MediaWiki-commits] [Gerrit] wikimedia...vendor[master]: Revert "update phpmailer for CVE"

2016-12-28 Thread Cdentinger (Code Review)

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

Change subject: Revert "update phpmailer for CVE"
..

Revert "update phpmailer for CVE"

This reverts commit b97f8f82b9fd4ba92f9a99911ac0dabe02482e79.

Change-Id: Iafeb580dee921efe64dc03165d477127f87e5023
---
M coderkungfu/php-queue/src/PHPQueue/Backend/PDO.php
M coderkungfu/php-queue/src/PHPQueue/Backend/Predis.php
D coderkungfu/php-queue/src/PHPQueue/Exception/JsonException.php
D coderkungfu/php-queue/src/PHPQueue/Json.php
M coderkungfu/php-queue/test/PHPQueue/Backend/PredisTest.php
M composer/LICENSE
M composer/autoload_files.php
M composer/autoload_namespaces.php
M composer/autoload_psr4.php
M composer/installed.json
M monolog/monolog/CHANGELOG.mdown
M monolog/monolog/composer.json
M monolog/monolog/doc/02-handlers-formatters-processors.md
M monolog/monolog/src/Monolog/Formatter/JsonFormatter.php
M monolog/monolog/src/Monolog/Formatter/LineFormatter.php
M monolog/monolog/src/Monolog/Formatter/NormalizerFormatter.php
M monolog/monolog/src/Monolog/Handler/AmqpHandler.php
M monolog/monolog/src/Monolog/Handler/DynamoDbHandler.php
M monolog/monolog/src/Monolog/Handler/RavenHandler.php
M monolog/monolog/src/Monolog/Handler/RollbarHandler.php
D monolog/monolog/src/Monolog/Handler/Slack/SlackRecord.php
M monolog/monolog/src/Monolog/Handler/SlackHandler.php
D monolog/monolog/src/Monolog/Handler/SlackWebhookHandler.php
D monolog/monolog/src/Monolog/Handler/SlackbotHandler.php
M monolog/monolog/src/Monolog/Handler/StreamHandler.php
M monolog/monolog/src/Monolog/Handler/SyslogUdpHandler.php
M monolog/monolog/src/Monolog/Handler/TestHandler.php
M monolog/monolog/src/Monolog/Logger.php
D monolog/monolog/src/Monolog/Processor/MercurialProcessor.php
M monolog/monolog/tests/Monolog/Formatter/JsonFormatterTest.php
M monolog/monolog/tests/Monolog/Formatter/NormalizerFormatterTest.php
M monolog/monolog/tests/Monolog/Handler/RavenHandlerTest.php
D monolog/monolog/tests/Monolog/Handler/Slack/SlackRecordTest.php
M monolog/monolog/tests/Monolog/Handler/SlackHandlerTest.php
D monolog/monolog/tests/Monolog/Handler/SlackWebhookHandlerTest.php
D monolog/monolog/tests/Monolog/Handler/SlackbotHandlerTest.php
M monolog/monolog/tests/Monolog/Handler/SyslogUdpHandlerTest.php
M monolog/monolog/tests/Monolog/Handler/TestHandlerTest.php
M monolog/monolog/tests/Monolog/LoggerTest.php
D monolog/monolog/tests/Monolog/Processor/MercurialProcessorTest.php
A phpmailer/phpmailer/.gitignore
A phpmailer/phpmailer/.scrutinizer.yml
A phpmailer/phpmailer/.travis.yml
A phpmailer/phpmailer/README.md
M phpmailer/phpmailer/VERSION
A phpmailer/phpmailer/changelog.md
M phpmailer/phpmailer/class.phpmailer.php
M phpmailer/phpmailer/class.phpmaileroauth.php
M phpmailer/phpmailer/class.pop3.php
M phpmailer/phpmailer/class.smtp.php
M phpmailer/phpmailer/composer.lock
A phpmailer/phpmailer/docs/Callback_function_notes.txt
A phpmailer/phpmailer/docs/DomainKeys_notes.txt
A phpmailer/phpmailer/docs/Note_for_SMTP_debugging.txt
A phpmailer/phpmailer/docs/extending.html
A phpmailer/phpmailer/docs/faq.html
A phpmailer/phpmailer/docs/generatedocs.sh
A phpmailer/phpmailer/docs/pop3_article.txt
M phpmailer/phpmailer/examples/scripts/shLegacy.js
M phpmailer/phpmailer/examples/smtp_check.phps
M phpmailer/phpmailer/extras/htmlfilter.php
M phpmailer/phpmailer/extras/ntlm_sasl_client.php
R phpmailer/phpmailer/language/phpmailer.lang-br.php
R phpmailer/phpmailer/language/phpmailer.lang-cz.php
M phpmailer/phpmailer/language/phpmailer.lang-de.php
R phpmailer/phpmailer/language/phpmailer.lang-dk.php
M phpmailer/phpmailer/language/phpmailer.lang-es.php
R phpmailer/phpmailer/language/phpmailer.lang-no.php
M phpmailer/phpmailer/language/phpmailer.lang-ro.php
R phpmailer/phpmailer/language/phpmailer.lang-se.php
A phpmailer/phpmailer/test/bootstrap.php
A phpmailer/phpmailer/test/fakepopserver.sh
A phpmailer/phpmailer/test/fakesendmail.sh
A phpmailer/phpmailer/test/phpmailerLangTest.php
A phpmailer/phpmailer/test/phpmailerTest.php
A phpmailer/phpmailer/test/runfakepopserver.sh
A phpmailer/phpmailer/test/test_callback.php
A phpmailer/phpmailer/test/testbootstrap-dist.php
A phpmailer/phpmailer/travis.phpunit.xml.dist
M psr/log/Psr/Log/AbstractLogger.php
M psr/log/Psr/Log/LogLevel.php
M psr/log/Psr/Log/LoggerAwareInterface.php
M psr/log/Psr/Log/LoggerAwareTrait.php
M psr/log/Psr/Log/LoggerInterface.php
M psr/log/Psr/Log/LoggerTrait.php
M psr/log/Psr/Log/NullLogger.php
M psr/log/Psr/Log/Test/LoggerInterfaceTest.php
M psr/log/composer.json
M symfony/event-dispatcher/EventDispatcher.php
M symfony/http-foundation/BinaryFileResponse.php
M symfony/http-foundation/File/MimeType/FileinfoMimeTypeGuesser.php
M symfony/http-foundation/JsonResponse.php
M symfony/http-foundation/Request.php
M symfony/http-foundation/RequestMatcher.php
M symfony/http-foundation/Response.php
M

[MediaWiki-commits] [Gerrit] mediawiki...Nimbus[master]: Remove unused stylesheet

2016-12-28 Thread jenkins-bot (Code Review)

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

Change subject: Remove unused stylesheet
..


Remove unused stylesheet

Change-Id: I042e472e1c2a1eee83ca131cf05e366ee2293bc6
---
M Nimbus.skin.php
D nimbus/Nimbus_IE.css
M skin.json
3 files changed, 1 insertion(+), 39 deletions(-)

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



diff --git a/Nimbus.skin.php b/Nimbus.skin.php
index 9f5725f..edaa0fb 100644
--- a/Nimbus.skin.php
+++ b/Nimbus.skin.php
@@ -49,9 +49,6 @@
'skins.monobook.styles',
'skins.nimbus'
) );
-
-   // IE-specific CSS
-   #$out->addStyle( 'Nimbus/nimbus/Nimbus_IE.css', 'screen', 'IE' 
);
}
 }
 
diff --git a/nimbus/Nimbus_IE.css b/nimbus/Nimbus_IE.css
deleted file mode 100644
index 7dd9167..000
--- a/nimbus/Nimbus_IE.css
+++ /dev/null
@@ -1,34 +0,0 @@
-.user-board-message-links {
-   padding-top: 5px;
-}
-
-.profile-toggle-button {
-   left: 50px;
-}
-
-#title-linktabs, #profile-toggle-button {
-   right: 20px !important;
-}
-
-.ratings-top {
-   right: 20px !important;
-   top: 45px;
-}
-
-.bottom-left-nav {
-   margin-top: 0px;
-}
-
-.menu-item .sub-menu-button {
-   right: 10px;
-}
-
-#title-linktabs {
-   right: 0px !important;
-   top: 5px !important;
-}
-
-.ratings-top {
-   right: 0px !important;
-   top: 37px !important;
-}
\ No newline at end of file
diff --git a/skin.json b/skin.json
index 36dc204..9979080 100644
--- a/skin.json
+++ b/skin.json
@@ -1,6 +1,6 @@
 {
"name": "Nimbus",
-   "version": "3.2.1",
+   "version": "3.2.2",
"author": [
"Aaron Wright",
"David Pean",
@@ -43,4 +43,3 @@
},
"manifest_version": 1
 }
-

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I042e472e1c2a1eee83ca131cf05e366ee2293bc6
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/skins/Nimbus
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Nimbus[master]: Remove unused stylesheet

2016-12-28 Thread SamanthaNguyen (Code Review)

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

Change subject: Remove unused stylesheet
..

Remove unused stylesheet

Change-Id: I042e472e1c2a1eee83ca131cf05e366ee2293bc6
---
D nimbus/Nimbus_IE.css
1 file changed, 0 insertions(+), 34 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Nimbus 
refs/changes/18/329518/1

diff --git a/nimbus/Nimbus_IE.css b/nimbus/Nimbus_IE.css
deleted file mode 100644
index 7dd9167..000
--- a/nimbus/Nimbus_IE.css
+++ /dev/null
@@ -1,34 +0,0 @@
-.user-board-message-links {
-   padding-top: 5px;
-}
-
-.profile-toggle-button {
-   left: 50px;
-}
-
-#title-linktabs, #profile-toggle-button {
-   right: 20px !important;
-}
-
-.ratings-top {
-   right: 20px !important;
-   top: 45px;
-}
-
-.bottom-left-nav {
-   margin-top: 0px;
-}
-
-.menu-item .sub-menu-button {
-   right: 10px;
-}
-
-#title-linktabs {
-   right: 0px !important;
-   top: 5px !important;
-}
-
-.ratings-top {
-   right: 0px !important;
-   top: 37px !important;
-}
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I042e472e1c2a1eee83ca131cf05e366ee2293bc6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Nimbus
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 

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

[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: update composer.lock

2016-12-28 Thread jenkins-bot (Code Review)

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

Change subject: update composer.lock
..


update composer.lock

Change-Id: I1d7aa560d7c501da5e640992921c4cae739ed264
---
M composer.lock
1 file changed, 65 insertions(+), 57 deletions(-)

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



diff --git a/composer.lock b/composer.lock
index ea09d7f..5cd945b 100644
--- a/composer.lock
+++ b/composer.lock
@@ -93,7 +93,7 @@
 "source": {
 "type": "git",
 "url": 
"https://gerrit.wikimedia.org/r/p/wikimedia/fundraising/php-queue.git;,
-"reference": "14198ba1f7d4868933649a85621a3955965e83cd"
+"reference": "8e15cbf9a46ef58ceeadb9b359fee925291a0173"
 },
 "require": {
 "clio/clio": "0.1.*",
@@ -149,7 +149,7 @@
 "queue",
 "transaction"
 ],
-"time": "2016-08-05 19:16:32"
+"time": "2016-10-17 23:39:02"
 },
 {
 "name": "fusesource/stomp-php",
@@ -245,23 +245,22 @@
 },
 {
 "name": "minfraud/http",
-"version": "v1.70",
+"version": "v1.71",
 "source": {
 "type": "git",
 "url": "https://github.com/maxmind/ccfd-api-php.git;,
-"reference": "941e9345f9c237a253be8b908ecef951698a1a99"
+"reference": "5f6c2a5454e755f1c56be17a1fc0c97576ff010e"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/maxmind/ccfd-api-php/zipball/941e9345f9c237a253be8b908ecef951698a1a99;,
-"reference": "941e9345f9c237a253be8b908ecef951698a1a99",
+"url": 
"https://api.github.com/repos/maxmind/ccfd-api-php/zipball/5f6c2a5454e755f1c56be17a1fc0c97576ff010e;,
+"reference": "5f6c2a5454e755f1c56be17a1fc0c97576ff010e",
 "shasum": ""
 },
 "type": "library",
 "autoload": {
-"files": [
-"src/HTTPBase.php",
-"src/CreditCardFraudDetection.php"
+"classmap": [
+"src"
 ]
 },
 "notification-url": "https://packagist.org/downloads/;,
@@ -282,7 +281,7 @@
 "maxmind",
 "minfraud"
 ],
-"time": "2015-07-21 14:49:48"
+"time": "2016-10-13 14:35:01"
 },
 {
 "name": "monolog/monolog",
@@ -398,16 +397,16 @@
 },
 {
 "name": "phpmailer/phpmailer",
-"version": "v5.2.16",
+"version": "v5.2.21",
 "source": {
 "type": "git",
 "url": "https://github.com/PHPMailer/PHPMailer.git;,
-"reference": "1d85f9ef3ecfc42bbc4f3c70d5e37ca9a65f629a"
+"reference": "1d51856b76c06fc687fcd9180efa7a0bed0d761e"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/PHPMailer/PHPMailer/zipball/1d85f9ef3ecfc42bbc4f3c70d5e37ca9a65f629a;,
-"reference": "1d85f9ef3ecfc42bbc4f3c70d5e37ca9a65f629a",
+"url": 
"https://api.github.com/repos/PHPMailer/PHPMailer/zipball/1d51856b76c06fc687fcd9180efa7a0bed0d761e;,
+"reference": "1d51856b76c06fc687fcd9180efa7a0bed0d761e",
 "shasum": ""
 },
 "require": {
@@ -454,7 +453,7 @@
 }
 ],
 "description": "PHPMailer is a full-featured email creation and 
transfer class for PHP",
-"time": "2016-06-06 09:09:37"
+"time": "2016-12-28 15:35:48"
 },
 {
 "name": "predis/predis",
@@ -508,22 +507,30 @@
 },
 {
 "name": "psr/log",
-"version": "1.0.0",
+"version": "1.0.2",
 "source": {
 "type": "git",
 "url": "https://github.com/php-fig/log.git;,
-"reference": "fe0936ee26643249e916849d48e3a51d5f5e278b"
+"reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/php-fig/log/zipball/fe0936ee26643249e916849d48e3a51d5f5e278b;,
-"reference": "fe0936ee26643249e916849d48e3a51d5f5e278b",
+"url": 
"https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d;,
+"reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
 "shasum": ""
 },
+"require": {
+"php": ">=5.3.0"
+},

[MediaWiki-commits] [Gerrit] wikimedia...SmashPig[deployment]: REVERT "DEPLOYMENT ONLY: Short-circuit everything to disable...

2016-12-28 Thread jenkins-bot (Code Review)

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

Change subject: REVERT "DEPLOYMENT ONLY: Short-circuit everything to disable 
listeners, per T154209"
..


REVERT "DEPLOYMENT ONLY: Short-circuit everything to disable listeners, per 
T154209"

Change-Id: I27e63fd7683797a6485b3e4b927f204029996445
---
M Core/Http/RequestHandler.php
1 file changed, 0 insertions(+), 4 deletions(-)

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



diff --git a/Core/Http/RequestHandler.php b/Core/Http/RequestHandler.php
index 7112439..5036a69 100644
--- a/Core/Http/RequestHandler.php
+++ b/Core/Http/RequestHandler.php
@@ -28,10 +28,6 @@
$response = new Response();
$response->setPrivate();
 
-// FIXME: Remove once https://phabricator.wikimedia.org/T154209 is resolved.
-$response->setStatusCode( 403, "Cannot continue." );
-return $response;
-
// --- Break the request into parts ---
$uri = $request->query->get( 'p', '' );
$parts = explode( '/', $uri );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I27e63fd7683797a6485b3e4b927f204029996445
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/SmashPig
Gerrit-Branch: deployment
Gerrit-Owner: Cdentinger 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Ejegg 
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...DonationInterface[master]: update composer.lock

2016-12-28 Thread Cdentinger (Code Review)

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

Change subject: update composer.lock
..

update composer.lock

Change-Id: I1d7aa560d7c501da5e640992921c4cae739ed264
---
M composer.lock
1 file changed, 65 insertions(+), 57 deletions(-)


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

diff --git a/composer.lock b/composer.lock
index ea09d7f..5cd945b 100644
--- a/composer.lock
+++ b/composer.lock
@@ -93,7 +93,7 @@
 "source": {
 "type": "git",
 "url": 
"https://gerrit.wikimedia.org/r/p/wikimedia/fundraising/php-queue.git;,
-"reference": "14198ba1f7d4868933649a85621a3955965e83cd"
+"reference": "8e15cbf9a46ef58ceeadb9b359fee925291a0173"
 },
 "require": {
 "clio/clio": "0.1.*",
@@ -149,7 +149,7 @@
 "queue",
 "transaction"
 ],
-"time": "2016-08-05 19:16:32"
+"time": "2016-10-17 23:39:02"
 },
 {
 "name": "fusesource/stomp-php",
@@ -245,23 +245,22 @@
 },
 {
 "name": "minfraud/http",
-"version": "v1.70",
+"version": "v1.71",
 "source": {
 "type": "git",
 "url": "https://github.com/maxmind/ccfd-api-php.git;,
-"reference": "941e9345f9c237a253be8b908ecef951698a1a99"
+"reference": "5f6c2a5454e755f1c56be17a1fc0c97576ff010e"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/maxmind/ccfd-api-php/zipball/941e9345f9c237a253be8b908ecef951698a1a99;,
-"reference": "941e9345f9c237a253be8b908ecef951698a1a99",
+"url": 
"https://api.github.com/repos/maxmind/ccfd-api-php/zipball/5f6c2a5454e755f1c56be17a1fc0c97576ff010e;,
+"reference": "5f6c2a5454e755f1c56be17a1fc0c97576ff010e",
 "shasum": ""
 },
 "type": "library",
 "autoload": {
-"files": [
-"src/HTTPBase.php",
-"src/CreditCardFraudDetection.php"
+"classmap": [
+"src"
 ]
 },
 "notification-url": "https://packagist.org/downloads/;,
@@ -282,7 +281,7 @@
 "maxmind",
 "minfraud"
 ],
-"time": "2015-07-21 14:49:48"
+"time": "2016-10-13 14:35:01"
 },
 {
 "name": "monolog/monolog",
@@ -398,16 +397,16 @@
 },
 {
 "name": "phpmailer/phpmailer",
-"version": "v5.2.16",
+"version": "v5.2.21",
 "source": {
 "type": "git",
 "url": "https://github.com/PHPMailer/PHPMailer.git;,
-"reference": "1d85f9ef3ecfc42bbc4f3c70d5e37ca9a65f629a"
+"reference": "1d51856b76c06fc687fcd9180efa7a0bed0d761e"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/PHPMailer/PHPMailer/zipball/1d85f9ef3ecfc42bbc4f3c70d5e37ca9a65f629a;,
-"reference": "1d85f9ef3ecfc42bbc4f3c70d5e37ca9a65f629a",
+"url": 
"https://api.github.com/repos/PHPMailer/PHPMailer/zipball/1d51856b76c06fc687fcd9180efa7a0bed0d761e;,
+"reference": "1d51856b76c06fc687fcd9180efa7a0bed0d761e",
 "shasum": ""
 },
 "require": {
@@ -454,7 +453,7 @@
 }
 ],
 "description": "PHPMailer is a full-featured email creation and 
transfer class for PHP",
-"time": "2016-06-06 09:09:37"
+"time": "2016-12-28 15:35:48"
 },
 {
 "name": "predis/predis",
@@ -508,22 +507,30 @@
 },
 {
 "name": "psr/log",
-"version": "1.0.0",
+"version": "1.0.2",
 "source": {
 "type": "git",
 "url": "https://github.com/php-fig/log.git;,
-"reference": "fe0936ee26643249e916849d48e3a51d5f5e278b"
+"reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/php-fig/log/zipball/fe0936ee26643249e916849d48e3a51d5f5e278b;,
-"reference": "fe0936ee26643249e916849d48e3a51d5f5e278b",
+"url": 
"https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d;,
+"reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
 "shasum": ""
 },
+"require": {
+"php": ">=5.3.0"
+

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Set celebration logo for hewiki

2016-12-28 Thread Urbanecm (Code Review)

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

Change subject: Set celebration logo for hewiki
..

Set celebration logo for hewiki

Bug: T154254
Change-Id: I620c2e05c1a781edd7ee15c49374a60d8c444c7c
---
M static/images/project-logos/hewiki-1.5x.png
M static/images/project-logos/hewiki-2x.png
M static/images/project-logos/hewiki.png
3 files changed, 0 insertions(+), 0 deletions(-)


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

diff --git a/static/images/project-logos/hewiki-1.5x.png 
b/static/images/project-logos/hewiki-1.5x.png
index f44a252..a25dd2b 100644
--- a/static/images/project-logos/hewiki-1.5x.png
+++ b/static/images/project-logos/hewiki-1.5x.png
Binary files differ
diff --git a/static/images/project-logos/hewiki-2x.png 
b/static/images/project-logos/hewiki-2x.png
index 4e964fb..365453d 100644
--- a/static/images/project-logos/hewiki-2x.png
+++ b/static/images/project-logos/hewiki-2x.png
Binary files differ
diff --git a/static/images/project-logos/hewiki.png 
b/static/images/project-logos/hewiki.png
index 1a7d95d..4314647 100644
--- a/static/images/project-logos/hewiki.png
+++ b/static/images/project-logos/hewiki.png
Binary files differ

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...SmashPig[deployment]: REVERT "DEPLOYMENT ONLY: Short-circuit everything to disable...

2016-12-28 Thread Cdentinger (Code Review)

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

Change subject: REVERT "DEPLOYMENT ONLY: Short-circuit everything to disable 
listeners, per T154209"
..

REVERT "DEPLOYMENT ONLY: Short-circuit everything to disable listeners, per 
T154209"

Change-Id: I27e63fd7683797a6485b3e4b927f204029996445
---
M Core/Http/RequestHandler.php
1 file changed, 0 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig 
refs/changes/15/329515/1

diff --git a/Core/Http/RequestHandler.php b/Core/Http/RequestHandler.php
index 7112439..5036a69 100644
--- a/Core/Http/RequestHandler.php
+++ b/Core/Http/RequestHandler.php
@@ -28,10 +28,6 @@
$response = new Response();
$response->setPrivate();
 
-// FIXME: Remove once https://phabricator.wikimedia.org/T154209 is resolved.
-$response->setStatusCode( 403, "Cannot continue." );
-return $response;
-
// --- Break the request into parts ---
$uri = $request->query->get( 'p', '' );
$parts = explode( '/', $uri );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I27e63fd7683797a6485b3e4b927f204029996445
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/SmashPig
Gerrit-Branch: deployment
Gerrit-Owner: Cdentinger 

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

[MediaWiki-commits] [Gerrit] wikimedia...SmashPig[deployment]: Update phpmailer for CVE-2016-10045 and CVE-2016-10033

2016-12-28 Thread jenkins-bot (Code Review)

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

Change subject: Update phpmailer for CVE-2016-10045 and CVE-2016-10033
..


Update phpmailer for CVE-2016-10045 and CVE-2016-10033

composer.lock and vendor submodule

Change-Id: Iea180e43a53aa75c335a57c82d78b13e37b4e202
---
M composer.lock
M vendor
2 files changed, 119 insertions(+), 108 deletions(-)

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



diff --git a/composer.lock b/composer.lock
index 12315e9..db64036 100644
--- a/composer.lock
+++ b/composer.lock
@@ -44,7 +44,7 @@
 "payment",
 "payments"
 ],
-"time": "2016-02-17 00:53:20"
+"time": "2016-02-17 00:44:20"
 },
 {
 "name": "clio/clio",
@@ -93,7 +93,7 @@
 "source": {
 "type": "git",
 "url": 
"https://gerrit.wikimedia.org/r/p/wikimedia/fundraising/php-queue.git;,
-"reference": "14198ba1f7d4868933649a85621a3955965e83cd"
+"reference": "8e15cbf9a46ef58ceeadb9b359fee925291a0173"
 },
 "require": {
 "clio/clio": "0.1.*",
@@ -148,7 +148,7 @@
 "queue",
 "transaction"
 ],
-"time": "2016-08-05 19:16:32"
+"time": "2016-10-17 23:39:02"
 },
 {
 "name": "fusesource/stomp-php",
@@ -197,6 +197,7 @@
 "messaging",
 "stomp"
 ],
+"abandoned": "stomp-php/stomp-php",
 "time": "2013-02-23 17:34:44"
 },
 {
@@ -243,16 +244,16 @@
 },
 {
 "name": "monolog/monolog",
-"version": "1.21.0",
+"version": "1.22.0",
 "source": {
 "type": "git",
 "url": "https://github.com/Seldaek/monolog.git;,
-"reference": "f42fbdfd53e306bda545845e4dbfd3e72edb4952"
+"reference": "bad29cb8d18ab0315e6c477751418a82c850d558"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/Seldaek/monolog/zipball/f42fbdfd53e306bda545845e4dbfd3e72edb4952;,
-"reference": "f42fbdfd53e306bda545845e4dbfd3e72edb4952",
+"url": 
"https://api.github.com/repos/Seldaek/monolog/zipball/bad29cb8d18ab0315e6c477751418a82c850d558;,
+"reference": "bad29cb8d18ab0315e6c477751418a82c850d558",
 "shasum": ""
 },
 "require": {
@@ -263,7 +264,7 @@
 "psr/log-implementation": "1.0.0"
 },
 "require-dev": {
-"aws/aws-sdk-php": "^2.4.9",
+"aws/aws-sdk-php": "^2.4.9 || ^3.0",
 "doctrine/couchdb": "~1.0@dev",
 "graylog2/gelf-php": "~1.0",
 "jakub-onderka/php-parallel-lint": "0.9",
@@ -317,20 +318,20 @@
 "logging",
 "psr-3"
 ],
-"time": "2016-07-29 03:23:52"
+"time": "2016-11-26 00:15:39"
 },
 {
 "name": "phpmailer/phpmailer",
-"version": "v5.2.16",
+"version": "v5.2.21",
 "source": {
 "type": "git",
 "url": "https://github.com/PHPMailer/PHPMailer.git;,
-"reference": "1d85f9ef3ecfc42bbc4f3c70d5e37ca9a65f629a"
+"reference": "1d51856b76c06fc687fcd9180efa7a0bed0d761e"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/PHPMailer/PHPMailer/zipball/1d85f9ef3ecfc42bbc4f3c70d5e37ca9a65f629a;,
-"reference": "1d85f9ef3ecfc42bbc4f3c70d5e37ca9a65f629a",
+"url": 
"https://api.github.com/repos/PHPMailer/PHPMailer/zipball/1d51856b76c06fc687fcd9180efa7a0bed0d761e;,
+"reference": "1d51856b76c06fc687fcd9180efa7a0bed0d761e",
 "shasum": ""
 },
 "require": {
@@ -377,7 +378,7 @@
 }
 ],
 "description": "PHPMailer is a full-featured email creation and 
transfer class for PHP",
-"time": "2016-06-06 09:09:37"
+"time": "2016-12-28 15:35:48"
 },
 {
 "name": "predis/predis",
@@ -431,22 +432,30 @@
 },
 {
 "name": "psr/log",
-"version": "1.0.0",
+"version": "1.0.2",
 "source": {
 "type": "git",
 "url": "https://github.com/php-fig/log.git;,
-"reference": "fe0936ee26643249e916849d48e3a51d5f5e278b"
+"reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d"
 },
 "dist": {
 "type": "zip",
-

[MediaWiki-commits] [Gerrit] wikimedia...SmashPig[deployment]: Update phpmailer for CVE-2016-10045 and CVE-2016-10033

2016-12-28 Thread Cdentinger (Code Review)

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

Change subject: Update phpmailer for CVE-2016-10045 and CVE-2016-10033
..

Update phpmailer for CVE-2016-10045 and CVE-2016-10033

composer.lock and vendor submodule

Change-Id: Iea180e43a53aa75c335a57c82d78b13e37b4e202
---
M composer.lock
M vendor
2 files changed, 119 insertions(+), 108 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig 
refs/changes/14/329514/1

diff --git a/composer.lock b/composer.lock
index 12315e9..db64036 100644
--- a/composer.lock
+++ b/composer.lock
@@ -44,7 +44,7 @@
 "payment",
 "payments"
 ],
-"time": "2016-02-17 00:53:20"
+"time": "2016-02-17 00:44:20"
 },
 {
 "name": "clio/clio",
@@ -93,7 +93,7 @@
 "source": {
 "type": "git",
 "url": 
"https://gerrit.wikimedia.org/r/p/wikimedia/fundraising/php-queue.git;,
-"reference": "14198ba1f7d4868933649a85621a3955965e83cd"
+"reference": "8e15cbf9a46ef58ceeadb9b359fee925291a0173"
 },
 "require": {
 "clio/clio": "0.1.*",
@@ -148,7 +148,7 @@
 "queue",
 "transaction"
 ],
-"time": "2016-08-05 19:16:32"
+"time": "2016-10-17 23:39:02"
 },
 {
 "name": "fusesource/stomp-php",
@@ -197,6 +197,7 @@
 "messaging",
 "stomp"
 ],
+"abandoned": "stomp-php/stomp-php",
 "time": "2013-02-23 17:34:44"
 },
 {
@@ -243,16 +244,16 @@
 },
 {
 "name": "monolog/monolog",
-"version": "1.21.0",
+"version": "1.22.0",
 "source": {
 "type": "git",
 "url": "https://github.com/Seldaek/monolog.git;,
-"reference": "f42fbdfd53e306bda545845e4dbfd3e72edb4952"
+"reference": "bad29cb8d18ab0315e6c477751418a82c850d558"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/Seldaek/monolog/zipball/f42fbdfd53e306bda545845e4dbfd3e72edb4952;,
-"reference": "f42fbdfd53e306bda545845e4dbfd3e72edb4952",
+"url": 
"https://api.github.com/repos/Seldaek/monolog/zipball/bad29cb8d18ab0315e6c477751418a82c850d558;,
+"reference": "bad29cb8d18ab0315e6c477751418a82c850d558",
 "shasum": ""
 },
 "require": {
@@ -263,7 +264,7 @@
 "psr/log-implementation": "1.0.0"
 },
 "require-dev": {
-"aws/aws-sdk-php": "^2.4.9",
+"aws/aws-sdk-php": "^2.4.9 || ^3.0",
 "doctrine/couchdb": "~1.0@dev",
 "graylog2/gelf-php": "~1.0",
 "jakub-onderka/php-parallel-lint": "0.9",
@@ -317,20 +318,20 @@
 "logging",
 "psr-3"
 ],
-"time": "2016-07-29 03:23:52"
+"time": "2016-11-26 00:15:39"
 },
 {
 "name": "phpmailer/phpmailer",
-"version": "v5.2.16",
+"version": "v5.2.21",
 "source": {
 "type": "git",
 "url": "https://github.com/PHPMailer/PHPMailer.git;,
-"reference": "1d85f9ef3ecfc42bbc4f3c70d5e37ca9a65f629a"
+"reference": "1d51856b76c06fc687fcd9180efa7a0bed0d761e"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/PHPMailer/PHPMailer/zipball/1d85f9ef3ecfc42bbc4f3c70d5e37ca9a65f629a;,
-"reference": "1d85f9ef3ecfc42bbc4f3c70d5e37ca9a65f629a",
+"url": 
"https://api.github.com/repos/PHPMailer/PHPMailer/zipball/1d51856b76c06fc687fcd9180efa7a0bed0d761e;,
+"reference": "1d51856b76c06fc687fcd9180efa7a0bed0d761e",
 "shasum": ""
 },
 "require": {
@@ -377,7 +378,7 @@
 }
 ],
 "description": "PHPMailer is a full-featured email creation and 
transfer class for PHP",
-"time": "2016-06-06 09:09:37"
+"time": "2016-12-28 15:35:48"
 },
 {
 "name": "predis/predis",
@@ -431,22 +432,30 @@
 },
 {
 "name": "psr/log",
-"version": "1.0.0",
+"version": "1.0.2",
 "source": {
 "type": "git",
 "url": "https://github.com/php-fig/log.git;,
-"reference": "fe0936ee26643249e916849d48e3a51d5f5e278b"
+"reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d"
 },
 "dist": {

[MediaWiki-commits] [Gerrit] wikimedia...vendor[master]: update phpmailer for CVE

2016-12-28 Thread Ejegg (Code Review)

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

Change subject: update phpmailer for CVE
..


update phpmailer for CVE

Change-Id: I21168da04c03d5a5d8eea29f159e58d4f3374676
---
M coderkungfu/php-queue/src/PHPQueue/Backend/PDO.php
M coderkungfu/php-queue/src/PHPQueue/Backend/Predis.php
A coderkungfu/php-queue/src/PHPQueue/Exception/JsonException.php
A coderkungfu/php-queue/src/PHPQueue/Json.php
M coderkungfu/php-queue/test/PHPQueue/Backend/PredisTest.php
M composer/LICENSE
M composer/autoload_files.php
M composer/autoload_namespaces.php
M composer/autoload_psr4.php
M composer/installed.json
M monolog/monolog/CHANGELOG.mdown
M monolog/monolog/composer.json
M monolog/monolog/doc/02-handlers-formatters-processors.md
M monolog/monolog/src/Monolog/Formatter/JsonFormatter.php
M monolog/monolog/src/Monolog/Formatter/LineFormatter.php
M monolog/monolog/src/Monolog/Formatter/NormalizerFormatter.php
M monolog/monolog/src/Monolog/Handler/AmqpHandler.php
M monolog/monolog/src/Monolog/Handler/DynamoDbHandler.php
M monolog/monolog/src/Monolog/Handler/RavenHandler.php
M monolog/monolog/src/Monolog/Handler/RollbarHandler.php
A monolog/monolog/src/Monolog/Handler/Slack/SlackRecord.php
M monolog/monolog/src/Monolog/Handler/SlackHandler.php
A monolog/monolog/src/Monolog/Handler/SlackWebhookHandler.php
A monolog/monolog/src/Monolog/Handler/SlackbotHandler.php
M monolog/monolog/src/Monolog/Handler/StreamHandler.php
M monolog/monolog/src/Monolog/Handler/SyslogUdpHandler.php
M monolog/monolog/src/Monolog/Handler/TestHandler.php
M monolog/monolog/src/Monolog/Logger.php
A monolog/monolog/src/Monolog/Processor/MercurialProcessor.php
M monolog/monolog/tests/Monolog/Formatter/JsonFormatterTest.php
M monolog/monolog/tests/Monolog/Formatter/NormalizerFormatterTest.php
M monolog/monolog/tests/Monolog/Handler/RavenHandlerTest.php
A monolog/monolog/tests/Monolog/Handler/Slack/SlackRecordTest.php
M monolog/monolog/tests/Monolog/Handler/SlackHandlerTest.php
A monolog/monolog/tests/Monolog/Handler/SlackWebhookHandlerTest.php
A monolog/monolog/tests/Monolog/Handler/SlackbotHandlerTest.php
M monolog/monolog/tests/Monolog/Handler/SyslogUdpHandlerTest.php
M monolog/monolog/tests/Monolog/Handler/TestHandlerTest.php
M monolog/monolog/tests/Monolog/LoggerTest.php
A monolog/monolog/tests/Monolog/Processor/MercurialProcessorTest.php
D phpmailer/phpmailer/.gitignore
D phpmailer/phpmailer/.scrutinizer.yml
D phpmailer/phpmailer/.travis.yml
D phpmailer/phpmailer/README.md
M phpmailer/phpmailer/VERSION
D phpmailer/phpmailer/changelog.md
M phpmailer/phpmailer/class.phpmailer.php
M phpmailer/phpmailer/class.phpmaileroauth.php
M phpmailer/phpmailer/class.pop3.php
M phpmailer/phpmailer/class.smtp.php
M phpmailer/phpmailer/composer.lock
D phpmailer/phpmailer/docs/Callback_function_notes.txt
D phpmailer/phpmailer/docs/DomainKeys_notes.txt
D phpmailer/phpmailer/docs/Note_for_SMTP_debugging.txt
D phpmailer/phpmailer/docs/extending.html
D phpmailer/phpmailer/docs/faq.html
D phpmailer/phpmailer/docs/generatedocs.sh
D phpmailer/phpmailer/docs/pop3_article.txt
M phpmailer/phpmailer/examples/scripts/shLegacy.js
M phpmailer/phpmailer/examples/smtp_check.phps
M phpmailer/phpmailer/extras/htmlfilter.php
M phpmailer/phpmailer/extras/ntlm_sasl_client.php
R phpmailer/phpmailer/language/phpmailer.lang-cs.php
R phpmailer/phpmailer/language/phpmailer.lang-da.php
M phpmailer/phpmailer/language/phpmailer.lang-de.php
M phpmailer/phpmailer/language/phpmailer.lang-es.php
R phpmailer/phpmailer/language/phpmailer.lang-nb.php
R phpmailer/phpmailer/language/phpmailer.lang-pt_br.php
M phpmailer/phpmailer/language/phpmailer.lang-ro.php
R phpmailer/phpmailer/language/phpmailer.lang-sv.php
D phpmailer/phpmailer/test/bootstrap.php
D phpmailer/phpmailer/test/fakepopserver.sh
D phpmailer/phpmailer/test/fakesendmail.sh
D phpmailer/phpmailer/test/phpmailerLangTest.php
D phpmailer/phpmailer/test/phpmailerTest.php
D phpmailer/phpmailer/test/runfakepopserver.sh
D phpmailer/phpmailer/test/test_callback.php
D phpmailer/phpmailer/test/testbootstrap-dist.php
D phpmailer/phpmailer/travis.phpunit.xml.dist
M psr/log/Psr/Log/AbstractLogger.php
M psr/log/Psr/Log/LogLevel.php
M psr/log/Psr/Log/LoggerAwareInterface.php
M psr/log/Psr/Log/LoggerAwareTrait.php
M psr/log/Psr/Log/LoggerInterface.php
M psr/log/Psr/Log/LoggerTrait.php
M psr/log/Psr/Log/NullLogger.php
M psr/log/Psr/Log/Test/LoggerInterfaceTest.php
M psr/log/composer.json
M symfony/event-dispatcher/EventDispatcher.php
M symfony/http-foundation/BinaryFileResponse.php
M symfony/http-foundation/File/MimeType/FileinfoMimeTypeGuesser.php
M symfony/http-foundation/JsonResponse.php
M symfony/http-foundation/Request.php
M symfony/http-foundation/RequestMatcher.php
M symfony/http-foundation/Response.php
M symfony/http-foundation/Session/Storage/Handler/MemcacheSessionHandler.php
M symfony/http-foundation/StreamedResponse.php
M

[MediaWiki-commits] [Gerrit] wikimedia...vendor[master]: Revert "update libs"

2016-12-28 Thread Ejegg (Code Review)

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

Change subject: Revert "update libs"
..


Revert "update libs"

This reverts commit c1ebacd623ce6a6d0b553f92ad978bfeb83132e2.

Change-Id: I2fd11d03a13067cf85b2af6aa49b7228ef7e6019
---
M autoload.php
D bin/parallel-lint
D bin/phpunit
M coderkungfu/php-queue/src/PHPQueue/Backend/PDO.php
M coderkungfu/php-queue/src/PHPQueue/Backend/Predis.php
D coderkungfu/php-queue/src/PHPQueue/Exception/JsonException.php
D coderkungfu/php-queue/src/PHPQueue/Json.php
M coderkungfu/php-queue/test/PHPQueue/Backend/PredisTest.php
M composer/ClassLoader.php
M composer/LICENSE
M composer/autoload_classmap.php
M composer/autoload_files.php
M composer/autoload_namespaces.php
M composer/autoload_psr4.php
M composer/autoload_real.php
M composer/autoload_static.php
M composer/installed.json
D doctrine/instantiator/.gitignore
D doctrine/instantiator/.scrutinizer.yml
D doctrine/instantiator/.travis.install.sh
D doctrine/instantiator/.travis.yml
D doctrine/instantiator/CONTRIBUTING.md
D doctrine/instantiator/LICENSE
D doctrine/instantiator/README.md
D doctrine/instantiator/composer.json
D doctrine/instantiator/phpmd.xml.dist
D doctrine/instantiator/phpunit.xml.dist
D 
doctrine/instantiator/src/Doctrine/Instantiator/Exception/ExceptionInterface.php
D 
doctrine/instantiator/src/Doctrine/Instantiator/Exception/InvalidArgumentException.php
D 
doctrine/instantiator/src/Doctrine/Instantiator/Exception/UnexpectedValueException.php
D doctrine/instantiator/src/Doctrine/Instantiator/Instantiator.php
D doctrine/instantiator/src/Doctrine/Instantiator/InstantiatorInterface.php
D 
doctrine/instantiator/tests/DoctrineTest/InstantiatorPerformance/InstantiatorPerformanceEvent.php
D 
doctrine/instantiator/tests/DoctrineTest/InstantiatorTest/Exception/InvalidArgumentExceptionTest.php
D 
doctrine/instantiator/tests/DoctrineTest/InstantiatorTest/Exception/UnexpectedValueExceptionTest.php
D doctrine/instantiator/tests/DoctrineTest/InstantiatorTest/InstantiatorTest.php
D 
doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/AbstractClassAsset.php
D 
doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/ArrayObjectAsset.php
D 
doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/ExceptionAsset.php
D 
doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/FinalExceptionAsset.php
D doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/PharAsset.php
D 
doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/PharExceptionAsset.php
D 
doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/SerializableArrayObjectAsset.php
D 
doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/SimpleSerializableAsset.php
D 
doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/SimpleTraitAsset.php
D 
doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/UnCloneableAsset.php
D 
doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/UnserializeExceptionArrayObjectAsset.php
D 
doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/WakeUpNoticesAsset.php
D 
doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/XMLReaderAsset.php
D jakub-onderka/php-parallel-lint/.gitignore
D jakub-onderka/php-parallel-lint/.travis.yml
D jakub-onderka/php-parallel-lint/LICENSE
D jakub-onderka/php-parallel-lint/README.md
D jakub-onderka/php-parallel-lint/appveyor.yml
D jakub-onderka/php-parallel-lint/bin/skip-linting.php
D jakub-onderka/php-parallel-lint/box.json
D jakub-onderka/php-parallel-lint/composer.json
D jakub-onderka/php-parallel-lint/parallel-lint
D jakub-onderka/php-parallel-lint/parallel-lint.php
D jakub-onderka/php-parallel-lint/phpcs-ruleset.xml
D jakub-onderka/php-parallel-lint/src/Error.php
D jakub-onderka/php-parallel-lint/src/ErrorFormatter.php
D jakub-onderka/php-parallel-lint/src/JsonSerializable.php
D jakub-onderka/php-parallel-lint/src/Manager.php
D jakub-onderka/php-parallel-lint/src/Output.php
D jakub-onderka/php-parallel-lint/src/ParallelLint.php
D jakub-onderka/php-parallel-lint/src/Process/GitBlameProcess.php
D jakub-onderka/php-parallel-lint/src/Process/LintProcess.php
D jakub-onderka/php-parallel-lint/src/Process/PhpExecutable.php
D jakub-onderka/php-parallel-lint/src/Process/PhpProcess.php
D jakub-onderka/php-parallel-lint/src/Process/Process.php
D jakub-onderka/php-parallel-lint/src/Process/SkipLintProcess.php
D jakub-onderka/php-parallel-lint/src/Result.php
D jakub-onderka/php-parallel-lint/src/Settings.php
D jakub-onderka/php-parallel-lint/src/exceptions.php
D jakub-onderka/php-parallel-lint/tests/Manager.run.phpt
D jakub-onderka/php-parallel-lint/tests/ParallelLint.lint.phpt
D jakub-onderka/php-parallel-lint/tests/Settings.parseArguments.phpt
D jakub-onderka/php-parallel-lint/tests/SkipLintProcess.phpt
D jakub-onderka/php-parallel-lint/tests/examples/example-01/empty-file
D

[MediaWiki-commits] [Gerrit] wikimedia...vendor[master]: update phpmailer for CVE

2016-12-28 Thread Cdentinger (Code Review)

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

Change subject: update phpmailer for CVE
..

update phpmailer for CVE

Change-Id: I21168da04c03d5a5d8eea29f159e58d4f3374676
---
M coderkungfu/php-queue/src/PHPQueue/Backend/PDO.php
M coderkungfu/php-queue/src/PHPQueue/Backend/Predis.php
A coderkungfu/php-queue/src/PHPQueue/Exception/JsonException.php
A coderkungfu/php-queue/src/PHPQueue/Json.php
M coderkungfu/php-queue/test/PHPQueue/Backend/PredisTest.php
M composer/LICENSE
M composer/autoload_files.php
M composer/autoload_namespaces.php
M composer/autoload_psr4.php
M composer/installed.json
M monolog/monolog/CHANGELOG.mdown
M monolog/monolog/composer.json
M monolog/monolog/doc/02-handlers-formatters-processors.md
M monolog/monolog/src/Monolog/Formatter/JsonFormatter.php
M monolog/monolog/src/Monolog/Formatter/LineFormatter.php
M monolog/monolog/src/Monolog/Formatter/NormalizerFormatter.php
M monolog/monolog/src/Monolog/Handler/AmqpHandler.php
M monolog/monolog/src/Monolog/Handler/DynamoDbHandler.php
M monolog/monolog/src/Monolog/Handler/RavenHandler.php
M monolog/monolog/src/Monolog/Handler/RollbarHandler.php
A monolog/monolog/src/Monolog/Handler/Slack/SlackRecord.php
M monolog/monolog/src/Monolog/Handler/SlackHandler.php
A monolog/monolog/src/Monolog/Handler/SlackWebhookHandler.php
A monolog/monolog/src/Monolog/Handler/SlackbotHandler.php
M monolog/monolog/src/Monolog/Handler/StreamHandler.php
M monolog/monolog/src/Monolog/Handler/SyslogUdpHandler.php
M monolog/monolog/src/Monolog/Handler/TestHandler.php
M monolog/monolog/src/Monolog/Logger.php
A monolog/monolog/src/Monolog/Processor/MercurialProcessor.php
M monolog/monolog/tests/Monolog/Formatter/JsonFormatterTest.php
M monolog/monolog/tests/Monolog/Formatter/NormalizerFormatterTest.php
M monolog/monolog/tests/Monolog/Handler/RavenHandlerTest.php
A monolog/monolog/tests/Monolog/Handler/Slack/SlackRecordTest.php
M monolog/monolog/tests/Monolog/Handler/SlackHandlerTest.php
A monolog/monolog/tests/Monolog/Handler/SlackWebhookHandlerTest.php
A monolog/monolog/tests/Monolog/Handler/SlackbotHandlerTest.php
M monolog/monolog/tests/Monolog/Handler/SyslogUdpHandlerTest.php
M monolog/monolog/tests/Monolog/Handler/TestHandlerTest.php
M monolog/monolog/tests/Monolog/LoggerTest.php
A monolog/monolog/tests/Monolog/Processor/MercurialProcessorTest.php
D phpmailer/phpmailer/.gitignore
D phpmailer/phpmailer/.scrutinizer.yml
D phpmailer/phpmailer/.travis.yml
D phpmailer/phpmailer/README.md
M phpmailer/phpmailer/VERSION
D phpmailer/phpmailer/changelog.md
M phpmailer/phpmailer/class.phpmailer.php
M phpmailer/phpmailer/class.phpmaileroauth.php
M phpmailer/phpmailer/class.pop3.php
M phpmailer/phpmailer/class.smtp.php
M phpmailer/phpmailer/composer.lock
D phpmailer/phpmailer/docs/Callback_function_notes.txt
D phpmailer/phpmailer/docs/DomainKeys_notes.txt
D phpmailer/phpmailer/docs/Note_for_SMTP_debugging.txt
D phpmailer/phpmailer/docs/extending.html
D phpmailer/phpmailer/docs/faq.html
D phpmailer/phpmailer/docs/generatedocs.sh
D phpmailer/phpmailer/docs/pop3_article.txt
M phpmailer/phpmailer/examples/scripts/shLegacy.js
M phpmailer/phpmailer/examples/smtp_check.phps
M phpmailer/phpmailer/extras/htmlfilter.php
M phpmailer/phpmailer/extras/ntlm_sasl_client.php
R phpmailer/phpmailer/language/phpmailer.lang-cs.php
R phpmailer/phpmailer/language/phpmailer.lang-da.php
M phpmailer/phpmailer/language/phpmailer.lang-de.php
M phpmailer/phpmailer/language/phpmailer.lang-es.php
R phpmailer/phpmailer/language/phpmailer.lang-nb.php
R phpmailer/phpmailer/language/phpmailer.lang-pt_br.php
M phpmailer/phpmailer/language/phpmailer.lang-ro.php
R phpmailer/phpmailer/language/phpmailer.lang-sv.php
D phpmailer/phpmailer/test/bootstrap.php
D phpmailer/phpmailer/test/fakepopserver.sh
D phpmailer/phpmailer/test/fakesendmail.sh
D phpmailer/phpmailer/test/phpmailerLangTest.php
D phpmailer/phpmailer/test/phpmailerTest.php
D phpmailer/phpmailer/test/runfakepopserver.sh
D phpmailer/phpmailer/test/test_callback.php
D phpmailer/phpmailer/test/testbootstrap-dist.php
D phpmailer/phpmailer/travis.phpunit.xml.dist
M psr/log/Psr/Log/AbstractLogger.php
M psr/log/Psr/Log/LogLevel.php
M psr/log/Psr/Log/LoggerAwareInterface.php
M psr/log/Psr/Log/LoggerAwareTrait.php
M psr/log/Psr/Log/LoggerInterface.php
M psr/log/Psr/Log/LoggerTrait.php
M psr/log/Psr/Log/NullLogger.php
M psr/log/Psr/Log/Test/LoggerInterfaceTest.php
M psr/log/composer.json
M symfony/event-dispatcher/EventDispatcher.php
M symfony/http-foundation/BinaryFileResponse.php
M symfony/http-foundation/File/MimeType/FileinfoMimeTypeGuesser.php
M symfony/http-foundation/JsonResponse.php
M symfony/http-foundation/Request.php
M symfony/http-foundation/RequestMatcher.php
M symfony/http-foundation/Response.php
M symfony/http-foundation/Session/Storage/Handler/MemcacheSessionHandler.php
M symfony/http-foundation/StreamedResponse.php
M

[MediaWiki-commits] [Gerrit] wikimedia...vendor[master]: Revert "update libs"

2016-12-28 Thread Cdentinger (Code Review)

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

Change subject: Revert "update libs"
..

Revert "update libs"

This reverts commit c1ebacd623ce6a6d0b553f92ad978bfeb83132e2.

Change-Id: I2fd11d03a13067cf85b2af6aa49b7228ef7e6019
---
M autoload.php
D bin/parallel-lint
D bin/phpunit
M coderkungfu/php-queue/src/PHPQueue/Backend/PDO.php
M coderkungfu/php-queue/src/PHPQueue/Backend/Predis.php
D coderkungfu/php-queue/src/PHPQueue/Exception/JsonException.php
D coderkungfu/php-queue/src/PHPQueue/Json.php
M coderkungfu/php-queue/test/PHPQueue/Backend/PredisTest.php
M composer/ClassLoader.php
M composer/LICENSE
M composer/autoload_classmap.php
M composer/autoload_files.php
M composer/autoload_namespaces.php
M composer/autoload_psr4.php
M composer/autoload_real.php
M composer/autoload_static.php
M composer/installed.json
D doctrine/instantiator/.gitignore
D doctrine/instantiator/.scrutinizer.yml
D doctrine/instantiator/.travis.install.sh
D doctrine/instantiator/.travis.yml
D doctrine/instantiator/CONTRIBUTING.md
D doctrine/instantiator/LICENSE
D doctrine/instantiator/README.md
D doctrine/instantiator/composer.json
D doctrine/instantiator/phpmd.xml.dist
D doctrine/instantiator/phpunit.xml.dist
D 
doctrine/instantiator/src/Doctrine/Instantiator/Exception/ExceptionInterface.php
D 
doctrine/instantiator/src/Doctrine/Instantiator/Exception/InvalidArgumentException.php
D 
doctrine/instantiator/src/Doctrine/Instantiator/Exception/UnexpectedValueException.php
D doctrine/instantiator/src/Doctrine/Instantiator/Instantiator.php
D doctrine/instantiator/src/Doctrine/Instantiator/InstantiatorInterface.php
D 
doctrine/instantiator/tests/DoctrineTest/InstantiatorPerformance/InstantiatorPerformanceEvent.php
D 
doctrine/instantiator/tests/DoctrineTest/InstantiatorTest/Exception/InvalidArgumentExceptionTest.php
D 
doctrine/instantiator/tests/DoctrineTest/InstantiatorTest/Exception/UnexpectedValueExceptionTest.php
D doctrine/instantiator/tests/DoctrineTest/InstantiatorTest/InstantiatorTest.php
D 
doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/AbstractClassAsset.php
D 
doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/ArrayObjectAsset.php
D 
doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/ExceptionAsset.php
D 
doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/FinalExceptionAsset.php
D doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/PharAsset.php
D 
doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/PharExceptionAsset.php
D 
doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/SerializableArrayObjectAsset.php
D 
doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/SimpleSerializableAsset.php
D 
doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/SimpleTraitAsset.php
D 
doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/UnCloneableAsset.php
D 
doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/UnserializeExceptionArrayObjectAsset.php
D 
doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/WakeUpNoticesAsset.php
D 
doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/XMLReaderAsset.php
D jakub-onderka/php-parallel-lint/.gitignore
D jakub-onderka/php-parallel-lint/.travis.yml
D jakub-onderka/php-parallel-lint/LICENSE
D jakub-onderka/php-parallel-lint/README.md
D jakub-onderka/php-parallel-lint/appveyor.yml
D jakub-onderka/php-parallel-lint/bin/skip-linting.php
D jakub-onderka/php-parallel-lint/box.json
D jakub-onderka/php-parallel-lint/composer.json
D jakub-onderka/php-parallel-lint/parallel-lint
D jakub-onderka/php-parallel-lint/parallel-lint.php
D jakub-onderka/php-parallel-lint/phpcs-ruleset.xml
D jakub-onderka/php-parallel-lint/src/Error.php
D jakub-onderka/php-parallel-lint/src/ErrorFormatter.php
D jakub-onderka/php-parallel-lint/src/JsonSerializable.php
D jakub-onderka/php-parallel-lint/src/Manager.php
D jakub-onderka/php-parallel-lint/src/Output.php
D jakub-onderka/php-parallel-lint/src/ParallelLint.php
D jakub-onderka/php-parallel-lint/src/Process/GitBlameProcess.php
D jakub-onderka/php-parallel-lint/src/Process/LintProcess.php
D jakub-onderka/php-parallel-lint/src/Process/PhpExecutable.php
D jakub-onderka/php-parallel-lint/src/Process/PhpProcess.php
D jakub-onderka/php-parallel-lint/src/Process/Process.php
D jakub-onderka/php-parallel-lint/src/Process/SkipLintProcess.php
D jakub-onderka/php-parallel-lint/src/Result.php
D jakub-onderka/php-parallel-lint/src/Settings.php
D jakub-onderka/php-parallel-lint/src/exceptions.php
D jakub-onderka/php-parallel-lint/tests/Manager.run.phpt
D jakub-onderka/php-parallel-lint/tests/ParallelLint.lint.phpt
D jakub-onderka/php-parallel-lint/tests/Settings.parseArguments.phpt
D jakub-onderka/php-parallel-lint/tests/SkipLintProcess.phpt
D jakub-onderka/php-parallel-lint/tests/examples/example-01/empty-file
D

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Remove WebRequest::checkSessionCookie() method as being depr...

2016-12-28 Thread Victorbarbu (Code Review)

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

Change subject: Remove WebRequest::checkSessionCookie() method as being 
deprecated
..

Remove WebRequest::checkSessionCookie() method as being deprecated

Bug: T61113
Change-Id: I5285dbfc47d6429e16b7e7839bf55d48320d0bf0
---
M RELEASE-NOTES-1.29
M includes/DerivativeRequest.php
M includes/WebRequest.php
3 files changed, 2 insertions(+), 20 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/11/329511/1

diff --git a/RELEASE-NOTES-1.29 b/RELEASE-NOTES-1.29
index 774254c..ab5757d 100644
--- a/RELEASE-NOTES-1.29
+++ b/RELEASE-NOTES-1.29
@@ -147,6 +147,8 @@
 * User::getTemporaryPassword() (deprecated in 1.27) was removed.
 * User::isPasswordReminderThrottled() (deprecated in 1.27) was removed.
 * FSRepo (deprecated in 1.19) was removed.
+* WebRequest::checkSessionCookie() (deprecated in 1.27) was removed. use
+\MediaWiki\Session\SessionManager::singleton()->getPersistedSessionId() 
instead.
 
 == Compatibility ==
 
diff --git a/includes/DerivativeRequest.php b/includes/DerivativeRequest.php
index 4c149ae..487e86c 100644
--- a/includes/DerivativeRequest.php
+++ b/includes/DerivativeRequest.php
@@ -49,10 +49,6 @@
return $this->base->getCookie( $key, $prefix, $default );
}
 
-   public function checkSessionCookie() {
-   return $this->base->checkSessionCookie();
-   }
-
public function getHeader( $name, $flags = 0 ) {
return $this->base->getHeader( $name, $flags );
}
diff --git a/includes/WebRequest.php b/includes/WebRequest.php
index e7c9b83..3bbdc3f 100644
--- a/includes/WebRequest.php
+++ b/includes/WebRequest.php
@@ -758,22 +758,6 @@
}
 
/**
-* Returns true if the request has a persistent session.
-* This does not necessarily mean that the user is logged in!
-*
-* @deprecated since 1.27, use
-*  
\MediaWiki\Session\SessionManager::singleton()->getPersistedSessionId()
-*  instead.
-* @return bool
-*/
-   public function checkSessionCookie() {
-   global $wgInitialSessionId;
-   wfDeprecated( __METHOD__, '1.27' );
-   return $wgInitialSessionId !== null &&
-   $this->getSession()->getId() === 
(string)$wgInitialSessionId;
-   }
-
-   /**
 * Get a cookie from the $_COOKIE jar
 *
 * @param string $key The name of the cookie

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Use mw.Message#parseDom where appropriate

2016-12-28 Thread jenkins-bot (Code Review)

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

Change subject: Use mw.Message#parseDom where appropriate
..


Use mw.Message#parseDom where appropriate

Avoid turning DOM into HTML markup and parsing it back into DOM.

Change-Id: I34f56ee60b836a7e0556130a153fc95adb4f3467
---
M modules/ve-mw/init/ve.init.mw.ArticleTarget.js
M modules/ve-mw/ui/pages/ve.ui.MWTemplatePage.js
2 files changed, 5 insertions(+), 5 deletions(-)

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



diff --git a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js 
b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
index 7589d92..e2b7644 100644
--- a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
+++ b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
@@ -812,7 +812,7 @@
} else {
userMsg = 'visualeditor-savedialog-identify-user';
}
-   $msg = $msg.add( $.parseHTML( mw.message( userMsg, username 
).parse() ) );
+   $msg = $msg.add( mw.message( userMsg, username ).parseDom() );
}
this.showSaveError( $msg );
 };
diff --git a/modules/ve-mw/ui/pages/ve.ui.MWTemplatePage.js 
b/modules/ve-mw/ui/pages/ve.ui.MWTemplatePage.js
index b7d293a..cd382d6 100644
--- a/modules/ve-mw/ui/pages/ve.ui.MWTemplatePage.js
+++ b/modules/ve-mw/ui/pages/ve.ui.MWTemplatePage.js
@@ -61,10 +61,10 @@
$( '' ),
$( '' )
.addClass( 
've-ui-mwTemplatePage-description-extra' )
-   .html( mw.message(
+   .append( mw.message(

'visualeditor-dialog-transclusion-more-template-description',
title.getRelativeText( 
mw.config.get( 'wgNamespaceIds' ).template )
-   ).parse() )
+   ).parseDom() )
);
}
} else {
@@ -74,10 +74,10 @@
if ( title ) {
this.$description
.addClass( 
've-ui-mwTemplatePage-description-missing' )
-   .html( mw.message(
+   .append( mw.message(

'visualeditor-dialog-transclusion-no-template-description',
title.getPrefixedText()
-   ).parse() )
+   ).parseDom() )
.find( 'a' ).attr( 'target', '_blank' );
}
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I34f56ee60b836a7e0556130a153fc95adb4f3467
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: Fomafix 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Newsletter[master]: Remove unnecessary doc for doLinkCacheQuery and fix a small ...

2016-12-28 Thread jenkins-bot (Code Review)

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

Change subject: Remove unnecessary doc for doLinkCacheQuery and fix a small typo
..


Remove unnecessary doc for doLinkCacheQuery and fix a small typo

* It doesn't return anything

Bug: T154233
Change-Id: Iab4262903dd3e22e3ffbd00ca6575ecf6d26b665
---
M includes/Echo/EchoNewsletterUserLocator.php
M includes/content/NewsletterContent.php
2 files changed, 1 insertion(+), 3 deletions(-)

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



diff --git a/includes/Echo/EchoNewsletterUserLocator.php 
b/includes/Echo/EchoNewsletterUserLocator.php
index 3e7b814..b70281d 100644
--- a/includes/Echo/EchoNewsletterUserLocator.php
+++ b/includes/Echo/EchoNewsletterUserLocator.php
@@ -5,7 +5,7 @@
 * Locate all users subscribed to a newsletter.
 *
 * @param EchoEvent $event
-* @return User[]|array empty if the newsletter has beend 
deleted/invalid
+* @return User[]|array empty if the newsletter has been deleted/invalid
 */
public static function locateNewsletterSubscribedUsers( EchoEvent 
$event ) {
$extra = $event->getExtra();
diff --git a/includes/content/NewsletterContent.php 
b/includes/content/NewsletterContent.php
index 10788a2..0f2bb85 100644
--- a/includes/content/NewsletterContent.php
+++ b/includes/content/NewsletterContent.php
@@ -307,8 +307,6 @@
 * or not and add them to LinkCache
 *
 * @param Iterator $users
-*
-* @return string
 */
private function doLinkCacheQuery( Iterator $users ) {
$batch = new LinkBatch();

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iab4262903dd3e22e3ffbd00ca6575ecf6d26b665
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: MtDu 
Gerrit-Reviewer: 01tonythomas <01tonytho...@gmail.com>
Gerrit-Reviewer: Florianschmidtwelzow 
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...Newsletter[master]: Remove unnecessary doc for doLinkCacheQuery and fix a small ...

2016-12-28 Thread MtDu (Code Review)

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

Change subject: Remove unnecessary doc for doLinkCacheQuery and fix a small typo
..

Remove unnecessary doc for doLinkCacheQuery and fix a small typo

* It doesn't return anything

Bug: T154233
Change-Id: Iab4262903dd3e22e3ffbd00ca6575ecf6d26b665
---
M includes/Echo/EchoNewsletterUserLocator.php
M includes/content/NewsletterContent.php
2 files changed, 1 insertion(+), 3 deletions(-)


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

diff --git a/includes/Echo/EchoNewsletterUserLocator.php 
b/includes/Echo/EchoNewsletterUserLocator.php
index 3e7b814..b70281d 100644
--- a/includes/Echo/EchoNewsletterUserLocator.php
+++ b/includes/Echo/EchoNewsletterUserLocator.php
@@ -5,7 +5,7 @@
 * Locate all users subscribed to a newsletter.
 *
 * @param EchoEvent $event
-* @return User[]|array empty if the newsletter has beend 
deleted/invalid
+* @return User[]|array empty if the newsletter has been deleted/invalid
 */
public static function locateNewsletterSubscribedUsers( EchoEvent 
$event ) {
$extra = $event->getExtra();
diff --git a/includes/content/NewsletterContent.php 
b/includes/content/NewsletterContent.php
index 10788a2..0f2bb85 100644
--- a/includes/content/NewsletterContent.php
+++ b/includes/content/NewsletterContent.php
@@ -307,8 +307,6 @@
 * or not and add them to LinkCache
 *
 * @param Iterator $users
-*
-* @return string
 */
private function doLinkCacheQuery( Iterator $users ) {
$batch = new LinkBatch();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iab4262903dd3e22e3ffbd00ca6575ecf6d26b665
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: MtDu 

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: Add disabled Progress bar to demos

2016-12-28 Thread jenkins-bot (Code Review)

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

Change subject: Add disabled Progress bar to demos
..


Add disabled Progress bar to demos

Change-Id: I166339e8443054b5e63cc19fcd5412b397a629c5
---
M demos/pages/widgets.js
1 file changed, 9 insertions(+), 0 deletions(-)

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



diff --git a/demos/pages/widgets.js b/demos/pages/widgets.js
index 70e15ea..21baddf 100644
--- a/demos/pages/widgets.js
+++ b/demos/pages/widgets.js
@@ -1881,6 +1881,15 @@
),
new OO.ui.FieldLayout(
new OO.ui.ProgressBarWidget( {
+   disabled: true
+   } ),
+   {
+   label: 'Progress bar 
(disabled)\u200E',
+   align: 'top'
+   }
+   ),
+   new OO.ui.FieldLayout(
+   new OO.ui.ProgressBarWidget( {
progress: false
} ),
{

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I166339e8443054b5e63cc19fcd5412b397a629c5
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: VolkerE 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Jforrester 
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]: Replace some usages of &$this in hook parameters

2016-12-28 Thread jenkins-bot (Code Review)

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

Change subject: Replace some usages of &$this in hook parameters
..


Replace some usages of &$this in hook parameters

Affected classes:
- ApiBase
- ApiPageSet
- HistoryPager
- RawAction

Bug: T153505
Change-Id: I0862476a39a1c3206a84f79c1b8f7db41bc47959
---
M includes/actions/HistoryAction.php
M includes/actions/RawAction.php
M includes/api/ApiBase.php
M includes/api/ApiPageSet.php
4 files changed, 22 insertions(+), 6 deletions(-)

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



diff --git a/includes/actions/HistoryAction.php 
b/includes/actions/HistoryAction.php
index 767a163..e8aec1c 100644
--- a/includes/actions/HistoryAction.php
+++ b/includes/actions/HistoryAction.php
@@ -428,7 +428,10 @@
$queryInfo['options'],
$this->tagFilter
);
-   Hooks::run( 'PageHistoryPager::getQueryInfo', [ &$this, 
&$queryInfo ] );
+
+   // Avoid PHP 7.1 warning of passing $this by reference
+   $historyPager = $this;
+   Hooks::run( 'PageHistoryPager::getQueryInfo', [ &$historyPager, 
&$queryInfo ] );
 
return $queryInfo;
}
diff --git a/includes/actions/RawAction.php b/includes/actions/RawAction.php
index 5bf24f6..d8c8bc3 100644
--- a/includes/actions/RawAction.php
+++ b/includes/actions/RawAction.php
@@ -108,7 +108,9 @@
$response->statusHeader( 404 );
}
 
-   if ( !Hooks::run( 'RawPageViewBeforeOutput', [ &$this, &$text ] 
) ) {
+   // Avoid PHP 7.1 warning of passing $this by reference
+   $rawAction = $this;
+   if ( !Hooks::run( 'RawPageViewBeforeOutput', [ &$rawAction, 
&$text ] ) ) {
wfDebug( __METHOD__ . ": RawPageViewBeforeOutput hook 
broke raw page output.\n" );
}
 
diff --git a/includes/api/ApiBase.php b/includes/api/ApiBase.php
index c1ad947..063d661 100644
--- a/includes/api/ApiBase.php
+++ b/includes/api/ApiBase.php
@@ -1936,7 +1936,10 @@
 */
public function getFinalDescription() {
$desc = $this->getDescription();
-   Hooks::run( 'APIGetDescription', [ &$this, &$desc ] );
+
+   // Avoid PHP 7.1 warning of passing $this by reference
+   $apiModule = $this;
+   Hooks::run( 'APIGetDescription', [ &$apiModule, &$desc ] );
$desc = self::escapeWikiText( $desc );
if ( is_array( $desc ) ) {
$desc = implode( "\n", $desc );
@@ -1984,7 +1987,9 @@
] + ( isset( $params['token'] ) ? $params['token'] : [] 
);
}
 
-   Hooks::run( 'APIGetAllowedParams', [ &$this, &$params, $flags ] 
);
+   // Avoid PHP 7.1 warning of passing $this by reference
+   $apiModule = $this;
+   Hooks::run( 'APIGetAllowedParams', [ &$apiModule, &$params, 
$flags ] );
 
return $params;
}
@@ -2002,7 +2007,10 @@
$path = $this->getModulePath();
 
$desc = $this->getParamDescription();
-   Hooks::run( 'APIGetParamDescription', [ &$this, &$desc ] );
+
+   // Avoid PHP 7.1 warning of passing $this by reference
+   $apiModule = $this;
+   Hooks::run( 'APIGetParamDescription', [ &$apiModule, &$desc ] );
 
if ( !$desc ) {
$desc = [];
diff --git a/includes/api/ApiPageSet.php b/includes/api/ApiPageSet.php
index 160ce87..d42e306 100644
--- a/includes/api/ApiPageSet.php
+++ b/includes/api/ApiPageSet.php
@@ -174,7 +174,10 @@
// populate this pageset with the generator output
if ( !$isDryRun ) {
$generator->executeGenerator( $this );
-   Hooks::run( 'APIQueryGeneratorAfterExecute', [ 
&$generator, &$this ] );
+
+   // Avoid PHP 7.1 warning of passing $this by 
reference
+   $apiModule = $this;
+   Hooks::run( 'APIQueryGeneratorAfterExecute', [ 
&$generator, &$apiModule ] );
} else {
// Prevent warnings from being reported on 
these parameters
$main = $this->getMain();

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0862476a39a1c3206a84f79c1b8f7db41bc47959
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Victorbarbu 
Gerrit-Reviewer:

[MediaWiki-commits] [Gerrit] wikimedia...SmashPig[master]: Revert on deployment: gitignore vendor submodule

2016-12-28 Thread Ejegg (Code Review)

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

Change subject: Revert on deployment: gitignore vendor submodule
..

Revert on deployment: gitignore vendor submodule

So we don't get complaints switching between master and deployment

Change-Id: Ide702baa01fa33255f021ca80c935ca2b039d078
---
M .gitignore
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig 
refs/changes/09/329509/1

diff --git a/.gitignore b/.gitignore
index 8bcf162..eab43d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,6 @@
 
 # IDE Tools
 .idea
+
+# Composer deps only on deployment branch
+vendor

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ide702baa01fa33255f021ca80c935ca2b039d078
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/SmashPig
Gerrit-Branch: master
Gerrit-Owner: Ejegg 

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

[MediaWiki-commits] [Gerrit] wikimedia...SmashPig[deployment]: Update vendor submodule for CVE-2016-10045 and CVE-2016-10033

2016-12-28 Thread Cdentinger (Code Review)

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

Change subject: Update vendor submodule for CVE-2016-10045 and CVE-2016-10033
..

Update vendor submodule for CVE-2016-10045 and CVE-2016-10033

Change-Id: I7a27272055191d410180f7ae9af87230107ed2da
---
M composer.lock
M vendor
2 files changed, 119 insertions(+), 108 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig 
refs/changes/08/329508/1

diff --git a/composer.lock b/composer.lock
index 12315e9..db64036 100644
--- a/composer.lock
+++ b/composer.lock
@@ -44,7 +44,7 @@
 "payment",
 "payments"
 ],
-"time": "2016-02-17 00:53:20"
+"time": "2016-02-17 00:44:20"
 },
 {
 "name": "clio/clio",
@@ -93,7 +93,7 @@
 "source": {
 "type": "git",
 "url": 
"https://gerrit.wikimedia.org/r/p/wikimedia/fundraising/php-queue.git;,
-"reference": "14198ba1f7d4868933649a85621a3955965e83cd"
+"reference": "8e15cbf9a46ef58ceeadb9b359fee925291a0173"
 },
 "require": {
 "clio/clio": "0.1.*",
@@ -148,7 +148,7 @@
 "queue",
 "transaction"
 ],
-"time": "2016-08-05 19:16:32"
+"time": "2016-10-17 23:39:02"
 },
 {
 "name": "fusesource/stomp-php",
@@ -197,6 +197,7 @@
 "messaging",
 "stomp"
 ],
+"abandoned": "stomp-php/stomp-php",
 "time": "2013-02-23 17:34:44"
 },
 {
@@ -243,16 +244,16 @@
 },
 {
 "name": "monolog/monolog",
-"version": "1.21.0",
+"version": "1.22.0",
 "source": {
 "type": "git",
 "url": "https://github.com/Seldaek/monolog.git;,
-"reference": "f42fbdfd53e306bda545845e4dbfd3e72edb4952"
+"reference": "bad29cb8d18ab0315e6c477751418a82c850d558"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/Seldaek/monolog/zipball/f42fbdfd53e306bda545845e4dbfd3e72edb4952;,
-"reference": "f42fbdfd53e306bda545845e4dbfd3e72edb4952",
+"url": 
"https://api.github.com/repos/Seldaek/monolog/zipball/bad29cb8d18ab0315e6c477751418a82c850d558;,
+"reference": "bad29cb8d18ab0315e6c477751418a82c850d558",
 "shasum": ""
 },
 "require": {
@@ -263,7 +264,7 @@
 "psr/log-implementation": "1.0.0"
 },
 "require-dev": {
-"aws/aws-sdk-php": "^2.4.9",
+"aws/aws-sdk-php": "^2.4.9 || ^3.0",
 "doctrine/couchdb": "~1.0@dev",
 "graylog2/gelf-php": "~1.0",
 "jakub-onderka/php-parallel-lint": "0.9",
@@ -317,20 +318,20 @@
 "logging",
 "psr-3"
 ],
-"time": "2016-07-29 03:23:52"
+"time": "2016-11-26 00:15:39"
 },
 {
 "name": "phpmailer/phpmailer",
-"version": "v5.2.16",
+"version": "v5.2.21",
 "source": {
 "type": "git",
 "url": "https://github.com/PHPMailer/PHPMailer.git;,
-"reference": "1d85f9ef3ecfc42bbc4f3c70d5e37ca9a65f629a"
+"reference": "1d51856b76c06fc687fcd9180efa7a0bed0d761e"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/PHPMailer/PHPMailer/zipball/1d85f9ef3ecfc42bbc4f3c70d5e37ca9a65f629a;,
-"reference": "1d85f9ef3ecfc42bbc4f3c70d5e37ca9a65f629a",
+"url": 
"https://api.github.com/repos/PHPMailer/PHPMailer/zipball/1d51856b76c06fc687fcd9180efa7a0bed0d761e;,
+"reference": "1d51856b76c06fc687fcd9180efa7a0bed0d761e",
 "shasum": ""
 },
 "require": {
@@ -377,7 +378,7 @@
 }
 ],
 "description": "PHPMailer is a full-featured email creation and 
transfer class for PHP",
-"time": "2016-06-06 09:09:37"
+"time": "2016-12-28 15:35:48"
 },
 {
 "name": "predis/predis",
@@ -431,22 +432,30 @@
 },
 {
 "name": "psr/log",
-"version": "1.0.0",
+"version": "1.0.2",
 "source": {
 "type": "git",
 "url": "https://github.com/php-fig/log.git;,
-"reference": "fe0936ee26643249e916849d48e3a51d5f5e278b"
+"reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d"
 },
 "dist": {
 "type": "zip",
-

[MediaWiki-commits] [Gerrit] oojs/ui[master]: Use CSS transforms for indeterminate ProgressBarWidget

2016-12-28 Thread jenkins-bot (Code Review)

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

Change subject: Use CSS transforms for indeterminate ProgressBarWidget
..


Use CSS transforms for indeterminate ProgressBarWidget

Animating margin-left is horrifically expensive. Just viewing the
current demo page, with its single indeterminate progressbar, causes
my CPU usage to jump to ~30% (Chromium) / ~50% (Firefox). While the
current 'margin-left' animation requires recalculating the layout of
the progressbar on every animation tick, this should be localised to
the widget itself and these so-called "modern" browsers really should
not be using this amount of resources.

They're okay at animating CSS transforms though, which don't require a
layout recalculation, with CPU usage on the demo page staying under 5%.
Since there seem to be no browsers that support CSS animation but no
CSS transforms, let's animate 'transform' rather than 'margin-left'
for identical effect.

(Microsoft Edge and old Opera 12 do not suffer from this. They have
mostly identical CPU usage with both variants, with Edge using ~10%
and Opera ~5%.)

(My test machine is a Thinkpad T500 with 2.53 GHz Intel Core2 Duo
T9400 CPU, with a discrete ATI Mobility Radeon HD 3650 graphics card.
Your mileage may vary, but I don't expect this to degrade performance
anywhere.)

Change-Id: I0a3e2e88930da01141acc3c391a379e2a18aec5d
---
M src/themes/apex/widgets.less
M src/themes/mediawiki/widgets.less
2 files changed, 8 insertions(+), 11 deletions(-)

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



diff --git a/src/themes/apex/widgets.less b/src/themes/apex/widgets.less
index 6b9c240..66a2817 100644
--- a/src/themes/apex/widgets.less
+++ b/src/themes/apex/widgets.less
@@ -1043,14 +1043,14 @@
&-bar {
height: 1em;
border-right: 1px solid #ccc;
-   .oo-ui-transition(width @medium-ease, margin-left @medium-ease);
+   .oo-ui-transition(width @medium-ease);
.oo-ui-vertical-gradient(@progressive-gradient-start, 
@progressive-gradient-end);
}
&-indeterminate {
.oo-ui-progressBarWidget-bar {
.oo-ui-animation(oo-ui-progressBarWidget-slide 2s 
infinite linear);
width: 40%;
-   margin-left: -10%;
+   .oo-ui-transform( translate( -25% ) );
border-left: 1px solid @progressive-border;
}
}
@@ -1060,10 +1060,10 @@
 
.oo-ui-progressBarWidget-slide-frames () {
from {
-   margin-left: -40%;
+   .oo-ui-transform( translate( -100% ) );
}
to {
-   margin-left: 100%;
+   .oo-ui-transform( translate( 350% ) );
}
}
@-webkit-keyframes oo-ui-progressBarWidget-slide {
diff --git a/src/themes/mediawiki/widgets.less 
b/src/themes/mediawiki/widgets.less
index 92dc8de..80ad348 100644
--- a/src/themes/mediawiki/widgets.less
+++ b/src/themes/mediawiki/widgets.less
@@ -1631,16 +1631,13 @@
&-bar {
background-color: @color-progressive;
height: 1em;
-   .oo-ui-transition(
-   width 200ms,
-   margin-left 200ms
-   );
+   .oo-ui-transition( width 200ms );
}
&-indeterminate {
.oo-ui-progressBarWidget-bar {
.oo-ui-animation( oo-ui-progressBarWidget-slide 2s 
infinite linear );
width: 40%;
-   margin-left: -10%;
+   .oo-ui-transform( translate( -25% ) );
border-left-width: @border-width-default;
}
}
@@ -1650,10 +1647,10 @@
 
.oo-ui-progressBarWidget-slide-frames () {
from {
-   margin-left: -40%;
+   .oo-ui-transform( translate( -100% ) );
}
to {
-   margin-left: 100%;
+   .oo-ui-transform( translate( 350% ) );
}
}
@-webkit-keyframes oo-ui-progressBarWidget-slide {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0a3e2e88930da01141acc3c391a379e2a18aec5d
Gerrit-PatchSet: 2
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: VolkerE 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...vendor[master]: update libs

2016-12-28 Thread Cdentinger (Code Review)

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

Change subject: update libs
..


update libs

Change-Id: I7a7cd9f2f797511409496d116d34c5b85a094ea1
---
M autoload.php
A bin/parallel-lint
A bin/phpunit
M coderkungfu/php-queue/src/PHPQueue/Backend/PDO.php
M coderkungfu/php-queue/src/PHPQueue/Backend/Predis.php
A coderkungfu/php-queue/src/PHPQueue/Exception/JsonException.php
A coderkungfu/php-queue/src/PHPQueue/Json.php
M coderkungfu/php-queue/test/PHPQueue/Backend/PredisTest.php
M composer/ClassLoader.php
M composer/LICENSE
M composer/autoload_classmap.php
M composer/autoload_files.php
M composer/autoload_namespaces.php
M composer/autoload_psr4.php
M composer/autoload_real.php
M composer/autoload_static.php
M composer/installed.json
A doctrine/instantiator/.gitignore
A doctrine/instantiator/.scrutinizer.yml
A doctrine/instantiator/.travis.install.sh
A doctrine/instantiator/.travis.yml
A doctrine/instantiator/CONTRIBUTING.md
A doctrine/instantiator/LICENSE
A doctrine/instantiator/README.md
A doctrine/instantiator/composer.json
A doctrine/instantiator/phpmd.xml.dist
A doctrine/instantiator/phpunit.xml.dist
A 
doctrine/instantiator/src/Doctrine/Instantiator/Exception/ExceptionInterface.php
A 
doctrine/instantiator/src/Doctrine/Instantiator/Exception/InvalidArgumentException.php
A 
doctrine/instantiator/src/Doctrine/Instantiator/Exception/UnexpectedValueException.php
A doctrine/instantiator/src/Doctrine/Instantiator/Instantiator.php
A doctrine/instantiator/src/Doctrine/Instantiator/InstantiatorInterface.php
A 
doctrine/instantiator/tests/DoctrineTest/InstantiatorPerformance/InstantiatorPerformanceEvent.php
A 
doctrine/instantiator/tests/DoctrineTest/InstantiatorTest/Exception/InvalidArgumentExceptionTest.php
A 
doctrine/instantiator/tests/DoctrineTest/InstantiatorTest/Exception/UnexpectedValueExceptionTest.php
A doctrine/instantiator/tests/DoctrineTest/InstantiatorTest/InstantiatorTest.php
A 
doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/AbstractClassAsset.php
A 
doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/ArrayObjectAsset.php
A 
doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/ExceptionAsset.php
A 
doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/FinalExceptionAsset.php
A doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/PharAsset.php
A 
doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/PharExceptionAsset.php
A 
doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/SerializableArrayObjectAsset.php
A 
doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/SimpleSerializableAsset.php
A 
doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/SimpleTraitAsset.php
A 
doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/UnCloneableAsset.php
A 
doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/UnserializeExceptionArrayObjectAsset.php
A 
doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/WakeUpNoticesAsset.php
A 
doctrine/instantiator/tests/DoctrineTest/InstantiatorTestAsset/XMLReaderAsset.php
A jakub-onderka/php-parallel-lint/.gitignore
A jakub-onderka/php-parallel-lint/.travis.yml
A jakub-onderka/php-parallel-lint/LICENSE
A jakub-onderka/php-parallel-lint/README.md
A jakub-onderka/php-parallel-lint/appveyor.yml
A jakub-onderka/php-parallel-lint/bin/skip-linting.php
A jakub-onderka/php-parallel-lint/box.json
A jakub-onderka/php-parallel-lint/composer.json
A jakub-onderka/php-parallel-lint/parallel-lint
A jakub-onderka/php-parallel-lint/parallel-lint.php
A jakub-onderka/php-parallel-lint/phpcs-ruleset.xml
A jakub-onderka/php-parallel-lint/src/Error.php
A jakub-onderka/php-parallel-lint/src/ErrorFormatter.php
A jakub-onderka/php-parallel-lint/src/JsonSerializable.php
A jakub-onderka/php-parallel-lint/src/Manager.php
A jakub-onderka/php-parallel-lint/src/Output.php
A jakub-onderka/php-parallel-lint/src/ParallelLint.php
A jakub-onderka/php-parallel-lint/src/Process/GitBlameProcess.php
A jakub-onderka/php-parallel-lint/src/Process/LintProcess.php
A jakub-onderka/php-parallel-lint/src/Process/PhpExecutable.php
A jakub-onderka/php-parallel-lint/src/Process/PhpProcess.php
A jakub-onderka/php-parallel-lint/src/Process/Process.php
A jakub-onderka/php-parallel-lint/src/Process/SkipLintProcess.php
A jakub-onderka/php-parallel-lint/src/Result.php
A jakub-onderka/php-parallel-lint/src/Settings.php
A jakub-onderka/php-parallel-lint/src/exceptions.php
A jakub-onderka/php-parallel-lint/tests/Manager.run.phpt
A jakub-onderka/php-parallel-lint/tests/ParallelLint.lint.phpt
A jakub-onderka/php-parallel-lint/tests/Settings.parseArguments.phpt
A jakub-onderka/php-parallel-lint/tests/SkipLintProcess.phpt
A jakub-onderka/php-parallel-lint/tests/examples/example-01/empty-file
A jakub-onderka/php-parallel-lint/tests/examples/example-02/example.php
A

[MediaWiki-commits] [Gerrit] wikimedia...vendor[master]: update libs

2016-12-28 Thread Cdentinger (Code Review)

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

Change subject: update libs
..

update libs

Change-Id: I7a7cd9f2f797511409496d116d34c5b85a094ea1
---
M autoload.php
M coderkungfu/php-queue/src/PHPQueue/Backend/PDO.php
M coderkungfu/php-queue/src/PHPQueue/Backend/Predis.php
M coderkungfu/php-queue/test/PHPQueue/Backend/PredisTest.php
M composer/ClassLoader.php
M composer/LICENSE
M composer/autoload_classmap.php
M composer/autoload_files.php
M composer/autoload_namespaces.php
M composer/autoload_psr4.php
M composer/autoload_real.php
M composer/autoload_static.php
M composer/installed.json
M monolog/monolog/CHANGELOG.mdown
M monolog/monolog/composer.json
M monolog/monolog/doc/02-handlers-formatters-processors.md
M monolog/monolog/src/Monolog/Formatter/JsonFormatter.php
M monolog/monolog/src/Monolog/Formatter/LineFormatter.php
M monolog/monolog/src/Monolog/Formatter/NormalizerFormatter.php
M monolog/monolog/src/Monolog/Handler/AmqpHandler.php
M monolog/monolog/src/Monolog/Handler/DynamoDbHandler.php
M monolog/monolog/src/Monolog/Handler/RavenHandler.php
M monolog/monolog/src/Monolog/Handler/RollbarHandler.php
M monolog/monolog/src/Monolog/Handler/SlackHandler.php
M monolog/monolog/src/Monolog/Handler/StreamHandler.php
M monolog/monolog/src/Monolog/Handler/SyslogUdpHandler.php
M monolog/monolog/src/Monolog/Handler/TestHandler.php
M monolog/monolog/src/Monolog/Logger.php
M monolog/monolog/tests/Monolog/Formatter/JsonFormatterTest.php
M monolog/monolog/tests/Monolog/Formatter/NormalizerFormatterTest.php
M monolog/monolog/tests/Monolog/Handler/RavenHandlerTest.php
M monolog/monolog/tests/Monolog/Handler/SlackHandlerTest.php
M monolog/monolog/tests/Monolog/Handler/SyslogUdpHandlerTest.php
M monolog/monolog/tests/Monolog/Handler/TestHandlerTest.php
M monolog/monolog/tests/Monolog/LoggerTest.php
D phpmailer/phpmailer/.gitignore
D phpmailer/phpmailer/.scrutinizer.yml
D phpmailer/phpmailer/.travis.yml
D phpmailer/phpmailer/README.md
M phpmailer/phpmailer/VERSION
D phpmailer/phpmailer/changelog.md
M phpmailer/phpmailer/class.phpmailer.php
M phpmailer/phpmailer/class.phpmaileroauth.php
M phpmailer/phpmailer/class.pop3.php
M phpmailer/phpmailer/class.smtp.php
M phpmailer/phpmailer/composer.lock
D phpmailer/phpmailer/docs/Callback_function_notes.txt
D phpmailer/phpmailer/docs/DomainKeys_notes.txt
D phpmailer/phpmailer/docs/Note_for_SMTP_debugging.txt
D phpmailer/phpmailer/docs/extending.html
D phpmailer/phpmailer/docs/faq.html
D phpmailer/phpmailer/docs/generatedocs.sh
D phpmailer/phpmailer/docs/pop3_article.txt
M phpmailer/phpmailer/examples/scripts/shLegacy.js
M phpmailer/phpmailer/examples/smtp_check.phps
M phpmailer/phpmailer/extras/htmlfilter.php
M phpmailer/phpmailer/extras/ntlm_sasl_client.php
D phpmailer/phpmailer/language/phpmailer.lang-br.php
D phpmailer/phpmailer/language/phpmailer.lang-cz.php
M phpmailer/phpmailer/language/phpmailer.lang-de.php
D phpmailer/phpmailer/language/phpmailer.lang-dk.php
M phpmailer/phpmailer/language/phpmailer.lang-es.php
D phpmailer/phpmailer/language/phpmailer.lang-no.php
M phpmailer/phpmailer/language/phpmailer.lang-ro.php
D phpmailer/phpmailer/language/phpmailer.lang-se.php
D phpmailer/phpmailer/test/bootstrap.php
D phpmailer/phpmailer/test/fakepopserver.sh
D phpmailer/phpmailer/test/fakesendmail.sh
D phpmailer/phpmailer/test/phpmailerLangTest.php
D phpmailer/phpmailer/test/phpmailerTest.php
D phpmailer/phpmailer/test/runfakepopserver.sh
D phpmailer/phpmailer/test/test_callback.php
D phpmailer/phpmailer/test/testbootstrap-dist.php
D phpmailer/phpmailer/travis.phpunit.xml.dist
M psr/log/Psr/Log/AbstractLogger.php
M psr/log/Psr/Log/LogLevel.php
M psr/log/Psr/Log/LoggerAwareInterface.php
M psr/log/Psr/Log/LoggerAwareTrait.php
M psr/log/Psr/Log/LoggerInterface.php
M psr/log/Psr/Log/LoggerTrait.php
M psr/log/Psr/Log/NullLogger.php
M psr/log/Psr/Log/Test/LoggerInterfaceTest.php
M psr/log/composer.json
M symfony/event-dispatcher/EventDispatcher.php
M symfony/http-foundation/BinaryFileResponse.php
M symfony/http-foundation/File/MimeType/FileinfoMimeTypeGuesser.php
M symfony/http-foundation/JsonResponse.php
M symfony/http-foundation/Request.php
M symfony/http-foundation/RequestMatcher.php
M symfony/http-foundation/Response.php
M symfony/http-foundation/Session/Storage/Handler/MemcacheSessionHandler.php
M symfony/http-foundation/StreamedResponse.php
M symfony/http-foundation/Tests/JsonResponseTest.php
M symfony/http-foundation/Tests/RequestTest.php
M 
symfony/http-foundation/Tests/Session/Storage/Handler/MemcacheSessionHandlerTest.php
M 
symfony/http-foundation/Tests/Session/Storage/Handler/MemcachedSessionHandlerTest.php
M symfony/polyfill-mbstring/Mbstring.php
M symfony/polyfill-mbstring/bootstrap.php
M symfony/polyfill-mbstring/composer.json
M symfony/polyfill-php54/composer.json
M symfony/polyfill-php55/composer.json
M symfony/yaml/Inline.php
M

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add language fallback from rup (Aromanian) to ro (Romanian)

2016-12-28 Thread Nemo bis (Code Review)

Nemo bis has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329506 )

Change subject: Add language fallback from rup (Aromanian) to ro (Romanian)
..

Add language fallback from rup (Aromanian) to ro (Romanian)

https://translatewiki.net/wiki/Thread:Portal_talk:Rup/User_Romanian_when_no_translation_available

All translators and roa_rup.wiki editors have been asked to join
the discussion.

Change-Id: If49561f3bca65fb0d1e413e175710ef744ad2ca0
---
A languages/messages/MessagesRup.php
1 file changed, 10 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/06/329506/1

diff --git a/languages/messages/MessagesRup.php 
b/languages/messages/MessagesRup.php
new file mode 100644
index 000..041dc46
--- /dev/null
+++ b/languages/messages/MessagesRup.php
@@ -0,0 +1,10 @@
+https://translatewiki.net
+ *
+ * @ingroup Language
+ * @file
+ */
+
+$fallback = 'ro';

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If49561f3bca65fb0d1e413e175710ef744ad2ca0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Nemo bis 

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

[MediaWiki-commits] [Gerrit] wikimedia...vendor[master]: update phpmailer for CVE-2016-10045 and CVE-2016-10033

2016-12-28 Thread Cdentinger (Code Review)

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

Change subject: update phpmailer for CVE-2016-10045 and CVE-2016-10033
..

update phpmailer for CVE-2016-10045 and CVE-2016-10033

Change-Id: I9e2aeac0cd4d930989b1e6b84486caeb759783aa
---
M autoload.php
M coderkungfu/php-queue/src/PHPQueue/Backend/PDO.php
M coderkungfu/php-queue/src/PHPQueue/Backend/Predis.php
M coderkungfu/php-queue/test/PHPQueue/Backend/PredisTest.php
M composer/ClassLoader.php
M composer/autoload_classmap.php
M composer/autoload_files.php
M composer/autoload_namespaces.php
M composer/autoload_psr4.php
M composer/autoload_real.php
M composer/autoload_static.php
M composer/installed.json
M monolog/monolog/CHANGELOG.mdown
M monolog/monolog/composer.json
M monolog/monolog/doc/02-handlers-formatters-processors.md
M monolog/monolog/src/Monolog/Formatter/JsonFormatter.php
M monolog/monolog/src/Monolog/Formatter/LineFormatter.php
M monolog/monolog/src/Monolog/Formatter/NormalizerFormatter.php
M monolog/monolog/src/Monolog/Handler/AmqpHandler.php
M monolog/monolog/src/Monolog/Handler/DynamoDbHandler.php
M monolog/monolog/src/Monolog/Handler/RavenHandler.php
M monolog/monolog/src/Monolog/Handler/RollbarHandler.php
M monolog/monolog/src/Monolog/Handler/SlackHandler.php
M monolog/monolog/src/Monolog/Handler/StreamHandler.php
M monolog/monolog/src/Monolog/Handler/SyslogUdpHandler.php
M monolog/monolog/src/Monolog/Handler/TestHandler.php
M monolog/monolog/src/Monolog/Logger.php
M monolog/monolog/tests/Monolog/Formatter/JsonFormatterTest.php
M monolog/monolog/tests/Monolog/Formatter/NormalizerFormatterTest.php
M monolog/monolog/tests/Monolog/Handler/RavenHandlerTest.php
M monolog/monolog/tests/Monolog/Handler/SlackHandlerTest.php
M monolog/monolog/tests/Monolog/Handler/SyslogUdpHandlerTest.php
M monolog/monolog/tests/Monolog/Handler/TestHandlerTest.php
M monolog/monolog/tests/Monolog/LoggerTest.php
D phpmailer/phpmailer/.gitignore
D phpmailer/phpmailer/.scrutinizer.yml
D phpmailer/phpmailer/.travis.yml
D phpmailer/phpmailer/README.md
M phpmailer/phpmailer/VERSION
D phpmailer/phpmailer/changelog.md
M phpmailer/phpmailer/class.phpmailer.php
M phpmailer/phpmailer/class.phpmaileroauth.php
M phpmailer/phpmailer/class.pop3.php
M phpmailer/phpmailer/class.smtp.php
M phpmailer/phpmailer/composer.lock
D phpmailer/phpmailer/docs/Callback_function_notes.txt
D phpmailer/phpmailer/docs/DomainKeys_notes.txt
D phpmailer/phpmailer/docs/Note_for_SMTP_debugging.txt
D phpmailer/phpmailer/docs/extending.html
D phpmailer/phpmailer/docs/faq.html
D phpmailer/phpmailer/docs/generatedocs.sh
D phpmailer/phpmailer/docs/pop3_article.txt
M phpmailer/phpmailer/examples/scripts/shLegacy.js
M phpmailer/phpmailer/examples/smtp_check.phps
M phpmailer/phpmailer/extras/htmlfilter.php
M phpmailer/phpmailer/extras/ntlm_sasl_client.php
D phpmailer/phpmailer/language/phpmailer.lang-br.php
D phpmailer/phpmailer/language/phpmailer.lang-cz.php
M phpmailer/phpmailer/language/phpmailer.lang-de.php
D phpmailer/phpmailer/language/phpmailer.lang-dk.php
M phpmailer/phpmailer/language/phpmailer.lang-es.php
D phpmailer/phpmailer/language/phpmailer.lang-no.php
M phpmailer/phpmailer/language/phpmailer.lang-ro.php
D phpmailer/phpmailer/language/phpmailer.lang-se.php
D phpmailer/phpmailer/test/bootstrap.php
D phpmailer/phpmailer/test/fakepopserver.sh
D phpmailer/phpmailer/test/fakesendmail.sh
D phpmailer/phpmailer/test/phpmailerLangTest.php
D phpmailer/phpmailer/test/phpmailerTest.php
D phpmailer/phpmailer/test/runfakepopserver.sh
D phpmailer/phpmailer/test/test_callback.php
D phpmailer/phpmailer/test/testbootstrap-dist.php
D phpmailer/phpmailer/travis.phpunit.xml.dist
M psr/log/Psr/Log/AbstractLogger.php
M psr/log/Psr/Log/LogLevel.php
M psr/log/Psr/Log/LoggerAwareInterface.php
M psr/log/Psr/Log/LoggerAwareTrait.php
M psr/log/Psr/Log/LoggerInterface.php
M psr/log/Psr/Log/LoggerTrait.php
M psr/log/Psr/Log/NullLogger.php
M psr/log/Psr/Log/Test/LoggerInterfaceTest.php
M psr/log/composer.json
M symfony/event-dispatcher/EventDispatcher.php
M symfony/http-foundation/BinaryFileResponse.php
M symfony/http-foundation/File/MimeType/FileinfoMimeTypeGuesser.php
M symfony/http-foundation/IpUtils.php
M symfony/http-foundation/JsonResponse.php
M symfony/http-foundation/Request.php
M symfony/http-foundation/RequestMatcher.php
M symfony/http-foundation/Response.php
M symfony/http-foundation/Session/Flash/FlashBagInterface.php
M symfony/http-foundation/Session/Storage/Handler/MemcacheSessionHandler.php
M symfony/http-foundation/Session/Storage/Handler/MongoDbSessionHandler.php
M symfony/http-foundation/StreamedResponse.php
M symfony/http-foundation/Tests/IpUtilsTest.php
M symfony/http-foundation/Tests/JsonResponseTest.php
M symfony/http-foundation/Tests/RequestTest.php
M 
symfony/http-foundation/Tests/Session/Storage/Handler/MemcacheSessionHandlerTest.php
M

[MediaWiki-commits] [Gerrit] wikimedia...SmashPig[master]: Update phpmailer for CVE-2016-10045 and CVE-2016-10033

2016-12-28 Thread jenkins-bot (Code Review)

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

Change subject: Update phpmailer for CVE-2016-10045 and CVE-2016-10033
..


Update phpmailer for CVE-2016-10045 and CVE-2016-10033

Change-Id: I7a27272055191d410180f7ae9af87230107ed2da
---
M composer.lock
1 file changed, 118 insertions(+), 107 deletions(-)

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



diff --git a/composer.lock b/composer.lock
index d93db56..5278ada 100644
--- a/composer.lock
+++ b/composer.lock
@@ -44,7 +44,7 @@
 "payment",
 "payments"
 ],
-"time": "2016-02-17 00:53:20"
+"time": "2016-02-17 00:44:20"
 },
 {
 "name": "clio/clio",
@@ -93,7 +93,7 @@
 "source": {
 "type": "git",
 "url": 
"https://gerrit.wikimedia.org/r/p/wikimedia/fundraising/php-queue.git;,
-"reference": "14198ba1f7d4868933649a85621a3955965e83cd"
+"reference": "8e15cbf9a46ef58ceeadb9b359fee925291a0173"
 },
 "require": {
 "clio/clio": "0.1.*",
@@ -149,7 +149,7 @@
 "queue",
 "transaction"
 ],
-"time": "2016-08-05 19:16:32"
+"time": "2016-10-17 23:39:02"
 },
 {
 "name": "fusesource/stomp-php",
@@ -198,6 +198,7 @@
 "messaging",
 "stomp"
 ],
+"abandoned": "stomp-php/stomp-php",
 "time": "2013-02-23 17:34:44"
 },
 {
@@ -244,16 +245,16 @@
 },
 {
 "name": "monolog/monolog",
-"version": "1.21.0",
+"version": "1.22.0",
 "source": {
 "type": "git",
 "url": "https://github.com/Seldaek/monolog.git;,
-"reference": "f42fbdfd53e306bda545845e4dbfd3e72edb4952"
+"reference": "bad29cb8d18ab0315e6c477751418a82c850d558"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/Seldaek/monolog/zipball/f42fbdfd53e306bda545845e4dbfd3e72edb4952;,
-"reference": "f42fbdfd53e306bda545845e4dbfd3e72edb4952",
+"url": 
"https://api.github.com/repos/Seldaek/monolog/zipball/bad29cb8d18ab0315e6c477751418a82c850d558;,
+"reference": "bad29cb8d18ab0315e6c477751418a82c850d558",
 "shasum": ""
 },
 "require": {
@@ -264,7 +265,7 @@
 "psr/log-implementation": "1.0.0"
 },
 "require-dev": {
-"aws/aws-sdk-php": "^2.4.9",
+"aws/aws-sdk-php": "^2.4.9 || ^3.0",
 "doctrine/couchdb": "~1.0@dev",
 "graylog2/gelf-php": "~1.0",
 "jakub-onderka/php-parallel-lint": "0.9",
@@ -318,20 +319,20 @@
 "logging",
 "psr-3"
 ],
-"time": "2016-07-29 03:23:52"
+"time": "2016-11-26 00:15:39"
 },
 {
 "name": "phpmailer/phpmailer",
-"version": "v5.2.16",
+"version": "v5.2.21",
 "source": {
 "type": "git",
 "url": "https://github.com/PHPMailer/PHPMailer.git;,
-"reference": "1d85f9ef3ecfc42bbc4f3c70d5e37ca9a65f629a"
+"reference": "1d51856b76c06fc687fcd9180efa7a0bed0d761e"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/PHPMailer/PHPMailer/zipball/1d85f9ef3ecfc42bbc4f3c70d5e37ca9a65f629a;,
-"reference": "1d85f9ef3ecfc42bbc4f3c70d5e37ca9a65f629a",
+"url": 
"https://api.github.com/repos/PHPMailer/PHPMailer/zipball/1d51856b76c06fc687fcd9180efa7a0bed0d761e;,
+"reference": "1d51856b76c06fc687fcd9180efa7a0bed0d761e",
 "shasum": ""
 },
 "require": {
@@ -378,7 +379,7 @@
 }
 ],
 "description": "PHPMailer is a full-featured email creation and 
transfer class for PHP",
-"time": "2016-06-06 09:09:37"
+"time": "2016-12-28 15:35:48"
 },
 {
 "name": "predis/predis",
@@ -432,22 +433,30 @@
 },
 {
 "name": "psr/log",
-"version": "1.0.0",
+"version": "1.0.2",
 "source": {
 "type": "git",
 "url": "https://github.com/php-fig/log.git;,
-"reference": "fe0936ee26643249e916849d48e3a51d5f5e278b"
+"reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d"
 },
 "dist": {
 "type": "zip",
-"url":

[MediaWiki-commits] [Gerrit] mediawiki...Newsletter[master]: Make Echo formatter point to Newsletter:NewsletterName

2016-12-28 Thread jenkins-bot (Code Review)

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

Change subject: Make Echo formatter point to Newsletter:NewsletterName
..


Make Echo formatter point to Newsletter:NewsletterName

* After migrating to content handler, newsletters urls point to 
Newsletter:NewsletterName instead of Special:Newsletter/id

Bug: T154244
Change-Id: Ib1eba8445e3af0a4f25792d858d6de8aea03865e
---
M includes/Echo/BaseNewsletterPresentationModel.php
M includes/Echo/EchoNewsletterPresentationModel.php
M includes/Echo/EchoNewsletterPublisherPresentationModel.php
M includes/Echo/EchoNewsletterSubscribedPresentationModel.php
M includes/Echo/EchoNewsletterUnsubscribedPresentationModel.php
5 files changed, 6 insertions(+), 6 deletions(-)

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



diff --git a/includes/Echo/BaseNewsletterPresentationModel.php 
b/includes/Echo/BaseNewsletterPresentationModel.php
index 5c85942..51507bb 100644
--- a/includes/Echo/BaseNewsletterPresentationModel.php
+++ b/includes/Echo/BaseNewsletterPresentationModel.php
@@ -14,7 +14,7 @@
return $this->event->getExtraParam( 'newsletter-name' );
}
 
-   protected function getSpecialNewsletterUrl(){
-   return SpecialPage::getTitleFor( 'Newsletter', 
$this->getNewsletterId() )->getFullURL();
+   protected function getNewsletterUrl(){
+   return Title::makeTitleSafe( NS_NEWSLETTER, 
$this->getNewsletterName() )->getFullURL();
}
 }
diff --git a/includes/Echo/EchoNewsletterPresentationModel.php 
b/includes/Echo/EchoNewsletterPresentationModel.php
index abb40fd..2a586c5 100644
--- a/includes/Echo/EchoNewsletterPresentationModel.php
+++ b/includes/Echo/EchoNewsletterPresentationModel.php
@@ -24,7 +24,7 @@
public function getSecondaryLinks() {
return array(
array(
-   'url' => $this->getSpecialNewsletterUrl(),
+   'url' => $this->getNewsletterUrl(),
'label' => $this->msg( 
'newsletter-notification-link-text-view-newsletter' )
),
);
diff --git a/includes/Echo/EchoNewsletterPublisherPresentationModel.php 
b/includes/Echo/EchoNewsletterPublisherPresentationModel.php
index 21fd228..ea6eaaf 100644
--- a/includes/Echo/EchoNewsletterPublisherPresentationModel.php
+++ b/includes/Echo/EchoNewsletterPublisherPresentationModel.php
@@ -8,7 +8,7 @@
 
public function getPrimaryLink() {
return array(
-   'url' => $this->getSpecialNewsletterUrl(),
+   'url' => $this->getNewsletterUrl(),
'label' => $this->msg( 
'newsletter-notification-link-text-new-publisher' )->text()
);
}
diff --git a/includes/Echo/EchoNewsletterSubscribedPresentationModel.php 
b/includes/Echo/EchoNewsletterSubscribedPresentationModel.php
index 989e5ee..24c4365 100644
--- a/includes/Echo/EchoNewsletterSubscribedPresentationModel.php
+++ b/includes/Echo/EchoNewsletterSubscribedPresentationModel.php
@@ -8,7 +8,7 @@
 
public function getPrimaryLink() {
return array(
-   'url' => $this->getSpecialNewsletterUrl(),
+   'url' => $this->getNewsletterUrl(),
'label' => $this->msg( 
'newsletter-notification-subscribed' )
->params( $this->getNewsletterName() )
);
diff --git a/includes/Echo/EchoNewsletterUnsubscribedPresentationModel.php 
b/includes/Echo/EchoNewsletterUnsubscribedPresentationModel.php
index 092d63d..9431cce 100644
--- a/includes/Echo/EchoNewsletterUnsubscribedPresentationModel.php
+++ b/includes/Echo/EchoNewsletterUnsubscribedPresentationModel.php
@@ -8,7 +8,7 @@
 
public function getPrimaryLink() {
return array(
-   'url' => $this->getSpecialNewsletterUrl(),
+   'url' => $this->getNewsletterUrl(),
'label' => $this->msg( 
'newsletter-notification-unsubscribed' )
->params( $this->getNewsletterName() )
);

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib1eba8445e3af0a4f25792d858d6de8aea03865e
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: MtDu 
Gerrit-Reviewer: 01tonythomas <01tonytho...@gmail.com>
Gerrit-Reviewer: Addshore 
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...Newsletter[master]: Make Echo formatter point to Newsletter:NewsletterName

2016-12-28 Thread MtDu (Code Review)

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

Change subject: Make Echo formatter point to Newsletter:NewsletterName
..

Make Echo formatter point to Newsletter:NewsletterName

* After migrating to content handler, newsletters urls point to 
Newsletter:NewsletterName instead of Special:Newsletter/id

Bug: T154244
Change-Id: Ib1eba8445e3af0a4f25792d858d6de8aea03865e
---
M includes/Echo/BaseNewsletterPresentationModel.php
M includes/Echo/EchoNewsletterPresentationModel.php
M includes/Echo/EchoNewsletterPublisherPresentationModel.php
M includes/Echo/EchoNewsletterSubscribedPresentationModel.php
M includes/Echo/EchoNewsletterUnsubscribedPresentationModel.php
5 files changed, 6 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Newsletter 
refs/changes/04/329504/1

diff --git a/includes/Echo/BaseNewsletterPresentationModel.php 
b/includes/Echo/BaseNewsletterPresentationModel.php
index 5c85942..a1a4be4 100644
--- a/includes/Echo/BaseNewsletterPresentationModel.php
+++ b/includes/Echo/BaseNewsletterPresentationModel.php
@@ -14,7 +14,7 @@
return $this->event->getExtraParam( 'newsletter-name' );
}
 
-   protected function getSpecialNewsletterUrl(){
-   return SpecialPage::getTitleFor( 'Newsletter', 
$this->getNewsletterId() )->getFullURL();
+   protected function getNewsletterUrl(){
+   return Title::makeTitleSafe( NS_NEWSLETTER, 
$this->getNewsletterName() )->getFullURL() );
}
 }
diff --git a/includes/Echo/EchoNewsletterPresentationModel.php 
b/includes/Echo/EchoNewsletterPresentationModel.php
index abb40fd..2a586c5 100644
--- a/includes/Echo/EchoNewsletterPresentationModel.php
+++ b/includes/Echo/EchoNewsletterPresentationModel.php
@@ -24,7 +24,7 @@
public function getSecondaryLinks() {
return array(
array(
-   'url' => $this->getSpecialNewsletterUrl(),
+   'url' => $this->getNewsletterUrl(),
'label' => $this->msg( 
'newsletter-notification-link-text-view-newsletter' )
),
);
diff --git a/includes/Echo/EchoNewsletterPublisherPresentationModel.php 
b/includes/Echo/EchoNewsletterPublisherPresentationModel.php
index 21fd228..ea6eaaf 100644
--- a/includes/Echo/EchoNewsletterPublisherPresentationModel.php
+++ b/includes/Echo/EchoNewsletterPublisherPresentationModel.php
@@ -8,7 +8,7 @@
 
public function getPrimaryLink() {
return array(
-   'url' => $this->getSpecialNewsletterUrl(),
+   'url' => $this->getNewsletterUrl(),
'label' => $this->msg( 
'newsletter-notification-link-text-new-publisher' )->text()
);
}
diff --git a/includes/Echo/EchoNewsletterSubscribedPresentationModel.php 
b/includes/Echo/EchoNewsletterSubscribedPresentationModel.php
index 989e5ee..24c4365 100644
--- a/includes/Echo/EchoNewsletterSubscribedPresentationModel.php
+++ b/includes/Echo/EchoNewsletterSubscribedPresentationModel.php
@@ -8,7 +8,7 @@
 
public function getPrimaryLink() {
return array(
-   'url' => $this->getSpecialNewsletterUrl(),
+   'url' => $this->getNewsletterUrl(),
'label' => $this->msg( 
'newsletter-notification-subscribed' )
->params( $this->getNewsletterName() )
);
diff --git a/includes/Echo/EchoNewsletterUnsubscribedPresentationModel.php 
b/includes/Echo/EchoNewsletterUnsubscribedPresentationModel.php
index 092d63d..9431cce 100644
--- a/includes/Echo/EchoNewsletterUnsubscribedPresentationModel.php
+++ b/includes/Echo/EchoNewsletterUnsubscribedPresentationModel.php
@@ -8,7 +8,7 @@
 
public function getPrimaryLink() {
return array(
-   'url' => $this->getSpecialNewsletterUrl(),
+   'url' => $this->getNewsletterUrl(),
'label' => $this->msg( 
'newsletter-notification-unsubscribed' )
->params( $this->getNewsletterName() )
);

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib1eba8445e3af0a4f25792d858d6de8aea03865e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: MtDu 

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

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: Port table2wiki to core

2016-12-28 Thread Phantom42 (Code Review)

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

Change subject: Port table2wiki to core
..

Port table2wiki to core

Script table2wiki is ported from compat to core

Bug: T115104
Change-Id: I6aee53160d9b0f1d1e98cf780fe641752ae2f057
---
A scripts/table2wiki.py
1 file changed, 586 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/03/329503/1

diff --git a/scripts/table2wiki.py b/scripts/table2wiki.py
new file mode 100644
index 000..f776feb
--- /dev/null
+++ b/scripts/table2wiki.py
@@ -0,0 +1,586 @@
+#!/usr/bin/python
+# -*- coding: utf-8  -*-
+"""
+Nifty script to convert HTML-tables to MediaWiki's own syntax.
+
+These command line parameters can be used to specify which pages to work on:
+
+
+
+-xml  Retrieve information from a local XML dump (pages_current, 
see
+  http://download.wikimedia.org).
+  Argument can also be given as "-xml:filename".
+  Searches for pages with HTML tables, and tries to convert 
them
+  on the live wiki.
+
+-sql  Retrieve information from a local mirror.
+  Searches for pages with HTML tables, and tries to convert 
them
+  on the live wiki.
+
+-namespace:n  Number or name of namespace to process. The parameter can be
+  used multiple times. It works in combination with all other
+  parameters, except for the -start parameter. If you e.g.
+  want to iterate over all categories starting at M, use
+  -start:Category:M.
+
+This SQL query can be used to find pages to work on:
+
+  SELECT CONCAT('[[', cur_title, ']]')
+  FROM cur
+  WHERE (cur_text LIKE '%
+# (C) Pywikibot team, 2003-2013
+#
+# Distributed under the terms of the MIT license.
+#
+# Automatically ported from compat branch by compat2core.py script
+#
+__version__ = '$Id$'
+#
+
+import re
+
+import pywikibot
+from pywikibot import i18n
+from pywikibot import config
+from pywikibot import pagegenerators
+
+# This is required for the text that is shown when you run this script
+# with the parameter -help.
+docuReplacements = {
+'': pagegenerators.parameterHelp,
+}
+
+
+class TableXmlDumpPageGenerator:
+'''
+A page generator that will yield all pages that seem to contain an HTML
+table.
+'''
+def __init__(self, xmlfilename):
+import xmlreader
+self.xmldump = xmlreader.XmlDump(xmlfilename)
+
+def __iter__(self):
+tableTagR = re.compile('

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Update PHPmailer for CVE-2016-10045 and CVE-2016-10033

2016-12-28 Thread jenkins-bot (Code Review)

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

Change subject: Update PHPmailer for CVE-2016-10045 and CVE-2016-10033
..


Update PHPmailer for CVE-2016-10045 and CVE-2016-10033

Change-Id: I128cc08a3e5ffc1a5bbb5b745c70b5bd221ea7eb
---
M composer.json
M composer.lock
2 files changed, 127 insertions(+), 111 deletions(-)

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



diff --git a/composer.json b/composer.json
index e16b453..d6a3181 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,7 @@
 "cogpowered/finediff": "0.*",
 "wikimedia/donation-interface": "dev-master",
 "wikimedia/smash-pig": "dev-master",
-"phpmailer/phpmailer": "5.2.6",
+"phpmailer/phpmailer": "5.2.21",
 "phpseclib/phpseclib": "0.3.7",
 "predis/predis": "1.*",
 "twig/twig": "1.*"
diff --git a/composer.lock b/composer.lock
index cfdb04f..d3217d0 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
 "Read more about it at 
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
 "This file is @generated automatically"
 ],
-"hash": "9d1888ed603a23fbd5afb2b4eb99acdb",
-"content-hash": "d3d501379291d40d65774ef35b503768",
+"hash": "c2a08d033ae69a5ecbae72fdbe929a2a",
+"content-hash": "824641a9a433422fd2773d67876f5d7b",
 "packages": [
 {
 "name": "amzn/login-and-pay-with-amazon-sdk-php",
@@ -44,7 +44,7 @@
 "payment",
 "payments"
 ],
-"time": "2016-02-17 00:44:20"
+"time": "2016-02-17 00:53:20"
 },
 {
 "name": "clio/clio",
@@ -93,7 +93,7 @@
 "source": {
 "type": "git",
 "url": 
"https://gerrit.wikimedia.org/r/p/wikimedia/fundraising/php-queue.git;,
-"reference": "14198ba1f7d4868933649a85621a3955965e83cd"
+"reference": "8e15cbf9a46ef58ceeadb9b359fee925291a0173"
 },
 "require": {
 "clio/clio": "0.1.*",
@@ -149,7 +149,7 @@
 "queue",
 "transaction"
 ],
-"time": "2016-08-05 19:16:32"
+"time": "2016-10-17 23:39:02"
 },
 {
 "name": "cogpowered/finediff",
@@ -296,23 +296,22 @@
 },
 {
 "name": "minfraud/http",
-"version": "v1.70",
+"version": "v1.71",
 "source": {
 "type": "git",
 "url": "https://github.com/maxmind/ccfd-api-php.git;,
-"reference": "941e9345f9c237a253be8b908ecef951698a1a99"
+"reference": "5f6c2a5454e755f1c56be17a1fc0c97576ff010e"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/maxmind/ccfd-api-php/zipball/941e9345f9c237a253be8b908ecef951698a1a99;,
-"reference": "941e9345f9c237a253be8b908ecef951698a1a99",
+"url": 
"https://api.github.com/repos/maxmind/ccfd-api-php/zipball/5f6c2a5454e755f1c56be17a1fc0c97576ff010e;,
+"reference": "5f6c2a5454e755f1c56be17a1fc0c97576ff010e",
 "shasum": ""
 },
 "type": "library",
 "autoload": {
-"files": [
-"src/HTTPBase.php",
-"src/CreditCardFraudDetection.php"
+"classmap": [
+"src"
 ]
 },
 "notification-url": "https://packagist.org/downloads/;,
@@ -333,7 +332,7 @@
 "maxmind",
 "minfraud"
 ],
-"time": "2015-07-21 14:49:48"
+"time": "2016-10-13 14:35:01"
 },
 {
 "name": "monolog/monolog",
@@ -449,16 +448,16 @@
 },
 {
 "name": "phpmailer/phpmailer",
-"version": "v5.2.6",
+"version": "v5.2.21",
 "source": {
 "type": "git",
 "url": "https://github.com/PHPMailer/PHPMailer.git;,
-"reference": "4d9434e394496a5bb7acd9e73046587184b413df"
+"reference": "1d51856b76c06fc687fcd9180efa7a0bed0d761e"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/PHPMailer/PHPMailer/zipball/4d9434e394496a5bb7acd9e73046587184b413df;,
-"reference": "4d9434e394496a5bb7acd9e73046587184b413df",
+"url": 
"https://api.github.com/repos/PHPMailer/PHPMailer/zipball/1d51856b76c06fc687fcd9180efa7a0bed0d761e;,
+"reference": "1d51856b76c06fc687fcd9180efa7a0bed0d761e",
 "shasum": ""
 },
 "require": {
@@ -466,14 +465,21 @@
 },

[MediaWiki-commits] [Gerrit] mediawiki...MediaWikiChat[master]: Prevent s being parsed

2016-12-28 Thread jenkins-bot (Code Review)

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

Change subject: Prevent s being parsed
..


Prevent s being parsed

Plus anything else that might be, not sure why that line was there,
 that's a bit dodgy...
Also some aesthetic changes for consistancy between Send and SendPM

Bug:T152332
Change-Id: I784f061dd7bdbc2c72a06351df5033e8450598b0
---
M api/GetNewWorker.php
M api/SendPM.api.php
M extension.json
3 files changed, 9 insertions(+), 5 deletions(-)

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



diff --git a/api/GetNewWorker.php b/api/GetNewWorker.php
index cf01255..99bbdb5 100644
--- a/api/GetNewWorker.php
+++ b/api/GetNewWorker.php
@@ -86,7 +86,6 @@
 ) ) {
 
 $message = $row->chat_message;
-$message = html_entity_decode( $message ); // otherwise the 
HTML is printed as text
 
 $fromid = $row->chat_user_id;
 $toid = $row->chat_to_id;
diff --git a/api/SendPM.api.php b/api/SendPM.api.php
index 139dc88..175f043 100644
--- a/api/SendPM.api.php
+++ b/api/SendPM.api.php
@@ -3,7 +3,7 @@
 class ChatSendPMAPI extends ApiBase {
 
public function execute() {
-   global $wgChatFloodMessages, $wgChatFloodSeconds;
+   global $wgChatFloodMessages, $wgChatFloodSeconds, 
$wgChatMaxMessageLength;
$result = $this->getResult();
$user = $this->getUser();
 
@@ -14,11 +14,16 @@
$message = MediaWikiChat::parseMessage( 
$originalMessage, $user );
 
if ( $message != '' ) {
-   $dbr = wfGetDB( DB_SLAVE );
$dbw = wfGetDB( DB_MASTER );
+   $dbr = wfGetDB( DB_SLAVE );
 
$fromId = $user->getID();
$timestamp = MediaWikiChat::now();
+
+   if ( strlen( $message ) > 
$wgChatMaxMessageLength ) {
+   $result->addValue( 
$this->getModuleName(), 'error', 'length' );
+   return true;
+   }
 
// Flood check
$res = $dbr->selectField(
@@ -27,7 +32,7 @@
array( "chat_timestamp > " . ( 
$timestamp - ( $wgChatFloodSeconds * 100 ) ), " chat_user_id = " . $fromId ),
__METHOD__
);
-if ( $res > $wgChatFloodMessages ) {
+   if ( $res > $wgChatFloodMessages ) {
$result->addValue( 
$this->getModuleName(), 'error', 'flood' );
return true;
}
diff --git a/extension.json b/extension.json
index 9f9ac08..74a70ce 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "MediaWikiChat",
-   "version": "2.17.3",
+   "version": "2.17.4",
"author": [
"Adam Carter/UltrasonicNXT"
],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I784f061dd7bdbc2c72a06351df5033e8450598b0
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/MediaWikiChat
Gerrit-Branch: master
Gerrit-Owner: UltrasonicNXT 
Gerrit-Reviewer: UltrasonicNXT 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia...SmashPig[master]: Update phpmailer for CVE-2016-10045 and CVE-2016-10033

2016-12-28 Thread Cdentinger (Code Review)

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

Change subject: Update phpmailer for CVE-2016-10045 and CVE-2016-10033
..

Update phpmailer for CVE-2016-10045 and CVE-2016-10033

Change-Id: I7a27272055191d410180f7ae9af87230107ed2da
---
M composer.json
M composer.lock
2 files changed, 121 insertions(+), 110 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig 
refs/changes/02/329502/1

diff --git a/composer.json b/composer.json
index 94a90c2..b3a6d3a 100644
--- a/composer.json
+++ b/composer.json
@@ -26,7 +26,7 @@
 "coderkungfu/php-queue": "dev-master",
 "fusesource/stomp-php": "^2.1.1",
 "php": ">=5.3.3",
-"phpmailer/phpmailer": "^5.2",
+"phpmailer/phpmailer": "5.2.21",
 "predis/predis": "^1.1",
 "symfony/event-dispatcher": "^2.1",
 "symfony/http-foundation": "^2.1",
diff --git a/composer.lock b/composer.lock
index d93db56..ea83b32 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
 "Read more about it at 
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
 "This file is @generated automatically"
 ],
-"hash": "dff59f168d145674604d93452ae96038",
-"content-hash": "72818ec1b403ee3282de2647c26d1686",
+"hash": "d6d793a98fb104503b82aa8c385782f5",
+"content-hash": "3a6fa78399c4a8299d59793bb4bb568c",
 "packages": [
 {
 "name": "amzn/login-and-pay-with-amazon-sdk-php",
@@ -44,7 +44,7 @@
 "payment",
 "payments"
 ],
-"time": "2016-02-17 00:53:20"
+"time": "2016-02-17 00:44:20"
 },
 {
 "name": "clio/clio",
@@ -93,7 +93,7 @@
 "source": {
 "type": "git",
 "url": 
"https://gerrit.wikimedia.org/r/p/wikimedia/fundraising/php-queue.git;,
-"reference": "14198ba1f7d4868933649a85621a3955965e83cd"
+"reference": "8e15cbf9a46ef58ceeadb9b359fee925291a0173"
 },
 "require": {
 "clio/clio": "0.1.*",
@@ -149,7 +149,7 @@
 "queue",
 "transaction"
 ],
-"time": "2016-08-05 19:16:32"
+"time": "2016-10-17 23:39:02"
 },
 {
 "name": "fusesource/stomp-php",
@@ -198,6 +198,7 @@
 "messaging",
 "stomp"
 ],
+"abandoned": "stomp-php/stomp-php",
 "time": "2013-02-23 17:34:44"
 },
 {
@@ -244,16 +245,16 @@
 },
 {
 "name": "monolog/monolog",
-"version": "1.21.0",
+"version": "1.22.0",
 "source": {
 "type": "git",
 "url": "https://github.com/Seldaek/monolog.git;,
-"reference": "f42fbdfd53e306bda545845e4dbfd3e72edb4952"
+"reference": "bad29cb8d18ab0315e6c477751418a82c850d558"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/Seldaek/monolog/zipball/f42fbdfd53e306bda545845e4dbfd3e72edb4952;,
-"reference": "f42fbdfd53e306bda545845e4dbfd3e72edb4952",
+"url": 
"https://api.github.com/repos/Seldaek/monolog/zipball/bad29cb8d18ab0315e6c477751418a82c850d558;,
+"reference": "bad29cb8d18ab0315e6c477751418a82c850d558",
 "shasum": ""
 },
 "require": {
@@ -264,7 +265,7 @@
 "psr/log-implementation": "1.0.0"
 },
 "require-dev": {
-"aws/aws-sdk-php": "^2.4.9",
+"aws/aws-sdk-php": "^2.4.9 || ^3.0",
 "doctrine/couchdb": "~1.0@dev",
 "graylog2/gelf-php": "~1.0",
 "jakub-onderka/php-parallel-lint": "0.9",
@@ -318,20 +319,20 @@
 "logging",
 "psr-3"
 ],
-"time": "2016-07-29 03:23:52"
+"time": "2016-11-26 00:15:39"
 },
 {
 "name": "phpmailer/phpmailer",
-"version": "v5.2.16",
+"version": "v5.2.21",
 "source": {
 "type": "git",
 "url": "https://github.com/PHPMailer/PHPMailer.git;,
-"reference": "1d85f9ef3ecfc42bbc4f3c70d5e37ca9a65f629a"
+"reference": "1d51856b76c06fc687fcd9180efa7a0bed0d761e"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/PHPMailer/PHPMailer/zipball/1d85f9ef3ecfc42bbc4f3c70d5e37ca9a65f629a;,
-"reference": "1d85f9ef3ecfc42bbc4f3c70d5e37ca9a65f629a",
+"url": 
"https://api.github.com/repos/PHPMailer/PHPMailer/zipball/1d51856b76c06fc687fcd9180efa7a0bed0d761e;,
+

[MediaWiki-commits] [Gerrit] mediawiki...MediaWikiChat[master]: Prevent s being parsed

2016-12-28 Thread UltrasonicNXT (Code Review)

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

Change subject: Prevent s being parsed
..

Prevent s being parsed

Plus anything else that might be, not sure why that line was there,
 that's a bit dodgy...
Also some aesthetic changes for consistancy between Send and SendPM

Change-Id: I784f061dd7bdbc2c72a06351df5033e8450598b0
---
M api/GetNewWorker.php
M api/Send.api.php
M api/SendPM.api.php
M extension.json
4 files changed, 19 insertions(+), 16 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MediaWikiChat 
refs/changes/01/329501/1

diff --git a/api/GetNewWorker.php b/api/GetNewWorker.php
index cf01255..99bbdb5 100644
--- a/api/GetNewWorker.php
+++ b/api/GetNewWorker.php
@@ -86,7 +86,6 @@
 ) ) {
 
 $message = $row->chat_message;
-$message = html_entity_decode( $message ); // otherwise the 
HTML is printed as text
 
 $fromid = $row->chat_user_id;
 $toid = $row->chat_to_id;
diff --git a/api/Send.api.php b/api/Send.api.php
index a1428ae..eeff2b6 100644
--- a/api/Send.api.php
+++ b/api/Send.api.php
@@ -4,7 +4,6 @@
 
public function execute() {
global $wgChatFloodMessages, $wgChatFloodSeconds, 
$wgChatMaxMessageLength;
-
$result = $this->getResult();
$user = $this->getUser();
 
diff --git a/api/SendPM.api.php b/api/SendPM.api.php
index 0539741..175f043 100644
--- a/api/SendPM.api.php
+++ b/api/SendPM.api.php
@@ -3,7 +3,7 @@
 class ChatSendPMAPI extends ApiBase {
 
public function execute() {
-   global $wgChatFloodMessages, $wgChatFloodSeconds;
+   global $wgChatFloodMessages, $wgChatFloodSeconds, 
$wgChatMaxMessageLength;
$result = $this->getResult();
$user = $this->getUser();
 
@@ -14,23 +14,28 @@
$message = MediaWikiChat::parseMessage( 
$originalMessage, $user );
 
if ( $message != '' ) {
-   $dbr = wfGetDB( DB_SLAVE );
$dbw = wfGetDB( DB_MASTER );
+   $dbr = wfGetDB( DB_SLAVE );
 
$fromId = $user->getID();
$timestamp = MediaWikiChat::now();
 
-// Flood check
-$res = $dbr->selectField(
-   'chat',
-   array( 'count(*)' ),
-   array( "chat_timestamp > " . ( $timestamp - ( 
$wgChatFloodSeconds * 100 ) ), " chat_user_id = " . $fromId ),
-   __METHOD__
-);
-if ( $res > $wgChatFloodMessages ) {
-   $result->addValue( $this->getModuleName(), 
'error', 'flood' );
-   return true;
-}
+   if ( strlen( $message ) > 
$wgChatMaxMessageLength ) {
+   $result->addValue( 
$this->getModuleName(), 'error', 'length' );
+   return true;
+   }
+
+   // Flood check
+   $res = $dbr->selectField(
+   'chat',
+   array( 'count(*)' ),
+   array( "chat_timestamp > " . ( 
$timestamp - ( $wgChatFloodSeconds * 100 ) ), " chat_user_id = " . $fromId ),
+   __METHOD__
+   );
+   if ( $res > $wgChatFloodMessages ) {
+   $result->addValue( 
$this->getModuleName(), 'error', 'flood' );
+   return true;
+   }
 
$dbw->insert(
'chat',
diff --git a/extension.json b/extension.json
index 9f9ac08..74a70ce 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "MediaWikiChat",
-   "version": "2.17.3",
+   "version": "2.17.4",
"author": [
"Adam Carter/UltrasonicNXT"
],

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I784f061dd7bdbc2c72a06351df5033e8450598b0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MediaWikiChat
Gerrit-Branch: master
Gerrit-Owner: UltrasonicNXT 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: [throttle] New rules for Queen Mary University

2016-12-28 Thread Urbanecm (Code Review)

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

Change subject: [throttle] New rules for Queen Mary University
..

[throttle] New rules for Queen Mary University

Location: London
Duration: 00:00 to 23:59 2016-01-13 and 00:00 to 23:59 2016-01-20
Ranges: IPv4: 161.23.0.0/16, 138.37.0.0/16, IPv6: 2a01:56c0::/32
Site: en.wikipedia.org
Estimated accounts: 40 (50 set)

Bug: T154245
Change-Id: Iae17aa43fb4d882288b3405c6e0ee5f67e814626
---
M wmf-config/throttle.php
1 file changed, 16 insertions(+), 0 deletions(-)


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

diff --git a/wmf-config/throttle.php b/wmf-config/throttle.php
index abf5a70..146813e 100644
--- a/wmf-config/throttle.php
+++ b/wmf-config/throttle.php
@@ -36,6 +36,22 @@
'value' => 50 // 40 expected
 ];
 
+$wmgThrottlingExceptions[] = [ // T154245
+   'from' => '2017-01-13T00:00 +0:00'
+   'to' => '2017-01-13T23:59 +0:00',
+   'range' => [ '161.23.0.0/16', '138.37.0.0/16', '2a01:56c0::/32' ],
+   'dbname' => 'enwiki',
+   'value' => 50 // 40 expected
+];
+
+$wmgThrottlingExceptions[] = [ // T154245
+   'from' => '2017-01-20T0:00 +0:00',
+   'to' => '2017-01-20T23:59 +0:00',
+   'range' => [ '161.23.0.0/16', '138.37.0.0/16', '2a01:56c0::/32' ],
+   'dbname' => 'enwiki',
+   'value' => 50 // 40 expected
+];
+
 ## Add throttling definitions above.
 
 /**

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Newsletter[master]: Added notifications to manually added users

2016-12-28 Thread jenkins-bot (Code Review)

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

Change subject: Added notifications to manually added users
..


Added notifications to manually added users

Bug: T154143
Change-Id: I22160066ac2ef0430c1c5286ebba8310b448b208
---
M Newsletter.hooks.php
M extension.json
M i18n/en.json
M i18n/qqq.json
A includes/Echo/EchoNewsletterSubscribedPresentationModel.php
A includes/Echo/EchoNewsletterUnsubscribedPresentationModel.php
M includes/specials/SpecialNewsletter.php
7 files changed, 109 insertions(+), 1 deletion(-)

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



diff --git a/Newsletter.hooks.php b/Newsletter.hooks.php
index 98cf4b3..742963f 100755
--- a/Newsletter.hooks.php
+++ b/Newsletter.hooks.php
@@ -59,6 +59,32 @@
'flyout-message' => 
'newsletter-notification-new-publisher-flyout',
'flyout-params' => array( 'newsletter-name', 'agent' ),
);
+   $notifications['newsletter-subscribed'] = array(
+   'category' => 'newsletter',
+   'primary-link' => array(
+   'message' => 
'newsletter-notification-subscribed',
+   'destination' => 'newsletter'
+   ),
+   'user-locators' => array(
+   array( 'EchoUserLocator::locateFromEventExtra', 
array( 'new-subscribers-id' ) )
+   ),
+   'presentation-model' => 
'EchoNewsletterSubscribedPresentationModel',
+   'title-message' => 'newsletter-notification-subscribed',
+   'title-params' => array( 'newsletter-name'),
+   );
+   $notifications['newsletter-unsubscribed'] = array(
+   'category' => 'newsletter',
+   'primary-link' => array(
+   'message' => 
'newsletter-notification-unsubscribed',
+   'destination' => 'newsletter'
+   ),
+   'user-locators' => array(
+   array( 'EchoUserLocator::locateFromEventExtra', 
array( 'removed-subscribers-id' ) )
+   ),
+   'presentation-model' => 
'EchoNewsletterUnsubscribedPresentationModel',
+   'title-message' => 
'newsletter-notification-unsubscribed',
+   'title-params' => array( 'newsletter-name'),
+   );
 
return true;
}
diff --git a/extension.json b/extension.json
index e972f39..4f9b050 100644
--- a/extension.json
+++ b/extension.json
@@ -89,7 +89,10 @@
"EchoNewsletterUserLocator": 
"includes/Echo/EchoNewsletterUserLocator.php",
"BaseNewsletterPresentationModel": 
"includes/Echo/BaseNewsletterPresentationModel.php",
"EchoNewsletterPresentationModel": 
"includes/Echo/EchoNewsletterPresentationModel.php",
-   "EchoNewsletterPublisherPresentationModel": 
"includes/Echo/EchoNewsletterPublisherPresentationModel.php"
+   "EchoNewsletterPublisherPresentationModel": 
"includes/Echo/EchoNewsletterPublisherPresentationModel.php",
+   "EchoNewsletterUnsubscribedPresentationModel": 
"includes/Echo/EchoNewsletterUnsubscribedPresentationModel.php",
+   "EchoNewsletterSubscribedPresentationModel": 
"includes/Echo/EchoNewsletterSubscribedPresentationModel.php"
+
},
"DefaultUserOptions": {
"echo-subscriptions-web-newsletter": true,
diff --git a/i18n/en.json b/i18n/en.json
index 2eefef7..254874c 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -103,6 +103,8 @@
"echo-category-title-newsletter": "Newsletters",
"echo-pref-tooltip-newsletter": "Notify me when any of the newsletters 
to which I have subscribed to announces a new issue.",
"newsletter-notification-title": "[[User:$3|$3]] {{GENDER:$4|has 
announced}} a [[$2|new issue]] of the newsletter \"$1\".",
+   "newsletter-notification-subscribed": "You have been subscribed to the 
\"$1\" newsletter by an administrator.",
+   "newsletter-notification-unsubscribed": "You have been unsubscribed 
from the \"$1\" newsletter by an administrator.",
"newsletter-notification-flyout": "$2 {{GENDER:$3|has announced}} a new 
issue of $1.",
"newsletter-notification-link-text-new-issue": "View new issue",
"newsletter-notification-link-text-view-newsletter": "View newsletter",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 02d2f28..da12d65 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -109,6 +109,8 @@
"newsletter-list-search-none-found": "Error message shown on 
[[Special:Newsletters]] if no newsletters found after user searches the table 
using

[MediaWiki-commits] [Gerrit] mediawiki...Echo[master]: Add GENDER support to a few Echo messages

2016-12-28 Thread jenkins-bot (Code Review)

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

Change subject: Add GENDER support to a few Echo messages
..


Add GENDER support to a few Echo messages

* echo-email-plain-footer
* echo-email-html-footer-preference-link-text
* echo-email-html-footer-with-link

Bug: T145439
Change-Id: I2d55a617910efa11effef1a469e6d845eebc5591
---
M i18n/en.json
M i18n/qqq.json
M includes/formatters/EchoHtmlEmailFormatter.php
M includes/formatters/EchoPlainTextEmailFormatter.php
4 files changed, 9 insertions(+), 8 deletions(-)

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



diff --git a/i18n/en.json b/i18n/en.json
index cf1f3ee..23e99e5 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -203,9 +203,9 @@
"echo-email-body-default": "You have a new notification at 
{{SITENAME}}:\n\n$1",
"echo-email-footer-default-html": "To control which emails we send you, 
check your 
preferences.\n$1",
"echo-email-footer-default": "$2\n\nTo control which emails we send 
you, check your 
preferences:\n{{canonicalurl:{{#special:Preferences}}#mw-prefsection-echo}}\n\n$1",
-   "echo-email-plain-footer": "To control which emails we send you, check 
your preferences:",
-   "echo-email-html-footer-preference-link-text": "check your preferences",
-   "echo-email-html-footer-with-link": "To control which emails we send 
you, $1.",
+   "echo-email-plain-footer": "To control which emails we send 
{{GENDER:$1|you}}, check {{GENDER:$1|your}} preferences:",
+   "echo-email-html-footer-preference-link-text": "check 
{{GENDER:$1|your}} preferences",
+   "echo-email-html-footer-with-link": "To control which emails we send 
{{GENDER:$2|you}}, $1.",
"echo-notification-alert": "{{PLURAL:$1|Alert ($1)|Alerts 
($1)|100=Alerts (99+)}}",
"echo-notification-notice": "{{PLURAL:$1|Notice ($1)|Notices 
($1)|100=Notices (99+)}}",
"echo-notification-alert-text-only": "Alerts",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 44e5a52..7fb8eff 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -197,9 +197,9 @@
"echo-email-body-default": "Default message content for Echo email 
notifications. Parameters:\n* $1 - a plain text description of the 
notification",
"echo-email-footer-default-html": "Default footer content for Echo html 
e-mail notifications. Parameters:\n* $1 - the address of the organization that 
sent the email\n* $2 - the URL to the notification preference page\nFor 
plain-text version, see {{msg-mw|Echo-email-footer-default}}.",
"echo-email-footer-default": "Default footer content for Echo text 
e-mail notifications. Parameters:\n* $1 - the address of the organization that 
sent the email\n* $2 - \"---...\" 
({{msg-mw|echo-email-batch-separator}})\n\nFor HTML version, see 
{{msg-mw|echo-email-footer-default-html}}.",
-   "echo-email-plain-footer": "Footer content for Echo text e-mail 
notifications.\n\nFor HTML version, see {{msg-mw|echo-email-html-footer}}.",
-   "echo-email-html-footer-preference-link-text": "Text of link to the 
preference page in the footer of HTML emails.",
-   "echo-email-html-footer-with-link": "Footer content of the HTML 
email.\n* $1 - complete HTML link to the preference page.\n\nSee 
{{msg-mw|echo-email-html-footer-preference-link-text}} for the text of the 
link.",
+   "echo-email-plain-footer": "Footer content for Echo text e-mail 
notifications. Parameters:\n* $1 - the name of the user being addressed, used 
for GENDER\n\nFor HTML version, see {{msg-mw|echo-email-html-footer}}.",
+   "echo-email-html-footer-preference-link-text": "Text of link to the 
preference page in the footer of HTML emails. Parameters:\n* $1 - the name of 
the user being addressed, used for GENDER",
+   "echo-email-html-footer-with-link": "Footer content of the HTML email. 
Parameters:\n* $1 - complete HTML link to the preference page. $2 - the name of 
the user being addressed, used for GENDER\n\nSee 
{{msg-mw|echo-email-html-footer-preference-link-text}} for the text of the 
link.",
"echo-notification-alert": "Label for alert notifications (= non 
discussion notifications) tab in Echo overlay. Parameters:\n* $1 - the number 
of unread alerts. The number cannot be higher than 100.\nSee also:\n* 
{{msg-mw|Echo-notification-notice}}\n{{Identical|Alert}}",
"echo-notification-notice": "Label for notice notifications tab in Echo 
overlay. Parameters:\n* $1 - the number of unread notices. The number cannot be 
higher than 100.\nSee also:\n* 
{{msg-mw|Echo-notification-notice}}\n{{Identical|Notice}}",
"echo-notification-alert-text-only": "Label for alert notifications (= 
non discussion notifications) tab in Echo overlay without alert notification 
count next to it\n{{Identical|Alert}}",
diff --git a/includes/formatters/EchoHtmlEmailFormatter.php

[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Update phpmailer for CVE-2016-10045 and CVE-2016-10033

2016-12-28 Thread Cdentinger (Code Review)

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

Change subject: Update phpmailer for CVE-2016-10045 and CVE-2016-10033
..

Update phpmailer for CVE-2016-10045 and CVE-2016-10033

Change-Id: Ie84ac8a93c4ac5dfa700a78a03f7667f59aea0da
---
M composer.json
M composer.lock
2 files changed, 3 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface 
refs/changes/99/329499/1

diff --git a/composer.json b/composer.json
index ff07415..7fc4e50 100644
--- a/composer.json
+++ b/composer.json
@@ -27,6 +27,7 @@
"minfraud/http": "^1.70",
"monolog/monolog": "~1.18.2",
"neitanod/forceutf8": "^2.0",
+   "phpmailer/phpmailer": "5.2.21",
"predis/predis": "^1.1",
"psr/log": "^1.0",
"zordius/lightncandy": "0.23",
diff --git a/composer.lock b/composer.lock
index 5cd945b..3d2777d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
 "Read more about it at 
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
 "This file is @generated automatically"
 ],
-"hash": "16969a6f73b030f3d6c3a2435a7099ae",
-"content-hash": "b48455e6e53399fe588ca65fb1257c5e",
+"hash": "16d535ec1cb596cdf51ade12c354adb0",
+"content-hash": "5eac44cbab3dc24c567f641d07a4d433",
 "packages": [
 {
 "name": "amzn/login-and-pay-with-amazon-sdk-php",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie84ac8a93c4ac5dfa700a78a03f7667f59aea0da
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Cdentinger 

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

[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Ran composer update

2016-12-28 Thread Cdentinger (Code Review)

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

Change subject: Ran composer update
..

Ran composer update

composer.lock has been hacked into oblivion

Change-Id: Iab71f0cbdc35e562860de1ac432827857e6e3349
---
M composer.lock
1 file changed, 65 insertions(+), 57 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface 
refs/changes/98/329498/1

diff --git a/composer.lock b/composer.lock
index ea09d7f..5cd945b 100644
--- a/composer.lock
+++ b/composer.lock
@@ -93,7 +93,7 @@
 "source": {
 "type": "git",
 "url": 
"https://gerrit.wikimedia.org/r/p/wikimedia/fundraising/php-queue.git;,
-"reference": "14198ba1f7d4868933649a85621a3955965e83cd"
+"reference": "8e15cbf9a46ef58ceeadb9b359fee925291a0173"
 },
 "require": {
 "clio/clio": "0.1.*",
@@ -149,7 +149,7 @@
 "queue",
 "transaction"
 ],
-"time": "2016-08-05 19:16:32"
+"time": "2016-10-17 23:39:02"
 },
 {
 "name": "fusesource/stomp-php",
@@ -245,23 +245,22 @@
 },
 {
 "name": "minfraud/http",
-"version": "v1.70",
+"version": "v1.71",
 "source": {
 "type": "git",
 "url": "https://github.com/maxmind/ccfd-api-php.git;,
-"reference": "941e9345f9c237a253be8b908ecef951698a1a99"
+"reference": "5f6c2a5454e755f1c56be17a1fc0c97576ff010e"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/maxmind/ccfd-api-php/zipball/941e9345f9c237a253be8b908ecef951698a1a99;,
-"reference": "941e9345f9c237a253be8b908ecef951698a1a99",
+"url": 
"https://api.github.com/repos/maxmind/ccfd-api-php/zipball/5f6c2a5454e755f1c56be17a1fc0c97576ff010e;,
+"reference": "5f6c2a5454e755f1c56be17a1fc0c97576ff010e",
 "shasum": ""
 },
 "type": "library",
 "autoload": {
-"files": [
-"src/HTTPBase.php",
-"src/CreditCardFraudDetection.php"
+"classmap": [
+"src"
 ]
 },
 "notification-url": "https://packagist.org/downloads/;,
@@ -282,7 +281,7 @@
 "maxmind",
 "minfraud"
 ],
-"time": "2015-07-21 14:49:48"
+"time": "2016-10-13 14:35:01"
 },
 {
 "name": "monolog/monolog",
@@ -398,16 +397,16 @@
 },
 {
 "name": "phpmailer/phpmailer",
-"version": "v5.2.16",
+"version": "v5.2.21",
 "source": {
 "type": "git",
 "url": "https://github.com/PHPMailer/PHPMailer.git;,
-"reference": "1d85f9ef3ecfc42bbc4f3c70d5e37ca9a65f629a"
+"reference": "1d51856b76c06fc687fcd9180efa7a0bed0d761e"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/PHPMailer/PHPMailer/zipball/1d85f9ef3ecfc42bbc4f3c70d5e37ca9a65f629a;,
-"reference": "1d85f9ef3ecfc42bbc4f3c70d5e37ca9a65f629a",
+"url": 
"https://api.github.com/repos/PHPMailer/PHPMailer/zipball/1d51856b76c06fc687fcd9180efa7a0bed0d761e;,
+"reference": "1d51856b76c06fc687fcd9180efa7a0bed0d761e",
 "shasum": ""
 },
 "require": {
@@ -454,7 +453,7 @@
 }
 ],
 "description": "PHPMailer is a full-featured email creation and 
transfer class for PHP",
-"time": "2016-06-06 09:09:37"
+"time": "2016-12-28 15:35:48"
 },
 {
 "name": "predis/predis",
@@ -508,22 +507,30 @@
 },
 {
 "name": "psr/log",
-"version": "1.0.0",
+"version": "1.0.2",
 "source": {
 "type": "git",
 "url": "https://github.com/php-fig/log.git;,
-"reference": "fe0936ee26643249e916849d48e3a51d5f5e278b"
+"reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/php-fig/log/zipball/fe0936ee26643249e916849d48e3a51d5f5e278b;,
-"reference": "fe0936ee26643249e916849d48e3a51d5f5e278b",
+"url": 
"https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d;,
+"reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
 "shasum": ""
 },
+

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Update PHPmailer for CVE-2016-10045 and CVE-2016-10033

2016-12-28 Thread Cdentinger (Code Review)

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

Change subject: Update PHPmailer for CVE-2016-10045 and CVE-2016-10033
..

Update PHPmailer for CVE-2016-10045 and CVE-2016-10033

Change-Id: I128cc08a3e5ffc1a5bbb5b745c70b5bd221ea7eb
---
M composer.json
M composer.lock
2 files changed, 127 insertions(+), 111 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/97/329497/1

diff --git a/composer.json b/composer.json
index e16b453..d6a3181 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,7 @@
 "cogpowered/finediff": "0.*",
 "wikimedia/donation-interface": "dev-master",
 "wikimedia/smash-pig": "dev-master",
-"phpmailer/phpmailer": "5.2.6",
+"phpmailer/phpmailer": "5.2.21",
 "phpseclib/phpseclib": "0.3.7",
 "predis/predis": "1.*",
 "twig/twig": "1.*"
diff --git a/composer.lock b/composer.lock
index cfdb04f..d3217d0 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
 "Read more about it at 
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
 "This file is @generated automatically"
 ],
-"hash": "9d1888ed603a23fbd5afb2b4eb99acdb",
-"content-hash": "d3d501379291d40d65774ef35b503768",
+"hash": "c2a08d033ae69a5ecbae72fdbe929a2a",
+"content-hash": "824641a9a433422fd2773d67876f5d7b",
 "packages": [
 {
 "name": "amzn/login-and-pay-with-amazon-sdk-php",
@@ -44,7 +44,7 @@
 "payment",
 "payments"
 ],
-"time": "2016-02-17 00:44:20"
+"time": "2016-02-17 00:53:20"
 },
 {
 "name": "clio/clio",
@@ -93,7 +93,7 @@
 "source": {
 "type": "git",
 "url": 
"https://gerrit.wikimedia.org/r/p/wikimedia/fundraising/php-queue.git;,
-"reference": "14198ba1f7d4868933649a85621a3955965e83cd"
+"reference": "8e15cbf9a46ef58ceeadb9b359fee925291a0173"
 },
 "require": {
 "clio/clio": "0.1.*",
@@ -149,7 +149,7 @@
 "queue",
 "transaction"
 ],
-"time": "2016-08-05 19:16:32"
+"time": "2016-10-17 23:39:02"
 },
 {
 "name": "cogpowered/finediff",
@@ -296,23 +296,22 @@
 },
 {
 "name": "minfraud/http",
-"version": "v1.70",
+"version": "v1.71",
 "source": {
 "type": "git",
 "url": "https://github.com/maxmind/ccfd-api-php.git;,
-"reference": "941e9345f9c237a253be8b908ecef951698a1a99"
+"reference": "5f6c2a5454e755f1c56be17a1fc0c97576ff010e"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/maxmind/ccfd-api-php/zipball/941e9345f9c237a253be8b908ecef951698a1a99;,
-"reference": "941e9345f9c237a253be8b908ecef951698a1a99",
+"url": 
"https://api.github.com/repos/maxmind/ccfd-api-php/zipball/5f6c2a5454e755f1c56be17a1fc0c97576ff010e;,
+"reference": "5f6c2a5454e755f1c56be17a1fc0c97576ff010e",
 "shasum": ""
 },
 "type": "library",
 "autoload": {
-"files": [
-"src/HTTPBase.php",
-"src/CreditCardFraudDetection.php"
+"classmap": [
+"src"
 ]
 },
 "notification-url": "https://packagist.org/downloads/;,
@@ -333,7 +332,7 @@
 "maxmind",
 "minfraud"
 ],
-"time": "2015-07-21 14:49:48"
+"time": "2016-10-13 14:35:01"
 },
 {
 "name": "monolog/monolog",
@@ -449,16 +448,16 @@
 },
 {
 "name": "phpmailer/phpmailer",
-"version": "v5.2.6",
+"version": "v5.2.21",
 "source": {
 "type": "git",
 "url": "https://github.com/PHPMailer/PHPMailer.git;,
-"reference": "4d9434e394496a5bb7acd9e73046587184b413df"
+"reference": "1d51856b76c06fc687fcd9180efa7a0bed0d761e"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/PHPMailer/PHPMailer/zipball/4d9434e394496a5bb7acd9e73046587184b413df;,
-"reference": "4d9434e394496a5bb7acd9e73046587184b413df",
+"url": 
"https://api.github.com/repos/PHPMailer/PHPMailer/zipball/1d51856b76c06fc687fcd9180efa7a0bed0d761e;,
+"reference": "1d51856b76c06fc687fcd9180efa7a0bed0d761e",
 "shasum": ""
 },
 "require": {
@@ -466,14 +465,21 @@

[MediaWiki-commits] [Gerrit] mediawiki...Echo[master]: Add GENDER support to a few Echo messages

2016-12-28 Thread MtDu (Code Review)

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

Change subject: Add GENDER support to a few Echo messages
..

Add GENDER support to a few Echo messages

* echo-email-plain-footer
* echo-email-html-footer-preference-link-text
* echo-email-html-footer-with-link

Bug: T145439
Change-Id: I2d55a617910efa11effef1a469e6d845eebc5591
---
M i18n/en.json
M i18n/qqq.json
M includes/formatters/EchoHtmlEmailFormatter.php
M includes/formatters/EchoPlainTextEmailFormatter.php
4 files changed, 9 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo 
refs/changes/96/329496/1

diff --git a/i18n/en.json b/i18n/en.json
index cf1f3ee..23e99e5 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -203,9 +203,9 @@
"echo-email-body-default": "You have a new notification at 
{{SITENAME}}:\n\n$1",
"echo-email-footer-default-html": "To control which emails we send you, 
check your 
preferences.\n$1",
"echo-email-footer-default": "$2\n\nTo control which emails we send 
you, check your 
preferences:\n{{canonicalurl:{{#special:Preferences}}#mw-prefsection-echo}}\n\n$1",
-   "echo-email-plain-footer": "To control which emails we send you, check 
your preferences:",
-   "echo-email-html-footer-preference-link-text": "check your preferences",
-   "echo-email-html-footer-with-link": "To control which emails we send 
you, $1.",
+   "echo-email-plain-footer": "To control which emails we send 
{{GENDER:$1|you}}, check {{GENDER:$1|your}} preferences:",
+   "echo-email-html-footer-preference-link-text": "check 
{{GENDER:$1|your}} preferences",
+   "echo-email-html-footer-with-link": "To control which emails we send 
{{GENDER:$2|you}}, $1.",
"echo-notification-alert": "{{PLURAL:$1|Alert ($1)|Alerts 
($1)|100=Alerts (99+)}}",
"echo-notification-notice": "{{PLURAL:$1|Notice ($1)|Notices 
($1)|100=Notices (99+)}}",
"echo-notification-alert-text-only": "Alerts",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 44e5a52..7fb8eff 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -197,9 +197,9 @@
"echo-email-body-default": "Default message content for Echo email 
notifications. Parameters:\n* $1 - a plain text description of the 
notification",
"echo-email-footer-default-html": "Default footer content for Echo html 
e-mail notifications. Parameters:\n* $1 - the address of the organization that 
sent the email\n* $2 - the URL to the notification preference page\nFor 
plain-text version, see {{msg-mw|Echo-email-footer-default}}.",
"echo-email-footer-default": "Default footer content for Echo text 
e-mail notifications. Parameters:\n* $1 - the address of the organization that 
sent the email\n* $2 - \"---...\" 
({{msg-mw|echo-email-batch-separator}})\n\nFor HTML version, see 
{{msg-mw|echo-email-footer-default-html}}.",
-   "echo-email-plain-footer": "Footer content for Echo text e-mail 
notifications.\n\nFor HTML version, see {{msg-mw|echo-email-html-footer}}.",
-   "echo-email-html-footer-preference-link-text": "Text of link to the 
preference page in the footer of HTML emails.",
-   "echo-email-html-footer-with-link": "Footer content of the HTML 
email.\n* $1 - complete HTML link to the preference page.\n\nSee 
{{msg-mw|echo-email-html-footer-preference-link-text}} for the text of the 
link.",
+   "echo-email-plain-footer": "Footer content for Echo text e-mail 
notifications. Parameters:\n* $1 - the name of the user being addressed, used 
for GENDER\n\nFor HTML version, see {{msg-mw|echo-email-html-footer}}.",
+   "echo-email-html-footer-preference-link-text": "Text of link to the 
preference page in the footer of HTML emails. Parameters:\n* $1 - the name of 
the user being addressed, used for GENDER",
+   "echo-email-html-footer-with-link": "Footer content of the HTML email. 
Parameters:\n* $1 - complete HTML link to the preference page. $2 - the name of 
the user being addressed, used for GENDER\n\nSee 
{{msg-mw|echo-email-html-footer-preference-link-text}} for the text of the 
link.",
"echo-notification-alert": "Label for alert notifications (= non 
discussion notifications) tab in Echo overlay. Parameters:\n* $1 - the number 
of unread alerts. The number cannot be higher than 100.\nSee also:\n* 
{{msg-mw|Echo-notification-notice}}\n{{Identical|Alert}}",
"echo-notification-notice": "Label for notice notifications tab in Echo 
overlay. Parameters:\n* $1 - the number of unread notices. The number cannot be 
higher than 100.\nSee also:\n* 
{{msg-mw|Echo-notification-notice}}\n{{Identical|Notice}}",
"echo-notification-alert-text-only": "Label for alert notifications (= 
non discussion notifications) tab in Echo overlay without alert notification 
count next to it\n{{Identical|Alert}}",
diff --git a/includes/formatters/EchoHtmlEmailFormatter.php

[MediaWiki-commits] [Gerrit] mediawiki...MultimediaViewer[master]: Copy button for attribution text in download dialog

2016-12-28 Thread Sn1per (Code Review)

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

Change subject: Copy button for attribution text in download dialog
..

Copy button for attribution text in download dialog

In addition:
* .mw-mmv-reuse-copy => .mw-mmv-dialog-copy because it's not just a
  reuse dialog thing anymore
* Adjust margin between attribution textbox and attribution option
  widget to stay consistent with reuse dialog UI

Bug: T77295
Change-Id: I79abdc1a3c10f0a8c3ecb6f4d444a601595a903f
---
M extension.json
M i18n/en.json
M i18n/qqq.json
M resources/mmv/ui/mmv.ui.dialog.less
M resources/mmv/ui/mmv.ui.download.pane.js
M resources/mmv/ui/mmv.ui.download.pane.less
M resources/mmv/ui/mmv.ui.reuse.dialog.less
M resources/mmv/ui/mmv.ui.reuse.embed.js
M resources/mmv/ui/mmv.ui.reuse.embed.less
M resources/mmv/ui/mmv.ui.reuse.share.js
M resources/mmv/ui/mmv.ui.reuse.share.less
11 files changed, 61 insertions(+), 21 deletions(-)


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

diff --git a/extension.json b/extension.json
index 65ce6e9..2b249ca 100644
--- a/extension.json
+++ b/extension.json
@@ -264,6 +264,7 @@

"multimediaviewer-download-attribution-cta-header",

"multimediaviewer-download-optional-attribution-cta-header",
"multimediaviewer-download-attribution-cta",
+   "multimediaviewer-download-attribution-copy",
"multimediaviewer-attr-plain",
"multimediaviewer-attr-html"
]
diff --git a/i18n/en.json b/i18n/en.json
index f926a79..d5be709 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -128,6 +128,7 @@
"multimediaviewer-download-attribution-cta-header": "You need to 
attribute the author",
"multimediaviewer-download-optional-attribution-cta-header": "You can 
attribute the author",
"multimediaviewer-download-attribution-cta": "Show me how",
+   "multimediaviewer-download-attribution-copy": "Select and copy (if 
supported) the attribution text for this file",
"multimediaviewer-attr-plain": "Plain",
"multimediaviewer-attr-html": "HTML",
"multimediaviewer-options-tooltip": "Enable or disable Media Viewer",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 6c94fa0..f33e26d 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -137,6 +137,7 @@
"multimediaviewer-download-attribution-cta-header": "Header for telling 
the user that the author of an image must be attributed, during a download 
action. See also 
{{msg-mw|multimediaviewer-download-optional-attribution-cta-header}}.",
"multimediaviewer-download-optional-attribution-cta-header": "Header 
for inviting the user to attribute author of the image during a download 
action. This is used for images where attribution is not a legal requirement. 
See also {{msg-mw|multimediaviewer-download-attribution-cta-header}}.",
"multimediaviewer-download-attribution-cta": "Call to action for a user 
to find out how to attribute the author of an image.",
+   "multimediaviewer-download-attribution-copy": "Text of the tooltip for 
the button to select and copy the attribution of a file (if supported by the 
browser) in the download panel, that is displayed when hovered over.",
"multimediaviewer-attr-plain": "Label for a button that lets the user 
pick plain text as an output format.",
"multimediaviewer-attr-html": "{{optional}}\nLabel for a button that 
lets the user pick HTML as an output format.\n{{Identical|HTML}}",
"multimediaviewer-options-tooltip": "Tooltip for a button that opens a 
panel for enabling or disabling the media viewer.",
diff --git a/resources/mmv/ui/mmv.ui.dialog.less 
b/resources/mmv/ui/mmv.ui.dialog.less
index 3206901..d51fd04 100644
--- a/resources/mmv/ui/mmv.ui.dialog.less
+++ b/resources/mmv/ui/mmv.ui.dialog.less
@@ -24,4 +24,18 @@
.rotate( -45deg );
position: fixed;
}
+
+   .mw-mmv-dialog-copy {
+   /* @embed */
+   background-image: url( img/pasting.svg );
+   background-size: contain;
+   background-position: right center;
+   background-repeat: no-repeat;
+
+   &:hover {
+   /* @embed */
+   background-image: url( img/pasting-hover.svg );
+   text-decoration: none;
+   }
+   }
 }
diff --git a/resources/mmv/ui/mmv.ui.download.pane.js 
b/resources/mmv/ui/mmv.ui.download.pane.js
index 7ee519f..814369f 100644
--- a/resources/mmv/ui/mmv.ui.download.pane.js
+++ b/resources/mmv/ui/mmv.ui.download.pane.js
@@ -187,6 +187,29 @@
.text( mw.message(

[MediaWiki-commits] [Gerrit] operations/puppet[production]: kubernetes::worker: Allow access to kubelet from master

2016-12-28 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329494 )

Change subject: kubernetes::worker: Allow access to kubelet from master
..

kubernetes::worker: Allow access to kubelet from master

Allow the masters to reach the kubelet. Useful for attaching/execing on
a container and debugging

Change-Id: Iece8f5f8b5d89678a6f48529668e7500ffb86d97
---
M hieradata/role/common/kubernetes/worker.yaml
M modules/profile/manifests/kubernetes/node.pp
2 files changed, 14 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/94/329494/1

diff --git a/hieradata/role/common/kubernetes/worker.yaml 
b/hieradata/role/common/kubernetes/worker.yaml
index 05b98d3..ab0a7cb 100644
--- a/hieradata/role/common/kubernetes/worker.yaml
+++ b/hieradata/role/common/kubernetes/worker.yaml
@@ -5,7 +5,9 @@
 profile::docker::storage::physical_volumes: "/dev/md2"
 profile::docker::engine::version: "1.12.5-0~debian-jessie"
 profile::docker::engine::proxy: "http://webproxy.%{::site}.wmnet:8080;
-profile::kubernetes::master_host: 'argon.eqiad.wmnet'
+profile::kubernetes::master_host:
+- argon.eqiad.wmnet
+- chlorine.eqiad.wmnet
 profile::kubernetes::infra_pod: 'darmstadtium.eqiad.wmnet/pause'
 profile::docker::engine::settings:
iptables: false
diff --git a/modules/profile/manifests/kubernetes/node.pp 
b/modules/profile/manifests/kubernetes/node.pp
index 1dcf812..920271d 100644
--- a/modules/profile/manifests/kubernetes/node.pp
+++ b/modules/profile/manifests/kubernetes/node.pp
@@ -1,5 +1,5 @@
 class profile::kubernetes::node {
-$master_host = hiera('profile::kubernetes::master_host')
+$master_hosts = hiera('profile::kubernetes::master_hosts')
 $infra_pod = hiera('profile::kubernetes::infra_pod')
 
 base::expose_puppet_certs { '/etc/kubernetes':
@@ -7,6 +7,9 @@
 user=> 'root',
 group   => 'root',
 }
+# TODO: Evaluate whether it makes sense to use a naive per host balancing
+# based on fqdn_rand() here or whether a more HA solution is better
+$master_host = $master_hosts[0]
 class { '::k8s::kubelet':
 master_host   => $master_host,
 listen_address=> '0.0.0.0',
@@ -21,4 +24,11 @@
 master_host => $master_host,
 use_package => true,
 }
+
+$master_hosts_ferm = join($master_hosts, ' ')
+ferm::service { 'kubelet-http':
+proto  => 'tcp',
+port   => '10250',
+srange => "(@resolve((${master_hosts_ferm})))",
+}
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iece8f5f8b5d89678a6f48529668e7500ffb86d97
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: CollationFa: Third time's the charm

2016-12-28 Thread Code Review

Bartosz Dziewoński has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329493 )

Change subject: CollationFa: Third time's the charm
..

CollationFa: Third time's the charm

We have to use a tertiary sortkey for everything with the primary
sortkey of 2627. Otherwise, the "Remove duplicate prefixes" logic
in IcuCollation would remove them.

The following characters will now be considered separate letters in
the 'xx-uca-fa' collation for the purpose of displaying the headings
on category pages: ء ئ ا و ٲ ٳ

Bug: T139110
Change-Id: Ibbea5d76348e4cdc38b74cba44286910b2ed592f
---
M includes/collation/CollationFa.php
1 file changed, 8 insertions(+), 5 deletions(-)


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

diff --git a/includes/collation/CollationFa.php 
b/includes/collation/CollationFa.php
index b7e45cc..358549f 100644
--- a/includes/collation/CollationFa.php
+++ b/includes/collation/CollationFa.php
@@ -19,7 +19,7 @@
  */
 
 /**
- * Temporary workaround for incorrect collation of Persian language ('fa') in 
ICU (bug T139110).
+ * Temporary workaround for incorrect collation of Persian language ('fa') in 
ICU 52 (bug T139110).
  *
  * 'ا' and 'و' should not be considered the same letter for the purposes of 
collation in Persian.
  *
@@ -34,11 +34,14 @@
}
 
public function getPrimarySortKey( $string ) {
-   $firstLetter = mb_substr( $string, 0, 1 );
-   if ( $firstLetter === 'و' || $firstLetter === 'ا' ) {
+   $primary = parent::getPrimarySortKey( $string );
+   // We have to use a tertiary sortkey for everything with the 
primary sortkey of 2627.
+   // Otherwise, the "Remove duplicate prefixes" logic in 
IcuCollation would remove them.
+   // This matches sortkeys for the following characters: ء ئ ا و 
ٲ ٳ
+   if ( substr( $primary, 0, 2 ) === "\x26\x27" ) {
+   wfDebug( "Using tertiary sortkey for '$string'\n" );
return $this->tertiaryCollator->getSortKey( $string );
}
-
-   return parent::getPrimarySortKey( $string );
+   return $primary;
}
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibbea5d76348e4cdc38b74cba44286910b2ed592f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Make UnitConverterTest compatible with non-BC floating point...

2016-12-28 Thread WMDE

Thiemo Mättig (WMDE) has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329490 )

Change subject: Make UnitConverterTest compatible with non-BC floating point 
math
..

Make UnitConverterTest compatible with non-BC floating point math

This code uses the DecimalMath class, which supports both BC and
floating point arithmetics. The class under test does not care. Why
should the test be limited then?

This is the most minimal patch I could think of to make it compatible
with both modes. This patch adds a bit of complexity because I'm using
regular expressions now.

Change-Id: Ie97e2fca2f55b2390d166ed072ced40a15f4ef14
---
M lib/tests/phpunit/Units/UnitConverterTest.php
1 file changed, 3 insertions(+), 13 deletions(-)


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

diff --git a/lib/tests/phpunit/Units/UnitConverterTest.php 
b/lib/tests/phpunit/Units/UnitConverterTest.php
index f3af232..7e61297 100644
--- a/lib/tests/phpunit/Units/UnitConverterTest.php
+++ b/lib/tests/phpunit/Units/UnitConverterTest.php
@@ -17,16 +17,6 @@
  */
 class UnitConverterTest extends PHPUnit_Framework_TestCase {
 
-   public function setUp() {
-   parent::setUp();
-
-   if ( !function_exists( 'bcscale' ) ) {
-   $this->markTestSkipped(
-   'Missing bcmath: This test needs arbitrary 
precision math.'
-   );
-   }
-   }
-
public function getConverterPairs() {
return [
[ 'Q1', '+16', 'http://acme.test/Q2', '+1975.2' ],
@@ -39,7 +29,7 @@
'Q1',

'+16',
'http://acme.test/Q2',
-   
'+19752000.00'
+   '+19752000\d{32}\b'
],
[ 'Q1', '+160', 'http://acme.test/Q2', '+19752' ],
[ 'Q1', '+1600', 'http://acme.test/Q2', '+197520' ],
@@ -70,7 +60,7 @@
$q = new QuantityValue( $decimal, $fromUnit, $decimal, $decimal 
);
$qConverted = $uc->toStandardUnits( $q );
 
-   $this->assertEquals( $toValue, 
$qConverted->getAmount()->getValue(), 'Wrong amount' );
+   $this->assertRegExp( "/^\\$toValue/", 
$qConverted->getAmount()->getValue(), 'Wrong amount' );
$this->assertEquals( $toUnit, $qConverted->getUnit(), 'Wrong 
unit' );
}
 
@@ -80,7 +70,7 @@
$q = new QuantityValue( $decimal, 'http://acme.test/Q123', 
$decimal, $decimal );
$qConverted = $uc->toStandardUnits( $q );
 
-   $this->assertEquals( '+13.70295', 
$qConverted->getAmount()->getValue(), 'Wrong amount' );
+   $this->assertStringStartsWith( '+13.70295', 
$qConverted->getAmount()->getValue(), 'Wrong amount' );
$this->assertEquals( 'http://acme.test/Q345', 
$qConverted->getUnit(), 'Wrong unit' );
 
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie97e2fca2f55b2390d166ed072ced40a15f4ef14
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) 

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

1 2 >

1 - 100 of 181 matches

Mail list logo