Ejegg has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/368266 )
Change subject: WIP order sequence numbers start at 1, not 0
......................................................................
WIP order sequence numbers start at 1, not 0
Bug: T171891
Change-Id: I2ae477f3d1e4bb9d155333534b9fcb5c6a14074d
---
M adyen_gateway/adyen.adapter.php
M amazon_gateway/amazon.adapter.php
M astropay_gateway/astropay.adapter.php
M gateway_common/gateway.adapter.php
M tests/phpunit/Adapter/Adyen/AdyenApiTest.php
M tests/phpunit/Adapter/Adyen/AdyenTest.php
M tests/phpunit/Adapter/Amazon/AmazonApiTest.php
M tests/phpunit/Adapter/GlobalCollect/GlobalCollectTest.php
M tests/phpunit/Adapter/PayPal/PayPalExpressTest.php
M tests/phpunit/includes/Responses/amazon/authorize.json
M tests/phpunit/includes/Responses/amazon/authorizeOnBillingAgreement.json
M tests/phpunit/includes/Responses/amazon/authorize_AmazonRejected.json
M tests/phpunit/includes/Responses/amazon/authorize_InvalidPaymentMethod.json
M tests/phpunit/includes/Responses/amazon/authorize_TransactionTimedOut.json
M tests/phpunit/includes/Responses/amazon/getBillingAgreementDetails.json
M tests/phpunit/includes/Responses/amazon/getCaptureDetails.json
M tests/phpunit/includes/Responses/amazon/setBillingAgreementDetails.json
M
tests/phpunit/includes/Responses/paypal_ec/GetExpressCheckoutDetails_10486.testresponse
M
tests/phpunit/includes/Responses/paypal_ec/GetExpressCheckoutDetails_OK.testresponse
19 files changed, 45 insertions(+), 43 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface
refs/changes/66/368266/1
diff --git a/adyen_gateway/adyen.adapter.php b/adyen_gateway/adyen.adapter.php
index 4542a24..992270f 100644
--- a/adyen_gateway/adyen.adapter.php
+++ b/adyen_gateway/adyen.adapter.php
@@ -153,11 +153,7 @@
* is never used at all.
*/
function do_transaction( $transaction ) {
- // If this is not our first call, get a fresh order ID
- // FIXME: This is repeated in three places. Maybe always
regenerate in incrementSequenceNumber?
- if ( $this->session_getData( 'sequence' ) ) {
- $this->regenerateOrderID();
- }
+ $this->ensureUniqueOrderID();
$this->session_addDonorData();
$this->setCurrentTransaction( $transaction );
diff --git a/amazon_gateway/amazon.adapter.php
b/amazon_gateway/amazon.adapter.php
index c150ae2..213db1f 100644
--- a/amazon_gateway/amazon.adapter.php
+++ b/amazon_gateway/amazon.adapter.php
@@ -118,9 +118,7 @@
$this->client = $this->getPwaClient();
$this->transaction_response = new PaymentTransactionResponse();
- if ( $this->session_getData( 'sequence' ) ) {
- $this->regenerateOrderID();
- }
+ $this->ensureUniqueOrderID();
try {
if ( $this->getData_Unstaged_Escaped( 'recurring' ) ===
'1' ) {
@@ -133,8 +131,6 @@
} catch ( ResponseProcessingException $ex ) {
$this->handleErrors( $ex, $this->transaction_response );
}
-
- $this->incrementSequenceNumber();
return PaymentResult::fromResults(
$this->transaction_response,
diff --git a/astropay_gateway/astropay.adapter.php
b/astropay_gateway/astropay.adapter.php
index 9b98b44..47e3a41 100644
--- a/astropay_gateway/astropay.adapter.php
+++ b/astropay_gateway/astropay.adapter.php
@@ -199,10 +199,7 @@
}
function doPayment() {
- // If this is not our first NewInvoice call, get a fresh order
ID
- if ( $this->session_getData( 'sequence' ) ) {
- $this->regenerateOrderID();
- }
+ $this->ensureUniqueOrderID();
$transaction_result = $this->do_transaction( 'NewInvoice' );
$this->runAntifraudFilters();
diff --git a/gateway_common/gateway.adapter.php
b/gateway_common/gateway.adapter.php
index 5da2a72..590bef5 100644
--- a/gateway_common/gateway.adapter.php
+++ b/gateway_common/gateway.adapter.php
@@ -3479,7 +3479,11 @@
}
$this->session_ensure();
- $sequence = $this->session_getData( 'sequence' ) ?: 0;
+ $sequence = $this->session_getData( 'sequence' );
+ if ( !$sequence ) {
+ $sequence = 1;
+ WmfFramework::setSessionValue( 'sequence',
$sequence );
+ }
return "{$ctid}.{$sequence}";
}
@@ -3511,6 +3515,15 @@
return $id;
}
+ protected function ensureUniqueOrderID() {
+ // If this is not our first call, get a fresh order ID
+ // FIXME: This is still too complicated
+ $sequenceNum = $this->session_getData( 'sequence' );
+ if ( $sequenceNum && $sequenceNum > 1 ) {
+ $this->regenerateOrderID();
+ }
+ }
+
public function getOrderIDMeta( $key = false ) {
$data = $this->order_id_meta;
if ( !is_array( $data ) ) {
diff --git a/tests/phpunit/Adapter/Adyen/AdyenApiTest.php
b/tests/phpunit/Adapter/Adyen/AdyenApiTest.php
index 2212164..5f8ff58 100644
--- a/tests/phpunit/Adapter/Adyen/AdyenApiTest.php
+++ b/tests/phpunit/Adapter/Adyen/AdyenApiTest.php
@@ -42,7 +42,7 @@
'card.cardHolderName' => 'Firstname Surname',
'currencyCode' => 'USD',
'merchantAccount' => 'wikitest',
- 'merchantReference' => '1.0',
+ 'merchantReference' => '1.1',
'offset' => '20',
'paymentAmount' => '155',
'skinCode' => 'testskin',
@@ -79,7 +79,7 @@
'last_name' => 'Surname',
'country' => 'US',
'gateway' => 'adyen',
- 'order_id' => '1.0',
+ 'order_id' => '1.1',
'recurring' => '',
'payment_method' => 'cc',
'payment_submethod' => 'visa',
diff --git a/tests/phpunit/Adapter/Adyen/AdyenTest.php
b/tests/phpunit/Adapter/Adyen/AdyenTest.php
index 371c800..21dad79 100644
--- a/tests/phpunit/Adapter/Adyen/AdyenTest.php
+++ b/tests/phpunit/Adapter/Adyen/AdyenTest.php
@@ -173,7 +173,7 @@
$gateway = $this->getFreshGatewayObject( array() );
$result = $gateway->processDonorReturn( array(
'authResult' => 'AUTHORISED',
- 'merchantReference' => '55555.0',
+ 'merchantReference' => '55555.1',
'merchantSig' =>
'o1QTd6X/PYrOgLPoSheamR3osAksh6oTaSytsCcJsFA=',
'paymentMethod' => 'visa',
'pspReference' => '123987612346789',
@@ -197,7 +197,7 @@
$gateway = $this->getFreshGatewayObject( array() );
$result = $gateway->processDonorReturn( array(
'authResult' => 'REFUSED',
- 'merchantReference' => '55555.0',
+ 'merchantReference' => '55555.1',
'merchantSig' =>
'EVqAiz4nZ8XQ9Wfbm9bOQYaKPV22qdY+/6va7zAo580=',
'paymentMethod' => 'visa',
'pspReference' => '123987612346789',
diff --git a/tests/phpunit/Adapter/Amazon/AmazonApiTest.php
b/tests/phpunit/Adapter/Amazon/AmazonApiTest.php
index 4f5c0ab..5ac721a 100644
--- a/tests/phpunit/Adapter/Amazon/AmazonApiTest.php
+++ b/tests/phpunit/Adapter/Amazon/AmazonApiTest.php
@@ -44,7 +44,7 @@
$this->assertEquals(
'https://wikimediafoundation.org/wiki/Thank_You/en?country=US', $redirect );
$mockClient = TestingAmazonAdapter::$mockClient;
$setOrderReferenceDetailsArgs =
$mockClient->calls['setOrderReferenceDetails'][0];
- $oid = $session['Donor']['contribution_tracking_id'] . '-0';
+ $oid = $session['Donor']['contribution_tracking_id'] . '-1';
$this->assertEquals( $oid,
$setOrderReferenceDetailsArgs['seller_order_id'], 'Did not set order id on
order reference' );
$this->assertEquals( $params['amount'],
$setOrderReferenceDetailsArgs['amount'], 'Did not set amount on order
reference' );
diff --git a/tests/phpunit/Adapter/GlobalCollect/GlobalCollectTest.php
b/tests/phpunit/Adapter/GlobalCollect/GlobalCollectTest.php
index ee8e3d3..543414e 100644
--- a/tests/phpunit/Adapter/GlobalCollect/GlobalCollectTest.php
+++ b/tests/phpunit/Adapter/GlobalCollect/GlobalCollectTest.php
@@ -102,7 +102,7 @@
$this->assertEquals( $externalData['order_id'],
$gateway->getData_Unstaged_Escaped( 'order_id' ), 'Failed asserting that an
extrenally provided order id is being honored in batch mode' );
//make sure that decimal numbers are rejected by GC. Should be
a toss and regen
- $externalData['order_id'] = '2143.0';
+ $externalData['order_id'] = '2143.1';
unset( $request['order_id'] );
unset( $session['Donor']['order_id'] );
$this->setUpRequest( $request, $session );
diff --git a/tests/phpunit/Adapter/PayPal/PayPalExpressTest.php
b/tests/phpunit/Adapter/PayPal/PayPalExpressTest.php
index b13db0c..2fe58aa 100644
--- a/tests/phpunit/Adapter/PayPal/PayPalExpressTest.php
+++ b/tests/phpunit/Adapter/PayPal/PayPalExpressTest.php
@@ -61,7 +61,7 @@
'gateway_txn_id' => null,
'language' => 'fr',
'contribution_tracking_id' =>
$init['contribution_tracking_id'],
- 'order_id' => $init['contribution_tracking_id'] . '.0',
+ 'order_id' => $init['contribution_tracking_id'] . '.1',
'utm_source' => 'CD1234_FR..paypal',
'currency' => 'USD',
'email' => '',
@@ -114,7 +114,7 @@
'gateway_txn_id' => null,
'language' => 'fr',
'contribution_tracking_id' =>
$init['contribution_tracking_id'],
- 'order_id' => $init['contribution_tracking_id'] . '.0',
+ 'order_id' => $init['contribution_tracking_id'] . '.1',
'utm_source' => 'CD1234_FR..rpaypal',
'currency' => 'USD',
'email' => '',
@@ -149,7 +149,7 @@
$gateway->setDummyGatewayResponseCode( 'OK' );
$gateway->processDonorReturn( array(
'token' => 'EC%2d4V987654XA123456V',
- 'PayerID' => 'ASDASD'
+ 'PayerID' => 'ASDASD',
) );
$message = DonationQueue::instance()->pop( 'donations' );
@@ -163,7 +163,7 @@
'gateway_txn_id' => '5EJ123456T987654S',
'gateway_session_id' => 'EC-4V987654XA123456V',
'language' => 'en',
- 'order_id' => $init['contribution_tracking_id'] . '.0',
+ 'order_id' => $init['contribution_tracking_id'] . '.1',
'payment_method' => 'paypal',
'payment_submethod' => '',
'response' => false,
diff --git a/tests/phpunit/includes/Responses/amazon/authorize.json
b/tests/phpunit/includes/Responses/amazon/authorize.json
index 39e7a89..b17a2ed 100644
--- a/tests/phpunit/includes/Responses/amazon/authorize.json
+++ b/tests/phpunit/includes/Responses/amazon/authorize.json
@@ -27,11 +27,11 @@
"SellerAuthorizationNote": [],
"CreationTimestamp": "2015-08-24T21:50:58.221Z",
"AmazonAuthorizationId": "S01-0391295-0674065-A095112",
- "AuthorizationReferenceId": "31243-0"
+ "AuthorizationReferenceId": "31243-1"
}
},
"ResponseMetadata": {
"RequestId": "785d061e-e152-4180-80d1-3a492d16e24e"
},
"ResponseStatus": "200"
-}
\ No newline at end of file
+}
diff --git
a/tests/phpunit/includes/Responses/amazon/authorizeOnBillingAgreement.json
b/tests/phpunit/includes/Responses/amazon/authorizeOnBillingAgreement.json
index 0163e64..7bdecd9 100644
--- a/tests/phpunit/includes/Responses/amazon/authorizeOnBillingAgreement.json
+++ b/tests/phpunit/includes/Responses/amazon/authorizeOnBillingAgreement.json
@@ -27,7 +27,7 @@
"CreationTimestamp": "2015-10-05T18:06:49.965Z",
"SellerAuthorizationNote": [],
"AmazonAuthorizationId": "S01-5318994-6362993-A004044",
- "AuthorizationReferenceId": "36834-0"
+ "AuthorizationReferenceId": "36834-1"
},
"AmazonOrderReferenceId": "S01-5318994-6362993"
},
@@ -35,4 +35,4 @@
"RequestId": "8c8f4d79-06d5-4de5-ae34-d3fdc73aa343"
},
"ResponseStatus": "200"
-}
\ No newline at end of file
+}
diff --git
a/tests/phpunit/includes/Responses/amazon/authorize_AmazonRejected.json
b/tests/phpunit/includes/Responses/amazon/authorize_AmazonRejected.json
index 687ea6d..347d051 100644
--- a/tests/phpunit/includes/Responses/amazon/authorize_AmazonRejected.json
+++ b/tests/phpunit/includes/Responses/amazon/authorize_AmazonRejected.json
@@ -24,11 +24,11 @@
"SellerAuthorizationNote": "{\"SandboxSimulation\":
{\"State\":\"Declined\", \"ReasonCode\":\"AmazonRejected\"}}",
"CreationTimestamp": "2015-09-01T22:31:02.551Z",
"AmazonAuthorizationId": "S01-7821958-9177140-A084347",
- "AuthorizationReferenceId": "36435-0"
+ "AuthorizationReferenceId": "36435-1"
}
},
"ResponseMetadata": {
"RequestId": "4a509982-d8cb-4dec-ad56-81a9dc5f070c"
},
"ResponseStatus": "200"
-}
\ No newline at end of file
+}
diff --git
a/tests/phpunit/includes/Responses/amazon/authorize_InvalidPaymentMethod.json
b/tests/phpunit/includes/Responses/amazon/authorize_InvalidPaymentMethod.json
index c6ff854..4e2946e 100644
---
a/tests/phpunit/includes/Responses/amazon/authorize_InvalidPaymentMethod.json
+++
b/tests/phpunit/includes/Responses/amazon/authorize_InvalidPaymentMethod.json
@@ -23,11 +23,11 @@
"CaptureNow": "true",
"CreationTimestamp": "2015-08-25T18:24:37.748Z",
"AmazonAuthorizationId": "S01-2525143-9142520-A075353",
- "AuthorizationReferenceId": "31243-0"
+ "AuthorizationReferenceId": "31243-1"
}
},
"ResponseMetadata": {
"RequestId": "0122bebe-b8c3-4435-8169-8b3a92ba1800"
},
"ResponseStatus": "200"
-}
\ No newline at end of file
+}
diff --git
a/tests/phpunit/includes/Responses/amazon/authorize_TransactionTimedOut.json
b/tests/phpunit/includes/Responses/amazon/authorize_TransactionTimedOut.json
index c2a1cf2..89d3516 100644
--- a/tests/phpunit/includes/Responses/amazon/authorize_TransactionTimedOut.json
+++ b/tests/phpunit/includes/Responses/amazon/authorize_TransactionTimedOut.json
@@ -24,11 +24,11 @@
"SellerAuthorizationNote": "{\"SandboxSimulation\":
{\"State\":\"Declined\", \"ReasonCode\":\"TransactionTimedOut\"}}",
"CreationTimestamp": "2015-09-02T17:14:02.214Z",
"AmazonAuthorizationId": "S01-6689996-9664966-A069817",
- "AuthorizationReferenceId": "36450-0"
+ "AuthorizationReferenceId": "36450-1"
}
},
"ResponseMetadata": {
"RequestId": "06488d3c-bcee-4448-8f0a-bd6f816e6fec"
},
"ResponseStatus": "200"
-}
\ No newline at end of file
+}
diff --git
a/tests/phpunit/includes/Responses/amazon/getBillingAgreementDetails.json
b/tests/phpunit/includes/Responses/amazon/getBillingAgreementDetails.json
index 0caa393..698b93f 100644
--- a/tests/phpunit/includes/Responses/amazon/getBillingAgreementDetails.json
+++ b/tests/phpunit/includes/Responses/amazon/getBillingAgreementDetails.json
@@ -8,7 +8,7 @@
"AmazonBillingAgreementId": "C01-9650293-7351908",
"BillingAgreementConsent": "true",
"SellerBillingAgreementAttributes": {
- "SellerBillingAgreementId": "36834-0"
+ "SellerBillingAgreementId": "36834-1"
},
"Buyer": {
"Name": "Testy Test",
@@ -35,4 +35,4 @@
"RequestId": "547cb94e-690e-47e9-99cd-aef79622a451"
},
"ResponseStatus": "200"
-}
\ No newline at end of file
+}
diff --git a/tests/phpunit/includes/Responses/amazon/getCaptureDetails.json
b/tests/phpunit/includes/Responses/amazon/getCaptureDetails.json
index daeb476..cc23937 100644
--- a/tests/phpunit/includes/Responses/amazon/getCaptureDetails.json
+++ b/tests/phpunit/includes/Responses/amazon/getCaptureDetails.json
@@ -1,7 +1,7 @@
{
"GetCaptureDetailsResult": {
"CaptureDetails": {
- "CaptureReferenceId": "31243-0",
+ "CaptureReferenceId": "31243-1",
"CaptureFee": {
"CurrencyCode": "USD",
"Amount": "0.00"
@@ -29,4 +29,4 @@
"RequestId": "f863dd05-99f3-4e9c-b0b6-561d65281cd7"
},
"ResponseStatus": "200"
-}
\ No newline at end of file
+}
diff --git
a/tests/phpunit/includes/Responses/amazon/setBillingAgreementDetails.json
b/tests/phpunit/includes/Responses/amazon/setBillingAgreementDetails.json
index 85aac83..5c781e4 100644
--- a/tests/phpunit/includes/Responses/amazon/setBillingAgreementDetails.json
+++ b/tests/phpunit/includes/Responses/amazon/setBillingAgreementDetails.json
@@ -7,7 +7,7 @@
},
"BillingAgreementConsent": "true",
"SellerBillingAgreementAttributes": {
- "SellerBillingAgreementId": "36834-0"
+ "SellerBillingAgreementId": "36834-1"
},
"ReleaseEnvironment": "Sandbox",
"SellerNote": "Monthly donation to the Wikimedia Foundation",
@@ -30,4 +30,4 @@
"RequestId": "9a92b3f8-d8d2-46bf-b998-e3332c71df61"
},
"ResponseStatus": "200"
-}
\ No newline at end of file
+}
diff --git
a/tests/phpunit/includes/Responses/paypal_ec/GetExpressCheckoutDetails_10486.testresponse
b/tests/phpunit/includes/Responses/paypal_ec/GetExpressCheckoutDetails_10486.testresponse
index f945850..15278e0 100644
---
a/tests/phpunit/includes/Responses/paypal_ec/GetExpressCheckoutDetails_10486.testresponse
+++
b/tests/phpunit/includes/Responses/paypal_ec/GetExpressCheckoutDetails_10486.testresponse
@@ -1 +1 @@
-TOKEN=EC%2d2D123456D9876543U&BILLINGAGREEMENTACCEPTEDSTATUS=0&CHECKOUTSTATUS=PaymentActionNotInitiated&TIMESTAMP=2017%2d02%2d01T20%3a07%3a14Z&CORRELATIONID=d70c9a334455e&ACK=Success&VERSION=204&BUILD=28806785&EMAIL=donor%40generous%2enet&PAYERID=8R297FE87CD8S&PAYERSTATUS=unverified&FIRSTNAME=Fezziwig&LASTNAME=Fowl&COUNTRYCODE=US&BILLINGNAME=Fezziwig%20Fowl&STREET=123%20Notta%20Way&CITY=Whoville&STATE=OR&ZIP=97211&COUNTRY=US&COUNTRYNAME=United%20States&ADDRESSID=PayPal&ADDRESSSTATUS=Confirmed&CURRENCYCODE=USD&AMT=1%2e55&ITEMAMT=1%2e55&SHIPPINGAMT=0&HANDLINGAMT=0&TAXAMT=0&CUSTOM=45931210&DESC=Donation%20to%20the%20Wikimedia%20Foundation&INVNUM=45931210%2e0&NOTIFYURL=http%3a%2f%2ffundraising%2ewikimedia%2eorg%2fIPNListener_Standalone%2ephp&INSURANCEAMT=0&SHIPDISCAMT=0&INSURANCEOPTIONOFFERED=false&L_QTY0=1&L_TAXAMT0=0&L_AMT0=1%2e55&L_DESC0=Donation%20to%20the%20Wikimedia%20Foundation&PAYMENTREQUEST_0_CURRENCYCODE=USD&PAYMENTREQUEST_0_AMT=1%2e55&PAYMENTREQUEST_0_ITEMAMT=1%2e55&PAYMENTREQUEST_0_SHIPPINGAMT=0&PAYMENTREQUEST_0_HANDLINGAMT=0&PAYMENTREQUEST_0_TAXAMT=0&PAYMENTREQUEST_0_CUSTOM=45931210&PAYMENTREQUEST_0_DESC=Donation%20to%20the%20Wikimedia%20Foundation&PAYMENTREQUEST_0_INVNUM=45931210%2e0&PAYMENTREQUEST_0_NOTIFYURL=http%3a%2f%2ffundraising%2ewikimedia%2eorg%2fIPNListener_Standalone%2ephp&PAYMENTREQUEST_0_INSURANCEAMT=0&PAYMENTREQUEST_0_SHIPDISCAMT=0&PAYMENTREQUEST_0_SELLERPAYPALACCOUNTID=receiver%40wikimedia%2eorg&PAYMENTREQUEST_0_INSURANCEOPTIONOFFERED=false&PAYMENTREQUEST_0_ADDRESSSTATUS=Confirmed&L_PAYMENTREQUEST_0_QTY0=1&L_PAYMENTREQUEST_0_TAXAMT0=0&L_PAYMENTREQUEST_0_AMT0=1%2e55&L_PAYMENTREQUEST_0_DESC0=Donation%20to%20the%20Wikimedia%20Foundation&PAYMENTREQUESTINFO_0_ERRORCODE=0
+TOKEN=EC%2d2D123456D9876543U&BILLINGAGREEMENTACCEPTEDSTATUS=0&CHECKOUTSTATUS=PaymentActionNotInitiated&TIMESTAMP=2017%2d02%2d01T20%3a07%3a14Z&CORRELATIONID=d70c9a334455e&ACK=Success&VERSION=204&BUILD=28806785&EMAIL=donor%40generous%2enet&PAYERID=8R297FE87CD8S&PAYERSTATUS=unverified&FIRSTNAME=Fezziwig&LASTNAME=Fowl&COUNTRYCODE=US&BILLINGNAME=Fezziwig%20Fowl&STREET=123%20Notta%20Way&CITY=Whoville&STATE=OR&ZIP=97211&COUNTRY=US&COUNTRYNAME=United%20States&ADDRESSID=PayPal&ADDRESSSTATUS=Confirmed&CURRENCYCODE=USD&AMT=1%2e55&ITEMAMT=1%2e55&SHIPPINGAMT=0&HANDLINGAMT=0&TAXAMT=0&CUSTOM=45931210.1&DESC=Donation%20to%20the%20Wikimedia%20Foundation&INVNUM=45931210%2e0&NOTIFYURL=http%3a%2f%2ffundraising%2ewikimedia%2eorg%2fIPNListener_Standalone%2ephp&INSURANCEAMT=0&SHIPDISCAMT=0&INSURANCEOPTIONOFFERED=false&L_QTY0=1&L_TAXAMT0=0&L_AMT0=1%2e55&L_DESC0=Donation%20to%20the%20Wikimedia%20Foundation&PAYMENTREQUEST_0_CURRENCYCODE=USD&PAYMENTREQUEST_0_AMT=1%2e55&PAYMENTREQUEST_0_ITEMAMT=1%2e55&PAYMENTREQUEST_0_SHIPPINGAMT=0&PAYMENTREQUEST_0_HANDLINGAMT=0&PAYMENTREQUEST_0_TAXAMT=0&PAYMENTREQUEST_0_CUSTOM=45931210&PAYMENTREQUEST_0_DESC=Donation%20to%20the%20Wikimedia%20Foundation&PAYMENTREQUEST_0_INVNUM=45931210.1%2e0&PAYMENTREQUEST_0_NOTIFYURL=http%3a%2f%2ffundraising%2ewikimedia%2eorg%2fIPNListener_Standalone%2ephp&PAYMENTREQUEST_0_INSURANCEAMT=0&PAYMENTREQUEST_0_SHIPDISCAMT=0&PAYMENTREQUEST_0_SELLERPAYPALACCOUNTID=receiver%40wikimedia%2eorg&PAYMENTREQUEST_0_INSURANCEOPTIONOFFERED=false&PAYMENTREQUEST_0_ADDRESSSTATUS=Confirmed&L_PAYMENTREQUEST_0_QTY0=1&L_PAYMENTREQUEST_0_TAXAMT0=0&L_PAYMENTREQUEST_0_AMT0=1%2e55&L_PAYMENTREQUEST_0_DESC0=Donation%20to%20the%20Wikimedia%20Foundation&PAYMENTREQUESTINFO_0_ERRORCODE=0
diff --git
a/tests/phpunit/includes/Responses/paypal_ec/GetExpressCheckoutDetails_OK.testresponse
b/tests/phpunit/includes/Responses/paypal_ec/GetExpressCheckoutDetails_OK.testresponse
index 9fa4f8a..c687e54 100644
---
a/tests/phpunit/includes/Responses/paypal_ec/GetExpressCheckoutDetails_OK.testresponse
+++
b/tests/phpunit/includes/Responses/paypal_ec/GetExpressCheckoutDetails_OK.testresponse
@@ -1 +1 @@
-TOKEN=EC%2d4V987654XA123456V&BILLINGAGREEMENTACCEPTEDSTATUS=0&CHECKOUTSTATUS=PaymentActionNotInitiated&TIMESTAMP=2017%2d02%2d01T20%3a07%3a14Z&CORRELATIONID=d70c9a334455e&ACK=Success&VERSION=204&BUILD=28806785&EMAIL=donor%40generous%2enet&PAYERID=8R297FE87CD8S&PAYERSTATUS=unverified&FIRSTNAME=Fezziwig&LASTNAME=Fowl&COUNTRYCODE=US&BILLINGNAME=Fezziwig%20Fowl&STREET=123%20Notta%20Way&CITY=Whoville&STATE=OR&ZIP=97211&COUNTRY=US&COUNTRYNAME=United%20States&ADDRESSID=PayPal&ADDRESSSTATUS=Confirmed&CURRENCYCODE=USD&AMT=1%2e55&ITEMAMT=1%2e55&SHIPPINGAMT=0&HANDLINGAMT=0&TAXAMT=0&CUSTOM=45931210&DESC=Donation%20to%20the%20Wikimedia%20Foundation&INVNUM=45931210%2e0&NOTIFYURL=http%3a%2f%2ffundraising%2ewikimedia%2eorg%2fIPNListener_Standalone%2ephp&INSURANCEAMT=0&SHIPDISCAMT=0&INSURANCEOPTIONOFFERED=false&L_QTY0=1&L_TAXAMT0=0&L_AMT0=1%2e55&L_DESC0=Donation%20to%20the%20Wikimedia%20Foundation&PAYMENTREQUEST_0_CURRENCYCODE=USD&PAYMENTREQUEST_0_AMT=1%2e55&PAYMENTREQUEST_0_ITEMAMT=1%2e55&PAYMENTREQUEST_0_SHIPPINGAMT=0&PAYMENTREQUEST_0_HANDLINGAMT=0&PAYMENTREQUEST_0_TAXAMT=0&PAYMENTREQUEST_0_CUSTOM=45931210&PAYMENTREQUEST_0_DESC=Donation%20to%20the%20Wikimedia%20Foundation&PAYMENTREQUEST_0_INVNUM=45931210%2e0&PAYMENTREQUEST_0_NOTIFYURL=http%3a%2f%2ffundraising%2ewikimedia%2eorg%2fIPNListener_Standalone%2ephp&PAYMENTREQUEST_0_INSURANCEAMT=0&PAYMENTREQUEST_0_SHIPDISCAMT=0&PAYMENTREQUEST_0_SELLERPAYPALACCOUNTID=receiver%40wikimedia%2eorg&PAYMENTREQUEST_0_INSURANCEOPTIONOFFERED=false&PAYMENTREQUEST_0_ADDRESSSTATUS=Confirmed&L_PAYMENTREQUEST_0_QTY0=1&L_PAYMENTREQUEST_0_TAXAMT0=0&L_PAYMENTREQUEST_0_AMT0=1%2e55&L_PAYMENTREQUEST_0_DESC0=Donation%20to%20the%20Wikimedia%20Foundation&PAYMENTREQUESTINFO_0_ERRORCODE=0
+TOKEN=EC%2d4V987654XA123456V&BILLINGAGREEMENTACCEPTEDSTATUS=0&CHECKOUTSTATUS=PaymentActionNotInitiated&TIMESTAMP=2017%2d02%2d01T20%3a07%3a14Z&CORRELATIONID=d70c9a334455e&ACK=Success&VERSION=204&BUILD=28806785&EMAIL=donor%40generous%2enet&PAYERID=8R297FE87CD8S&PAYERSTATUS=unverified&FIRSTNAME=Fezziwig&LASTNAME=Fowl&COUNTRYCODE=US&BILLINGNAME=Fezziwig%20Fowl&STREET=123%20Notta%20Way&CITY=Whoville&STATE=OR&ZIP=97211&COUNTRY=US&COUNTRYNAME=United%20States&ADDRESSID=PayPal&ADDRESSSTATUS=Confirmed&CURRENCYCODE=USD&AMT=1%2e55&ITEMAMT=1%2e55&SHIPPINGAMT=0&HANDLINGAMT=0&TAXAMT=0&CUSTOM=45931210.1&DESC=Donation%20to%20the%20Wikimedia%20Foundation&INVNUM=45931210%2e0&NOTIFYURL=http%3a%2f%2ffundraising%2ewikimedia%2eorg%2fIPNListener_Standalone%2ephp&INSURANCEAMT=0&SHIPDISCAMT=0&INSURANCEOPTIONOFFERED=false&L_QTY0=1&L_TAXAMT0=0&L_AMT0=1%2e55&L_DESC0=Donation%20to%20the%20Wikimedia%20Foundation&PAYMENTREQUEST_0_CURRENCYCODE=USD&PAYMENTREQUEST_0_AMT=1%2e55&PAYMENTREQUEST_0_ITEMAMT=1%2e55&PAYMENTREQUEST_0_SHIPPINGAMT=0&PAYMENTREQUEST_0_HANDLINGAMT=0&PAYMENTREQUEST_0_TAXAMT=0&PAYMENTREQUEST_0_CUSTOM=45931210&PAYMENTREQUEST_0_DESC=Donation%20to%20the%20Wikimedia%20Foundation&PAYMENTREQUEST_0_INVNUM=45931210.1%2e0&PAYMENTREQUEST_0_NOTIFYURL=http%3a%2f%2ffundraising%2ewikimedia%2eorg%2fIPNListener_Standalone%2ephp&PAYMENTREQUEST_0_INSURANCEAMT=0&PAYMENTREQUEST_0_SHIPDISCAMT=0&PAYMENTREQUEST_0_SELLERPAYPALACCOUNTID=receiver%40wikimedia%2eorg&PAYMENTREQUEST_0_INSURANCEOPTIONOFFERED=false&PAYMENTREQUEST_0_ADDRESSSTATUS=Confirmed&L_PAYMENTREQUEST_0_QTY0=1&L_PAYMENTREQUEST_0_TAXAMT0=0&L_PAYMENTREQUEST_0_AMT0=1%2e55&L_PAYMENTREQUEST_0_DESC0=Donation%20to%20the%20Wikimedia%20Foundation&PAYMENTREQUESTINFO_0_ERRORCODE=0
--
To view, visit https://gerrit.wikimedia.org/r/368266
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2ae477f3d1e4bb9d155333534b9fcb5c6a14074d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ejegg <ej...@ejegg.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
