Bump to PHP 8.2 and Laravel 10 minimum

ziming · Mar 2, 2023 · df69c65 · df69c65
1 parent 8612f41
commit df69c65
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/composer.json b/composer.json
@@ -15,20 +15,20 @@
         }
     ],
     "require": {
-        "php": "^8.1",
+        "php": "^8.2",
         "ext-gmp": "*",
         "ext-json": "*",
         "ext-openssl": "*",
         "archtechx/enums": "^0.3.1",
         "guzzlehttp/guzzle": "^7.0",
-        "illuminate/contracts": "^9.0||^10.0",
+        "illuminate/contracts": "^10.0",
         "spatie/laravel-package-tools": "^1.4.3",
         "web-token/jwt-framework": "^3.0"
     },
     "require-dev": {
         "brianium/paratest": "^7.0",
         "nunomaduro/collision": "^6.0||^7.0",
-        "orchestra/testbench": "^7.0||^8.0",
+        "orchestra/testbench": "^8.0",
         "phpunit/phpunit": "^9.5.10||^10.0",
         "rector/rector": "^0.15",
         "spatie/laravel-ray": "^1.23",

diff --git a/src/LaravelMyinfoSg.php b/src/LaravelMyinfoSg.php
@@ -3,6 +3,7 @@
 namespace Ziming\LaravelMyinfoSg;
 
 use Exception;
+use GuzzleHttp\Exception\GuzzleException;
 use Psr\Http\Message\ResponseInterface;
 use Illuminate\Support\Carbon;
 use GuzzleHttp\Client;
@@ -57,8 +58,8 @@ public function generateAuthoriseApiUrl(string $state): string
     /**
      * Get MyInfo Person Data in an array with a 'data' key.
      *
-     * @throws Exception
-     * @return array<string, mixed>|array<string, mixed[]>
+     * @return array<string, mixed>|array<string, array>
+     * @throws GuzzleException|Exception
      */
     public function getMyinfoPersonData(string $code): array
     {
@@ -78,7 +79,7 @@ public function getMyinfoPersonData(string $code): array
     /**
      * Create Token Request.
      *
-     * @throws Exception
+     * @throws Exception|GuzzleException
      */
     private function createTokenRequest(string $code): ResponseInterface
     {
@@ -138,7 +139,7 @@ private function createTokenRequest(string $code): ResponseInterface
      * Call Person API.
      *
      * @throws Exception
-     * @return array<string, mixed>|array<string, mixed[]>
+     * @return array<string, mixed>|array<string, array>
      */
     private function callPersonAPI(string $accessToken): array
     {
@@ -197,7 +198,7 @@ private function callPersonAPI(string $accessToken): array
     /**
      * Create Person Request.
      *
-     * @throws Exception
+     * @throws Exception|GuzzleException
      */
     private function createPersonRequest(string $sub, string $validAccessToken): ResponseInterface
     {