Update to use PHP 8.1 syntax

src/LazySession.php

@@ -23,19 +23,15 @@ final class LazySession implements
     SessionInterface,
     InitializeSessionIdInterface
 {
-    private SessionPersistenceInterface $persistence;
-
     private ?SessionInterface $proxiedSession = null;
 
-    /**
-     * Request instance to use when calling $persistence->initializeSessionFromRequest()
-     */
-    private ServerRequestInterface $request;
-
-    public function __construct(SessionPersistenceInterface $persistence, ServerRequestInterface $request)
-    {
-        $this->persistence = $persistence;
-        $this->request     = $request;
+    public function __construct(
+        private readonly SessionPersistenceInterface $persistence,
+        /**
+         * Request instance to use when calling $persistence->initializeSessionFromRequest()
+         */
+        private readonly ServerRequestInterface $request
+    ) {
     }
 
     public function regenerate(): SessionInterface

src/Session.php

@@ -23,17 +23,6 @@ class Session implements
      */
     private array $data;
 
-    /**
-     * The session identifier, if any.
-     *
-     * This is present in the session to allow the session persistence
-     * implementation to be stateless. When present here, we can query for it
-     * when it is time to persist the session, instead of relying on state in
-     * the persistence instance (which may be shared between multiple
-     * requests).
-     */
-    private string $id;
-
     private bool $isRegenerated = false;
 
     /**
@@ -49,10 +38,20 @@ class Session implements
     private int $sessionLifetime = 0;
 
     /** @param array<string, mixed> $data */
-    public function __construct(array $data, string $id = '')
-    {
+    public function __construct(
+        array $data,
+        /**
+         * The session identifier, if any.
+         *
+         * This is present in the session to allow the session persistence
+         * implementation to be stateless. When present here, we can query for it
+         * when it is time to persist the session, instead of relying on state in
+         * the persistence instance (which may be shared between multiple
+         * requests).
+         */
+        private string $id = ''
+    ) {
         $this->data = $this->originalData = $data;
-        $this->id   = $id;
 
         /** @psalm-suppress MixedAssignment */
         $lifetime = $data[SessionCookiePersistenceInterface::SESSION_LIFETIME_KEY] ?? null;

src/SessionMiddleware.php

@@ -14,11 +14,8 @@ class SessionMiddleware implements MiddlewareInterface
 {
     public const SESSION_ATTRIBUTE = 'session';
 
-    private SessionPersistenceInterface $persistence;
-
-    public function __construct(SessionPersistenceInterface $persistence)
+    public function __construct(private readonly SessionPersistenceInterface $persistence)
     {
-        $this->persistence = $persistence;
     }
 
     public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface

test/RequestHandler.php

@@ -13,7 +13,7 @@
 final class RequestHandler implements RequestHandlerInterface
 {
     private ?ServerRequestInterface $received = null;
-    private ResponseInterface $defaultResponse;
+    private readonly ResponseInterface $defaultResponse;
 
     public function __construct(
         ResponseInterface|null $defaultResponse = null,