jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/330310 )
Change subject: Pull composer changes from deployment
......................................................................
Pull composer changes from deployment
Change-Id: Id3ebcf2b49f3b289c10988648a6b2e3f4d81f8dd
---
M composer.json
M composer.lock
2 files changed, 18 insertions(+), 11 deletions(-)
Approvals:
jenkins-bot: Verified
Ejegg: 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..f2f8e19 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",
@@ -449,16 +449,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 +466,21 @@
},
"require-dev": {
"phpdocumentor/phpdocumentor": "*",
- "phpunit/phpunit": "*"
+ "phpunit/phpunit": "4.7.*"
+ },
+ "suggest": {
+ "league/oauth2-google": "Needed for Google XOAUTH2
authentication"
},
"type": "library",
"autoload": {
"classmap": [
"class.phpmailer.php",
+ "class.phpmaileroauth.php",
+ "class.phpmaileroauthgoogle.php",
+ "class.smtp.php",
"class.pop3.php",
- "class.smtp.php"
+ "extras/EasyPeasyICS.php",
+ "extras/ntlm_sasl_client.php"
]
},
"notification-url": "https://packagist.org/downloads/";,
@@ -498,7 +505,7 @@
}
],
"description": "PHPMailer is a full-featured email creation and
transfer class for PHP",
- "time": "2013-04-11 16:45:39"
+ "time": "2016-12-28 15:35:48"
},
{
"name": "phpseclib/phpseclib",
@@ -1191,7 +1198,7 @@
"donations",
"payments"
],
- "time": "2016-12-06 19:40:49"
+ "time": "2016-12-06 19:11:55"
},
{
"name": "zordius/lightncandy",
--
To view, visit https://gerrit.wikimedia.org/r/330310
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id3ebcf2b49f3b289c10988648a6b2e3f4d81f8dd
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Cdentinger <cdentin...@wikimedia.org>
Gerrit-Reviewer: Ejegg <eeggles...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
