Support httplug v2

Author: GrahamCampbell

composer.json

@@ -23,17 +23,17 @@
 	"require": {
 		"php": "^5.6 || ^7.0",
 		"ext-xml": "*",
-		"php-http/client-common": "^1.6",
+		"php-http/client-common": "^1.6 || ^2.0",
 		"php-http/client-implementation": "^1.0",
 		"php-http/discovery": "^1.2",
-		"php-http/httplug": "^1.1",
-		"php-http/multipart-stream-builder": "^1.0",
+		"php-http/httplug": "^1.1 || ^2.0",
+		"php-http/multipart-stream-builder": "^1.1",
 		"symfony/options-resolver": "^2.6 || ^3.0 || ^4.0"
 	},
 	"require-dev": {
 		"guzzlehttp/psr7": "^1.2",
-		"php-http/guzzle6-adapter": "^1.0",
-		"php-http/mock-client": "^1.0",
+		"php-http/guzzle6-adapter": "^1.0 || ^2.0",
+		"php-http/mock-client": "^1.2",
 		"phpunit/phpunit": "^5.7.27 || ^6.5"
 	},
 	"autoload": {

lib/Gitlab/HttpClient/Plugin/ApiVersion.php

@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Gitlab\HttpClient\Plugin;
 
 use Http\Client\Common\Plugin;
@@ -14,12 +13,14 @@
  */
 class ApiVersion implements Plugin
 {
+    use Plugin\VersionBridgePlugin;
+
     private $redirected = false;
 
     /**
      * {@inheritdoc}
      */
-    public function handleRequest(RequestInterface $request, callable $next, callable $first)
+    public function doHandleRequest(RequestInterface $request, callable $next, callable $first)
     {
         $uri = $request->getUri();
 

lib/Gitlab/HttpClient/Plugin/Authentication.php

@@ -14,6 +14,8 @@
  */
 class Authentication implements Plugin
 {
+    use Plugin\VersionBridgePlugin;
+
     /**
      * @var string
      */
@@ -44,7 +46,7 @@ public function __construct($method, $token, $sudo = null)
     /**
      * {@inheritdoc}
      */
-    public function handleRequest(RequestInterface $request, callable $next, callable $first)
+    public function doHandleRequest(RequestInterface $request, callable $next, callable $first)
     {
         switch ($this->method) {
             case Client::AUTH_HTTP_TOKEN:

lib/Gitlab/HttpClient/Plugin/GitlabExceptionThrower.php

@@ -17,10 +17,12 @@
  */
 class GitlabExceptionThrower implements Plugin
 {
+    use Plugin\VersionBridgePlugin;
+
     /**
      * {@inheritdoc}
      */
-    public function handleRequest(RequestInterface $request, callable $next, callable $first)
+    public function doHandleRequest(RequestInterface $request, callable $next, callable $first)
     {
         return $next($request)->then(function (ResponseInterface $response) {
             if ($response->getStatusCode() >= 400 && $response->getStatusCode() < 600) {

lib/Gitlab/HttpClient/Plugin/History.php

@@ -14,6 +14,8 @@
  */
 class History implements Journal
 {
+    use HistoryTrait;
+
     /**
      * @var ResponseInterface
      */
@@ -34,11 +36,4 @@ public function addSuccess(RequestInterface $request, ResponseInterface $respons
     {
         $this->lastResponse = $response;
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function addFailure(RequestInterface $request, Exception $exception)
-    {
-    }
 }

lib/Gitlab/HttpClient/Plugin/HistoryTrait.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace Gitlab\HttpClient\Plugin;
+
+use Http\Client\Common\HttpMethodsClientInterface;
+use Http\Client\Exception;
+use Psr\Http\Client\ClientExceptionInterface;
+use Psr\Http\Message\RequestInterface;
+
+if (interface_exists(HttpMethodsClientInterface::class)) {
+    trait HistoryTrait
+    {
+        public function addFailure(RequestInterface $request, ClientExceptionInterface $exception)
+        {
+        }
+    }
+} else {
+    trait HistoryTrait
+    {
+        public function addFailure(RequestInterface $request, Exception $exception)
+        {
+        }
+    }
+}