add support for immutable 5

Innmind · Sep 23, 2023 · 0d00e39 · 0d00e39
1 parent 83a8a2b
commit 0d00e39
Show file tree

Hide file tree

Showing 20 changed files with 36 additions and 32 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Changelog
 
-## [Unreleased]
+## 4.3.0 - 2023-09-23
+
+### Added
+
+- Support for `innmind/immutable:~5.0`
 
 ### Removed
 

diff --git a/composer.json b/composer.json
@@ -16,7 +16,7 @@
     },
     "require": {
         "php": "~8.2",
-        "innmind/immutable": "~4.6",
+        "innmind/immutable": "~4.15|~5.0",
         "innmind/time-continuum": "~3.1",
         "innmind/math": "~6.0",
         "innmind/url": "~4.1",

diff --git a/src/Model/Basic/Message.php b/src/Model/Basic/Message.php
@@ -74,7 +74,7 @@ final class Message
     private function __construct(Sequence $chunks, int $length)
     {
         $this->chunks = $chunks->map(
-            static fn($chunk) => $chunk->toEncoding('ASCII'),
+            static fn($chunk) => $chunk->toEncoding(Str\Encoding::ascii),
         );
         $this->length = $length;
         /** @var Map<string, mixed> */
@@ -112,7 +112,7 @@ public static function of(Str $body): self
     {
         return new self(
             Sequence::of($body),
-            $body->toEncoding('ASCII')->length(),
+            $body->toEncoding(Str\Encoding::ascii)->length(),
         );
     }
 
@@ -123,7 +123,7 @@ public static function of(Str $body): self
     public static function file(Content $content): self
     {
         $chunks = (new Chunk)($content)->map(
-            static fn($chunk) => $chunk->toEncoding('ASCII'),
+            static fn($chunk) => $chunk->toEncoding(Str\Encoding::ascii),
         );
         /** @var int<0, max> */
         $size = $content->size()->match(
@@ -355,7 +355,7 @@ public function body(): Str
         return $this
             ->chunks
             ->fold(new Concat)
-            ->toEncoding('ASCII');
+            ->toEncoding(Str\Encoding::ascii);
     }
 
     /**

diff --git a/src/Transport/Connection.php b/src/Transport/Connection.php
@@ -280,7 +280,7 @@ private function sendFrame(Frame $frame): Either
         /** @var Either<Failure, self> */
         return Maybe::just($frame)
             ->filter(fn($frame) => $this->maxChannels->allows($frame->channel()->toInt()))
-            ->map(static fn($frame) => $frame->pack()->toEncoding('ASCII'))
+            ->map(static fn($frame) => $frame->pack()->toEncoding(Str\Encoding::ascii))
             ->filter(fn($frame) => $this->maxFrameSize->allows($frame->length()))
             ->flatMap(
                 fn($frame) => $this

diff --git a/src/Transport/Connection/MessageReader.php b/src/Transport/Connection/MessageReader.php
@@ -306,7 +306,7 @@ private function accumulateChunk(
         return $frame
             ->content()
             ->either()
-            ->map(static fn($chunk) => $chunk->toEncoding('ASCII'))
+            ->map(static fn($chunk) => $chunk->toEncoding(Str\Encoding::ascii))
             ->flatMap(
                 static fn($chunk) => $stream
                     ->write($chunk)

diff --git a/src/Transport/Frame.php b/src/Transport/Frame.php
@@ -174,7 +174,7 @@ private function packMethod(): Str
             ->values
             ->map(static fn($value) => $value->pack())
             ->fold(new Concat)
-            ->toEncoding('ASCII');
+            ->toEncoding(Str\Encoding::ascii);
 
         return $this->doPack($payload);
     }
@@ -185,7 +185,7 @@ private function packHeader(): Str
             ->values
             ->map(static fn($value) => $value->pack())
             ->fold(new Concat)
-            ->toEncoding('ASCII');
+            ->toEncoding(Str\Encoding::ascii);
 
         return $this->doPack($payload);
     }
@@ -207,7 +207,7 @@ private function packHeartbeat(): Str
 
     private function doPack(Str $payload): Str
     {
-        $payload = $payload->toEncoding('ASCII');
+        $payload = $payload->toEncoding(Str\Encoding::ascii);
 
         /** @psalm-suppress InvalidArgument */
         return Sequence::of(
@@ -218,6 +218,6 @@ private function doPack(Str $payload): Str
             UnsignedOctet::internal(self::end())->pack(),
         )
             ->fold(new Concat)
-            ->toEncoding('ASCII');
+            ->toEncoding(Str\Encoding::ascii);
     }
 }
diff --git a/src/Transport/Frame/Value/Bits.php b/src/Transport/Frame/Value/Bits.php
@@ -44,7 +44,7 @@ public static function unpack(Readable $stream): Maybe
     {
         return $stream
             ->read(1)
-            ->map(static fn($chunk) => $chunk->toEncoding('ASCII'))
+            ->map(static fn($chunk) => $chunk->toEncoding(Str\Encoding::ascii))
             ->filter(static fn($chunk) => $chunk->length() === 1)
             ->map(
                 static fn($chunk) => $chunk

diff --git a/src/Transport/Frame/Value/LongString.php b/src/Transport/Frame/Value/LongString.php
@@ -39,7 +39,7 @@ public static function literal(string $string): self
     public static function of(Str $string): self
     {
         /** @psalm-suppress InvalidArgument */
-        $_ = UnsignedLongInteger::of($string->toEncoding('ASCII')->length());
+        $_ = UnsignedLongInteger::of($string->toEncoding(Str\Encoding::ascii)->length());
 
         return new self($string);
     }
@@ -55,7 +55,7 @@ public static function unpack(Readable $stream): Maybe
             ->flatMap(
                 static fn($length) => $stream
                     ->read($length)
-                    ->map(static fn($string) => $string->toEncoding('ASCII'))
+                    ->map(static fn($string) => $string->toEncoding(Str\Encoding::ascii))
                     ->filter(static fn($string) => $string->length() === $length),
             )
             ->map(static fn($string) => new self($string));
@@ -75,7 +75,7 @@ public function pack(): Str
     {
         /** @psalm-suppress InvalidArgument */
         return UnsignedLongInteger::of(
-            $this->original->toEncoding('ASCII')->length(),
+            $this->original->toEncoding(Str\Encoding::ascii)->length(),
         )
             ->pack()
             ->append($this->original->toString());

diff --git a/src/Transport/Frame/Value/Sequence.php b/src/Transport/Frame/Value/Sequence.php
@@ -85,7 +85,7 @@ public function pack(): Str
                 $value->pack(),
             ))
             ->fold(new Concat)
-            ->toEncoding('ASCII');
+            ->toEncoding(Str\Encoding::ascii);
         /** @psalm-suppress InvalidArgument */
         $value = UnsignedLongInteger::of($data->length())->pack();
 
@@ -105,7 +105,7 @@ private static function unpackNested(
     ): Maybe {
         return $stream
             ->read(1)
-            ->map(static fn($chunk) => $chunk->toEncoding('ASCII'))
+            ->map(static fn($chunk) => $chunk->toEncoding(Str\Encoding::ascii))
             ->filter(static fn($chunk) => $chunk->length() === 1)
             ->flatMap(static fn($chunk) => Symbol::unpack($clock, $chunk->toString(), $stream))
             ->flatMap(static fn($value) => match ($stream->position()->toInt() < $boundary) {

diff --git a/src/Transport/Frame/Value/ShortString.php b/src/Transport/Frame/Value/ShortString.php
@@ -39,7 +39,7 @@ public static function literal(string $string): self
     public static function of(Str $string): self
     {
         /** @psalm-suppress InvalidArgument */
-        $_ = UnsignedOctet::of($string->toEncoding('ASCII')->length());
+        $_ = UnsignedOctet::of($string->toEncoding(Str\Encoding::ascii)->length());
 
         return new self($string);
     }
@@ -55,7 +55,7 @@ public static function unpack(Readable $stream): Maybe
             ->flatMap(
                 static fn($length) => $stream
                     ->read($length)
-                    ->map(static fn($string) => $string->toEncoding('ASCII'))
+                    ->map(static fn($string) => $string->toEncoding(Str\Encoding::ascii))
                     ->filter(static fn($string) => $string->length() === $length),
             )
             ->map(static fn($string) => new self($string));
@@ -75,7 +75,7 @@ public function pack(): Str
     {
         /** @psalm-suppress InvalidArgument */
         return UnsignedOctet::of(
-            $this->original->toEncoding('ASCII')->length(),
+            $this->original->toEncoding(Str\Encoding::ascii)->length(),
         )
             ->pack()
             ->append($this->original->toString());

diff --git a/src/Transport/Frame/Value/SignedLongInteger.php b/src/Transport/Frame/Value/SignedLongInteger.php
@@ -51,7 +51,7 @@ public static function unpack(Readable $stream): Maybe
     {
         return $stream
             ->read(4)
-            ->map(static fn($chunk) => $chunk->toEncoding('ASCII'))
+            ->map(static fn($chunk) => $chunk->toEncoding(Str\Encoding::ascii))
             ->filter(static fn($chunk) => $chunk->length() === 4)
             ->map(static function($chunk) {
                 /** @var int<-2147483648, 2147483647> $value */

diff --git a/src/Transport/Frame/Value/SignedLongLongInteger.php b/src/Transport/Frame/Value/SignedLongLongInteger.php
@@ -38,7 +38,7 @@ public static function unpack(Readable $stream): Maybe
     {
         return $stream
             ->read(8)
-            ->map(static fn($chunk) => $chunk->toEncoding('ASCII'))
+            ->map(static fn($chunk) => $chunk->toEncoding(Str\Encoding::ascii))
             ->filter(static fn($chunk) => $chunk->length() === 8)
             ->map(static function($chunk) {
                 /** @var int $value */

diff --git a/src/Transport/Frame/Value/SignedOctet.php b/src/Transport/Frame/Value/SignedOctet.php
@@ -53,7 +53,7 @@ public static function unpack(Readable $stream): Maybe
     {
         return $stream
             ->read(1)
-            ->map(static fn($chunk) => $chunk->toEncoding('ASCII'))
+            ->map(static fn($chunk) => $chunk->toEncoding(Str\Encoding::ascii))
             ->filter(static fn($chunk) => $chunk->length() === 1)
             ->map(static function($chunk) {
                 /** @var int<-128, 127> $value */

diff --git a/src/Transport/Frame/Value/SignedShortInteger.php b/src/Transport/Frame/Value/SignedShortInteger.php
@@ -51,7 +51,7 @@ public static function unpack(Readable $stream): Maybe
     {
         return $stream
             ->read(2)
-            ->map(static fn($chunk) => $chunk->toEncoding('ASCII'))
+            ->map(static fn($chunk) => $chunk->toEncoding(Str\Encoding::ascii))
             ->filter(static fn($chunk) => $chunk->length() === 2)
             ->map(static function($chunk) {
                 /** @var int<-32768, 32767> $value */

diff --git a/src/Transport/Frame/Value/Table.php b/src/Transport/Frame/Value/Table.php
@@ -89,7 +89,7 @@ public function pack(): Str
                 $pair[1]->pack(),
             ))
             ->fold(new Concat)
-            ->toEncoding('ASCII');
+            ->toEncoding(Str\Encoding::ascii);
 
         /** @psalm-suppress InvalidArgument */
         $value = UnsignedLongInteger::of($data->length())->pack();
@@ -113,7 +113,7 @@ private static function unpackNested(
             ->flatMap(
                 static fn($key) => $stream
                     ->read(1)
-                    ->map(static fn($chunk) => $chunk->toEncoding('ASCII'))
+                    ->map(static fn($chunk) => $chunk->toEncoding(Str\Encoding::ascii))
                     ->filter(static fn($chunk) => $chunk->length() === 1)
                     ->flatMap(static fn($chunk) => Symbol::unpack(
                         $clock,

diff --git a/src/Transport/Frame/Value/UnsignedLongInteger.php b/src/Transport/Frame/Value/UnsignedLongInteger.php
@@ -62,7 +62,7 @@ public static function unpack(Readable $stream): Maybe
     {
         return $stream
             ->read(4)
-            ->map(static fn($chunk) => $chunk->toEncoding('ASCII'))
+            ->map(static fn($chunk) => $chunk->toEncoding(Str\Encoding::ascii))
             ->filter(static fn($chunk) => $chunk->length() === 4)
             ->map(static function($chunk) {
                 /** @var int<0, 4294967295> $value */

diff --git a/src/Transport/Frame/Value/UnsignedLongLongInteger.php b/src/Transport/Frame/Value/UnsignedLongLongInteger.php
@@ -63,7 +63,7 @@ public static function unpack(Readable $stream): Maybe
     {
         return $stream
             ->read(8)
-            ->map(static fn($chunk) => $chunk->toEncoding('ASCII'))
+            ->map(static fn($chunk) => $chunk->toEncoding(Str\Encoding::ascii))
             ->filter(static fn($chunk) => $chunk->length() === 8)
             ->map(static function($chunk) {
                 /** @var int<0, max> $value */

diff --git a/src/Transport/Frame/Value/UnsignedOctet.php b/src/Transport/Frame/Value/UnsignedOctet.php
@@ -64,7 +64,7 @@ public static function unpack(Readable $stream): Maybe
     {
         return $stream
             ->read(1)
-            ->map(static fn($chunk) => $chunk->toEncoding('ASCII'))
+            ->map(static fn($chunk) => $chunk->toEncoding(Str\Encoding::ascii))
             ->filter(static fn($chunk) => $chunk->length() === 1)
             ->map(static function($chunk) {
                 /** @var int<0, 255> $octet */

diff --git a/src/Transport/Frame/Value/UnsignedShortInteger.php b/src/Transport/Frame/Value/UnsignedShortInteger.php
@@ -62,7 +62,7 @@ public static function unpack(Readable $stream): Maybe
     {
         return $stream
             ->read(2)
-            ->map(static fn($chunk) => $chunk->toEncoding('ASCII'))
+            ->map(static fn($chunk) => $chunk->toEncoding(Str\Encoding::ascii))
             ->filter(static fn($chunk) => $chunk->length() === 2)
             ->map(static function($chunk) {
                 /** @var int<0, 65535> $value */

diff --git a/src/Transport/Protocol/Connection.php b/src/Transport/Protocol/Connection.php
@@ -161,7 +161,7 @@ private function response(User $user, Password $password): LongString
         $response = Table::of($arguments);
         $response = $response
             ->pack()
-            ->toEncoding('ASCII')
+            ->toEncoding(Str\Encoding::ascii)
             ->substring(4); // skip the encoded table length integer
 
         return LongString::of($response);