Bump guzzle to 7.0

denpamusic · Aug 23, 2020 · 578dab8 · 578dab8
1 parent aaaa048
commit 578dab8
Show file tree

Hide file tree

Showing 28 changed files with 204 additions and 197 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,6 +4,7 @@ php:
   - 7.1
   - 7.2
   - 7.3
+  - 7.4
   - hhvm
   - nightly
 

diff --git a/composer.json b/composer.json
@@ -14,7 +14,7 @@
     ],
     "require": {
         "php": ">=7.1",
-        "guzzlehttp/guzzle": "^6.3"
+        "guzzlehttp/guzzle": "^6.5 | ^7.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^7.0 | ^8.0"

diff --git a/src/Client.php b/src/Client.php
@@ -96,7 +96,7 @@ public function __destruct()
      *
      * @return \Denpa\Bitcoin\Config
      */
-    public function getConfig() : Config
+    public function getConfig(): Config
     {
         return $this->config;
     }
@@ -106,7 +106,7 @@ public function getConfig() : Config
      *
      * @return \GuzzleHttp\ClientInterface
      */
-    public function getClient() : ClientInterface
+    public function getClient(): ClientInterface
     {
         return $this->client;
     }
@@ -118,7 +118,7 @@ public function getClient() : ClientInterface
      *
      * @return self
      */
-    public function setClient(ClientInterface $client) : self
+    public function setClient(ClientInterface $client): self
     {
         $this->client = $client;
 
@@ -132,7 +132,7 @@ public function setClient(ClientInterface $client) : self
      *
      * @return self
      */
-    public function wallet(string $name) : self
+    public function wallet(string $name): self
     {
         $this->path = "/wallet/$name";
 
@@ -147,7 +147,7 @@ public function wallet(string $name) : self
      *
      * @return \Psr\Http\Message\ResponseInterface
      */
-    public function request(string $method, ...$params) : ResponseInterface
+    public function request(string $method, ...$params): ResponseInterface
     {
         try {
             $response = $this->client
@@ -178,7 +178,8 @@ public function requestAsync(
         string $method,
         $params = [],
         ?callable $fulfilled = null,
-        ?callable $rejected = null) : Promise\Promise
+        ?callable $rejected = null
+    ): Promise\Promise
     {
         $promise = $this->client
             ->postAsync($this->path, $this->makeJson($method, $params));
@@ -205,7 +206,7 @@ public function requestAsync(
      *
      * @return void
      */
-    public function wait() : void
+    public function wait(): void
     {
         if (!empty($this->promises)) {
             Promise\settle($this->promises)->wait();
@@ -234,7 +235,7 @@ public function __call(string $method, array $params = [])
      *
      * @return string
      */
-    protected function getConfigProvider() : string
+    protected function getConfigProvider(): string
     {
         return 'Denpa\\Bitcoin\\Config';
     }
@@ -244,7 +245,7 @@ protected function getConfigProvider() : string
      *
      * @return string
      */
-    protected function getResponseHandler() : string
+    protected function getResponseHandler(): string
     {
         return 'Denpa\\Bitcoin\\Responses\\BitcoindResponse';
     }
@@ -254,7 +255,7 @@ protected function getResponseHandler() : string
      *
      * @return \GuzzleHttp\HandlerStack
      */
-    protected function getHandler() : HandlerStack
+    protected function getHandler(): HandlerStack
     {
         $stack = HandlerStack::create();
 
@@ -278,7 +279,7 @@ protected function getHandler() : HandlerStack
      *
      * @return array
      */
-    protected function makeJson(string $method, $params = []) : array
+    protected function makeJson(string $method, $params = []): array
     {
         return [
             'json' => [

diff --git a/src/Config.php b/src/Config.php
@@ -9,7 +9,8 @@
 
 class Config implements \ArrayAccess, \Countable
 {
-    use Collection, ImmutableArray;
+    use Collection;
+    use ImmutableArray;
 
     /**
      * Default configuration.
@@ -44,7 +45,7 @@ public function __construct(array $config = [])
      *
      * @return string|null
      */
-    public function getCa() : ?string
+    public function getCa(): ?string
     {
         if (isset($this->config['ca']) && is_file($this->config['ca'])) {
             return $this->config['ca'];
@@ -58,7 +59,7 @@ public function getCa() : ?string
      *
      * @return array
      */
-    public function getAuth() : array
+    public function getAuth(): array
     {
         return [
             $this->config['user'],
@@ -71,7 +72,7 @@ public function getAuth() : array
      *
      * @return string
      */
-    public function getDsn() : string
+    public function getDsn(): string
     {
         $scheme = $this->config['scheme'] ?? 'http';
 
@@ -87,7 +88,7 @@ public function getDsn() : string
      *
      * @return self
      */
-    public function set(array $config = []) : self
+    public function set(array $config = []): self
     {
         // use same var name as laravel-bitcoinrpc
         $config['password'] = $config['password'] ?? $config['pass'] ?? null;
@@ -107,7 +108,7 @@ public function set(array $config = []) : self
      *
      * @return array
      */
-    protected function toArray() : array
+    protected function toArray(): array
     {
         return $this->config;
     }

diff --git a/src/Exceptions/BadConfigurationException.php b/src/Exceptions/BadConfigurationException.php
@@ -33,7 +33,7 @@ public function __construct(array $config, ...$args)
      *
      * @return array
      */
-    public function getConfig() : array
+    public function getConfig(): array
     {
         return $this->config;
     }
@@ -43,7 +43,7 @@ public function getConfig() : array
      *
      * @return array
      */
-    protected function getConstructorParameters() : array
+    protected function getConstructorParameters(): array
     {
         return [
             $this->getConfig(),

diff --git a/src/Exceptions/BadRemoteCallException.php b/src/Exceptions/BadRemoteCallException.php
@@ -35,7 +35,7 @@ public function __construct(Response $response)
      *
      * @return \Denpa\Bitcoin\Responses\Response
      */
-    public function getResponse() : Response
+    public function getResponse(): Response
     {
         return $this->response;
     }
@@ -45,7 +45,7 @@ public function getResponse() : Response
      *
      * @return array
      */
-    protected function getConstructorParameters() : array
+    protected function getConstructorParameters(): array
     {
         return [
             $this->getResponse(),

diff --git a/src/Exceptions/ClientException.php b/src/Exceptions/ClientException.php
@@ -15,7 +15,7 @@ abstract class ClientException extends Exception
      *
      * @return \Exception
      */
-    public function withNamespace($namespace) : Exception
+    public function withNamespace($namespace): Exception
     {
         $classname = $this->getClassName();
 
@@ -33,7 +33,7 @@ public function withNamespace($namespace) : Exception
      *
      * @return string
      */
-    protected function getClassName() : string
+    protected function getClassName(): string
     {
         $pos = ($pos = strrpos(static::class, '\\')) !== false ? $pos + 1 : 0;
 

diff --git a/src/Exceptions/ConnectionException.php b/src/Exceptions/ConnectionException.php
@@ -35,7 +35,7 @@ public function __construct(Request $request, ...$args)
      *
      * @return \GuzzleHttp\Psr7\Request
      */
-    public function getRequest() : Request
+    public function getRequest(): Request
     {
         return $this->request;
     }
@@ -45,7 +45,7 @@ public function getRequest() : Request
      *
      * @return array
      */
-    protected function getConstructorParameters() : array
+    protected function getConstructorParameters(): array
     {
         return [
             $this->getRequest(),

diff --git a/src/Exceptions/Handler.php b/src/Exceptions/Handler.php
@@ -44,7 +44,7 @@ protected function __construct()
      *
      * @return \Throwable|null
      */
-    protected function namespaceHandler(Throwable $exception) : ?Throwable
+    protected function namespaceHandler(Throwable $exception): ?Throwable
     {
         if ($this->namespace && $exception instanceof ClientException) {
             return $exception->withNamespace($this->namespace);
@@ -60,7 +60,7 @@ protected function namespaceHandler(Throwable $exception) : ?Throwable
      *
      * @return \Throwable|null
      */
-    protected function requestExceptionHandler(Throwable $exception) : ?Throwable
+    protected function requestExceptionHandler(Throwable $exception): ?Throwable
     {
         if ($exception instanceof RequestException) {
             if (
@@ -87,7 +87,7 @@ protected function requestExceptionHandler(Throwable $exception) : ?Throwable
      *
      * @return self
      */
-    public function registerHandler(callable $handler) : self
+    public function registerHandler(callable $handler): self
     {
         $this->handlers[] = $handler;
 
@@ -101,7 +101,7 @@ public function registerHandler(callable $handler) : self
      *
      * @return void
      */
-    public function handle(Throwable $exception) : void
+    public function handle(Throwable $exception): void
     {
         foreach ($this->handlers as $handler) {
             $result = $handler($exception);
@@ -121,7 +121,7 @@ public function handle(Throwable $exception) : void
      *
      * @return self
      */
-    public function setNamespace($namespace) : self
+    public function setNamespace($namespace): self
     {
         $this->namespace = $namespace;
 

diff --git a/src/Responses/BitcoindResponse.php b/src/Responses/BitcoindResponse.php
@@ -14,14 +14,16 @@ class BitcoindResponse extends Response implements
     \Serializable,
     \JsonSerializable
 {
-    use Collection, ImmutableArray, SerializableContainer;
+    use Collection;
+    use ImmutableArray;
+    use SerializableContainer;
 
     /**
      * Gets array representation of response object.
      *
      * @return array
      */
-    public function toArray() : array
+    public function toArray(): array
     {
         return (array) $this->result();
     }
@@ -31,7 +33,7 @@ public function toArray() : array
      *
      * @return array
      */
-    public function toContainer() : array
+    public function toContainer(): array
     {
         return $this->container;
     }

diff --git a/src/Responses/Response.php b/src/Responses/Response.php
@@ -43,7 +43,7 @@ public function __construct(ResponseInterface $response)
      *
      * @return \Psr\Http\Message\ResponseInterface
      */
-    public function response() : ResponseInterface
+    public function response(): ResponseInterface
     {
         return $this->response;
     }
@@ -55,7 +55,7 @@ public function response() : ResponseInterface
      *
      * @return self
      */
-    public function setResponse(ResponseInterface $response) : self
+    public function setResponse(ResponseInterface $response): self
     {
         $this->response = $response;
 
@@ -67,7 +67,7 @@ public function setResponse(ResponseInterface $response) : self
      *
      * @return bool
      */
-    public function hasError() : bool
+    public function hasError(): bool
     {
         return isset($this->container['error']);
     }
@@ -77,7 +77,7 @@ public function hasError() : bool
      *
      * @return array|null
      */
-    public function error() : ?array
+    public function error(): ?array
     {
         return $this->container['error'] ?? null;
     }
@@ -87,7 +87,7 @@ public function error() : ?array
      *
      * @return bool
      */
-    public function hasResult() : bool
+    public function hasResult(): bool
     {
         return isset($this->container['result']);
     }
@@ -107,7 +107,7 @@ public function result()
      *
      * @return int
      */
-    public function getStatusCode() : int
+    public function getStatusCode(): int
     {
         return $this->response->getStatusCode();
     }
@@ -120,7 +120,7 @@ public function getStatusCode() : int
      *
      * @return self
      */
-    public function withStatus($code, $reasonPhrase = '') : self
+    public function withStatus($code, $reasonPhrase = ''): self
     {
         $new = clone $this;
 
@@ -134,7 +134,7 @@ public function withStatus($code, $reasonPhrase = '') : self
      *
      * @return string
      */
-    public function getReasonPhrase() : string
+    public function getReasonPhrase(): string
     {
         return $this->response->getReasonPhrase();
     }