fixed tests

Author: Nyholm

src/Driver/Userland/Connection/StreamSocketConnectionPool.php

@@ -37,7 +37,7 @@ final class StreamSocketConnectionPool implements ConnectionPoolInterface
      */
     public function __construct($socket)
     {
-        stream_set_blocking($socket, 0);
+        stream_set_blocking($socket, false);
 
         $this->serverSocket  = $socket;
         $this->clientSockets = [];
@@ -152,7 +152,7 @@ private function acceptConnection(): void
         $clientSocket = @stream_socket_accept($this->serverSocket);
 
         if (false !== $clientSocket) {
-            stream_set_blocking($clientSocket, 0);
+            stream_set_blocking($clientSocket, false);
 
             $connection = new StreamSocketConnection($clientSocket);
 

src/Driver/Userland/ConnectionHandler/ConnectionHandler.php

@@ -90,7 +90,7 @@ public function ready(): array
             while (!empty($record = $this->readRecord())) {
                 $statusCode = $this->processRecord($record);
 
-                if (null != $statusCode) {
+                if (null !== $statusCode) {
                     $statusCodes[] = $statusCode;
                 }
             }
@@ -180,11 +180,11 @@ private function readRecord(): array
      *
      * @param array $record The record that has been read
      *
-     * @return int Number of dispatched requests
+     * @return null|int Number of dispatched requests
      *
      * @throws ProtocolException If the client sends an unexpected record.
      */
-    private function processRecord(array $record): int
+    private function processRecord(array $record): ?int
     {
         $requestId = $record['requestId'];
 
@@ -195,7 +195,7 @@ private function processRecord(array $record): int
         } elseif (!isset($this->requests[$requestId])) {
             throw new ProtocolException('Invalid request id for record of type: '.$record['type']);
         } elseif (DaemonInterface::FCGI_PARAMS === $record['type']) {
-            while (strlen($content) > 0) {
+            while (null !== $content && strlen($content) > 0) {
                 $this->readNameValuePair($requestId, $content);
             }
         } elseif (DaemonInterface::FCGI_STDIN === $record['type']) {
@@ -218,11 +218,11 @@ private function processRecord(array $record): int
      * Process a FCGI_BEGIN_REQUEST record.
      *
      * @param int    $requestId   The request id sending the record
-     * @param string $contentData The content of the record
+     * @param null|string $contentData The content of the record
      *
      * @throws ProtocolException If the FCGI_BEGIN_REQUEST record is unexpected
      */
-    private function processBeginRequestRecord(int $requestId, string $contentData): void
+    private function processBeginRequestRecord(int $requestId, ?string $contentData): void
     {
         if (isset($this->requests[$requestId])) {
             throw new ProtocolException('Unexpected FCGI_BEGIN_REQUEST record');
@@ -257,9 +257,9 @@ private function processBeginRequestRecord(int $requestId, string $contentData):
      * Read a FastCGI name-value pair from a buffer and add it to the request params.
      *
      * @param int    $requestId The request id that sent the name-value pair
-     * @param string $buffer    The buffer to read the pair from (pass by reference)
+     * @param null|string $buffer    The buffer to read the pair from (pass by reference)
      */
-    private function readNameValuePair(int $requestId, string &$buffer): void
+    private function readNameValuePair(int $requestId, ?string &$buffer): void
     {
         $nameLength  = $this->readFieldLength($buffer);
         $valueLength = $this->readFieldLength($buffer);

test/CallbackKernelTest.php

@@ -18,7 +18,7 @@ class CallbackKernelTest extends TestCase
      */
     public function testInvalidArgumentException()
     {
-        $this->expectException(\InvalidArgumentException::class);
+        $this->expectException(\TypeError::class);
         new CallbackKernel('not a callable function');
     }
 

test/Helper/Mocker/Driver/Connection/MockConnection.php

@@ -9,23 +9,23 @@ class MockConnection implements ConnectionInterface
 {
     use MockerTrait;
 
-    public function read($length)
+    public function read(int $length): string
     {
-        return $this->delegateCall('read', func_get_args());
+        $this->delegateCall('read', func_get_args());
     }
 
-    public function write($buffer)
+    public function write(string $buffer): void
     {
-        return $this->delegateCall('write', func_get_args());
+        $this->delegateCall('write', func_get_args());
     }
 
-    public function isClosed()
+    public function isClosed(): bool
     {
         return $this->delegateCall('isClosed', func_get_args());
     }
 
-    public function close()
+    public function close(): void
     {
-        return $this->delegateCall('close', func_get_args());
+        $this->delegateCall('close', func_get_args());
     }
 }

test/Helper/Mocker/Driver/Connection/MockConnectionPool.php

@@ -9,23 +9,23 @@ class MockConnectionPool implements ConnectionPoolInterface
 {
     use MockerTrait;
 
-    public function getReadableConnections($timeout)
+    public function getReadableConnections(int $timeout): array
     {
         return $this->delegateCall('getReadableConnections', func_get_args());
     }
 
-    public function count()
+    public function count(): int
     {
         return $this->delegateCall('count', func_get_args());
     }
 
-    public function shutdown()
+    public function shutdown(): void
     {
-        return $this->delegateCall('shutdown', func_get_args());
+        $this->delegateCall('shutdown', func_get_args());
     }
 
-    public function close()
+    public function close(): void
     {
-        return $this->delegateCall('close', func_get_args());
+        $this->delegateCall('close', func_get_args());
     }
 }

test/Helper/Mocker/Driver/ConnectionHandler/MockConnectionHandler.php

@@ -9,22 +9,22 @@ class MockConnectionHandler implements ConnectionHandlerInterface
 {
     use MockerTrait;
 
-    public function ready()
+    public function ready(): array
     {
         return $this->delegateCall('ready', func_get_args());
     }
 
-    public function shutdown()
+    public function shutdown(): void
     {
-        return $this->delegateCall('shutdown', func_get_args());
+        $this->delegateCall('shutdown', func_get_args());
     }
 
-    public function close()
+    public function close(): void
     {
-        return $this->delegateCall('close', func_get_args());
+        $this->delegateCall('close', func_get_args());
     }
 
-    public function isClosed()
+    public function isClosed(): bool
     {
         return $this->delegateCall('isClosed', func_get_args());
     }

test/Helper/Mocker/Driver/ConnectionHandler/MockConnectionHandlerFactory.php

@@ -2,6 +2,7 @@
 
 namespace PHPFastCGI\Test\FastCGIDaemon\Helper\Mocker\Driver\ConnectionHandler;
 
+use PHPFastCGI\FastCGIDaemon\Driver\Userland\ConnectionHandler\ConnectionHandlerInterface;
 use PHPFastCGI\FastCGIDaemon\KernelInterface;
 use PHPFastCGI\FastCGIDaemon\Driver\Userland\Connection\ConnectionInterface;
 use PHPFastCGI\FastCGIDaemon\Driver\Userland\ConnectionHandler\ConnectionHandlerFactoryInterface;
@@ -11,7 +12,7 @@ class MockConnectionHandlerFactory implements ConnectionHandlerFactoryInterface
 {
     use MockerTrait;
 
-    public function createConnectionHandler(KernelInterface $kernel, ConnectionInterface $connection)
+    public function createConnectionHandler(KernelInterface $kernel, ConnectionInterface $connection): ConnectionHandlerInterface
     {
         return $this->delegateCall('createConnectionHandler', func_get_args());
     }

test/Helper/Mocker/Driver/MockDriverContainer.php

@@ -2,14 +2,15 @@
 
 namespace PHPFastCGI\Test\FastCGIDaemon\Helper\Mocker\Driver;
 
+use PHPFastCGI\FastCGIDaemon\DaemonFactoryInterface;
 use PHPFastCGI\FastCGIDaemon\Driver\DriverContainerInterface;
 use PHPFastCGI\Test\FastCGIDaemon\Helper\Mocker\MockerTrait;
 
 class MockDriverContainer implements DriverContainerInterface
 {
     use MockerTrait;
 
-    public function getFactory($driver)
+    public function getFactory(string $driver): DaemonFactoryInterface
     {
         return $this->delegateCall('getFactory', func_get_args());
     }

test/Helper/Mocker/MockDaemon.php

@@ -8,13 +8,13 @@ class MockDaemon implements DaemonInterface
 {
     use MockerTrait;
 
-    public function run()
+    public function run(): void
     {
-        return $this->delegateCall('run', func_get_args());
+        $this->delegateCall('run', func_get_args());
     }
 
-    public function flagShutdown($message = null)
+    public function flagShutdown(string $message = null): void
     {
-        return $this->delegateCall('flagShutdown', func_get_args());
+        $this->delegateCall('flagShutdown', func_get_args());
     }
 }

test/Helper/Mocker/MockDaemonFactory.php

@@ -11,12 +11,12 @@ class MockDaemonFactory implements DaemonFactoryInterface
 {
     use MockerTrait;
 
-    public function createDaemon(KernelInterface $kernel, DaemonOptions $options, $fd = DaemonInterface::FCGI_LISTENSOCK_FILENO)
+    public function createDaemon(KernelInterface $kernel, DaemonOptions $options, int $fd = DaemonInterface::FCGI_LISTENSOCK_FILENO): DaemonInterface
     {
         return $this->delegateCall('createDaemon', func_get_args());
     }
 
-    public function createTcpDaemon(KernelInterface $kernel, DaemonOptions $options, $port, $host = 'localhost')
+    public function createTcpDaemon(KernelInterface $kernel, DaemonOptions $options, string $host = 'localhost', int $port): DaemonInterface
     {
         return $this->delegateCall('createTcpDaemon', func_get_args());
     }