Merge branch 'develop'

* develop:
  add support for immutable 5
  use blackbox 5
  use psalm 5
  test against php 8.3

.github/workflows/ci.yml

@@ -8,7 +8,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macOS-latest]
-        php-version: ['8.1', '8.2']
+        php-version: ['8.2', '8.3']
         dependencies: ['lowest', 'highest']
     name: 'PHPUnit'
     steps:
@@ -33,7 +33,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macOS-latest]
-        php-version: ['8.1', '8.2']
+        php-version: ['8.2', '8.3']
         dependencies: ['lowest', 'highest']
     name: 'Coverage'
     steps:
@@ -60,7 +60,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-version: ['8.1', '8.2']
+        php-version: ['8.2', '8.3']
         dependencies: ['lowest', 'highest']
     name: 'Psalm'
     steps:
@@ -81,7 +81,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-version: ['8.1']
+        php-version: ['8.2']
     name: 'CS'
     steps:
       - name: Checkout

.gitignore

@@ -1,3 +1,4 @@
 composer.lock
 vendor
 .phpunit.result.cache
+.phpunit.cache

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 6.4.0 - 2023-09-16
+
+### Added
+
+- Support for `innmind/immutable:~5.0`
+
+### Removed
+
+- Support for PHP `8.1`
+
 ## 6.3.0 - 2023-04-30
 
 ### Added

composer.json

@@ -15,9 +15,9 @@
         "issues": "http://github.com/Innmind/Http/issues"
     },
     "require": {
-        "php": "~8.1",
+        "php": "~8.2",
         "innmind/url": "~4.0",
-        "innmind/immutable": "~4.13",
+        "innmind/immutable": "~4.15|~5.0",
         "innmind/filesystem": "^6.3.2",
         "innmind/time-continuum": "~3.0",
         "innmind/stream": "~4.0",
@@ -36,10 +36,10 @@
     },
     "require-dev": {
         "psr/http-message": "^1.0",
-        "phpunit/phpunit": "^9.5.14",
-        "vimeo/psalm": "~4.21",
+        "phpunit/phpunit": "~10.2",
+        "vimeo/psalm": "~5.12",
         "nikic/php-parser": "^4.13.2",
-        "innmind/black-box": "^4.17",
+        "innmind/black-box": "~5.5",
         "innmind/coding-standard": "~2.0",
         "symfony/process": "^6.2"
     }

phpunit.xml.dist

@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" colors="true" bootstrap="vendor/autoload.php" printerClass="Innmind\BlackBox\PHPUnit\ResultPrinterV9" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
-  <coverage>
-    <include>
-      <directory>.</directory>
-    </include>
-    <exclude>
-      <directory>./tests</directory>
-      <directory>./vendor</directory>
-    </exclude>
-  </coverage>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" colors="true" bootstrap="vendor/autoload.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.3/phpunit.xsd" cacheDirectory=".phpunit.cache">
+  <extensions>
+    <bootstrap class="Innmind\BlackBox\PHPUnit\Extension">
+    </bootstrap>
+  </extensions>
+  <coverage/>
   <php>
     <env name="BLACKBOX_SET_SIZE" value="1"/>
   </php>
@@ -17,4 +13,13 @@
       <directory>./tests</directory>
     </testsuite>
   </testsuites>
+  <source>
+    <include>
+      <directory>.</directory>
+    </include>
+    <exclude>
+      <directory>./tests</directory>
+      <directory>./vendor</directory>
+    </exclude>
+  </source>
 </phpunit>

psalm.xml

@@ -2,6 +2,8 @@
 <psalm
     errorLevel="1"
     resolveFromConfigFile="true"
+    findUnusedCode="false"
+    findUnusedBaselineEntry="true"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"

src/Content/Multipart.php

@@ -117,7 +117,7 @@ public function reduce($carry, callable $reducer)
     public function size(): Maybe
     {
         // +2 for carriage return and -- (for last boundary)
-        $boundary = $this->boundaryStr()->toEncoding('ASCII')->length() + 2;
+        $boundary = $this->boundaryStr()->toEncoding(Str\Encoding::ascii)->length() + 2;
 
         if ($this->parts->empty()) {
             return Maybe::just(new Size($boundary + $boundary));

src/Content/Multipart/Data.php

@@ -45,7 +45,7 @@ public function size(): Maybe
             $this
                 ->chunks()
                 ->fold(new Concat)
-                ->toEncoding('ASCII')
+                ->toEncoding(Str\Encoding::ascii)
                 ->length(),
         );
     }

src/Content/Multipart/File.php

@@ -46,7 +46,7 @@ public function size(): Maybe
         $headers = $this
             ->headers()
             ->fold(new Concat)
-            ->toEncoding('ASCII')
+            ->toEncoding(Str\Encoding::ascii)
             ->length();
 
         return $this

src/Factory/Header/AcceptCharsetFactory.php

@@ -54,6 +54,7 @@ public function __invoke(Str $name, Str $value): Maybe
 
         /**
          * @psalm-suppress NamedArgumentNotAllowed
+         * @psalm-suppress InvalidArgument
          * @var Maybe<Header>
          */
         return Maybe::all(...$values->toList())->map(

src/Factory/Header/AcceptEncodingFactory.php

@@ -54,6 +54,7 @@ public function __invoke(Str $name, Str $value): Maybe
 
         /**
          * @psalm-suppress NamedArgumentNotAllowed
+         * @psalm-suppress InvalidArgument
          * @var Maybe<Header>
          */
         return Maybe::all(...$values->toList())->map(

src/Factory/Header/AcceptFactory.php

@@ -60,6 +60,7 @@ public function __invoke(Str $name, Str $value): Maybe
 
         /**
          * @psalm-suppress NamedArgumentNotAllowed
+         * @psalm-suppress InvalidArgument
          * @var Maybe<Header>
          */
         return Maybe::all(...$values->toList())->map(
@@ -90,7 +91,10 @@ private function buildParams(Str $params): Maybe
             return Maybe::just([]);
         }
 
-        /** @var Maybe<list<Parameter>> */
+        /**
+         * @psalm-suppress InvalidArgument
+         * @var Maybe<list<Parameter>>
+         */
         return Maybe::all(...$params->toList())->map(
             static fn(Parameter ...$params) => $params,
         );

src/Factory/Header/AcceptLanguageFactory.php

@@ -54,6 +54,7 @@ public function __invoke(Str $name, Str $value): Maybe
 
         /**
          * @psalm-suppress NamedArgumentNotAllowed
+         * @psalm-suppress InvalidArgument
          * @var Maybe<Header>
          */
         return Maybe::all(...$values->toList())->map(

src/Factory/Header/AllowFactory.php

@@ -38,6 +38,7 @@ public function __invoke(Str $name, Str $value): Maybe
 
         /**
          * @psalm-suppress NamedArgumentNotAllowed
+         * @psalm-suppress InvalidArgument
          * @var Maybe<Header>
          */
         return Maybe::all(...$values->toList())->map(

src/Factory/Header/CacheControlFactory.php

@@ -79,7 +79,10 @@ public function __invoke(Str $name, Str $value): Maybe
             return Maybe::nothing();
         }
 
-        /** @var Maybe<Header> */
+        /**
+         * @psalm-suppress InvalidArgument
+         * @var Maybe<Header>
+         */
         return Maybe::all(...$values->toList())->map(
             static fn(CacheControlValue ...$values) => new CacheControl(...$values),
         );

src/Factory/Header/ContentLanguageFactory.php

@@ -38,6 +38,7 @@ public function __invoke(Str $name, Str $value): Maybe
 
         /**
          * @psalm-suppress NamedArgumentNotAllowed
+         * @psalm-suppress InvalidArgument
          * @var Maybe<Header>
          */
         return Maybe::all(...$values->toList())->map(

src/Factory/Header/CookieFactory.php

@@ -41,6 +41,7 @@ public function __invoke(Str $name, Str $value): Maybe
 
         /**
          * @psalm-suppress NamedArgumentNotAllowed
+         * @psalm-suppress InvalidArgument
          * @var Maybe<Header>
          */
         return Maybe::all(...$values->toList())->map(

src/Factory/Header/LinkFactory.php

@@ -72,6 +72,7 @@ public function __invoke(Str $name, Str $value): Maybe
 
         /**
          * @psalm-suppress NamedArgumentNotAllowed
+         * @psalm-suppress InvalidArgument
          * @var Maybe<Header>
          */
         return Maybe::all(...$links->toList())->map(
@@ -105,6 +106,7 @@ private function buildParams(Str $params): Maybe
 
         /**
          * @psalm-suppress MixedArgumentTypeCoercion
+         * @psalm-suppress InvalidArgument
          * @var Maybe<Map<string, Parameter\Parameter>>
          */
         return Maybe::all(...$params->toList())->map(

src/Header/ContentLengthValue.php

@@ -20,7 +20,6 @@ public function __construct(int $length)
             throw new DomainException((string) $length);
         }
 
-        /** @var 0|positive-int */
         $this->length = $length;
     }
 

src/ResponseSender.php

@@ -32,10 +32,10 @@ final class ResponseSender implements Sender
     /**
      * @param callable(File\Content): Sequence<Str> $chunk
      */
-    public function __construct(Clock $clock, callable $chunk = new Chunk)
+    public function __construct(Clock $clock, callable $chunk = null)
     {
         $this->clock = $clock;
-        $this->chunk = $chunk;
+        $this->chunk = $chunk ?? new Chunk;
     }
 
     public function __invoke(Response $response): void

tests/Factory/Header/HostFactoryTest.php

@@ -48,7 +48,7 @@ public function testReturnNothingWhenNotExpectedHeader()
         ));
     }
 
-    public function cases(): array
+    public static function cases(): array
     {
         return [
             ['www.w3.org:8080'],

tests/File/InputTest.php

@@ -37,8 +37,7 @@ public function testForeach()
         $this
             ->forAll(Set\Sequence::of(
                 $this->strings(),
-                Set\Integers::between(1, 10),
-            ))
+            )->between(1, 10))
             ->then(function($lines) {
                 \file_put_contents('/tmp/test_content', \implode("\n", $lines));
                 $content = Input::of(Stream::open(Path::of('/tmp/test_content')));
@@ -77,8 +76,7 @@ public function testMap()
             ->forAll(
                 Set\Sequence::of(
                     $this->strings(),
-                    Set\Integers::between(1, 10),
-                ),
+                )->between(1, 10),
                 $this->strings(),
             )
             ->then(function($lines, $replacement) {
@@ -106,8 +104,7 @@ public function testFlatMap()
             ->forAll(
                 Set\Sequence::of(
                     $this->strings(),
-                    Set\Integers::between(1, 10),
-                ),
+                )->between(1, 10),
                 $this->strings(),
             )
             ->then(function($lines, $newLine) {
@@ -132,8 +129,7 @@ public function testFilter()
         $this
             ->forAll(Set\Sequence::of(
                 $this->strings(),
-                Set\Integers::between(1, 10),
-            ))
+            )->between(1, 10))
             ->then(function($lines) {
                 \file_put_contents('/tmp/test_content', \implode("\n", $lines));
                 $content = Input::of(Stream::open(Path::of('/tmp/test_content')));
@@ -154,8 +150,7 @@ public function testLines()
             ->forAll(
                 Set\Sequence::of(
                     $this->strings(),
-                    Set\Integers::between(1, 10),
-                ),
+                )->between(1, 10),
                 $this->strings(),
             )
             ->then(function($lines, $replacement) {
@@ -190,8 +185,7 @@ public function testReduce()
         $this
             ->forAll(Set\Sequence::of(
                 $this->strings(),
-                Set\Integers::between(1, 10),
-            ))
+            )->between(1, 10))
             ->then(function($lines) {
                 \file_put_contents('/tmp/test_content', \implode("\n", $lines));
                 $content = Input::of(Stream::open(Path::of('/tmp/test_content')));
@@ -211,8 +205,7 @@ public function testToString()
         $this
             ->forAll(Set\Sequence::of(
                 $this->strings(),
-                Set\Integers::between(1, 10),
-            ))
+            )->between(1, 10))
             ->then(function($lines) {
                 \file_put_contents('/tmp/test_content', \implode("\n", $lines));
                 $content = Input::of(Stream::open(Path::of('/tmp/test_content')));
@@ -226,10 +219,9 @@ public function testSize()
         $this
             ->forAll(Set\Sequence::of(
                 $this->strings(),
-                Set\Integers::between(0, 10),
-            ))
+            )->between(0, 10))
             ->then(function($lines) {
-                $expectedSize = Str::of(\implode("\n", $lines))->toEncoding('ASCII')->length();
+                $expectedSize = Str::of(\implode("\n", $lines))->toEncoding(Str\Encoding::ascii)->length();
                 \file_put_contents('/tmp/test_content', \implode("\n", $lines));
                 $content = Input::of(Stream::open(Path::of('/tmp/test_content')));
 
@@ -248,8 +240,7 @@ public function testThrowWhenTryingToLoadInputTwice()
         $this
             ->forAll(Set\Sequence::of(
                 $this->strings(),
-                Set\Integers::between(1, 10),
-            ))
+            )->between(1, 10))
             ->then(function($lines) {
                 \file_put_contents('/tmp/test_content', \implode("\n", $lines));
                 $content = Input::of(Stream::open(Path::of('/tmp/test_content')));

tests/Header/AcceptCharsetValueTest.php

@@ -47,7 +47,7 @@ public function testThrowWhenInvalidAcceptCharsetValue($value)
         new AcceptCharsetValue($value, new Quality(1));
     }
 
-    public function invalids(): array
+    public static function invalids(): array
     {
         return [
             ['@'],

tests/Header/AcceptEncodingValueTest.php

@@ -46,7 +46,7 @@ public function testThrowWhenInvalidAcceptEncodingValue($value)
         new AcceptEncodingValue($value, new Quality(1));
     }
 
-    public function invalids(): array
+    public static function invalids(): array
     {
         return [
             ['@'],

tests/Header/AcceptLanguageValueTest.php

@@ -46,7 +46,7 @@ public function testThrowWhenInvalidAcceptLanguageValue($value)
         new AcceptLanguageValue($value, new Quality(1));
     }
 
-    public function invalids(): array
+    public static function invalids(): array
     {
         return [
             ['@'],