Merge pull request #200 from samsonasik/update-to-php81-syntax

Update to latest PHP 8.1 syntax

src/RelativeStream.php

@@ -17,9 +17,9 @@
  */
 final class RelativeStream implements StreamInterface, Stringable
 {
-    private int $offset;
+    private readonly int $offset;
 
-    public function __construct(private StreamInterface $decoratedStream, ?int $offset)
+    public function __construct(private readonly StreamInterface $decoratedStream, ?int $offset)
     {
         $this->offset = (int) $offset;
     }

src/ServerRequestFactory.php

@@ -54,7 +54,7 @@ public static function fromGlobals(
         ?array $files = null,
         ?FilterServerRequestInterface $requestFilter = null
     ): ServerRequestInterface {
-        $requestFilter = $requestFilter ?? FilterUsingXForwardedHeaders::trustReservedSubnets();
+        $requestFilter ??= FilterUsingXForwardedHeaders::trustReservedSubnets();
 
         $server  = normalizeServer(
             $server ?? $_SERVER,

src/ServerRequestFilter/FilterUsingXForwardedHeaders.php

@@ -50,8 +50,10 @@ final class FilterUsingXForwardedHeaders implements FilterServerRequestInterface
      * @param list<non-empty-string> $trustedProxies
      * @param list<FilterUsingXForwardedHeaders::HEADER_*> $trustedHeaders
      */
-    private function __construct(private array $trustedProxies = [], private array $trustedHeaders = [])
-    {
+    private function __construct(
+        private readonly array $trustedProxies = [],
+        private readonly array $trustedHeaders = []
+    ) {
     }
 
     public function __invoke(ServerRequestInterface $request): ServerRequestInterface

src/UploadedFile.php

@@ -44,7 +44,7 @@ class UploadedFile implements UploadedFileInterface
         UPLOAD_ERR_EXTENSION  => 'A PHP extension stopped the file upload.',
     ];
 
-    private int $error;
+    private readonly int $error;
 
     private ?string $file = null;
 
@@ -58,10 +58,10 @@ class UploadedFile implements UploadedFileInterface
      */
     public function __construct(
         $streamOrFile,
-        private ?int $size,
+        private readonly ?int $size,
         int $errorStatus,
-        private ?string $clientFilename = null,
-        private ?string $clientMediaType = null
+        private readonly ?string $clientFilename = null,
+        private readonly ?string $clientMediaType = null
     ) {
         if ($errorStatus === UPLOAD_ERR_OK) {
             if (is_string($streamOrFile)) {

src/UriFactory.php

@@ -162,7 +162,7 @@ private static function marshalHostAndPort(array $server, array $headers): array
     private static function marshalIpv6HostAndPort(array $server, ?int $port): array
     {
         $host             = '[' . (string) $server['SERVER_ADDR'] . ']';
-        $port             = $port ?? 80;
+        $port           ??= 80;
         $portSeparatorPos = strrpos($host, ':');
 
         if (false === $portSeparatorPos) {

test/ServerRequestFactoryTest.php

@@ -471,7 +471,7 @@ public function testReturnsFilteredRequestBasedOnRequestFilterProvided(): void
     {
         $expectedRequest = new ServerRequest();
         $filter          = new class ($expectedRequest) implements FilterServerRequestInterface {
-            public function __construct(private ServerRequestInterface $request)
+            public function __construct(private readonly ServerRequestInterface $request)
             {
             }