From 2c187bb84a4c90485c526c2e529817f1d2741a66 Mon Sep 17 00:00:00 2001 From: Joe Pill Date: Mon, 8 Jan 2024 15:18:54 -0600 Subject: [PATCH 1/2] fix: change default timeout to 60s --- CHANGELOG.md | 6 ++++++ README.md | 2 +- src/ShipEngine.php | 2 +- tests/ShipEngineConfigTest.php | 26 +++++++++++++------------- tests/ShipEngineTest.php | 4 ++-- 5 files changed, 23 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cf726bb..8f38329 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,3 +7,9 @@ * bump version number ([2eb5d71](https://www.github.com/ShipEngine/shipengine-php/commit/2eb5d710f82ccefd2110a720394234e47e38040e)) * implement CD w/ release please ([5325e40](https://www.github.com/ShipEngine/shipengine-php/commit/5325e40f0bff35f8cda1fc5f67ce5f461345a905)) + +## 1.0.1 + +### Changes + +* increase default timeout from 15s to 60s \ No newline at end of file diff --git a/README.md b/README.md index 5673296..b9aebe2 100644 --- a/README.md +++ b/README.md @@ -83,7 +83,7 @@ $config = array( 'apiKey' => $apiKey, 'pageSize' => 75, 'retries' => 3, - 'timeout' => \DateInterval('PT15S') + 'timeout' => \DateInterval('PT60S') ); $shipengine = new ShipEngine($config); diff --git a/src/ShipEngine.php b/src/ShipEngine.php index 4a7803c..852bba2 100644 --- a/src/ShipEngine.php +++ b/src/ShipEngine.php @@ -18,7 +18,7 @@ final class ShipEngine /** * ShipEngine SDK Version */ - public const VERSION = '1.0.0'; + public const VERSION = '1.0.1'; // /** // * diff --git a/tests/ShipEngineConfigTest.php b/tests/ShipEngineConfigTest.php index 10d98a0..2db241f 100644 --- a/tests/ShipEngineConfigTest.php +++ b/tests/ShipEngineConfigTest.php @@ -44,7 +44,7 @@ public static function setUpBeforeClass(): void 'baseUrl' => self::$test_url, 'pageSize' => 75, 'retries' => 7, - 'timeout' => new DateInterval('PT15S'), + 'timeout' => new DateInterval('PT60S'), 'events' => null ) ); @@ -54,7 +54,7 @@ public static function setUpBeforeClass(): void 'baseUrl' => self::$test_url, 'pageSize' => 75, 'retries' => 7, - 'timeout' => new DateInterval('PT15S'), + 'timeout' => new DateInterval('PT60S'), ) ); // self::$goodAddress = new Address( @@ -81,7 +81,7 @@ public function testNoAPIKey(): void 'baseUrl' => self::$test_url, 'pageSize' => 75, 'retries' => 7, - 'timeout' => new DateInterval('PT15S'), + 'timeout' => new DateInterval('PT60S'), 'events' => null ) ); @@ -108,7 +108,7 @@ public function testEmptyAPIKey(): void 'baseUrl' => self::$test_url, 'pageSize' => 75, 'retries' => 7, - 'timeout' => new DateInterval('PT15S'), + 'timeout' => new DateInterval('PT60S'), 'events' => null ) ); @@ -135,7 +135,7 @@ public function testInvalidRetries(): void 'baseUrl' => self::$test_url, 'pageSize' => 75, 'retries' => -7, - 'timeout' => new DateInterval('PT15S'), + 'timeout' => new DateInterval('PT60S'), 'events' => null ) ); @@ -249,7 +249,7 @@ public function testMergeApiKey(): void 'baseUrl' => self::$test_url, 'pageSize' => 75, 'retries' => 7, - 'timeout' => new DateInterval('PT15S'), + 'timeout' => new DateInterval('PT60S'), 'events' => null ) ); @@ -266,7 +266,7 @@ public function testMergeBaseUrl(): void 'baseUrl' => self::$test_url, 'pageSize' => 75, 'retries' => 7, - 'timeout' => new DateInterval('PT15S'), + 'timeout' => new DateInterval('PT60S'), 'events' => null ) ); @@ -283,7 +283,7 @@ public function testMergePageSize(): void 'baseUrl' => self::$test_url, 'pageSize' => 75, 'retries' => 7, - 'timeout' => new DateInterval('PT15S'), + 'timeout' => new DateInterval('PT60S'), 'events' => null ) ); @@ -300,7 +300,7 @@ public function testMergeRetries(): void 'baseUrl' => self::$test_url, 'pageSize' => 75, 'retries' => 7, - 'timeout' => new DateInterval('PT15S'), + 'timeout' => new DateInterval('PT60S'), 'events' => null ) ); @@ -317,7 +317,7 @@ public function testMergeTimeout(): void 'baseUrl' => self::$test_url, 'pageSize' => 75, 'retries' => 7, - 'timeout' => new DateInterval('PT15S'), + 'timeout' => new DateInterval('PT60S'), 'events' => null ) ); @@ -346,7 +346,7 @@ public function testMergeTimeout(): void // 'baseUrl' => self::$test_url, // 'pageSize' => 75, // 'retries' => 0, - // 'timeout' => new DateInterval('PT15S'), + // 'timeout' => new DateInterval('PT60S'), // ) // ); // $shipengine->validateAddress($address429); @@ -380,7 +380,7 @@ public function testMergeTimeout(): void // 'apiKey' => 'baz', // 'baseUrl' => self::$test_url, // 'pageSize' => 75, - // 'timeout' => new DateInterval('PT15S'), + // 'timeout' => new DateInterval('PT60S'), // ) // ); // $shipengine->validateAddress($address429); @@ -418,7 +418,7 @@ public function testMergeTimeout(): void // 'baseUrl' => self::$test_url, // 'pageSize' => 75, // 'retries' => 3, - // 'timeout' => new DateInterval('PT15S'), + // 'timeout' => new DateInterval('PT60S'), // ) // ); // $shipengine->validateAddress($address429); diff --git a/tests/ShipEngineTest.php b/tests/ShipEngineTest.php index f4d5108..9e2d6d5 100644 --- a/tests/ShipEngineTest.php +++ b/tests/ShipEngineTest.php @@ -33,7 +33,7 @@ public static function setUpBeforeClass(): void 'baseUrl' => 'https://api.shipengine.com', 'pageSize' => 75, 'retries' => 7, - 'timeout' => new \DateInterval('PT15S'), + 'timeout' => new \DateInterval('PT60S'), ) ); } @@ -46,7 +46,7 @@ public function testInstantiation(): void 'baseUrl' => 'https://api.shipengine.com', 'pageSize' => 75, 'retries' => 7, - 'timeout' => new \DateInterval('PT15S'), + 'timeout' => new \DateInterval('PT60S'), ) ); $this->assertInstanceOf(ShipEngine::class, $shipengineInit); From 69f34fa26bf3962d28aa8ca351836b0e8c9cfb0d Mon Sep 17 00:00:00 2001 From: Joe Pill Date: Mon, 8 Jan 2024 15:24:57 -0600 Subject: [PATCH 2/2] bump version # --- version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.txt b/version.txt index 3eefcb9..7dea76e 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -1.0.0 +1.0.1