Skip to content

Commit 9bd0da7

Browse files
committed
JSON format fix
1 parent ff24578 commit 9bd0da7

File tree

6 files changed

+25
-25
lines changed

6 files changed

+25
-25
lines changed

src/Message/FetchTransactionRequest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ public function getData()
2323
if ($transactionId = $this->getTransactionId()) {
2424

2525
return array(
26-
'id' => $transactionId,
26+
'id' => (string) $transactionId,
2727
'refType' => 'merchantRefId'
2828
);
2929

3030
} elseif ($transactionReference = $this->getTransactionReference()) {
3131

3232
return array(
33-
'id' => $transactionReference
33+
'id' => (string) $transactionReference
3434
);
3535

3636
} else {

src/Message/PayoutRequest.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,14 @@ public function getData()
4646

4747
return array(
4848
'payeeProfile' => array(
49-
'email' => $this->getEmail()
49+
'email' => (string) $this->getEmail()
5050
),
5151
'transaction' => array(
52-
'merchantRefId' => $this->getTransactionId(),
53-
'amount' => $this->getAmountInteger(),
54-
'currency' => $this->getCurrency(),
52+
'merchantRefId' => (string) $this->getTransactionId(),
53+
'amount' => (int) $this->getAmountInteger(),
54+
'currency' => (string) $this->getCurrency(),
5555
),
56-
'message' => $this->getDescription()
56+
'message' => (string) $this->getDescription()
5757
);
5858
}
5959

src/Message/PurchaseRequest.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,14 @@ public function getData()
6565
return array(
6666
'paymentMethod' => array(
6767
'type' => 'neteller',
68-
'value' => $this->getEmail()
68+
'value' => (string) $this->getEmail()
6969
),
7070
'transaction' => array(
71-
'merchantRefId' => $this->getTransactionId(),
72-
'amount' => $this->getAmountInteger(),
73-
'currency' => $this->getCurrency(),
71+
'merchantRefId' => (string) $this->getTransactionId(),
72+
'amount' => (int) $this->getAmountInteger(),
73+
'currency' => (string) $this->getCurrency(),
7474
),
75-
'verificationCode' => $this->getVerificationCode()
75+
'verificationCode' => (string) $this->getVerificationCode()
7676
);
7777
}
7878

tests/Omnipay/Neteller/Message/FetchTransactionRequestTest.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,26 +15,26 @@ public function setUp()
1515
parent::setUp();
1616
$this->request = new FetchTransactionRequest($this->getHttpClient(), $this->getHttpRequest());
1717
$this->request->initialize(array(
18-
'transactionId' => 'TX4567890'
18+
'transactionId' => 4567890
1919
));
2020
}
2121

2222
public function testGetData()
2323
{
2424
$this->request->initialize(array(
25-
'transactionId' => 'TX4567890'
25+
'transactionId' => 4567890
2626
));
2727

2828
$data = $this->request->getData();
29-
$this->assertSame('TX4567890', $data['id']);
29+
$this->assertSame('4567890', $data['id']);
3030
$this->assertSame('merchantRefId', $data['refType']);
3131

3232
$this->request->initialize(array(
33-
'transactionReference' => 'RF4567890'
33+
'transactionReference' => 4567890
3434
));
3535

3636
$data = $this->request->getData();
37-
$this->assertSame('RF4567890', $data['id']);
37+
$this->assertSame('4567890', $data['id']);
3838
$this->assertArrayNotHasKey('refType', $data);
3939

4040
$this->request->initialize(array());

tests/Omnipay/Neteller/Message/PayoutRequestTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ public function setUp()
1616
$this->request = new PayoutRequest($this->getHttpClient(), $this->getHttpRequest());
1717
$this->request->initialize(array(
1818
'email' => 'netellertest_USD@neteller.com',
19-
'verificationCode' => '270955',
20-
'transactionId' => 'TX4567890',
19+
'verificationCode' => 270955,
20+
'transactionId' => 4567890,
2121
'description' => 'Free Text Description',
22-
'amount' => '12.34',
22+
'amount' => 12.34,
2323
'currency' => 'USD'
2424
));
2525
}
@@ -28,7 +28,7 @@ public function testGetData()
2828
{
2929
$data = $this->request->getData();
3030
$this->assertSame('netellertest_USD@neteller.com', $data['payeeProfile']['email']);
31-
$this->assertSame('TX4567890', $data['transaction']['merchantRefId']);
31+
$this->assertSame('4567890', $data['transaction']['merchantRefId']);
3232
$this->assertSame(1234, $data['transaction']['amount']);
3333
$this->assertSame('USD', $data['transaction']['currency']);
3434
$this->assertSame('Free Text Description', $data['message']);

tests/Omnipay/Neteller/Message/PurchaseRequestTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ public function setUp()
1616
$this->request = new PurchaseRequest($this->getHttpClient(), $this->getHttpRequest());
1717
$this->request->initialize(array(
1818
'email' => 'netellertest_USD@neteller.com',
19-
'verificationCode' => '270955',
20-
'transactionId' => 'TX4567890',
21-
'amount' => '12.34',
19+
'verificationCode' => 270955,
20+
'transactionId' => 4567890,
21+
'amount' => 12.34,
2222
'currency' => 'USD'
2323
));
2424
}
@@ -28,7 +28,7 @@ public function testGetData()
2828
$data = $this->request->getData();
2929
$this->assertSame('neteller', $data['paymentMethod']['type']);
3030
$this->assertSame('netellertest_USD@neteller.com', $data['paymentMethod']['value']);
31-
$this->assertSame('TX4567890', $data['transaction']['merchantRefId']);
31+
$this->assertSame('4567890', $data['transaction']['merchantRefId']);
3232
$this->assertSame(1234, $data['transaction']['amount']);
3333
$this->assertSame('USD', $data['transaction']['currency']);
3434
$this->assertSame('270955', $data['verificationCode']);

0 commit comments

Comments
 (0)