From 58487ed131d63b3f76d7425656bb6047ba1b4b02 Mon Sep 17 00:00:00 2001
From: Tobias Nyholm <tobias.nyholm@gmail.com>
Date: Fri, 28 Dec 2018 11:18:30 +0100
Subject: [PATCH 1/6] Added a way to be forward compatible with version 2.0

---
 src/Plugin/ForwardCompatibilityPlugin.php | 25 +++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 src/Plugin/ForwardCompatibilityPlugin.php

diff --git a/src/Plugin/ForwardCompatibilityPlugin.php b/src/Plugin/ForwardCompatibilityPlugin.php
new file mode 100644
index 0000000..49083a7
--- /dev/null
+++ b/src/Plugin/ForwardCompatibilityPlugin.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Http\Client\Common\Plugin;
+
+use Http\Client\Common\Plugin;
+use Psr\Http\Message\RequestInterface;
+
+/**
+ * A plugin that helps you migrate from php-http/client-common 1.x to 2.x. This
+ * will also help you to support PHP5 at the same time you support 2.x.
+ *
+ * @author Tobias Nyholm <tobias.nyholm@gmail.com>
+ */
+abstract class ForwardCompatibilityPlugin implements Plugin
+{
+    abstract function doHandleRequest(RequestInterface $request, callable $next, callable $first);
+
+    /**
+     * {@inheritdoc}
+     */
+    public function handleRequest(RequestInterface $request, callable $next, callable $first)
+    {
+        return $this->doHandleRequest($request, $next, $first);
+    }
+}

From e4f35b92216e792d51b88a8556f928651a2b15a6 Mon Sep 17 00:00:00 2001
From: Tobias Nyholm <tobias.nyholm@gmail.com>
Date: Fri, 28 Dec 2018 11:29:05 +0100
Subject: [PATCH 2/6] Added a client

---
 ...lityPlugin.php => VersionBridgePlugin.php} |  2 +-
 src/VersionBridgeClient.php                   | 24 +++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)
 rename src/Plugin/{ForwardCompatibilityPlugin.php => VersionBridgePlugin.php} (91%)
 create mode 100644 src/VersionBridgeClient.php

diff --git a/src/Plugin/ForwardCompatibilityPlugin.php b/src/Plugin/VersionBridgePlugin.php
similarity index 91%
rename from src/Plugin/ForwardCompatibilityPlugin.php
rename to src/Plugin/VersionBridgePlugin.php
index 49083a7..3d558c7 100644
--- a/src/Plugin/ForwardCompatibilityPlugin.php
+++ b/src/Plugin/VersionBridgePlugin.php
@@ -11,7 +11,7 @@
  *
  * @author Tobias Nyholm <tobias.nyholm@gmail.com>
  */
-abstract class ForwardCompatibilityPlugin implements Plugin
+abstract class VersionBridgePlugin implements Plugin
 {
     abstract function doHandleRequest(RequestInterface $request, callable $next, callable $first);
 
diff --git a/src/VersionBridgeClient.php b/src/VersionBridgeClient.php
new file mode 100644
index 0000000..286bcca
--- /dev/null
+++ b/src/VersionBridgeClient.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Http\Client\Common\Plugin;
+
+use Http\Client\Common\Plugin;
+use Http\Client\HttpClient;
+use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\ResponseInterface;
+
+/**
+ * A client that helps you migrate from php-http/httplug 1.x to 2.x. This
+ * will also help you to support PHP5 at the same time you support 2.x.
+ *
+ * @author Tobias Nyholm <tobias.nyholm@gmail.com>
+ */
+abstract class VersionBridgeClient implements HttpClient
+{
+    abstract public function doSendRequest(RequestInterface $request);
+
+    public function sendRequest(RequestInterface $request)
+    {
+        return $this->doSendRequest($request);
+    }
+}

From ae766f104396fd461bbf3ac2c2a14cbffa88b96f Mon Sep 17 00:00:00 2001
From: Tobias Nyholm <tobias.nyholm@gmail.com>
Date: Fri, 28 Dec 2018 11:29:44 +0100
Subject: [PATCH 3/6] Make them protected

---
 src/Plugin/VersionBridgePlugin.php | 2 +-
 src/VersionBridgeClient.php        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Plugin/VersionBridgePlugin.php b/src/Plugin/VersionBridgePlugin.php
index 3d558c7..e62c980 100644
--- a/src/Plugin/VersionBridgePlugin.php
+++ b/src/Plugin/VersionBridgePlugin.php
@@ -13,7 +13,7 @@
  */
 abstract class VersionBridgePlugin implements Plugin
 {
-    abstract function doHandleRequest(RequestInterface $request, callable $next, callable $first);
+    abstract protected function doHandleRequest(RequestInterface $request, callable $next, callable $first);
 
     /**
      * {@inheritdoc}
diff --git a/src/VersionBridgeClient.php b/src/VersionBridgeClient.php
index 286bcca..6e841fd 100644
--- a/src/VersionBridgeClient.php
+++ b/src/VersionBridgeClient.php
@@ -15,7 +15,7 @@
  */
 abstract class VersionBridgeClient implements HttpClient
 {
-    abstract public function doSendRequest(RequestInterface $request);
+    abstract protected function doSendRequest(RequestInterface $request);
 
     public function sendRequest(RequestInterface $request)
     {

From ac081042263f491ffe92e74c99013b7263c5cf62 Mon Sep 17 00:00:00 2001
From: Tobias Nyholm <tobias.nyholm@gmail.com>
Date: Fri, 28 Dec 2018 11:32:40 +0100
Subject: [PATCH 4/6] cs

---
 src/Plugin/VersionBridgePlugin.php | 3 ---
 src/VersionBridgeClient.php        | 4 +---
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/Plugin/VersionBridgePlugin.php b/src/Plugin/VersionBridgePlugin.php
index e62c980..d5bc89e 100644
--- a/src/Plugin/VersionBridgePlugin.php
+++ b/src/Plugin/VersionBridgePlugin.php
@@ -15,9 +15,6 @@ abstract class VersionBridgePlugin implements Plugin
 {
     abstract protected function doHandleRequest(RequestInterface $request, callable $next, callable $first);
 
-    /**
-     * {@inheritdoc}
-     */
     public function handleRequest(RequestInterface $request, callable $next, callable $first)
     {
         return $this->doHandleRequest($request, $next, $first);
diff --git a/src/VersionBridgeClient.php b/src/VersionBridgeClient.php
index 6e841fd..2ff76f4 100644
--- a/src/VersionBridgeClient.php
+++ b/src/VersionBridgeClient.php
@@ -1,11 +1,9 @@
 <?php
 
-namespace Http\Client\Common\Plugin;
+namespace Http\Client\Common;
 
-use Http\Client\Common\Plugin;
 use Http\Client\HttpClient;
 use Psr\Http\Message\RequestInterface;
-use Psr\Http\Message\ResponseInterface;
 
 /**
  * A client that helps you migrate from php-http/httplug 1.x to 2.x. This

From 46f3f39e021e02cdd8dedc73a04713c050ee18dc Mon Sep 17 00:00:00 2001
From: Nyholm <tobias.nyholm@gmail.com>
Date: Sat, 29 Dec 2018 08:47:52 +0100
Subject: [PATCH 5/6] Use traits

---
 src/Plugin/VersionBridgePlugin.php | 2 +-
 src/VersionBridgeClient.php        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Plugin/VersionBridgePlugin.php b/src/Plugin/VersionBridgePlugin.php
index d5bc89e..d04927b 100644
--- a/src/Plugin/VersionBridgePlugin.php
+++ b/src/Plugin/VersionBridgePlugin.php
@@ -11,7 +11,7 @@
  *
  * @author Tobias Nyholm <tobias.nyholm@gmail.com>
  */
-abstract class VersionBridgePlugin implements Plugin
+trait VersionBridgePlugin
 {
     abstract protected function doHandleRequest(RequestInterface $request, callable $next, callable $first);
 
diff --git a/src/VersionBridgeClient.php b/src/VersionBridgeClient.php
index 2ff76f4..52632d4 100644
--- a/src/VersionBridgeClient.php
+++ b/src/VersionBridgeClient.php
@@ -11,7 +11,7 @@
  *
  * @author Tobias Nyholm <tobias.nyholm@gmail.com>
  */
-abstract class VersionBridgeClient implements HttpClient
+trait VersionBridgeClient
 {
     abstract protected function doSendRequest(RequestInterface $request);
 

From 7c8f75c0682ba3dd405f8589ef000e1c49c9ac18 Mon Sep 17 00:00:00 2001
From: Nyholm <tobias.nyholm@gmail.com>
Date: Sat, 29 Dec 2018 08:50:48 +0100
Subject: [PATCH 6/6] Use Traits

---
 src/Plugin/VersionBridgePlugin.php | 1 -
 src/VersionBridgeClient.php        | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/Plugin/VersionBridgePlugin.php b/src/Plugin/VersionBridgePlugin.php
index d04927b..f3891e5 100644
--- a/src/Plugin/VersionBridgePlugin.php
+++ b/src/Plugin/VersionBridgePlugin.php
@@ -2,7 +2,6 @@
 
 namespace Http\Client\Common\Plugin;
 
-use Http\Client\Common\Plugin;
 use Psr\Http\Message\RequestInterface;
 
 /**
diff --git a/src/VersionBridgeClient.php b/src/VersionBridgeClient.php
index 52632d4..048eeae 100644
--- a/src/VersionBridgeClient.php
+++ b/src/VersionBridgeClient.php
@@ -2,7 +2,6 @@
 
 namespace Http\Client\Common;
 
-use Http\Client\HttpClient;
 use Psr\Http\Message\RequestInterface;
 
 /**