Merge branch 'develop'

* develop:
  update changelog
  derive laziness of message bodies from source bodies
  prevent generating values that will be accepted

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 7.1.0 - 2024-06-27
+
+### Changed
+
+- Requires `innmind/immutable:~5.7`
+- Derive bodies laziness from source bodies
+
 ## 7.0.1 - 2024-03-27
 
 ### Fixed

composer.json

@@ -17,7 +17,7 @@
     "require": {
         "php": "~8.2",
         "innmind/url": "~4.0",
-        "innmind/immutable": "~4.15|~5.0",
+        "innmind/immutable": "~5.7",
         "innmind/filesystem": "~7.0",
         "innmind/io": "~2.2",
         "innmind/time-continuum": "~3.0",

src/Content/Multipart.php

@@ -73,16 +73,17 @@ public function asContent(): Content
     private function chunks(): Sequence
     {
         $boundary = $this->boundaryStr();
-        $boundaryLine = Sequence::lazyStartingWith($boundary->append("\r\n"));
+        $boundaryLine = Sequence::of($boundary->append("\r\n"));
 
         if ($this->parts->empty()) {
             return $boundaryLine->add($boundary->append('--'));
         }
 
         return $this
             ->parts
-            ->flatMap(static fn($part) => $boundaryLine
-                ->append($part->chunks())
+            ->flatMap(static fn($part) => $part
+                ->chunks()
+                ->prepend($boundaryLine)
                 ->add(Str::of("\r\n")),
             )
             ->add($boundary->append('--'));

src/Content/Multipart/File.php

@@ -31,8 +31,10 @@ public function __construct(string $name, Binary $file)
     public function chunks(): Sequence
     {
         return $this
-            ->headers()
-            ->append($this->file->content()->chunks());
+            ->file
+            ->content()
+            ->chunks()
+            ->prepend($this->headers());
     }
 
     /**
@@ -61,9 +63,7 @@ private function headers(): Sequence
     {
         $name = $this->file->name()->toString();
         $mediaType = $this->file->mediaType()->toString();
-        // Use a lazy Sequence here to prevent loading the whole file in memory
-        // when the the chunks are appended to the headers in self::chunks()
-        $headers = Sequence::lazyStartingWith(
+        $headers = Sequence::of(
             Str::of("Content-Disposition: form-data; name=\"{$this->name}\"; filename=\"$name\"\r\n"),
             Str::of("Content-Type: $mediaType\r\n"),
         );

src/Request/Stringable.php

@@ -32,13 +32,16 @@ public function __invoke(Request $request): Content
             ->map(static fn($header) => $header->toString())
             ->map(Str::of(...))
             ->map(static fn($header) => $header->append("\n"));
-        $body = $request->body()->chunks();
 
         return Content::ofChunks(
-            Sequence::lazyStartingWith($status)
-                ->append($headers)
-                ->add(Str::of("\n"))
-                ->append($body),
+            $request
+                ->body()
+                ->chunks()
+                ->prepend(
+                    Sequence::of($status)
+                        ->append($headers)
+                        ->add(Str::of("\n")),
+                ),
         );
     }
 

src/Response/Stringable.php

@@ -32,13 +32,16 @@ public function __invoke(Response $response): Content
             ->map(static fn($header) => $header->toString())
             ->map(Str::of(...))
             ->map(static fn($header) => $header->append("\n"));
-        $body = $response->body()->chunks();
 
         return Content::ofChunks(
-            Sequence::lazyStartingWith($status)
-                ->append($headers)
-                ->add(Str::of("\n"))
-                ->append($body),
+            $response
+                ->body()
+                ->chunks()
+                ->prepend(
+                    Sequence::of($status)
+                        ->append($headers)
+                        ->add(Str::of("\n")),
+                ),
         );
     }
 

src/ServerRequest/Stringable.php

@@ -35,10 +35,13 @@ public function __invoke(ServerRequest $request): Content
             ->map(static fn($header) => $header->append("\n"));
 
         return Content::ofChunks(
-            Sequence::lazyStartingWith($status)
-                ->append($headers)
-                ->add(Str::of("\n"))
-                ->append($this->bodyChunks($request)),
+            $this
+                ->bodyChunks($request)
+                ->prepend(
+                    Sequence::of($status)
+                        ->append($headers)
+                        ->add(Str::of("\n")),
+                ),
         );
     }
 

tests/Header/ContentType/BoundaryTest.php

@@ -35,7 +35,9 @@ public function testOf()
     public function testThrowWhenRandomString()
     {
         $this
-            ->forAll(Set\Unicode::strings())
+            ->forAll(Set\Unicode::strings()->filter(
+                static fn($string) => !\preg_match('~^[a-zA-Z0-9 \'()+_,-./:=?]{1,70}$~', $string),
+            ))
             ->then(function($random) {
                 try {
                     Boundary::of($random);