Mepps has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/352867 )

Change subject: Merge branch 'master' into deployment
......................................................................

Merge branch 'master' into deployment

3b81aba Add de Bijenkorf card
32c51ba Get rid of MultiQueueWriter, 'verified' alias
4f2c7ee Clean up PayPal subscription message normalization
f9a930c Remove unused imports

Change-Id: I239f93ef16eb78237550c4f03c772062a00057d9
---
D PaymentProviders/Adyen/Tests/config_test.yaml
D PaymentProviders/Adyen/Tests/phpunit/PaymentCaptureActionTest.php
D PaymentProviders/Adyen/Tests/phpunit/RecordCaptureJobTest.php
D PaymentProviders/Amazon/Tests/phpunit/NormalizeTest.php
D PaymentProviders/AstroPay/Tests/phpunit/NormalizeTest.php
D PaymentProviders/Ingenico/Tests/phpunit/IdealStatusProviderTest.php
D PaymentProviders/PayPal/Tests/Data/express_checkout_transformed.json
D 
PaymentProviders/PayPal/Tests/Data/recurring_payment_profile_created_transformed.json
D PaymentProviders/PayPal/Tests/Data/refund_ec_transformed.json
D PaymentProviders/PayPal/Tests/Data/refund_recurring_ec_transformed.json
D PaymentProviders/PayPal/Tests/Data/subscr_signup_transformed.json
D PaymentProviders/PayPal/Tests/config_test.yaml
12 files changed, 0 insertions(+), 606 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig 
refs/changes/67/352867/1

diff --git a/PaymentProviders/Adyen/Tests/config_test.yaml 
b/PaymentProviders/Adyen/Tests/config_test.yaml
deleted file mode 100644
index 068ed27..0000000
--- a/PaymentProviders/Adyen/Tests/config_test.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-<<<<<<< HEAD   (200f63 Merge branch 'master' into deployment)
-=======
-adyen:
-    data-store:
-
-        payments-antifraud:
-            class: PHPQueue\Backend\PDO
-            constructor-parameters:
-                -
-                    connection_string: 'sqlite::memory:'
-
-        donations:
-            class: PHPQueue\Backend\PDO
-            constructor-parameters:
-                -
-                    connection_string: 'sqlite::memory:'
-
-        jobs-adyen:
-            class: PHPQueue\Backend\PDO
-            constructor-parameters:
-                -
-                    connection_string: 'sqlite::memory:'
-
-        pending-db:
-            class: PDO
-            constructor-parameters:
-                - 'sqlite::memory:'
-
-    payment-provider:
-        adyen:
-            api:
-                class: 
SmashPig\PaymentProviders\Adyen\Tests\MockAdyenPaymentsAPI
->>>>>>> BRANCH (f9a930 Remove unused imports)
diff --git a/PaymentProviders/Adyen/Tests/phpunit/PaymentCaptureActionTest.php 
b/PaymentProviders/Adyen/Tests/phpunit/PaymentCaptureActionTest.php
deleted file mode 100644
index ea4273c..0000000
--- a/PaymentProviders/Adyen/Tests/phpunit/PaymentCaptureActionTest.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<<<<<<< HEAD   (200f63 Merge branch 'master' into deployment)
-=======
-<?php
-namespace SmashPig\PaymentProviders\Adyen\Tests;
-
-use PHPQueue\Interfaces\FifoQueueStore;
-use SmashPig\Core\Configuration;
-use SmashPig\Core\Context;
-use SmashPig\PaymentProviders\Adyen\Actions\PaymentCaptureAction;
-use SmashPig\PaymentProviders\Adyen\ExpatriatedMessages\Authorisation;
-use SmashPig\Tests\BaseSmashPigUnitTestCase;
-
-class PaymentCaptureActionTest extends BaseSmashPigUnitTestCase  {
-       /**
-        * @var Configuration
-        */
-       protected $config;
-
-       /**
-        * @var FifoQueueStore
-        */
-       protected $jobQueue;
-
-       public function setUp() {
-               parent::setUp();
-               $this->config = 
AdyenTestConfiguration::createWithSuccessfulApi();
-               Context::initWithLogger( $this->config );
-               $this->jobQueue = $this->config->object( 
'data-store/jobs-adyen' );
-               $this->jobQueue->createTable( 'jobs-adyen' );
-       }
-
-       public function testSuccessfulAuth() {
-               $auth = new Authorisation();
-               $auth->success = true;
-               $auth->correlationId = 'adyen-' . mt_rand();
-               $auth->merchantAccountCode = 'WikimediaTest' ;
-               $auth->currency = 'USD';
-               $auth->amount = '10';
-               $auth->merchantReference = mt_rand();
-               $auth->pspReference = mt_rand();
-               $auth->cvvResult = 1;
-               $auth->avsResult = 19;
-
-               $action = new PaymentCaptureAction();
-               $action->execute( $auth );
-
-               $job = $this->jobQueue->pop();
-
-               $this->assertEquals(
-                       
'SmashPig\PaymentProviders\Adyen\Jobs\ProcessCaptureRequestJob',
-                       $job['php-message-class']
-               );
-               $sameProps = array(
-                       'currency', 'amount', 'pspReference', 
'merchantReference',
-                       'avsResult', 'cvvResult',
-
-               );
-               foreach ( $sameProps as $prop ) {
-                       $this->assertEquals(
-                               $auth->$prop,
-                               $job[$prop],
-                               "Job property $prop does not match capture"
-                       );
-               }
-       }
-
-       public function testFailedAuth() {
-               $auth = new Authorisation();
-               $auth->success = false;
-               $auth->correlationId = 'adyen-' . mt_rand();
-               $auth->merchantAccountCode = 'WikimediaTest' ;
-               $auth->merchantReference = mt_rand();
-
-               $action = new PaymentCaptureAction();
-               $action->execute( $auth );
-
-               $job = $this->jobQueue->pop();
-
-               $this->assertEquals(
-                       'SmashPig\Core\Jobs\DeletePendingJob',
-                       $job['php-message-class']
-               );
-               $this->assertEquals(
-                       $auth->merchantReference,
-                       $job['order_id']
-               );
-               $this->assertEquals( 'adyen', $job['gateway'] );
-       }
-}
->>>>>>> BRANCH (f9a930 Remove unused imports)
diff --git a/PaymentProviders/Adyen/Tests/phpunit/RecordCaptureJobTest.php 
b/PaymentProviders/Adyen/Tests/phpunit/RecordCaptureJobTest.php
deleted file mode 100644
index 8069ffc..0000000
--- a/PaymentProviders/Adyen/Tests/phpunit/RecordCaptureJobTest.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<<<<<<< HEAD   (200f63 Merge branch 'master' into deployment)
-=======
-<?php namespace SmashPig\PaymentProviders\Adyen\Test;
-
-use SmashPig\Core\Configuration;
-use SmashPig\Core\Context;
-use SmashPig\Core\DataStores\KeyedOpaqueStorableObject;
-use SmashPig\Core\DataStores\PendingDatabase;
-use SmashPig\Core\QueueConsumers\BaseQueueConsumer;
-use SmashPig\PaymentProviders\Adyen\Jobs\RecordCaptureJob;
-use SmashPig\PaymentProviders\Adyen\Tests\AdyenTestConfiguration;
-use SmashPig\Tests\BaseSmashPigUnitTestCase;
-
-/**
- * Verify Adyen RecordCapture job functions
- */
-class RecordCaptureJobTest extends BaseSmashPigUnitTestCase {
-
-       /**
-        * @var Configuration
-        */
-       public $config;
-       /**
-        * @var PendingDatabase
-        */
-       protected $pendingDatabase;
-       protected $pendingMessage;
-
-       public function setUp() {
-               parent::setUp();
-               $this->config = 
AdyenTestConfiguration::createWithSuccessfulApi();
-               Context::initWithLogger( $this->config );
-               $this->pendingDatabase = PendingDatabase::get();
-               $this->pendingMessage = json_decode(
-                       file_get_contents( __DIR__ . '/../Data/pending.json' ) 
, true
-               );
-               $this->pendingMessage['captured'] = true;
-               $this->pendingDatabase->storeMessage( $this->pendingMessage );
-       }
-
-       public function tearDown() {
-               $this->pendingDatabase->deleteMessage( $this->pendingMessage );
-               parent::tearDown();
-       }
-
-       public function testRecordCapture() {
-               $donationsQueue = BaseQueueConsumer::getQueue( 'donations' );
-               $donationsQueue->createTable( 'donations' );
-
-               $capture = KeyedOpaqueStorableObject::fromJsonProxy(
-                       
'SmashPig\PaymentProviders\Adyen\ExpatriatedMessages\Capture',
-                       file_get_contents( __DIR__ . '/../Data/capture.json' )
-               );
-
-               $job = RecordCaptureJob::factory( $capture );
-               $this->assertTrue( $job->execute() );
-
-               $donorData = 
$this->pendingDatabase->fetchMessageByGatewayOrderId(
-                       'adyen', $capture->merchantReference
-               );
-
-               $this->assertNull(
-                       $donorData,
-                       'RecordCaptureJob left donor data on pending queue'
-               );
-
-               $donationMessage = $donationsQueue->pop();
-               $this->assertNotNull(
-                       $donationMessage,
-                       'RecordCaptureJob did not send donation message'
-               );
-               // can we use arraySubset yet?
-               $sameKeys = array_intersect(
-                       array_keys( $donationMessage ),
-                       array_keys( $this->pendingMessage )
-               );
-               foreach ( $sameKeys as $key ) {
-                       if ( $key === 'gateway_txn_id' ) {
-                               $this->assertEquals(
-                                       $capture->originalReference, 
$donationMessage[$key],
-                                       'RecordCaptureJob should have set 
gateway_txn_id'
-                               );
-                       } else {
-                               $this->assertEquals(
-                                       $this->pendingMessage[$key],
-                                       $donationMessage[$key],
-                                       "Value of key $key mutated"
-                               );
-                       }
-               }
-       }
-}
->>>>>>> BRANCH (f9a930 Remove unused imports)
diff --git a/PaymentProviders/Amazon/Tests/phpunit/NormalizeTest.php 
b/PaymentProviders/Amazon/Tests/phpunit/NormalizeTest.php
deleted file mode 100644
index fd8c1c8..0000000
--- a/PaymentProviders/Amazon/Tests/phpunit/NormalizeTest.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<<<<<<< HEAD   (200f63 Merge branch 'master' into deployment)
-=======
-<?php
-namespace SmashPig\PaymentProviders\Amazon\Tests;
-
-use SmashPig\PaymentProviders\Amazon\ExpatriatedMessages\RefundCompleted;
-use SmashPig\PaymentProviders\Amazon\ExpatriatedMessages\CaptureCompleted;
-use SmashPig\Tests\BaseSmashPigUnitTestCase;
-
-class NormalizeTest extends BaseSmashPigUnitTestCase {
-       /**
-        * @var CaptureCompleted
-        */
-       protected $captureCompleted;
-
-       /**
-        * @var RefundCompleted
-        */
-       protected $refundCompleted;
-
-       public function setUp() {
-               parent::setUp();
-               $this->captureCompleted = $this->loadJson( __DIR__ . 
"/../Data/IPN/CaptureCompleted.json" );
-               $this->refundCompleted = $this->loadJson( __DIR__ . 
"/../Data/IPN/RefundCompleted.json" );
-       }
-
-       public function testNormalizeCaptureCompleted() {
-               $expected = array(
-                       'completion_message_id' => 'amazon-98765432-1',
-                       'contribution_tracking_id' => '98765432',
-                       'currency' => 'USD',
-                       'date' => 1357002061,
-                       'fee' => '0.0',
-                       'gateway' => 'amazon',
-                       'gateway_status' => 'Completed',
-                       'gateway_txn_id' => 'P01-0000000-0000000-000000',
-                       'gross' => '10.0',
-                       'order_id' => '98765432-1',
-                       'payment_method' => 'amazon',
-               );
-               $stripFields = array(
-                       'propertiesExportedAsKeys',
-                       'propertiesExcludedFromExport',
-               );
-               $message = new CaptureCompleted( $this->captureCompleted );
-               $normalized = $message->normalizeForQueue();
-               foreach ( $stripFields as $field ) {
-                       unset( $normalized[$field] );
-               }
-               $this->assertEquals( $expected, $normalized );
-       }
-
-       public function testNormalizeRefundCompleted() {
-               $id = 'P01-0000000-0000000-C' . mt_rand( 10000, 99999 );
-               $expected = array(
-                       'gross_currency' => 'USD',
-                       'date' => 1357002061,
-                       'gateway' => 'amazon',
-                       'gateway_parent_id' => $id,
-                       'gateway_refund_id' => 'P01-0000000-0000000-R00000',
-                       'gross' => '10.0',
-                       'type' => 'refund',
-               );
-               $stripFields = array(
-                       'propertiesExportedAsKeys',
-                       'propertiesExcludedFromExport',
-               );
-               $message = new RefundCompleted( $this->refundCompleted );
-               $message->setParentId( $id );
-               $normalized = $message->normalizeForQueue();
-               foreach ( $stripFields as $field ) {
-                       unset( $normalized[$field] );
-               }
-               $this->assertEquals( $expected, $normalized );
-       }
-}
->>>>>>> BRANCH (f9a930 Remove unused imports)
diff --git a/PaymentProviders/AstroPay/Tests/phpunit/NormalizeTest.php 
b/PaymentProviders/AstroPay/Tests/phpunit/NormalizeTest.php
deleted file mode 100644
index b007ec6..0000000
--- a/PaymentProviders/AstroPay/Tests/phpunit/NormalizeTest.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<<<<<<< HEAD   (200f63 Merge branch 'master' into deployment)
-=======
-<?php
-namespace SmashPig\PaymentProviders\AstroPay\Test;
-
-use SmashPig\PaymentProviders\AstroPay\ExpatriatedMessages\PaymentMessage;
-use SmashPig\Tests\BaseSmashPigUnitTestCase;
-
-class NormalizeTest extends BaseSmashPigUnitTestCase {
-       /**
-        * @var array
-        */
-       protected $paymentSuccess;
-
-       public function setUp() {
-               parent::setUp();
-               $this->paymentSuccess = $this->loadJson( __DIR__ . 
"/../Data/paid.json" );
-       }
-
-       /**
-        * Check that we produce the right message, including the completion id
-        */
-       public function testNormalizePaymentSuccess() {
-               $expected = array(
-                       'completion_message_id' => 'astropay-32303.1',
-                       'contribution_tracking_id' => '32303',
-                       'currency' => 'BRL',
-                       'gateway' => 'astropay',
-                       'gateway_status' => '9',
-                       'gateway_txn_id' => '31912',
-                       'gross' => '100.00',
-                       'order_id' => '32303.1',
-               );
-               $stripFields = array(
-                       'propertiesExportedAsKeys',
-                       'propertiesExcludedFromExport',
-                       'date',
-               );
-               $message = new PaymentMessage();
-               $message->constructFromValues( $this->paymentSuccess );
-               $normalized = $message->normalizeForQueue();
-               foreach ( $stripFields as $field ) {
-                       unset( $normalized[$field] );
-               }
-               $this->assertEquals( $expected, $normalized );
-       }
-}
->>>>>>> BRANCH (f9a930 Remove unused imports)
diff --git 
a/PaymentProviders/Ingenico/Tests/phpunit/IdealStatusProviderTest.php 
b/PaymentProviders/Ingenico/Tests/phpunit/IdealStatusProviderTest.php
deleted file mode 100644
index b37d22d..0000000
--- a/PaymentProviders/Ingenico/Tests/phpunit/IdealStatusProviderTest.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<<<<<<< HEAD   (200f63 Merge branch 'master' into deployment)
-=======
-<?php
-namespace SmashPig\PaymentProviders\Ingenico\Tests;
-
-use PHPUnit_Framework_MockObject_MockObject;
-use Psr\Cache\CacheItemPoolInterface;
-use SmashPig\Core\Http\CurlWrapper;
-use SmashPig\PaymentProviders\Ingenico\IdealStatusProvider;
-use SmashPig\Tests\BaseSmashPigUnitTestCase;
-
-/**
- * @group Ingenico
- */
-class IdealStatusProviderTest extends BaseSmashPigUnitTestCase {
-
-       /**
-        * @var PHPUnit_Framework_MockObject_MockObject
-        */
-       protected $curlWrapper;
-
-       /**
-        * @var IdealStatusProvider
-        */
-       protected $provider;
-
-       /**
-        * @var CacheItemPoolInterface
-        */
-       protected $cache;
-
-       public function setUp() {
-
-               $config = $this->setConfig( 'ingenico' );
-               $this->curlWrapper = $this->getMock( 
'\SmashPig\Core\Http\CurlWrapper' );
-               $this->cache = $config->object( 'cache', true );
-               $config->overrideObjectInstance( 'curl/wrapper', 
$this->curlWrapper );
-               $config->object( 'cache' )->clear();
-               $this->provider = new IdealStatusProvider( array(
-                       'cache-parameters' => array(
-                               'duration' => 10,
-                               'key' => 'BLAH_BLAH'
-                       ),
-                       'availability-url' => 
'http://example.org/undocumented/api/GetIssuers'
-               ) );
-               $contents = file_get_contents( __DIR__ . 
"/../Data/availability.response" );
-               $parsed = CurlWrapper::parseResponse(
-                       $contents, array( 'http_code' => 200 )
-               );
-               $this->curlWrapper->method( 'execute' )->willReturn( $parsed );
-               parent::setUp();
-       }
-
-       public function testGetBankStatus() {
-               $results = $this->provider->getBankStatus();
-               $this->assertEquals(
-                       array(
-                               'ABNANL2A' => array(
-                                       'name' => 'ABN AMRO',
-                                       'availability' => '40',
-                               ),
-                               'INGBNL2A' => array(
-                                       'name' => 'Issuer Simulation V3 - ING',
-                                       'availability' => '100',
-                               )
-                       ),
-                       $results
-               );
-       }
-
-       public function testCacheBankStatus() {
-               $this->curlWrapper->expects( $this->once() )
-                       ->method( 'execute' );
-               $results = $this->provider->getBankStatus();
-               $this->assertEquals(
-                       array(
-                               'ABNANL2A' => array(
-                                       'name' => 'ABN AMRO',
-                                       'availability' => '40',
-                               ),
-                               'INGBNL2A' => array(
-                                       'name' => 'Issuer Simulation V3 - ING',
-                                       'availability' => '100',
-                               )
-                       ),
-                       $results
-               );
-               $cachedResults = $this->provider->getBankStatus();
-               $this->assertEquals( $results, $cachedResults );
-       }
-}
->>>>>>> BRANCH (f9a930 Remove unused imports)
diff --git 
a/PaymentProviders/PayPal/Tests/Data/express_checkout_transformed.json 
b/PaymentProviders/PayPal/Tests/Data/express_checkout_transformed.json
deleted file mode 100644
index 4ef9bf5..0000000
--- a/PaymentProviders/PayPal/Tests/Data/express_checkout_transformed.json
+++ /dev/null
@@ -1,21 +0,0 @@
-<<<<<<< HEAD   (200f63 Merge branch 'master' into deployment)
-=======
-{
-       "date": 1481144318,
-       "txn_type": "express_checkout",
-       "gateway_txn_id": "3N2616476S0123456",
-       "currency": "JPY",
-       "contribution_tracking_id": "123456",
-       "email": "[email protected]",
-       "first_name": "Fowl",
-       "last_name": "Pond",
-       "country": "US",
-       "gross": "150",
-       "fee": "43",
-       "order_id": "123456",
-       "gateway": "paypal_ec",
-       "source_name": "SmashPig",
-       "source_type": "listener",
-       "source_version": "unknown"
-}
->>>>>>> BRANCH (f9a930 Remove unused imports)
diff --git 
a/PaymentProviders/PayPal/Tests/Data/recurring_payment_profile_created_transformed.json
 
b/PaymentProviders/PayPal/Tests/Data/recurring_payment_profile_created_transformed.json
deleted file mode 100644
index 388aa2e..0000000
--- 
a/PaymentProviders/PayPal/Tests/Data/recurring_payment_profile_created_transformed.json
+++ /dev/null
@@ -1,25 +0,0 @@
-<<<<<<< HEAD   (200f63 Merge branch 'master' into deployment)
-=======
-{
-  "subscr_id": "I-88J1M3DLSF0",
-  "txn_type": "subscr_signup",
-  "contribution_tracking_id": "47017286",
-  "order_id": "47017286",
-  "email": "[email protected]",
-  "first_name": "Fezziwig",
-  "middle_name": "",
-  "last_name": "Fowl",
-  "frequency_interval": "1",
-  "frequency_unit": "month",
-  "installments": 0,
-  "country": "US",
-  "create_date": 1492533928,
-  "start_date": 1492533928,
-  "date": 1492533928,
-  "gateway": "paypal_ec",
-  "recurring": "1",
-  "source_name": "SmashPig",
-  "source_type": "listener",
-  "source_version": "unknown"
-}
->>>>>>> BRANCH (f9a930 Remove unused imports)
diff --git a/PaymentProviders/PayPal/Tests/Data/refund_ec_transformed.json 
b/PaymentProviders/PayPal/Tests/Data/refund_ec_transformed.json
deleted file mode 100644
index 859aff5..0000000
--- a/PaymentProviders/PayPal/Tests/Data/refund_ec_transformed.json
+++ /dev/null
@@ -1,24 +0,0 @@
-<<<<<<< HEAD   (200f63 Merge branch 'master' into deployment)
-=======
-{
-  "date": 1490200499,
-  "gateway_parent_id": "1V551844CE5526421",
-  "gateway_txn_id": "3HD08833MR473623T",
-  "currency": "JPY",
-  "type": "refund",
-  "contribution_tracking_id": "46239229",
-  "email": "[email protected]",
-  "first_name": "Testy",
-  "last_name": "McTesterson",
-  "gross": "-150",
-  "fee": "-43",
-  "order_id": "46239229",
-  "gateway_refund_id": "3HD08833MR473623T",
-  "gross_currency": "JPY",
-  "country": "US",
-  "gateway": "paypal_ec",
-  "source_name": "SmashPig",
-  "source_type": "listener",
-  "source_version": "unknown"
-}
->>>>>>> BRANCH (f9a930 Remove unused imports)
diff --git 
a/PaymentProviders/PayPal/Tests/Data/refund_recurring_ec_transformed.json 
b/PaymentProviders/PayPal/Tests/Data/refund_recurring_ec_transformed.json
deleted file mode 100644
index 99553c7..0000000
--- a/PaymentProviders/PayPal/Tests/Data/refund_recurring_ec_transformed.json
+++ /dev/null
@@ -1,25 +0,0 @@
-<<<<<<< HEAD   (200f63 Merge branch 'master' into deployment)
-=======
-{
-  "date": 1490200431,
-  "gateway_parent_id": "4GV70894MM323713P",
-  "gateway_txn_id": "4CX17568KP793000L",
-  "currency": "JPY",
-  "type": "refund",
-  "contribution_tracking_id": "45931681",
-  "email": "[email protected]",
-  "first_name": "Testy",
-  "last_name": "McTesterson",
-  "gross": "-150",
-  "fee": "-43",
-  "order_id": "45931681",
-  "gateway_refund_id": "4CX17568KP793000L",
-  "gross_currency": "JPY",
-  "country": "US",
-  "gateway": "paypal_ec",
-  "subscr_id": "I-DD1FNAAAUU22",
-  "source_name": "SmashPig",
-  "source_type": "listener",
-  "source_version": "unknown"
-}
->>>>>>> BRANCH (f9a930 Remove unused imports)
diff --git a/PaymentProviders/PayPal/Tests/Data/subscr_signup_transformed.json 
b/PaymentProviders/PayPal/Tests/Data/subscr_signup_transformed.json
deleted file mode 100644
index ff8eac8..0000000
--- a/PaymentProviders/PayPal/Tests/Data/subscr_signup_transformed.json
+++ /dev/null
@@ -1,31 +0,0 @@
-<<<<<<< HEAD   (200f63 Merge branch 'master' into deployment)
-=======
-{
-    "subscr_id": 2048343366,
-    "txn_type": "subscr_signup",
-    "contribution_tracking_id": "7373",
-    "order_id": "7373",
-    "email": "[email protected]",
-    "first_name": "Joe",
-    "middle_name": "",
-    "last_name": "Camel",
-    "street_address": "123 Only Joking",
-    "city": "Scranton",
-    "state_province": "CA",
-    "country": "US",
-    "postal_code": "99999",
-    "frequency_interval": "1",
-    "frequency_unit": "month",
-    "installments": 0,
-    "gross": "1.03",
-    "currency": "USD",
-    "create_date": 1474498991,
-    "start_date": 1474498991,
-    "date": 1474498991,
-    "gateway": "paypal",
-    "recurring": "1",
-    "source_name": "SmashPig",
-    "source_type": "listener",
-    "source_version": "unknown"
-}
->>>>>>> BRANCH (f9a930 Remove unused imports)
diff --git a/PaymentProviders/PayPal/Tests/config_test.yaml 
b/PaymentProviders/PayPal/Tests/config_test.yaml
deleted file mode 100644
index b042f61..0000000
--- a/PaymentProviders/PayPal/Tests/config_test.yaml
+++ /dev/null
@@ -1,47 +0,0 @@
-<<<<<<< HEAD   (200f63 Merge branch 'master' into deployment)
-=======
-paypal:
-    api:
-        class: SmashPig\PaymentProviders\PayPal\Tests\MockPayPalPaymentsAPI
-
-    data-store:
-        donations:
-            class: PHPQueue\Backend\PDO
-            constructor-parameters:
-                -
-                    connection_string: 'sqlite::memory:'
-                    queue: donations
-
-        jobs-paypal:
-            class: PHPQueue\Backend\PDO
-            constructor-parameters:
-                -
-                    connection_string: 'sqlite::memory:'
-                    queue: jobs-paypal
-
-        recurring:
-            class: PHPQueue\Backend\PDO
-            constructor-parameters:
-                -
-                    connection_string: 'sqlite::memory:'
-                    queue: recurring
-
-        refund:
-            class: PHPQueue\Backend\PDO
-            constructor-parameters:
-                -
-                    connection_string: 'sqlite::memory:'
-                    queue: refund
-
-        no-op:
-            class: PHPQueue\Backend\PDO
-            constructor-parameters:
-                -
-                    connection_string: 'sqlite::memory:'
-                    queue: no-op
-
-        pending-db:
-            class: PDO
-            constructor-parameters:
-                - 'sqlite::memory:'
->>>>>>> BRANCH (f9a930 Remove unused imports)

-- 
To view, visit https://gerrit.wikimedia.org/r/352867
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I239f93ef16eb78237550c4f03c772062a00057d9
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/SmashPig
Gerrit-Branch: deployment
Gerrit-Owner: Mepps <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to