From 957426eac1224a1be7bede8ca4819ff14e2804e2 Mon Sep 17 00:00:00 2001
From: Niklas Keller <me@kelunik.com>
Date: Mon, 12 Aug 2019 23:28:38 +0200
Subject: [PATCH] Rename request header interceptors

These are specific to requests, we probably want the same set of interceptors for responses.
---
 src/Client.php                                              | 6 +++---
 src/Interceptor/{AddHeader.php => AddRequestHeader.php}     | 2 +-
 .../{RemoveHeader.php => RemoveRequestHeader.php}           | 2 +-
 src/Interceptor/{SetHeader.php => SetRequestHeader.php}     | 2 +-
 .../{SetDefaultHeader.php => SetRequestHeaderIfUnset.php}   | 2 +-
 test/ClientHttpBinIntegrationTest.php                       | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)
 rename src/Interceptor/{AddHeader.php => AddRequestHeader.php} (87%)
 rename src/Interceptor/{RemoveHeader.php => RemoveRequestHeader.php} (85%)
 rename src/Interceptor/{SetHeader.php => SetRequestHeader.php} (87%)
 rename src/Interceptor/{SetDefaultHeader.php => SetRequestHeaderIfUnset.php} (89%)

diff --git a/src/Client.php b/src/Client.php
index b69e08c6..1279b5da 100644
--- a/src/Client.php
+++ b/src/Client.php
@@ -6,7 +6,7 @@
 use Amp\Http\Client\Connection\ConnectionPool;
 use Amp\Http\Client\Connection\DefaultConnectionPool;
 use Amp\Http\Client\Connection\Stream;
-use Amp\Http\Client\Interceptor\SetDefaultHeader;
+use Amp\Http\Client\Interceptor\SetRequestHeaderIfUnset;
 use Amp\Http\Client\Internal\InterceptedStream;
 use Amp\NullCancellationToken;
 use Amp\Promise;
@@ -35,8 +35,8 @@ public function __construct(?ConnectionPool $connectionPool = null)
 
         // We want to set these by default if the user doesn't choose otherwise
         $this->defaultNetworkInterceptors = [
-            new SetDefaultHeader('accept', '*/*'),
-            new SetDefaultHeader('user-agent', 'amphp/http-client (v4.0.0-dev)'),
+            new SetRequestHeaderIfUnset('accept', '*/*'),
+            new SetRequestHeaderIfUnset('user-agent', 'amphp/http-client (v4.0.0-dev)'),
         ];
     }
 
diff --git a/src/Interceptor/AddHeader.php b/src/Interceptor/AddRequestHeader.php
similarity index 87%
rename from src/Interceptor/AddHeader.php
rename to src/Interceptor/AddRequestHeader.php
index 0467b165..4eb6b72e 100644
--- a/src/Interceptor/AddHeader.php
+++ b/src/Interceptor/AddRequestHeader.php
@@ -4,7 +4,7 @@
 
 use Amp\Http\Client\Request;
 
-final class AddHeader extends ModifyRequest
+final class AddRequestHeader extends ModifyRequest
 {
     public function __construct(string $headerName, string ...$headerValues)
     {
diff --git a/src/Interceptor/RemoveHeader.php b/src/Interceptor/RemoveRequestHeader.php
similarity index 85%
rename from src/Interceptor/RemoveHeader.php
rename to src/Interceptor/RemoveRequestHeader.php
index 5ff39474..281a2077 100644
--- a/src/Interceptor/RemoveHeader.php
+++ b/src/Interceptor/RemoveRequestHeader.php
@@ -5,7 +5,7 @@
 
 use Amp\Http\Client\Request;
 
-final class RemoveHeader extends ModifyRequest
+final class RemoveRequestHeader extends ModifyRequest
 {
     public function __construct(string $headerName)
     {
diff --git a/src/Interceptor/SetHeader.php b/src/Interceptor/SetRequestHeader.php
similarity index 87%
rename from src/Interceptor/SetHeader.php
rename to src/Interceptor/SetRequestHeader.php
index df22f64e..5ee9fdad 100644
--- a/src/Interceptor/SetHeader.php
+++ b/src/Interceptor/SetRequestHeader.php
@@ -4,7 +4,7 @@
 
 use Amp\Http\Client\Request;
 
-final class SetHeader extends ModifyRequest
+final class SetRequestHeader extends ModifyRequest
 {
     public function __construct(string $headerName, string ...$headerValues)
     {
diff --git a/src/Interceptor/SetDefaultHeader.php b/src/Interceptor/SetRequestHeaderIfUnset.php
similarity index 89%
rename from src/Interceptor/SetDefaultHeader.php
rename to src/Interceptor/SetRequestHeaderIfUnset.php
index 0d3b3fa4..45a142ef 100644
--- a/src/Interceptor/SetDefaultHeader.php
+++ b/src/Interceptor/SetRequestHeaderIfUnset.php
@@ -4,7 +4,7 @@
 
 use Amp\Http\Client\Request;
 
-final class SetDefaultHeader extends ModifyRequest
+final class SetRequestHeaderIfUnset extends ModifyRequest
 {
     public function __construct(string $headerName, string $headerValue, string ...$headerValues)
     {
diff --git a/test/ClientHttpBinIntegrationTest.php b/test/ClientHttpBinIntegrationTest.php
index 8157c18e..a0d363f8 100644
--- a/test/ClientHttpBinIntegrationTest.php
+++ b/test/ClientHttpBinIntegrationTest.php
@@ -11,7 +11,7 @@
 use Amp\Delayed;
 use Amp\Http\Client\Body\FileBody;
 use Amp\Http\Client\Body\FormBody;
-use Amp\Http\Client\Interceptor\SetDefaultHeader;
+use Amp\Http\Client\Interceptor\SetRequestHeaderIfUnset;
 use Amp\Http\Client\Interceptor\FollowRedirects;
 use Amp\Http\Client\Interceptor\DecompressResponse;
 use Amp\Http\Client\Interceptor\TooManyRedirectsException;
@@ -114,7 +114,7 @@ public function testDefaultUserAgentSent(): \Generator
     {
         $uri = 'http://httpbin.org/user-agent';
 
-        $this->givenNetworkInterceptor(new SetDefaultHeader('user-agent', 'amphp/http-client'));
+        $this->givenNetworkInterceptor(new SetRequestHeaderIfUnset('user-agent', 'amphp/http-client'));
 
         /** @var Response $response */
         $response = yield $this->executeRequest(new Request($uri));