Remove connection info from Response

src/Connection/DefaultConnectionPool.php

@@ -10,10 +10,10 @@
 use Amp\Http\Client\SocketException;
 use Amp\Http\Client\TimeoutException;
 use Amp\Promise;
+use Amp\Socket;
 use Amp\Socket\ClientTlsContext;
 use Amp\Socket\ConnectContext;
 use Amp\Socket\Connector;
-use Amp\Socket;
 use Amp\Socket\EncryptableSocket;
 use Amp\TimeoutCancellationToken;
 use function Amp\call;

src/Connection/Http1Connection.php

@@ -77,7 +77,8 @@ public function getTlsInfo(): ?TlsInfo
     }
 
     /** @inheritdoc */
-    public function request(Request $request, ?CancellationToken $cancellation = null): Promise {
+    public function request(Request $request, ?CancellationToken $cancellation = null): Promise
+    {
         return call(function () use ($request, $cancellation) {
             $cancellation = $cancellation ?? new NullCancellationToken;
 
@@ -161,7 +162,7 @@ private function doRead(
                 $backpressure = $bodyEmitter->emit($data);
             };
 
-        $parser = new Http1Parser($request, $this, $bodyCallback);
+        $parser = new Http1Parser($request, $bodyCallback);
 
         try {
             while (null !== $chunk = yield $this->socket->read()) {

src/Connection/Http1Parser.php

@@ -60,9 +60,6 @@ final class Http1Parser
     /** @var string */
     private $request;
 
-    /** @var Connection */
-    private $connection;
-
     /** @var int */
     private $maxHeaderBytes;
 
@@ -72,10 +69,9 @@ final class Http1Parser
     /** @var callable */
     private $bodyDataCallback;
 
-    public function __construct(Request $request, Connection $connection, callable $bodyDataCallback = null)
+    public function __construct(Request $request, callable $bodyDataCallback = null)
     {
         $this->request = $request;
-        $this->connection = $connection;
         $this->bodyDataCallback = $bodyDataCallback;
         $this->maxHeaderBytes = $request->getHeaderSizeLimit();
         $this->maxBodyBytes = $request->getBodySizeLimit();
@@ -173,7 +169,7 @@ public function parse(string $data = null): ?Response
                 $this->complete = true;
             }
 
-            return new Response($this->protocol, $this->statusCode, $this->statusReason, $this->headers, new InMemoryStream, $this->request, $this->connection);
+            return new Response($this->protocol, $this->statusCode, $this->statusReason, $this->headers, new InMemoryStream, $this->request);
         }
 
         body_identity:

src/Internal/NetworkInterceptorClient.php

@@ -5,7 +5,6 @@
 use Amp\CancellationToken;
 use Amp\Http\Client\Client;
 use Amp\Http\Client\Connection\Connection;
-use Amp\Http\Client\ConnectionInfo;
 use Amp\Http\Client\NetworkInterceptor;
 use Amp\Http\Client\Request;
 use Amp\NullCancellationToken;

src/Response.php

@@ -4,11 +4,8 @@
 
 use Amp\ByteStream\InputStream;
 use Amp\ByteStream\Payload;
-use Amp\Http\Client\Connection\Connection;
 use Amp\Http\Message;
 use Amp\Promise;
-use Amp\Socket\SocketAddress;
-use Amp\Socket\TlsInfo;
 use Amp\Success;
 
 /**
@@ -25,7 +22,6 @@ final class Response extends Message
     private $reason;
     private $request;
     private $body;
-    private $connection;
     private $completionPromise;
     private $previousResponse;
 
@@ -36,7 +32,6 @@ public function __construct(
         array $headers,
         InputStream $body,
         Request $request,
-        Connection $connection,
         ?Promise $completionPromise = null,
         ?Response $previousResponse = null
     ) {
@@ -45,7 +40,6 @@ public function __construct(
         $this->reason = $reason;
         $this->body = new Payload($body);
         $this->request = $request;
-        $this->connection = $connection;
         $this->completionPromise = $completionPromise ?? new Success;
         $this->previousResponse = $previousResponse;
 
@@ -220,34 +214,6 @@ public function getBody(): Payload
         return $this->body;
     }
 
-    public function getLocalAddress(): SocketAddress
-    {
-        return $this->connection->getLocalAddress();
-    }
-
-    public function getRemoteAddress(): SocketAddress
-    {
-        return $this->connection->getRemoteAddress();
-    }
-
-    public function getTlsInfo(): ?TlsInfo
-    {
-        return $this->connection->getTlsInfo();
-    }
-
-    public function getCompletionPromise(): Promise
-    {
-        return $this->completionPromise;
-    }
-
-    public function withConnectionInfo(ConnectionInfo $connectionInfo): self
-    {
-        $clone = clone $this;
-        $clone->connection = $connectionInfo;
-
-        return $clone;
-    }
-
     public function withPreviousResponse(?Response $previousResponse): self
     {
         $clone = clone $this;

test/ClientHttpBinIntegrationTest.php

@@ -367,24 +367,6 @@ public function testInfiniteRedirect(): \Generator
         yield $this->executeRequest(new Request("http://httpbin.org/redirect/11"));
     }
 
-    public function testConnectionInfo(): \Generator
-    {
-        /** @var Response $response */
-        $response = yield $this->executeRequest(new Request("https://httpbin.org/get"));
-
-        $this->assertStringContainsString(":", $response->getLocalAddress());
-        $this->assertStringContainsString(":", $response->getRemoteAddress());
-        $this->assertNotNull($response->getTlsInfo());
-        $this->assertSame("TLSv1.2", $response->getTlsInfo()->getVersion());
-        $this->assertNotEmpty($response->getTlsInfo()->getPeerCertificates());
-        $this->assertContains("httpbin.org", $response->getTlsInfo()->getPeerCertificates()[0]->getNames());
-
-        foreach ($response->getTlsInfo()->getPeerCertificates() as $certificate) {
-            $this->assertGreaterThanOrEqual($certificate->getValidFrom(), \time(), "Failed for " . $certificate->getSubject()->getCommonName());
-            $this->assertLessThanOrEqual($certificate->getValidTo(), \time(), "Failed for " . $certificate->getSubject()->getCommonName());
-        }
-    }
-
     public function testRequestCancellation(): \Generator
     {
         $this->givenSlowRawServerResponse(

test/ParserTest.php

@@ -2,7 +2,6 @@
 
 namespace Amp\Http\Client;
 
-use Amp\Http\Client\Connection\Connection;
 use Amp\Http\Client\Connection\Http1Parser;
 use PHPUnit\Framework\TestCase;
 
@@ -11,7 +10,7 @@ class ParserTest extends TestCase
     public function testKeepAliveHeadResponseParse(): void
     {
         $request = "HTTP/1.1 200 OK\r\n\r\n";
-        $parser = new Http1Parser(new Request('/', 'HEAD'), $this->createMock(Connection::class));
+        $parser = new Http1Parser(new Request('/', 'HEAD'));
         $response = $parser->parse($request);
 
         $this->assertEquals(200, $response->getStatus());