Merge branch 'develop'

* develop:
  specify next release
  fix loading the multipart files in memory
  fix psalm error
  CS

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 7.0.1 - 2024-03-27
+
+### Fixed
+
+- Files used in `Innmind\Http\Content\Multipart` are no longer loaded in memory
+
 ## 7.0.0 - 2023-10-22
 
 ### Changed

src/Content/Multipart/File.php

@@ -61,7 +61,9 @@ private function headers(): Sequence
     {
         $name = $this->file->name()->toString();
         $mediaType = $this->file->mediaType()->toString();
-        $headers = Sequence::of(
+        // 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(
             Str::of("Content-Disposition: form-data; name=\"{$this->name}\"; filename=\"$name\"\r\n"),
             Str::of("Content-Type: $mediaType\r\n"),
         );

src/Factory/Files/FilesFactory.php

@@ -7,7 +7,6 @@
     Factory\FilesFactory as FilesFactoryInterface,
     ServerRequest\Files,
     File\Status,
-    Exception\LogicException,
 };
 use Innmind\MediaType\MediaType;
 use Innmind\Filesystem\{
@@ -17,10 +16,7 @@
 use Innmind\Url\Path;
 use Innmind\IO\IO;
 use Innmind\Stream\Capabilities;
-use Innmind\Immutable\{
-    Map,
-    Either,
-};
+use Innmind\Immutable\Either;
 
 /**
  * @psalm-immutable

src/Factory/Header/AcceptFactory.php

@@ -13,7 +13,6 @@
 use Innmind\Immutable\{
     Str,
     Maybe,
-    Sequence,
 };
 
 /**

src/Factory/Header/DelegationFactory.php

@@ -3,10 +3,7 @@
 
 namespace Innmind\Http\Factory\Header;
 
-use Innmind\Http\{
-    Factory\HeaderFactory,
-    Header,
-};
+use Innmind\Http\Factory\HeaderFactory;
 use Innmind\Immutable\{
     Map,
     Str,

src/Factory/Header/HeaderFactory.php

@@ -7,10 +7,7 @@
     Header,
     Header\Value,
 };
-use Innmind\Immutable\{
-    Str,
-    Maybe,
-};
+use Innmind\Immutable\Str;
 
 /**
  * @psalm-immutable

src/Factory/Header/HeadersFactory.php

@@ -7,7 +7,6 @@
     Factory\HeadersFactory as HeadersFactoryInterface,
     Factory\HeaderFactory as HeaderFactoryInterface,
     Headers,
-    Header,
 };
 use Innmind\Immutable\Str;
 

src/Header/LinkValue.php

@@ -8,7 +8,6 @@
 use Innmind\Immutable\{
     Str,
     Map,
-    Sequence,
     Maybe,
 };
 

src/ResponseSender.php

@@ -5,18 +5,13 @@
 
 use Innmind\Http\{
     Header\Date,
-    Header\DateValue,
     Header\SetCookie,
     Header\CookieValue,
     Header\Parameter,
     TimeContinuum\Format\Http,
     Exception\LogicException,
 };
 use Innmind\TimeContinuum\Clock;
-use Innmind\Immutable\{
-    Sequence,
-    Str,
-};
 
 final class ResponseSender implements Sender
 {
@@ -94,7 +89,10 @@ static function(array $parameters, Parameter $parameter): array {
                             )->getTimestamp();
                             // MaxAge has precedence
                             /** @psalm-suppress MixedAssignment */
-                            $parameters['expire'] = ($parameters['expire'] ?? 0 !== 0) ? $parameters['expire'] : $timestamp;
+                            $parameters['expire'] = match ($parameters['expire'] ?? 0) {
+                                0 => $timestamp,
+                                default => $parameters['expire'] ?? 0,
+                            };
                             break;
 
                         case 'Max-Age':

tests/Factory/Files/FilesFactoryTest.php

@@ -11,10 +11,6 @@
 };
 use Innmind\IO\IO;
 use Innmind\Stream\Streams;
-use Innmind\Immutable\{
-    Map,
-    MapInterface
-};
 use PHPUnit\Framework\TestCase;
 
 class FilesFactoryTest extends TestCase

tests/Factory/Header/FactoriesTest.php

@@ -5,8 +5,7 @@
 
 use Innmind\Http\Factory\{
     Header\Factories,
-    Header\DelegationFactory,
-    HeaderFactory
+    Header\DelegationFactory
 };
 use Innmind\TimeContinuum\Earth\Clock;
 use Innmind\Immutable\Map;

tests/Header/AcceptCharsetTest.php

@@ -6,7 +6,6 @@
 use Innmind\Http\{
     Header\AcceptCharset,
     Header,
-    Header\Value,
     Header\AcceptCharsetValue,
     Header\Parameter\Quality
 };

tests/Header/AcceptRangesTest.php

@@ -6,7 +6,6 @@
 use Innmind\Http\{
     Header\AcceptRanges,
     Header,
-    Header\Value,
     Header\AcceptRangesValue
 };
 use Innmind\Immutable\Set;

tests/Header/AcceptRangesValueTest.php

@@ -6,7 +6,6 @@
 use Innmind\Http\{
     Header\AcceptRangesValue,
     Header\Value,
-    Header\Parameter\Quality,
     Exception\DomainException,
 };
 use PHPUnit\Framework\TestCase;

tests/Header/AcceptTest.php

@@ -7,12 +7,7 @@
     Header\Accept,
     Header,
     Header\AcceptValue,
-    Header\Parameter\Quality,
-    Header\Parameter
-};
-use Innmind\Immutable\{
-    Set,
-    Map
+    Header\Parameter\Quality
 };
 use PHPUnit\Framework\TestCase;
 

tests/Header/AgeTest.php

@@ -6,7 +6,6 @@
 use Innmind\Http\{
     Header\Age,
     Header,
-    Header\Value,
     Header\AgeValue
 };
 use Innmind\Immutable\Set;

tests/Header/AllowValueTest.php

@@ -6,7 +6,6 @@
 use Innmind\Http\Header\{
     AllowValue,
     Value,
-    Parameter\Quality,
 };
 use PHPUnit\Framework\TestCase;
 

tests/Header/AuthorizationTest.php

@@ -6,7 +6,6 @@
 use Innmind\Http\{
     Header\Authorization,
     Header,
-    Header\Value,
     Header\AuthorizationValue
 };
 use Innmind\Immutable\Set;

tests/Header/CacheControlTest.php

@@ -8,10 +8,6 @@
     Header,
     Header\CacheControlValue\PublicCache
 };
-use Innmind\Immutable\{
-    Set,
-    Map
-};
 use PHPUnit\Framework\TestCase;
 
 class CacheControlTest extends TestCase

tests/Header/ContentEncodingTest.php

@@ -6,7 +6,6 @@
 use Innmind\Http\{
     Header\ContentEncoding,
     Header,
-    Header\Value,
     Header\ContentEncodingValue
 };
 use Innmind\Immutable\Set;

tests/Header/ContentLengthTest.php

@@ -6,7 +6,6 @@
 use Innmind\Http\{
     Header\ContentLength,
     Header,
-    Header\Value,
     Header\ContentLengthValue
 };
 use Innmind\Immutable\Set;

tests/Header/ContentLocationTest.php

@@ -6,7 +6,6 @@
 use Innmind\Http\{
     Header\ContentLocation,
     Header,
-    Header\Value,
     Header\LocationValue
 };
 use Innmind\Immutable\Set;

tests/Header/ContentRangeTest.php

@@ -6,7 +6,6 @@
 use Innmind\Http\{
     Header\ContentRange,
     Header,
-    Header\Value,
     Header\ContentRangeValue
 };
 use Innmind\Immutable\Set;

tests/Header/ContentTypeTest.php

@@ -6,14 +6,10 @@
 use Innmind\Http\{
     Header\ContentType,
     Header,
-    Header\Value,
     Header\ContentTypeValue,
     Header\Parameter
 };
-use Innmind\Immutable\{
-    Set,
-    Map,
-};
+use Innmind\Immutable\Set;
 use PHPUnit\Framework\TestCase;
 
 class ContentTypeTest extends TestCase

tests/Header/CookieTest.php

@@ -6,7 +6,6 @@
 use Innmind\Http\{
     Header\Cookie,
     Header,
-    Header\Value,
     Header\CookieValue,
     Header\Parameter\Parameter
 };

tests/Header/DateTest.php

@@ -6,7 +6,6 @@
 use Innmind\Http\{
     Header\Date,
     Header,
-    Header\Value,
     Header\DateValue
 };
 use Innmind\TimeContinuum\Earth\PointInTime\PointInTime;

tests/Header/ExpiresTest.php

@@ -6,7 +6,6 @@
 use Innmind\Http\{
     Header\Expires,
     Header,
-    Header\Value,
     Header\DateValue
 };
 use Innmind\TimeContinuum\Earth\PointInTime\PointInTime;

tests/Header/HostTest.php

@@ -6,7 +6,6 @@
 use Innmind\Http\{
     Header\Host,
     Header,
-    Header\Value,
     Header\HostValue
 };
 use Innmind\Immutable\Set;

tests/Header/IfModifiedSinceTest.php

@@ -6,7 +6,6 @@
 use Innmind\Http\{
     Header\IfModifiedSince,
     Header,
-    Header\Value,
     Header\DateValue
 };
 use Innmind\TimeContinuum\Earth\PointInTime\PointInTime;

tests/Header/IfUnmodifiedSinceTest.php

@@ -6,7 +6,6 @@
 use Innmind\Http\{
     Header\IfUnmodifiedSince,
     Header,
-    Header\Value,
     Header\DateValue
 };
 use Innmind\TimeContinuum\Earth\PointInTime\PointInTime;

tests/Header/LastModifiedTest.php

@@ -6,7 +6,6 @@
 use Innmind\Http\{
     Header\LastModified,
     Header,
-    Header\Value,
     Header\DateValue
 };
 use Innmind\TimeContinuum\Earth\PointInTime\PointInTime;

tests/Header/LinkTest.php

@@ -10,10 +10,6 @@
     Header\Parameter
 };
 use Innmind\Url\Url;
-use Innmind\Immutable\{
-    Set,
-    Map
-};
 use PHPUnit\Framework\TestCase;
 
 class LinkTest extends TestCase

tests/Header/LocationTest.php

@@ -6,7 +6,6 @@
 use Innmind\Http\{
     Header\Location,
     Header,
-    Header\Value,
     Header\LocationValue
 };
 use Innmind\Immutable\Set;

tests/Header/RangeTest.php

@@ -6,7 +6,6 @@
 use Innmind\Http\{
     Header\Range,
     Header,
-    Header\Value,
     Header\RangeValue
 };
 use Innmind\Immutable\Set;

tests/Header/ReferrerTest.php

@@ -6,7 +6,6 @@
 use Innmind\Http\{
     Header\Referrer,
     Header,
-    Header\Value,
     Header\ReferrerValue
 };
 use Innmind\Immutable\Set;

tests/Header/SetCookieTest.php

@@ -6,7 +6,6 @@
 use Innmind\Http\{
     Header\SetCookie,
     Header,
-    Header\Value,
     Header\CookieValue,
     Header\Parameter\Parameter,
     Header\CookieParameter\Secure

tests/Header/WWWAuthenticateTest.php

@@ -6,8 +6,7 @@
 use Innmind\Http\{
     Header\WWWAuthenticate,
     Header\WWWAuthenticateValue,
-    Header,
-    Header\Value
+    Header
 };
 use Innmind\Immutable\Set;
 use PHPUnit\Framework\TestCase;

tests/HeadersTest.php

@@ -10,7 +10,6 @@
     Header\Allow,
     Header\ContentType,
     Header\ContentTypeValue,
-    Header\Parameter,
     Header\Value\Value,
 };
 use Innmind\Immutable\SideEffect;

tests/Response/StatusCodeTest.php

@@ -5,10 +5,7 @@
 
 use Innmind\Http\Response\StatusCode;
 use PHPUnit\Framework\TestCase;
-use Innmind\BlackBox\{
-    PHPUnit\BlackBox,
-    Set,
-};
+use Innmind\BlackBox\PHPUnit\BlackBox;
 
 class StatusCodeTest extends TestCase
 {