jenkins-bot has submitted this change and it was merged.
Change subject: Upgrade Mailgun to 2.0
......................................................................
Upgrade Mailgun to 2.0
The composer.json file has been updated
by version = 2.0.
Bug:T132020
Change-Id: Ia6c384f6cc132b52430136f4efffebcc03b895ae
---
M MailgunHooks.php
M composer.json
2 files changed, 9 insertions(+), 3 deletions(-)
Approvals:
01tonythomas: Looks good to me, approved
jenkins-bot: Verified
diff --git a/MailgunHooks.php b/MailgunHooks.php
index 9df0774..61ba017 100644
--- a/MailgunHooks.php
+++ b/MailgunHooks.php
@@ -38,7 +38,8 @@
array $headers, array $to, MailAddress $from, $subject, $body
) {
$conf = RequestContext::getMain()->getConfig();
- $mailgunTransport = new \Mailgun\Mailgun( $conf->get(
'MailgunAPIKey' ) );
+ $client = new \Http\Adapter\Guzzle6\Client();
+ $mailgunTransport = new \Mailgun\Mailgun( $conf->get(
'MailgunAPIKey' ), $client );
$message = $mailgunTransport->BatchMessage( $conf->get(
'MailgunDomain' ) );
$message->setFromAddress( $from );
diff --git a/composer.json b/composer.json
index d4ec90e..1372cbf 100644
--- a/composer.json
+++ b/composer.json
@@ -1,10 +1,15 @@
{
"name": "mediawiki/mailgun",
"require": {
- "mailgun/mailgun-php": "1.7.2"
+ "mailgun/mailgun-php": "2.0",
+ "guzzlehttp/psr7": "~1.2",
+ "php-http/httplug": "^1.0",
+ "php-http/discovery": "^0.8"
},
"require-dev": {
- "jakub-onderka/php-parallel-lint": "0.9.2"
+ "jakub-onderka/php-parallel-lint": "0.9.2",
+ "phpunit/phpunit": "~4.6",
+ "php-http/guzzle6-adapter": "^1.0"
},
"scripts": {
"test": [
--
To view, visit https://gerrit.wikimedia.org/r/282162
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia6c384f6cc132b52430136f4efffebcc03b895ae
Gerrit-PatchSet: 9
Gerrit-Project: mediawiki/extensions/Mailgun
Gerrit-Branch: master
Gerrit-Owner: Haritha28 <haritha....@gmail.com>
Gerrit-Reviewer: 01tonythomas <01tonytho...@gmail.com>
Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
