jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/398500 )
Change subject: Update Amazon SDK fork for logging retries
......................................................................
Update Amazon SDK fork for logging retries
Awkwardly provide our logger to the constructor params
Bug: T182735
Change-Id: I5cc90e246f4436fd332117e2bb4c869247ca3584
---
M amazon_gateway/amazon.adapter.php
M composer.lock
2 files changed, 13 insertions(+), 3 deletions(-)
Approvals:
Mepps: Looks good to me, approved
jenkins-bot: Verified
diff --git a/amazon_gateway/amazon.adapter.php
b/amazon_gateway/amazon.adapter.php
index 30914d5..274fbd6 100644
--- a/amazon_gateway/amazon.adapter.php
+++ b/amazon_gateway/amazon.adapter.php
@@ -65,6 +65,15 @@
array( 'payment_method' => 'amazon' )
);
}
+ // Provide our logger instance to the SmashPig payments-client
parameters.
+ // Dang, this is still really ugly.
+ Context::get()->getProviderConfiguration()->override(
+ [ 'payments-client' =>
+ [ 'constructor-parameters' =>
+ [ 0 => [ 'logger' => $this->logger ] ]
+ ]
+ ]
+ );
$this->session_addDonorData();
}
diff --git a/composer.lock b/composer.lock
index 81ca3e4..5d275a2 100644
--- a/composer.lock
+++ b/composer.lock
@@ -57,11 +57,12 @@
"source": {
"type": "git",
"url":
"https://github.com/ejegg/login-and-pay-with-amazon-sdk-php";,
- "reference": "855d642f85f14c76ca810013b0323ae4ac37f1c6"
+ "reference": "198cc8ccab51e270909602cee38706b4d1f6bbba"
},
"require": {
"ext-curl": "*",
- "php": ">=5.3.0"
+ "php": ">=5.3.0",
+ "psr/log": "^1.0"
},
"type": "library",
"autoload": {
@@ -88,7 +89,7 @@
"payment",
"payments"
],
- "time": "2016-02-17 00:53:20"
+ "time": "2017-12-15T15:03:21+00:00"
},
{
"name": "clio/clio",
--
To view, visit https://gerrit.wikimedia.org/r/398500
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5cc90e246f4436fd332117e2bb4c869247ca3584
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ejegg <[email protected]>
Gerrit-Reviewer: AndyRussG <[email protected]>
Gerrit-Reviewer: Cdentinger <[email protected]>
Gerrit-Reviewer: Jgleeson <[email protected]>
Gerrit-Reviewer: Katie Horn <[email protected]>
Gerrit-Reviewer: Mepps <[email protected]>
Gerrit-Reviewer: XenoRyet <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
