[PsrHttpMessageBridge] Add native types where possible

Author: derrabus

EventListener/PsrResponseListener.php

@@ -26,7 +26,7 @@
  */
 final class PsrResponseListener implements EventSubscriberInterface
 {
-    private $httpFoundationFactory;
+    private readonly HttpFoundationFactoryInterface $httpFoundationFactory;
 
     public function __construct(HttpFoundationFactoryInterface $httpFoundationFactory = null)
     {

Factory/HttpFoundationFactory.php

@@ -28,13 +28,11 @@
 class HttpFoundationFactory implements HttpFoundationFactoryInterface
 {
     /**
-     * @var int The maximum output buffering size for each iteration when sending the response
+     * @param int $responseBufferMaxLength The maximum output buffering size for each iteration when sending the response
      */
-    private $responseBufferMaxLength;
-
-    public function __construct(int $responseBufferMaxLength = 16372)
-    {
-        $this->responseBufferMaxLength = $responseBufferMaxLength;
+    public function __construct(
+        private readonly int $responseBufferMaxLength = 16372,
+    ) {
     }
 
     public function createRequest(ServerRequestInterface $psrRequest, bool $streamed = false): Request

Factory/PsrHttpFactory.php

@@ -33,17 +33,12 @@
  */
 class PsrHttpFactory implements HttpMessageFactoryInterface
 {
-    private $serverRequestFactory;
-    private $streamFactory;
-    private $uploadedFileFactory;
-    private $responseFactory;
-
-    public function __construct(ServerRequestFactoryInterface $serverRequestFactory, StreamFactoryInterface $streamFactory, UploadedFileFactoryInterface $uploadedFileFactory, ResponseFactoryInterface $responseFactory)
-    {
-        $this->serverRequestFactory = $serverRequestFactory;
-        $this->streamFactory = $streamFactory;
-        $this->uploadedFileFactory = $uploadedFileFactory;
-        $this->responseFactory = $responseFactory;
+    public function __construct(
+        private readonly ServerRequestFactoryInterface $serverRequestFactory,
+        private readonly StreamFactoryInterface $streamFactory,
+        private readonly UploadedFileFactoryInterface $uploadedFileFactory,
+        private readonly ResponseFactoryInterface $responseFactory,
+    ) {
     }
 
     public function createRequest(Request $symfonyRequest): ServerRequestInterface

Factory/UploadedFile.php

@@ -21,11 +21,12 @@
  */
 class UploadedFile extends BaseUploadedFile
 {
-    private $psrUploadedFile;
-    private $test = false;
+    private bool $test = false;
 
-    public function __construct(UploadedFileInterface $psrUploadedFile, callable $getTemporaryPath)
-    {
+    public function __construct(
+        private readonly UploadedFileInterface $psrUploadedFile,
+        callable $getTemporaryPath,
+    ) {
         $error = $psrUploadedFile->getError();
         $path = '';
 
@@ -45,8 +46,6 @@ public function __construct(UploadedFileInterface $psrUploadedFile, callable $ge
             $psrUploadedFile->getError(),
             $this->test
         );
-
-        $this->psrUploadedFile = $psrUploadedFile;
     }
 
     public function move(string $directory, string $name = null): File

Tests/Factory/PsrHttpFactoryTest.php

@@ -29,11 +29,8 @@
  */
 class PsrHttpFactoryTest extends TestCase
 {
-    /** @var HttpMessageFactoryInterface */
-    private $factory;
-
-    /** @var string */
-    private $tmpDir;
+    private HttpMessageFactoryInterface $factory;
+    private string $tmpDir;
 
     protected function buildHttpMessageFactory(): HttpMessageFactoryInterface
     {

Tests/Fixtures/App/Controller/PsrRequestController.php

@@ -11,13 +11,10 @@
 
 final class PsrRequestController
 {
-    private $responseFactory;
-    private $streamFactory;
-
-    public function __construct(ResponseFactoryInterface $responseFactory, StreamFactoryInterface $streamFactory)
-    {
-        $this->responseFactory = $responseFactory;
-        $this->streamFactory = $streamFactory;
+    public function __construct(
+        private readonly ResponseFactoryInterface $responseFactory,
+        private readonly StreamFactoryInterface $streamFactory,
+    ) {
     }
 
     public function serverRequestAction(ServerRequestInterface $request): ResponseInterface

Tests/Fixtures/Message.php

@@ -21,28 +21,19 @@
  */
 class Message implements MessageInterface
 {
-    private $version = '1.1';
-    private $headers = [];
-    private $body;
-
-    public function __construct(string $version = '1.1', array $headers = [], StreamInterface $body = null)
-    {
-        $this->version = $version;
-        $this->headers = $headers;
-        $this->body = $body ?? new Stream();
+    public function __construct(
+        private readonly string $version = '1.1',
+        private array $headers = [],
+        private readonly StreamInterface $body = new Stream(),
+    ) {
     }
 
     public function getProtocolVersion(): string
     {
         return $this->version;
     }
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return static
-     */
-    public function withProtocolVersion($version): MessageInterface
+    public function withProtocolVersion($version): never
     {
         throw new \BadMethodCallException('Not implemented.');
     }
@@ -67,34 +58,19 @@ public function getHeaderLine($name): string
         return $this->hasHeader($name) ? implode(',', $this->headers[$name]) : '';
     }
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return static
-     */
-    public function withHeader($name, $value): MessageInterface
+    public function withHeader($name, $value): static
     {
         $this->headers[$name] = (array) $value;
 
         return $this;
     }
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return static
-     */
-    public function withAddedHeader($name, $value): MessageInterface
+    public function withAddedHeader($name, $value): never
     {
         throw new \BadMethodCallException('Not implemented.');
     }
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return static
-     */
-    public function withoutHeader($name): MessageInterface
+    public function withoutHeader($name): static
     {
         unset($this->headers[$name]);
 
@@ -108,10 +84,8 @@ public function getBody(): StreamInterface
 
     /**
      * {@inheritdoc}
-     *
-     * @return static
      */
-    public function withBody(StreamInterface $body): MessageInterface
+    public function withBody(StreamInterface $body): never
     {
         throw new \BadMethodCallException('Not implemented.');
     }

Tests/Fixtures/Response.php

@@ -19,29 +19,26 @@
  */
 class Response extends Message implements ResponseInterface
 {
-    private $statusCode;
-
-    public function __construct(string $version = '1.1', array $headers = [], StreamInterface $body = null, int $statusCode = 200)
-    {
+    public function __construct(
+        string $version = '1.1',
+        array $headers = [],
+        StreamInterface $body = new Stream(),
+        private readonly int $statusCode = 200,
+    ) {
         parent::__construct($version, $headers, $body);
-
-        $this->statusCode = $statusCode;
     }
 
     public function getStatusCode(): int
     {
         return $this->statusCode;
     }
 
-    /**
-     * @return static
-     */
-    public function withStatus($code, $reasonPhrase = ''): ResponseInterface
+    public function withStatus($code, $reasonPhrase = ''): never
     {
         throw new \BadMethodCallException('Not implemented.');
     }
 
-    public function getReasonPhrase(): string
+    public function getReasonPhrase(): never
     {
         throw new \BadMethodCallException('Not implemented.');
     }