jenkins-bot has submitted this change and it was merged. Change subject: Update package pointers, Amazon class names ......................................................................
Update package pointers, Amazon class names New Amazon SDK version has PaymentsClient and ReportsClient instead of just Client Change-Id: If9a3db8f96210f753a2b0283c4486e044af5b1e4 --- M amazon_gateway/amazon.adapter.php M composer.lock M tests/includes/MockAmazonClient.php 3 files changed, 18 insertions(+), 16 deletions(-) Approvals: Awight: Looks good to me, approved jenkins-bot: Verified diff --git a/amazon_gateway/amazon.adapter.php b/amazon_gateway/amazon.adapter.php index 53930be..494cc29 100644 --- a/amazon_gateway/amazon.adapter.php +++ b/amazon_gateway/amazon.adapter.php @@ -1,7 +1,7 @@ <?php -use PayWithAmazon\Client as PwaClient; -use PayWithAmazon\ClientInterface as PwaClientInterface; +use PayWithAmazon\PaymentsClient as PwaClient; +use PayWithAmazon\PaymentsClientInterface as PwaClientInterface; /** * Wikimedia Foundation @@ -21,9 +21,11 @@ */ /** - * Uses Login and Pay with Amazon widgets and the associated SDK to charge donors + * Uses Login and Pay with Amazon widgets and a fork of the associated + * SDK to charge donors. + * * See https://payments.amazon.com/documentation - * and https://github.com/amzn/login-and-pay-with-amazon-sdk-php + * and https://github.com/ejegg/login-and-pay-with-amazon-sdk-php */ class AmazonAdapter extends GatewayAdapter { diff --git a/composer.lock b/composer.lock index 4586e69..845d450 100644 --- a/composer.lock +++ b/composer.lock @@ -13,7 +13,7 @@ "source": { "type": "git", "url": "https://github.com/ejegg/login-and-pay-with-amazon-sdk-php";, - "reference": "24b31581d85c232a3b0f5038c2894d565c831392" + "reference": "855d642f85f14c76ca810013b0323ae4ac37f1c6" }, "require": { "ext-curl": "*", @@ -44,7 +44,7 @@ "payment", "payments" ], - "time": "2015-08-24 21:48:53" + "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": "4e3e6ebd093e8528fbb73204acfda4d09aa0a494" + "reference": "c5a5200e3b5df3ec5f02ff27e8e6d9a07ce10b5e" }, "require": { "clio/clio": "@stable", @@ -147,7 +147,7 @@ "queue", "transaction" ], - "time": "2015-08-21 21:11:07" + "time": "2015-08-25 20:02:50" }, { "name": "fusesource/stomp-php", @@ -313,16 +313,16 @@ }, { "name": "predis/predis", - "version": "v1.0.1", + "version": "v1.0.3", "source": { "type": "git", "url": "https://github.com/nrk/predis.git";, - "reference": "7a170b3d8123c556597b4fbdb88631f99de180c2" + "reference": "84060b9034d756b4d79641667d7f9efe1aeb8e04" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nrk/predis/zipball/7a170b3d8123c556597b4fbdb88631f99de180c2";, - "reference": "7a170b3d8123c556597b4fbdb88631f99de180c2", + "url": "https://api.github.com/repos/nrk/predis/zipball/84060b9034d756b4d79641667d7f9efe1aeb8e04";, + "reference": "84060b9034d756b4d79641667d7f9efe1aeb8e04", "shasum": "" }, "require": { @@ -359,7 +359,7 @@ "predis", "redis" ], - "time": "2015-01-02 12:51:34" + "time": "2015-07-30 18:34:15" }, { "name": "psr/log", diff --git a/tests/includes/MockAmazonClient.php b/tests/includes/MockAmazonClient.php index 6915609..c9aef1f 100644 --- a/tests/includes/MockAmazonClient.php +++ b/tests/includes/MockAmazonClient.php @@ -1,8 +1,8 @@ <?php /** - * FIXME: Jenkins still not installing DonationInterface composer deps - * use PayWithAmazon\ClientInterface as PwaClientInterface; + * FIXME: Jenkins mwext-testextension-hhvm still not installing DonationInterface composer deps + * use PayWithAmazon\PaymentsClientInterface; */ /** @@ -10,7 +10,7 @@ * Amazon SDK. TODO: replace with PHPUnit method return mocks when Jenkins * is running new enough PHPUnit. Only mocking the stuff we use. */ -class MockAmazonClient { // FIXME: implements PwaClientInterface { +class MockAmazonClient { // FIXME: implements PaymentsClientInterface { // Each key is a method name whose value is an array of times it's been // called, recording all argument values. -- To view, visit https://gerrit.wikimedia.org/r/280125 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If9a3db8f96210f753a2b0283c4486e044af5b1e4 Gerrit-PatchSet: 6 Gerrit-Project: mediawiki/extensions/DonationInterface Gerrit-Branch: master Gerrit-Owner: Awight <[email protected]> Gerrit-Reviewer: AndyRussG <[email protected]> Gerrit-Reviewer: Awight <[email protected]> Gerrit-Reviewer: Cdentinger <[email protected]> Gerrit-Reviewer: Ejegg <[email protected]> Gerrit-Reviewer: Ssmith <[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
