Skip to content

Commit 5814a24

Browse files
committed
Compatible with lower versions
1 parent 0478bae commit 5814a24

File tree

80 files changed

+384
-352
lines changed

Some content is hidden

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

80 files changed

+384
-352
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Changelog
22

3+
## 1.3.6 - 2024-11-20
4+
* [#18](https://github.com/alipay/global-open-sdk-php/pull/18) feature-update-version
5+
- Compatible with lower versions
6+
37
## 1.3.5 - 2024-11-04
48
* [#17](https://github.com/alipay/global-open-sdk-php/pull/17) feature-notify
59
- add notify

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
```
22
Language:PHP
3-
PHP version:5.4.7+
4-
Releass ^1.3.5
3+
PHP version:5.6.40+
4+
Releass ^1.3.6
55
Copyright:Ant financial services group
66
```
77

client/BaseAlipayClient.php

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ abstract class BaseAlipayClient
1010
private $gatewayUrl;
1111
private $merchantPrivateKey;
1212
private $alipayPublicKey;
13-
1413
private $clientId;
14+
private $isSandboxMode;
1515

1616
function __construct()
1717
{
@@ -35,6 +35,11 @@ function __construct4($gatewayUrl, $merchantPrivateKey, $alipayPublicKey, $clien
3535
$this->merchantPrivateKey = $merchantPrivateKey;
3636
$this->alipayPublicKey = $alipayPublicKey;
3737
$this->clientId = $clientId;
38+
39+
if (strpos($clientId, "SANDBOX_") === 0) {
40+
$this->isSandboxMode = true;
41+
}
42+
3843
}
3944

4045
public function execute($request)
@@ -47,10 +52,14 @@ public function execute($request)
4752
$this->checkRequestParam($request);
4853

4954
$clientId = $request->getClientId();
55+
if (strpos($clientId, "SANDBOX_") === 0) {
56+
$this->isSandboxMode = true;
57+
}
58+
$this->adjustSandboxUrl($request);
5059
$httpMethod = $request->getHttpMethod();
5160
$path = $request->getPath();
5261
$keyVersion = $request->getKeyVersion();
53-
$reqTime = date(DATE_ISO8601);
62+
$reqTime =date(DATE_ISO8601);
5463
$reqBody = json_encode($request);
5564

5665
$signValue = $this->genSignValue($httpMethod, $path, $clientId, $reqTime, $reqBody);
@@ -182,9 +191,17 @@ private function genRequestUrl($path)
182191

183192
}
184193

194+
private function adjustSandboxUrl($alipayRequest) {
195+
if ($this->isSandboxMode) {
196+
$originPath = $alipayRequest->getPath();
197+
$newPath = preg_replace('/\/ams\/api/', '/ams/sandbox/api', $originPath, 1);
198+
$alipayRequest->setPath($newPath);
199+
}
200+
}
185201

186202
abstract protected function buildCustomHeader();
187203

188204
abstract protected function sendRequest($requestUrl, $httpMethod, $headers, $reqBody);
189205

206+
190207
}

client/SignatureTool.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,7 @@ static private function verifySignatureWithSHA256RSA($rspContent, $rspSignValue,
4747
} else {
4848
$originalRspSignValue = base64_decode(urldecode($rspSignValue));
4949
}
50-
$verifyResult = openssl_verify($rspContent, $originalRspSignValue, $pubKey, OPENSSL_ALGO_SHA256);
51-
return $verifyResult;
50+
return openssl_verify($rspContent, $originalRspSignValue, $pubKey, OPENSSL_ALGO_SHA256);
5251
}
5352

5453
}

example/AuthTest.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
use Model\GrantType;
99
use Request\auth\AlipayAuthApplyTokenRequest;
1010
use Request\auth\AlipayAuthConsultRequest;
11+
use Request\auth\AlipayAuthRevokeTokenRequest;
1112

1213

1314
const clientId = "";
@@ -63,7 +64,7 @@ function queryToken($accessToken)
6364

6465
function revoke_token($accessToken)
6566
{
66-
$request = new \Request\auth\AlipayAuthRevokeTokenRequest();
67+
$request = new AlipayAuthRevokeTokenRequest();
6768
$request->setAccessToken($accessToken);
6869

6970
$alipayClient = new DefaultAlipayClient(gatewayUrl, merchantPrivateKey, alipayPublicKey, clientId);
@@ -73,6 +74,6 @@ function revoke_token($accessToken)
7374
}
7475

7576

76-
//authConsult();
77+
authConsult();
7778
//applyToken("281001133029700579331362");
78-
revoke_token("28288803001247281723530452000N6krsDm8J8171000589");
79+
//revoke_token("28288803001247281723530452000N6krsDm8J8171000589");

example/PayTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,10 +214,10 @@ function consult()
214214
print(json_encode($alipayResponse));
215215
}
216216

217-
//pay();
217+
pay();
218218
//cancel("PR_1724811957224");
219219
//queryPay("PR_172352027421");
220220
//refund("202408131940108001001881A0212894597");
221221
//queryRefund("refund_1723527767056");
222-
consult();
222+
//consult();
223223
//createSession();

init.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,16 @@
7474
require __DIR__ . '/request/vaulting/AlipayVaultingSessionRequest.php';
7575

7676
//notify
77-
require __DIR__ . '/request/notify/AlipayCaptureResultNotify.php';
7877
require __DIR__ . '/request/notify/AlipayNotify.php';
78+
require __DIR__ . '/request/notify/AlipayAuthNotify.php';
79+
require __DIR__ . '/request/notify/AlipayCaptureResultNotify.php';
80+
require __DIR__ . '/request/notify/AlipayDisputeNotify.php';
7981
require __DIR__ . '/request/notify/AlipayPayResultNotify.php';
8082
require __DIR__ . '/request/notify/AlipayRefundNotify.php';
83+
require __DIR__ . '/request/notify/AlipaySubscriptionNotify.php';
84+
require __DIR__ . '/request/notify/AlipaySubscriptionPayNotify.php';
85+
require __DIR__ . '/request/notify/AlipayVaultingNotify.php';
86+
8187

8288

8389

model/AcquirerInfo.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public function getAcquirerName()
2828
/**
2929
* @param mixed $acquirerName
3030
*/
31-
public function setAcquirerName($acquirerName): void
31+
public function setAcquirerName($acquirerName)
3232
{
3333
$this->acquirerName = $acquirerName;
3434
}
@@ -44,7 +44,7 @@ public function getReferenceRequestId()
4444
/**
4545
* @param mixed $referenceRequestId
4646
*/
47-
public function setReferenceRequestId($referenceRequestId): void
47+
public function setReferenceRequestId($referenceRequestId)
4848
{
4949
$this->referenceRequestId = $referenceRequestId;
5050
}
@@ -60,7 +60,7 @@ public function getAcquirerTransactionId()
6060
/**
6161
* @param mixed $acquirerTransactionId
6262
*/
63-
public function setAcquirerTransactionId($acquirerTransactionId): void
63+
public function setAcquirerTransactionId($acquirerTransactionId)
6464
{
6565
$this->acquirerTransactionId = $acquirerTransactionId;
6666
}
@@ -76,7 +76,7 @@ public function getAcquirerMerchantId()
7676
/**
7777
* @param mixed $acquirerMerchantId
7878
*/
79-
public function setAcquirerMerchantId($acquirerMerchantId): void
79+
public function setAcquirerMerchantId($acquirerMerchantId)
8080
{
8181
$this->acquirerMerchantId = $acquirerMerchantId;
8282
}
@@ -92,7 +92,7 @@ public function getAcquirerResultCode()
9292
/**
9393
* @param mixed $acquirerResultCode
9494
*/
95-
public function setAcquirerResultCode($acquirerResultCode): void
95+
public function setAcquirerResultCode($acquirerResultCode)
9696
{
9797
$this->acquirerResultCode = $acquirerResultCode;
9898
}
@@ -108,7 +108,7 @@ public function getAcquirerResultMessage()
108108
/**
109109
* @param mixed $acquirerResultMessage
110110
*/
111-
public function setAcquirerResultMessage($acquirerResultMessage): void
111+
public function setAcquirerResultMessage($acquirerResultMessage)
112112
{
113113
$this->acquirerResultMessage = $acquirerResultMessage;
114114
}

model/Attachment.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public function getFileKey()
7070
/**
7171
* @param mixed $fileKey
7272
*/
73-
public function setFileKey($fileKey): void
73+
public function setFileKey($fileKey)
7474
{
7575
$this->fileKey = $fileKey;
7676
}

model/AuthMetaData.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public function getAccountHolderName()
1818
/**
1919
* @param mixed $accountHolderName
2020
*/
21-
public function setAccountHolderName($accountHolderName): void
21+
public function setAccountHolderName($accountHolderName)
2222
{
2323
$this->accountHolderName = $accountHolderName;
2424
}
@@ -34,7 +34,7 @@ public function getAccountHolderCertNo()
3434
/**
3535
* @param mixed $accountHolderCertNo
3636
*/
37-
public function setAccountHolderCertNo($accountHolderCertNo): void
37+
public function setAccountHolderCertNo($accountHolderCertNo)
3838
{
3939
$this->accountHolderCertNo = $accountHolderCertNo;
4040
}

0 commit comments

Comments
 (0)