Skip to content

Commit 87658ff

Browse files
authored
Merge pull request #1 from lokielse/master
update
2 parents edb3542 + b767f19 commit 87658ff

15 files changed

+49
-53
lines changed

CONTRIBUTING.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
# Contributing Guidelines
22

33
* Fork the project.
4+
* Switch to **develop** branch.
45
* Make your feature addition or bug fix.
56
* Add tests for it. This is important so I don't break it in a future version unintentionally.
67
* Commit just the modifications, do not mess with the composer.json or CHANGELOG.md files.
78
* Ensure your code is nicely formatted in the [PSR-2](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-2-coding-style-guide.md)
89
style and that all tests pass.
9-
* Send the pull request.
10+
* Send the pull request **develop** to **develop**.
1011
* Check that the Travis CI build passed. If not, rinse and repeat.

README.md

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
[![Software License][ico-license]](LICENSE)
88

99

10-
11-
1210
**Alipay driver for the Omnipay PHP payment processing library**
1311

1412
[Omnipay](https://github.com/omnipay/omnipay) is a framework agnostic, multi-gateway payment
@@ -20,14 +18,7 @@ processing library for PHP. This package implements Alipay support for Omnipay.
2018
2119
## Installation
2220

23-
Omnipay is installed via [Composer](http://getcomposer.org/). To install, simply add it
24-
to your `composer.json` file:
25-
26-
"lokielse/omnipay-alipay": "^2.0",
27-
28-
And run composer to update your dependencies:
29-
30-
$ composer update -vvv
21+
composer require lokielse/omnipay-alipay
3122

3223
## Basic Usage
3324

@@ -73,8 +64,10 @@ $response = $gateway->purchase()->setBizContent([
7364
$url = $response->getRedirectUrl();
7465
```
7566

76-
For general usage instructions, please see the main [Omnipay](https://github.com/omnipay/omnipay)
77-
repository.
67+
For general usage instructions, please see the
68+
69+
- [Omnipay Basic Documentation](https://github.com/thephpleague/omnipay)
70+
- [Omnipay Alipay Wiki](https://github.com/lokielse/omnipay-alipay/wiki)
7871

7972
## Related
8073

@@ -104,8 +97,6 @@ or better yet, fork the library and submit a pull request.
10497
[ico-code-quality]: https://img.shields.io/scrutinizer/g/lokielse/omnipay-alipay.svg
10598
[ico-downloads]: https://img.shields.io/packagist/dt/lokielse/omnipay-alipay.svg
10699

107-
108-
109100
[link-packagist]: https://packagist.org/packages/lokielse/omnipay-alipay
110101
[link-travis]: https://travis-ci.org/lokielse/omnipay-alipay
111102
[link-scrutinizer]: https://scrutinizer-ci.com/g/lokielse/omnipay-alipay/code-structure
@@ -115,8 +106,6 @@ or better yet, fork the library and submit a pull request.
115106
[link-author]: https://github.com/lokielse
116107
[link-contributors]: ../../contributors
117108

118-
119-
120109
[link-wiki-aop-page]: https://github.com/lokielse/omnipay-alipay/wiki/Aop-Page-Gateway
121110
[link-wiki-aop-app]: https://github.com/lokielse/omnipay-alipay/wiki/Aop-APP-Gateway
122111
[link-wiki-aop-f2f]: https://github.com/lokielse/omnipay-alipay/wiki/Aop-Face-To-Face-Gateway

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@
2929
]
3030
},
3131
"require": {
32-
"omnipay/common": "v3.0-beta.1",
32+
"omnipay/common": "^3.0",
3333
"php-http/guzzle6-adapter": "*"
3434
},
3535
"require-dev": {
36-
"omnipay/tests": "v3.0-beta.1",
36+
"omnipay/tests": "^3.0",
3737
"squizlabs/php_codesniffer": "3.*"
3838
}
3939
}

src/AbstractAopGateway.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ public function sandbox()
331331
/**
332332
* @param array $parameters
333333
*
334-
* @return AopCompletePurchaseRequest
334+
* @return \Omnipay\Alipay\Requests\AopCompletePurchaseRequest
335335
* @throws InvalidRequestException
336336
*/
337337
public function completePurchase(array $parameters = [])
@@ -345,7 +345,7 @@ public function completePurchase(array $parameters = [])
345345
*
346346
* @param array $parameters
347347
*
348-
* @return AopTradeQueryRequest
348+
* @return \Omnipay\Alipay\Requests\AopTradeQueryRequest
349349
*/
350350
public function query(array $parameters = [])
351351
{
@@ -358,7 +358,7 @@ public function query(array $parameters = [])
358358
*
359359
* @param array $parameters
360360
*
361-
* @return AopTradeRefundRequest
361+
* @return \Omnipay\Alipay\Requests\AopTradeRefundRequest
362362
*/
363363
public function refund(array $parameters = [])
364364
{
@@ -371,7 +371,7 @@ public function refund(array $parameters = [])
371371
*
372372
* @param array $parameters
373373
*
374-
* @return AopTradeRefundQueryRequest
374+
* @return \Omnipay\Alipay\Requests\AopTradeRefundQueryRequest
375375
*/
376376
public function refundQuery(array $parameters = [])
377377
{
@@ -384,7 +384,7 @@ public function refundQuery(array $parameters = [])
384384
*
385385
* @param array $parameters
386386
*
387-
* @return AopTradeCloseRequest
387+
* @return \Omnipay\Alipay\Requests\AopTradeCloseRequest
388388
*/
389389
public function close(array $parameters = [])
390390
{
@@ -397,7 +397,7 @@ public function close(array $parameters = [])
397397
*
398398
* @param array $parameters
399399
*
400-
* @return AopTradeCancelRequest
400+
* @return \Omnipay\Alipay\Requests\AopTradeCancelRequest
401401
*/
402402
public function cancel(array $parameters = [])
403403
{
@@ -410,7 +410,7 @@ public function cancel(array $parameters = [])
410410
*
411411
* @param array $parameters
412412
*
413-
* @return AopTransferToAccountRequest
413+
* @return \Omnipay\Alipay\Requests\AopTransferToAccountRequest
414414
*/
415415
public function transfer(array $parameters = [])
416416
{
@@ -423,7 +423,7 @@ public function transfer(array $parameters = [])
423423
*
424424
* @param array $parameters
425425
*
426-
* @return AopTransferToAccountQueryRequest
426+
* @return \Omnipay\Alipay\Requests\AopTransferToAccountQueryRequest
427427
*/
428428
public function transferQuery(array $parameters = [])
429429
{
@@ -436,7 +436,7 @@ public function transferQuery(array $parameters = [])
436436
*
437437
* @param array $parameters
438438
*
439-
* @return AopTradeCancelRequest
439+
* @return \Omnipay\Alipay\Requests\AopTradeCancelRequest
440440
*/
441441
public function settle(array $parameters = [])
442442
{

src/AbstractLegacyGateway.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ public function setAlipaySdk($value)
304304
/**
305305
* @param array $parameters
306306
*
307-
* @return LegacyCompletePurchaseRequest
307+
* @return \Omnipay\Alipay\Requests\LegacyCompletePurchaseRequest
308308
*/
309309
public function completePurchase(array $parameters = [])
310310
{
@@ -315,7 +315,7 @@ public function completePurchase(array $parameters = [])
315315
/**
316316
* @param array $parameters
317317
*
318-
* @return LegacyRefundRequest
318+
* @return \Omnipay\Alipay\Requests\LegacyRefundRequest
319319
*/
320320
public function refund(array $parameters = [])
321321
{
@@ -326,7 +326,7 @@ public function refund(array $parameters = [])
326326
/**
327327
* @param array $parameters
328328
*
329-
* @return LegacyRefundRequest
329+
* @return \Omnipay\Alipay\Requests\LegacyRefundRequest
330330
*/
331331
public function completeRefund(array $parameters = [])
332332
{
@@ -337,7 +337,7 @@ public function completeRefund(array $parameters = [])
337337
/**
338338
* @param array $parameters
339339
*
340-
* @return LegacyQueryRequest
340+
* @return \Omnipay\Alipay\Requests\LegacyQueryRequest
341341
*/
342342
public function query(array $parameters = [])
343343
{

src/AopAppGateway.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public function getName()
2626
/**
2727
* @param array $parameters
2828
*
29-
* @return AopTradeAppPayRequest
29+
* @return \Omnipay\Alipay\Requests\AopTradeAppPayRequest
3030
*/
3131
public function purchase(array $parameters = [])
3232
{

src/AopF2FGateway.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public function getName()
2727
/**
2828
* @param array $parameters
2929
*
30-
* @return AopTradePayRequest
30+
* @return \Omnipay\Alipay\Requests\AopTradePayRequest
3131
*/
3232
public function capture(array $parameters = [])
3333
{
@@ -38,7 +38,7 @@ public function capture(array $parameters = [])
3838
/**
3939
* @param array $parameters
4040
*
41-
* @return AopTradePreCreateRequest
41+
* @return \Omnipay\Alipay\Requests\AopTradePreCreateRequest
4242
*/
4343
public function purchase(array $parameters = [])
4444
{

src/LegacyWapGateway.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public function getName()
2626
/**
2727
* @param array $parameters
2828
*
29-
* @return LegacyWapPurchaseRequest
29+
* @return \Omnipay\Alipay\Requests\LegacyWapPurchaseRequest
3030
*/
3131
public function purchase(array $parameters = [])
3232
{

src/Requests/AopCompletePurchaseRequest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public function getParams()
4242
*
4343
* @param mixed $data The data to send
4444
*
45-
* @return AopCompletePurchaseResponse
45+
* @return \Omnipay\Alipay\Responses\AopCompletePurchaseResponse
4646
*/
4747
public function sendData($data)
4848
{

src/Requests/AopNotifyRequest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ public function setPartner($value)
181181
/**
182182
* @param boolean $value
183183
*
184-
* @return AopNotifyRequest
184+
* @return \Omnipay\Alipay\Requests\AopNotifyRequest
185185
*/
186186
public function setVerifyNotifyId($value)
187187
{
@@ -194,7 +194,7 @@ public function setVerifyNotifyId($value)
194194
/**
195195
* @param boolean $sort
196196
*
197-
* @return AopNotifyRequest
197+
* @return \Omnipay\Alipay\Requests\AopNotifyRequest
198198
*/
199199
public function setSort($sort)
200200
{
@@ -207,7 +207,7 @@ public function setSort($sort)
207207
/**
208208
* @param string $encodePolicy
209209
*
210-
* @return AopNotifyRequest
210+
* @return \Omnipay\Alipay\Requests\AopNotifyRequest
211211
*/
212212
public function setEncodePolicy($encodePolicy)
213213
{

0 commit comments

Comments
 (0)