Update http/guzzle libs

closes #13, #20

Author: turtle0x1

composer.json

@@ -27,18 +27,18 @@
     "require": {
         "php": "~5.5|~7.0",
         "psr/http-message": "^1.0",
-        "php-http/httplug": "^1.0",
-        "php-http/discovery": "^1.0",
+        "php-http/httplug": "^2.4.1",
+        "php-http/discovery": "^1.20",
         "php-http/client-implementation": "^1.0",
-        "php-http/client-common": "^1.1",
+        "php-http/client-common": "^2.7.2",
         "php-http/cache-plugin": "^1.6"
     },
     "require-dev": {
         "phpunit/phpunit": "4.*",
         "mockery/mockery": "^0.9.5",
-        "php-http/guzzle6-adapter": "^1.0",
+        "php-http/guzzle7-adapter": "^1.0",
         "guzzlehttp/psr7": "^1.2",
-        "php-http/mock-client": "^0.3",
+        "php-http/mock-client": "^1.6.1",
         "squizlabs/php_codesniffer": "^2.6"
     },
     "autoload": {

src/Client.php

@@ -7,7 +7,7 @@
 use Opensaucesystems\Lxd\Exception\ServerException;
 use Opensaucesystems\Lxd\HttpClient\Plugin\PathPrepend;
 use Opensaucesystems\Lxd\HttpClient\Plugin\PathTrimEnd;
-use Opensaucesystems\Lxd\HttpClient\Plugin\LxdExceptionThower;
+use Opensaucesystems\Lxd\HttpClient\Plugin\LxdExceptionThrower;
 use Http\Client\Common\HttpMethodsClient;
 use Http\Client\Common\Plugin;
 use Http\Client\Common\PluginClient;
@@ -84,7 +84,7 @@ public function __construct(
         $this->url            = $url ?: 'https://127.0.0.1:8443';
         $this->projectName    = $projectName;
 
-        $this->addPlugin(new LxdExceptionThower());
+        $this->addPlugin(new LxdExceptionThrower());
 
         $this->setUrl($this->url);
     }

src/HttpClient/Plugin/LxdExceptionThower.php

@@ -0,0 +1,55 @@
+<?php
+
+namespace Opensaucesystems\Lxd\HttpClient\Plugin;
+
+use Http\Promise\Promise;
+use Http\Client\Common\Plugin;
+use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\ResponseInterface;
+use Http\Client\Exception\HttpException;
+use Opensaucesystems\Lxd\Exception\BadRequestException;
+use Opensaucesystems\Lxd\Exception\OperationException;
+use Opensaucesystems\Lxd\Exception\AuthenticationFailedException;
+use Opensaucesystems\Lxd\Exception\NotFoundException;
+use Opensaucesystems\Lxd\Exception\ConflictException;
+
+/**
+ * Handle LXD errors.
+ */
+class LxdExceptionThrower implements Plugin
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function handleRequest(RequestInterface $request, callable $next, callable $first): Promise
+    {
+        return $next($request)->then(
+            function (ResponseInterface $response) {
+                // Successful response, just return it.
+                return $response;
+            },
+            function (\Throwable $e) use ($request) {
+                if ($e instanceof HttpException) {
+                    $response = $e->getResponse();
+                    $status = $response->getStatusCode();
+
+                    switch ($status) {
+                        case 400:
+                            throw new BadRequestException($request, $response, $e);
+                        case 401:
+                            throw new OperationException($request, $response, $e);
+                        case 403:
+                            throw new AuthenticationFailedException($request, $response, $e);
+                        case 404:
+                            throw new NotFoundException($request, $response, $e);
+                        case 409:
+                            throw new ConflictException($request, $response, $e);
+                    }
+                }
+
+                // Rethrow unhandled exceptions
+                throw $e;
+            }
+        );
+    }
+}

src/HttpClient/Plugin/LxdExceptionThrower.php

@@ -2,6 +2,7 @@
 
 namespace Opensaucesystems\Lxd\HttpClient\Plugin;
 
+use Http\Promise\Promise;
 use Http\Client\Common\Plugin;
 use Psr\Http\Message\RequestInterface;
 
@@ -25,7 +26,7 @@ public function __construct($path)
     /**
      * {@inheritdoc}
      */
-    public function handleRequest(RequestInterface $request, callable $next, callable $first)
+    public function handleRequest(RequestInterface $request, callable $next, callable $first): Promise
     {
         $currentPath = $request->getUri()->getPath();
         $uri = $request->getUri()->withPath($this->path.$currentPath);

src/HttpClient/Plugin/PathPrepend.php

@@ -1,6 +1,7 @@
 <?php
 namespace Opensaucesystems\Lxd\HttpClient\Plugin;
 
+use Http\Promise\Promise;
 use Http\Client\Common\Plugin;
 use Psr\Http\Message\RequestInterface;
 
@@ -23,7 +24,7 @@ public function __construct($trim = '/')
     /**
      * {@inheritdoc}
      */
-    public function handleRequest(RequestInterface $request, callable $next, callable $first)
+    public function handleRequest(RequestInterface $request, callable $next, callable $first): Promise
     {
         $trimPath = rtrim($request->getUri()->getPath(), $this->trim);
         $uri = $request->getUri()->withPath($trimPath);