Rename request header interceptors

These are specific to requests, we probably want the same set of interceptors for responses.
amphp · Aug 12, 2019 · 957426e · 957426e
1 parent c48b355
commit 957426e
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git 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 → src/Interceptor/AddRequestHeader.php b/src/Interceptor/AddHeader.php → 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 → src/Interceptor/RemoveRequestHeader.php b/src/Interceptor/RemoveHeader.php → 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 → src/Interceptor/SetRequestHeader.php b/src/Interceptor/SetHeader.php → 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 → src/Interceptor/SetRequestHeaderIfUnset.php b/src/Interceptor/SetDefaultHeader.php → 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
@@ -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));