Merge branch 'develop'

* develop:
  use innmind/stream 4

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 4.2.0 - 2023-01-29
+
+### Changed
+
+- Requires `innmind/stream:~4.0`
+
 ## 4.1.0 - 2022-12-18
 
 ### Added

composer.json

@@ -24,7 +24,7 @@
         "innmind/operating-system": "~3.1",
         "innmind/media-type": "~2.0",
         "innmind/filesystem": "~5.2|~6.0",
-        "innmind/stream": "~3.3"
+        "innmind/stream": "~4.0"
     },
     "autoload": {
         "psr-4": {

src/Client.php

@@ -11,7 +11,10 @@
     Model\Channel\Close as CloseChannel,
 };
 use Innmind\OperatingSystem\CurrentProcess;
-use Innmind\Stream\Streams;
+use Innmind\Stream\{
+    Capabilities,
+    Streams,
+};
 use Innmind\Immutable\{
     Either,
     Maybe,
@@ -24,7 +27,7 @@ final class Client
     private Maybe $command;
     /** @var callable(): Maybe<Connection> */
     private $load;
-    private Streams $streams;
+    private Capabilities $streams;
     /** @var Maybe<CurrentProcess> */
     private Maybe $signals;
 
@@ -36,7 +39,7 @@ final class Client
     private function __construct(
         Maybe $command,
         callable $load,
-        Streams $streams,
+        Capabilities $streams,
         Maybe $signals,
     ) {
         $this->command = $command;
@@ -48,14 +51,19 @@ private function __construct(
     /**
      * @param callable(): Maybe<Connection> $load
      */
-    public static function of(callable $load, Streams $streams = null): self
+    public static function of(callable $load, Capabilities $streams = null): self
     {
         /** @var Maybe<Command> */
         $command = Maybe::nothing();
         /** @var Maybe<CurrentProcess> */
         $signals = Maybe::nothing();
 
-        return new self($command, $load, $streams ?? Streams::of(), $signals);
+        return new self(
+            $command,
+            $load,
+            $streams ?? Streams::fromAmbientAuthority(),
+            $signals,
+        );
     }
 
     public function with(Command $command): self

src/Transport/Connection/MessageReader.php

@@ -24,7 +24,7 @@
 use Innmind\TimeContinuum\Earth\ElapsedPeriod;
 use Innmind\Filesystem\File\Content;
 use Innmind\Stream\{
-    Streams,
+    Capabilities,
     Bidirectional,
 };
 use Innmind\Immutable\{
@@ -41,9 +41,9 @@
  */
 final class MessageReader
 {
-    private Streams $streams;
+    private Capabilities $streams;
 
-    private function __construct(Streams $streams)
+    private function __construct(Capabilities $streams)
     {
         $this->streams = $streams;
     }
@@ -61,7 +61,7 @@ public function __invoke(Connection $connection): Either
             ));
     }
 
-    public static function of(Streams $streams): self
+    public static function of(Capabilities $streams): self
     {
         return new self($streams);
     }