Skip to content

Commit c03e564

Browse files
authored
Merge pull request #37 from ShipEngine/jpill/increase-timeout-to-60s
change default timeout to 60s
2 parents a27fe31 + 69f34fa commit c03e564

File tree

6 files changed

+24
-18
lines changed

6 files changed

+24
-18
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,9 @@
77

88
* bump version number ([2eb5d71](https://www.github.com/ShipEngine/shipengine-php/commit/2eb5d710f82ccefd2110a720394234e47e38040e))
99
* implement CD w/ release please ([5325e40](https://www.github.com/ShipEngine/shipengine-php/commit/5325e40f0bff35f8cda1fc5f67ce5f461345a905))
10+
11+
## 1.0.1
12+
13+
### Changes
14+
15+
* increase default timeout from 15s to 60s

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ $config = array(
8383
'apiKey' => $apiKey,
8484
'pageSize' => 75,
8585
'retries' => 3,
86-
'timeout' => \DateInterval('PT15S')
86+
'timeout' => \DateInterval('PT60S')
8787
);
8888

8989
$shipengine = new ShipEngine($config);

src/ShipEngine.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ final class ShipEngine
1818
/**
1919
* ShipEngine SDK Version
2020
*/
21-
public const VERSION = '1.0.0';
21+
public const VERSION = '1.0.1';
2222

2323
// /**
2424
// *

tests/ShipEngineConfigTest.php

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public static function setUpBeforeClass(): void
4444
'baseUrl' => self::$test_url,
4545
'pageSize' => 75,
4646
'retries' => 7,
47-
'timeout' => new DateInterval('PT15S'),
47+
'timeout' => new DateInterval('PT60S'),
4848
'events' => null
4949
)
5050
);
@@ -54,7 +54,7 @@ public static function setUpBeforeClass(): void
5454
'baseUrl' => self::$test_url,
5555
'pageSize' => 75,
5656
'retries' => 7,
57-
'timeout' => new DateInterval('PT15S'),
57+
'timeout' => new DateInterval('PT60S'),
5858
)
5959
);
6060
// self::$goodAddress = new Address(
@@ -81,7 +81,7 @@ public function testNoAPIKey(): void
8181
'baseUrl' => self::$test_url,
8282
'pageSize' => 75,
8383
'retries' => 7,
84-
'timeout' => new DateInterval('PT15S'),
84+
'timeout' => new DateInterval('PT60S'),
8585
'events' => null
8686
)
8787
);
@@ -108,7 +108,7 @@ public function testEmptyAPIKey(): void
108108
'baseUrl' => self::$test_url,
109109
'pageSize' => 75,
110110
'retries' => 7,
111-
'timeout' => new DateInterval('PT15S'),
111+
'timeout' => new DateInterval('PT60S'),
112112
'events' => null
113113
)
114114
);
@@ -135,7 +135,7 @@ public function testInvalidRetries(): void
135135
'baseUrl' => self::$test_url,
136136
'pageSize' => 75,
137137
'retries' => -7,
138-
'timeout' => new DateInterval('PT15S'),
138+
'timeout' => new DateInterval('PT60S'),
139139
'events' => null
140140
)
141141
);
@@ -249,7 +249,7 @@ public function testMergeApiKey(): void
249249
'baseUrl' => self::$test_url,
250250
'pageSize' => 75,
251251
'retries' => 7,
252-
'timeout' => new DateInterval('PT15S'),
252+
'timeout' => new DateInterval('PT60S'),
253253
'events' => null
254254
)
255255
);
@@ -266,7 +266,7 @@ public function testMergeBaseUrl(): void
266266
'baseUrl' => self::$test_url,
267267
'pageSize' => 75,
268268
'retries' => 7,
269-
'timeout' => new DateInterval('PT15S'),
269+
'timeout' => new DateInterval('PT60S'),
270270
'events' => null
271271
)
272272
);
@@ -283,7 +283,7 @@ public function testMergePageSize(): void
283283
'baseUrl' => self::$test_url,
284284
'pageSize' => 75,
285285
'retries' => 7,
286-
'timeout' => new DateInterval('PT15S'),
286+
'timeout' => new DateInterval('PT60S'),
287287
'events' => null
288288
)
289289
);
@@ -300,7 +300,7 @@ public function testMergeRetries(): void
300300
'baseUrl' => self::$test_url,
301301
'pageSize' => 75,
302302
'retries' => 7,
303-
'timeout' => new DateInterval('PT15S'),
303+
'timeout' => new DateInterval('PT60S'),
304304
'events' => null
305305
)
306306
);
@@ -317,7 +317,7 @@ public function testMergeTimeout(): void
317317
'baseUrl' => self::$test_url,
318318
'pageSize' => 75,
319319
'retries' => 7,
320-
'timeout' => new DateInterval('PT15S'),
320+
'timeout' => new DateInterval('PT60S'),
321321
'events' => null
322322
)
323323
);
@@ -346,7 +346,7 @@ public function testMergeTimeout(): void
346346
// 'baseUrl' => self::$test_url,
347347
// 'pageSize' => 75,
348348
// 'retries' => 0,
349-
// 'timeout' => new DateInterval('PT15S'),
349+
// 'timeout' => new DateInterval('PT60S'),
350350
// )
351351
// );
352352
// $shipengine->validateAddress($address429);
@@ -380,7 +380,7 @@ public function testMergeTimeout(): void
380380
// 'apiKey' => 'baz',
381381
// 'baseUrl' => self::$test_url,
382382
// 'pageSize' => 75,
383-
// 'timeout' => new DateInterval('PT15S'),
383+
// 'timeout' => new DateInterval('PT60S'),
384384
// )
385385
// );
386386
// $shipengine->validateAddress($address429);
@@ -418,7 +418,7 @@ public function testMergeTimeout(): void
418418
// 'baseUrl' => self::$test_url,
419419
// 'pageSize' => 75,
420420
// 'retries' => 3,
421-
// 'timeout' => new DateInterval('PT15S'),
421+
// 'timeout' => new DateInterval('PT60S'),
422422
// )
423423
// );
424424
// $shipengine->validateAddress($address429);

tests/ShipEngineTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public static function setUpBeforeClass(): void
3333
'baseUrl' => 'https://api.shipengine.com',
3434
'pageSize' => 75,
3535
'retries' => 7,
36-
'timeout' => new \DateInterval('PT15S'),
36+
'timeout' => new \DateInterval('PT60S'),
3737
)
3838
);
3939
}
@@ -46,7 +46,7 @@ public function testInstantiation(): void
4646
'baseUrl' => 'https://api.shipengine.com',
4747
'pageSize' => 75,
4848
'retries' => 7,
49-
'timeout' => new \DateInterval('PT15S'),
49+
'timeout' => new \DateInterval('PT60S'),
5050
)
5151
);
5252
$this->assertInstanceOf(ShipEngine::class, $shipengineInit);

version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.0.0
1+
1.0.1

0 commit comments

Comments
 (0)