⬆️ Drop PHP 7.2 support

Laravel 8.40.0 supports PHP above version 7.3. So this package needs support for PHP 7.3 and above only as well.
marcreichel · Jun 4, 2021 · 7ffe034 · 7ffe034
1 parent 670005b
commit 7ffe034
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/composer.json b/composer.json
@@ -3,7 +3,7 @@
     "description": "A Laravel wrapper for version 4 of the IGDB API (Apicalypse) including webhook handling",
     "keywords": ["laravel", "api-wrapper", "igdb", "igdb-api", "apicalypse", "wrapper"],
     "require": {
-        "php": "^7.2 | ^7.3 | ^7.4 | ^8.0",
+        "php": "^7.3 | ^7.4 | ^8.0",
         "laravel/framework": "^8.40.0",
         "guzzlehttp/guzzle": "~6.0|~7.0",
         "ext-json": "*"

diff --git a/src/ApiHelper.php b/src/ApiHelper.php
@@ -2,6 +2,7 @@
 
 namespace MarcReichel\IGDBLaravel;
 
+use Exception;
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\GuzzleException;
 use Illuminate\Support\Facades\Cache;
@@ -16,6 +17,7 @@ class ApiHelper
      *
      * @return string
      * @throws AuthenticationException
+     * @throws GuzzleException
      */
     public static function retrieveAccessToken(): string
     {
@@ -34,14 +36,14 @@ public static function retrieveAccessToken(): string
             ]);
             $response = json_decode($guzzleClient->post(
                 'https://id.twitch.tv/oauth2/token?' . $query
-            )->getBody(), true);
+            )->getBody(), true, 512, JSON_THROW_ON_ERROR);
 
             if (isset($response['access_token']) && $response['expires_in']) {
                 Cache::put($accessTokenCacheKey, (string)$response['access_token'], (int)$response['expires_in']);
 
                 $accessToken = (string)$response['access_token'];
             }
-        } catch (GuzzleException $exception) {
+        } catch (Exception $exception) {
             throw new AuthenticationException('Access Token could not be retrieved from Twitch.');
         }
 

diff --git a/src/Builder.php b/src/Builder.php
@@ -188,6 +188,7 @@ protected function resetCacheLifetime(): void
      *
      * @return string
      * @throws AuthenticationException
+     * @throws GuzzleException
      */
     protected function retrieveAccessToken(): string
     {
@@ -1420,7 +1421,7 @@ private function castDate($date)
      * Execute the query.
      *
      * @return mixed|string
-     * @throws MissingEndpointException|AuthenticationException
+     * @throws MissingEndpointException|AuthenticationException|GuzzleException
      */
     public function get()
     {
@@ -1443,7 +1444,7 @@ function () use ($accessToken) {
                                     'Authorization' => 'Bearer ' . $accessToken,
                                 ],
                                 'body' => $this->getQuery(),
-                            ])->getBody(), true));
+                            ])->getBody(), true, 512, JSON_THROW_ON_ERROR));
                     } catch (Exception $exception) {
                         $this->handleRequestException($exception);
                     }
@@ -1541,7 +1542,7 @@ public function findOrFail(int $id)
      * Execute the query and get the first result.
      *
      * @return mixed
-     * @throws MissingEndpointException|AuthenticationException
+     * @throws MissingEndpointException|AuthenticationException|GuzzleException
      */
     public function first()
     {
@@ -1554,7 +1555,7 @@ public function first()
      * Return the total "count" result of the query.
      *
      * @return mixed
-     * @throws MissingEndpointException|AuthenticationException
+     * @throws MissingEndpointException|AuthenticationException|GuzzleException
      */
     public function count()
     {
@@ -1579,7 +1580,7 @@ function () use ($accessToken) {
                                     'Authorization' => 'Bearer ' . $accessToken,
                                 ],
                                 'body' => $this->getQuery(),
-                            ])->getBody(), true)['count'];
+                            ])->getBody(), true, 512, JSON_THROW_ON_ERROR)['count'];
                     } catch (Exception $exception) {
                         $this->handleRequestException($exception);
                     }
@@ -1598,7 +1599,7 @@ function () use ($accessToken) {
     /**
      * @return mixed
      * @throws MissingEndpointException
-     * @throws ModelNotFoundException|AuthenticationException
+     * @throws ModelNotFoundException|AuthenticationException|GuzzleException
      */
     public function firstOrFail()
     {
@@ -1623,7 +1624,7 @@ public function firstOrFail()
      * @param int $limit
      *
      * @return Paginator
-     * @throws MissingEndpointException|AuthenticationException
+     * @throws MissingEndpointException|AuthenticationException|GuzzleException
      */
     public function paginate(int $limit = 10): Paginator
     {