Merge pull request #62 from ddebin/master

Bump guzzlehttp/oauth-subscriber to 0.8.*

Author: noweh

composer.json

@@ -19,7 +19,7 @@
     "ext-json": "*",
     "php": ">=7.4",
     "guzzlehttp/guzzle": "^7.5.0",
-    "guzzlehttp/oauth-subscriber": "^0.6.0"
+    "guzzlehttp/oauth-subscriber": "^0.8.0"
   },
   "require-dev": {
     "phpunit/phpunit": "^9.6.3",

src/AbstractController.php

@@ -2,6 +2,8 @@
 namespace Noweh\TwitterApi;
 
 use GuzzleHttp\Client;
+use GuzzleHttp\Exception\GuzzleException;
+use GuzzleHttp\Exception\RequestException;
 use GuzzleHttp\Exception\ServerException;
 use GuzzleHttp\Subscriber\Oauth\Oauth1;
 use GuzzleHttp\HandlerStack;
@@ -86,10 +88,10 @@ private function getAPIBaseURI(): string
     /**
      * Perform the request to Twitter API
      * @param array<string, mixed> $postData
-     * @return mixed
-     * @throws \GuzzleHttp\Exception\GuzzleException|\RuntimeException|\JsonException
+     * @return \stdClass|null
+     * @throws GuzzleException|\RuntimeException|\JsonException
      */
-    public function performRequest(array $postData = [], $withHeaders = false)
+    public function performRequest(array $postData = [], bool $withHeaders = false): ?\stdClass
     {
         try {
             $headers = [
@@ -128,9 +130,10 @@ public function performRequest(array $postData = [], $withHeaders = false)
                 'json' => count($postData) ? $postData : null,
             ]);
 
+            /** @var \stdClass|null $body */
             $body = json_decode($response->getBody()->getContents(), false, 512, JSON_THROW_ON_ERROR);
 
-            if ($withHeaders) {
+            if ($withHeaders && $body) {
                 $body->headers = $response->getHeaders();
             }
 
@@ -148,12 +151,11 @@ public function performRequest(array $postData = [], $withHeaders = false)
             return $body;
 
         } catch (ServerException $e) {
-            /** @var \stdClass $payload */
-            $payload = json_decode(str_replace("\n", "", $e->getResponse()->getBody()->getContents()), false, 512,
-                JSON_THROW_ON_ERROR);
-            throw new \RuntimeException($payload->detail, $payload->status);
-        } catch (\GuzzleHttp\Exception\RequestException $e) {
-            throw new \RuntimeException($e->getResponse()->getBody()->getContents(), $e->getCode());
+            /** @var \stdClass|null $payload */
+            $payload = json_decode($e->getResponse()->getBody()->getContents(), false, 512, JSON_THROW_ON_ERROR);
+            throw new \RuntimeException($payload->detail ?? $e->getMessage(), $payload->status ?? $e->getCode());
+        } catch (RequestException $e) {
+            throw new \RuntimeException($e->getMessage(), $e->getCode());
         }
     }
 
@@ -213,7 +215,7 @@ private function parseSettings(array $settings): void
         $this->bearer_token = $settings['bearer_token'];
         $this->access_token = $settings['access_token'];
         $this->access_token_secret = $settings['access_token_secret'];
-        $this->free_mode = $settings['free_mode'] ?? false;
+        $this->free_mode = (bool) ($settings['free_mode'] ?? false);
         $this->api_base_uri = $settings['api_base_uri'] ?? self::API_BASE_URI;
     }
 

src/Media.php

@@ -4,6 +4,9 @@
 
 use Exception;
 use GuzzleHttp\Client;
+use GuzzleHttp\Exception\GuzzleException;
+use GuzzleHttp\Exception\RequestException;
+use GuzzleHttp\Exception\ServerException;
 use GuzzleHttp\HandlerStack;
 use GuzzleHttp\Subscriber\Oauth\Oauth1;
 use JsonException;
@@ -34,7 +37,7 @@ public function __construct(array $settings)
 
     /**
      * Prepare request to upload images to Twitter
-     * @param array $settings
+     * @param array<string, mixed> $settings
      * @return void
      */
     private function prepareRequest(array $settings = []): void
@@ -58,9 +61,8 @@ private function prepareRequest(array $settings = []): void
     /**
      * Upload media to Twitter
      * @param string $filedata Base64 encoded binary file
-     * @return void
-     * @throws JsonException
-     * @throws Exception
+     * @return array<string, mixed>|null
+     * @throws GuzzleException|\RuntimeException|\JsonException
      */
     public function upload(string $filedata = ""): ?array
     {
@@ -81,10 +83,16 @@ public function upload(string $filedata = ""): ?array
             ]);
 
             if ($response->getStatusCode() === 200) {
-                return json_decode($response->getBody()->getContents(), true, 512, JSON_THROW_ON_ERROR);
+                /** @var array<string, mixed>|null $payload */
+                $payload = json_decode($response->getBody()->getContents(), true, 512, JSON_THROW_ON_ERROR);
+                return $payload;
             }
-        } catch (Exception $e) {
-            throw new \RuntimeException($e->getResponse()->getBody()->getContents(), $e->getCode());
+        } catch (ServerException $e) {
+            /** @var \stdClass|null $payload */
+            $payload = json_decode($e->getResponse()->getBody()->getContents(), true, 512, JSON_THROW_ON_ERROR);
+            throw new \RuntimeException($payload->detail ?? $e->getMessage(), $payload->status ?? $e->getCode());
+        } catch (RequestException $e) {
+            throw new \RuntimeException($e->getMessage(), $e->getCode());
         }
 
         return null;