Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/Gateway.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ public function getName()
*/
public function getDefaultParameters()
{
return array(
return [
'username' => '',
'password' => '',
'testMode' => false,
);
];
}

/**
Expand Down Expand Up @@ -90,7 +90,7 @@ public function setPassword($value)
*
* @return \Omnipay\Paysafecard\Message\PurchaseRequest
*/
public function purchase(array $parameters = array())
public function purchase(array $parameters = [])
{
return $this->createRequest('\Omnipay\Paysafecard\Message\PurchaseRequest', $parameters);
}
Expand All @@ -100,7 +100,7 @@ public function purchase(array $parameters = array())
*
* @return \Omnipay\Paysafecard\Message\CompletePurchaseRequest
*/
public function completePurchase(array $parameters = array())
public function completePurchase(array $parameters = [])
{
return $this->createRequest('\Omnipay\Paysafecard\Message\CompletePurchaseRequest', $parameters);
}
Expand All @@ -110,7 +110,7 @@ public function completePurchase(array $parameters = array())
*
* @return \Omnipay\Paysafecard\Message\PayoutRequest
*/
public function payout(array $parameters = array())
public function payout(array $parameters = [])
{
return $this->createRequest('\Omnipay\Paysafecard\Message\PayoutRequest', $parameters);
}
Expand All @@ -120,7 +120,7 @@ public function payout(array $parameters = array())
*
* @return \Omnipay\Paysafecard\Message\ValidatePayoutRequest
*/
public function validatePayout(array $parameters = array())
public function validatePayout(array $parameters = [])
{
return $this->createRequest('\Omnipay\Paysafecard\Message\ValidatePayoutRequest', $parameters);
}
Expand All @@ -130,7 +130,7 @@ public function validatePayout(array $parameters = array())
*
* @return \Omnipay\Paysafecard\Message\FetchTransactionRequest
*/
public function fetchTransaction(array $parameters = array())
public function fetchTransaction(array $parameters = [])
{
return $this->createRequest('\Omnipay\Paysafecard\Message\FetchTransactionRequest', $parameters);
}
Expand Down
6 changes: 3 additions & 3 deletions src/Message/AbstractRequest.php
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,10 @@ public function getEndpoint()
public function sendData($data)
{
$endpoint = $this->getEndpoint();
$headers = array(
$headers = [
'Content-Type' => 'text/xml; charset=utf-8',
'SOAPAction' => $endpoint.'/'.$this->getMethod(),
);
'SOAPAction' => $endpoint.'/'.$this->getMethod(),
];

$httpResponse = $this->httpClient->post($endpoint, $headers, $data)->send();

Expand Down
20 changes: 10 additions & 10 deletions src/Message/CompletePurchaseRequest.php
Original file line number Diff line number Diff line change
Expand Up @@ -114,15 +114,15 @@ public function sendData($data)
{
$fetchTransaction = new FetchTransactionRequest($this->httpClient, $this->httpRequest);

$response = $fetchTransaction->initialize(array(
'testMode' => $this->getTestMode(),
'username' => $this->getUsername(),
'password' => $this->getPassword(),
'subId' => $this->getSubId(),
$response = $fetchTransaction->initialize([
'testMode' => $this->getTestMode(),
'username' => $this->getUsername(),
'password' => $this->getPassword(),
'subId' => $this->getSubId(),
'transactionId' => $this->getTransactionId(),
'currency' => $this->getCurrency(),
'amount' => $this->getAmount(),
))->send();
'currency' => $this->getCurrency(),
'amount' => $this->getAmount(),
])->send();

if ($response->getDispositionState() !== 'S') {
return $response;
Expand All @@ -136,9 +136,9 @@ public function sendData($data)
*
* @param \SimpleXMLElement $xml
*
* @return PurchaseResponse
*
* @throws InvalidResponseException
*
* @return PurchaseResponse
*/
protected function createResponse(\SimpleXMLElement $xml)
{
Expand Down
2 changes: 1 addition & 1 deletion src/Message/CompletePurchaseResponse.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

namespace Omnipay\Paysafecard\Message;

use Omnipay\Common\Message\RequestInterface;
use Omnipay\Common\Exception\InvalidResponseException;
use Omnipay\Common\Message\RequestInterface;

/**
* Paysafecard Complete Purchase Response.
Expand Down
4 changes: 2 additions & 2 deletions src/Message/FetchTransactionRequest.php
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,9 @@ public function getData()
*
* @param \SimpleXMLElement $xml
*
* @return PurchaseResponse
*
* @throws InvalidResponseException
*
* @return PurchaseResponse
*/
protected function createResponse(\SimpleXMLElement $xml)
{
Expand Down
8 changes: 3 additions & 5 deletions src/Message/FetchTransactionResponse.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

namespace Omnipay\Paysafecard\Message;

use Omnipay\Common\Message\RequestInterface;
use Omnipay\Common\Exception\InvalidResponseException;
use Omnipay\Common\Message\RequestInterface;

/**
* Paysafecard Fetch Transaction Response.
Expand All @@ -16,14 +16,14 @@
*/
class FetchTransactionResponse extends AbstractResponse
{
private $messages = array(
private $messages = [
'O' => 'Consumed',
'R' => 'Created',
'S' => 'Disposed',
'L' => 'Cancelled',
'X' => 'Expired',
'D' => 'Debited',
);
];

public function __construct(RequestInterface $request, \SimpleXMLElement $data)
{
Expand Down Expand Up @@ -60,8 +60,6 @@ public function getMessage()
if ($state && isset($this->messages[$state])) {
return $this->messages[$state];
}

return;
}

public function getTransactionId()
Expand Down
4 changes: 2 additions & 2 deletions src/Message/PayoutRequest.php
Original file line number Diff line number Diff line change
Expand Up @@ -324,9 +324,9 @@ public function getData()
*
* @param \SimpleXMLElement $xml
*
* @return PayoutResponse
*
* @throws InvalidResponseException
*
* @return PayoutResponse
*/
protected function createResponse(\SimpleXMLElement $xml)
{
Expand Down
2 changes: 1 addition & 1 deletion src/Message/PayoutResponse.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

namespace Omnipay\Paysafecard\Message;

use Omnipay\Common\Message\RequestInterface;
use Omnipay\Common\Exception\InvalidResponseException;
use Omnipay\Common\Message\RequestInterface;

/**
* Paysafecard Purchase Response.
Expand Down
14 changes: 7 additions & 7 deletions src/Message/PurchaseRequest.php
Original file line number Diff line number Diff line change
Expand Up @@ -498,12 +498,12 @@ public function getData()
protected function modifyUrl($url)
{
$url = Url::createFromUrl($url);
$url->getQuery()->modify(array(
'mtid' => $this->getTransactionId(),
'subid' => $this->getSubId(),
'amount' => $this->getAmount(),
$url->getQuery()->modify([
'mtid' => $this->getTransactionId(),
'subid' => $this->getSubId(),
'amount' => $this->getAmount(),
'currency' => $this->getCurrency(),
));
]);

return (string) $url;
}
Expand All @@ -513,9 +513,9 @@ protected function modifyUrl($url)
*
* @param \SimpleXMLElement $xml
*
* @return PurchaseResponse
*
* @throws InvalidResponseException
*
* @return PurchaseResponse
*/
protected function createResponse(\SimpleXMLElement $xml)
{
Expand Down
15 changes: 7 additions & 8 deletions src/Message/PurchaseResponse.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

namespace Omnipay\Paysafecard\Message;

use Omnipay\Common\Message\RequestInterface;
use Omnipay\Common\Message\RedirectResponseInterface;
use Omnipay\Common\Exception\InvalidResponseException;
use Omnipay\Common\Message\RedirectResponseInterface;
use Omnipay\Common\Message\RequestInterface;

/**
* Paysafecard Purchase Response.
Expand Down Expand Up @@ -47,12 +47,12 @@ public function isRedirect()
public function getRedirectUrl()
{
$url = $this->request->getTestMode() ? $this->testRedirect : $this->liveRedirect;
$data = array(
'amount' => $this->request->getAmount(),
$data = [
'amount' => $this->request->getAmount(),
'currency' => $this->request->getCurrency(),
'mid' => $this->getMid(),
'mtid' => $this->getTransactionId(),
);
'mid' => $this->getMid(),
'mtid' => $this->getTransactionId(),
];

if ($language = $this->request->getLanguage()) {
$data['language'] = $language;
Expand All @@ -72,7 +72,6 @@ public function getRedirectMethod()

public function getRedirectData()
{
return;
}

public function getSubId()
Expand Down
4 changes: 2 additions & 2 deletions src/Message/ValidatePayoutRequest.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ public function getValidationOnly()
*
* @param \SimpleXMLElement $xml
*
* @return ValidatePayoutResponse
*
* @throws InvalidResponseException
*
* @return ValidatePayoutResponse
*/
protected function createResponse(\SimpleXMLElement $xml)
{
Expand Down
Loading