修复异常

Author: xutongle

src/MakesHttpRequests.php

@@ -3,71 +3,71 @@
 namespace Larva\Pusher;
 
 use Exception;
-use Larva\Forge\Exceptions\FailedActionException;
-use Larva\Forge\Exceptions\NotFoundException;
-use Larva\Forge\Exceptions\RateLimitExceededException;
-use Larva\Forge\Exceptions\TimeoutException;
-use Larva\Forge\Exceptions\ValidationException;
+use Larva\Pusher\Exceptions\FailedActionException;
+use Larva\Pusher\Exceptions\NotFoundException;
+use Larva\Pusher\Exceptions\RateLimitExceededException;
+use Larva\Pusher\Exceptions\TimeoutException;
+use Larva\Pusher\Exceptions\ValidationException;
 use Psr\Http\Message\ResponseInterface;
 
 trait MakesHttpRequests
 {
     /**
      * Make a GET request to Forge servers and return the response.
      *
-     * @param  string  $uri
+     * @param string $uri
      * @return mixed
      */
-    public function get($uri)
+    public function get(string $uri)
     {
         return $this->request('GET', $uri);
     }
 
     /**
      * Make a POST request to Forge servers and return the response.
      *
-     * @param  string  $uri
-     * @param  array  $payload
+     * @param string $uri
+     * @param array $payload
      * @return mixed
      */
-    public function post($uri, array $payload = [])
+    public function post(string $uri, array $payload = [])
     {
         return $this->request('POST', $uri, $payload);
     }
 
     /**
      * Make a PUT request to Forge servers and return the response.
      *
-     * @param  string  $uri
-     * @param  array  $payload
+     * @param string $uri
+     * @param array $payload
      * @return mixed
      */
-    public function put($uri, array $payload = [])
+    public function put(string $uri, array $payload = [])
     {
         return $this->request('PUT', $uri, $payload);
     }
 
     /**
      * Make a DELETE request to Forge servers and return the response.
      *
-     * @param  string  $uri
-     * @param  array  $payload
+     * @param string $uri
+     * @param array $payload
      * @return mixed
      */
-    public function delete($uri, array $payload = [])
+    public function delete(string $uri, array $payload = [])
     {
         return $this->request('DELETE', $uri, $payload);
     }
 
     /**
      * Make request to Forge servers and return the response.
      *
-     * @param  string  $verb
-     * @param  string  $uri
-     * @param  array  $payload
+     * @param string $verb
+     * @param string $uri
+     * @param array $payload
      * @return mixed
      */
-    protected function request($verb, $uri, array $payload = [])
+    protected function request(string $verb, string $uri, array $payload = [])
     {
         if (isset($payload['json'])) {
             $payload = ['json' => $payload['json']];
@@ -83,57 +83,57 @@ protected function request($verb, $uri, array $payload = [])
             return $this->handleRequestError($response);
         }
 
-        $responseBody = (string) $response->getBody();
+        $responseBody = (string)$response->getBody();
 
         return json_decode($responseBody, true) ?: $responseBody;
     }
 
     /**
      * Handle the request error.
      *
-     * @param  \Psr\Http\Message\ResponseInterface  $response
+     * @param \Psr\Http\Message\ResponseInterface $response
      * @return void
      *
      * @throws \Exception
-     * @throws \Larva\Forge\Exceptions\FailedActionException
-     * @throws \Larva\Forge\Exceptions\NotFoundException
-     * @throws \Larva\Forge\Exceptions\ValidationException
-     * @throws \Larva\Forge\Exceptions\RateLimitExceededException
+     * @throws \Larva\Pusher\Exceptions\FailedActionException
+     * @throws \Larva\Pusher\Exceptions\NotFoundException
+     * @throws \Larva\Pusher\Exceptions\ValidationException
+     * @throws \Larva\Pusher\Exceptions\RateLimitExceededException
      */
     protected function handleRequestError(ResponseInterface $response)
     {
         if ($response->getStatusCode() == 422) {
-            throw new ValidationException(json_decode((string) $response->getBody(), true));
+            throw new ValidationException(json_decode((string)$response->getBody(), true));
         }
 
         if ($response->getStatusCode() == 404) {
             throw new NotFoundException();
         }
 
         if ($response->getStatusCode() == 400) {
-            throw new FailedActionException((string) $response->getBody());
+            throw new FailedActionException((string)$response->getBody());
         }
 
         if ($response->getStatusCode() === 429) {
             throw new RateLimitExceededException(
                 $response->hasHeader('x-ratelimit-reset')
-                    ? (int) $response->getHeader('x-ratelimit-reset')[0]
+                    ? (int)$response->getHeader('x-ratelimit-reset')[0]
                     : null
             );
         }
 
-        throw new Exception((string) $response->getBody());
+        throw new Exception((string)$response->getBody());
     }
 
     /**
      * Retry the callback or fail after x seconds.
      *
-     * @param  int  $timeout
-     * @param  callable  $callback
-     * @param  int  $sleep
+     * @param int $timeout
+     * @param callable $callback
+     * @param int $sleep
      * @return mixed
      *
-     * @throws \Larva\Forge\Exceptions\TimeoutException
+     * @throws \Larva\Pusher\Exceptions\TimeoutException
      */
     public function retry($timeout, $callback, $sleep = 5)
     {
@@ -155,7 +155,7 @@ public function retry($timeout, $callback, $sleep = 5)
             $output = [];
         }
 
-        if (! is_array($output)) {
+        if (!is_array($output)) {
             $output = [$output];
         }