Ejegg has submitted this change and it was merged.
Change subject: Merge master into deployment
......................................................................
Merge master into deployment
10ce4bd Update package pointers, Amazon class names
fa64403 Quit letting a submethod be in multiple groups
0b08b53 Default function defines data transformers from config
da1d9d7 Move data transformers to config
66f4346 Move most error mapping into config
a5dd0ec Use generalized lookup table builder for WP
b8ba755 Tiny cleanups
1629e68 Trim email during normalization
2631404 remove protocol string from referrer param
Also delete tests and update vendor submodule.
Change-Id: Ib21a16a890dbbbd35f4c55a8fd8f36d96c009cd0
---
D tests/includes/MockAmazonClient.php
M vendor
2 files changed, 0 insertions(+), 171 deletions(-)
Approvals:
Ejegg: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/includes/MockAmazonClient.php
b/tests/includes/MockAmazonClient.php
deleted file mode 100644
index f4e049b..0000000
--- a/tests/includes/MockAmazonClient.php
+++ /dev/null
@@ -1,171 +0,0 @@
-<<<<<<< HEAD (d3579d Merge master into deployment)
-=======
-<?php
-
-/**
- * FIXME: Jenkins mwext-testextension-hhvm still not installing
DonationInterface composer deps
- * use PayWithAmazon\PaymentsClientInterface;
- */
-
-/**
- * Stubs out the functionality of the Client class from the Login and Pay with
- * 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 PaymentsClientInterface {
-
- // Each key is a method name whose value is an array of times it's been
- // called, recording all argument values.
- public $calls = array();
-
- // Keys are method names, values are arrays of error codes such as
InvalidPaymentMethod
- // When a code is not found, the operation will return a successful
result
- public $returns = array();
-
- // Similar to $returns, but any entries here are thrown as exceptions
- public $exceptions = array();
-
- public function __construct( $config = null ) {
-
- }
-
- public function __get( $name ) {
-
- }
-
- protected function fakeCall( $functionName, $arguments ) {
- $this->calls[$functionName][] = $arguments;
- $status = null;
- $returnIndex = count( $this->calls[$functionName] ) - 1;
- if ( isset( $this->returns[$functionName] ) && isset(
$this->returns[$functionName][$returnIndex] ) ) {
- $status = $this->returns[$functionName][$returnIndex];
- }
- if ( isset( $this->exceptions[$functionName] ) && isset(
$this->exceptions[$functionName][$returnIndex] ) ) {
- throw $this->exceptions[$functionName][$returnIndex];
- }
- return new MockAmazonResponse( $functionName, $status );
- }
-
- public function authorize( $requestParameters = array() ) {
- return $this->fakeCall( 'authorize', $requestParameters );
- }
-
- public function authorizeOnBillingAgreement( $requestParameters =
array() ) {
- return $this->fakeCall( 'authorizeOnBillingAgreement',
$requestParameters );
- }
-
- public function cancelOrderReference( $requestParameters = array() ) {
-
- }
-
- public function capture( $requestParameters = array() ) {
-
- }
-
- public function charge( $requestParameters = array() ) {
-
- }
-
- public function closeAuthorization( $requestParameters = array() ) {
-
- }
-
- public function closeBillingAgreement( $requestParameters = array() ) {
-
- }
-
- public function closeOrderReference( $requestParameters = array() ) {
- return $this->fakeCall( 'closeOrderReference',
$requestParameters );
- }
-
- public function confirmBillingAgreement( $requestParameters = array() )
{
- return $this->fakeCall( 'confirmBillingAgreement',
$requestParameters );
- }
-
- public function confirmOrderReference( $requestParameters = array() ) {
- return $this->fakeCall( 'confirmOrderReference',
$requestParameters );
- }
-
- public function createOrderReferenceForId( $requestParameters = array()
) {
-
- }
-
- public function getAuthorizationDetails( $requestParameters = array() )
{
-
- }
-
- public function getBillingAgreementDetails( $requestParameters =
array() ) {
- return $this->fakeCall( 'getBillingAgreementDetails',
$requestParameters );
- }
-
- public function getCaptureDetails( $requestParameters = array() ) {
- return $this->fakeCall( 'getCaptureDetails', $requestParameters
);
- }
-
- public function getOrderReferenceDetails( $requestParameters = array()
) {
- return $this->fakeCall( 'getOrderReferenceDetails',
$requestParameters );
- }
-
- public function getParameters() {
-
- }
-
- public function getProviderCreditDetails( $requestParameters = array()
) {
-
- }
-
- public function getProviderCreditReversalDetails( $requestParameters =
array() ) {
-
- }
-
- public function getRefundDetails( $requestParameters = array() ) {
-
- }
-
- public function getServiceStatus( $requestParameters = array() ) {
-
- }
-
- public function getUserInfo( $access_token ) {
-
- }
-
- public function refund( $requestParameters = array() ) {
-
- }
-
- public function reverseProviderCredit( $requestParameters = array() ) {
-
- }
-
- public function setBillingAgreementDetails( $requestParameters =
array() ) {
- return $this->fakeCall( 'setBillingAgreementDetails',
$requestParameters );
-
- }
-
- public function setClientId( $value ) {
-
- }
-
- public function setMwsServiceUrl( $url ) {
-
- }
-
- public function setOrderReferenceDetails( $requestParameters = array()
) {
- return $this->fakeCall( 'setOrderReferenceDetails',
$requestParameters );
- }
-
- public function setProxy( $proxy ) {
-
- }
-
- public function setSandbox( $value ) {
-
- }
-
- public function validateBillingAgreement( $requestParameters = array()
) {
-
- }
-
-}
->>>>>>> BRANCH (263140 remove protocol string from referrer param)
diff --git a/vendor b/vendor
index 5790cbe..c20162c 160000
--- a/vendor
+++ b/vendor
-Subproject commit 5790cbe4635e36d2df52a622c77e910a6d31d861
+Subproject commit c20162cd1721b6792fe31acc6197a9aa417f2c48
--
To view, visit https://gerrit.wikimedia.org/r/281685
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib21a16a890dbbbd35f4c55a8fd8f36d96c009cd0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg <[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
