Move transport creation to tester

Author: bukka

sapi/fpm/tests/fcgi.inc

@@ -444,24 +444,25 @@ class Client
      */
     private $_readWriteTimeout = 5000;
 
+    /**
+     * Data transport instance
+     * @var Transport
+     */
     private Transport $transport;
 
     /**
      * Constructor
      *
      * @param string $host Host of the FastCGI application
      * @param int $port Port of the FastCGI application
-     * @param string $transport Transport
+     * @param Transport $transport Transport
      */
-    public function __construct($host, $port, string $transport = 'stream')
+    public function __construct($host, $port, Transport $transport)
     {
         $this->_host = $host;
         $this->_port = $port;
 
-        $this->transport = match ($transport) {
-            'stream' => new StreamTransport(),
-            'socket' => new SocketTransport(),
-        };
+        $this->transport = $transport;
     }
 
     /**

sapi/fpm/tests/tester.inc

@@ -3,6 +3,9 @@
 namespace FPM;
 
 use FPM\FastCGI\Client;
+use FPM\FastCGI\SocketTransport;
+use FPM\FastCGI\StreamTransport;
+use FPM\FastCGI\Transport;
 
 require_once 'fcgi.inc';
 require_once 'logreader.inc';
@@ -386,6 +389,19 @@ class Tester
         $this->clientTransport = $clientTransport;
     }
 
+    /**
+     * Creates new client transport.
+     *
+     * @return Transport
+     */
+    private function createTransport()
+    {
+        return match ($this->clientTransport) {
+            'stream' => new StreamTransport(),
+            'socket' => new SocketTransport(),
+        };
+    }
+
     /**
      * @param string $ini
      */
@@ -936,11 +952,11 @@ class Tester
         }
 
         if ( ! $keepAlive) {
-            return new Client($host, $port, $this->clientTransport);
+            return new Client($host, $port, $this->createTransport());
         }
 
         if ( ! isset($this->clients[$host][$port])) {
-            $client = new Client($host, $port, $this->clientTransport);
+            $client = new Client($host, $port, $this->createTransport());
             $client->setKeepAlive(true);
             $this->clients[$host][$port] = $client;
         }