Skip to content

Commit 561c64c

Browse files
author
Watson Zuo
committed
upgrade phpseclib
1 parent 611361e commit 561c64c

File tree

5 files changed

+53
-53
lines changed

5 files changed

+53
-53
lines changed

‎composer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"require": {
2626
"php": ">=8.0.0",
2727
"guzzlehttp/guzzle": "7.*",
28-
"phpseclib/phpseclib": "3.0.37",
28+
"phpseclib/phpseclib": "^3.0.17",
2929
"symfony/serializer": "^5.4 || ^6.4 || ^7.0",
3030
"symfony/property-access": "^5.4 || ^6.4 || ^7.0",
3131
"symfony/property-info": "^5.4 || ^6.4 || ^7.0",
@@ -56,4 +56,4 @@
5656
"test": "XDEBUG_MODE=coverage ./vendor/bin/phpunit --color --testsuite default",
5757
"test_rest_resources": "./run_rest_resource_tests.sh"
5858
}
59-
}
59+
}

‎src/API/Courier.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,28 +22,28 @@ public function __construct(Http $httpClient)
2222
/**
2323
* @throws AfterShipError
2424
*/
25-
public function getUserCouriers(
25+
public function getAllCouriers(
2626
array $headers = []
27-
): \Tracking\API\Courier\GetUserCouriersResponse {
27+
): \Tracking\API\Courier\GetAllCouriersResponse {
2828
$options = [
2929
'headers' => $headers,
3030
];
31-
$resp = $this->httpClient->request('GET', sprintf("/tracking/2025-01/couriers"), $options);
31+
$resp = $this->httpClient->request('GET', sprintf("/tracking/2025-01/couriers/all"), $options);
3232

33-
return $this->parseSingleResource($resp, \Tracking\API\Courier\GetUserCouriersResponse::class);
33+
return $this->parseSingleResource($resp, \Tracking\API\Courier\GetAllCouriersResponse::class);
3434
}
3535
/**
3636
* @throws AfterShipError
3737
*/
38-
public function getAllCouriers(
38+
public function getUserCouriers(
3939
array $headers = []
40-
): \Tracking\API\Courier\GetAllCouriersResponse {
40+
): \Tracking\API\Courier\GetUserCouriersResponse {
4141
$options = [
4242
'headers' => $headers,
4343
];
44-
$resp = $this->httpClient->request('GET', sprintf("/tracking/2025-01/couriers/all"), $options);
44+
$resp = $this->httpClient->request('GET', sprintf("/tracking/2025-01/couriers"), $options);
4545

46-
return $this->parseSingleResource($resp, \Tracking\API\Courier\GetAllCouriersResponse::class);
46+
return $this->parseSingleResource($resp, \Tracking\API\Courier\GetUserCouriersResponse::class);
4747
}
4848
/**
4949
* @throws AfterShipError

‎src/API/Tracking.php‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
use Tracking\Exception\AfterShipError;
1010
use Tracking\Exception\ErrorCode;
1111
use Tracking\Transport\Http;
12-
use Tracking\API\Tracking\GetTrackingsQuery;
1312
use Tracking\API\Tracking\GetTrackingByIdQuery;
13+
use Tracking\API\Tracking\GetTrackingsQuery;
1414

1515
class Tracking extends APIBase
1616
{
@@ -21,22 +21,6 @@ public function __construct(Http $httpClient)
2121
$this->httpClient = $httpClient;
2222
}
2323

24-
/**
25-
* @throws AfterShipError
26-
*/
27-
public function createTracking(
28-
\Tracking\API\Tracking\CreateTrackingRequest $body,
29-
array $headers = []
30-
): \Tracking\API\Tracking\CreateTrackingResponse {
31-
$options = [
32-
'headers' => $headers,
33-
34-
'json' => $body->toRequestArray(),
35-
];
36-
$resp = $this->httpClient->request('POST', sprintf("/tracking/2025-01/trackings"), $options);
37-
38-
return $this->parseSingleResource($resp, \Tracking\API\Tracking\CreateTrackingResponse::class);
39-
}
4024
/**
4125
* @throws AfterShipError
4226
*/
@@ -61,17 +45,20 @@ public function updateTrackingById(
6145
/**
6246
* @throws AfterShipError
6347
*/
64-
public function getTrackings(
65-
GetTrackingsQuery $query = null,
48+
public function retrackTrackingById(
49+
string $id,
6650
array $headers = []
67-
): \Tracking\API\Tracking\GetTrackingsResponse {
51+
): \Tracking\API\Tracking\RetrackTrackingByIdResponse {
52+
if ($id === "") {
53+
throw ErrorCode::genLocalError(ErrorCode::INVALID_REQUEST, "Param 'id' cannot be an empty string");
54+
}
55+
6856
$options = [
6957
'headers' => $headers,
70-
'query' => $query ? $query->toArray() : [],
7158
];
72-
$resp = $this->httpClient->request('GET', sprintf("/tracking/2025-01/trackings"), $options);
59+
$resp = $this->httpClient->request('POST', sprintf("/tracking/2025-01/trackings/%s/retrack", $id), $options);
7360

74-
return $this->parseSingleResource($resp, \Tracking\API\Tracking\GetTrackingsResponse::class);
61+
return $this->parseSingleResource($resp, \Tracking\API\Tracking\RetrackTrackingByIdResponse::class);
7562
}
7663
/**
7764
* @throws AfterShipError
@@ -114,40 +101,53 @@ public function deleteTrackingById(
114101
/**
115102
* @throws AfterShipError
116103
*/
117-
public function retrackTrackingById(
104+
public function markTrackingCompletedById(
118105
string $id,
106+
\Tracking\API\Tracking\MarkTrackingCompletedByIdRequest $body,
119107
array $headers = []
120-
): \Tracking\API\Tracking\RetrackTrackingByIdResponse {
108+
): \Tracking\API\Tracking\MarkTrackingCompletedByIdResponse {
121109
if ($id === "") {
122110
throw ErrorCode::genLocalError(ErrorCode::INVALID_REQUEST, "Param 'id' cannot be an empty string");
123111
}
124112

125113
$options = [
126114
'headers' => $headers,
115+
116+
'json' => $body->toRequestArray(),
127117
];
128-
$resp = $this->httpClient->request('POST', sprintf("/tracking/2025-01/trackings/%s/retrack", $id), $options);
118+
$resp = $this->httpClient->request('POST', sprintf("/tracking/2025-01/trackings/%s/mark-as-completed", $id), $options);
129119

130-
return $this->parseSingleResource($resp, \Tracking\API\Tracking\RetrackTrackingByIdResponse::class);
120+
return $this->parseSingleResource($resp, \Tracking\API\Tracking\MarkTrackingCompletedByIdResponse::class);
131121
}
132122
/**
133123
* @throws AfterShipError
134124
*/
135-
public function markTrackingCompletedById(
136-
string $id,
137-
\Tracking\API\Tracking\MarkTrackingCompletedByIdRequest $body,
125+
public function getTrackings(
126+
GetTrackingsQuery $query = null,
138127
array $headers = []
139-
): \Tracking\API\Tracking\MarkTrackingCompletedByIdResponse {
140-
if ($id === "") {
141-
throw ErrorCode::genLocalError(ErrorCode::INVALID_REQUEST, "Param 'id' cannot be an empty string");
142-
}
128+
): \Tracking\API\Tracking\GetTrackingsResponse {
129+
$options = [
130+
'headers' => $headers,
131+
'query' => $query ? $query->toArray() : [],
132+
];
133+
$resp = $this->httpClient->request('GET', sprintf("/tracking/2025-01/trackings"), $options);
143134

135+
return $this->parseSingleResource($resp, \Tracking\API\Tracking\GetTrackingsResponse::class);
136+
}
137+
/**
138+
* @throws AfterShipError
139+
*/
140+
public function createTracking(
141+
\Tracking\API\Tracking\CreateTrackingRequest $body,
142+
array $headers = []
143+
): \Tracking\API\Tracking\CreateTrackingResponse {
144144
$options = [
145145
'headers' => $headers,
146146

147147
'json' => $body->toRequestArray(),
148148
];
149-
$resp = $this->httpClient->request('POST', sprintf("/tracking/2025-01/trackings/%s/mark-as-completed", $id), $options);
149+
$resp = $this->httpClient->request('POST', sprintf("/tracking/2025-01/trackings"), $options);
150150

151-
return $this->parseSingleResource($resp, \Tracking\API\Tracking\MarkTrackingCompletedByIdResponse::class);
151+
return $this->parseSingleResource($resp, \Tracking\API\Tracking\CreateTrackingResponse::class);
152152
}
153153
}

‎src/Client.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
*/
66
namespace Tracking;
77

8-
use Tracking\API\Tracking;
98
use Tracking\API\Courier;
109
use Tracking\API\EstimatedDeliveryDate;
10+
use Tracking\API\Tracking;
1111
use Tracking\Exception\AfterShipError;
1212

1313
class Client
@@ -16,10 +16,6 @@ class Client
1616

1717
private static $instance = null;
1818

19-
/**
20-
* @var Tracking
21-
*/
22-
public $tracking;
2319
/**
2420
* @var Courier
2521
*/
@@ -28,6 +24,10 @@ class Client
2824
* @var EstimatedDeliveryDate
2925
*/
3026
public $estimated_delivery_date;
27+
/**
28+
* @var Tracking
29+
*/
30+
public $tracking;
3131
/**
3232
* @throws AfterShipError
3333
*/
@@ -36,9 +36,9 @@ public function __construct(array $conf = [])
3636
$config = new Config($conf);
3737
$this->config = $config;
3838

39-
$this->tracking = new Tracking(new Transport\Http($config));
4039
$this->courier = new Courier(new Transport\Http($config));
4140
$this->estimated_delivery_date = new EstimatedDeliveryDate(new Transport\Http($config));
41+
$this->tracking = new Tracking(new Transport\Http($config));
4242
}
4343

4444
/**

‎src/Transport/Http.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class Http
2121
private $config;
2222
const CONTENT_TYPE = 'application/json';
2323

24-
const SDK_VERSION = '10.2.0';
24+
const SDK_VERSION = '10.2.1';
2525

2626
public function __construct(Config $config)
2727
{

0 commit comments

Comments
 (0)