Use only psr18 and not httplug anymore, fix psr7 implementation

joelwurtz · joelwurtz · commit 0243e0c63b41 · 2019-01-21T18:16:40.000+01:00
diff --git a/composer.json b/composer.json
@@ -10,17 +10,15 @@
     ],
     "require": {
         "php": "^7.1",
-        "symfony/options-resolver": "^2.6 || ^3.0 || ^4.0",
-        "php-http/httplug": "^1.0 || ^2.0",
-        "php-http/message-factory": "^1.0.2 || ^2.0",
-        "php-http/discovery": "^1.0"
+        "nyholm/psr7": "^1.0",
+        "psr/http-client": "^1.0",
+        "symfony/options-resolver": "^2.6 || ^3.0 || ^4.0"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^2.2",
-        "guzzlehttp/psr7": "^1.2",
-        "php-http/client-integration-tests": "^1.0 || ^2.0",
+        "php-http/client-integration-tests": "^2.0",
         "php-http/message": "^1.0",
-        "php-http/client-common": "^1.0 || ^2.0"
+        "php-http/client-common": "^2.0"
     },
     "provide": {
         "php-http/client-implementation": "1.0"
diff --git a/src/Client.php b/src/Client.php
@@ -6,8 +6,6 @@
 use Http\Client\Socket\Exception\ConnectionException;
 use Http\Client\Socket\Exception\InvalidRequestException;
 use Http\Client\Socket\Exception\SSLConnectionException;
-use Http\Discovery\MessageFactoryDiscovery;
-use Http\Message\ResponseFactory;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 use Symfony\Component\OptionsResolver\Options;
@@ -38,8 +36,7 @@ class Client implements HttpClient
     /**
      * Constructor.
      *
-     * @param ResponseFactory $responseFactory Response factory for creating response
-     * @param array           $config          {
+     * @param array $config {
      *
      *    @var string $remote_socket          Remote entrypoint (can be a tcp or unix domain address)
      *    @var int    $timeout                Timeout before canceling request
@@ -50,13 +47,8 @@ class Client implements HttpClient
      *    @var int    $ssl_method             Crypto method for ssl/tls, see PHP doc, defaults to STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT
      * }
      */
-    public function __construct(ResponseFactory $responseFactory = null, array $config = [])
+    public function __construct(array $config = [])
     {
-        if (null === $responseFactory) {
-            $responseFactory = MessageFactoryDiscovery::find();
-        }
-
-        $this->responseFactory = $responseFactory;
         $this->config = $this->configure($config);
     }
 
diff --git a/src/Exception/BrokenPipeException.php b/src/Exception/BrokenPipeException.php
@@ -2,8 +2,6 @@
 
 namespace Http\Client\Socket\Exception;
 
-use Http\Client\Exception\NetworkException;
-
 class BrokenPipeException extends NetworkException
 {
 }
diff --git a/src/Exception/ConnectionException.php b/src/Exception/ConnectionException.php
@@ -2,8 +2,6 @@
 
 namespace Http\Client\Socket\Exception;
 
-use Http\Client\Exception\NetworkException;
-
 class ConnectionException extends NetworkException
 {
 }
diff --git a/src/Exception/InvalidRequestException.php b/src/Exception/InvalidRequestException.php
@@ -2,8 +2,6 @@
 
 namespace Http\Client\Socket\Exception;
 
-use Http\Client\Exception\NetworkException;
-
 class InvalidRequestException extends NetworkException
 {
 }
diff --git a/src/Exception/NetworkException.php b/src/Exception/NetworkException.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Http\Client\Socket\Exception;
+
+use Psr\Http\Client\NetworkExceptionInterface;
+use Psr\Http\Message\RequestInterface;
+
+class NetworkException extends \RuntimeException implements NetworkExceptionInterface
+{
+    private $request;
+
+    public function __construct(string $message, RequestInterface $request, \Exception $previous = null)
+    {
+        $this->request = $request;
+
+        parent::__construct($message, 0, $previous);
+    }
+
+    public function getRequest(): RequestInterface
+    {
+        return $this->request;
+    }
+}
diff --git a/src/Exception/SSLConnectionException.php b/src/Exception/SSLConnectionException.php
@@ -2,8 +2,6 @@
 
 namespace Http\Client\Socket\Exception;
 
-use Http\Client\Exception\NetworkException;
-
 class SSLConnectionException extends NetworkException
 {
 }
diff --git a/src/Exception/StreamException.php b/src/Exception/StreamException.php
@@ -2,37 +2,8 @@
 
 namespace Http\Client\Socket\Exception;
 
-use Http\Client\Exception;
-use Psr\Http\Message\RequestInterface;
+use Psr\Http\Client\ClientExceptionInterface;
 
-class StreamException extends \RuntimeException implements Exception
+class StreamException extends \RuntimeException implements ClientExceptionInterface
 {
-    /**
-     * The request object.
-     *
-     * @var RequestInterface
-     */
-    private $request;
-
-    /**
-     * Accepts an optional request object as 4th param.
-     *
-     * @param string           $message
-     * @param int              $code
-     * @param Exception        $previous
-     * @param RequestInterface $request
-     */
-    public function __construct($message = null, $code = null, $previous = null, RequestInterface $request = null)
-    {
-        $this->request = $request;
-        parent::__construct($message, $code, $previous);
-    }
-
-    /**
-     * @return \Psr\Http\Message\RequestInterface|null
-     */
-    final public function getRequest()
-    {
-        return $this->request;
-    }
 }
diff --git a/src/Exception/TimeoutException.php b/src/Exception/TimeoutException.php
@@ -2,6 +2,6 @@
 
 namespace Http\Client\Socket\Exception;
 
-class TimeoutException extends StreamException
+class TimeoutException extends NetworkException
 {
 }
diff --git a/src/ResponseReader.php b/src/ResponseReader.php
@@ -5,6 +5,7 @@
 use Http\Client\Socket\Exception\BrokenPipeException;
 use Http\Client\Socket\Exception\TimeoutException;
 use Http\Message\ResponseFactory;
+use Nyholm\Psr7\Response;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 
@@ -76,8 +77,8 @@ protected function readResponse(RequestInterface $request, $socket): ResponseInt
                 : '';
         }
 
-        $response = $this->responseFactory->createResponse($status, $reason, $responseHeaders, null, $protocol);
-        $stream = $this->createStream($socket, $response);
+        $response = new Response($status, $responseHeaders, null, $protocol, $reason);
+        $stream = $this->createStream($socket, $request, $response);
 
         return $response->withBody($stream);
     }
@@ -87,14 +88,14 @@ protected function readResponse(RequestInterface $request, $socket): ResponseInt
      *
      * @param resource $socket
      */
-    protected function createStream($socket, ResponseInterface $response): Stream
+    protected function createStream($socket, RequestInterface $request, ResponseInterface $response): Stream
     {
         $size = null;
 
         if ($response->hasHeader('Content-Length')) {
             $size = (int) $response->getHeaderLine('Content-Length');
         }
 
-        return new Stream($socket, $size);
+        return new Stream($request, $socket, $size);
     }
 }
diff --git a/src/Stream.php b/src/Stream.php
@@ -4,6 +4,7 @@
 
 use Http\Client\Socket\Exception\StreamException;
 use Http\Client\Socket\Exception\TimeoutException;
+use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\StreamInterface;
 
 /**
@@ -42,16 +43,21 @@ class Stream implements StreamInterface
      */
     private $readed = 0;
 
+    /**
+     * @var RequestInterface request associated to this stream
+     */
+    private $request;
+
     /**
      * Create the stream.
      *
      * @param resource $socket
-     * @param int      $size
      */
-    public function __construct($socket, ?int $size = null)
+    public function __construct(RequestInterface $request, $socket, ?int $size = null)
     {
         $this->socket = $socket;
         $this->size = $size;
+        $this->request = $request;
     }
 
     /**
@@ -175,7 +181,7 @@ public function read($length)
         $read = fread($this->socket, $length);
 
         if ($this->getMetadata('timed_out')) {
-            throw new TimeoutException('Stream timed out while reading data');
+            throw new TimeoutException('Stream timed out while reading data', $this->request);
         }
 
         $this->readed += strlen($read);
diff --git a/tests/SocketHttpClientTest.php b/tests/SocketHttpClientTest.php
@@ -12,7 +12,7 @@ public function createClient($options = [])
     {
         $messageFactory = new GuzzleMessageFactory();
 
-        return new HttpMethodsClient(new SocketHttpClient($messageFactory, $options), $messageFactory);
+        return new HttpMethodsClient(new SocketHttpClient($options), $messageFactory);
     }
 
     public function testTcpSocketDomain()
@@ -26,7 +26,7 @@ public function testTcpSocketDomain()
     }
 
     /**
-     * @expectedException \Http\Client\Exception\NetworkException
+     * @expectedException \Http\Client\Socket\Exception\NetworkException
      */
     public function testNoRemote()
     {
@@ -55,7 +55,7 @@ public function testRemoteInHostHeader()
     }
 
     /**
-     * @expectedException \Http\Client\Exception\NetworkException
+     * @expectedException \Http\Client\Socket\Exception\NetworkException
      */
     public function testBrokenSocket()
     {
@@ -95,7 +95,7 @@ public function testUnixSocketDomain()
     }
 
     /**
-     * @expectedException \Http\Client\Exception\NetworkException
+     * @expectedException \Http\Client\Socket\Exception\NetworkException
      */
     public function testNetworkExceptionOnConnectError()
     {
@@ -173,7 +173,7 @@ public function testInvalidSslConnectionWithClientCertificate()
     }
 
     /**
-     * @expectedException \Http\Client\Exception\NetworkException
+     * @expectedException \Http\Client\Socket\Exception\NetworkException
      */
     public function testNetworkExceptionOnSslError()
     {
@@ -184,7 +184,7 @@ public function testNetworkExceptionOnSslError()
     }
 
     /**
-     * @expectedException \Http\Client\Exception\NetworkException
+     * @expectedException \Http\Client\Socket\Exception\NetworkException
      */
     public function testNetworkExceptionOnTimeout()
     {
diff --git a/tests/StreamTest.php b/tests/StreamTest.php
@@ -3,6 +3,7 @@
 namespace Http\Client\Socket\Tests;
 
 use Http\Client\Socket\Stream;
+use Nyholm\Psr7\Request;
 use PHPUnit\Framework\TestCase;
 
 class StreamTest extends TestCase
@@ -13,7 +14,7 @@ public function createSocket($body, $useSize = true)
         fwrite($socket, $body);
         fseek($socket, 0);
 
-        return new Stream($socket, $useSize ? strlen($body) : null);
+        return new Stream(new Request('GET', '/'), $socket, $useSize ? strlen($body) : null);
     }
 
     public function testToString()
@@ -56,7 +57,7 @@ public function testEof()
         $socket = fopen('php://memory', 'rw+');
         fwrite($socket, 'Body');
         fseek($socket, 0);
-        $stream = new Stream($socket);
+        $stream = new Stream(new Request('GET', '/'), $socket);
 
         $this->assertEquals('Body', $stream->getContents());
         fwrite($socket, "\0");
@@ -116,7 +117,7 @@ public function testTimeout()
         $socket = fsockopen('php.net', 80);
         socket_set_timeout($socket, 0, 100);
 
-        $stream = new Stream($socket, 50);
+        $stream = new Stream(new Request('GET', '/'), $socket, 50);
         $stream->getContents();
     }
 
@@ -138,7 +139,7 @@ public function testClose()
         fwrite($socket, 'Body');
         fseek($socket, 0);
 
-        $stream = new Stream($socket);
+        $stream = new Stream(new Request('GET', '/'), $socket);
         $stream->close();
 
         $this->assertFalse(is_resource($socket));

Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,6 @@`
`2`	`2`
`3`	`3`	`namespace Http\Client\Socket\Exception;`
`4`	`4`
`5`		`-use Http\Client\Exception\NetworkException;`
`6`		`-`
`7`	`5`	`class BrokenPipeException extends NetworkException`
`8`	`6`	`{`
`9`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,6 @@`
`2`	`2`
`3`	`3`	`namespace Http\Client\Socket\Exception;`
`4`	`4`
`5`		`-class TimeoutException extends StreamException`
	`5`	`+class TimeoutException extends NetworkException`
`6`	`6`	`{`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`use Http\Client\Socket\Exception\BrokenPipeException;`
`6`	`6`	`use Http\Client\Socket\Exception\TimeoutException;`
`7`	`7`	`use Http\Message\ResponseFactory;`
	`8`	`+use Nyholm\Psr7\Response;`
`8`	`9`	`use Psr\Http\Message\RequestInterface;`
`9`	`10`	`use Psr\Http\Message\ResponseInterface;`
`10`	`11`
`@@ -76,8 +77,8 @@ protected function readResponse(RequestInterface $request, $socket): ResponseInt`
`76`	`77`	`: '';`
`77`	`78`	`}`
`78`	`79`
`79`		`- $response = $this->responseFactory->createResponse($status, $reason, $responseHeaders, null, $protocol);`
`80`		`- $stream = $this->createStream($socket, $response);`
	`80`	`+ $response = new Response($status, $responseHeaders, null, $protocol, $reason);`
	`81`	`+ $stream = $this->createStream($socket, $request, $response);`
`81`	`82`
`82`	`83`	`return $response->withBody($stream);`
`83`	`84`	`}`
`@@ -87,14 +88,14 @@ protected function readResponse(RequestInterface $request, $socket): ResponseInt`
`87`	`88`	`*`
`88`	`89`	`* @param resource $socket`
`89`	`90`	`*/`
`90`		`- protected function createStream($socket, ResponseInterface $response): Stream`
	`91`	`+ protected function createStream($socket, RequestInterface $request, ResponseInterface $response): Stream`
`91`	`92`	`{`
`92`	`93`	`$size = null;`
`93`	`94`
`94`	`95`	`if ($response->hasHeader('Content-Length')) {`
`95`	`96`	`$size = (int) $response->getHeaderLine('Content-Length');`
`96`	`97`	`}`
`97`	`98`
`98`		`- return new Stream($socket, $size);`
	`99`	`+ return new Stream($request, $socket, $size);`
`99`	`100`	`}`
`100`	`101`	`}`