Merge pull request #593 from Slamdunk/readonly

Use `readonly` class annotation where possible
psr7-sessions · Oct 28, 2024 · 1fd67b2 · 1fd67b2
2 parents 12f92de + e4c80ce
commit 1fd67b2
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 16 deletions.
diff --git a/src/Storageless/Http/ClientFingerprint/Configuration.php b/src/Storageless/Http/ClientFingerprint/Configuration.php
@@ -4,11 +4,11 @@
 
 namespace PSR7Sessions\Storageless\Http\ClientFingerprint;
 
-/** @immutable */
-final class Configuration
+/** @psalm-immutable */
+final readonly class Configuration
 {
     /** @var list<Source> */
-    private readonly array $sources;
+    private array $sources;
 
     /**
      * @param list<Source> ...$sources

diff --git a/src/Storageless/Http/ClientFingerprint/RemoteAddr.php b/src/Storageless/Http/ClientFingerprint/RemoteAddr.php
@@ -9,8 +9,8 @@
 use function array_key_exists;
 use function is_string;
 
-/** @immutable */
-final class RemoteAddr implements Source
+/** @psalm-immutable */
+final readonly class RemoteAddr implements Source
 {
     private const SERVER_PARAM_NAME = 'REMOTE_ADDR';
 

diff --git a/src/Storageless/Http/ClientFingerprint/SameOriginRequest.php b/src/Storageless/Http/ClientFingerprint/SameOriginRequest.php
@@ -22,19 +22,19 @@
 /**
  * @internal
  *
- * @immutable
+ * @psalm-immutable
  */
-final class SameOriginRequest implements Constraint
+final readonly class SameOriginRequest implements Constraint
 {
     public const CLAIM = 'fp';
 
     /** @var list<Source> */
-    private readonly array $sources;
+    private array $sources;
     /** @var non-empty-string */
-    private readonly string $currentRequestFingerprint;
+    private string $currentRequestFingerprint;
 
     public function __construct(
-        private readonly Configuration $configuration,
+        private Configuration $configuration,
         ServerRequestInterface $serverRequest,
     ) {
         $this->sources = $this->configuration->sources();

diff --git a/src/Storageless/Http/ClientFingerprint/UserAgent.php b/src/Storageless/Http/ClientFingerprint/UserAgent.php
@@ -6,8 +6,8 @@
 
 use Psr\Http\Message\ServerRequestInterface;
 
-/** @immutable */
-final class UserAgent implements Source
+/** @psalm-immutable */
+final readonly class UserAgent implements Source
 {
     public function extractFrom(ServerRequestInterface $request): string
     {

diff --git a/src/Storageless/Http/Configuration.php b/src/Storageless/Http/Configuration.php
@@ -27,7 +27,7 @@
 use Lcobucci\JWT\Configuration as JwtConfig;
 use PSR7Sessions\Storageless\Http\ClientFingerprint\Configuration as FingerprintConfig;
 
-/** @immutable */
+/** @psalm-immutable */
 final class Configuration
 {
     private JwtConfig $jwtConfiguration;

diff --git a/src/Storageless/Http/SessionMiddleware.php b/src/Storageless/Http/SessionMiddleware.php
@@ -43,14 +43,14 @@
 
 use function sprintf;
 
-/** @immutable */
-final class SessionMiddleware implements MiddlewareInterface
+/** @psalm-immutable */
+final readonly class SessionMiddleware implements MiddlewareInterface
 {
     public const SESSION_CLAIM     = 'session-data';
     public const SESSION_ATTRIBUTE = 'session';
 
     public function __construct(
-        private readonly Configuration $config,
+        private Configuration $config,
     ) {
     }