Merge branch 'develop'

* develop: specify next release require filesystem 7
Innmind · Oct 22, 2023 · 8458342 · 8458342
2 parents fed3a31 + c90c1f4
commit 8458342
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 5.2.0 - 2023-10-22
+
+### Changed
+
+- Requires `innmind/filesystem:~7.0`
+
 ## 5.1.0 - 2023-09-16
 
 ### Added

diff --git a/composer.json b/composer.json
@@ -20,7 +20,7 @@
         "innmind/url": "~4.0",
         "psr/log": "~3.0",
         "innmind/time-continuum": "^3.1,<3.3|^3.4.1",
-        "innmind/filesystem": "~6.2",
+        "innmind/filesystem": "~7.0",
         "innmind/time-warp": "^3.0"
     },
     "autoload": {

diff --git a/src/Server/Process/Started.php b/src/Server/Process/Started.php
@@ -235,7 +235,7 @@ private function writeInputAndRead(
     ): array {
         return $this
             ->content
-            ->map(static fn($content) => (new Chunk)($content))
+            ->map(static fn($content) => $content->chunks())
             ->otherwise(function() {
                 $this->closeInput($this->input);
 

diff --git a/tests/Server/CommandTest.php b/tests/Server/CommandTest.php
@@ -135,7 +135,7 @@ public function testWithInput()
     {
         $command = Command::foreground('bin/console')
             ->withInput(
-                $input = $this->createMock(Content::class),
+                $input = Content::none(),
             );
 
         $this->assertInstanceOf(Command::class, $command);

diff --git a/tests/Server/Process/UnixTest.php b/tests/Server/Process/UnixTest.php
@@ -17,6 +17,7 @@
 };
 use Innmind\TimeWarp\Halt\Usleep;
 use Innmind\Url\Path;
+use Innmind\IO\IO;
 use Innmind\Stream\{
     Readable\Stream,
     Streams,
@@ -208,8 +209,10 @@ public function testWithInput()
             Streams::fromAmbientAuthority(),
             new Usleep,
             new Second(1),
-            Command::foreground('cat')->withInput(Content\OfStream::of(
-                Stream::of(\fopen('fixtures/symfony.log', 'r')),
+            Command::foreground('cat')->withInput(Content::oneShot(
+                IO::of(static fn() => null)->readable()->wrap(
+                    Stream::of(\fopen('fixtures/symfony.log', 'r')),
+                ),
             )),
         );
         $output = '';
@@ -233,8 +236,10 @@ public function testOverwrite()
             new Usleep,
             new Second(1),
             Command::foreground('cat')
-                ->withInput(Content\OfStream::of(
-                    Stream::of(\fopen('fixtures/symfony.log', 'r')),
+                ->withInput(Content::oneShot(
+                    IO::of(static fn() => null)->readable()->wrap(
+                        Stream::of(\fopen('fixtures/symfony.log', 'r')),
+                    ),
                 ))
                 ->overwrite(Path::of('test.log')),
         );

diff --git a/tests/Server/Processes/UnixTest.php b/tests/Server/Processes/UnixTest.php
@@ -16,6 +16,7 @@
 use Innmind\Filesystem\File\Content;
 use Innmind\TimeContinuum\Earth\Clock;
 use Innmind\TimeWarp\Halt\Usleep;
+use Innmind\IO\IO;
 use Innmind\Stream\{
     Readable\Stream,
     Streams,
@@ -81,8 +82,10 @@ public function testExecuteWithInput()
             new Usleep,
         );
         $process = $processes->execute(
-            Command::foreground('cat')->withInput(Content\OfStream::of(
-                Stream::of(\fopen('fixtures/symfony.log', 'r')),
+            Command::foreground('cat')->withInput(Content::oneShot(
+                IO::of(static fn() => null)->readable()->wrap(
+                    Stream::of(\fopen('fixtures/symfony.log', 'r')),
+                ),
             )),
         );