Skip to content

Commit dafdbdd

Browse files
authored
Merge pull request #49 from mollie/v2-omnipay-mollie
V2 omnipay mollie
2 parents f3131c6 + 5058ad7 commit dafdbdd

File tree

71 files changed

+1773
-1074
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+1773
-1074
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
composer.lock
33
composer.phar
44
phpunit.xml
5+
/.idea

composer.json

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,23 @@
2929
"autoload": {
3030
"psr-4": { "Omnipay\\Mollie\\" : "src/" }
3131
},
32+
"autoload-dev": {
33+
"psr-4": { "Omnipay\\Mollie\\Test\\": "tests/" }
34+
},
3235
"require": {
33-
"omnipay/common": "^3"
36+
"omnipay/common": "3.0.2"
3437
},
3538
"require-dev": {
36-
"omnipay/tests": "^3",
39+
"omnipay/tests": "^3.1",
3740
"squizlabs/php_codesniffer": "^3",
38-
"phpro/grumphp": "^0.14"
41+
"phpro/grumphp": "^0.14",
42+
"phpmd/phpmd": "^2",
43+
"overtrue/phplint": "^1",
44+
"jakub-onderka/php-parallel-lint": "^1"
3945
},
4046
"extra": {
4147
"branch-alias": {
42-
"dev-master": "4.0.x-dev"
48+
"dev-master": "5.0.x-dev"
4349
}
4450
},
4551
"scripts": {

grumphp.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,11 @@ parameters:
1212
warning_severity: ~
1313
ignore_patterns:
1414
- tests/
15-
triggered_by: [php]
15+
triggered_by: [php]
16+
phpmd:
17+
exclude: []
18+
ruleset: ['cleancode', 'codesize', 'naming']
19+
triggered_by: ['php']
20+
phplint:
21+
exclude: []
22+
triggered_by: ['php', 'phtml', 'php3', 'php4', 'php5']

src/Gateway.php

Lines changed: 76 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,31 @@
33
namespace Omnipay\Mollie;
44

55
use Omnipay\Common\AbstractGateway;
6+
use Omnipay\Common\Message\RequestInterface;
7+
use Omnipay\Mollie\Message\Request\CompletePurchaseRequest;
8+
use Omnipay\Mollie\Message\Request\CreateCustomerRequest;
9+
use Omnipay\Mollie\Message\Request\FetchCustomerRequest;
10+
use Omnipay\Mollie\Message\Request\FetchIssuersRequest;
11+
use Omnipay\Mollie\Message\Request\FetchPaymentMethodsRequest;
12+
use Omnipay\Mollie\Message\Request\FetchTransactionRequest;
13+
use Omnipay\Mollie\Message\Request\PurchaseRequest;
14+
use Omnipay\Mollie\Message\Request\RefundRequest;
15+
use Omnipay\Mollie\Message\Request\UpdateCustomerRequest;
616

717
/**
8-
* Mollie (iDeal) Gateway
18+
* Mollie Gateway provides a wrapper for Mollie API.
19+
* Please have a look at links below to have a high-level overview and see the API specification
920
*
10-
* @link https://www.mollie.nl/files/documentatie/payments-api.html
21+
* @see https://www.mollie.com/en/developers
22+
* @see https://docs.mollie.com/index
23+
*
24+
* @method RequestInterface authorize(array $options = array())
25+
* @method RequestInterface completeAuthorize(array $options = array())
26+
* @method RequestInterface capture(array $options = array())
27+
* @method RequestInterface void(array $options = array())
28+
* @method RequestInterface createCard(array $options = array())
29+
* @method RequestInterface updateCard(array $options = array())
30+
* @method RequestInterface deleteCard(array $options = array())
1131
*/
1232
class Gateway extends AbstractGateway
1333
{
@@ -48,82 +68,109 @@ public function setApiKey($value)
4868

4969
/**
5070
* @param array $parameters
51-
* @return \Omnipay\Mollie\Message\FetchIssuersRequest
71+
* @return FetchIssuersRequest
5272
*/
53-
public function fetchIssuers(array $parameters = array())
73+
public function fetchIssuers(array $parameters = [])
5474
{
55-
return $this->createRequest('\Omnipay\Mollie\Message\FetchIssuersRequest', $parameters);
75+
/** @var FetchIssuersRequest $request */
76+
$request = $this->createRequest(FetchIssuersRequest::class, $parameters);
77+
78+
return $request;
5679
}
5780

5881
/**
5982
* @param array $parameters
60-
* @return \Omnipay\Mollie\Message\FetchPaymentMethodsRequest
83+
* @return FetchPaymentMethodsRequest
6184
*/
62-
public function fetchPaymentMethods(array $parameters = array())
85+
public function fetchPaymentMethods(array $parameters = [])
6386
{
64-
return $this->createRequest('\Omnipay\Mollie\Message\FetchPaymentMethodsRequest', $parameters);
87+
/** @var FetchPaymentMethodsRequest $request */
88+
$request = $this->createRequest(FetchPaymentMethodsRequest::class, $parameters);
89+
90+
return $request;
6591
}
6692

6793
/**
6894
* @param array $parameters
69-
* @return \Omnipay\Mollie\Message\FetchTransactionRequest
95+
* @return FetchTransactionRequest
7096
*/
71-
public function fetchTransaction(array $parameters = array())
97+
public function fetchTransaction(array $parameters = [])
7298
{
73-
return $this->createRequest('\Omnipay\Mollie\Message\FetchTransactionRequest', $parameters);
99+
/** @var FetchTransactionRequest $request */
100+
$request = $this->createRequest(FetchTransactionRequest::class, $parameters);
101+
102+
return $request;
74103
}
75104

76105
/**
77106
* @param array $parameters
78-
* @return \Omnipay\Mollie\Message\PurchaseRequest
107+
* @return PurchaseRequest
79108
*/
80-
public function purchase(array $parameters = array())
109+
public function purchase(array $parameters = [])
81110
{
82-
return $this->createRequest('\Omnipay\Mollie\Message\PurchaseRequest', $parameters);
111+
/** @var PurchaseRequest $request */
112+
$request = $this->createRequest(PurchaseRequest::class, $parameters);
113+
114+
return $request;
83115
}
84116

85117
/**
86118
* @param array $parameters
87-
* @return \Omnipay\Mollie\Message\CompletePurchaseRequest
119+
* @return CompletePurchaseRequest
88120
*/
89-
public function completePurchase(array $parameters = array())
121+
public function completePurchase(array $parameters = [])
90122
{
91-
return $this->createRequest('\Omnipay\Mollie\Message\CompletePurchaseRequest', $parameters);
123+
/** @var CompletePurchaseRequest $request */
124+
$request = $this->createRequest(CompletePurchaseRequest::class, $parameters);
125+
126+
return $request;
92127
}
93128

94129
/**
95130
* @param array $parameters
96-
* @return \Omnipay\Mollie\Message\RefundRequest
131+
* @return RefundRequest
97132
*/
98-
public function refund(array $parameters = array())
133+
public function refund(array $parameters = [])
99134
{
100-
return $this->createRequest('\Omnipay\Mollie\Message\RefundRequest', $parameters);
135+
/** @var RefundRequest $request */
136+
$request = $this->createRequest(RefundRequest::class, $parameters);
137+
138+
return $request;
101139
}
102140

103141
/**
104142
* @param array $parameters
105-
* @return \Omnipay\Mollie\Message\CreateCustomerRequest
143+
* @return CreateCustomerRequest
106144
*/
107-
public function createCustomer(array $parameters = array())
145+
public function createCustomer(array $parameters = [])
108146
{
109-
return $this->createRequest('\Omnipay\Mollie\Message\CreateCustomerRequest', $parameters);
147+
/** @var CreateCustomerRequest $request */
148+
$request = $this->createRequest(CreateCustomerRequest::class, $parameters);
149+
150+
return $request;
110151
}
111152

112153
/**
113154
* @param array $parameters
114-
* @return \Omnipay\Mollie\Message\UpdateCustomerRequest
155+
* @return UpdateCustomerRequest
115156
*/
116-
public function updateCustomer(array $parameters = array())
157+
public function updateCustomer(array $parameters = [])
117158
{
118-
return $this->createRequest('\Omnipay\Mollie\Message\UpdateCustomerRequest', $parameters);
159+
/** @var UpdateCustomerRequest $request */
160+
$request = $this->createRequest(UpdateCustomerRequest::class, $parameters);
161+
162+
return $request;
119163
}
120164

121165
/**
122166
* @param array $parameters
123-
* @return \Omnipay\Mollie\Message\FetchCustomerRequest
167+
* @return FetchCustomerRequest
124168
*/
125-
public function fetchCustomer(array $parameters = array())
169+
public function fetchCustomer(array $parameters = [])
126170
{
127-
return $this->createRequest('\Omnipay\Mollie\Message\FetchCustomerRequest', $parameters);
171+
/** @var FetchCustomerRequest $request */
172+
$request = $this->createRequest(FetchCustomerRequest::class, $parameters);
173+
174+
return $request;
128175
}
129176
}

src/Message/AbstractRequest.php

Lines changed: 0 additions & 42 deletions
This file was deleted.

src/Message/AbstractResponse.php

Lines changed: 0 additions & 18 deletions
This file was deleted.

src/Message/CreateCustomerResponse.php

Lines changed: 0 additions & 16 deletions
This file was deleted.

src/Message/FetchCustomerResponse.php

Lines changed: 0 additions & 16 deletions
This file was deleted.

src/Message/FetchIssuersRequest.php

Lines changed: 0 additions & 26 deletions
This file was deleted.

src/Message/FetchIssuersResponse.php

Lines changed: 0 additions & 26 deletions
This file was deleted.

0 commit comments

Comments
 (0)