From c106e1568c1dcca35b93281b7652be8ac5799249 Mon Sep 17 00:00:00 2001
From: Barnaby Walters <barnaby@waterpigs.co.uk>
Date: Wed, 9 Jun 2021 01:14:23 +0200
Subject: [PATCH] Removed some unused use statements, un-required
 psr/http-client

---
 composer.json  |   1 -
 composer.lock  | 106 ++++++++++++++++++++++++-------------------------
 src/Server.php |   3 --
 3 files changed, 53 insertions(+), 57 deletions(-)

diff --git a/composer.json b/composer.json
index aa23462..1966d31 100644
--- a/composer.json
+++ b/composer.json
@@ -25,7 +25,6 @@
         "psr/log": "^1.1",
         "nyholm/psr7": "1.4.x-dev",
         "indieauth/client": "^1.1",
-        "psr/http-client": "^1.0",
         "psr/http-server-middleware": "^1.0",
         "dflydev/fig-cookies": "^3.0",
         "mf2/mf2": "^0.4.6",
diff --git a/composer.lock b/composer.lock
index 8592376..f067d32 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "b0410d716bb0a72d683dd504ec19644d",
+    "content-hash": "6dfa0e018cef496d86d54f6d5fc3d429",
     "packages": [
         {
             "name": "barnabywalters/mf-cleaner",
@@ -572,58 +572,6 @@
             },
             "time": "2015-12-19T14:08:53+00:00"
         },
-        {
-            "name": "psr/http-client",
-            "version": "1.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/http-client.git",
-                "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-client/zipball/2dfb5f6c5eff0e91e20e913f8c5452ed95b86621",
-                "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.0 || ^8.0",
-                "psr/http-message": "^1.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psr\\Http\\Client\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
-                }
-            ],
-            "description": "Common interface for HTTP clients",
-            "homepage": "https://github.com/php-fig/http-client",
-            "keywords": [
-                "http",
-                "http-client",
-                "psr",
-                "psr-18"
-            ],
-            "support": {
-                "source": "https://github.com/php-fig/http-client/tree/master"
-            },
-            "time": "2020-06-29T06:28:15+00:00"
-        },
         {
             "name": "psr/http-factory",
             "version": "1.0.1",
@@ -2040,6 +1988,58 @@
             ],
             "time": "2021-06-05T04:49:07+00:00"
         },
+        {
+            "name": "psr/http-client",
+            "version": "1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/http-client.git",
+                "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/http-client/zipball/2dfb5f6c5eff0e91e20e913f8c5452ed95b86621",
+                "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.0 || ^8.0",
+                "psr/http-message": "^1.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Http\\Client\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for HTTP clients",
+            "homepage": "https://github.com/php-fig/http-client",
+            "keywords": [
+                "http",
+                "http-client",
+                "psr",
+                "psr-18"
+            ],
+            "support": {
+                "source": "https://github.com/php-fig/http-client/tree/master"
+            },
+            "time": "2020-06-29T06:28:15+00:00"
+        },
         {
             "name": "sebastian/cli-parser",
             "version": "1.0.1",
diff --git a/src/Server.php b/src/Server.php
index eddee2a..89766cb 100644
--- a/src/Server.php
+++ b/src/Server.php
@@ -8,8 +8,6 @@ use Mf2;
 use BarnabyWalters\Mf2 as M;
 use GuzzleHttp\Psr7\Header as HeaderParser;
 use Nyholm\Psr7\Response;
-use PHPUnit\Framework\Constraint\Callback;
-use Psr\Http\Client\ClientInterface as HttpClientInterface;
 use Psr\Http\Client\ClientExceptionInterface;
 use Psr\Http\Client\NetworkExceptionInterface;
 use Psr\Http\Client\RequestExceptionInterface;
@@ -20,7 +18,6 @@ use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
 use Taproot\IndieAuth\Callback\AuthorizationFormInterface;
 use Taproot\IndieAuth\Callback\DefaultAuthorizationForm;
-use Taproot\IndieAuth\Middleware\ResponseRequestHandler;
 
 /**
  * Development Reference