use psr factory and cs fixes

phpunit.xml.dist

@@ -8,7 +8,6 @@
   <testsuites>
     <testsuite name="Socket Client Test Suite">
       <directory>tests/</directory>
-      <exclude>tests/SocketClientFeatureTest.php</exclude>
     </testsuite>
   </testsuites>
   <php>

src/Client.php

@@ -59,9 +59,6 @@ public function __construct($config1 = [], $config2 = null, array $config = [])
         $this->config = $this->configure($config2 ?: $config);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function sendRequest(RequestInterface $request): ResponseInterface
     {
         $remote = $this->config['remote_socket'];
@@ -100,9 +97,9 @@ public function sendRequest(RequestInterface $request): ResponseInterface
      * @param string           $remote  Entrypoint for the connection
      * @param bool             $useSsl  Whether to use ssl or not
      *
-     * @throws ConnectionException|SSLConnectionException When the connection fail
-     *
      * @return resource Socket resource
+     *
+     * @throws ConnectionException|SSLConnectionException When the connection fail
      */
     protected function createSocket(RequestInterface $request, string $remote, bool $useSsl)
     {
@@ -174,9 +171,9 @@ protected function configure(array $config = [])
     /**
      * Return remote socket from the request.
      *
-     * @throws InvalidRequestException When no remote can be determined from the request
-     *
      * @return string
+     *
+     * @throws InvalidRequestException When no remote can be determined from the request
      */
     private function determineRemoteFromRequest(RequestInterface $request)
     {

src/Exception/NetworkException.php

@@ -12,7 +12,7 @@ class NetworkException extends \RuntimeException implements NetworkExceptionInte
      */
     private $request;
 
-    public function __construct(string $message, RequestInterface $request, \Exception $previous = null)
+    public function __construct(string $message, RequestInterface $request, ?\Exception $previous = null)
     {
         $this->request = $request;
 

src/RequestWriter.php

@@ -123,6 +123,7 @@ private function fwrite($stream, string $bytes)
             // The write worked or failed explicitly. This value is fine to return.
             return $result;
         }
+
         // We performed a 0-length write, were told that the stream was writable, and
         // then immediately performed another 0-length write. Conclude that the pipe
         // is broken and return `false`.

src/ResponseReader.php

@@ -4,9 +4,9 @@
 
 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\ResponseFactoryInterface;
 use Psr\Http\Message\ResponseInterface;
 
 /**
@@ -19,7 +19,7 @@
 trait ResponseReader
 {
     /**
-     * @var ResponseFactory For creating response
+     * @var ResponseFactoryInterface For creating response
      */
     protected $responseFactory;
 

src/Stream.php

@@ -91,8 +91,6 @@ public function detach()
     }
 
     /**
-     * {@inheritdoc}
-     *
      * @return int<0, max>|null
      */
     public function getSize(): ?int
@@ -153,8 +151,6 @@ public function isReadable(): bool
     }
 
     /**
-     * {@inheritdoc}
-     *
      * @param int<0, max> $length
      */
     public function read($length): string

tests/SocketHttpAdapterTest.php

@@ -8,9 +8,6 @@
 
 class SocketHttpAdapterTest extends HttpClientTest
 {
-    /**
-     * {@inheritdoc}
-     */
     protected function createHttpAdapter(): ClientInterface
     {
         return new SocketHttpClient();

tests/SocketHttpClientTest.php

@@ -2,17 +2,17 @@
 
 namespace Http\Client\Socket\Tests;
 
+use GuzzleHttp\Psr7\HttpFactory;
 use Http\Client\Common\HttpMethodsClient;
 use Http\Client\Socket\Client as SocketHttpClient;
 use Http\Client\Socket\Exception\NetworkException;
 use Http\Client\Socket\Exception\TimeoutException;
-use Http\Message\MessageFactory\GuzzleMessageFactory;
 
 class SocketHttpClientTest extends BaseTestCase
 {
     public function createClient($options = [])
     {
-        $messageFactory = new GuzzleMessageFactory();
+        $messageFactory = new HttpFactory();
 
         return new HttpMethodsClient(new SocketHttpClient($options), $messageFactory);
     }

tests/server/tcp-bugous-server.php

@@ -6,4 +6,4 @@
 $client = stream_socket_accept($socketServer);
 
 fclose($client);
-\Http\Client\Socket\Tests\Semaphore::release();
+Http\Client\Socket\Tests\Semaphore::release();

tests/server/tcp-server.php

@@ -16,4 +16,4 @@
 while (!@feof($client)) {
     @fread($client, 1000);
 }
-\Http\Client\Socket\Tests\Semaphore::release();
+Http\Client\Socket\Tests\Semaphore::release();

tests/server/tcp-ssl-server-client.php

@@ -46,4 +46,4 @@
 while (!@feof($client)) {
     @fread($client, 1000);
 }
-\Http\Client\Socket\Tests\Semaphore::release();
+Http\Client\Socket\Tests\Semaphore::release();

tests/server/tcp-ssl-server.php

@@ -35,4 +35,4 @@
     @fread($client, 1000);
 }
 
-\Http\Client\Socket\Tests\Semaphore::release();
+Http\Client\Socket\Tests\Semaphore::release();

tests/server/unix-domain-server.php

@@ -22,4 +22,4 @@
 }
 
 unlink(__DIR__.'/server.sock');
-\Http\Client\Socket\Tests\Semaphore::release();
+Http\Client\Socket\Tests\Semaphore::release();